Photo

src/main/java/com/sswugdsc4a/withparents/config/SpringSecurityConfig.java

@@ -1,6 +1,7 @@
 package com.sswugdsc4a.withparents.config;
 
 import com.sswugdsc4a.withparents.filter.JwtAuthorizationFilter;
+import com.sswugdsc4a.withparents.repository.LastApiCallTimeRepository;
 import com.sswugdsc4a.withparents.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
@@ -19,6 +20,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
 
     private final PropertyConfig propertyConfig;
     private final UserRepository userRepository;
+    private final LastApiCallTimeRepository lastApiCallTimeRepository;
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
@@ -32,7 +34,7 @@ protected void configure(HttpSecurity http) throws Exception {
 
         // jwt 필터 추가
         http.addFilterAfter(
-                new JwtAuthorizationFilter(userRepository, propertyConfig),
+                new JwtAuthorizationFilter(userRepository, lastApiCallTimeRepository, propertyConfig),
                 BasicAuthenticationFilter.class
         );
 

src/main/java/com/sswugdsc4a/withparents/controller/MedicationController.java

@@ -23,7 +23,8 @@ public MedicationDTO createMedication(
                 body.getUserId(),
                 body.getDescription(),
                 body.getDayOfTheWeekList(),
-                body.getDosingTime()
+                body.getDosingTimeList(),
+                body.getNotificationStatus()
         );
     }
 
@@ -35,7 +36,8 @@ public MedicationDTO modifyMedication(
                 body.getMedicationId(),
                 body.getDescription(),
                 body.getDayOfTheWeekList(),
-                body.getDosingTime()
+                body.getDosingTimeList(),
+                body.getNotificationStatus()
         );
     }
 

src/main/java/com/sswugdsc4a/withparents/controller/PhotoController.java

@@ -0,0 +1,52 @@
+package com.sswugdsc4a.withparents.controller;
+
+import com.sswugdsc4a.withparents.dto.Request.gallery.ModifyPhotoRequest;
+import com.sswugdsc4a.withparents.dto.dto.photo.PhotoDTO;
+import com.sswugdsc4a.withparents.dto.request.gallery.UploadPhotoRequest;
+import com.sswugdsc4a.withparents.entity.Family;
+import com.sswugdsc4a.withparents.service.PhotoService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class PhotoController {
+
+    private final PhotoService photoService;
+
+    @PostMapping("/api/gallery/uploadPhoto")
+    public PhotoDTO uploadPhoto(
+            @RequestBody UploadPhotoRequest body
+    ){
+        return photoService.uploadPhoto(
+                body.getImageUrl(),
+                body.getDescription()
+        );
+    }
+    @PatchMapping("/api/gallery/modifyPhoto")
+    public PhotoDTO modifyPhoto(
+            @RequestBody ModifyPhotoRequest body
+    ){
+        return photoService.modifyPhoto(
+                body.getPhotoId(),
+                body.getImageUrl(),
+                body.getDescription()
+        );
+    }
+    @DeleteMapping("/api/gallery/deletePhoto")
+    public void deletePhoto(
+            @RequestParam Long photoId
+    ){
+        photoService.deletePhoto(photoId);
+    }
+
+    @GetMapping("/api/gallery/getPhotoList")
+    public List<PhotoDTO> getPhotoList(
+            @RequestParam Long familyId
+    ){
+        return photoService.getPhotoList(familyId);
+    }
+
+}

src/main/java/com/sswugdsc4a/withparents/controller/ScheduleController.java

@@ -0,0 +1,63 @@
+package com.sswugdsc4a.withparents.controller;
+
+import com.sswugdsc4a.withparents.dto.Request.schedule.ModifyScheduleRequest;
+import com.sswugdsc4a.withparents.dto.dto.ScheduleDTO;
+import com.sswugdsc4a.withparents.dto.request.schedule.CreateScheduleRequest;
+import com.sswugdsc4a.withparents.service.ScheduleService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class ScheduleController {
+    private final ScheduleService scheduleService;
+
+    @PostMapping("/api/schedule/createSchedule")
+    public ScheduleDTO createSchedule(
+            @RequestBody CreateScheduleRequest body
+    ) {
+        return scheduleService.createSchedule(
+                body.getTitle(),
+                body.getDate(),
+                body.getTime(),
+                body.getNotificationStatus()
+        );
+    }
+    @PatchMapping("/api/schedule/modifySchedule")
+    public ScheduleDTO modifySchedule(
+            @RequestBody ModifyScheduleRequest body
+    ){
+        return scheduleService.modifySchedule(
+                body.getScheduleId(),
+                body.getTitle(),
+                body.getDate(),
+                body.getTime(),
+                body.getNotificationStatus()
+        );
+    }
+
+
+    @GetMapping("/api/schedule/getScheduleList")
+    public List<ScheduleDTO> getScheduleList(
+            @RequestParam int year,
+            @RequestParam int month
+    ) {
+        return scheduleService.getScheduleList(year, month);
+    }
+
+    @GetMapping("/api/schedule/getTodayScheduleList")
+    public List<ScheduleDTO> getTodayScheduleList(
+    ) {
+        return scheduleService.getTodayScheduleList();
+    }
+
+    @DeleteMapping("/api/schedule/deleteSchedule")
+    public void deleteSchedule(
+            @RequestParam Long scheduleId
+    ){
+        scheduleService.deleteSchedule(scheduleId);
+    }
+};
+

src/main/java/com/sswugdsc4a/withparents/controller/UserController.java

@@ -1,15 +1,16 @@
 package com.sswugdsc4a.withparents.controller;
 
-import com.sswugdsc4a.withparents.dto.dto.user.FamilyDTO;
-import com.sswugdsc4a.withparents.dto.dto.user.LocationInfoDTO;
-import com.sswugdsc4a.withparents.dto.dto.user.SimpleUserInfoDTO;
-import com.sswugdsc4a.withparents.dto.dto.user.UserDTO;
+import com.sswugdsc4a.withparents.dto.dto.user.*;
 import com.sswugdsc4a.withparents.dto.request.user.CreateFamilyRequest;
 import com.sswugdsc4a.withparents.dto.request.user.ModifyUserInfoRequest;
 import com.sswugdsc4a.withparents.dto.request.user.SetLocationInfoRequest;
+import com.sswugdsc4a.withparents.entity.LastApiCallTime;
 import com.sswugdsc4a.withparents.service.UserService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -47,19 +48,30 @@ public UserDTO getUserInfo(){
     public LocationInfoDTO setLocationInfo(
             @RequestBody SetLocationInfoRequest body
             ){
-        return userService.setLocationInfo(body.getLocationInfo());
+        return userService.setLocationInfo(
+                body.getLatitude(),
+                body.getLatitude());
     }
 
     @GetMapping("/api/user/getLocationInfo")
-    public LocationInfoDTO getLocationInfo(
-            @RequestParam Long userId
-    ){
-        return userService.getLocationInfo(userId);
+    public List<LocationAndNicknameDTO> getLocationInfo(){
+        return userService.getLocationInfo();
     }
 
     @GetMapping("/api/user/getFamilyMemberList")
     public List<SimpleUserInfoDTO> getFamilyMemberIdList(){
         return userService.getFamilyMemberList();
     }
 
+
+    @GetMapping("/api/user/getHomeInfo")
+    public HomeInfoDTO getHomeInfo() {
+        return userService.getHomeInfo();
+    }
+
+    @GetMapping("/api/user/getParentsLastApiCallTime")
+    public List<LastApiCallTime> getParentsLastApiCallTime(){
+        return userService.getParentsLastApiCallTime();
+    }
+
 }

src/main/java/com/sswugdsc4a/withparents/dto/Request/gallery/ModifyPhotoRequest.java

@@ -0,0 +1,12 @@
+package com.sswugdsc4a.withparents.dto.Request.gallery;
+
+import lombok.Getter;
+
+@Getter
+public class ModifyPhotoRequest {
+
+    private Long photoId;
+    private String imageUrl;
+    private String description;
+
+}

src/main/java/com/sswugdsc4a/withparents/dto/Request/gallery/UploadPhotoRequest.java

@@ -0,0 +1,11 @@
+package com.sswugdsc4a.withparents.dto.request.gallery;
+
+import lombok.Getter;
+
+@Getter
+public class UploadPhotoRequest {
+    private Long familyId;
+    private String imageUrl;
+    private String description;
+
+}

src/main/java/com/sswugdsc4a/withparents/dto/Request/medication/CreateMedicationRequest.java

@@ -3,13 +3,14 @@
 import lombok.Getter;
 
 import java.time.LocalTime;
+import java.util.List;
 
 @Getter
 public class CreateMedicationRequest {
 
     private Long userId;
     private String description;
     private String dayOfTheWeekList;
-    private LocalTime dosingTime;
-
+    private List<LocalTime> dosingTimeList;
+    private Boolean notificationStatus;
 }

src/main/java/com/sswugdsc4a/withparents/dto/Request/medication/ModifyMedicationRequest.java

@@ -11,6 +11,7 @@ public class ModifyMedicationRequest {
     private Long medicationId;
     private String description;
     private String dayOfTheWeekList;
-    private LocalTime dosingTime;
+    private List<LocalTime> dosingTimeList;
+    private Boolean notificationStatus;;
 
 }

src/main/java/com/sswugdsc4a/withparents/dto/Request/schedule/CreateScheduleRequest.java

@@ -0,0 +1,14 @@
+package com.sswugdsc4a.withparents.dto.request.schedule;
+
+import lombok.Getter;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+@Getter
+public class CreateScheduleRequest {
+    private String title;
+    private LocalDate date;
+    private LocalTime time;
+    private Boolean notificationStatus;
+}

src/main/java/com/sswugdsc4a/withparents/dto/Request/schedule/ModifyScheduleRequest.java

@@ -0,0 +1,18 @@
+package com.sswugdsc4a.withparents.dto.Request.schedule;
+
+
+import lombok.Getter;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+@Getter
+public class ModifyScheduleRequest {
+
+    private Long scheduleId;
+    private String title;
+    private LocalDate date;
+    private LocalTime time;
+    private Boolean notificationStatus;
+
+}

src/main/java/com/sswugdsc4a/withparents/dto/Request/user/SetLocationInfoRequest.java

@@ -4,5 +4,6 @@
 
 @Getter
 public class SetLocationInfoRequest {
-    private String locationInfo;
+    private String latitude;
+    private String longitude;
 }

src/main/java/com/sswugdsc4a/withparents/dto/dto/ScheduleDTO.java

@@ -0,0 +1,33 @@
+package com.sswugdsc4a.withparents.dto.dto;
+
+import com.sswugdsc4a.withparents.entity.Schedule;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class ScheduleDTO {
+
+    private Long id;
+    private Long creatorId;
+    private String title;
+    private LocalDate date;
+    private LocalTime time;
+    private Boolean notificationStatus;
+
+    public static ScheduleDTO entityToDTO(Schedule e){
+        return new ScheduleDTO(
+                e.getId(),
+                e.getCreator().getId(),
+                e.getTitle(),
+                e.getDate(),
+                e.getTime(),
+                e.getNotificationState()
+        );
+    }
+}

src/main/java/com/sswugdsc4a/withparents/dto/dto/medication/MedicationDTO.java

@@ -6,6 +6,8 @@
 import lombok.Setter;
 
 import java.time.LocalTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Getter
 @Setter
@@ -16,15 +18,20 @@ public class MedicationDTO {
     private Long userId;
     private String description;
     private String dayOfTheWeekList;
-    private LocalTime dosingTime;
+    private List<LocalTime> dosingTimes;
+    private Boolean notificationStatus;
 
     public static MedicationDTO entityToDto(Medication e){
         return new MedicationDTO(
                 e.getId(),
                 e.getUser().getId(),
                 e.getDescription(),
                 e.getDayOfTheWeekList(),
-                e.getDosingTime()
+                e.getDosingTimeList()
+                        .stream()
+                        .map(t -> {return t.getTime();})
+                        .collect(Collectors.toList()),
+                e.getNotificationStatus()
         );
     }