🔀Merge: Main Merge 32차 (#154)

* 🐛 Hotfix: 댓글 수정 request dto 추가 (#149) * Hotfix : 댓글 삭제 시 게시물의 댓글 수 차감 로직 수정 (#151) * 🐛 Hotfix: 댓글 수정 request dto 추가 * 🐛 Hotfix: 댓글 삭제 시 게시물의 댓글 수 차감 로직 수정 * Feat: 프로필 이모지 설정 로직 구현 (#153) * 🗃️ profile 속성의 Enum value ProfileEmoji 생성 * 🗃️ profile 속성 ProfileEmoji 설정 * ✨ Feat: 회원 가입 및 정보 수정에 프로필 이모지 설정 로직 추가
Meetfolio-Project-CodeZ-Team · May 20, 2024 · c20f242 · c20f242
1 parent 479e598
commit c20f242
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 19 deletions.
diff --git a/src/main/java/com/codez4/meetfolio/domain/comment/controller/CommentController.java b/src/main/java/com/codez4/meetfolio/domain/comment/controller/CommentController.java
@@ -63,7 +63,6 @@ public ApiResponse<CommentResponse.CommentProc> updateComment(@RequestBody Comme
     @DeleteMapping("/{commentId}")
     public ApiResponse<CommentResponse.CommentProc> deleteComment(
         @PathVariable(name = "commentId") Long commentId) {
-
         return ApiResponse.onSuccess(commentCommandService.delete(commentId));
     }
 }
diff --git a/src/main/java/com/codez4/meetfolio/domain/comment/dto/CommentResponse.java b/src/main/java/com/codez4/meetfolio/domain/comment/dto/CommentResponse.java
@@ -186,7 +186,7 @@ public static CommentItem toCommentItem(Comment comment) {
             .commentId(comment.getId())
             .content(comment.getContent())
             .memberName(member.getEmail().split("@")[0])
-            .profile(member.getProfile())
+            .profile(member.getProfile().name())
             .sinceCreation(sinceCreation)
             .childComments(getChildList(comment))
             .build();

diff --git a/src/main/java/com/codez4/meetfolio/domain/comment/service/CommentCommandService.java b/src/main/java/com/codez4/meetfolio/domain/comment/service/CommentCommandService.java
@@ -66,7 +66,8 @@ public CommentResponse.CommentProc update(String content, Long commentId) {
 
     public CommentResponse.CommentProc delete(Long commentId) {
         Comment comment = commentQueryService.findById(commentId);
-        comment.getBoard().changeComment(false);
+        Board board  = comment.getBoard();
+        board.changeComment(false);
         commentRepository.deleteById(commentId);
         return CommentResponse.toCommentProc(commentId);
     }

diff --git a/src/main/java/com/codez4/meetfolio/domain/enums/ProfileEmoji.java b/src/main/java/com/codez4/meetfolio/domain/enums/ProfileEmoji.java
@@ -0,0 +1,34 @@
+package com.codez4.meetfolio.domain.enums;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum ProfileEmoji {
+    BACKEND,
+    WEB,
+    APP,
+    DESIGN,
+    AI,
+    TOOL,
+    MAN,
+    WOMAN,
+    MOUSE,
+    KEYBOARD,
+    FIRE,
+    SPARKLE;
+
+    @JsonCreator
+    public static ProfileEmoji convert(String source)
+    {
+        for (ProfileEmoji profileEmoji : ProfileEmoji.values()) {
+            if (profileEmoji.name().equals(source)) {
+                return profileEmoji;
+            }
+        }
+        return null;
+    }
+}
+
diff --git a/src/main/java/com/codez4/meetfolio/domain/member/Member.java b/src/main/java/com/codez4/meetfolio/domain/member/Member.java
@@ -1,10 +1,7 @@
 package com.codez4.meetfolio.domain.member;
 
 import com.codez4.meetfolio.domain.common.BaseTimeEntity;
-import com.codez4.meetfolio.domain.enums.Authority;
-import com.codez4.meetfolio.domain.enums.Grade;
-import com.codez4.meetfolio.domain.enums.JobKeyword;
-import com.codez4.meetfolio.domain.enums.Status;
+import com.codez4.meetfolio.domain.enums.*;
 import com.codez4.meetfolio.domain.member.dto.MemberRequest;
 import com.codez4.meetfolio.global.security.Password;
 import com.codez4.meetfolio.global.utils.TimeUtils;
@@ -52,8 +49,9 @@ public class Member extends BaseTimeEntity {
     @Enumerated(EnumType.STRING)
     private Status status;
 
-    @Column
-    private String profile;
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private ProfileEmoji profile;
 
     @Column(nullable = false)
     @ColumnDefault("'MEMBER'")
@@ -77,7 +75,6 @@ public void withdraw(){
         setInactive();
         this.email = "";
         this.major = "";
-        this.profile = "";
     }
 
     /**
@@ -87,6 +84,7 @@ public void updateInfo(MemberRequest.Patch request) {
         this.major = request.getMajor();
         this.grade = Grade.convert(request.getGrade());
         this.jobKeyword = JobKeyword.convert(request.getJobKeyword());
+        this.profile = ProfileEmoji.convert(request.getProfile());
     }
 
     public void updatePassword(String password){

diff --git a/src/main/java/com/codez4/meetfolio/domain/member/controller/MemberController.java b/src/main/java/com/codez4/meetfolio/domain/member/controller/MemberController.java
@@ -7,6 +7,7 @@
 import com.codez4.meetfolio.domain.comment.service.CommentQueryService;
 import com.codez4.meetfolio.domain.enums.Grade;
 import com.codez4.meetfolio.domain.enums.JobKeyword;
+import com.codez4.meetfolio.domain.enums.ProfileEmoji;
 import com.codez4.meetfolio.domain.like.service.LikeQueryService;
 import com.codez4.meetfolio.domain.member.Member;
 import com.codez4.meetfolio.domain.member.dto.MemberRequest;
@@ -48,6 +49,7 @@ public ApiResponse<MemberResponse.MemberProc> signUp(
                 .grade(Grade.convert(request.getGrade()))
                 .jobKeyword(JobKeyword.convert(request.getJobKeyword()))
                 .major(request.getMajor())
+                .profile(ProfileEmoji.convert(request.getProfile()))
                 .build();
         return ApiResponse.onSuccess(memberCommandService.post(post));
     }

diff --git a/src/main/java/com/codez4/meetfolio/domain/member/dto/MemberRequest.java b/src/main/java/com/codez4/meetfolio/domain/member/dto/MemberRequest.java
@@ -2,11 +2,13 @@
 
 import com.codez4.meetfolio.domain.enums.Grade;
 import com.codez4.meetfolio.domain.enums.JobKeyword;
+import com.codez4.meetfolio.domain.enums.ProfileEmoji;
 import com.codez4.meetfolio.domain.member.Member;
 import com.codez4.meetfolio.global.annotation.EnumValid;
 import com.codez4.meetfolio.global.security.Password;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -24,7 +26,6 @@ public static class SignUpRequest {
         @NotBlank(message = "비밀번호 입력은 필수입니다.")
         private String password;
 
-
         @Schema(description = "학년 및 학적, FRESHMAN/SOPHOMORE/JUNIOR/SENIOR/GRADUATE")
         @NotBlank(message = "학년 및 학적 입력은 필수입니다.")
         @EnumValid(enumClass = Grade.class)
@@ -35,9 +36,15 @@ public static class SignUpRequest {
         @EnumValid(enumClass = JobKeyword.class)
         private String jobKeyword;
 
-        @Schema(description = "전공, COMPUTER_ENGINEERING", example = "COMPUTER_ENGINEERING")
+        @Schema(description = "전공")
         @NotBlank(message = "전공 입력은 필수입니다.")
         private String major;
+
+
+        @Schema(description = "프로필 이모지,  BACKEND/WEB/APP/DESIGN/AI/TOOL/MAN/WOMAN/MOUSE/KEYBOARD/FIRE/SPARKLE")
+        @NotNull(message = "이모지를 선택은 필수입니다")
+        @EnumValid(enumClass = ProfileEmoji.class)
+        private String profile;
     }
 
     /*
@@ -52,6 +59,7 @@ public static class Post {
         private Grade grade;
         private JobKeyword jobKeyword;
         private String major;
+        private ProfileEmoji profile;
     }
 
     @Schema(description = "사용자 정보 수정 요청 DTO")
@@ -69,15 +77,21 @@ public static class Patch {
 
         @Schema(description = "수정하는 희망 직무 키워드, BACKEND/WEB/APP/DESIGN/AI", example = "BACKEND")
         private String jobKeyword;
+
+        @Schema(description = "프로필 이모지,  BACKEND/WEB/APP/DESIGN/AI/TOOL/MAN/WOMAN/MOUSE/KEYBOARD/FIRE/SPARKLE")
+        @NotNull(message = "이모지를 선택은 필수입니다")
+        @EnumValid(enumClass = ProfileEmoji.class)
+        private String profile;
     }
 
     public static Member toEntity(Post post) {
         return Member.builder()
-            .email(post.getEmail())
-            .password(Password.encrypt(post.getPassword(), ENCODER))
-            .grade(post.getGrade())
-            .jobKeyword(post.getJobKeyword())
-            .major(post.getMajor())
-            .build();
+                .email(post.getEmail())
+                .password(Password.encrypt(post.getPassword(), ENCODER))
+                .grade(post.getGrade())
+                .jobKeyword(post.getJobKeyword())
+                .major(post.getMajor())
+                .profile(post.getProfile())
+                .build();
     }
 }
diff --git a/src/main/java/com/codez4/meetfolio/domain/member/dto/MemberResponse.java b/src/main/java/com/codez4/meetfolio/domain/member/dto/MemberResponse.java
@@ -98,6 +98,8 @@ public static class MemberDetailInfo {
         private String major;
         @Schema(description = "희망 직무")
         private String jobKeyword;
+        @Schema(description = "프로필 이모지")
+        private String profile;
         @Schema(description = "포인트")
         private int point;
         @Schema(description = "활성 상태, ACTIVE/INACTIVE/WITHDRAW(탈퇴)")
@@ -111,7 +113,7 @@ public static MemberInfo toMemberInfo(Member member) {
                 return MemberInfo.builder()
                         .authority(member.getAuthority().name())
                         .memberName(member.getEmail().split("@")[0])
-                        .profile(member.getProfile())
+                        .profile(member.getProfile().name())
                         .major(member.getMajor())
                         .build();
             } else if (member.getAuthority() == Authority.ADMIN) {
@@ -149,6 +151,7 @@ public static MemberDetailInfo toMemberDetailInfo(Member member) {
                 .grade(member.getGrade().getDescription())
                 .major(member.getMajor())
                 .jobKeyword(member.getJobKeyword().getDescription())
+                .profile(member.getProfile().name())
                 .point(member.getPoint())
                 .status(member.getStatus().name())
                 .build();