Merge pull request #167 from Team-Smeme/unan_#165

[REFACTOR] 윤한 담당 API 리팩토링
Team-Smeme · Oct 31, 2023 · dd2412e · dd2412e
2 parents a0bdfab + 15a412a
commit dd2412e
Show file tree

Hide file tree

Showing 20 changed files with 198 additions and 126 deletions.
diff --git a/src/main/java/com/smeme/server/controller/BetaAuthController.java b/src/main/java/com/smeme/server/controller/BetaAuthController.java
@@ -23,6 +23,7 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/beta")
 @Tag(name = "BetaAuth", description = "베타 테스트용 인증 API")
+@Deprecated
 public class BetaAuthController {
 
     private final BetaAuthService betaAuthService;

diff --git a/src/main/java/com/smeme/server/controller/MemberController.java b/src/main/java/com/smeme/server/controller/MemberController.java
@@ -34,7 +34,7 @@ public class MemberController {
     @ApiResponses(value = {
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "사용자 정보 수정 성공")})
     @PatchMapping()
-    public ResponseEntity<ApiResponse> updateUserProfile(Principal principal, @RequestBody MemberUpdateRequestDTO request) {
+    public ResponseEntity<ApiResponse> updateProfile(Principal principal, @RequestBody MemberUpdateRequestDTO request) {
         MemberUpdateResponseDTO response = memberService.updateMember(getMemberId(principal), request);
         return ResponseEntity.ok(success(SUCCESS_UPDATE_USERNAME.getMessage(), response));
     }
@@ -44,8 +44,8 @@ public ResponseEntity<ApiResponse> updateUserProfile(Principal principal, @Reque
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "사용자 정보 수정 성공"
                     , content = @Content(schema = @Schema(implementation = MemberGetResponseDTO.class)))})
     @GetMapping("/me")
-    public ResponseEntity<ApiResponse> getUserProfile(Principal principal) {
-        MemberGetResponseDTO response = memberService.getMember(getMemberId(principal));
+    public ResponseEntity<ApiResponse> getProfile(Principal principal) {
+        MemberGetResponseDTO response = memberService.getProfile(getMemberId(principal));
         return ResponseEntity.ok(success(SUCCESS_GET_USER.getMessage(), response));
     }
 
@@ -73,7 +73,7 @@ public ResponseEntity<ApiResponse> checkDuplicatedName(@Parameter(description =
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "사용자 푸쉬 알람 동의 여부 수정 성공")})
     @PatchMapping("/push")
     public ResponseEntity<ApiResponse> updateUserPush(Principal principal, @RequestBody MemberPushUpdateRequestDTO request) {
-        memberService.updateMemberPush(getMemberId(principal), request);
+        memberService.updateHasAlarm(getMemberId(principal), request);
         return ResponseEntity.ok(success(SUCCESS_UPDATE_USER_PUSH.getMessage()));
     }
 

diff --git a/src/main/java/com/smeme/server/dto/auth/SignInResponseDTO.java b/src/main/java/com/smeme/server/dto/auth/SignInResponseDTO.java
@@ -1,6 +1,7 @@
 package com.smeme.server.dto.auth;
 
 
+import com.smeme.server.dto.auth.token.TokenVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 
@@ -17,4 +18,8 @@ public record SignInResponseDTO(
         boolean hasPlan
 ) {
 
+        public static SignInResponseDTO of(TokenVO tokenVO, boolean isRegistered, boolean hasPlan) {
+                return new SignInResponseDTO(tokenVO.accessToken(), tokenVO.refreshToken(), isRegistered, hasPlan);
+        }
+
 }
diff --git a/src/main/java/com/smeme/server/dto/member/MemberGetResponseDTO.java b/src/main/java/com/smeme/server/dto/member/MemberGetResponseDTO.java
@@ -1,6 +1,7 @@
 package com.smeme.server.dto.member;
 
 import com.smeme.server.dto.badge.BadgeResponseDTO;
+import com.smeme.server.dto.goal.GoalResponseDTO;
 import com.smeme.server.dto.training.TrainingTimeResponseDTO;
 import com.smeme.server.model.Member;
 import com.smeme.server.model.goal.Goal;
@@ -24,12 +25,12 @@ public record MemberGetResponseDTO(
         @Schema(description = "뱃지")
         BadgeResponseDTO badge) {
 
-    public static MemberGetResponseDTO of(Goal goal, Member member, TrainingTimeResponseDTO trainingTime, BadgeResponseDTO badge) {
+    public static MemberGetResponseDTO of(GoalResponseDTO goal, Member member, TrainingTimeResponseDTO trainingTime, BadgeResponseDTO badge) {
         return new MemberGetResponseDTO(
                 member.getUsername(),
                 member.getGoal().getDescription(),
-                goal.getWay(),
-                goal.getDetail(),
+                goal.way(),
+                goal.detail(),
                 member.getTargetLang().toString(),
                 member.isHasPushAlarm(),
                 trainingTime,

diff --git a/src/main/java/com/smeme/server/dto/training/TrainingTimeResponseDTO.java b/src/main/java/com/smeme/server/dto/training/TrainingTimeResponseDTO.java
@@ -2,7 +2,8 @@
 
 import lombok.Builder;
 
-@Builder
 public record TrainingTimeResponseDTO(String day, int hour, int minute) {
-
+    public static TrainingTimeResponseDTO of(String day, int hour, int minute) {
+        return new TrainingTimeResponseDTO(day, hour, minute);
+    }
 }
diff --git a/src/main/java/com/smeme/server/model/badge/MemberBadge.java b/src/main/java/com/smeme/server/model/badge/MemberBadge.java
@@ -13,6 +13,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -34,6 +35,8 @@ public class MemberBadge extends BaseTimeEntity {
     @JoinColumn(name = "badge_id")
     private Badge badge;
 
+
+    @Builder
     public MemberBadge(Member member, Badge badge) {
         setMember(member);
         this.badge = badge;

diff --git a/src/main/java/com/smeme/server/repository/diary/DiaryRepository.java b/src/main/java/com/smeme/server/repository/diary/DiaryRepository.java
@@ -1,5 +1,6 @@
 package com.smeme.server.repository.diary;
 
+import com.smeme.server.model.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.smeme.server.model.Diary;
@@ -8,7 +9,7 @@
 
 public interface DiaryRepository extends JpaRepository<Diary, Long>, DiaryCustomRepository {
 
-    void deleteAllByMemberId(Long id);
+    void deleteAllByMember(Member member);
 
     List<Diary> findAllByMemberId(Long memberId);
 }
diff --git a/src/main/java/com/smeme/server/repository/trainingTime/TrainingTimeRepository.java b/src/main/java/com/smeme/server/repository/trainingTime/TrainingTimeRepository.java
@@ -1,5 +1,6 @@
 package com.smeme.server.repository.trainingTime;
 
+import com.smeme.server.model.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.smeme.server.model.training.TrainingTime;
@@ -8,8 +9,8 @@
 
 public interface TrainingTimeRepository extends JpaRepository<TrainingTime, Long>, TrainingTimeCustomRepository {
 
-    List<TrainingTime> findAllByMemberId(Long memberId);
+    List<TrainingTime> findAllByMember(Member member);
 
-    void deleteAllByMemberId(Long id);
+    void deleteAllByMember(Member member);
 
 }
diff --git a/src/main/java/com/smeme/server/service/CorrectionService.java b/src/main/java/com/smeme/server/service/CorrectionService.java
@@ -55,6 +55,12 @@ public void update(Long id, CorrectionRequestDTO request) {
         correction.updateContent(request.content());
     }
 
+    @Transactional
+    public void deleteAllByDiaryId(Long diaryId) {
+        correctionRepository.deleteAllByDiaryId(diaryId);
+    }
+
+
     protected void deleteCorrections(List<Correction> corrections) {
         correctionRepository.deleteAll(corrections);
     }

diff --git a/src/main/java/com/smeme/server/service/DiaryService.java b/src/main/java/com/smeme/server/service/DiaryService.java
@@ -92,6 +92,15 @@ public void deleteByExpiredDate() {
         diaryRepository.findByExpiredDate().forEach(this::delete);
     }
 
+    @Transactional
+    public void deleteAllByMember(Member member) {
+        diaryRepository.deleteAllByMember(member);
+    }
+
+    public List<Diary> getAllByMemberId(Long memberId) {
+        return diaryRepository.findAllByMemberId(memberId);
+    }
+
     protected Diary get(Long id) {
         Diary diary = diaryRepository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException(INVALID_DIARY.getMessage()));

diff --git a/src/main/java/com/smeme/server/service/GoalService.java b/src/main/java/com/smeme/server/service/GoalService.java
@@ -31,6 +31,6 @@ public GoalsResponseDTO getAll() {
     public GoalResponseDTO getByType(GoalType goalType) {
         Goal goal = goalRepository.findOneByType(goalType)
                 .orElseThrow(() -> new EntityNotFoundException(EMPTY_GOAL.getMessage()));
-        return new GoalResponseDTO(goalType.getDescription(), goal.getWay(), goal.getDetail());
+        return new GoalResponseDTO(goal.getType().getDescription(), goal.getWay(), goal.getDetail());
     }
 }
diff --git a/src/main/java/com/smeme/server/service/MemberBadgeService.java b/src/main/java/com/smeme/server/service/MemberBadgeService.java
@@ -0,0 +1,34 @@
+package com.smeme.server.service;
+
+import com.smeme.server.model.Member;
+import com.smeme.server.model.badge.Badge;
+import com.smeme.server.model.badge.MemberBadge;
+import com.smeme.server.repository.badge.MemberBadgeRepository;
+import com.smeme.server.util.message.ErrorMessage;
+import jakarta.persistence.EntityNotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class MemberBadgeService {
+
+    private final MemberBadgeRepository memberBadgeRepository;
+
+    protected void save(Member member, Badge badge) {
+        MemberBadge memberBadge = MemberBadge.builder()
+                .member(member)
+                .badge(badge)
+                .build();
+        memberBadgeRepository.save(memberBadge);
+    }
+
+    public void deleteAllByMember(Member member) {
+        memberBadgeRepository.deleteAll(member.getBadges());
+    }
+
+    protected Badge getBadgeByMemberId(Long memberId) {
+        return memberBadgeRepository.findFirstByMemberIdOrderByCreatedAtDesc(memberId).orElseThrow(
+                () -> new EntityNotFoundException(ErrorMessage.EMPTY_BADGE.getMessage())).getBadge();
+    }
+}