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 @@ -7,6 +7,5 @@

public interface MemberOnboardService {
Member fetchOrCreateMember(Provide p);
Member initNewMemberInfo(Long requestMemberId, InitMemberInfoRequest initMemberInfoRequest, FileUploadResult fileUploadResult);
Member initNewMemberInfo(Long requestMemberId, InitMemberInfoRequest initMemberInfoRequest);
}
14 changes: 0 additions & 14 deletions src/main/java/org/fontory/fontorybe/member/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,6 @@ public static Member fromDefaults(MemberDefaults memberDefaults, String nickname
.build();
}

public Member initNewMemberInfo(InitMemberInfoRequest initNewMemberInfo, String profileImageKey) {
return Member.builder()
.id(this.id)
.nickname(initNewMemberInfo.getNickname())
.gender(initNewMemberInfo.getGender())
.birth(initNewMemberInfo.getBirth())
.createdAt(this.createdAt)
.provideId(this.provideId)
.deletedAt(this.deletedAt)
.provideId(this.provideId)
.status(MemberStatus.ACTIVATE)
.build();
}

public Member initNewMemberInfo(InitMemberInfoRequest initNewMemberInfo) {
return Member.builder()
.id(this.id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@
@ConfigurationProperties(prefix="member.default")
public class MemberDefaults {
private LocalDate birth;
private String profileImageKey;
private Gender gender;

@ConstructorBinding
public MemberDefaults(LocalDate birth,
String profileImageKey) {
public MemberDefaults(LocalDate birth) {
this.birth = birth;
this.profileImageKey = profileImageKey;
this.gender = Gender.NONE;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,6 @@ public Member fetchOrCreateMember(Provide p) {
}
}

@Override
@Transactional
public Member initNewMemberInfo(Long requestMemberId,
InitMemberInfoRequest initNewMemberInfoRequest,
FileUploadResult fileUploadResult) {
Member targetMember = memberLookupService.getOrThrowById(requestMemberId);
FileMetadata fileMetadata = fileService.getOrThrowById(fileUploadResult.getId());
if (targetMember.getStatus() == MemberStatus.ACTIVATE) {
throw new MemberAlreadyJoinedException();
} else if (memberLookupService.existsByNickname(initNewMemberInfoRequest.getNickname())) {
throw new MemberDuplicateNameExistsException();
}

checkContainsBadWord(initNewMemberInfoRequest.getNickname());

return memberRepository.save(targetMember.initNewMemberInfo(initNewMemberInfoRequest, fileMetadata.getKey()));
}

@Override
@Transactional
public Member initNewMemberInfo(Long requestMemberId,
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ api.server.url=http://localhost:8080

spring.config.import=optional:classpath:application-infrastructure.properties
url.base=http://localhost
url.path.signup=/signup/step-one
url.path.signup=/signup
url.path.auth=
url.cdn=https://cdn.fontory.co.kr

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.fontory.fontorybe.file.application.port.CloudStorageService;
import org.fontory.fontorybe.file.application.port.FileRepository;
import org.fontory.fontorybe.file.application.port.FileService;
import org.fontory.fontorybe.file.domain.FileUploadResult;
import org.fontory.fontorybe.member.controller.MemberController;
import org.fontory.fontorybe.member.controller.ProfileController;
import org.fontory.fontorybe.member.controller.RegistrationController;
Expand All @@ -38,7 +37,6 @@
import org.fontory.fontorybe.provide.service.port.ProvideRepository;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.web.multipart.MultipartFile;

import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
Expand Down Expand Up @@ -138,8 +136,7 @@ public TestContainer() {
.build();

memberDefaults = new MemberDefaults(
LocalDate.of(1999, 12, 31),
DEFAULT_PROFILE_KEY);
LocalDate.of(1999, 12, 31));

fileService = FileServiceImpl.builder()
.memberLookupService(memberLookupService)
Expand Down
Loading