#257 [feat] 모델 메인뷰 API의 제안 상태 정보 추가

src/main/java/com/moddy/server/controller/model/dto/response/OfferResponse.java

@@ -1,6 +1,7 @@
 package com.moddy.server.controller.model.dto.response;
 
-import com.moddy.server.domain.prefer_offer_condition.OfferCondition;
+import com.moddy.server.domain.hair_service_offer.OfferStatus;
+
 import java.util.List;
 
 public record OfferResponse(
@@ -9,6 +10,6 @@ public record OfferResponse(
         String name,
         String shopName,
         List<String> conditions,
-        boolean isClicked
+        OfferStatus status
 ) {
 }

src/main/java/com/moddy/server/domain/hair_service_offer/HairServiceOffer.java

@@ -8,8 +8,6 @@
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 
-import java.time.LocalDateTime;
-
 @Entity
 @Getter
 @Builder
@@ -50,11 +48,8 @@ public HairServiceOffer(HairModelApplication hairModelApplication, Model model,
         this.isClicked = isClicked;
     }
 
-    public void agreeOfferToModel(){
-        this.isModelAgree = true;
-    }
+    public void agreeOfferToModel() { this.isModelAgree = true; }
 
     public void updateClickStatus() { this.isClicked = true; }
 
-
 }

src/main/java/com/moddy/server/domain/hair_service_offer/OfferStatus.java

@@ -0,0 +1,8 @@
+package com.moddy.server.domain.hair_service_offer;
+
+import lombok.Getter;
+
+@Getter
+public enum OfferStatus {
+    EXPIRED, UNCLICKED, CLICKED
+}

src/main/java/com/moddy/server/service/application/HairModelApplicationRetrieveService.java

@@ -120,6 +120,12 @@ public DownloadUrlResponseDto getApplicationCaptureDownloadUrl(final Long applic
         return new DownloadUrlResponseDto(applicationDownloadUrl);
     }
 
+    public boolean getApplicationExpiredStatus(final Long applicationId){
+        final HairModelApplication hairModelApplication = hairModelApplicationJpaRepository.findById(applicationId)
+                .orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_APPLICATION_EXCEPTION));
+        return hairModelApplication.isExpired();
+    }
+
     private Page<HairModelApplication> findApplicationsByPaging(final int page, final int size) {
         PageRequest pageRequest = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "id"));
         Page<HairModelApplication> applicationPage = hairModelApplicationJpaRepository.findAll(pageRequest);

src/main/java/com/moddy/server/service/offer/HairServiceOfferRetrieveService.java

@@ -10,6 +10,7 @@
 import com.moddy.server.controller.offer.dto.response.OfferInfoResponse;
 import com.moddy.server.domain.designer.Designer;
 import com.moddy.server.domain.hair_service_offer.HairServiceOffer;
+import com.moddy.server.domain.hair_service_offer.OfferStatus;
 import com.moddy.server.domain.hair_service_offer.repository.HairServiceOfferJpaRepository;
 import com.moddy.server.domain.model.ModelApplyStatus;
 import com.moddy.server.domain.prefer_offer_condition.OfferCondition;
@@ -116,13 +117,22 @@ private List<OfferResponse> getModelMainOfferList(final Page<HairServiceOffer> o
                 return offerCondition.getOfferCondition().getValue();
             }).collect(Collectors.toList());
 
-            OfferResponse offerResponse = new OfferResponse(offer.getId(), designer.getProfileImgUrl(), designer.getName(), designer.getHairShop().getName(), offerConditionTop2List, offer.isClicked());
+            OfferResponse offerResponse = new OfferResponse(offer.getId(), designer.getProfileImgUrl(), designer.getName(), designer.getHairShop().getName(), offerConditionTop2List, calOfferStatus(offer));
             return offerResponse;
         }).collect(Collectors.toList());
 
         return offerResponseList;
     }
 
+    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;
+    }
+
     private Page<HairServiceOffer> findOffersByPaging(final Long modelId, final int page, final int size) {
         PageRequest pageRequest = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
         Page<HairServiceOffer> offerPage = hairServiceOfferJpaRepository.findByModelId(modelId, pageRequest);