-
Notifications
You must be signed in to change notification settings - Fork 4
CLAP-116 Feature: 회원 일괄 추가 (CSV) #104
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
e8d1f13
CLAP-116 Feat:회원 CSV 파일 추가 API 구현
db9c861
CLAP-116 fix:RegisterMemberCsvUsecase 삭제
548ea43
CLAP-116 fix:에러코드 수정
0a73fb0
CLAP-116 fix: 에러 처리 로직을 ExceptionHandler로 위임
9716cd3
Delete src/test/resources/application-test.yml
Sihun23 3e3e212
CLAP-116 fix:RegistermemberCsvService 삭제
22de55e
CLAP-116 fix:CsvParser 패키지 위치 변경
5af313c
CLAP-116 fix:컨트롤러 태그 수정
b0fbda5
CLAP-116 fix:API 엔드포인트 변경
687dcb0
Delete src/main/resources/env.properties
Sihun23 79eb301
CLAP-116 fix: Csv 파싱 로직 Member 객체로 변경
939eee1
CLAP-116 fix:충돌 해결
ae5883e
CLAP-116 fix:잘못된 import문 수정
0d941cc
CLAP-116 fix:회원 등록 에러코드 불일치 해결
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package clap.server.adapter.inbound.web.admin; | ||
|
|
||
| import clap.server.adapter.inbound.security.SecurityUserDetails; | ||
| import clap.server.application.port.inbound.admin.RegisterMemberUsecase; | ||
| import clap.server.common.annotation.architecture.WebAdapter; | ||
| import io.swagger.v3.oas.annotations.Operation; | ||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.security.access.annotation.Secured; | ||
| import org.springframework.security.core.annotation.AuthenticationPrincipal; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.multipart.MultipartFile; | ||
|
|
||
| @Tag(name = "05. Admin") | ||
| @WebAdapter | ||
| @RequestMapping("/api/managements") | ||
| public class RegisterMemberCsvController { | ||
| private final RegisterMemberUsecase registerMemberUsecase; | ||
|
|
||
| public RegisterMemberCsvController(RegisterMemberUsecase registerMemberUsecase) { | ||
| this.registerMemberUsecase = registerMemberUsecase; | ||
| } | ||
|
|
||
| @Operation(summary = "CSV 파일로 회원 등록 API") | ||
| @PostMapping("/members/upload") | ||
| @Secured("ROLE_ADMIN") | ||
| public ResponseEntity<String> registerMembersFromCsv( | ||
| @AuthenticationPrincipal SecurityUserDetails userInfo, | ||
| @RequestParam("file") MultipartFile file) { | ||
| int addedCount = registerMemberUsecase.registerMembersFromCsv(userInfo.getUserId(), file); | ||
| return ResponseEntity.ok(addedCount + "명의 회원이 등록되었습니다."); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
src/main/java/clap/server/application/port/inbound/admin/RegisterMemberUsecase.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,10 @@ | ||
| package clap.server.application.port.inbound.admin; | ||
|
|
||
| import clap.server.adapter.inbound.web.dto.admin.RegisterMemberRequest; | ||
| import org.springframework.web.multipart.MultipartFile; | ||
|
|
||
| public interface RegisterMemberUsecase { | ||
| void registerMember(Long adminId, RegisterMemberRequest request); | ||
|
|
||
| int registerMembersFromCsv(Long adminId, MultipartFile file); | ||
| } |
68 changes: 68 additions & 0 deletions
68
src/main/java/clap/server/application/service/admin/CsvParseService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package clap.server.application.service.admin; | ||
|
|
||
| import clap.server.application.port.outbound.member.LoadDepartmentPort; | ||
| 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; | ||
| import java.io.IOException; | ||
| import java.io.InputStreamReader; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static clap.server.application.mapper.MemberMapper.toMember; | ||
| import static clap.server.domain.model.member.MemberInfo.toMemberInfo; | ||
|
|
||
|
|
||
| @Slf4j | ||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class CsvParseService { | ||
|
|
||
| private final LoadDepartmentPort loadDepartmentPort; | ||
|
|
||
| public List<Member> parse(MultipartFile file) { | ||
| List<Member> members = new ArrayList<>(); | ||
| try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getInputStream()))) { | ||
| String line; | ||
| while ((line = reader.readLine()) != null) { | ||
| String[] fields = line.split(","); | ||
| if (fields.length != 7) { | ||
| throw ApplicationException.from(MemberErrorCode.INVALID_CSV_FORMAT); | ||
| } | ||
| members.add(mapToMember(fields)); | ||
| } | ||
| } catch (IOException e) { | ||
| throw ApplicationException.from(MemberErrorCode.CSV_PARSING_ERROR); | ||
| } | ||
| return members; | ||
| } | ||
|
|
||
| private Member mapToMember(String[] fields) { | ||
| // 부서 ID로 Department 객체 조회 | ||
| Long departmentId = Long.parseLong(fields[2].trim()); | ||
| Department department = loadDepartmentPort.findById(departmentId) | ||
| .orElseThrow(() -> new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND)); | ||
|
|
||
| MemberInfo memberInfo = toMemberInfo( | ||
| fields[0].trim(), // name | ||
| fields[4].trim(), // email | ||
| fields[1].trim(), // nickname | ||
| Boolean.parseBoolean(fields[6].trim()), // isReviewer | ||
| department, // department | ||
| MemberRole.valueOf(fields[5].trim()), // role | ||
| fields[3].trim() // departmentRole | ||
| ); | ||
|
|
||
| return toMember(memberInfo); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.