✨ Feature: 일기 수정 및 삭제 테스트 케이스 작성 및 유효성 검사 추가 (#53)

* ✅ Test: DiaryCommandServiceTest 작성 * ✨ Feature: DiaryCommandService 유효성 검사 추가 * ♻️ Refactor: 패키지 경로 수정 * ✅ Test: DiaryControllerTest 작성 * ✅ Test: 존재하지 않는 일기 수정 테스트 케이스 추가
Team-Zzangdol · Apr 23, 2024 · 568f2ba · 568f2ba
1 parent aa01001
commit 568f2ba
Show file tree

Hide file tree

Showing 25 changed files with 349 additions and 65 deletions.
diff --git a/moodoodle-api/src/main/java/zzangdol/auth/business/AuthFacade.java b/moodoodle-api/src/main/java/zzangdol/auth/business/AuthFacade.java
@@ -9,9 +9,9 @@
 import zzangdol.auth.presentation.dto.request.SignInRequest;
 import zzangdol.auth.presentation.dto.request.SignUpRequest;
 import zzangdol.auth.presentation.dto.response.EmailVerificationTokenResponse;
+import zzangdol.exception.custom.UserCredentialsException;
 import zzangdol.jwt.JwtResponse;
 import zzangdol.jwt.JwtService;
-import zzangdol.moodoodlecommon.exception.custom.UserCredentialsException;
 import zzangdol.response.status.ErrorStatus;
 import zzangdol.ses.service.AwsSesService;
 import zzangdol.user.domain.User;

diff --git a/moodoodle-api/src/main/java/zzangdol/auth/implement/AuthService.java b/moodoodle-api/src/main/java/zzangdol/auth/implement/AuthService.java
@@ -6,9 +6,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import zzangdol.auth.presentation.dto.request.SignInRequest;
 import zzangdol.auth.presentation.dto.request.SignUpRequest;
+import zzangdol.exception.custom.UserCredentialsException;
 import zzangdol.jwt.JwtResponse;
 import zzangdol.jwt.JwtService;
-import zzangdol.moodoodlecommon.exception.custom.UserCredentialsException;
 import zzangdol.response.status.ErrorStatus;
 import zzangdol.user.dao.UserRepository;
 import zzangdol.user.domain.AuthProvider;

diff --git a/moodoodle-api/src/main/java/zzangdol/auth/implement/EmailVerificationTokenService.java b/moodoodle-api/src/main/java/zzangdol/auth/implement/EmailVerificationTokenService.java
@@ -5,7 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import zzangdol.auth.presentation.dto.response.EmailVerificationTokenResponse;
-import zzangdol.moodoodlecommon.exception.custom.InvalidTokenException;
+import zzangdol.exception.custom.InvalidTokenException;
 import zzangdol.redis.dao.EmailVerificationTokenRepository;
 import zzangdol.redis.domain.EmailVerificationToken;
 

diff --git a/moodoodle-api/src/main/java/zzangdol/auth/implement/VerificationCodeService.java b/moodoodle-api/src/main/java/zzangdol/auth/implement/VerificationCodeService.java
@@ -3,10 +3,10 @@
 import java.util.concurrent.ThreadLocalRandom;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import zzangdol.moodoodlecommon.exception.custom.VerificationCodeException;
-import zzangdol.response.status.ErrorStatus;
+import zzangdol.exception.custom.VerificationCodeException;
 import zzangdol.redis.dao.VerificationCodeRepository;
 import zzangdol.redis.domain.VerificationCode;
+import zzangdol.response.status.ErrorStatus;
 
 @RequiredArgsConstructor
 @Service

diff --git a/moodoodle-api/src/main/java/zzangdol/diary/implement/DiaryCommandServiceImpl.java b/moodoodle-api/src/main/java/zzangdol/diary/implement/DiaryCommandServiceImpl.java
@@ -1,5 +1,6 @@
 package zzangdol.diary.implement;
 
+import groovy.util.logging.Slf4j;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -10,14 +11,16 @@
 import zzangdol.diary.domain.Diary;
 import zzangdol.diary.domain.DiaryEmotion;
 import zzangdol.diary.domain.Painting;
-import zzangdol.emotion.domain.Emotion;
 import zzangdol.diary.presentation.dto.request.DiaryCreateRequest;
 import zzangdol.diary.presentation.dto.request.DiaryUpdateRequest;
-import zzangdol.moodoodlecommon.exception.custom.DiaryDateOutOfBoundsException;
-import zzangdol.moodoodlecommon.exception.custom.DiaryDuplicateDateException;
-import zzangdol.moodoodlecommon.exception.custom.DiaryNotFoundException;
+import zzangdol.emotion.domain.Emotion;
+import zzangdol.exception.custom.DiaryAccessDeniedException;
+import zzangdol.exception.custom.DiaryDateOutOfBoundsException;
+import zzangdol.exception.custom.DiaryDuplicateDateException;
+import zzangdol.exception.custom.DiaryNotFoundException;
 import zzangdol.user.domain.User;
 
+@Slf4j
 @RequiredArgsConstructor
 @Transactional
 @Service
@@ -27,26 +30,26 @@ public class DiaryCommandServiceImpl implements DiaryCommandService {
 
     @Override
     public Diary createDiary(User user, DiaryCreateRequest request, String color,
-                                           List<Emotion> emotions) {
+                             List<Emotion> emotions) {
         validateDiaryDate(request.getDate());
         checkDiaryDuplication(user, request.getDate());
         Painting painting = buildPainting(request, color);
         Diary diary = buildDiary(user, request, emotions, painting);
         return diaryRepository.save(diary);
     }
 
-    private void checkDiaryDuplication(User user, LocalDateTime date) {
-        if (diaryRepository.existsByDateAndUserId(date, user.getId())) {
-            throw DiaryDuplicateDateException.EXCEPTION;
-        }
-    }
-
     private void validateDiaryDate(LocalDateTime date) {
         if (date.toLocalDate().isAfter(LocalDate.now())) {
             throw DiaryDateOutOfBoundsException.EXCEPTION;
         }
     }
 
+    private void checkDiaryDuplication(User user, LocalDateTime date) {
+        if (diaryRepository.existsByDateAndUserId(date, user.getId())) {
+            throw DiaryDuplicateDateException.EXCEPTION;
+        }
+    }
+
     private Diary buildDiary(User user, DiaryCreateRequest request, List<Emotion> emotions, Painting painting) {
         Diary diary = Diary.builder()
                 .date(request.getDate())
@@ -78,14 +81,28 @@ private Painting buildPainting(DiaryCreateRequest request, String color) {
     public Diary updateDiary(User user, Long diaryId, DiaryUpdateRequest request) {
         Diary diary = diaryRepository.findById(diaryId)
                 .orElseThrow(() -> DiaryNotFoundException.EXCEPTION);
+        checkDiaryOwnership(user, diary);
+        if (request.getDate() != null) {
+            validateDiaryDate(request.getDate());
+            checkDiaryDuplication(user, request.getDate());
+        }
         diary.updateDate(request.getDate());
         diary.updateContent(request.getContent());
         return diary;
     }
 
     @Override
     public void deleteDiary(User user, Long diaryId) {
+        Diary diary = diaryRepository.findById(diaryId)
+                .orElseThrow(() -> DiaryNotFoundException.EXCEPTION);
+        checkDiaryOwnership(user, diary);
         diaryRepository.deleteById(diaryId);
     }
 
+    private void checkDiaryOwnership(User user, Diary diary) {
+        if (!diary.getUser().getId().equals(user.getId())) {
+            throw DiaryAccessDeniedException.EXCEPTION;
+        }
+    }
+
 }
diff --git a/moodoodle-api/src/main/java/zzangdol/diary/implement/DiaryQueryServiceImpl.java b/moodoodle-api/src/main/java/zzangdol/diary/implement/DiaryQueryServiceImpl.java
@@ -7,8 +7,8 @@
 import zzangdol.diary.dao.DiaryRepository;
 import zzangdol.diary.dao.querydsl.DiaryQueryRepository;
 import zzangdol.diary.domain.Diary;
-import zzangdol.moodoodlecommon.exception.custom.DiaryAccessDeniedException;
-import zzangdol.moodoodlecommon.exception.custom.DiaryNotFoundException;
+import zzangdol.exception.custom.DiaryAccessDeniedException;
+import zzangdol.exception.custom.DiaryNotFoundException;
 import zzangdol.user.domain.User;
 
 @RequiredArgsConstructor

diff --git a/moodoodle-api/src/main/java/zzangdol/global/annotation/AuthenticationArgumentResolver.java b/moodoodle-api/src/main/java/zzangdol/global/annotation/AuthenticationArgumentResolver.java
@@ -11,12 +11,12 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
-import zzangdol.moodoodlecommon.exception.custom.InvalidTokenException;
-import zzangdol.user.domain.User;
+import zzangdol.exception.GeneralException;
+import zzangdol.exception.custom.InvalidTokenException;
 import zzangdol.jwt.JwtProvider;
-import zzangdol.user.implement.UserQueryService;
-import zzangdol.moodoodlecommon.exception.GeneralException;
 import zzangdol.response.status.ErrorStatus;
+import zzangdol.user.domain.User;
+import zzangdol.user.implement.UserQueryService;
 
 @RequiredArgsConstructor
 @Component

diff --git a/moodoodle-api/src/main/java/zzangdol/global/config/ExceptionAdvice.java b/moodoodle-api/src/main/java/zzangdol/global/config/ExceptionAdvice.java
@@ -17,7 +17,7 @@
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
-import zzangdol.moodoodlecommon.exception.GeneralException;
+import zzangdol.exception.GeneralException;
 import zzangdol.response.ResponseDto;
 import zzangdol.response.status.ErrorStatus;
 

diff --git a/moodoodle-api/src/main/java/zzangdol/jwt/JwtProvider.java b/moodoodle-api/src/main/java/zzangdol/jwt/JwtProvider.java
@@ -21,11 +21,11 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
-import zzangdol.moodoodlecommon.exception.custom.ExpiredTokenException;
-import zzangdol.moodoodlecommon.exception.custom.InvalidTokenException;
-import zzangdol.user.domain.User;
-import zzangdol.moodoodlecommon.exception.GeneralException;
+import zzangdol.exception.GeneralException;
+import zzangdol.exception.custom.ExpiredTokenException;
+import zzangdol.exception.custom.InvalidTokenException;
 import zzangdol.response.status.ErrorStatus;
+import zzangdol.user.domain.User;
 
 @Component
 public class JwtProvider {

diff --git a/moodoodle-api/src/main/java/zzangdol/jwt/JwtService.java b/moodoodle-api/src/main/java/zzangdol/jwt/JwtService.java
@@ -3,13 +3,13 @@
 import io.jsonwebtoken.Claims;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import zzangdol.user.dao.UserRepository;
-import zzangdol.user.domain.User;
-import zzangdol.moodoodlecommon.exception.GeneralException;
-import zzangdol.moodoodlecommon.exception.custom.UserNotFoundException;
-import zzangdol.response.status.ErrorStatus;
+import zzangdol.exception.GeneralException;
+import zzangdol.exception.custom.UserNotFoundException;
 import zzangdol.redis.dao.RefreshTokenRepository;
 import zzangdol.redis.domain.RefreshToken;
+import zzangdol.response.status.ErrorStatus;
+import zzangdol.user.dao.UserRepository;
+import zzangdol.user.domain.User;
 
 @RequiredArgsConstructor
 @Service

diff --git a/moodoodle-api/src/main/java/zzangdol/user/implement/UserQueryServiceImpl.java b/moodoodle-api/src/main/java/zzangdol/user/implement/UserQueryServiceImpl.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import zzangdol.moodoodlecommon.exception.custom.UserNotFoundException;
+import zzangdol.exception.custom.UserNotFoundException;
 import zzangdol.user.dao.UserRepository;
 import zzangdol.user.domain.User;
 

diff --git a/...odleapi/MoodoodleApiApplicationTests.java → ...zangdol/MoodoodleApiApplicationTests.java b/...odleapi/MoodoodleApiApplicationTests.java → ...zangdol/MoodoodleApiApplicationTests.java
@@ -1,4 +1,4 @@
-package zzangdol.moodoodleapi;
+package zzangdol;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;