#257 [feat] 모델 메인뷰 API의 제안 상태 정보 추가 #259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KWY0218
approved these changes
Feb 28, 2024
| @@ -8,7 +8,7 @@ | |||
| import jakarta.validation.constraints.NotNull; | |||
| import lombok.*; | |||
|
|
|||
| import java.time.LocalDateTime; | |||
| @@ -12,6 +12,7 @@ | |||
| import com.moddy.server.controller.model.dto.response.ApplicationImgUrlResponse; | |||
| 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.OfferStatus; | |||
Comment on lines
127
to
135
| private OfferStatus calOfferStatus(final HairServiceOffer hairServiceOffer){ | ||
| if(hairModelApplicationRetrieveService.getApplicationExpiredStatus(hairServiceOffer.getHairModelApplication().getId())){ | ||
| return OfferStatus.EXPIRED; | ||
| } else if (hairServiceOffer.isClicked()){ | ||
| return OfferStatus.CLICKED; | ||
| } else { | ||
| return OfferStatus.UNCLICKED; | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| private OfferStatus calOfferStatus(final HairServiceOffer hairServiceOffer){ | |
| if(hairModelApplicationRetrieveService.getApplicationExpiredStatus(hairServiceOffer.getHairModelApplication().getId())){ | |
| return OfferStatus.EXPIRED; | |
| } else if (hairServiceOffer.isClicked()){ | |
| return OfferStatus.CLICKED; | |
| } else { | |
| return OfferStatus.UNCLICKED; | |
| } | |
| } | |
| private OfferStatus calOfferStatus(final HairServiceOffer hairServiceOffer){ | |
| if(hairModelApplicationRetrieveService.getApplicationExpiredStatus(hairServiceOffer.getHairModelApplication().getId())){ | |
| return OfferStatus.EXPIRED; | |
| } else if (hairServiceOffer.isClicked()){ | |
| return OfferStatus.CLICKED; | |
| } | |
| return OfferStatus.UNCLICKED; | |
| } |
p4
마지막 else 문을 없애서 들여쓰기를 하나 없앨 수 있을 것 같습니다...!
|
리뷰에 있는 내용 반영했습니다 👍 |
|
좋습니다 ~ ! 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
관련 이슈번호
해결하는 데 얼마나 걸렸나요? (예상 작업 시간 / 실제 작업 시간)
해결하려는 문제가 무엇인가요?
--> local yml에 timezone 설정이 UTC로 되어 있었네요....... ^^... korea로 변경하니 DB에 있는값 그대로 가져와집니다!
어떻게 해결했나요?
application의 created_at을 기준으로 계산 했습니다!
추후에 만료일을 계산하는 함수가 또 추가 될거 같아서 재사용하기 편하게 짜려고 했으나...
해당 api에서는 만료 여부만 파악하면 되기에 isExpired로 만료 여부 boolean으로 return 하도록 변경했습니다!
또한 EXPIRED의 우선순위가 더 큰것으로 파악되어서 expired를 if문의 제일 상단에 위치시켰습니다~ 더 좋은 방법있으면 환영합니다..
설명