{refactor} 코드 리팩토링

{refactor} 코드 리팩토링

Author: JayongLee

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/controller/GroupController.java

@@ -7,6 +7,7 @@
 import MathCaptain.weakness.Group.dto.response.GroupMemberListResponseDto;
 import MathCaptain.weakness.Group.dto.response.GroupResponseDto;
 import MathCaptain.weakness.Group.dto.response.RelationResponseDto;
+import MathCaptain.weakness.Group.enums.RequestStatus;
 import MathCaptain.weakness.Group.service.GroupJoinService;
 import MathCaptain.weakness.Notification.service.NotificationService;
 import MathCaptain.weakness.User.domain.UserDetailsImpl;
@@ -29,6 +30,10 @@
 @RequiredArgsConstructor
 public class GroupController {
 
+    public static final RequestStatus ACCEPTED = RequestStatus.ACCEPTED;
+    public static final RequestStatus REJECTED = RequestStatus.REJECTED;
+    public static final RequestStatus CANCELED = RequestStatus.CANCELED;
+
     private final GroupService groupService;
     private final RelationService relationService;
     private final GroupJoinService groupJoinService;
@@ -67,8 +72,8 @@ public ApiResponse<GroupResponseDto> updateGroup(@Valid @PathVariable Long group
     public ApiResponse<?> joinGroup(@Valid @PathVariable Long groupId,
                                     @LoginUser Users loginUser,
                                     @RequestBody GroupJoinRequestDto groupJoinRequestDto) {
-        Long groupJoinId = groupJoinService.joinGroupRequest(groupId, loginUser, groupJoinRequestDto);
-        notificationService.notifyGroupJoinRequest(groupId, loginUser, groupJoinId);
+        groupJoinService.joinGroupRequest(groupId, loginUser, groupJoinRequestDto);
+        notificationService.notifyGroupJoinRequest(groupId, loginUser);
         return ApiResponse.ok("그룹 가입 요청이 완료되었습니다.");
     }
 
@@ -82,25 +87,26 @@ public ApiResponse<?> deleteGroup(@PathVariable Long groupId) {
     ///  그룹 가입
 
     // 그룹 가입 요청 수락
-    @PostMapping("/group/join/accept/{groupId}/{joinRequestId}")
-    public ApiResponse<?> acceptJoinRequest(@PathVariable Long groupId, @PathVariable Long joinRequestId) {
-        groupJoinService.acceptJoinRequest(groupId, joinRequestId);
-        notificationService.notifyGroupJoinResult(groupId, joinRequestId);
+    @PostMapping("/group/join/accept/{groupId}")
+    public ApiResponse<?> acceptJoinRequest(@PathVariable Long groupId, @LoginUser Users loginUser) {
+        groupJoinService.changeStatus(groupId, loginUser, ACCEPTED);
+        notificationService.notifyGroupJoinResult(groupId, loginUser);
         return ApiResponse.ok("그룹 가입 요청이 수락되었습니다.");
     }
 
     // 그룹 가입 요청 거절
-    @PostMapping("/group/join/reject/{groupId}/{joinRequestId}")
-    public ApiResponse<?> rejectJoinRequest(@PathVariable("groupId") Long groupId, @PathVariable("joinRequestId") Long joinRequestId) {
-        groupJoinService.rejectJoinRequest(joinRequestId);
-        notificationService.notifyGroupJoinResult(groupId, joinRequestId);
+    @PostMapping("/group/join/reject/{groupId}")
+    public ApiResponse<?> rejectJoinRequest(@PathVariable Long groupId, @LoginUser Users loginUser) {
+        groupJoinService.changeStatus(groupId, loginUser, REJECTED);
+        notificationService.notifyGroupJoinResult(groupId, loginUser);
         return ApiResponse.ok("그룹 가입 요청이 거절되었습니다.");
     }
 
     // 그룹 가입 요청 취소
-    @DeleteMapping("/group/join/cancel/{joinRequestId}")
-    public ApiResponse<?> cancelJoinRequest(@PathVariable Long joinRequestId) {
-        return groupJoinService.cancelJoinRequest(joinRequestId);
+    @DeleteMapping("/group/join/cancel/{groupId}")
+    public ApiResponse<?> cancelJoinRequest(@PathVariable Long groupId, @LoginUser Users loginUser) {
+        groupJoinService.changeStatus(groupId, loginUser, CANCELED);
+        return ApiResponse.ok("그룹 가입 요청이 취소되었습니다.");
     }
 
     // 그룹 가입 요청 조회

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/Group.java

@@ -29,11 +29,7 @@ public class Group {
     @Column(name = "group_id")
     private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "leader")
-    private Users leader;
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "joinGroup", cascade = CascadeType.REMOVE)
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "group", cascade = CascadeType.REMOVE)
     @Column(name = "members")
     private List<RelationBetweenUserAndGroup> relationBetweenUserAndGroup;
 
@@ -66,7 +62,7 @@ public class Group {
     @CollectionTable(name = "group_weekly_goal_achieve", joinColumns = @JoinColumn(name = "group_id"))
     @MapKeyColumn(name = "day_of_week") // 요일을 키로 사용
     @Column(name = "goal_count") // 카운트를 값으로 사용
-    private Map<DayOfWeek, Integer> weeklyGoalAchieve;
+    private Map<DayOfWeek, Integer> weeklyGoalAchieveMap;
 
     @OneToMany(mappedBy = "recruitGroup")
     private List<Recruitment> recruitments;
@@ -75,11 +71,11 @@ public class Group {
     protected void onCreate() {
         this.createDate = LocalDate.now();
 
-        if (this.weeklyGoalAchieve == null) {
-            this.weeklyGoalAchieve = new EnumMap<>(DayOfWeek.class);
+        if (this.weeklyGoalAchieveMap == null) {
+            this.weeklyGoalAchieveMap = new EnumMap<>(DayOfWeek.class);
         }
         for (DayOfWeek dayOfWeek : DayOfWeek.values()) {
-            weeklyGoalAchieve.put(dayOfWeek, 0);
+            weeklyGoalAchieveMap.put(dayOfWeek, 0);
         }
     }
 
@@ -127,8 +123,8 @@ public void updateGroupRanking(int groupRanking) {
         this.groupRanking = groupRanking;
     }
 
-    public void updateWeeklyGoalAchieve(DayOfWeek dayOfWeek, int goalCount) {
-        weeklyGoalAchieve.put(dayOfWeek, goalCount);
+    public void updateWeeklyGoalAchieveMap(DayOfWeek dayOfWeek, int goalCount) {
+        weeklyGoalAchieveMap.put(dayOfWeek, goalCount);
     }
 
     public void updateGroup(GroupUpdateRequestDto requestDto) {
@@ -143,13 +139,13 @@ public boolean checkJoin(int dailyGoal, int weeklyGoal) {
         return dailyGoal >= minDailyHours && weeklyGoal >= minWeeklyDays;
     }
 
-    public void increaseWeeklyGoalAchieve(DayOfWeek day) {
-        weeklyGoalAchieve.put(day, weeklyGoalAchieve.get(day) + 1);
+    public void increaseWeeklyGoalAchieveMap(DayOfWeek day) {
+        weeklyGoalAchieveMap.put(day, weeklyGoalAchieveMap.get(day) + 1);
     }
 
-    public void resetWeeklyGoalAchieve() {
+    public void resetWeeklyGoalAchieveMap() {
         for (DayOfWeek dayOfWeek : DayOfWeek.values()) {
-            weeklyGoalAchieve.put(dayOfWeek, 0);
+            weeklyGoalAchieveMap.put(dayOfWeek, 0);
         }
     }
 

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/GroupJoin.java

@@ -1,23 +1,18 @@
 package MathCaptain.weakness.Group.domain;
 
 import MathCaptain.weakness.Group.enums.GroupRole;
+import MathCaptain.weakness.Group.enums.RequestStatus;
 import MathCaptain.weakness.User.domain.Users;
 import jakarta.persistence.*;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.hibernate.validator.constraints.Range;
 
-import java.time.DayOfWeek;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Entity
 @Getter
 @Builder
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Table(name = "RELATION_BETWEEN_USER_AND_GROUP")
 public class RelationBetweenUserAndGroup {
@@ -28,20 +23,22 @@ public class RelationBetweenUserAndGroup {
     private Long id;
 
     @ManyToOne(cascade = CascadeType.REMOVE)
-    @JoinColumn(name = "member")
+    @JoinColumn(name = "member", referencedColumnName = "user_id")
     private Users member;
 
+    @ManyToOne(cascade = CascadeType.REMOVE)
+    @JoinColumn(name = "members")
+    private Group group;
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     private GroupRole groupRole;
 
-    @ManyToOne(cascade = CascadeType.REMOVE)
-    @JoinColumn(name = "joinGroup")
-    private Group joinGroup;
-
     @Column(nullable = false)
     private LocalDate joinDate;
 
+    private RequestStatus requestStatus;
+
     @Column(nullable = false)
     @Range(min = 0, max = 24)
     private int personalDailyGoal;
@@ -54,14 +51,10 @@ public class RelationBetweenUserAndGroup {
     @Range(min = 0, max = 1440)
     private Long personalDailyGoalAchieve;
 
-    // 주간 인증 수행 시간
+    // 주간 인증 수행 일수
     @Range(min = 0, max = 7)
     private int personalWeeklyGoalAchieve;
 
-    private Boolean isWeeklyGoalAchieved;
-
-    private Boolean isDailyGoalAchieved;
-
     // 주간 목표 달성 연속 횟수
     @Range(min = 0)
     private int weeklyGoalAchieveStreak;
@@ -77,19 +70,27 @@ protected void onPrePersist() {
             this.joinDate = LocalDate.now(); // joinDate의 기본값 설정 (필요 시)
         }
 
-        if (this.isWeeklyGoalAchieved == null) {
-            this.isWeeklyGoalAchieved = false;
-        }
+        this.requestStatus = RequestStatus.WAITING;
 
-        if (this.isDailyGoalAchieved == null) {
-            this.isDailyGoalAchieved = false;
-        }
         this.personalWeeklyGoalAchieve = 0;
         this.weeklyGoalAchieveStreak = 0;
         this.personalDailyGoalAchieve = 0L;
 
     }
 
+    public void subtractPoint(Long point) {
+        this.member.subtractPoint(point);
+        this.group.subtractPoint(point);
+    }
+
+    public boolean isDailyGoalAchieved() {
+        return this.personalDailyGoalAchieve >= this.personalDailyGoal;
+    }
+
+    public boolean isWeeklyGoalAchieved() {
+        return this.personalWeeklyGoalAchieve >= this.personalWeeklyGoal;
+    }
+
     // 일간 목표 업데이트
     public void updatePersonalDailyGoalAchieved(Long personalDailyGoalAchieved) {
         this.personalDailyGoalAchieve = personalDailyGoalAchieved;
@@ -115,26 +116,13 @@ public void resetPersonalWeeklyGoalAchieve() {
         this.personalWeeklyGoalAchieve = 0;
     }
 
-    // 주간 목표 달성 여부 초기화
-    public void resetIsWeeklyGoalAchieved() {
-        this.isWeeklyGoalAchieved = false;
-    }
-
-    // 일간 목표 달성 여부 초기화
-    public void resetIsDailyGoalAchieved() {
-        this.isDailyGoalAchieved = false;
-    }
-
     // 주간 목표 달성 연속 횟수 초기화
     public void resetWeeklyGoalAchieveStreak() {
         this.weeklyGoalAchieveStreak = 0;
     }
 
-    public boolean isWeeklyGoalAchieved() {
-        return this.isWeeklyGoalAchieved;
+    public void updateRequestStatus(RequestStatus requestStatus) {
+        this.requestStatus = requestStatus;
     }
 
-    public boolean isDailyGoalAchieved() {
-        return this.isDailyGoalAchieved;
-    }
 }

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/RelationBetweenUserAndGroup.java

@@ -31,5 +31,5 @@ public class GroupMemberListResponseDto {
 
     private int currentProgress;
 
-    private Boolean isAchieveWeeklyGoal;
+    private Boolean isWeeklyGoalAchieved;
 }