Skip to content

Commit

Permalink
CLAP-310 Remove: 회원 정보 수정 request email 필드 삭제
Browse files Browse the repository at this point in the history
<footer>
- 관련: #380
  • Loading branch information
joowojr committed Feb 6, 2025
1 parent 20abbdc commit 276fa0e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import clap.server.exception.code.FileErrorcode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.annotation.Secured;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
Expand All @@ -21,23 +22,19 @@

@Tag(name = "05. Admin [회원 관리]")
@WebAdapter
@RequiredArgsConstructor
@RequestMapping("/api/managements")
public class RegisterMemberCsvController {
private final RegisterMemberCSVUsecase registerMemberCSVUsecase;

public RegisterMemberCsvController(RegisterMemberCSVUsecase registerMemberCSVUsecase) {
this.registerMemberCSVUsecase = registerMemberCSVUsecase;
}

@Operation(summary = "CSV 파일로 회원 등록 API")
@PostMapping("/members/upload")
@Secured("ROLE_ADMIN")
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);
}
throw new AdapterException(FileErrorcode.UNSUPPORTED_FILE_TYPE);}
int addedCount = registerMemberCSVUsecase.registerMembersFromCsv(userInfo.getUserId(), file);
return ResponseEntity.ok(addedCount + "명의 회원이 등록되었습니다.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ public record UpdateMemberRequest(
@NotBlank
@Pattern(regexp = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$",
message = "올바른 이메일 형식이 아닙니다.")
@Schema(description = "회원 이메일", example = "siena@gmail.com")
String email,
@NotNull @Schema(description = "승인 권한 여부")
Boolean isReviewer,
@NotNull @Schema(description = "부서 ID")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest re

//TODO: 인프라팀만 담당자가 될 수 있도록 수정해야함
member.getMemberInfo().updateMemberInfoByAdmin(
request.name(), request.email(), request.isReviewer(),
request.name(), request.isReviewer(),
department, request.role(), request.departmentRole());
commandMemberPort.save(member);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ public static MemberInfo toMemberInfo(String name, String email, String nickname
.build();
}

public void updateMemberInfoByAdmin(String name, String email, boolean isReviewer,
public void updateMemberInfoByAdmin(String name, boolean isReviewer,
Department department, MemberRole role, String departmentRole) {
assertReviewerIsManager(isReviewer, role);
this.name = name;
this.email = email;
this.isReviewer = isReviewer;
this.department = department;
this.role = role;
Expand Down

0 comments on commit 276fa0e

Please sign in to comment.