최근 조회한 모델,모델 추천 API 추가 + swagger 문서 수정

src/main/java/com/backend/soullive_a/controller/ModelController.java

@@ -1,13 +1,17 @@
 package com.backend.soullive_a.controller;
 
-import com.backend.soullive_a.dto.request.ModelRequest;
+import com.backend.soullive_a.dto.response.ModelRecommendResponse;
 import com.backend.soullive_a.dto.response.ModelResponse;
+import com.backend.soullive_a.dto.response.RecentModelResponse;
 import com.backend.soullive_a.exception.base.BaseResponse;
 import com.backend.soullive_a.service.ModelService;
-import jakarta.validation.Valid;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-
+@Tag(name = "모델 API", description = "모델 조회,생성,최근 조회한 모델 API입니다.")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/model")
@@ -19,31 +23,38 @@ public class ModelController {
      * @param modelName
      * @return
      */
+    @Operation(summary = "모델 조회 API", description = "모델 기본 정보를 조회하는 API입니다.")
     @GetMapping("")
-    public BaseResponse<ModelResponse> getModel(@RequestParam String modelName) {
+    public BaseResponse<ModelResponse> getModel(@RequestParam String modelName, @RequestParam Long productId) {
         return BaseResponse.<ModelResponse>builder()
                 .isSuccess(true)
                 .code(200)
                 .message("모델 조회에 성공했습니다.")
-                .data(modelService.getModel(modelName))
+                .data(modelService.getModel(modelName,productId))
                 .build();
 
     }
 
-    /**
-     * 모델 등록 api
-     * @param request
-     * @return
-     */
-    @PostMapping("")
-    public BaseResponse<ModelResponse> createModel(@RequestBody @Valid ModelRequest request) {
-        System.out.println("@");
-        return BaseResponse.<ModelResponse>builder()
-                .isSuccess(true)
-                .code(200)
-                .message("모델 생성에 성공했습니다.")
-                .data(modelService.createModel(request))
-                .build();
+    @Operation(summary = "최근 조회 모델 API", description = "최근 조회한 모델들을 조회하는 API입니다.")
+    @GetMapping("/recent/{productId}")
+    public BaseResponse<List<RecentModelResponse>> getRecentModel(@Parameter(name = "상품 id",description = "상품 기본키(필수)",
+        required = true) @PathVariable Long productId){
+        return BaseResponse.<List<RecentModelResponse>>builder()
+            .isSuccess(true)
+            .code(200)
+            .message("최근 조회한 모델 조회 성공")
+            .data(modelService.getRecentModel(productId))
+            .build();
+    }
 
+    @Operation(summary = "모델 추천 API", description = "모델을 추천 받는 API이다.")
+    @GetMapping("/recommendation")
+    public BaseResponse<List<ModelRecommendResponse>> getRecommendModel(){
+        return BaseResponse.<List<ModelRecommendResponse>>builder()
+            .isSuccess(true)
+            .code(200)
+            .message("모델 추천 성공")
+            .data(modelService.getRecommendModel())
+            .build();
     }
 }

src/main/java/com/backend/soullive_a/controller/ModelIntroductionController.java

@@ -1,15 +1,15 @@
 
 package com.backend.soullive_a.controller;
 
-import com.backend.soullive_a.dto.request.ModelIntroduceRequest;
+
 import com.backend.soullive_a.dto.response.ModelIntroductionResponse;
-import com.backend.soullive_a.dto.response.ModelResponse;
 import com.backend.soullive_a.exception.base.BaseResponse;
 import com.backend.soullive_a.service.ModelIntroductionService;
-import jakarta.validation.Valid;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-
+@Tag(name = "모델 소개 API", description = "모델 소개 API입니다.")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/model/introduction")
@@ -22,6 +22,7 @@ public class ModelIntroductionController {
      * @param modelName
      * @return
      */
+    @Operation(summary = "모델 소개 API", description = "모델 소개 정보를 조회하는 API입니다.")
     @GetMapping("")
     public BaseResponse<ModelIntroductionResponse> getModelIntroduction(@RequestParam String modelName) {
         return BaseResponse.<ModelIntroductionResponse>builder()
@@ -33,17 +34,7 @@ public BaseResponse<ModelIntroductionResponse> getModelIntroduction(@RequestPara
     }
 
 
-//    @PostMapping("/{modelId}")
-//    public BaseResponse<ModelIntroductionResponse> createModelIntroduction(
-//            @PathVariable Long modelId,
-//            @RequestBody @Valid ModelIntroduceRequest request) {
-//        return BaseResponse.<ModelIntroductionResponse>builder()
-//                .isSuccess(true)
-//                .code(2006)
-//                .message("모델소개 정보 생성에 성공했습니다.")
-//                .data(modelIntroductionService.createModelIntroduction(request, modelId))
-//                .build();
-//    }
+
 
 }
 

src/main/java/com/backend/soullive_a/controller/ModelIssueController.java

@@ -0,0 +1,26 @@
+package com.backend.soullive_a.controller;
+
+import com.backend.soullive_a.dto.response.model.issue.ModelIssueResponse;
+import com.backend.soullive_a.exception.base.BaseResponse;
+import com.backend.soullive_a.service.ModelIssueService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/model/issue")
+public class ModelIssueController {
+    private final ModelIssueService modelIssueService;
+    @GetMapping()
+    public BaseResponse<ModelIssueResponse> getIssue(@RequestParam String modelName) {
+        return BaseResponse.<ModelIssueResponse>builder()
+                .code(200)
+                .message("부정이슈 조회에 성공했습니다.")
+                .isSuccess(true)
+                .data(modelIssueService.getIssue(modelName))
+                .build();
+    }
+}

src/main/java/com/backend/soullive_a/controller/ModelPopularityController.java

@@ -3,19 +3,22 @@
 import com.backend.soullive_a.dto.response.model.popularity.ModelPopularityResponse;
 import com.backend.soullive_a.exception.base.BaseResponse;
 import com.backend.soullive_a.service.ModelPopularityService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-
+@Tag(name = "모델 화제성 API", description = "모델 화제성 API입니다.")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/model/popularity")
 public class ModelPopularityController {
 
     private final ModelPopularityService modelPopularityService;
 
+    @Operation(summary = "모델 화제성 API", description = "모델 화제성 정보를 조회하는 API입니다.")
     @GetMapping("")
     public BaseResponse<ModelPopularityResponse> getModelPopularity(
             @RequestParam String name

src/main/java/com/backend/soullive_a/controller/ProductController.java

@@ -4,13 +4,15 @@
 import com.backend.soullive_a.dto.response.ProductResponse;
 import com.backend.soullive_a.exception.base.BaseResponse;
 import com.backend.soullive_a.service.ProductService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-
+@Tag(name = "광고 상품 API", description = "광고 상품 API입니다.")
 @Slf4j
 @RestController
 @RequestMapping("api/product")
@@ -19,6 +21,7 @@ public class ProductController {
 
     private final ProductService productService;
 
+    @Operation(summary = "광고 상품 생성 API", description = "광고 상품을 생성하는 API입니다.")
     @PostMapping("")
     public BaseResponse<ProductResponse> createProduct(
             @RequestBody @Valid CreateProductRequest createProductRequest
@@ -30,7 +33,7 @@ public BaseResponse<ProductResponse> createProduct(
                 .data(productService.createProduct(createProductRequest))
                 .build();
     }
-
+    @Operation(summary = "모든 광고 상품 조회 API", description = "모든 광고 상품을 조회 API입니다.")
     @GetMapping()
     public BaseResponse<List<ProductResponse>> getAllProduct() {
         return BaseResponse.<List<ProductResponse>>builder()
@@ -40,7 +43,7 @@ public BaseResponse<List<ProductResponse>> getAllProduct() {
                 .data(productService.getAllProduct())
                 .build();
     }
-
+    @Operation(summary = "특정 광고 상품 조회 API", description = "특정 광고 상품을 조회 API입니다.")
     @GetMapping("/{id}")
     public BaseResponse<ProductResponse> getProduct(@PathVariable Long id) {
         return BaseResponse.<ProductResponse>builder()
@@ -50,7 +53,7 @@ public BaseResponse<ProductResponse> getProduct(@PathVariable Long id) {
                 .data(productService.getProduct(id))
                 .build();
     }
-
+    @Operation(summary = "특정 광고 상품 삭제 API", description = "특정 광고 상품을 삭제 API입니다.")
     @DeleteMapping("/{id}")
     public BaseResponse<Void> deleteProduct(@PathVariable Long id) {
 

src/main/java/com/backend/soullive_a/dto/response/ModelRecommendResponse.java

@@ -0,0 +1,15 @@
+package com.backend.soullive_a.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "모델 추천 응답 model")
+public record ModelRecommendResponse(
+    @Schema(name = "imageUrl", example = "https://soullive-bucket.s3.ap-northeast-2.amazonaws.com/heeae_profile.png", description = "모델 이미지 url입니다.")
+    String imageUrl,
+    @Schema(name = "name", example = "김희애", description = "모델 이름입니다.")
+    String name,
+    @Schema(name = "job", example = "텔런트/영화배우", description = "모델 직업(구분자)입니다.")
+    String job
+) {
+
+}

src/main/java/com/backend/soullive_a/dto/response/RecentModelResponse.java

@@ -0,0 +1,19 @@
+package com.backend.soullive_a.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "최근 조회한 모델 model 객체")
+public record RecentModelResponse(
+    @Schema(name = "modelId", example = "1", description = "모델 기본키")
+    Long modelId,
+    @Schema(name = "imageUrl", example = "https://soullive-bucket.s3.ap-northeast-2.amazonaws.com/heeae_profile.png", description = "모델 이미지 url입니다.")
+    String imageUrl,
+    @Schema(name = "modelName", example = "한지민", description = "모델 이름입니다.")
+    String modelName,
+    @Schema(name = "aiRate", example = "3.0", description = "ai 추천 점수입니다.")
+    Float aiRate,
+    @Schema(name = "job", example = "배우", description = "직업에 대한 값입니다.")
+    String job
+) {
+
+}

src/main/java/com/backend/soullive_a/dto/response/model/issue/ModelIssueResponse.java

@@ -0,0 +1,14 @@
+package com.backend.soullive_a.dto.response.model.issue;
+
+import lombok.Builder;
+
+import java.util.List;
+
+@Builder
+public record ModelIssueResponse(
+        String scoreUrl,
+        String aiComment,
+        Integer crime,
+        List<ModelNewsResponse> modelNewsResponseList
+) {
+}

src/main/java/com/backend/soullive_a/dto/response/model/issue/ModelNewsResponse.java

@@ -0,0 +1,15 @@
+package com.backend.soullive_a.dto.response.model.issue;
+
+import jakarta.persistence.Column;
+import lombok.Builder;
+
+import java.time.LocalDate;
+
+@Builder
+public record ModelNewsResponse(
+        String company,
+        LocalDate newsDate,
+        String title,
+        String newsUrl
+) {
+}

src/main/java/com/backend/soullive_a/entity/model/issue/ModelIssue.java

@@ -0,0 +1,30 @@
+package com.backend.soullive_a.entity.model.issue;
+
+import com.backend.soullive_a.entity.model.Model;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class ModelIssue {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "MODEL_ISSUE_ID", nullable = false)
+    private Long id;
+
+    @Column(name = "SCORE_URL", nullable = false)
+    private String scoreUrl;
+
+    @Column(name = "AI_COMMENT", nullable = false)
+    private String aiComment;
+
+    @Column(name = "CRIME", nullable = false)
+    private Integer crime;
+
+    @OneToOne
+    @JoinColumn(name = "MODEL_ID", nullable = false)
+    private Model model;
+}

src/main/java/com/backend/soullive_a/entity/model/issue/ModelNews.java

@@ -0,0 +1,35 @@
+package com.backend.soullive_a.entity.model.issue;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDate;
+
+@Getter
+@Entity
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class ModelNews {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "MODEL_NEWS_ID", nullable = false)
+    private Long id;
+
+    @Column(name = "COMPANY", nullable = false)
+    private String  company;
+
+    @Column(name = "NEWS_DATE", nullable = false)
+    private LocalDate newsDate;
+
+    @Column(name = "TITLE", nullable = false)
+    private String title;
+
+    @Column(name = "NEWS_URL", nullable = false)
+    private String newsUrl;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "MODEL_ISSUE_ID", nullable = false)
+    private ModelIssue modelIssue;
+
+}

src/main/java/com/backend/soullive_a/repository/ModelRepository.java

@@ -1,12 +1,20 @@
 package com.backend.soullive_a.repository;
 
+import com.backend.soullive_a.dto.response.ModelRecommendResponse;
 import com.backend.soullive_a.entity.model.Model;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.Optional;
 
 
 public interface ModelRepository extends JpaRepository<Model, Long> {
+
     public Optional<Model> findByModelName(String modelName);
+
+    @Query("select "
+        + "new com.backend.soullive_a.dto.response.ModelRecommendResponse(m.imageUrl,m.modelName,m.job) "
+        + "From Model m ")
+    List<ModelRecommendResponse> findAllRecommendModel();
 }