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

#226 [refactor] 제안서 작성 service 분리 #227

Merged
merged 6 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 @@ -12,6 +12,7 @@
import com.moddy.server.controller.designer.dto.response.DownloadUrlResponseDto;
import com.moddy.server.service.application.HairModelApplicationRetrieveService;
import com.moddy.server.service.designer.DesignerService;
import com.moddy.server.service.offer.HairServiceOfferRegisterService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
Expand Down Expand Up @@ -42,6 +43,7 @@ public class DesignerController {

private final DesignerService designerService;
private final HairModelApplicationRetrieveService hairModelApplicationRetrieveService;
private final HairServiceOfferRegisterService hairServiceOfferRegisterService;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p2
사용하지 않는 변수는 제거해주세요!


@Operation(summary = "[JWT] 디자이너 메인 뷰 조회", description = "디자이너 메인 뷰 조회 API입니다.")
@ApiResponses({
Expand All @@ -68,10 +70,10 @@ public SuccessResponse<DesignerMainResponse> getDesignerMainInfo(
@SecurityRequirement(name = "JWT Auth")
@PostMapping("{applicationId}/offer")
public SuccessNonDataResponse offerCreateRequest(
@Parameter(hidden = true) @UserId Long userId,
@Parameter(hidden = true) @UserId Long designerId,
@PathVariable(value = "applicationId") Long applicationId,
@Valid @RequestBody OfferCreateRequest offerCreateRequest) throws IOException {
designerService.postOffer(userId, applicationId, offerCreateRequest);
hairServiceOfferRegisterService.postOffer(designerId, applicationId, offerCreateRequest);
return SuccessNonDataResponse.success(SuccessCode.POST_OFFER_SUCCESS);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p2 :
요 친구들도 OfferController로 이동해야할것 같습니다~!


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

@Entity
@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PreferOfferCondition extends BaseTimeEntity {
Expand All @@ -28,4 +27,8 @@ public class PreferOfferCondition extends BaseTimeEntity {
@NotNull
private OfferCondition offerCondition;

public PreferOfferCondition(HairServiceOffer hairServiceOffer, OfferCondition offerCondition){
this.hairServiceOffer = hairServiceOffer;
this.offerCondition = offerCondition;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3
파라미터를 final로 명시해주면 좋을 것 같습니다!

}
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ private HairModelApplicationResponse getApplicationResponse(final HairModelAppli
return applicationResponse;
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -117,39 +117,6 @@ public UserCreateResponse createDesigner(Long userId, DesignerCreateRequest requ
return authService.createUserToken(designer.getId().toString());
}


@Transactional
public void postOffer(Long userId, Long applicationId, OfferCreateRequest request) throws IOException {
Designer designer = designerJpaRepository.findById(userId).orElseThrow(() -> new NotFoundException(DESIGNER_NOT_FOUND_EXCEPTION));
HairModelApplication hairModelApplication = hairModelApplicationJpaRepository.findById(applicationId).orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_APPLICATION_EXCEPTION));

if (hairServiceOfferJpaRepository.existsByHairModelApplicationIdAndDesignerId(applicationId,designer.getId())) throw new ConflictException(ErrorCode.ALREADY_EXIST_OFFER_EXCEPTION);

HairServiceOffer offer = HairServiceOffer.builder()
.model(hairModelApplication.getModel())
.hairModelApplication(hairModelApplication)
.designer(designer)
.offerDetail(request.offerDetail())
.isModelAgree(false)
.isClicked(false)
.build();
hairServiceOfferJpaRepository.save(offer);

request.preferOfferConditions().stream()
.forEach(p -> {
PreferOfferCondition preferOfferCondition = PreferOfferCondition.builder()
.offerCondition(p)
.hairServiceOffer(offer)
.build();
preferOfferConditionJpaRepository.save(preferOfferCondition);

});

final String modelName = hairModelApplication.getModel().getName();
final String modelPhoneNumber = hairModelApplication.getModel().getPhoneNumber();
smsUtil.sendOfferToModel(modelPhoneNumber, modelName);
}

@Transactional
public ApplicationDetailInfoResponse getApplicationDetail(Long userId, Long applicationId) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
package com.moddy.server.service.offer;

import com.moddy.server.common.exception.enums.ErrorCode;
import com.moddy.server.common.exception.model.ConflictException;
import com.moddy.server.common.exception.model.NotFoundException;
import com.moddy.server.common.util.SmsUtil;
import com.moddy.server.controller.designer.dto.request.OfferCreateRequest;
import com.moddy.server.domain.designer.Designer;
import com.moddy.server.domain.designer.repository.DesignerJpaRepository;
import com.moddy.server.domain.hair_model_application.HairModelApplication;
import com.moddy.server.domain.hair_model_application.repository.HairModelApplicationJpaRepository;
import com.moddy.server.domain.hair_service_offer.HairServiceOffer;
import com.moddy.server.domain.hair_service_offer.repository.HairServiceOfferJpaRepository;
import com.moddy.server.domain.model.Model;
import com.moddy.server.domain.prefer_offer_condition.PreferOfferCondition;
import com.moddy.server.domain.prefer_offer_condition.repository.PreferOfferConditionJpaRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
import java.util.List;

import static com.moddy.server.common.exception.enums.ErrorCode.DESIGNER_NOT_FOUND_EXCEPTION;

@Service
@RequiredArgsConstructor
public class HairServiceOfferRegisterService {
private final PreferOfferConditionJpaRepository preferOfferConditionJpaRepository;
private final HairServiceOfferJpaRepository hairServiceOfferJpaRepository;
private final DesignerJpaRepository designerJpaRepository;
private final HairModelApplicationJpaRepository hairModelApplicationJpaRepository;
private final SmsUtil smsUtil;

public void deleteModelHairServiceOfferInfos(final Long modelId) {
final List<HairServiceOffer> hairServiceOffers = hairServiceOfferJpaRepository.findAllByModelId(modelId);
Expand All @@ -29,4 +47,34 @@ public void deleteDesignerHairServiceOfferInfos(final Long designerId) {
hairServiceOfferJpaRepository.deleteById(hairServiceOffer.getId());
});
}

@Transactional
public void postOffer(Long designerId, Long applicationId, OfferCreateRequest request) throws IOException {
Designer designer = designerJpaRepository.findById(designerId).orElseThrow(() -> new NotFoundException(DESIGNER_NOT_FOUND_EXCEPTION));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3
파라미터를 final로 명시해주면 좋을 것 같습니다!

HairModelApplication hairModelApplication = hairModelApplicationJpaRepository.findById(applicationId).orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_APPLICATION_EXCEPTION));
Model model = hairModelApplication.getModel();
if (hairServiceOfferJpaRepository.existsByHairModelApplicationIdAndDesignerId(applicationId,designer.getId())) throw new ConflictException(ErrorCode.ALREADY_EXIST_OFFER_EXCEPTION);

HairServiceOffer offer = HairServiceOffer.builder()
.model(model)
.hairModelApplication(hairModelApplication)
.designer(designer)
.offerDetail(request.offerDetail())
.isModelAgree(false)
.isClicked(false)
.build();
hairServiceOfferJpaRepository.save(offer);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p2 :
Entity에 직접적으로 Builder 사용은 최대한 줄여보고 차라리 생성자를 만들어서 작업해보는 것은 어떨까요?
관련해서 왜 Builder 사용을 줄이자 했는지 기억이 안나서 제가 PR에 질문 올렸는데 원용이가 답변 해준거 링크 두고 갑니다.. 링크

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p2:
builder를 제거하고, Offer 도메인 클래스 내에 model, hairModelApplication, designer, offerDetial을 파라미터로 받는 생성자를 하나 만들어 값을 넣어주고,
isModelAgree, isClicked 같은 경우는 생성자 내부에서 false로 지정해준다면
생성자 파라미터가 4개라 많이 헷갈리지 않을 것이라고 생각합니다..!

request.preferOfferConditions().stream()
.forEach(p -> {
PreferOfferCondition preferOfferCondition = new PreferOfferCondition(offer,p);
preferOfferConditionJpaRepository.save(preferOfferCondition);

});

final String modelName = model.getName();
final String modelPhoneNumber = model.getPhoneNumber();
smsUtil.sendOfferToModel(modelPhoneNumber, modelName);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p4:
나머지 로직들은 DB에 저장하는 거라 개념이 비슷한데 sms를 보내는 부분은 따로 private 메소드 따로 만들면 좋을거 같아요..! 너무 다른 로직(?)개념이라 빼는게 좋을거 같다는 생각을 했답니다!


}
Loading