Skip to content
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

판매자 등록 (농부로 전환 시 상점도 추가) #223

Merged
merged 1 commit into from
Nov 15, 2024
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 @@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import poomasi.domain.auth.security.userdetail.UserDetailsImpl;
import poomasi.domain.member.dto.request.ConvertToFarmerRequest;
import poomasi.domain.member.dto.request.FarmerUpdateRequest;
import poomasi.domain.member.dto.response.FarmerResponse;
import poomasi.domain.member.entity.Member;
Expand All @@ -23,9 +24,10 @@ public class MemberFarmerController {

@PutMapping("/to-farmer")
@Secured("ROLE_CUSTOMER")
public ResponseEntity<Void> convertToFarmer(@AuthenticationPrincipal UserDetailsImpl userDetails) {
public ResponseEntity<Void> convertToFarmer(@AuthenticationPrincipal UserDetailsImpl userDetails,
@RequestBody ConvertToFarmerRequest convertToFarmerRequest) {
Member member = userDetails.getMember();
memberFarmerService.convertToFarmer(member);
memberFarmerService.convertToFarmer(member, convertToFarmerRequest);
return ResponseEntity.noContent().build();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package poomasi.domain.member.dto.request;

import poomasi.domain.store.dto.StoreRegisterRequest;

public record ConvertToFarmerRequest(
String name,
String address,
String phone
) {
public StoreRegisterRequest toStoreRegisterRequest() {
return new StoreRegisterRequest(
name,
address,
phone
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import poomasi.domain.member.dto.request.ConvertToFarmerRequest;
import poomasi.domain.member.dto.request.FarmerUpdateRequest;
import poomasi.domain.member.entity.Member;
import poomasi.domain.member.repository.MemberRepository;
import poomasi.domain.store.dto.StoreRegisterRequest;
import poomasi.domain.store.entity.Store;
import poomasi.domain.store.service.StoreService;
import poomasi.global.error.BusinessException;

import static poomasi.domain.member.entity.Role.ROLE_FARMER;
Expand All @@ -20,13 +23,18 @@
public class MemberFarmerService {
private final MemberRepository memberRepository;
private final MemberService memberService;
private final StoreService storeService;

@Transactional
public void convertToFarmer(Member member) {
public void convertToFarmer(Member member, ConvertToFarmerRequest convertToFarmerRequest) {
if (member.isFarmer()) {
throw new BusinessException(MEMBER_ALREADY_FARMER);
}

StoreRegisterRequest storeRegisterRequest = convertToFarmerRequest.toStoreRegisterRequest();

storeService.addStore(storeRegisterRequest,member);

member.setAddress(null, null, null, null);
member.setRole(ROLE_FARMER);
memberRepository.save(member);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
package poomasi.domain.store.dto;

import org.hibernate.annotations.Comment;
import poomasi.domain.member.entity.Member;
import poomasi.domain.store.entity.Store;

public record StoreRegisterRequest(
String name,
String address,
String phone,
@Comment("사업자 번호")
String businessNumber
String phone
) {

public Store toEntity(Member member) {
return Store.builder()
.name(name)
.address(address)
.phone(phone)
.businessNumber(businessNumber)
.owner(member)
.build();
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/poomasi/domain/store/entity/Store.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ public void updateStore(StoreRegisterRequest storeRegisterRequest) {
this.name = storeRegisterRequest.name();
this.address = storeRegisterRequest.address();
this.phone = storeRegisterRequest.phone();
this.businessNumber = storeRegisterRequest.businessNumber();
}

public void addProduct(Product saveProduct) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import poomasi.domain.member.dto.request.ConvertToFarmerRequest;
import poomasi.domain.member.dto.request.FarmerUpdateRequest;
import poomasi.domain.member.entity.Member;
import poomasi.domain.member.entity.Role;
import poomasi.domain.member.repository.MemberRepository;
import poomasi.domain.store.entity.Store;
import poomasi.domain.store.service.StoreService;
import poomasi.global.error.BusinessError;
import poomasi.global.error.BusinessException;

Expand All @@ -30,6 +32,9 @@ class MemberFarmerServiceTest {
@Mock
private MemberService memberService;

@Mock
private StoreService storeService;

@InjectMocks
private MemberFarmerService memberFarmerService;

Expand Down Expand Up @@ -59,10 +64,11 @@ void setUp() {
@DisplayName("회원 -> 농부로 변환 성공 테스트")
void convertToFarmer_success() {
// given
ConvertToFarmerRequest convertToFarmerRequest = new ConvertToFarmerRequest("name", "address", "phone");
given(memberRepository.save(customerMember)).willReturn(customerMember);

// when
memberFarmerService.convertToFarmer(customerMember);
memberFarmerService.convertToFarmer(customerMember, convertToFarmerRequest);

// then
assertEquals(Role.ROLE_FARMER, customerMember.getRole());
Expand All @@ -72,8 +78,9 @@ void convertToFarmer_success() {
@Test
@DisplayName("이미 농부인 회원 변환 시도 시 예외 발생 테스트")
void convertToFarmer_alreadyFarmer() {
ConvertToFarmerRequest convertToFarmerRequest = new ConvertToFarmerRequest("name", "address", "phone");
// when & then
assertThatThrownBy(() -> memberFarmerService.convertToFarmer(farmerMember))
assertThatThrownBy(() -> memberFarmerService.convertToFarmer(farmerMember, convertToFarmerRequest))
.isInstanceOf(BusinessException.class)
.hasFieldOrPropertyWithValue("businessError", BusinessError.MEMBER_ALREADY_FARMER);
}
Expand Down
Loading