From 55c475c8b14270146b4843ccc9dbca7dc8beb81e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 23:04:52 +0900
Subject: [PATCH 1/7] =?UTF-8?q?CLAP-269=20Refactor:=20=EB=B6=80=EC=84=9C?=
 =?UTF-8?q?=EB=A5=BC=20=ED=95=9C=EB=B2=88=EC=97=90=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20=ED=95=B4=EB=8B=B9=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=B6=80=EC=84=9C=EC=97=90=20=EB=A7=A4=ED=95=91=ED=95=98?=
 =?UTF-8?q?=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

<footer>
- 관련: #306
---
 .../persistense/DepartmentPersistentAdapter.java         | 9 +++++++++
 .../repository/member/DepartmentRepository.java          | 4 ++++
 .../port/outbound/member/LoadDepartmentPort.java         | 2 ++
 3 files changed, 15 insertions(+)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/DepartmentPersistentAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/DepartmentPersistentAdapter.java
index 024350c0..75efb2ab 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/DepartmentPersistentAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/DepartmentPersistentAdapter.java
@@ -1,6 +1,7 @@
 package clap.server.adapter.outbound.persistense;
 
 import clap.server.adapter.outbound.persistense.entity.member.DepartmentEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.DepartmentStatus;
 import clap.server.adapter.outbound.persistense.mapper.DepartmentPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.member.DepartmentRepository;
 import clap.server.application.port.outbound.member.CommandDepartmentPort;
@@ -9,6 +10,7 @@
 import clap.server.domain.model.member.Department;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
 import java.util.Optional;
 
 @PersistenceAdapter
@@ -22,4 +24,11 @@ public Optional<Department> findById(final Long id) {
         Optional<DepartmentEntity> departmentEntity = departmentRepository.findById(id);
         return departmentEntity.map(departmentPersistenceMapper::toDomain);
     }
+
+    @Override
+    public List<Department> findActiveDepartments() {
+        return departmentRepository.findAllByStatusIs(DepartmentStatus.ACTIVE).stream()
+                .map(departmentPersistenceMapper::toDomain).toList();
+    }
+
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/DepartmentRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/DepartmentRepository.java
index 9df573d0..394701c1 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/DepartmentRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/DepartmentRepository.java
@@ -1,9 +1,13 @@
 package clap.server.adapter.outbound.persistense.repository.member;
 
 import clap.server.adapter.outbound.persistense.entity.member.DepartmentEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.DepartmentStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Long> {
+    List<DepartmentEntity> findAllByStatusIs(DepartmentStatus status);
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadDepartmentPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadDepartmentPort.java
index 69fc1f4f..a682f1b6 100644
--- a/src/main/java/clap/server/application/port/outbound/member/LoadDepartmentPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/LoadDepartmentPort.java
@@ -2,8 +2,10 @@
 
 import clap.server.domain.model.member.Department;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface LoadDepartmentPort {
     Optional<Department> findById(Long id);
+    List<Department> findActiveDepartments();
 }
\ No newline at end of file

From 52d66cc27045478594c530cd952c8a02d0d14251 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 23:05:22 +0900
Subject: [PATCH 2/7] =?UTF-8?q?CLAP-269=20Feat:=20=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?=EC=9D=98=20=EC=8B=A4=EC=A0=9C=20=ED=83=80=EC=9E=85=EC=9D=84=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=ED=95=98=EC=97=AC=20=EC=9C=A0=ED=9A=A8?=
 =?UTF-8?q?=EC=84=B1=EC=9D=84=20=EA=B2=80=EC=A6=9D=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #306
---
 .../admin/RegisterMemberCSVService.java       | 19 +++++++++++++------
 .../member/UpdateMemberInfoService.java       |  4 ++--
 ...{FileUtils.java => FileTypeValidator.java} | 19 ++++++++++++++++---
 .../admin/RegisterMemberCSVServiceTest.java   |  9 +++++----
 4 files changed, 36 insertions(+), 15 deletions(-)
 rename src/main/java/clap/server/common/utils/{FileUtils.java => FileTypeValidator.java} (56%)

diff --git a/src/main/java/clap/server/application/service/admin/RegisterMemberCSVService.java b/src/main/java/clap/server/application/service/admin/RegisterMemberCSVService.java
index 1b9068e6..59ebb1b5 100644
--- a/src/main/java/clap/server/application/service/admin/RegisterMemberCSVService.java
+++ b/src/main/java/clap/server/application/service/admin/RegisterMemberCSVService.java
@@ -4,11 +4,15 @@
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 @ApplicationService
@@ -20,13 +24,16 @@ public class RegisterMemberCSVService implements RegisterMemberCSVUsecase {
 
     @Override
     @Transactional
-    public int registerMembersFromCsv(Long adminId, MultipartFile file) {
-        List<Member> members = csvParser.parse(file);
+    public int registerMembersFromCsv(Long adminId, MultipartFile file) throws IOException {
+        if (!FileTypeValidator.validCSVFile(file.getInputStream())) {
+            throw new ApplicationException(FileErrorcode.UNSUPPORTED_FILE_TYPE);
+        }
+
+        List<Member> members = csvParser.parseDataAndMapToMember(file);
         Member admin = memberService.findActiveMember(adminId);
-        members.forEach(member -> {
-            member.register(admin);
-            commandMemberPort.save(member);
-        });
+        members.forEach(member -> {member.register(admin);});
+
+        commandMemberPort.saveAll(members);
         return members.size();
     }
 }
\ No newline at end of file
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 7e5afb8d..2b3cefc9 100644
--- a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
+++ b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
@@ -6,7 +6,7 @@
 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.FileUtils;
+import clap.server.common.utils.FileTypeValidator;
 import clap.server.domain.model.member.Member;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.FileErrorcode;
@@ -25,7 +25,7 @@ class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
 
     @Override
     public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException {
-        if (!FileUtils.validImageFile(profileImage.getInputStream())) {
+        if (!FileTypeValidator.validImageFile(profileImage.getInputStream())) {
             throw new ApplicationException(FileErrorcode.UNSUPPORTED_FILE_TYPE);
         }
         Member member = memberService.findActiveMember(memberId);
diff --git a/src/main/java/clap/server/common/utils/FileUtils.java b/src/main/java/clap/server/common/utils/FileTypeValidator.java
similarity index 56%
rename from src/main/java/clap/server/common/utils/FileUtils.java
rename to src/main/java/clap/server/common/utils/FileTypeValidator.java
index 5a5b7d97..85963d38 100644
--- a/src/main/java/clap/server/common/utils/FileUtils.java
+++ b/src/main/java/clap/server/common/utils/FileTypeValidator.java
@@ -7,8 +7,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class FileUtils {
-    private FileUtils() {
+public class FileTypeValidator {
+    private FileTypeValidator() {
         throw new IllegalStateException("Utility class");
     }
 
@@ -16,11 +16,24 @@ private FileUtils() {
     private static final List<String> VALID_IMAGE_TYPES = Arrays.asList(
             "image/jpeg", "image/pjpeg", "image/png", "image/gif", "image/bmp", "image/x-windows-bmp"
     );
+    private static final List<String> VALID_DOCS_TYPES = Arrays.asList(
+            "text/csv",
+            "application/vnd.ms-excel",
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    );
 
-    public static boolean validImageFile(InputStream inputStream) {
+    public static boolean validCSVFile(InputStream inputStream) {
         try {
             String mimeType = tika.detect(inputStream);
+            return VALID_DOCS_TYPES.contains(mimeType.toLowerCase());
+        } catch (IOException e) {
+            return false;
+        }
+    }
 
+    public static boolean validImageFile(InputStream inputStream) {
+        try {
+            String mimeType = tika.detect(inputStream);
             return VALID_IMAGE_TYPES.contains(mimeType.toLowerCase());
         } catch (IOException e) {
             return false;
diff --git a/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java b/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
index 0d8bdf43..25427637 100644
--- a/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
+++ b/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
@@ -11,6 +11,7 @@
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -37,7 +38,7 @@ void setup() {
      * - 주어진 CSV 파일을 정상적으로 파싱하여 회원이 등록되는지 검증
      */
     @Test
-    void testRegisterMembersFromCsvSuccess() {
+    void testRegisterMembersFromCsvSuccess() throws IOException {
         Long adminId = 1L;
         MultipartFile file = new MockMultipartFile("file", "members.csv", "text/csv", "dummy-content".getBytes());
 
@@ -45,7 +46,7 @@ void testRegisterMembersFromCsvSuccess() {
         List<Member> parsedMembers = List.of(Mockito.mock(Member.class), Mockito.mock(Member.class));
 
         when(memberService.findActiveMember(adminId)).thenReturn(admin);
-        when(csvParseService.parse(file)).thenReturn(parsedMembers);
+        when(csvParseService.parseDataAndMapToMember(file)).thenReturn(parsedMembers);
 
         int addedCount = registerMemberCSVService.registerMembersFromCsv(adminId, file);
 
@@ -83,7 +84,7 @@ void testRegisterMembersFromCsvThrowsWhenCsvParsingFails() {
         MultipartFile file = new MockMultipartFile("file", "members.csv", "text/csv", "dummy-content".getBytes());
 
         // ✅ Mock 객체 설정: CSV 파싱 과정에서 예외 발생하도록 설정
-        when(csvParseService.parse(file)).thenThrow(new ApplicationException(MemberErrorCode.CSV_PARSING_ERROR));
+        when(csvParseService.parseDataAndMapToMember(file)).thenThrow(new ApplicationException(MemberErrorCode.CSV_PARSING_ERROR));
 
         // 🔹 유스케이스 실행 및 예외 검증
         ApplicationException exception = assertThrows(ApplicationException.class, () -> {
@@ -110,7 +111,7 @@ void testRegisterMembersFromCsvThrowsWhenSavingMemberFails() {
 
         //  특정 회원 등록 중 예외 발생
         when(memberService.findActiveMember(adminId)).thenReturn(admin);
-        when(csvParseService.parse(file)).thenReturn(parsedMembers);
+        when(csvParseService.parseDataAndMapToMember(file)).thenReturn(parsedMembers);
         doThrow(new ApplicationException(MemberErrorCode.MEMBER_REGISTRATION_FAILED))
                 .when(commandMemberPort).save(failingMember);
 

From fefdfc992bcffe44ee10ca3504e94f813ba334d1 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 23:05:46 +0900
Subject: [PATCH 3/7] =?UTF-8?q?CLAP-269=20Refactor:=20=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=20=EC=A0=80=EC=9E=A5=20=EC=8B=9C=EC=97=90=20=EC=9D=BC=EA=B4=84?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=80=EC=9E=A5=EB=90=98=EB=8F=84=EB=A1=9D=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>
- 관련: #306
---
 .../persistense/MemberPersistenceAdapter.java |  6 +++++
 .../admin/RegisterMemberCSVUsecase.java       |  4 ++-
 .../outbound/member/CommandMemberPort.java    |  3 +++
 .../service/admin/CsvParseService.java        | 25 +++++++++++--------
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index b307b27e..8d04e98f 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -73,6 +73,12 @@ public void save(final Member member) {
         memberRepository.save(memberEntity);
     }
 
+    @Override
+    public void saveAll(List<Member> members) {
+        List<MemberEntity> memberEntities = members.stream().map(memberPersistenceMapper::toEntity).toList();
+        memberRepository.saveAll(memberEntities);
+    }
+
     @Override
     public List<Member> findActiveManagers() {
         List<MemberEntity> memberEntities = memberRepository.findByRoleAndStatus(MemberRole.valueOf("ROLE_MANAGER"), MemberStatus.ACTIVE);
diff --git a/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberCSVUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberCSVUsecase.java
index c3e33ccb..440fd8c2 100644
--- a/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberCSVUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberCSVUsecase.java
@@ -2,6 +2,8 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+
 public interface RegisterMemberCSVUsecase {
-    int registerMembersFromCsv(Long adminId, MultipartFile file);
+    int registerMembersFromCsv(Long adminId, MultipartFile file) throws IOException;
 }
diff --git a/src/main/java/clap/server/application/port/outbound/member/CommandMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/CommandMemberPort.java
index 5ad3903d..5c618fc1 100644
--- a/src/main/java/clap/server/application/port/outbound/member/CommandMemberPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/CommandMemberPort.java
@@ -2,6 +2,9 @@
 
 import clap.server.domain.model.member.Member;
 
+import java.util.List;
+
 public interface CommandMemberPort {
     void save(Member member);
+    void saveAll(List<Member> members);
 }
diff --git a/src/main/java/clap/server/application/service/admin/CsvParseService.java b/src/main/java/clap/server/application/service/admin/CsvParseService.java
index b6fd6646..aeaed78c 100644
--- a/src/main/java/clap/server/application/service/admin/CsvParseService.java
+++ b/src/main/java/clap/server/application/service/admin/CsvParseService.java
@@ -1,16 +1,16 @@
 package clap.server.application.service.admin;
 
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.application.port.outbound.member.LoadDepartmentPort;
-import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Department;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.member.MemberInfo;
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.DepartmentErrorCode;
 import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.BufferedReader;
@@ -24,38 +24,41 @@
 
 
 @Slf4j
-@ApplicationService
+@Service
 @RequiredArgsConstructor
 public class CsvParseService {
 
     private final LoadDepartmentPort loadDepartmentPort;
 
-    public List<Member> parse(MultipartFile file) {
+    public List<Member> parseDataAndMapToMember(MultipartFile file) {
         List<Member> members = new ArrayList<>();
+        List<Department> departments = loadDepartmentPort.findActiveDepartments();
+
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getInputStream()))) {
             // 첫 번째 줄은 헤더로 간주하고 다음 줄부터 파싱
             String headerLine = reader.readLine();
             if (headerLine == null) {
-                throw ApplicationException.from(MemberErrorCode.INVALID_CSV_FORMAT);
+                throw new ApplicationException(MemberErrorCode.INVALID_CSV_FORMAT);
             }
             String line;
             while ((line = reader.readLine()) != null) {
                 String[] fields = line.split(",");
                 if (fields.length != 7) {
-                    throw ApplicationException.from(MemberErrorCode.INVALID_CSV_FORMAT);
+                    throw new ApplicationException(MemberErrorCode.INVALID_CSV_FORMAT);
                 }
-                members.add(mapToMember(fields));
+                members.add(mapToMember(fields, departments));
             }
         } catch (IOException e) {
-            throw ApplicationException.from(MemberErrorCode.CSV_PARSING_ERROR);
+            throw new ApplicationException(MemberErrorCode.CSV_PARSING_ERROR);
         }
         return members;
     }
 
-    private Member mapToMember(String[] fields) {
-        // 부서 ID로 Department 객체 조회
+    private Member mapToMember(String[] fields, List<Department> departments) {
         Long departmentId = Long.parseLong(fields[2].trim());
-        Department department = loadDepartmentPort.findById(departmentId)
+        Department department = departments.stream()
+                .filter(dept -> dept.getDepartmentId().equals(departmentId))
+                .findFirst()
                 .orElseThrow(() -> new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
 
         MemberInfo memberInfo = toMemberInfo(

From fa864bf82737e6efc46545350c7e311848c32d03 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 23:09:51 +0900
Subject: [PATCH 4/7] =?UTF-8?q?CLAP-269=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>
- 관련: #306
---
 .../inbound/security/handler/JwtAccessDeniedHandler.java      | 1 -
 .../inbound/web/admin/RegisterMemberCsvController.java        | 4 +++-
 src/main/java/clap/server/exception/code/FileErrorcode.java   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/security/handler/JwtAccessDeniedHandler.java b/src/main/java/clap/server/adapter/inbound/security/handler/JwtAccessDeniedHandler.java
index 728c3218..22fbf136 100644
--- a/src/main/java/clap/server/adapter/inbound/security/handler/JwtAccessDeniedHandler.java
+++ b/src/main/java/clap/server/adapter/inbound/security/handler/JwtAccessDeniedHandler.java
@@ -23,7 +23,6 @@ public void handle(
     ) throws IOException, ServletException {
         AuthErrorCode errorCode = AuthErrorCode.FORBIDDEN;
 
-        response.setContentType("application/json;charset=UTF-8");
         response.setStatus(errorCode.getHttpStatus().value());
         response.getWriter().write(errorCode.getCustomCode());
     }
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java b/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java
index 1f4390e1..d550dbc4 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java
@@ -13,6 +13,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+
 @Tag(name = "05. Admin")
 @WebAdapter
 @RequestMapping("/api/managements")
@@ -28,7 +30,7 @@ public RegisterMemberCsvController(RegisterMemberCSVUsecase registerMemberCSVUse
     @Secured("ROLE_ADMIN")
     public ResponseEntity<String> registerMembersFromCsv(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
-            @RequestParam("file") MultipartFile file) {
+            @RequestParam("file") MultipartFile file) throws IOException {
         int addedCount = registerMemberCSVUsecase.registerMembersFromCsv(userInfo.getUserId(), file);
         return ResponseEntity.ok(addedCount + "명의 회원이 등록되었습니다.");
     }
diff --git a/src/main/java/clap/server/exception/code/FileErrorcode.java b/src/main/java/clap/server/exception/code/FileErrorcode.java
index 1e3e47fc..dae4869f 100644
--- a/src/main/java/clap/server/exception/code/FileErrorcode.java
+++ b/src/main/java/clap/server/exception/code/FileErrorcode.java
@@ -8,7 +8,7 @@
 @RequiredArgsConstructor
 public enum FileErrorcode implements BaseErrorCode {
     FILE_UPLOAD_REQUEST_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "FILE_001", "파일 업로드에 실패하였습니다."),
-    UNSUPPORTED_FILE_TYPE(HttpStatus.BAD_REQUEST, "FILE_002", "이미지가 아닌 파일 유형입니다."),;
+    UNSUPPORTED_FILE_TYPE(HttpStatus.BAD_REQUEST, "FILE_002", "유효하지 않은 파일 유형입니다."),;
 
     private final HttpStatus httpStatus;
     private final String customCode;

From 847a2ce7b15cba2fc9887049488fa72b177a30f1 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 23:12:25 +0900
Subject: [PATCH 5/7] =?UTF-8?q?CLAP-269=20Refactor:=20=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?=20=ED=83=80=EC=9E=85=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20=EA=B2=80?=
 =?UTF-8?q?=EC=A6=9D=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=EB=8B=A8?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #306
---
 .../inbound/web/admin/RegisterMemberCsvController.java |  7 +++++++
 .../service/admin/RegisterMemberCSVService.java        | 10 +---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java b/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java
index d550dbc4..9dd219e9 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java
@@ -3,6 +3,10 @@
 import clap.server.adapter.inbound.security.service.SecurityUserDetails;
 import clap.server.application.port.inbound.admin.RegisterMemberCSVUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
+import clap.server.common.utils.FileTypeValidator;
+import clap.server.exception.AdapterException;
+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 org.springframework.http.ResponseEntity;
@@ -31,6 +35,9 @@ public RegisterMemberCsvController(RegisterMemberCSVUsecase registerMemberCSVUse
     public ResponseEntity<String> registerMembersFromCsv(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @RequestParam("file") MultipartFile file) throws IOException {
+        if (!FileTypeValidator.validCSVFile(file.getInputStream())) {
+            throw new AdapterException(FileErrorcode.UNSUPPORTED_FILE_TYPE);
+        }
         int addedCount = registerMemberCSVUsecase.registerMembersFromCsv(userInfo.getUserId(), file);
         return ResponseEntity.ok(addedCount + "명의 회원이 등록되었습니다.");
     }
diff --git a/src/main/java/clap/server/application/service/admin/RegisterMemberCSVService.java b/src/main/java/clap/server/application/service/admin/RegisterMemberCSVService.java
index 59ebb1b5..76261543 100644
--- a/src/main/java/clap/server/application/service/admin/RegisterMemberCSVService.java
+++ b/src/main/java/clap/server/application/service/admin/RegisterMemberCSVService.java
@@ -4,15 +4,11 @@
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.common.annotation.architecture.ApplicationService;
-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 lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 @ApplicationService
@@ -24,11 +20,7 @@ public class RegisterMemberCSVService implements RegisterMemberCSVUsecase {
 
     @Override
     @Transactional
-    public int registerMembersFromCsv(Long adminId, MultipartFile file) throws IOException {
-        if (!FileTypeValidator.validCSVFile(file.getInputStream())) {
-            throw new ApplicationException(FileErrorcode.UNSUPPORTED_FILE_TYPE);
-        }
-
+    public int registerMembersFromCsv(Long adminId, MultipartFile file) {
         List<Member> members = csvParser.parseDataAndMapToMember(file);
         Member admin = memberService.findActiveMember(adminId);
         members.forEach(member -> {member.register(admin);});

From 896491289c31cb01f4b8b91fe24b86345ee72dfa Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 23:16:56 +0900
Subject: [PATCH 6/7] =?UTF-8?q?CLAP-269=20Docs:=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0=EB=A5=B8=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=B0=8F=20displayname=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #306
---
 .../inbound/admin/RegisterMemberCSVUsecase.java    |  4 +---
 .../admin/RegisterMemberCSVServiceTest.java        | 14 ++++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberCSVUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberCSVUsecase.java
index 440fd8c2..c3e33ccb 100644
--- a/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberCSVUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberCSVUsecase.java
@@ -2,8 +2,6 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-
 public interface RegisterMemberCSVUsecase {
-    int registerMembersFromCsv(Long adminId, MultipartFile file) throws IOException;
+    int registerMembersFromCsv(Long adminId, MultipartFile file);
 }
diff --git a/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java b/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
index 25427637..968d00e8 100644
--- a/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
+++ b/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
@@ -6,6 +6,7 @@
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.MemberErrorCode;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.mock.web.MockMultipartFile;
@@ -38,7 +39,8 @@ void setup() {
      * - 주어진 CSV 파일을 정상적으로 파싱하여 회원이 등록되는지 검증
      */
     @Test
-    void testRegisterMembersFromCsvSuccess() throws IOException {
+    @DisplayName("CSV 파일에서 회원 정보를 성공적으로 파싱하고 등록하는지 검증한다.")
+    void testRegisterMembersFromCsvSuccess() {
         Long adminId = 1L;
         MultipartFile file = new MockMultipartFile("file", "members.csv", "text/csv", "dummy-content".getBytes());
 
@@ -51,15 +53,17 @@ void testRegisterMembersFromCsvSuccess() throws IOException {
         int addedCount = registerMemberCSVService.registerMembersFromCsv(adminId, file);
 
         assertEquals(2, addedCount);
-        verify(commandMemberPort, times(2)).save(any(Member.class));
-        verify(parsedMembers.get(0), times(1)).register(admin);
-        verify(parsedMembers.get(1), times(1)).register(admin);
+        verify(commandMemberPort).saveAll(parsedMembers);
+        verify(parsedMembers.get(0)).register(admin);
+        verify(parsedMembers.get(1)).register(admin);
     }
 
+
     /**
      * ❌ 관리자 찾기 실패 (MEMBER_NOT_FOUND)
      */
     @Test
+    @DisplayName("관리자가 존재하지 않을 때 CSV 회원 등록 시 예외가 발생한다.")
     void testRegisterMembersFromCsvThrowsWhenAdminNotFound() {
         Long adminId = 99L;
         MultipartFile file = new MockMultipartFile("file", "members.csv", "text/csv", "dummy-content".getBytes());
@@ -79,6 +83,7 @@ void testRegisterMembersFromCsvThrowsWhenAdminNotFound() {
      * ❌ CSV 파싱 실패 (CSV_PARSING_ERROR)
      */
     @Test
+    @DisplayName("CSV 파싱 실패 시 예외 발생 및 회원 등록이 실패한다.")
     void testRegisterMembersFromCsvThrowsWhenCsvParsingFails() {
         Long adminId = 1L;
         MultipartFile file = new MockMultipartFile("file", "members.csv", "text/csv", "dummy-content".getBytes());
@@ -101,6 +106,7 @@ void testRegisterMembersFromCsvThrowsWhenCsvParsingFails() {
      *
      */
     @Test
+    @DisplayName("회원 등록 과정 중 실패 시 예외 발생 및 부분 저장 된다.")
     void testRegisterMembersFromCsvThrowsWhenSavingMemberFails() {
         Long adminId = 1L;
         MultipartFile file = new MockMultipartFile("file", "members.csv", "text/csv", "dummy-content".getBytes());

From 6adf9dece5781e2b2a9a1232c9d0fe6b3a5a8e04 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 23:24:53 +0900
Subject: [PATCH 7/7] =?UTF-8?q?CLAP-269=20Docs:=20=EB=B6=80=EB=B6=84=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=EC=97=90=20=EB=8C=80=ED=95=9C=20=EA=B8=B0?=
 =?UTF-8?q?=ED=9A=8D=20=EA=B2=80=ED=86=A0=20=ED=95=84=EC=9A=94=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=A3=BC?=
 =?UTF-8?q?=EC=84=9D=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #306
---
 .../admin/RegisterMemberCSVServiceTest.java   | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java b/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
index 968d00e8..3c974e35 100644
--- a/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
+++ b/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java
@@ -105,28 +105,28 @@ void testRegisterMembersFromCsvThrowsWhenCsvParsingFails() {
      * ❌ 회원 등록 실패 (MEMBER_REGISTRATION_FAILED)
      *
      */
-    @Test
-    @DisplayName("회원 등록 과정 중 실패 시 예외 발생 및 부분 저장 된다.")
-    void testRegisterMembersFromCsvThrowsWhenSavingMemberFails() {
-        Long adminId = 1L;
-        MultipartFile file = new MockMultipartFile("file", "members.csv", "text/csv", "dummy-content".getBytes());
-
-        Member admin = Mockito.mock(Member.class);
-        Member failingMember = Mockito.mock(Member.class);
-        List<Member> parsedMembers = List.of(failingMember, Mockito.mock(Member.class));
-
-        //  특정 회원 등록 중 예외 발생
-        when(memberService.findActiveMember(adminId)).thenReturn(admin);
-        when(csvParseService.parseDataAndMapToMember(file)).thenReturn(parsedMembers);
-        doThrow(new ApplicationException(MemberErrorCode.MEMBER_REGISTRATION_FAILED))
-                .when(commandMemberPort).save(failingMember);
-
-        // Usecase 실행
-        ApplicationException exception = assertThrows(ApplicationException.class, () -> {
-            registerMemberCSVService.registerMembersFromCsv(adminId, file);
-        });
-
-        assertEquals(MemberErrorCode.MEMBER_REGISTRATION_FAILED.getCustomCode(), exception.getCode().getCustomCode());
-        verify(commandMemberPort, times(1)).save(failingMember); // ❗ 실패한 회원만 저장 시도해야 함
-    }
+//    @Test
+//    @DisplayName("회원 등록 과정 중 실패 시 예외 발생 및 부분 저장 된다.")
+//    void testRegisterMembersFromCsvThrowsWhenSavingMemberFails() {
+//        Long adminId = 1L;
+//        MultipartFile file = new MockMultipartFile("file", "members.csv", "text/csv", "dummy-content".getBytes());
+//
+//        Member admin = Mockito.mock(Member.class);
+//        Member failingMember = Mockito.mock(Member.class);
+//        List<Member> parsedMembers = List.of(failingMember, Mockito.mock(Member.class));
+//
+//        //  특정 회원 등록 중 예외 발생
+//        when(memberService.findActiveMember(adminId)).thenReturn(admin);
+//        when(csvParseService.parseDataAndMapToMember(file)).thenReturn(parsedMembers);
+//        doThrow(new ApplicationException(MemberErrorCode.MEMBER_REGISTRATION_FAILED))
+//                .when(commandMemberPort).save(failingMember);
+//
+//        // Usecase 실행
+//        ApplicationException exception = assertThrows(ApplicationException.class, () -> {
+//            registerMemberCSVService.registerMembersFromCsv(adminId, file);
+//        });
+//
+//        assertEquals(MemberErrorCode.MEMBER_REGISTRATION_FAILED.getCustomCode(), exception.getCode().getCustomCode());
+//        verify(commandMemberPort, times(1)).save(failingMember); // ❗ 실패한 회원만 저장 시도해야 함
+//    }
 }