Homework

Daily/src/main/java/com/HelloWorld/Daily/controller/DailyRestController.java

@@ -55,6 +55,26 @@ public ApiResponse<?> postDailies(@AuthenticationPrincipal UserDetails userDetai
         return ApiResponse.createSuccessWithNoContent(); // 공통 API를 반환하기 위한 ApiResponse 객체 사용
     }
 
+    // Daily 수정
+    @PutMapping("/daily/{dailyId}")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse<?> updateDaily(@AuthenticationPrincipal UserDetails userDetails, @PathVariable Long dailyId, @Valid @RequestBody DailyDTO.RequestDTO requestDTO) {
+
+        dailyService.updateDaily(userDetails, dailyId, requestDTO);
+
+        return ApiResponse.createSuccessWithNoContent(); // 공통 API를 반환하기 위한 ApiResponse 객체 사용
+    }
+
+    // Daily 삭제
+    @PostMapping("/daily-delete/{dailyId}")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse<?> deleteDaily(@PathVariable Long dailyId) {
+
+        dailyService.deleteDaily(dailyId);
+
+        return ApiResponse.createSuccessWithNoContent(); // 공통 API를 반환하기 위한 ApiResponse 객체 사용
+    }
+
     // 좋아요 기능
     @PostMapping("/daily-like/{dailyId}")
     @ResponseStatus(HttpStatus.OK)

Daily/src/main/java/com/HelloWorld/Daily/entity/Daily.java

@@ -27,4 +27,7 @@ public static Daily of(DailyDTO.RequestDTO dailyDTO, Member member) {
                 .build();
     }
 
+    public void updateDaily(DailyDTO.RequestDTO dailyDTO) {
+        this.isPublic = dailyDTO.isItIsPublic();
+    }
 }

Daily/src/main/java/com/HelloWorld/Daily/entity/DailyContent.java

@@ -3,12 +3,14 @@
 import com.HelloWorld.Daily.dto.DailyDTO;
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.DynamicUpdate;
 
 @Entity
 @Getter
 @Builder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
+@DynamicUpdate
 public class DailyContent extends Common {
 
     @Id
@@ -41,4 +43,34 @@ public static DailyContent of(Daily daily, DailyDTO.RequestDTO requestDTO){
                 .penitence3(requestDTO.getPenitence3())
                 .build();
     }
+
+    public void updateDailyContent(DailyDTO.RequestDTO requestDTO) {
+        if (requestDTO.getThanks1() != null) {
+            this.thanks1 = requestDTO.getThanks1();
+        }
+        if (requestDTO.getThanks2() != null) {
+            this.thanks2 = requestDTO.getThanks2();
+        }
+        if (requestDTO.getThanks3() != null) {
+            this.thanks3 = requestDTO.getThanks3();
+        }
+        if (requestDTO.getPenitence1() != null) {
+            this.penitence1 = requestDTO.getPenitence1();
+        }
+        if (requestDTO.getPenitence2() != null) {
+            this.penitence2 = requestDTO.getPenitence2();
+        }
+        if (requestDTO.getPenitence3() != null) {
+            this.penitence3 = requestDTO.getPenitence3();
+        }
+    }
+
+    public void deleteDailyContent(DailyDTO.RequestDTO requestDTO) {
+        this.thanks1 = null;
+        this.thanks2 = null;
+        this.thanks3 = null;
+        this.penitence1 = null;
+        this.penitence2 = null;
+        this.penitence3 = null;
+    }
 }

Daily/src/main/java/com/HelloWorld/Daily/service/DailyService.java

@@ -8,6 +8,7 @@
 import com.HelloWorld.Daily.repository.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,6 +87,40 @@ private void saveEntityAboutDaily(Member member, DailyDTO.RequestDTO requestDTO)
         dailyContentRepository.save(DailyContent.of(daily, requestDTO));
     }
 
+    @Transactional
+    public void updateDaily(UserDetails userDetails, Long dailyId, DailyDTO.RequestDTO requestDTO) {
+//        if (userDetails == null) {
+//            throw new NotExistMemberException(MessageCode.DOES_NOT_EXIST_MEMBER.getMessage());
+//        }
+
+        Daily daily = dailyRepository.findById(dailyId)
+                .orElseThrow(() -> new NotExistMemberException(MessageCode.DOES_NOT_EXIST_MEMBER.getMessage()));
+
+        DailyContent dailyContent = dailyContentRepository.selectDailyContentByDaily(dailyId);
+
+//        String userName = userDetails.getUsername();
+//        Member member = memberRepository.findByUserName(userName)
+//                .orElseThrow(() -> new NotExistMemberException(MessageCode.DOES_NOT_EXIST_MEMBER.getMessage()));
+
+        daily.updateDaily(requestDTO);
+        dailyContent.updateDailyContent(requestDTO);
+    }
+
+    @Transactional
+    public void deleteDaily(Long dailyId) {
+        if (dailyLikeRepository.existsById(dailyId)) {
+            dailyLikeRepository.deleteById(dailyId);
+        }
+        else { throw new RuntimeException("DailyLike not found with id: " + dailyId); }
+        if (dailyContentRepository.existsById(dailyId)) {
+            dailyContentRepository.deleteById(dailyId);
+        }
+        else { throw new RuntimeException("DailyContent not found with id: " + dailyId); }
+        if (dailyRepository.existsById(dailyId)) {
+            dailyRepository.deleteById(dailyId);
+        }
+        else { throw new RuntimeException("Daily not found with id: " + dailyId); }
+    }
 
     // ResponseDTO 조회 및 객체화
     private DailyDTO.ResponseDTO getResponseDTO(Daily daily, String memberName){