From e77cc897235814896f5fd16dbca2ed0f1646c098 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 6 Feb 2025 17:11:22 +0900
Subject: [PATCH 1/4] =?UTF-8?q?CLAP-303=20Fix:=20=EB=84=A4=EC=9D=B4?=
 =?UTF-8?q?=EB=B0=8D=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #365
---
 .../inbound/web/dto/admin/response/MemberDetailsResponse.java   | 2 +-
 .../web/dto/member/response/MemberDetailInfoResponse.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/MemberDetailsResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/MemberDetailsResponse.java
index d6c1cda3..77cb3384 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/MemberDetailsResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/MemberDetailsResponse.java
@@ -9,7 +9,7 @@ public record MemberDetailsResponse(
         @Schema(description = "회원 이름", example = "서주원")
         String name,
         @Schema(description = "회원 아이디", example = "siena.it")
-        String nicknanme,
+        String nickname,
         @Schema(description = "회원 이메일", example = "siena.it@gmail.com")
         String email,
         @Schema(description = "승인 권한 여부")
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java
index 3b939ded..cc7d2de2 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java
@@ -8,7 +8,7 @@ public record MemberDetailInfoResponse(
         @Schema(description = "회원 이름", example = "서주원")
         String name,
         @Schema(description = "회원 아이디", example = "siena.it")
-        String nicknanme,
+        String nickname,
         @Schema(description = "회원 이메일", example = "siena.it@gmail.com")
         String email,
         @Schema(description = "승인 권한 여부")

From 6826183188476fdc1adb8ca50e9f4edeb4fa6d47 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 6 Feb 2025 17:11:32 +0900
Subject: [PATCH 2/4] =?UTF-8?q?CLAP-303=20Fix:=20=EB=A7=A4=ED=95=91=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #365
---
 .../clap/server/application/mapper/MemberResponseMapper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/application/mapper/MemberResponseMapper.java b/src/main/java/clap/server/application/mapper/MemberResponseMapper.java
index 67e9ceba..d0491b9f 100644
--- a/src/main/java/clap/server/application/mapper/MemberResponseMapper.java
+++ b/src/main/java/clap/server/application/mapper/MemberResponseMapper.java
@@ -27,7 +27,7 @@ public static MemberDetailInfoResponse toMemberDetailInfoResponse(Member member)
                 member.getImageUrl(),
                 member.getMemberInfo().getName(),
                 member.getMemberInfo().getNickname(),
-                member.getImageUrl(),
+                member.getMemberInfo().getEmail(),
                 member.isReviewer(),
                 member.getMemberInfo().getRole(),
                 member.getMemberInfo().getDepartment().getName(),

From 8b81d842c7e2e4fefc8a37f2906439b52b965af1 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 6 Feb 2025 17:11:44 +0900
Subject: [PATCH 3/4] =?UTF-8?q?CLAP-303=20Style:=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #365
---
 .../application/service/admin/SendInvitationService.java       | 2 +-
 src/main/java/clap/server/domain/model/member/Member.java      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationService.java b/src/main/java/clap/server/application/service/admin/SendInvitationService.java
index 4002ee34..b6b6bd34 100644
--- a/src/main/java/clap/server/application/service/admin/SendInvitationService.java
+++ b/src/main/java/clap/server/application/service/admin/SendInvitationService.java
@@ -39,7 +39,7 @@ public void sendInvitation(SendInvitationRequest request) {
         commandMemberPort.save(member);
 
         // 회원 상태를 APPROVAL_REQUEST으로 변경
-        member.changeStatusToAPPROVAL_REQUEST();
+        member.changeToApproveRequested();
 
         sendEmailPort.sendInvitationEmail(
                 member.getMemberInfo().getEmail(),
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
index f8aead10..27b06c6d 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -75,9 +75,10 @@ public boolean isReviewer() {
         return this.memberInfo != null && this.memberInfo.isReviewer();
     }
 
-    public void changeStatusToAPPROVAL_REQUEST() {
+    public void changeToApproveRequested() {
         this.status = MemberStatus.APPROVAL_REQUEST;
     }
+
     public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled, String imageUrl) {
         this.memberInfo.updateName(name);
         this.agitNotificationEnabled = agitNotificationEnabled;

From 902e2d03d5016ae8e56828485d879a7b50cb6ff1 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 6 Feb 2025 17:13:03 +0900
Subject: [PATCH 4/4] =?UTF-8?q?CLAP-303=20Fix:=20=ED=8C=8C=EC=9D=BC=20null?=
 =?UTF-8?q?=20=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #365
---
 .../inbound/web/member/MemberInfoController.java       |  6 ++++++
 .../service/member/UpdateMemberInfoService.java        | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/member/MemberInfoController.java b/src/main/java/clap/server/adapter/inbound/web/member/MemberInfoController.java
index dbb02e8b..b82a0863 100644
--- a/src/main/java/clap/server/adapter/inbound/web/member/MemberInfoController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/member/MemberInfoController.java
@@ -8,6 +8,9 @@
 import clap.server.application.port.inbound.member.MemberDetailInfoUsecase;
 import clap.server.application.port.inbound.member.MemberProfileUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
+import clap.server.common.utils.FileTypeValidator;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.FileErrorcode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -49,6 +52,9 @@ public void updateMemberDetailInfo(
             @RequestPart(name = "memberInfo") UpdateMemberInfoRequest request,
             @RequestPart(name = "profileImage", required = false) MultipartFile profileImage,
             @AuthenticationPrincipal SecurityUserDetails userInfo) throws IOException {
+        if (profileImage !=null && !FileTypeValidator.validImageFile(profileImage.getInputStream())) {
+            throw new ApplicationException(FileErrorcode.UNSUPPORTED_FILE_TYPE);
+        }
         updateMemberInfoUsecase.updateMemberInfo(userInfo.getUserId(), request, profileImage);
     }
 }
diff --git a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
index 4a1a07ec..50446cdf 100644
--- a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
+++ b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
@@ -6,11 +6,8 @@
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.s3.S3UploadPort;
 import clap.server.common.annotation.architecture.ApplicationService;
-import clap.server.domain.policy.attachment.FilePathPolicy;
-import clap.server.common.utils.FileTypeValidator;
 import clap.server.domain.model.member.Member;
-import clap.server.exception.ApplicationException;
-import clap.server.exception.code.FileErrorcode;
+import clap.server.domain.policy.attachment.FilePathPolicy;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -27,11 +24,8 @@ class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
 
     @Override
     public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException {
-        if (!FileTypeValidator.validImageFile(profileImage.getInputStream())) {
-            throw new ApplicationException(FileErrorcode.UNSUPPORTED_FILE_TYPE);
-        }
         Member member = memberService.findActiveMember(memberId);
-        String profileImageUrl = s3UploadPort.uploadSingleFile(FilePathPolicy.MEMBER_IMAGE, profileImage);
+        String profileImageUrl = profileImage != null ? s3UploadPort.uploadSingleFile(FilePathPolicy.MEMBER_IMAGE, profileImage) : null;
         member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(),
                 request.kakaoWorkNotification(), profileImageUrl);
         commandMemberPort.save(member);