Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-project/WEB6_8_ENDKOCHGIL_BE into feat/mission

parkjioh · parkjioh · commit abd50e3f4924 · 2025-10-10T15:05:51.000+09:00
diff --git a/backend/src/main/java/com/back/domain/item/entity/ItemType.java b/backend/src/main/java/com/back/domain/item/entity/ItemType.java
@@ -1,8 +1,8 @@
 package com.back.domain.item.entity;
 
 public enum ItemType {
-    AVATAR,
-    FURNITURE,
-    CLOTHE,
-    BACKGROUND,
+    NATURE,
+    FESTIVAL,
+    SPORTS,
+    SPECIAL
 }
diff --git a/backend/src/main/java/com/back/domain/member/controller/ApiV1MemberController.java b/backend/src/main/java/com/back/domain/member/controller/ApiV1MemberController.java
@@ -157,23 +157,23 @@ public ResponseEntity<ApiResponse<MemberDto>> modifyProfile(
                 );
     }
 
-    public record PasswordReqDto(String password) {}
-    @PutMapping("/modify/password")
-    @Operation(summary = "[Test] 비밀번호 변경", description = "비밀번호 변경")
-    public ResponseEntity<ApiResponse<Void>> modifyPassword(
-            @Valid @RequestBody PasswordReqDto reqBody
-    ) {
-        Member actor = rq.getActorFromDb();
-        memberService.modifyPassword(actor, reqBody.password());
-
-        return ResponseEntity
-                .status(HttpStatus.OK)
-                .body(new ApiResponse<>(
-                                "200",
-                                "[Member] Success: 비밀번호 변경"
-                        )
-                );
-    }
+//    public record PasswordReqDto(String password) {}
+//    @PutMapping("/modify/password")
+//    @Operation(summary = "[Test] 비밀번호 변경", description = "비밀번호 변경")
+//    public ResponseEntity<ApiResponse<Void>> modifyPassword(
+//            @Valid @RequestBody PasswordReqDto reqBody
+//    ) {
+//        Member actor = rq.getActorFromDb();
+//        memberService.modifyPassword(actor, reqBody.password());
+//
+//        return ResponseEntity
+//                .status(HttpStatus.OK)
+//                .body(new ApiResponse<>(
+//                                "200",
+//                                "[Member] Success: 비밀번호 변경"
+//                        )
+//                );
+//    }
 
     @GetMapping("/me")
     @Operation(summary = "회원 정보 확인", description = "현재 로그인된 사용자 정보 확인")
@@ -326,4 +326,19 @@ public ResponseEntity<ApiResponse<MemberDto>> obtainTitle(
                         )
                 );
     }
+
+    @GetMapping("/me/statistic")
+    @Operation(summary = "회원 통계 확인", description = "클리어한 미션 카운트")
+    public ResponseEntity<ApiResponse<StatisticDto>> meStatistic() {
+        Member actor = rq.getActorFromDb();
+
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ApiResponse<>(
+                                "200",
+                                "[Member] Success: 사용자 통계 확인 (%s)".formatted(actor.getEmail()),
+                                new StatisticDto(actor.getStatistic())
+                        )
+                );
+    }
 }
diff --git a/backend/src/main/java/com/back/domain/member/dto/StatisticDto.java b/backend/src/main/java/com/back/domain/member/dto/StatisticDto.java
@@ -0,0 +1,17 @@
+package com.back.domain.member.dto;
+
+import com.back.domain.member.entity.MemberStatistic;
+
+public record StatisticDto(
+        int countDaily,
+        int countWeekly,
+        int countChallenge
+) {
+    public StatisticDto(MemberStatistic statistic) {
+        this(
+                statistic.getCountDaily(),
+                statistic.getCountWeekly(),
+                statistic.getCountChallenge()
+        );
+    }
+}
diff --git a/backend/src/main/java/com/back/domain/member/entity/Member.java b/backend/src/main/java/com/back/domain/member/entity/Member.java
@@ -52,6 +52,8 @@ public class Member extends BaseEntity {
     private MemberRole role = MemberRole.USER;
     private String apiKey = null;
     private String socialAccessToken = null;
+    @OneToOne(cascade = CascadeType.ALL)
+    private MemberStatistic statistic;
 
     //생성자(회원 가입)
     public Member(String email, String password, String name) {
diff --git a/backend/src/main/java/com/back/domain/member/entity/MemberStatistic.java b/backend/src/main/java/com/back/domain/member/entity/MemberStatistic.java
@@ -0,0 +1,36 @@
+package com.back.domain.member.entity;
+
+import com.back.global.jpa.entity.BaseEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToOne;
+import lombok.*;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class MemberStatistic extends BaseEntity {
+    @OneToOne
+    private Member member;
+
+    private int countDaily = 0;
+    private int countWeekly = 0;
+    private int countChallenge = 0;
+
+    public MemberStatistic(Member member) {
+        this.member = member;
+    }
+
+    public void clearDaily() {
+        this.countDaily++;
+    }
+
+    public void clearWeekly() {
+        this.countWeekly++;
+    }
+
+    public void clearChallenge() {
+        this.countChallenge++;
+    }
+}
diff --git a/backend/src/main/java/com/back/domain/member/repository/MemberStatisticRepository.java b/backend/src/main/java/com/back/domain/member/repository/MemberStatisticRepository.java
@@ -0,0 +1,8 @@
+package com.back.domain.member.repository;
+
+import com.back.domain.member.entity.MemberStatistic;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MemberStatisticRepository extends JpaRepository<MemberStatistic, Integer> {
+
+}
diff --git a/backend/src/main/java/com/back/domain/member/service/MemberService.java b/backend/src/main/java/com/back/domain/member/service/MemberService.java
@@ -5,6 +5,7 @@
 import com.back.domain.item.repository.ItemRepository;
 import com.back.domain.member.entity.Member;
 import com.back.domain.member.entity.MemberGender;
+import com.back.domain.member.entity.MemberStatistic;
 import com.back.domain.member.repository.MemberRepository;
 import com.back.domain.title.entity.Title;
 import com.back.domain.title.repository.TitleRepository;
@@ -26,6 +27,7 @@
 public class MemberService {
     private final PasswordEncoder passwordEncoder;
     private final AuthService authService;
+    private final MemberStatisticService memberStatisticService;
     private final MemberRepository memberRepository;
     private final ItemRepository itemRepository;
     private final TitleRepository titleRepository;
@@ -39,6 +41,8 @@ public Member signup(String email, String password, String name) {
 
         password = passwordEncoder.encode(password);
         Member member = new Member(email, password, name);
+        MemberStatistic memberStatistic = memberStatisticService.create(member);
+        member.setStatistic(memberStatistic);
 
         return memberRepository.save(member);
     }
@@ -87,6 +91,7 @@ public void genCode(Member member) {
 
     //회원 탈퇴
     public void delete(Member member) {
+        memberStatisticService.delete(member);
         memberRepository.delete(member);
     }
 
@@ -135,11 +140,20 @@ public void unequipTitle(Member member) {
         member.setTitle(null);
     }
 
-    // *** Modify 메서드 ***
-    public void modifyPassword(Member member, String password) {
-        member.setPassword(passwordEncoder.encode(password));
+    // *** 미션 클리어 카운트 ***
+    public void clearDaily(Member member) {
+        member.getStatistic().clearDaily();
+    }
+
+    public void clearWeekly(Member member) {
+        member.getStatistic().clearWeekly();
     }
 
+    public void clearChallenge(Member member) {
+        member.getStatistic().clearChallenge();
+    }
+
+    // *** Modify 메서드 ***
     public void modifyProfile(Member member, String name, LocalDate age, MemberGender gender) {
         member.setName(name);
         member.setBirth(age);
@@ -152,6 +166,10 @@ public void modifyStatus(Member member, int level, int xp, int money) {
         member.setMoney(money);
     }
 
+//    public void modifyPassword(Member member, String password) {
+//        member.setPassword(passwordEncoder.encode(password));
+//    }
+
     // *** Find 메서드 ***
     public Optional<Member> findById(int id) {
         return memberRepository.findById(id);
diff --git a/backend/src/main/java/com/back/domain/member/service/MemberStatisticService.java b/backend/src/main/java/com/back/domain/member/service/MemberStatisticService.java
@@ -0,0 +1,23 @@
+package com.back.domain.member.service;
+
+import com.back.domain.member.entity.Member;
+import com.back.domain.member.entity.MemberStatistic;
+import com.back.domain.member.repository.MemberStatisticRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class MemberStatisticService {
+    private final MemberStatisticRepository memberStatisticRepository;
+
+    public MemberStatistic create(Member member) {
+        return memberStatisticRepository.save(new MemberStatistic(member));
+    }
+
+    public void delete(Member member) {
+        memberStatisticRepository.delete(member.getStatistic());
+    }
+}
diff --git a/backend/src/main/java/com/back/domain/notification/dto/NotificationDto.java b/backend/src/main/java/com/back/domain/notification/dto/NotificationDto.java
@@ -7,19 +7,24 @@
 
 import java.time.LocalDateTime;
 
+
 public record NotificationDto(
         @NotNull int id,
         @NotNull int memberID,
         @NotNull NotificationType type,
-        @NotBlank  String message,
+        @NotBlank String message,
         @NotNull Boolean isRead,
         @NotNull LocalDateTime createDate,
         @NotNull LocalDateTime modifyDate
 
 ) {
 
-    public NotificationDto(Notification notification)
+    public LocalDateTime getCreateDate()
     {
+        return createDate;
+    }
+    public NotificationDto(Notification notification) {
+
         this(
                 notification.getId(),
                 notification.getMemberId(),
@@ -30,4 +35,5 @@ public NotificationDto(Notification notification)
                 notification.getModifyDate()
         );
     }
+
 }
diff --git a/backend/src/main/java/com/back/domain/notification/service/NotificationService.java b/backend/src/main/java/com/back/domain/notification/service/NotificationService.java
@@ -9,6 +9,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
 
 @Service
@@ -34,7 +35,9 @@ public NotificationDto findById(int id) {
     }
 
     public List<NotificationDto> findAll() {
-        return notificationRepository.findAll().stream().map(NotificationDto::new).toList();
+        return notificationRepository.findAll().stream().map(NotificationDto::new)
+                .sorted(Comparator.comparing(NotificationDto::getCreateDate).reversed())
+                .toList();
     }
 
     public void deleteNotification(int id) {
@@ -64,6 +67,7 @@ public List<NotificationDto> findByUserId(int userId) {
         return notificationRepository.findByMemberId(userId)
                 .stream()
                 .map(NotificationDto::new) // 생성자 참조
+                .sorted(Comparator.comparing(NotificationDto::getCreateDate).reversed())
                 .toList();
 
     }
@@ -72,6 +76,7 @@ public List<NotificationDto> findByUserIdAndIsRead(int userId, boolean isRead) {
         return notificationRepository.findByMemberIdAndIsRead(userId, isRead)
                 .stream()
                 .map(NotificationDto::new) // 생성자 참조
+                .sorted(Comparator.comparing(NotificationDto::getCreateDate).reversed())
                 .toList();
     }
 
diff --git a/backend/src/main/java/com/back/domain/title/dto/CreateTitleDto.java b/backend/src/main/java/com/back/domain/title/dto/CreateTitleDto.java
@@ -2,11 +2,13 @@
 
 public record CreateTitleDto(
         String content,
-        String achiveRequire
+        String achiveRequire,
+        String caption
 ) {
-    public CreateTitleDto(String content, String achiveRequire)
+    public CreateTitleDto(String content, String achiveRequire,      String caption)
     {
         this.content = content;
         this.achiveRequire = achiveRequire;
+        this.caption = caption;
     }
 }
diff --git a/backend/src/main/java/com/back/domain/title/dto/TitleDto.java b/backend/src/main/java/com/back/domain/title/dto/TitleDto.java
@@ -5,14 +5,17 @@
 public record TitleDto(
         int id,
         String contents,
-        String achiveRequire
+        String achiveRequire,
+        String caption
 ) {
     public TitleDto(Title title)
     {
         this(
             title.getId(),
             title.getContent(),
-            title.getAchieveRequire()
+            title.getAchieveRequire(),
+                title.getCaption()
+
         );
     }
 }
diff --git a/backend/src/main/java/com/back/domain/title/entity/Title.java b/backend/src/main/java/com/back/domain/title/entity/Title.java
@@ -13,11 +13,13 @@
 public class Title extends BaseEntity {
     String content;
     String achieveRequire;
+    String caption;
 
 
-    public Title(String content , String achieveRequire) {
+    public Title(String content , String achieveRequire  ,  String caption) {
         this.content = content;
         this.achieveRequire = achieveRequire;
+        this.caption = caption;
     }
 
 }
diff --git a/backend/src/main/java/com/back/domain/title/service/TitleService.java b/backend/src/main/java/com/back/domain/title/service/TitleService.java
@@ -20,7 +20,8 @@ public TitleDto  createTitle( CreateTitleDto createTitleDto)
     {
         return new TitleDto(titleRepository.save(new Title(
                 createTitleDto.content(),
-                createTitleDto.achiveRequire()
+                createTitleDto.achiveRequire(),
+                createTitleDto.caption()
         )));
     }
 
diff --git a/backend/src/main/java/com/back/global/initData/BaseInitData.java b/backend/src/main/java/com/back/global/initData/BaseInitData.java
diff --git a/backend/src/test/java/com/back/domain/item/ApiV1ItemControllerTest.java b/backend/src/test/java/com/back/domain/item/ApiV1ItemControllerTest.java
diff --git a/backend/src/test/java/com/back/domain/member/ApiV1MemberControllerTest.java b/backend/src/test/java/com/back/domain/member/ApiV1MemberControllerTest.java
diff --git a/backend/src/test/java/com/back/domain/title/ApiV1TitleControllerTest.java b/backend/src/test/java/com/back/domain/title/ApiV1TitleControllerTest.java
