From 92b52563d07eeb815283ef416ec27995b9f56a12 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 22:11:55 +0700
Subject: [PATCH 01/20] =?UTF-8?q?CLAP-172=20Remove:=20=EC=95=8C=EB=A6=BC?=
 =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../member/MemberNotificationEntity.java      | 32 -------------------
 .../NotificationChannelEntity.java            | 31 ------------------
 .../constant/NotificationChannelEnum.java     | 12 -------
 .../member/MemberNotificationRepository.java  |  9 ------
 .../NotificationChannelRepository.java        |  9 ------
 5 files changed, 93 deletions(-)
 delete mode 100644 src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberNotificationEntity.java
 delete mode 100644 src/main/java/clap/server/adapter/outbound/persistense/entity/notification/NotificationChannelEntity.java
 delete mode 100644 src/main/java/clap/server/adapter/outbound/persistense/entity/notification/constant/NotificationChannelEnum.java
 delete mode 100644 src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberNotificationRepository.java
 delete mode 100644 src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationChannelRepository.java

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberNotificationEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberNotificationEntity.java
deleted file mode 100644
index 3708775e..00000000
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberNotificationEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package clap.server.adapter.outbound.persistense.entity.member;
-
-import clap.server.adapter.outbound.persistense.entity.common.BaseTimeEntity;
-import clap.server.adapter.outbound.persistense.entity.notification.NotificationChannelEntity;
-import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-@Entity
-@Table(name = "member_notification")
-@Getter
-@SuperBuilder
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class MemberNotificationEntity extends BaseTimeEntity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(nullable = false)
-    private Long memberNotificationId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "member_id")
-    private MemberEntity member;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "notification_channel_id")
-    private NotificationChannelEntity notificationChannel;
-
-    @Column(nullable = false)
-    private boolean isEnabled;
-}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/NotificationChannelEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/NotificationChannelEntity.java
deleted file mode 100644
index 948e663d..00000000
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/NotificationChannelEntity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package clap.server.adapter.outbound.persistense.entity.notification;
-
-import clap.server.adapter.outbound.persistense.entity.common.BaseTimeEntity;
-import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
-import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-@Entity
-@Table(name = "notification_channel")
-@Getter
-@SuperBuilder
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class NotificationChannelEntity extends BaseTimeEntity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(nullable = false)
-    private Long notificationChannelId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "admin_id", nullable = false)
-    private MemberEntity admin;
-
-    @Column(nullable = false)
-    private String code;
-
-    @Column(nullable = false)
-    private String name;
-}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/constant/NotificationChannelEnum.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/constant/NotificationChannelEnum.java
deleted file mode 100644
index 07f9b048..00000000
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/constant/NotificationChannelEnum.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package clap.server.adapter.outbound.persistense.entity.notification.constant;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-public enum NotificationChannelEnum {
-    KAKAO_WORK,
-    EMAIL,
-    AGIT
-}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberNotificationRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberNotificationRepository.java
deleted file mode 100644
index 15223788..00000000
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberNotificationRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package clap.server.adapter.outbound.persistense.repository.member;
-
-import clap.server.adapter.outbound.persistense.entity.member.MemberNotificationEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface MemberNotificationRepository extends JpaRepository<MemberNotificationEntity, Long> {
-}
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationChannelRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationChannelRepository.java
deleted file mode 100644
index bf2e39bc..00000000
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationChannelRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package clap.server.adapter.outbound.persistense.repository.notification;
-
-import clap.server.adapter.outbound.persistense.entity.notification.NotificationChannelEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface NotificationChannelRepository extends JpaRepository<NotificationChannelEntity, Long> {
-}
\ No newline at end of file

From 07e11c2f3cf4b67321b71bf873913f7d8454f812 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 22:12:29 +0700
Subject: [PATCH 02/20] =?UTF-8?q?CLAP-172=20Feat:=20=EC=9B=B9=ED=9B=85=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=97=90=20=EB=8C=80=ED=95=9C=20=ED=95=84?=
 =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../persistense/entity/member/MemberEntity.java |  7 +++++--
 .../clap/server/domain/model/member/Member.java | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java
index ba9862ad..7d4e1547 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java
@@ -45,7 +45,6 @@ public class MemberEntity extends BaseTimeEntity {
     @Column(nullable = false)
     private MemberStatus status;
 
-    // TODO: spring security 적용 예정
     @Column(nullable = false)
     private String password;
 
@@ -53,7 +52,11 @@ public class MemberEntity extends BaseTimeEntity {
     private String imageUrl;
 
     @Column
-    private Boolean notificationEnabled;
+    private Boolean kakaoWorkNotificationEnabled;
+    @Column
+    private Boolean agitNotificationEnabled;
+    @Column
+    private Boolean emailNotificationEnabled;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "admin_id")
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 f55b3fcc..900edfd4 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -3,6 +3,7 @@
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.domain.model.common.BaseTime;
+import jakarta.persistence.Column;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -14,16 +15,20 @@ public class Member extends BaseTime {
     private Long memberId;
     private MemberInfo memberInfo;
     private Member admin;
-    private Boolean notificationEnabled;
+    private Boolean kakaoWorkNotificationEnabled;
+    private Boolean agitNotificationEnabled;
+    private Boolean emailNotificationEnabled;
     private String imageUrl;
     private MemberStatus status;
     private String password;
 
     @Builder
-    public Member(MemberInfo memberInfo, Boolean notificationEnabled, Member admin, String imageUrl,
-                  MemberStatus status, String password) {
+    public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled,
+                  Member admin, String imageUrl, MemberStatus status, String password) {
         this.memberInfo = memberInfo;
-        this.notificationEnabled = notificationEnabled;
+        this.agitNotificationEnabled = agitNotificationEnabled;
+        this.emailNotificationEnabled = emailNotificationEnabled;
+        this.kakaoWorkNotificationEnabled = kakaoWorkNotificationEnabled;
         this.admin = admin;
         this.imageUrl = imageUrl;
         this.status = status;
@@ -33,7 +38,9 @@ public Member(MemberInfo memberInfo, Boolean notificationEnabled, Member admin,
     public static Member createMember(Member admin, MemberInfo memberInfo) {
        return Member.builder()
                .memberInfo(memberInfo)
-               .notificationEnabled(null)
+               .agitNotificationEnabled(null)
+               .emailNotificationEnabled(null)
+               .kakaoWorkNotificationEnabled(null)
                .admin(admin)
                .imageUrl(null)
                .status(MemberStatus.PENDING)

From 4935bafe20ca14c3d61bcb270dd3e3e22b72aacc Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 07:01:25 +0700
Subject: [PATCH 03/20] =?UTF-8?q?CLAP-172=20Refactor:=20usecase=20?=
 =?UTF-8?q?=EC=84=B8=EB=B6=84=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../adapter/inbound/web/auth/AuthController.java       | 10 ++++++----
 .../inbound/web/member/ResetPasswordController.java    |  4 +++-
 .../auth/{AuthUsecase.java => LoginUsecase.java}       |  3 +--
 .../application/port/inbound/auth/LogoutUsecase.java   |  5 +++++
 .../inbound/member/ResetInitialPasswordUsecase.java    |  5 +++++
 .../port/inbound/member/ResetPasswordUsecase.java      |  1 -
 .../server/application/service/auth/AuthService.java   |  6 +++---
 .../service/member/ResetPasswordService.java           |  5 +++--
 8 files changed, 26 insertions(+), 13 deletions(-)
 rename src/main/java/clap/server/application/port/inbound/auth/{AuthUsecase.java => LoginUsecase.java} (67%)
 create mode 100644 src/main/java/clap/server/application/port/inbound/auth/LogoutUsecase.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/member/ResetInitialPasswordUsecase.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java b/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java
index c14f4722..79d26333 100644
--- a/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java
@@ -3,7 +3,8 @@
 import clap.server.adapter.inbound.security.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.auth.LoginRequest;
 import clap.server.adapter.inbound.web.dto.auth.LoginResponse;
-import clap.server.application.port.inbound.auth.AuthUsecase;
+import clap.server.application.port.inbound.auth.LoginUsecase;
+import clap.server.application.port.inbound.auth.LogoutUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -23,7 +24,8 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/auths")
 public class AuthController {
-    private final AuthUsecase authUsecase;
+    private final LoginUsecase loginUsecase;
+    private final LogoutUsecase logoutUsecase;
 
     @Operation(summary = "로그인 API")
     @PostMapping("/login")
@@ -31,7 +33,7 @@ public ResponseEntity<LoginResponse> login(@RequestHeader(name = "sessionId") St
                                                @RequestBody LoginRequest request,
                                                HttpServletRequest httpRequest) {
         String clientIp = getClientIp(httpRequest);
-        LoginResponse response = authUsecase.login(request.nickname(), request.password(), sessionId, clientIp);
+        LoginResponse response = loginUsecase.login(request.nickname(), request.password(), sessionId, clientIp);
         return ResponseEntity.ok(response);
     }
 
@@ -41,7 +43,7 @@ public void logout(@AuthenticationPrincipal SecurityUserDetails userInfo,
                                        @Parameter(hidden = true) @RequestHeader(value = "Authorization") String authHeader,
                                        @RequestHeader(value = "refreshToken") String refreshToken) {
         String accessToken = authHeader.split(" ")[1];
-        authUsecase.logout(userInfo.getUserId(), accessToken, refreshToken);
+        logoutUsecase.logout(userInfo.getUserId(), accessToken, refreshToken);
     }
 
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/member/ResetPasswordController.java b/src/main/java/clap/server/adapter/inbound/web/member/ResetPasswordController.java
index f7d896b9..a81e2df6 100644
--- a/src/main/java/clap/server/adapter/inbound/web/member/ResetPasswordController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/member/ResetPasswordController.java
@@ -1,6 +1,7 @@
 package clap.server.adapter.inbound.web.member;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.application.port.inbound.member.ResetInitialPasswordUsecase;
 import clap.server.application.port.inbound.member.ResetPasswordUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import clap.server.common.annotation.validation.password.ValidPassword;
@@ -19,12 +20,13 @@
 @RequestMapping("/api")
 public class ResetPasswordController {
     private final ResetPasswordUsecase resetPasswordUsecase;
+    private final ResetInitialPasswordUsecase resetInitialPasswordUsecase;
 
     @Operation(summary = "초기 로그인 후 비밀번호 재설정 API", description = "swagger에서 따옴표를 포함하지 않고 요청합니다.")
     @PatchMapping("/members/initial-password")
     public void resetPasswordAndActivateMember(@AuthenticationPrincipal SecurityUserDetails userInfo,
                                                @RequestBody @NotBlank @ValidPassword String password) {
-        resetPasswordUsecase.resetPasswordAndActivateMember(userInfo.getUserId(), password);
+        resetInitialPasswordUsecase.resetPasswordAndActivateMember(userInfo.getUserId(), password);
     }
 
     @Operation(summary = "비밀번호 재설정 API", description = "swagger에서 따옴표를 포함하지 않고 요청합니다.")
diff --git a/src/main/java/clap/server/application/port/inbound/auth/AuthUsecase.java b/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java
similarity index 67%
rename from src/main/java/clap/server/application/port/inbound/auth/AuthUsecase.java
rename to src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java
index 85307841..74fc0db0 100644
--- a/src/main/java/clap/server/application/port/inbound/auth/AuthUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java
@@ -2,7 +2,6 @@
 
 import clap.server.adapter.inbound.web.dto.auth.LoginResponse;
 
-public interface AuthUsecase {
+public interface LoginUsecase {
     LoginResponse login(String nickname, String password, String sessionId, String clientIp);
-    void logout(Long memberId, String accessToken, String refreshToken);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/auth/LogoutUsecase.java b/src/main/java/clap/server/application/port/inbound/auth/LogoutUsecase.java
new file mode 100644
index 00000000..f19a30c9
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/auth/LogoutUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.auth;
+
+public interface LogoutUsecase {
+    void logout(Long memberId, String accessToken, String refreshToken);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/member/ResetInitialPasswordUsecase.java b/src/main/java/clap/server/application/port/inbound/member/ResetInitialPasswordUsecase.java
new file mode 100644
index 00000000..87f89652
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/member/ResetInitialPasswordUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.member;
+
+public interface ResetInitialPasswordUsecase {
+    void resetPasswordAndActivateMember(Long memberId, String password);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/member/ResetPasswordUsecase.java b/src/main/java/clap/server/application/port/inbound/member/ResetPasswordUsecase.java
index 1dc3ebb2..837c877d 100644
--- a/src/main/java/clap/server/application/port/inbound/member/ResetPasswordUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/member/ResetPasswordUsecase.java
@@ -2,5 +2,4 @@
 
 public interface ResetPasswordUsecase {
     void resetPassword(Long memberId, String password);
-    void resetPasswordAndActivateMember(Long memberId, String password);
 }
diff --git a/src/main/java/clap/server/application/service/auth/AuthService.java b/src/main/java/clap/server/application/service/auth/AuthService.java
index 9fb7487f..aafac610 100644
--- a/src/main/java/clap/server/application/service/auth/AuthService.java
+++ b/src/main/java/clap/server/application/service/auth/AuthService.java
@@ -3,7 +3,8 @@
 import clap.server.adapter.inbound.web.dto.auth.LoginResponse;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.application.mapper.response.AuthResponseMapper;
-import clap.server.application.port.inbound.auth.AuthUsecase;
+import clap.server.application.port.inbound.auth.LoginUsecase;
+import clap.server.application.port.inbound.auth.LogoutUsecase;
 import clap.server.application.port.outbound.auth.ForbiddenTokenPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.ApplicationService;
@@ -14,7 +15,6 @@
 import clap.server.exception.AuthException;
 import clap.server.exception.code.AuthErrorCode;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,7 +24,7 @@
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional
-class AuthService implements AuthUsecase {
+class AuthService implements LoginUsecase, LogoutUsecase {
     private final LoadMemberPort loadMemberPort;
     private final ManageTokenService manageTokenService;
     private final PasswordEncoder passwordEncoder;
diff --git a/src/main/java/clap/server/application/service/member/ResetPasswordService.java b/src/main/java/clap/server/application/service/member/ResetPasswordService.java
index 60752411..4baad9b5 100644
--- a/src/main/java/clap/server/application/service/member/ResetPasswordService.java
+++ b/src/main/java/clap/server/application/service/member/ResetPasswordService.java
@@ -1,7 +1,8 @@
 package clap.server.application.service.member;
 
-import clap.server.application.port.inbound.member.ResetPasswordUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.inbound.member.ResetInitialPasswordUsecase;
+import clap.server.application.port.inbound.member.ResetPasswordUsecase;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
@@ -14,7 +15,7 @@
 @RequiredArgsConstructor
 @Transactional
 @Slf4j
-class ResetPasswordService implements ResetPasswordUsecase {
+class ResetPasswordService implements ResetPasswordUsecase, ResetInitialPasswordUsecase {
     private final MemberService memberService;
     private final PasswordEncoder passwordEncoder;
     private final CommandMemberPort commandMemberPort;

From 4c92c66bcd8724b1901adc9adbdb4e4176269458 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:10:47 +0700
Subject: [PATCH 04/20] =?UTF-8?q?CLAP-172=20Config:=20apache=20tika=20?=
 =?UTF-8?q?=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 962217f7..f46f2163 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,6 +101,10 @@ dependencies {
     implementation 'software.amazon.awssdk:s3'
     implementation 'ch.qos.logback:logback-classic:1.4.12'
 
+    // Apache Tika
+    implementation 'org.apache.tika:tika-core:2.9.0'
+    implementation 'org.apache.tika:tika-parsers:2.9.0'
+
 }
 
 tasks.named('test') {

From a6a38be40b456961a59e459b0df81fec2f11a540 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:11:35 +0700
Subject: [PATCH 05/20] =?UTF-8?q?CLAP-172=20Config:=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=ED=8C=8C=EC=9D=BC=EC=9D=B8=EC=A7=80=20=EA=B2=80?=
 =?UTF-8?q?=EC=A6=9D=ED=95=98=EB=8A=94=20=EC=9C=A0=ED=8B=B8=20=ED=81=B4?=
 =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../common/constants/FilePathConstants.java   |  2 +-
 .../clap/server/common/utils/FileUtils.java   | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/clap/server/common/utils/FileUtils.java

diff --git a/src/main/java/clap/server/common/constants/FilePathConstants.java b/src/main/java/clap/server/common/constants/FilePathConstants.java
index 92393f90..0b13ec57 100644
--- a/src/main/java/clap/server/common/constants/FilePathConstants.java
+++ b/src/main/java/clap/server/common/constants/FilePathConstants.java
@@ -8,7 +8,7 @@
 public enum FilePathConstants {
     TASK_IMAGE("task/image"),
     TASK_DOCUMENT("task/docs"),
-    MEMBER_IMAGE("member/image"),
+    MEMBER_IMAGE("member"),
     ;
     private final String path;
 
diff --git a/src/main/java/clap/server/common/utils/FileUtils.java b/src/main/java/clap/server/common/utils/FileUtils.java
new file mode 100644
index 00000000..5a5b7d97
--- /dev/null
+++ b/src/main/java/clap/server/common/utils/FileUtils.java
@@ -0,0 +1,29 @@
+package clap.server.common.utils;
+
+import org.apache.tika.Tika;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
+public class FileUtils {
+    private FileUtils() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    private static final Tika tika = new Tika();
+    private static final List<String> VALID_IMAGE_TYPES = Arrays.asList(
+            "image/jpeg", "image/pjpeg", "image/png", "image/gif", "image/bmp", "image/x-windows-bmp"
+    );
+
+    public static boolean validImageFile(InputStream inputStream) {
+        try {
+            String mimeType = tika.detect(inputStream);
+
+            return VALID_IMAGE_TYPES.contains(mimeType.toLowerCase());
+        } catch (IOException e) {
+            return false;
+        }
+    }
+}

From b4f731b69cb991b2e878425fcd5827962eecf524 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:13:23 +0700
Subject: [PATCH 06/20] =?UTF-8?q?CLAP-172=20Feat:=20=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?API=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../dto/member/MemberDetailInfoResponse.java  | 35 +++++++++++++++++++
 .../web/member/MemberInfoController.java      | 21 ++++++++---
 .../application/mapper/MemberMapper.java      | 22 ++++++++++++
 .../member/MemberDetailInfoUsecase.java       |  7 ++++
 ...Usecase.java => MemberProfileUsecase.java} |  2 +-
 .../service/member/MemberInfoService.java     | 18 ++++++----
 6 files changed, 93 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/member/MemberDetailInfoUsecase.java
 rename src/main/java/clap/server/application/port/inbound/member/{MemberInfoUsecase.java => MemberProfileUsecase.java} (82%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java
new file mode 100644
index 00000000..83a848e5
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java
@@ -0,0 +1,35 @@
+package clap.server.adapter.inbound.web.dto.member;
+
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record MemberDetailInfoResponse(
+        String profileImageUrl,
+        @Schema(description = "회원 이름", example = "서주원")
+        String name,
+        @Schema(description = "회원 아이디", example = "siena.it")
+        String nicknanme,
+        @Schema(description = "회원 이메일", example = "siena.it@gmail.com")
+        String email,
+        @Schema(description = "승인 권한 여부")
+        Boolean isReviewer,
+        @Schema(description = "회원 역할")
+        MemberRole role,
+        @Schema(description = "회원 직책")
+        String departmentRole,
+        @Schema(description = "알림 수신 여부")
+        NotificationSettingInfoResponse notificationSettingInfo
+) {
+    public static record NotificationSettingInfoResponse(
+            @Schema(description = "아지트 알림 수신 여부")
+            boolean agit,
+            @Schema(description = "이메일 알림 수신 여부")
+            boolean email,
+            @Schema(description = "카카오 워크 알림 수신 여부")
+            boolean kakaoWork
+    ) {
+    }
+}
+
+
+
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 3633bb76..7f490949 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
@@ -1,8 +1,12 @@
 package clap.server.adapter.inbound.web.member;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse;
 import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse;
-import clap.server.application.port.inbound.member.MemberInfoUsecase;
+import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest;
+import clap.server.application.port.inbound.member.UpdateMemberInfoUsecase;
+import clap.server.application.port.inbound.member.MemberDetailInfoUsecase;
+import clap.server.application.port.inbound.member.MemberProfileUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,18 +15,27 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
 
 @Tag(name = "01. Member", description = "회원 정보 조회 및 수정 API")
 @WebAdapter
 @RequiredArgsConstructor
 @RequestMapping("/api/members")
 public class MemberInfoController {
-    private final MemberInfoUsecase memberInfoUsecase;
+    private final MemberProfileUsecase memberProfileUsecase;
+    private final MemberDetailInfoUsecase memberDetailInfoUsecase;
+    private final UpdateMemberInfoUsecase updateMemberInfoUsecase;
 
-    @Operation(summary = "회원 프로필을 조회합니다. 활성화된 회원만 조회 가능합니다.")
+    @Operation(summary = "회원 프로필 조회 API")
     @GetMapping("/profile")
     public ResponseEntity<MemberProfileResponse> getMemberProfile(@AuthenticationPrincipal SecurityUserDetails userInfo) {
-        return ResponseEntity.ok(memberInfoUsecase.getMemberProfile(userInfo.getUserId()));
+        return ResponseEntity.ok(memberProfileUsecase.getMemberProfile(userInfo.getUserId()));
     }
 
+    @Operation(summary = "회원 프로필 조회 API")
+    @GetMapping("/info")
+    public ResponseEntity<MemberDetailInfoResponse> getMemberDetailInfo(@AuthenticationPrincipal SecurityUserDetails userInfo) {
+        return ResponseEntity.ok(memberDetailInfoUsecase.getMemberInfo(userInfo.getUserId()));
+    }
 }
diff --git a/src/main/java/clap/server/application/mapper/MemberMapper.java b/src/main/java/clap/server/application/mapper/MemberMapper.java
index a314b944..df52bc4d 100644
--- a/src/main/java/clap/server/application/mapper/MemberMapper.java
+++ b/src/main/java/clap/server/application/mapper/MemberMapper.java
@@ -1,6 +1,7 @@
 package clap.server.application.mapper;
 
 
+import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse;
 import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse;
 import clap.server.domain.model.member.Member;
 
@@ -18,4 +19,25 @@ public static MemberProfileResponse toMemberProfileResponse(Member member) {
                 member.getMemberInfo().getRole()
         );
     }
+
+    public static MemberDetailInfoResponse toMemberDetailInfoResponse(Member member) {
+        return new MemberDetailInfoResponse(
+                member.getImageUrl(),
+                member.getMemberInfo().getName(),
+                member.getMemberInfo().getNickname(),
+                member.getImageUrl(),
+                member.isReviewer(),
+                member.getMemberInfo().getRole(),
+                member.getMemberInfo().getDepartmentRole(),
+                toNotificationSettingInfoResponse(member)
+        );
+    }
+
+    public static MemberDetailInfoResponse.NotificationSettingInfoResponse toNotificationSettingInfoResponse(Member member) {
+        return new MemberDetailInfoResponse.NotificationSettingInfoResponse(
+                member.getAgitNotificationEnabled(),
+                member.getEmailNotificationEnabled(),
+                member.getKakaoWorkNotificationEnabled()
+        );
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/inbound/member/MemberDetailInfoUsecase.java b/src/main/java/clap/server/application/port/inbound/member/MemberDetailInfoUsecase.java
new file mode 100644
index 00000000..a87a094e
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/member/MemberDetailInfoUsecase.java
@@ -0,0 +1,7 @@
+package clap.server.application.port.inbound.member;
+
+import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse;
+
+public interface MemberDetailInfoUsecase {
+    MemberDetailInfoResponse getMemberInfo(Long memberId);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/member/MemberInfoUsecase.java b/src/main/java/clap/server/application/port/inbound/member/MemberProfileUsecase.java
similarity index 82%
rename from src/main/java/clap/server/application/port/inbound/member/MemberInfoUsecase.java
rename to src/main/java/clap/server/application/port/inbound/member/MemberProfileUsecase.java
index feef14f0..e05acebd 100644
--- a/src/main/java/clap/server/application/port/inbound/member/MemberInfoUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/member/MemberProfileUsecase.java
@@ -2,6 +2,6 @@
 
 import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse;
 
-public interface MemberInfoUsecase {
+public interface MemberProfileUsecase {
     MemberProfileResponse getMemberProfile(Long memberId);
 }
diff --git a/src/main/java/clap/server/application/service/member/MemberInfoService.java b/src/main/java/clap/server/application/service/member/MemberInfoService.java
index 60ec23bd..d8b7efc8 100644
--- a/src/main/java/clap/server/application/service/member/MemberInfoService.java
+++ b/src/main/java/clap/server/application/service/member/MemberInfoService.java
@@ -1,24 +1,22 @@
 package clap.server.application.service.member;
 
+import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse;
 import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse;
 import clap.server.application.port.inbound.domain.MemberService;
-import clap.server.application.port.inbound.member.MemberInfoUsecase;
-import clap.server.application.port.outbound.member.CommandMemberPort;
-import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.application.port.inbound.member.MemberDetailInfoUsecase;
+import clap.server.application.port.inbound.member.MemberProfileUsecase;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
+import static clap.server.application.mapper.MemberMapper.toMemberDetailInfoResponse;
 import static clap.server.application.mapper.MemberMapper.toMemberProfileResponse;
 
 @ApplicationService
 @RequiredArgsConstructor
-class MemberInfoService implements MemberInfoUsecase {
+class MemberInfoService implements MemberProfileUsecase , MemberDetailInfoUsecase {
     private final MemberService memberService;
-    private final LoadMemberPort loadMemberPort;
-    private final CommandMemberPort commandMemberPort;
-
 
     @Override
     @Transactional(readOnly = true)
@@ -26,4 +24,10 @@ public MemberProfileResponse getMemberProfile(Long memberId) {
         Member member = memberService.findActiveMember(memberId);
         return toMemberProfileResponse(member);
     }
+
+    @Override
+    public MemberDetailInfoResponse getMemberInfo(Long memberId) {
+        Member member = memberService.findActiveMember(memberId);
+        return toMemberDetailInfoResponse(member);
+    }
 }

From 9657de75318570876f013ee042aa1930cac10de9 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:14:11 +0700
Subject: [PATCH 07/20] =?UTF-8?q?CLAP-172=20Feat:=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=20=ED=9A=8C=EC=9B=90=20=EC=A0=95=EB=B3=B4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=9D=B4=EB=A6=84=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 ...emberService.java => UpdateMemberInfoService.java} | 11 ++++++-----
 .../clap/server/domain/model/member/MemberInfo.java   |  8 ++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)
 rename src/main/java/clap/server/application/service/admin/{ManageMemberService.java => UpdateMemberInfoService.java} (76%)

diff --git a/src/main/java/clap/server/application/service/admin/ManageMemberService.java b/src/main/java/clap/server/application/service/admin/UpdateMemberInfoService.java
similarity index 76%
rename from src/main/java/clap/server/application/service/admin/ManageMemberService.java
rename to src/main/java/clap/server/application/service/admin/UpdateMemberInfoService.java
index f30b5962..79ea9d0c 100644
--- a/src/main/java/clap/server/application/service/admin/ManageMemberService.java
+++ b/src/main/java/clap/server/application/service/admin/UpdateMemberInfoService.java
@@ -1,7 +1,7 @@
 package clap.server.application.service.admin;
 
 import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
-import clap.server.application.port.inbound.admin.ManageMemberUsecase;
+import clap.server.application.port.inbound.admin.UpdateMemberInfoUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadDepartmentPort;
@@ -16,18 +16,19 @@
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional
-class ManageMemberService implements ManageMemberUsecase {
+class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
     private final MemberService memberService;
     private final CommandMemberPort commandMemberPort;
     private final LoadDepartmentPort loadDepartmentPort;
 
     @Override
-    public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request) {
+    public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberInfoRequest request) {
         Member member = memberService.findActiveMember(memberId);
-        Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(() -> new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
+        Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(() ->
+                new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
 
         //TODO: 인프라팀만 담당자가 될 수 있도록 수정해야함
-        member.getMemberInfo().updateMemberInfo(
+        member.getMemberInfo().updateMemberInfoByAdmin(
                 request.name(), request.email(), request.isReviewer(),
                 department, request.role(), request.departmentRole());
         commandMemberPort.save(member);
diff --git a/src/main/java/clap/server/domain/model/member/MemberInfo.java b/src/main/java/clap/server/domain/model/member/MemberInfo.java
index 11e3bf2f..9f4d3bd4 100644
--- a/src/main/java/clap/server/domain/model/member/MemberInfo.java
+++ b/src/main/java/clap/server/domain/model/member/MemberInfo.java
@@ -47,8 +47,8 @@ public static MemberInfo toMemberInfo(String name, String email, String nickname
                 .build();
     }
 
-    public void updateMemberInfo(String name, String email, boolean isReviewer,
-                                 Department department, MemberRole role, String departmentRole) {
+    public void updateMemberInfoByAdmin(String name, String email, boolean isReviewer,
+                                        Department department, MemberRole role, String departmentRole) {
         assertReviewerIsManager(isReviewer, role);
         this.name = name;
         this.email = email;
@@ -58,6 +58,10 @@ public void updateMemberInfo(String name, String email, boolean isReviewer,
         this.departmentRole = departmentRole;
     }
 
+    public void updateName(String name) {
+        this.name = name;
+    }
+
     public static void assertReviewerIsManager(boolean isReviewer, MemberRole role) {
         if (isReviewer) {
             if (role != MemberRole.ROLE_MANAGER) {

From c00e9ab476eeb8752f10ec7a404cd90ebdfed7d6 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:14:38 +0700
Subject: [PATCH 08/20] =?UTF-8?q?CLAP-172=20Fix:=20port=EB=A5=BC=20?=
 =?UTF-8?q?=ED=98=B8=EC=B6=9C=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../server/application/service/task/UpdateTaskService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
index b25e355f..9d1f37c6 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -1,7 +1,6 @@
 package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.*;
-import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
@@ -12,6 +11,7 @@
 import clap.server.application.port.inbound.task.UpdateTaskProcessorUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskStatusUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskUsecase;
+import clap.server.application.port.outbound.s3.S3UploadPort;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
@@ -45,7 +45,7 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
     private final LoadAttachmentPort loadAttachmentPort;
     private final LabelService labelService;
     private final CommandAttachmentPort commandAttachmentPort;
-    private final S3UploadAdapter s3UploadAdapter;
+    private final S3UploadPort s3UploadPort;
 
     @Override
     @Transactional
@@ -105,7 +105,7 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
         List<Attachment> attachmentsToDelete = validateAndGetAttachments(attachmentIdsToDelete, task);
         attachmentsToDelete.forEach(Attachment::softDelete);
 
-        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
+        List<String> fileUrls = s3UploadPort.uploadFiles(FilePathConstants.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }

From a776b1c3910a5bf70fc511b3c4d6b5fede257bd9 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:15:00 +0700
Subject: [PATCH 09/20] =?UTF-8?q?CLAP-172=20Rename:=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../port/inbound/admin/ManageMemberUsecase.java            | 7 -------
 .../port/inbound/admin/UpdateMemberInfoUsecase.java        | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 src/main/java/clap/server/application/port/inbound/admin/ManageMemberUsecase.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/UpdateMemberInfoUsecase.java

diff --git a/src/main/java/clap/server/application/port/inbound/admin/ManageMemberUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/ManageMemberUsecase.java
deleted file mode 100644
index 46050ae3..00000000
--- a/src/main/java/clap/server/application/port/inbound/admin/ManageMemberUsecase.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package clap.server.application.port.inbound.admin;
-
-import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
-
-public interface ManageMemberUsecase {
-    void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request);
-}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberInfoUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberInfoUsecase.java
new file mode 100644
index 00000000..42799ded
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberInfoUsecase.java
@@ -0,0 +1,7 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
+
+public interface UpdateMemberInfoUsecase {
+    void updateMemberInfo(Long adminId, Long memberId, UpdateMemberInfoRequest request);
+}

From 254752ea0bd7e47e287385ce5b4afcd1fb11cbc7 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:16:44 +0700
Subject: [PATCH 10/20] =?UTF-8?q?CLAP-172=20Feat:=20=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20API=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../web/admin/ManageMemberController.java     |  6 ++--
 .../dto/member/UpdateMemberInfoRequest.java   | 19 ++++++++++
 .../member/UpdateMemberInfoUsecase.java       | 10 ++++++
 .../member/UpdateMemberInfoService.java       | 36 +++++++++++++++++++
 .../server/domain/model/member/Member.java    | 29 +++++++++------
 5 files changed, 86 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/member/UpdateMemberInfoRequest.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/member/UpdateMemberInfoUsecase.java
 create mode 100644 src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
index 69d0e02b..c86c378c 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
@@ -2,7 +2,7 @@
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
-import clap.server.application.port.inbound.admin.ManageMemberUsecase;
+import clap.server.application.port.inbound.admin.UpdateMemberInfoUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,7 +20,7 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/managements/members")
 public class ManageMemberController {
-    private final ManageMemberUsecase manageMemberUsecase;
+    private final UpdateMemberInfoUsecase manageMemberUsecase;
 
     @Operation(summary = "회원 정보 수정 API")
     @PostMapping("/{memberId}")
@@ -28,6 +28,6 @@ public class ManageMemberController {
     public void registerMember(@AuthenticationPrincipal SecurityUserDetails userInfo,
                                @PathVariable Long memberId,
                                @RequestBody @Valid UpdateMemberInfoRequest request){
-        manageMemberUsecase.updateMemberInfo(memberId, request);
+        manageMemberUsecase.updateMemberInfo(userInfo.getUserId(), memberId, request);
     }
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/UpdateMemberInfoRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/UpdateMemberInfoRequest.java
new file mode 100644
index 00000000..25269a07
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/UpdateMemberInfoRequest.java
@@ -0,0 +1,19 @@
+package clap.server.adapter.inbound.web.dto.member;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+
+public record UpdateMemberInfoRequest(
+        @NotBlank @Schema(description = "이름")
+        String name,
+        @Schema(description = "아지트 알림 수신 여부")
+        boolean agitNotification,
+        @Schema(description = "이메일 알림 수신 여부")
+        boolean emailNotification,
+        @Schema(description = "카카오 워크 알림 수신 여부")
+        boolean kakaoWorkNotification
+) {
+}
+
+
+
diff --git a/src/main/java/clap/server/application/port/inbound/member/UpdateMemberInfoUsecase.java b/src/main/java/clap/server/application/port/inbound/member/UpdateMemberInfoUsecase.java
new file mode 100644
index 00000000..52aaff2a
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/member/UpdateMemberInfoUsecase.java
@@ -0,0 +1,10 @@
+package clap.server.application.port.inbound.member;
+
+import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+public interface UpdateMemberInfoUsecase {
+    void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException;
+}
diff --git a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
new file mode 100644
index 00000000..8211a167
--- /dev/null
+++ b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
@@ -0,0 +1,36 @@
+package clap.server.application.service.member;
+
+import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest;
+import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.inbound.member.UpdateMemberInfoUsecase;
+import clap.server.application.port.outbound.s3.S3UploadPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.common.constants.FilePathConstants;
+import clap.server.common.utils.FileUtils;
+import clap.server.domain.model.member.Member;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.MemberErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+@ApplicationService
+@RequiredArgsConstructor
+@Transactional
+class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
+    private final MemberService memberService;
+    private final S3UploadPort s3UploadPort;
+
+    @Override
+    public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException {
+        if (!FileUtils.validImageFile(profileImage.getInputStream())) {
+            throw new ApplicationException(MemberErrorCode.UNSUPPORTED_FILE_TYPE);
+        }
+        Member member = memberService.findActiveMember(memberId);
+        String profileImageUrl = s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage);
+        member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(),
+                request.kakaoWorkNotification(), profileImageUrl);
+    }
+}
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 bb91c59b..c5b61ee6 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -2,7 +2,6 @@
 
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.domain.model.common.BaseTime;
-import jakarta.persistence.Column;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -35,16 +34,16 @@ public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean em
     }
 
     public static Member createMember(Member admin, MemberInfo memberInfo) {
-       return Member.builder()
-               .memberInfo(memberInfo)
-               .agitNotificationEnabled(null)
-               .emailNotificationEnabled(null)
-               .kakaoWorkNotificationEnabled(null)
-               .admin(admin)
-               .imageUrl(null)
-               .status(MemberStatus.PENDING)
-               .password(null)
-               .build();
+        return Member.builder()
+                .memberInfo(memberInfo)
+                .agitNotificationEnabled(null)
+                .emailNotificationEnabled(null)
+                .kakaoWorkNotificationEnabled(null)
+                .admin(admin)
+                .imageUrl(null)
+                .status(MemberStatus.PENDING)
+                .password(null)
+                .build();
     }
 
     public void resetPassword(String newEncodedPassword) {
@@ -63,4 +62,12 @@ public String getNickname() {
     public boolean isReviewer() {
         return this.memberInfo != null && this.memberInfo.isReviewer();
     }
+
+    public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled, String imageUrl) {
+        this.memberInfo.updateName(name);
+        this.agitNotificationEnabled = agitNotificationEnabled;
+        this.emailNotificationEnabled = emailNotificationEnabled;
+        this.kakaoWorkNotificationEnabled = kakaoWorkNotificationEnabled;
+        this.imageUrl = imageUrl;
+    }
 }

From c42ad70a4e737fbd7ad5ff8d3b2b3dcb756935ee Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:19:13 +0700
Subject: [PATCH 11/20] =?UTF-8?q?CLAP-172=20Feat:=20=EC=B2=A8=EB=B6=80?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=97=90=20=EA=B4=80=ED=95=9C=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=EC=BD=94=EB=93=9C=20=ED=81=B4=EB=9E=98=EC=8A=A4?=
 =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../adapter/outbound/infrastructure/s3/S3UploadAdapter.java  | 5 +++--
 .../application/service/member/UpdateMemberInfoService.java  | 3 ++-
 .../code/{S3Errorcode.java => AttachmentErrorcode.java}      | 5 +++--
 .../java/clap/server/exception/code/MemberErrorCode.java     | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename src/main/java/clap/server/exception/code/{S3Errorcode.java => AttachmentErrorcode.java} (60%)

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
index 68798b73..6b8f33a9 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
@@ -5,7 +5,7 @@
 import clap.server.config.s3.KakaoS3Config;
 import clap.server.common.constants.FilePathConstants;
 import clap.server.exception.S3Exception;
-import clap.server.exception.code.S3Errorcode;
+import clap.server.exception.code.AttachmentErrorcode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
@@ -34,11 +34,12 @@ public String uploadSingleFile(FilePathConstants filePrefix, MultipartFile file)
         try {
             Path filePath = getFilePath(file);
             String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename());
+
             uploadToS3(objectKey, filePath);
             Files.delete(filePath);
             return getFileUrl(objectKey);
         } catch (IOException e) {
-            throw new S3Exception(S3Errorcode.FILE_UPLOAD_REQUEST_FAILED);
+            throw new S3Exception(AttachmentErrorcode.FILE_UPLOAD_REQUEST_FAILED);
         }
     }
 
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 8211a167..7d79fadd 100644
--- a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
+++ b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
@@ -9,6 +9,7 @@
 import clap.server.common.utils.FileUtils;
 import clap.server.domain.model.member.Member;
 import clap.server.exception.ApplicationException;
+import clap.server.exception.code.AttachmentErrorcode;
 import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +27,7 @@ class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
     @Override
     public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException {
         if (!FileUtils.validImageFile(profileImage.getInputStream())) {
-            throw new ApplicationException(MemberErrorCode.UNSUPPORTED_FILE_TYPE);
+            throw new ApplicationException(AttachmentErrorcode.UNSUPPORTED_FILE_TYPE);
         }
         Member member = memberService.findActiveMember(memberId);
         String profileImageUrl = s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage);
diff --git a/src/main/java/clap/server/exception/code/S3Errorcode.java b/src/main/java/clap/server/exception/code/AttachmentErrorcode.java
similarity index 60%
rename from src/main/java/clap/server/exception/code/S3Errorcode.java
rename to src/main/java/clap/server/exception/code/AttachmentErrorcode.java
index 30fc1cf6..8992f41c 100644
--- a/src/main/java/clap/server/exception/code/S3Errorcode.java
+++ b/src/main/java/clap/server/exception/code/AttachmentErrorcode.java
@@ -6,8 +6,9 @@
 
 @Getter
 @RequiredArgsConstructor
-public enum S3Errorcode implements BaseErrorCode {
-    FILE_UPLOAD_REQUEST_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "TASK_004", "파일 업로드에 실패하였습니다.");
+public enum AttachmentErrorcode implements BaseErrorCode {
+    FILE_UPLOAD_REQUEST_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "FILE_001", "파일 업로드에 실패하였습니다."),
+    UNSUPPORTED_FILE_TYPE(HttpStatus.BAD_REQUEST, "FILE_002", "이미지가 아닌 파일 유형입니다."),;
 
     private final HttpStatus httpStatus;
     private final String customCode;
diff --git a/src/main/java/clap/server/exception/code/MemberErrorCode.java b/src/main/java/clap/server/exception/code/MemberErrorCode.java
index dae6b6ef..9e41bfda 100644
--- a/src/main/java/clap/server/exception/code/MemberErrorCode.java
+++ b/src/main/java/clap/server/exception/code/MemberErrorCode.java
@@ -10,7 +10,7 @@ public enum MemberErrorCode implements BaseErrorCode {
     MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER_001", "회원을 찾을 수 없습니다."),
     ACTIVE_MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER_002", "활성화 회원을 찾을 수 없습니다."),
     NOT_A_REVIEWER(HttpStatus.FORBIDDEN, "MEMBER_003", "리뷰어 권한이 없습니다."),
-    MEMBER_REGISTER_FAILED(HttpStatus.BAD_REQUEST, "MEMBER_004", "회원 등록에 실패하였습니다");
+    MEMBER_REGISTER_FAILED(HttpStatus.BAD_REQUEST, "MEMBER_004", "회원 등록에 실패하였습니다"),
     ;
 
     private final HttpStatus httpStatus;

From 672c0056ecc03bf6e4cc226943134337b4d69f92 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 13:25:05 +0700
Subject: [PATCH 12/20] =?UTF-8?q?CLAP-172=20Rename:=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../adapter/inbound/web/admin/ManageMemberController.java   | 6 +++---
 ...pdateMemberInfoUsecase.java => UpdateMemberUsecase.java} | 2 +-
 ...pdateMemberInfoService.java => UpdateMemberService.java} | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename src/main/java/clap/server/application/port/inbound/admin/{UpdateMemberInfoUsecase.java => UpdateMemberUsecase.java} (83%)
 rename src/main/java/clap/server/application/service/admin/{UpdateMemberInfoService.java => UpdateMemberService.java} (91%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
index c86c378c..debb9dff 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
@@ -2,7 +2,7 @@
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
-import clap.server.application.port.inbound.admin.UpdateMemberInfoUsecase;
+import clap.server.application.port.inbound.admin.UpdateMemberUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,7 +20,7 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/managements/members")
 public class ManageMemberController {
-    private final UpdateMemberInfoUsecase manageMemberUsecase;
+    private final UpdateMemberUsecase updateMemberUsecase;
 
     @Operation(summary = "회원 정보 수정 API")
     @PostMapping("/{memberId}")
@@ -28,6 +28,6 @@ public class ManageMemberController {
     public void registerMember(@AuthenticationPrincipal SecurityUserDetails userInfo,
                                @PathVariable Long memberId,
                                @RequestBody @Valid UpdateMemberInfoRequest request){
-        manageMemberUsecase.updateMemberInfo(userInfo.getUserId(), memberId, request);
+        updateMemberUsecase.updateMemberInfo(userInfo.getUserId(), memberId, request);
     }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberInfoUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java
similarity index 83%
rename from src/main/java/clap/server/application/port/inbound/admin/UpdateMemberInfoUsecase.java
rename to src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java
index 42799ded..f6b82579 100644
--- a/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberInfoUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java
@@ -2,6 +2,6 @@
 
 import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
 
-public interface UpdateMemberInfoUsecase {
+public interface UpdateMemberUsecase {
     void updateMemberInfo(Long adminId, Long memberId, UpdateMemberInfoRequest request);
 }
diff --git a/src/main/java/clap/server/application/service/admin/UpdateMemberInfoService.java b/src/main/java/clap/server/application/service/admin/UpdateMemberService.java
similarity index 91%
rename from src/main/java/clap/server/application/service/admin/UpdateMemberInfoService.java
rename to src/main/java/clap/server/application/service/admin/UpdateMemberService.java
index 79ea9d0c..86527623 100644
--- a/src/main/java/clap/server/application/service/admin/UpdateMemberInfoService.java
+++ b/src/main/java/clap/server/application/service/admin/UpdateMemberService.java
@@ -1,7 +1,7 @@
 package clap.server.application.service.admin;
 
 import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
-import clap.server.application.port.inbound.admin.UpdateMemberInfoUsecase;
+import clap.server.application.port.inbound.admin.UpdateMemberUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadDepartmentPort;
@@ -16,7 +16,7 @@
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional
-class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
+class UpdateMemberService implements UpdateMemberUsecase {
     private final MemberService memberService;
     private final CommandMemberPort commandMemberPort;
     private final LoadDepartmentPort loadDepartmentPort;

From dd22e3715216ddd778508d92c1b560e02d6652f0 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 14:01:13 +0700
Subject: [PATCH 13/20] =?UTF-8?q?CLAP-172=20Feat:=20=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=EA=B3=BC=EC=A0=95=EC=97=90=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EC=84=A4=EC=A0=95=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../dto/member/MemberDetailInfoResponse.java   |  4 +++-
 .../server/domain/model/member/Member.java     |  3 +++
 .../model/member/MemberNotification.java       | 18 ------------------
 3 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 src/main/java/clap/server/domain/model/member/MemberNotification.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java
index 83a848e5..2327bdb2 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java
@@ -15,7 +15,9 @@ public record MemberDetailInfoResponse(
         Boolean isReviewer,
         @Schema(description = "회원 역할")
         MemberRole role,
-        @Schema(description = "회원 직책")
+        @Schema(description = "부서")
+        String departmentName,
+        @Schema(description = "직책")
         String departmentRole,
         @Schema(description = "알림 수신 여부")
         NotificationSettingInfoResponse notificationSettingInfo
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 c5b61ee6..98816425 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -53,6 +53,9 @@ public void resetPassword(String newEncodedPassword) {
     public void resetPasswordAndActivateMember(String newEncodedPassword) {
         this.password = newEncodedPassword;
         this.status = MemberStatus.ACTIVE;
+        this.agitNotificationEnabled = true;
+        this.emailNotificationEnabled = true;
+        this.kakaoWorkNotificationEnabled = true;
     }
 
     public String getNickname() {
diff --git a/src/main/java/clap/server/domain/model/member/MemberNotification.java b/src/main/java/clap/server/domain/model/member/MemberNotification.java
deleted file mode 100644
index 2e41018c..00000000
--- a/src/main/java/clap/server/domain/model/member/MemberNotification.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package clap.server.domain.model.member;
-
-import clap.server.domain.model.common.BaseTime;
-import clap.server.domain.model.notification.NotificationChannel;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-@Getter
-@SuperBuilder
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class MemberNotification extends BaseTime {
-    private Long memberNotificationId;
-    private Boolean isEnabled;
-    private Member member;
-    private NotificationChannel notificationChannel;
- }

From 10a0b8753fa5139292b907ee0df38a3d19c1a3a9 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 14:01:42 +0700
Subject: [PATCH 14/20] =?UTF-8?q?CLAP-172=20Fix:=20=EC=98=A4=ED=83=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 src/main/java/clap/server/application/mapper/MemberMapper.java   | 1 +
 .../server/application/service/member/MemberInfoService.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/clap/server/application/mapper/MemberMapper.java b/src/main/java/clap/server/application/mapper/MemberMapper.java
index df52bc4d..804a339a 100644
--- a/src/main/java/clap/server/application/mapper/MemberMapper.java
+++ b/src/main/java/clap/server/application/mapper/MemberMapper.java
@@ -28,6 +28,7 @@ public static MemberDetailInfoResponse toMemberDetailInfoResponse(Member member)
                 member.getImageUrl(),
                 member.isReviewer(),
                 member.getMemberInfo().getRole(),
+                member.getMemberInfo().getDepartment().getName(),
                 member.getMemberInfo().getDepartmentRole(),
                 toNotificationSettingInfoResponse(member)
         );
diff --git a/src/main/java/clap/server/application/service/member/MemberInfoService.java b/src/main/java/clap/server/application/service/member/MemberInfoService.java
index d8b7efc8..d4e993d8 100644
--- a/src/main/java/clap/server/application/service/member/MemberInfoService.java
+++ b/src/main/java/clap/server/application/service/member/MemberInfoService.java
@@ -26,6 +26,7 @@ public MemberProfileResponse getMemberProfile(Long memberId) {
     }
 
     @Override
+    @Transactional(readOnly = true)
     public MemberDetailInfoResponse getMemberInfo(Long memberId) {
         Member member = memberService.findActiveMember(memberId);
         return toMemberDetailInfoResponse(member);

From ea4a2d54470664ee4ad074aa04d4904bba347afd Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 14:42:47 +0700
Subject: [PATCH 15/20] =?UTF-8?q?CLAP-172=20Rename:=20dto=EB=AA=85=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../adapter/inbound/web/admin/ManageMemberController.java     | 4 ++--
 ...{UpdateMemberInfoRequest.java => UpdateMemberRequest.java} | 2 +-
 .../application/port/inbound/admin/UpdateMemberUsecase.java   | 4 ++--
 .../server/application/service/admin/UpdateMemberService.java | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/clap/server/adapter/inbound/web/dto/admin/{UpdateMemberInfoRequest.java => UpdateMemberRequest.java} (96%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
index debb9dff..fa4a068f 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java
@@ -1,7 +1,7 @@
 package clap.server.adapter.inbound.web.admin;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
-import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
+import clap.server.adapter.inbound.web.dto.admin.UpdateMemberRequest;
 import clap.server.application.port.inbound.admin.UpdateMemberUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,7 +27,7 @@ public class ManageMemberController {
     @Secured("ROLE_ADMIN")
     public void registerMember(@AuthenticationPrincipal SecurityUserDetails userInfo,
                                @PathVariable Long memberId,
-                               @RequestBody @Valid UpdateMemberInfoRequest request){
+                               @RequestBody @Valid UpdateMemberRequest request){
         updateMemberUsecase.updateMemberInfo(userInfo.getUserId(), memberId, request);
     }
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateMemberInfoRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateMemberRequest.java
similarity index 96%
rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateMemberInfoRequest.java
rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateMemberRequest.java
index 1aa4f905..8616fb4c 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateMemberInfoRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateMemberRequest.java
@@ -6,7 +6,7 @@
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 
-public record UpdateMemberInfoRequest(
+public record UpdateMemberRequest(
         @NotBlank @Schema(description = "회원 이름", example = "서주원")
         String name,
         @NotBlank
diff --git a/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java
index f6b82579..ea4c6c36 100644
--- a/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java
@@ -1,7 +1,7 @@
 package clap.server.application.port.inbound.admin;
 
-import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
+import clap.server.adapter.inbound.web.dto.admin.UpdateMemberRequest;
 
 public interface UpdateMemberUsecase {
-    void updateMemberInfo(Long adminId, Long memberId, UpdateMemberInfoRequest request);
+    void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest request);
 }
diff --git a/src/main/java/clap/server/application/service/admin/UpdateMemberService.java b/src/main/java/clap/server/application/service/admin/UpdateMemberService.java
index 86527623..862a24d5 100644
--- a/src/main/java/clap/server/application/service/admin/UpdateMemberService.java
+++ b/src/main/java/clap/server/application/service/admin/UpdateMemberService.java
@@ -1,6 +1,6 @@
 package clap.server.application.service.admin;
 
-import clap.server.adapter.inbound.web.dto.admin.UpdateMemberInfoRequest;
+import clap.server.adapter.inbound.web.dto.admin.UpdateMemberRequest;
 import clap.server.application.port.inbound.admin.UpdateMemberUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.member.CommandMemberPort;
@@ -22,7 +22,7 @@ class UpdateMemberService implements UpdateMemberUsecase {
     private final LoadDepartmentPort loadDepartmentPort;
 
     @Override
-    public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberInfoRequest request) {
+    public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest request) {
         Member member = memberService.findActiveMember(memberId);
         Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(() ->
                 new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));

From c6dbe49c33d4e4cd9d57fa07537e261a5bed65cb Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 14:44:12 +0700
Subject: [PATCH 16/20] =?UTF-8?q?CLAP-172=20Feat:=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=EA=B0=80=20null=20=EB=98=90=EB=8A=94=20empty=EC=9D=BC?=
 =?UTF-8?q?=20=EB=95=8C=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../service/member/UpdateMemberInfoService.java   | 15 ++++++++++-----
 .../clap/server/domain/model/member/Member.java   |  4 +++-
 2 files changed, 13 insertions(+), 6 deletions(-)

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 7d79fadd..3c6271fd 100644
--- a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
+++ b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
@@ -3,6 +3,7 @@
 import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.member.UpdateMemberInfoUsecase;
+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.common.constants.FilePathConstants;
@@ -10,7 +11,6 @@
 import clap.server.domain.model.member.Member;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.AttachmentErrorcode;
-import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -23,15 +23,20 @@
 class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
     private final MemberService memberService;
     private final S3UploadPort s3UploadPort;
+    private final CommandMemberPort commandMemberPort;
 
     @Override
     public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException {
-        if (!FileUtils.validImageFile(profileImage.getInputStream())) {
-            throw new ApplicationException(AttachmentErrorcode.UNSUPPORTED_FILE_TYPE);
-        }
         Member member = memberService.findActiveMember(memberId);
-        String profileImageUrl = s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage);
+        String profileImageUrl = null;
+        if (!profileImage.isEmpty()){
+            if(!FileUtils.validImageFile(profileImage.getInputStream())) {
+                throw new ApplicationException(AttachmentErrorcode.UNSUPPORTED_FILE_TYPE);
+            }
+            profileImageUrl = s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage);
+        }
         member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(),
                 request.kakaoWorkNotification(), profileImageUrl);
+        commandMemberPort.save(member);
     }
 }
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 98816425..7b88eb6b 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -71,6 +71,8 @@ public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boole
         this.agitNotificationEnabled = agitNotificationEnabled;
         this.emailNotificationEnabled = emailNotificationEnabled;
         this.kakaoWorkNotificationEnabled = kakaoWorkNotificationEnabled;
-        this.imageUrl = imageUrl;
+        if (imageUrl != null) {
+            this.imageUrl = imageUrl;
+        }
     }
 }

From 06c57a43ac25f1ada78c33ca33c0c12c68e5e89d Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 14:44:40 +0700
Subject: [PATCH 17/20] =?UTF-8?q?CLAP-172=20Feat:=20=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?=EC=9D=84=20=EC=84=A0=ED=83=9D=EC=A0=81=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B0=9B=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/inbound/web/task/ManagementTaskController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
index b45238b1..a8caae72 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
@@ -34,7 +34,7 @@ public class ManagementTaskController {
     @Secured({"ROLE_MANAGER", "ROLE_USER"})
     public ResponseEntity<CreateTaskResponse> createTask(
             @RequestPart(name = "taskInfo") @Valid CreateTaskRequest createTaskRequest,
-            @RequestPart(name = "attachment") @NotNull  List<MultipartFile> attachments,
+            @RequestPart(name = "attachment", required = false) @NotNull  List<MultipartFile> attachments,
             @AuthenticationPrincipal SecurityUserDetails userInfo
             ){
             return ResponseEntity.ok(createTaskUsecase.createTask(userInfo.getUserId(), createTaskRequest, attachments));
@@ -46,7 +46,7 @@ public ResponseEntity<CreateTaskResponse> createTask(
     public ResponseEntity<UpdateTaskResponse> updateTask(
             @PathVariable @NotNull Long taskId,
             @RequestPart(name = "taskInfo") @Valid UpdateTaskRequest updateTaskRequest,
-            @RequestPart(name = "attachment") @NotNull  List<MultipartFile> attachments,
+            @RequestPart(name = "attachment", required = false) @NotNull  List<MultipartFile> attachments,
             @AuthenticationPrincipal SecurityUserDetails userInfo){
         return ResponseEntity.ok(updateTaskUsecase.updateTask(userInfo.getUserId(), taskId, updateTaskRequest, attachments));
     }

From b1d24368dee06c6f02eb1297cb1771ae9ddfc0ce Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 14:45:08 +0700
Subject: [PATCH 18/20] =?UTF-8?q?CLAP-172=20Feat:=20=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20API=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../inbound/web/member/MemberInfoController.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 7f490949..46d9ce8e 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
@@ -11,13 +11,17 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+
 @Tag(name = "01. Member", description = "회원 정보 조회 및 수정 API")
 @WebAdapter
 @RequiredArgsConstructor
@@ -33,9 +37,18 @@ public ResponseEntity<MemberProfileResponse> getMemberProfile(@AuthenticationPri
         return ResponseEntity.ok(memberProfileUsecase.getMemberProfile(userInfo.getUserId()));
     }
 
-    @Operation(summary = "회원 프로필 조회 API")
+    @Operation(summary = "회원 상세 정보 조회 API")
     @GetMapping("/info")
     public ResponseEntity<MemberDetailInfoResponse> getMemberDetailInfo(@AuthenticationPrincipal SecurityUserDetails userInfo) {
         return ResponseEntity.ok(memberDetailInfoUsecase.getMemberInfo(userInfo.getUserId()));
     }
+
+    @Operation(summary = "회원 정보 수정 API", description = "이미지 수정이 없을 시에는 profileImage를 보내지 않습니다.")
+    @PatchMapping(value = "/info", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE, MediaType.APPLICATION_JSON_VALUE})
+    public void updateMemberDetailInfo(
+            @RequestPart(name = "memberInfo") UpdateMemberInfoRequest request,
+            @RequestPart(name = "profileImage", required = false) MultipartFile profileImage,
+            @AuthenticationPrincipal SecurityUserDetails userInfo) throws IOException {
+        updateMemberInfoUsecase.updateMemberInfo(userInfo.getUserId(), request, profileImage);
+    }
 }

From 0a8fc37fccc5ac274424591f478e227b668b929b Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 18:39:53 +0700
Subject: [PATCH 19/20] CLAP-172 Feat: merge conflict slove
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 src/main/java/clap/server/domain/model/member/Member.java | 2 ++
 1 file changed, 2 insertions(+)

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 b3d70bf3..6ffcf101 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -74,6 +74,8 @@ public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boole
         if (imageUrl != null) {
             this.imageUrl = imageUrl;
         }
+    }
+
     public void setStatusDeleted() {
         this.status = MemberStatus.DELETED;
     }

From a5d081f04f02d36f785f87bcbda854d438885550 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Thu, 30 Jan 2025 21:03:23 +0700
Subject: [PATCH 20/20] =?UTF-8?q?CLAP-172=20Remove:=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #164
---
 .../clap/server/application/service/task/UpdateTaskService.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
index 06d59405..214f9348 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -1,7 +1,6 @@
 package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.*;
-import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
@@ -47,7 +46,6 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
     private final CommandAttachmentPort commandAttachmentPort;
     private final S3UploadPort s3UploadPort;
     private final CommandTaskHistoryPort commandTaskHistoryPort;
-    private final S3UploadAdapter s3UploadAdapter;
 
     @Override
     @Transactional