Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public record MemberDetailsResponse(
@Schema(description = "회원 이름", example = "서주원")
String name,
@Schema(description = "회원 아이디", example = "siena.it")
String nicknanme,
String nickname,
@Schema(description = "회원 이메일", example = "siena.it@gmail.com")
String email,
@Schema(description = "승인 권한 여부")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public record MemberDetailInfoResponse(
@Schema(description = "회원 이름", example = "서주원")
String name,
@Schema(description = "회원 아이디", example = "siena.it")
String nicknanme,
String nickname,
@Schema(description = "회원 이메일", example = "siena.it@gmail.com")
String email,
@Schema(description = "승인 권한 여부")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import clap.server.application.port.inbound.member.MemberDetailInfoUsecase;
import clap.server.application.port.inbound.member.MemberProfileUsecase;
import clap.server.common.annotation.architecture.WebAdapter;
import clap.server.common.utils.FileTypeValidator;
import clap.server.exception.ApplicationException;
import clap.server.exception.code.FileErrorcode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
Expand Down Expand Up @@ -49,6 +52,9 @@ public void updateMemberDetailInfo(
@RequestPart(name = "memberInfo") UpdateMemberInfoRequest request,
@RequestPart(name = "profileImage", required = false) MultipartFile profileImage,
@AuthenticationPrincipal SecurityUserDetails userInfo) throws IOException {
if (profileImage !=null && !FileTypeValidator.validImageFile(profileImage.getInputStream())) {
throw new ApplicationException(FileErrorcode.UNSUPPORTED_FILE_TYPE);
}
updateMemberInfoUsecase.updateMemberInfo(userInfo.getUserId(), request, profileImage);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static MemberDetailInfoResponse toMemberDetailInfoResponse(Member member)
member.getImageUrl(),
member.getMemberInfo().getName(),
member.getMemberInfo().getNickname(),
member.getImageUrl(),
member.getMemberInfo().getEmail(),
member.isReviewer(),
member.getMemberInfo().getRole(),
member.getMemberInfo().getDepartment().getName(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void sendInvitation(SendInvitationRequest request) {
commandMemberPort.save(member);

// 회원 상태를 APPROVAL_REQUEST으로 변경
member.changeStatusToAPPROVAL_REQUEST();
member.changeToApproveRequested();

sendEmailPort.sendInvitationEmail(
member.getMemberInfo().getEmail(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@
import clap.server.application.port.outbound.member.CommandMemberPort;
import clap.server.application.port.outbound.s3.S3UploadPort;
import clap.server.common.annotation.architecture.ApplicationService;
import clap.server.domain.policy.attachment.FilePathPolicy;
import clap.server.common.utils.FileTypeValidator;
import clap.server.domain.model.member.Member;
import clap.server.exception.ApplicationException;
import clap.server.exception.code.FileErrorcode;
import clap.server.domain.policy.attachment.FilePathPolicy;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
Expand All @@ -27,11 +24,8 @@ class UpdateMemberInfoService implements UpdateMemberInfoUsecase {

@Override
public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException {
if (!FileTypeValidator.validImageFile(profileImage.getInputStream())) {
throw new ApplicationException(FileErrorcode.UNSUPPORTED_FILE_TYPE);
}
Member member = memberService.findActiveMember(memberId);
String profileImageUrl = s3UploadPort.uploadSingleFile(FilePathPolicy.MEMBER_IMAGE, profileImage);
String profileImageUrl = profileImage != null ? s3UploadPort.uploadSingleFile(FilePathPolicy.MEMBER_IMAGE, profileImage) : null;
member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(),
request.kakaoWorkNotification(), profileImageUrl);
commandMemberPort.save(member);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/clap/server/domain/model/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,10 @@ public boolean isReviewer() {
return this.memberInfo != null && this.memberInfo.isReviewer();
}

public void changeStatusToAPPROVAL_REQUEST() {
public void changeToApproveRequested() {
this.status = MemberStatus.APPROVAL_REQUEST;
}

public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled, String imageUrl) {
this.memberInfo.updateName(name);
this.agitNotificationEnabled = agitNotificationEnabled;
Expand Down
Loading