Merge pull request #295 from Gamegoo-repo/feat/294

[Feat/294] 프로필 조회에 wantP 추가하기

src/main/generated/com/gamegoo/domain/member/QMember.java

@@ -80,6 +80,8 @@ public class QMember extends EntityPathBase<Member> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
 
+    public final NumberPath<Integer> wantPosition = createNumber("wantPosition", Integer.class);
+
     public final NumberPath<Double> winRate = createNumber("winRate", Double.class);
 
     public QMember(String variable) {

src/main/java/com/gamegoo/controller/member/ProfileController.java

@@ -57,8 +57,8 @@ public ApiResponse<String> modifyPosition(
         Long userId = JWTUtil.getCurrentUserId();
         int mainP = positionRequestDTO.getMainP();
         int subP = positionRequestDTO.getSubP();
-
-        profileService.modifyPosition(userId, mainP, subP);
+        int wantP = positionRequestDTO.getWantP();
+        profileService.modifyPosition(userId, mainP, subP, wantP);
 
         return ApiResponse.onSuccess("포지션 수정이 완료되었습니다. ");
     }

src/main/java/com/gamegoo/converter/MemberConverter.java

@@ -71,6 +71,7 @@ public static MemberResponse.myProfileMemberDTO toMyProfileDTO(Member member) {
             .manner(member.getMannerLevel())
             .mainP(member.getMainPosition())
             .subP(member.getSubPosition())
+                .wantP(member.getWantPosition())
             .isAgree(member.getIsAgree())
             .isBlind(member.getBlind())
             .winrate(member.getWinRate())
@@ -114,6 +115,7 @@ public static MemberResponse.myProfileDTO profileDTO(Member member, Double manne
             .mannerRank(mannerScoreRank)
             .mainP(member.getMainPosition())
             .subP(member.getSubPosition())
+                .wantP(member.getWantPosition())
             .isAgree(member.getIsAgree())
             .isBlind(member.getBlind())
             .winrate(member.getWinRate())
@@ -158,6 +160,7 @@ public static MemberResponse.memberProfileDTO toMemberProfileDTO(Member member,
             .mannerRank(mannerScoreRank)
             .mannerRatingCount(mannerRatingCount)
             .mainP(targetMember.getMainPosition())
+                .wantP(targetMember.getWantPosition())
             .subP(targetMember.getSubPosition())
             .isAgree(targetMember.getIsAgree())
             .isBlind(targetMember.getBlind())

src/main/java/com/gamegoo/domain/member/Member.java

@@ -69,10 +69,13 @@ public class Member extends BaseDateTimeEntity {
     private Double winRate;
 
     @Column(name = "main_position")
-    private Integer mainPosition;
+    private Integer mainPosition = 0;
 
     @Column(name = "sub_position")
-    private Integer subPosition;
+    private Integer subPosition = 0;
+
+    @Column(name = "want_position")
+    private Integer wantPosition = 0;
 
     @Column(name = "refresh_token")
     private String refreshToken;
@@ -119,9 +122,10 @@ public void updateMike(Boolean isMike){
         this.mike=isMike;
     }
 
-    public void updatePosition(Integer mainPosition, Integer subPosition) {
+    public void updatePosition(Integer mainPosition, Integer subPosition, Integer wantPosition) {
         this.mainPosition = mainPosition;
         this.subPosition = subPosition;
+        this.wantPosition = wantPosition;
     }
 
     public void updateProfileImage(Integer profileImage) {
@@ -132,9 +136,10 @@ public void deactiveMember() {
         this.blind = true;
     }
 
-    public void updateMemberFromMatching(Integer mainPosition, Integer subPosition, Boolean mike) {
+    public void updateMemberFromMatching(Integer mainPosition, Integer subPosition, Integer wantPosition, Boolean mike) {
         this.mainPosition = mainPosition;
         this.subPosition = subPosition;
+        this.wantPosition = wantPosition;
         this.mike = mike;
     }
 

src/main/java/com/gamegoo/dto/member/MemberRequest.java

@@ -79,6 +79,10 @@ public static class PositionRequestDTO {
         @Min(value = 0, message = "서브 포지션의 값은 0이상이어야 합니다.")
         @Max(value = 5, message = "서브 포지션의 값은 5이하이어야합니다.")
         int subP;
+
+        @Min(value = 0, message = "원하는 포지션의 값은 0이상이어야 합니다.")
+        @Max(value = 5, message = "원하는 포지션의 값은 5이하이어야합니다.")
+        int wantP;
     }
 
     @Getter

src/main/java/com/gamegoo/dto/member/MemberResponse.java

@@ -98,6 +98,7 @@ public static class myProfileMemberDTO {
         String updatedAt;
         Integer mainP;
         Integer subP;
+        Integer wantP;
         Boolean isAgree;
         Boolean isBlind;
         String loginType;
@@ -123,6 +124,7 @@ public static class myProfileDTO {
         String updatedAt;
         Integer mainP;
         Integer subP;
+        Integer wantP;
         Boolean isAgree;
         Boolean isBlind;
         String loginType;
@@ -151,6 +153,7 @@ public static class memberProfileDTO {
         String updatedAt;
         Integer mainP;
         Integer subP;
+        Integer wantP;
         Boolean isAgree;
         Boolean isBlind;
         String loginType;

src/main/java/com/gamegoo/service/matching/MatchingService.java

@@ -358,8 +358,7 @@ public void save(MatchingRequest.InitializingMatchingRequestDTO request, Long id
 
         // 매칭 기록에 따라 member 정보 변경하기
         if (request.getMainP() != null && request.getSubP() != null && request.getWantP() != null) {
-            member.updateMemberFromMatching(request.getMainP(), request.getSubP(),
-                request.getMike());
+            member.updateMemberFromMatching(request.getMainP(), request.getSubP(), request.getWantP(), request.getMike());
             log.info("Updated member information based on matching record, memberId: {}",
                 member.getId());
         }

src/main/java/com/gamegoo/service/member/AuthService.java

@@ -88,6 +88,9 @@ public Member joinMember(String email, String password, String gameName, String
             .profileImage(randomProfileImage)
             .blind(false)
             .mike(false)
+                .mainPosition(0)
+                .subPosition(0)
+                .wantPosition(0)
             .mannerLevel(1)
             .isAgree(isAgree)
             .build();
@@ -112,7 +115,6 @@ public Member joinMember(String email, String password, String gameName, String
         //    (2) Champion id, Member id 엮어서 MemberChampion 테이블에 넣기
         top3Champions
             .forEach(championId -> {
-                System.out.println(championId);
                 Champion champion = championRepository.findById(Long.valueOf(championId))
                     .orElseThrow(() -> new MemberHandler(ErrorStatus.CHAMPION_NOT_FOUND));
 

src/main/java/com/gamegoo/service/member/ProfileService.java

@@ -180,15 +180,15 @@ public void deleteMember(Long userId) {
      * @param subP
      */
     @Transactional
-    public void modifyPosition(Long userId, int mainP, int subP) {
-        if (mainP < 0 || subP < 0 || mainP > 5 || subP > 5) {
+    public void modifyPosition(Long userId, int mainP, int subP, int wantP) {
+        if (mainP < 0 || subP < 0 || wantP < 0 || mainP > 5 || subP > 5 || wantP > 5) {
             throw new MemberHandler(ErrorStatus.POSITION_NOT_FOUND);
         }
 
         Member member = memberRepository.findById(userId)
             .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
 
-        member.updatePosition(mainP, subP);
+        member.updatePosition(mainP, subP, wantP);
         memberRepository.save(member);
     }