{feat} 그룹 상세 정보에 삽입할 데이터 추가

{feat} 그룹 상세 정보에 삽입할 데이터 추가

Author: JayongLee

Dockerfile

@@ -1,4 +1,8 @@
-FROM amazoncorretto:17
+FROM amazoncorretto:17-alpine
+
+RUN apk update && apk add --no-cache curl
+
+WORKDIR /app
 
 EXPOSE 8080
 

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

@@ -65,7 +65,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 = new EnumMap<>(DayOfWeek.class);
+    private Map<DayOfWeek, Integer> weeklyGoalAchieve;
 
     @OneToMany(mappedBy = "recruitGroup")
     private List<Recruitment> recruitments;

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupDetailResponseDto.java

@@ -33,5 +33,7 @@ public class GroupDetailResponseDto {
 
     private Map<DayOfWeek, Integer> weeklyGoalAchieve;
 
+    private Integer totalWeeklyGoalCount;
+
     private Long memberCount;
 }

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupMemberListResponseDto.java

@@ -26,5 +26,10 @@ public class GroupMemberListResponseDto {
     @NotNull
     private int userWeeklyGoal;
 
+    @NotNull
+    private int userDailyGoal;
+
+    private int currentProgress;
+
     private Boolean isAchieveWeeklyGoal;
 }

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/repository/RelationRepository.java

@@ -30,6 +30,9 @@ public interface RelationRepository extends JpaRepository<RelationBetweenUserAnd
     @Query("SELECT r.joinGroup.id FROM RelationBetweenUserAndGroup r WHERE r.member = :user")
     List<Long> findGroupsIdByMember(@Param("user") Users user);
 
+    @Query("SELECT SUM(r.personalWeeklyGoal) FROM RelationBetweenUserAndGroup r WHERE r.joinGroup.id = :groupId")
+    Integer sumPersonalWeeklyGoalByGroupId(@Param("groupId") Long groupId);
+
     Optional<List<RelationBetweenUserAndGroup>> findAllByMember_Email(String email);
 
     Optional<RelationBetweenUserAndGroup> findByMember_EmailAndJoinGroup_Id(String memberEmail, Long joinGroupId);

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/GroupService.java

@@ -8,6 +8,7 @@
 import MathCaptain.weakness.Group.dto.response.GroupDetailResponseDto;
 import MathCaptain.weakness.Group.dto.response.GroupResponseDto;
 import MathCaptain.weakness.Group.dto.response.UserGroupCardResponseDto;
+import MathCaptain.weakness.Record.repository.RecordRepository;
 import MathCaptain.weakness.Record.service.RecordService;
 import MathCaptain.weakness.User.domain.UserDetailsImpl;
 import MathCaptain.weakness.User.dto.response.UserResponseDto;
@@ -27,6 +28,7 @@
 
 import java.time.DayOfWeek;
 import java.time.LocalDateTime;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -38,6 +40,7 @@ public class GroupService {
 
     private final GroupRepository groupRepository;
     private final RelationRepository relationRepository;
+    private final RecordRepository recordRepository;
     private final RelationService relationService;
     private final RecordService recordService;
 
@@ -114,9 +117,11 @@ public GroupDetailResponseDto getGroupDetail(Long groupId) {
         Group group = groupRepository.findById(groupId)
                 .orElseThrow(() -> new ResourceNotFoundException("해당 그룹이 없습니다."));
 
+        Integer totalWeeklyGoalCount = relationRepository.sumPersonalWeeklyGoalByGroupId(groupId);
+
         Long memberCount = relationRepository.countByJoinGroup_Id(groupId);
 
-        return buildGroupDetailResponseDto(group, memberCount);
+        return buildGroupDetailResponseDto(group, memberCount, totalWeeklyGoalCount);
     }
 
     public ApiResponse<List<GroupResponseDto>> getUsersGroups(Users user) {
@@ -248,7 +253,7 @@ private Group buildGroup(Users leader, GroupCreateRequestDto groupCreateRequestD
                 .build();
     }
 
-    private GroupDetailResponseDto buildGroupDetailResponseDto(Group group, Long memberCount) {
+    private GroupDetailResponseDto buildGroupDetailResponseDto(Group group, Long memberCount, Integer totalWeeklyGoalCount) {
         return GroupDetailResponseDto.builder()
                 .groupId(group.getId())
                 .groupName(group.getName())
@@ -261,6 +266,7 @@ private GroupDetailResponseDto buildGroupDetailResponseDto(Group group, Long mem
                 .hashtags(group.getHashtags())
                 .groupImageUrl(group.getGroupImageUrl())
                 .weeklyGoalAchieve(group.getWeeklyGoalAchieve())
+                .totalWeeklyGoalCount(totalWeeklyGoalCount)
                 .memberCount(memberCount)
                 .build();
     }

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/RelationService.java

@@ -7,6 +7,7 @@
 import MathCaptain.weakness.Group.dto.response.GroupResponseDto;
 import MathCaptain.weakness.Group.dto.response.RelationResponseDto;
 import MathCaptain.weakness.Group.repository.GroupRepository;
+import MathCaptain.weakness.Record.repository.RecordRepository;
 import MathCaptain.weakness.User.dto.response.UserResponseDto;
 import MathCaptain.weakness.Group.enums.GroupRole;
 import MathCaptain.weakness.Group.repository.RelationRepository;
@@ -19,6 +20,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.DayOfWeek;
+import java.time.LocalDateTime;
+import java.time.temporal.TemporalAdjusters;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -29,6 +33,7 @@ public class RelationService {
 
     private final RelationRepository relationRepository;
     private final GroupRepository groupRepository;
+    private final RecordRepository recordRepository;
 
     // 그룹 탈퇴
     public ApiResponse<?> leaveGroup(Users user, Long groupId) {
@@ -70,20 +75,17 @@ public void saveRelation(Users member, Group group, GroupJoinRequestDto groupJoi
 
     // 그룹 멤버 리스트 (그룹 상세 페이지)
     public List<GroupMemberListResponseDto> getGroupMemberList(Long groupId) {
-
+        // 그룹 멤버 관계 조회
         List<RelationBetweenUserAndGroup> relations = relationRepository.findAllByJoinGroup_id(groupId)
                 .orElseThrow(() -> new ResourceNotFoundException("해당 그룹에 멤버가 없습니다."));
 
+        // 이번 주의 시작과 끝 시간 계산
+        LocalDateTime startOfWeek = LocalDateTime.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+        LocalDateTime endOfWeek = startOfWeek.plusWeeks(1);
+
+        // 멤버 리스트 생성
         return relations.stream()
-                .map(relation -> GroupMemberListResponseDto.builder()
-                        .userId(relation.getMember().getUserId())
-                        .userName(relation.getMember().getName())
-//                        .userImage(relation.getMember().getImage())
-                        .userRole(relation.getGroupRole())
-                        .userPoint(relation.getMember().getUserPoint())
-                        .userWeeklyGoal(relation.getPersonalWeeklyGoal())
-                        .isAchieveWeeklyGoal(relation.getIsWeeklyGoalAchieved())
-                        .build())
+                .map(relation -> mapToGroupMemberListResponseDto(relation, startOfWeek, endOfWeek))
                 .collect(Collectors.toList());
     }
 
@@ -131,6 +133,30 @@ public RelationResponseDto getRelationInfo(Long relationId) {
 
     /// 빌드
 
+    private GroupMemberListResponseDto mapToGroupMemberListResponseDto(RelationBetweenUserAndGroup relation, LocalDateTime startOfWeek, LocalDateTime endOfWeek) {
+        // 기록 리포지토리에서 현재 진행 상황 가져오기 (null 방지)
+        Integer currentProgress = recordRepository.countDailyGoalAchieved(
+                relation.getJoinGroup().getId(),
+                relation.getMember().getUserId(),
+                startOfWeek,
+                endOfWeek
+        ).orElse(0);
+
+        // DTO 빌드 및 반환
+        return GroupMemberListResponseDto.builder()
+                .userId(relation.getMember().getUserId())
+                .userName(relation.getMember().getName())
+                //.userImage(relation.getMember().getImage()) // 주석 유지 또는 복원 필요 시 활성화
+                .userRole(relation.getGroupRole())
+                .userPoint(relation.getMember().getUserPoint())
+                .userWeeklyGoal(relation.getPersonalWeeklyGoal())
+                .userDailyGoal(relation.getPersonalDailyGoal())
+                .isAchieveWeeklyGoal(relation.getIsWeeklyGoalAchieved())
+                .currentProgress(currentProgress)
+                .build();
+    }
+
+
     private RelationBetweenUserAndGroup buildLeaderRelation(Users leader, Group group, int dailyGoal, int weeklyGoal) {
         return RelationBetweenUserAndGroup.builder()
                 .member(leader)

MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/repository/RecordRepository.java

@@ -26,4 +26,15 @@ List<DayOfWeek> findDaysWithActivity(
             @Param("group") Group group,
             @Param("startOfWeek") LocalDateTime startOfWeek,
             @Param("endOfWeek") LocalDateTime endOfWeek);
+
+    // 이번주에 그룹원이 수행한 인증의 횟수
+    @Query("SELECT SUM (CASE WHEN ar.dailyGoalAchieved = true THEN 1 ELSE 0 END) " +
+            "FROM ActivityRecord ar " +
+            "WHERE ar.group.id = :groupId " +
+            "AND ar.user.userId = :userId " +
+            "AND ar.startTime >= :startOfWeek AND ar.startTime < :endOfWeek")
+    Optional<Integer> countDailyGoalAchieved(@Param("groupId") Long groupId,
+                                   @Param("userId") Long userId,
+                                   @Param("startOfWeek") LocalDateTime startOfWeek,
+                                   @Param("endOfWeek") LocalDateTime endOfWeek);
 }