Merge pull request #35 from PU-Track/main

merge for deployment

Author: 13155a1

src/main/java/putrack/server/controller/PatientController.java

@@ -0,0 +1,24 @@
+package putrack.server.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import putrack.server.dto.PatientStatusDto;
+import putrack.server.dto.PredictedDateTimeDto;
+import putrack.server.service.PatientService;
+
+@RestController
+@RequestMapping("/patient")
+@Tag(name = "Patient", description = "Patient API")
+public class PatientController {
+    @Autowired
+    private PatientService patientService;
+
+    @Operation(summary = "다음 체위 변경 시기", description = "다음 체위를 변경하는 시각을 반환합니다. (status가 sleeping일 시 알림 발송)")
+    @PostMapping("/{patientId}/changeTime")
+    public PredictedDateTimeDto predictChangeTime(@PathVariable("patientId") Integer patientId, @RequestBody PatientStatusDto dto) {
+        return patientService.predictChangeTime(patientId, dto);
+    }
+}

src/main/java/putrack/server/controller/UserController.java

@@ -5,29 +5,22 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import putrack.server.dto.CaregiverRegisterDto;
-import putrack.server.dto.PatientRegisterDto;
+import putrack.server.dto.PatientDto;
 import putrack.server.dto.PushTokenRequestDto;
 import putrack.server.entity.Caregiver;
-import putrack.server.entity.Patient;
 import putrack.server.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
 
 @RestController
 @RequestMapping("/user")
-@Tag(name = "User", description = "User (환자, 보호자) 등록 API")
+@Tag(name = "User", description = "User API")
 public class UserController {
 
     @Autowired
     private UserService userService;
 
-//    @Operation(summary = "환자 등록", description = "새로운 환자를 등록합니다.")
-//    @PostMapping("/patient/register")
-//    public ResponseEntity<Patient> registerPatient(@RequestBody PatientRegisterDto dto) {
-//        Patient patient = userService.registerPatient(dto);
-//        return ResponseEntity.ok(patient);
-//    }
-
     @Operation(summary = "간병인 등록", description = "새로운 간병인을 등록합니다. (role: CAREGIVER, DOCTOR, NURSE, NURSING_ASSISTANT, OTHER, gender: F, M)")
     @PostMapping("/caregiver/register")
     public ResponseEntity<Caregiver> registerCaregiver(@RequestBody CaregiverRegisterDto dto) {
@@ -43,4 +36,10 @@ public String registerCaregiverToken(
         userService.registerCaregiverPushToken(code, dto.getPushToken());
         return "FCM 토큰 등록 완료";
     }
+
+    @Operation(summary = "환자 정보 리스트", description = "간병인에 대한 환자 정보 리스트")
+    @GetMapping("/caregiver/{code}/patients")
+    public List<PatientDto> getPatientsByCaregiverCode(@PathVariable("code") String code) {
+        return userService.getPatientsByCaregiverCode(code);
+    }
 }

src/main/java/putrack/server/dto/PatientDto.java

@@ -0,0 +1,15 @@
+package putrack.server.dto;
+
+import lombok.Data;
+import putrack.server.entity.PatientStatus;
+
+@Data
+public class PatientDto {
+    private Integer patientId;
+    private String name;
+    private Integer age;
+    private Double weight;
+    private Double height;
+    private String gender;
+    private PatientStatus status;
+}

src/main/java/putrack/server/dto/PatientRegisterDto.java

@@ -0,0 +1,14 @@
+package putrack.server.dto;
+
+import lombok.Data;
+import java.time.LocalDateTime;
+import putrack.server.entity.PatientStatus;
+
+@Data
+public class PatientStatusDto {
+    private PatientStatus status;
+    private Double airTemp;
+    private Double airHumid;
+    private Double cushionTemp;
+    private LocalDateTime postureStartTime;
+}

src/main/java/putrack/server/dto/PatientStatusDto.java

@@ -0,0 +1,11 @@
+package putrack.server.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class PredictedDateTimeDto {
+    private LocalDateTime currentDateTime;
+    private LocalDateTime predictedDateTime;
+}

src/main/java/putrack/server/dto/PredictedDateTimeDto.java

@@ -3,6 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -30,9 +31,21 @@ public class Caregiver {
     @Column(length = 50)
     private String code;
 
-    @Column(length = 50)
+    @Column(columnDefinition = "TEXT")
     private String pushToken;
 
-    @ManyToMany(mappedBy = "caregivers")
+    @ManyToMany
+    @JoinTable(
+            name = "PatientCaregiver",
+            joinColumns = @JoinColumn(name = "caregiver_id"),
+            inverseJoinColumns = @JoinColumn(name = "patient_id")
+    )
     private List<Patient> patients;
+
+    public void assignPatients(List<Patient> patients) {
+        if (this.patients == null) {
+            this.patients = new ArrayList<>();
+        }
+        this.patients.addAll(patients);
+    }
 }

src/main/java/putrack/server/entity/Caregiver.java

@@ -3,6 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.time.LocalTime;
 import java.util.List;
 
 
@@ -13,12 +14,6 @@ public class Patient {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer patientId;
 
-    @Column(nullable = false, length = 50)
-    private String username;
-
-    @Column(nullable = false, length = 100)
-    private String password;
-
     @Column(nullable = false, length = 50)
     private String name;
 
@@ -29,10 +24,20 @@ public class Patient {
     private String gender;
 
     @Column(nullable = false)
-    private Integer weight;
+    private Double weight;
 
-    @Column(nullable = false, length = 50)
-    private String code;
+    @Column(nullable = false)
+    private Double height;
+
+    @Enumerated(EnumType.STRING)
+    @Column
+    private PatientStatus status;
+
+    @Column
+    private Integer averageInterval;
+
+    @Column
+    private LocalTime averageWakeUpTime;
 
     @OneToOne(mappedBy = "patient")
     private Device devices;
@@ -43,14 +48,6 @@ public class Patient {
     @OneToMany(mappedBy = "patient")
     private List<Prediction> predictions;
 
-    @Column(nullable = false, length = 50)
-    private String pushToken;
-
-    @ManyToMany
-    @JoinTable(
-            name = "PatientCaregiver",
-            joinColumns = @JoinColumn(name = "patient_id"),
-            inverseJoinColumns = @JoinColumn(name = "caregiver_id")
-    )
+    @ManyToMany(mappedBy = "patients")
     private List<Caregiver> caregivers;
 }

src/main/java/putrack/server/entity/Patient.java

@@ -0,0 +1,7 @@
+package putrack.server.entity;
+
+public enum PatientStatus {
+    LYING,
+    SITTING,
+    SLEEPING
+}

src/main/java/putrack/server/entity/PatientStatus.java

@@ -4,5 +4,5 @@
 import putrack.server.entity.Patient;
 
 public interface PatientRepository extends JpaRepository<Patient, Integer>  {
-    boolean existsByUsername(String username);
+
 }