-
Notifications
You must be signed in to change notification settings - Fork 0
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
Changes from 1 commit
cc90f20
3b702d0
d20ee65
5a7fbca
da2f769
a858967
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
@@ -42,6 +43,7 @@ public class DesignerController { | |
|
||
private final DesignerService designerService; | ||
private final HairModelApplicationRetrieveService hairModelApplicationRetrieveService; | ||
private final HairServiceOfferRegisterService hairServiceOfferRegisterService; | ||
|
||
@Operation(summary = "[JWT] 디자이너 메인 뷰 조회", description = "디자이너 메인 뷰 조회 API입니다.") | ||
@ApiResponses({ | ||
|
@@ -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); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. p2 : |
||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,7 +11,6 @@ | |
|
||
@Entity | ||
@Getter | ||
@Builder | ||
@NoArgsConstructor | ||
@AllArgsConstructor | ||
public class PreferOfferCondition extends BaseTimeEntity { | ||
|
@@ -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; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. p3 |
||
} |
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); | ||
|
@@ -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)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. p3 |
||
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); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. p2 : There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. p2: |
||
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); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. p4: |
||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
p2
사용하지 않는 변수는 제거해주세요!