Merge pull request #13 from 9oormthon-univ/develop

[Feat] ChatGPT로 이미지 분석 및 상세 조회 및 가이드 반환 develop -> main

Author: Junyeong-An

build.gradle

@@ -4,6 +4,10 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.7'
 }
 
+ext {
+    springAiVersion = "1.0.1"
+}
+
 group = 'com'
 version = '0.0.1-SNAPSHOT'
 description = 'trash-heroes-be'
@@ -51,6 +55,15 @@ dependencies {
 
     // s3
     implementation "io.awspring.cloud:spring-cloud-aws-starter-s3:3.4.0"
+
+    // openai
+    implementation 'org.springframework.ai:spring-ai-starter-model-openai'
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.ai:spring-ai-bom:$springAiVersion"
+    }
 }
 
 tasks.named('test') {

src/main/java/com/trashheroesbe/feature/district/api/DistrictController.java

@@ -5,7 +5,6 @@
 import com.trashheroesbe.feature.district.application.DistrictService;
 import com.trashheroesbe.feature.district.dto.response.DistrictListResponse;
 import com.trashheroesbe.global.response.ApiResponse;
-import java.util.ArrayList;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/trashheroesbe/feature/gpt/dto/request/TrashAnalysisRequestDt.java

@@ -0,0 +1,6 @@
+package com.trashheroesbe.feature.gpt.dto.request;
+
+public record TrashAnalysisRequestDt(
+        String imageUrl
+) {
+}

src/main/java/com/trashheroesbe/feature/gpt/dto/response/TrashAnalysisResponseDto.java

@@ -0,0 +1,14 @@
+package com.trashheroesbe.feature.gpt.dto.response;
+
+
+import com.trashheroesbe.feature.trash.domain.entity.TrashType;
+
+public record TrashAnalysisResponseDto(
+        TrashType type,
+        String item,
+        String description
+) {
+    public static TrashAnalysisResponseDto of(TrashType type, String item, String description) {
+        return new TrashAnalysisResponseDto(type, item, description);
+    }
+}

src/main/java/com/trashheroesbe/feature/question/api/QuestionController.java

@@ -0,0 +1,38 @@
+package com.trashheroesbe.feature.question.api;
+
+import static com.trashheroesbe.global.response.type.SuccessCode.OK;
+
+import com.trashheroesbe.feature.question.application.QuestionService;
+import com.trashheroesbe.feature.trash.dto.response.TrashItemResponse;
+import com.trashheroesbe.feature.trash.dto.response.TrashTypeResponse;
+import com.trashheroesbe.global.response.ApiResponse;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/questions")
+public class QuestionController implements QuestionControllerApi {
+
+    private final QuestionService questionService;
+
+    @Override
+    @GetMapping("/trash-types")
+    public ApiResponse<List<TrashTypeResponse>> getTrashTypes() {
+        List<TrashTypeResponse> response = questionService.getTrashTypes();
+        return ApiResponse.success(OK, response);
+    }
+
+    @Override
+    @GetMapping("/trash-types/{trashTypeId}")
+    public ApiResponse<List<TrashItemResponse>> getTrashItems(
+        @PathVariable Long trashTypeId
+    ) {
+        List<TrashItemResponse> response = questionService.getTrashItems(trashTypeId);
+        return ApiResponse.success(OK, response);
+    }
+}

src/main/java/com/trashheroesbe/feature/question/api/QuestionControllerApi.java

@@ -0,0 +1,18 @@
+package com.trashheroesbe.feature.question.api;
+
+import com.trashheroesbe.feature.trash.dto.response.TrashItemResponse;
+import com.trashheroesbe.feature.trash.dto.response.TrashTypeResponse;
+import com.trashheroesbe.global.response.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
+
+@Tag(name = "Question", description = "질문 관련 API(챗봇)")
+public interface QuestionControllerApi {
+
+    @Operation(summary = "상위 쓰레기 카테고리 조회(쓰레기 타입 조회)", description = "쓰레기 카테고리를 조회합니다.(쓰레기 타입)")
+    ApiResponse<List<TrashTypeResponse>> getTrashTypes();
+
+    @Operation(summary = "쓰레기 카테고리별 품목 조회(쓰레기 품목 조회)", description = "쓰레기 품목을 조회 합니다.")
+    ApiResponse<List<TrashItemResponse>> getTrashItems(Long trashTypeId);
+}

src/main/java/com/trashheroesbe/feature/question/application/QuestionService.java

@@ -0,0 +1,46 @@
+package com.trashheroesbe.feature.question.application;
+
+import static com.trashheroesbe.global.response.type.ErrorCode.NOT_EXISTS_TRASH_ITEM;
+import static com.trashheroesbe.global.response.type.ErrorCode.NOT_EXISTS_TRASH_TYPE;
+
+import com.trashheroesbe.feature.trash.domain.entity.TrashItem;
+import com.trashheroesbe.feature.trash.domain.entity.TrashType;
+import com.trashheroesbe.feature.trash.domain.service.TrashItemFinder;
+import com.trashheroesbe.feature.trash.domain.service.TrashTypeFinder;
+import com.trashheroesbe.feature.trash.dto.response.TrashItemResponse;
+import com.trashheroesbe.feature.trash.dto.response.TrashTypeResponse;
+import com.trashheroesbe.global.exception.BusinessException;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class QuestionService {
+
+    private final TrashTypeFinder trashTypeFinder;
+    private final TrashItemFinder trashItemFinder;
+
+    public List<TrashTypeResponse> getTrashTypes() {
+        List<TrashType> trashTypes = trashTypeFinder.getAllTrashTypes();
+        if (trashTypes.isEmpty()) {
+            throw new BusinessException(NOT_EXISTS_TRASH_TYPE);
+        }
+        return trashTypes.stream()
+            .map(TrashTypeResponse::from)
+            .collect(Collectors.toList());
+    }
+
+    public List<TrashItemResponse> getTrashItems(Long trashTypeId) {
+        List<TrashItem> trashItems = trashItemFinder.findTrashItemsByTrashTypeId(trashTypeId);
+        if (trashItems.isEmpty()) {
+            throw new BusinessException(NOT_EXISTS_TRASH_ITEM);
+        }
+        return trashItems.stream()
+            .map(TrashItemResponse::from)
+            .collect(Collectors.toList());
+    }
+}

src/main/java/com/trashheroesbe/feature/trash/api/TrashController.java

@@ -2,8 +2,8 @@
 
 import com.trashheroesbe.feature.trash.application.TrashService;
 import com.trashheroesbe.feature.trash.dto.request.CreateTrashRequest;
-import com.trashheroesbe.feature.trash.dto.response.TrashResult;
 import com.trashheroesbe.feature.trash.application.TrashCreateUseCase;
+import com.trashheroesbe.feature.trash.dto.response.TrashResultResponse;
 import com.trashheroesbe.global.auth.security.CustomerDetails;
 import com.trashheroesbe.global.response.ApiResponse;
 import com.trashheroesbe.global.response.type.SuccessCode;
@@ -25,34 +25,45 @@ public class TrashController implements TrashControllerApi {
 
     @Override
     @PostMapping
-    public ApiResponse<TrashResult> createTrash(
+    public ApiResponse<TrashResultResponse> createTrash(
             @ModelAttribute CreateTrashRequest request,
             @AuthenticationPrincipal CustomerDetails customerDetails
     ) {
         log.info("쓰레기 생성 요청: userId={}, fileName={}",
                 customerDetails.getUser().getId(), request.imageFile().getOriginalFilename());
 
-        TrashResult result = trashCreateUseCase.createTrash(request, customerDetails.getUser());
+        TrashResultResponse result = trashCreateUseCase.createTrash(request, customerDetails.getUser());
         return ApiResponse.success(SuccessCode.OK, result);
     }
 
     @Override
     @GetMapping("/{trashId}")
-    public ApiResponse<TrashResult> getTrash(@PathVariable Long trashId) {
+    public ApiResponse<TrashResultResponse> getTrash(@PathVariable Long trashId) {
         // TODO: 조회 로직 구현 필요
         return null;
     }
 
     @Override
     @GetMapping("/my")
-    public ApiResponse<List<TrashResult>> getMyTrash(
+    public ApiResponse<List<TrashResultResponse>> getMyTrash(
             @AuthenticationPrincipal CustomerDetails customerDetails
     ) {
         log.info("내 쓰레기 목록 조회 요청: userId={}", customerDetails.getUser().getId());
 
-        List<TrashResult> myTrashList = trashService.getTrashByUser(customerDetails.getUser());
+        List<TrashResultResponse> myTrashList = trashService.getTrashByUser(customerDetails.getUser());
 
         return ApiResponse.success(SuccessCode.OK, myTrashList);
     }
 
+    @Override
+    @DeleteMapping("/{trashId}")
+    public ApiResponse<Void> deleteTrash(
+            @PathVariable Long trashId,
+            @AuthenticationPrincipal CustomerDetails customerDetails
+    ) {
+        log.info("쓰레기 삭제 요청: userId={}, trashId={}", customerDetails.getUser().getId(), trashId);
+        trashService.deleteTrash(trashId, customerDetails.getUser());
+        return ApiResponse.success(SuccessCode.OK);
+    }
+
 }

src/main/java/com/trashheroesbe/feature/trash/api/TrashControllerApi.java

@@ -2,12 +2,13 @@
 
 
 import com.trashheroesbe.feature.trash.dto.request.CreateTrashRequest;
-import com.trashheroesbe.feature.trash.dto.response.TrashResult;
+import com.trashheroesbe.feature.trash.dto.response.TrashResultResponse;
 import com.trashheroesbe.global.auth.security.CustomerDetails;
 import com.trashheroesbe.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,18 +21,21 @@ public interface TrashControllerApi {
     @Operation(
             summary = "쓰레기 생성",
             description = "현재 인증된 사용자의 이미지 파일로 쓰레기를 생성합니다. 이미지는 S3에 업로드되고 URL이 저장됩니다.",
-            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
+            requestBody = @RequestBody(
                     content = @Content(
                             mediaType = "multipart/form-data",
                             schema = @Schema(implementation = CreateTrashRequest.class)
                     )
             )
     )
-    ApiResponse<TrashResult> createTrash(CreateTrashRequest request, @AuthenticationPrincipal CustomerDetails customerDetails);
+    ApiResponse<TrashResultResponse> createTrash(CreateTrashRequest request, @AuthenticationPrincipal CustomerDetails customerDetails);
 
     @Operation(summary = "쓰레기 조회", description = "쓰레기 ID로 정보를 조회합니다.")
-    ApiResponse<TrashResult> getTrash(@PathVariable Long trashId);
+    ApiResponse<TrashResultResponse> getTrash(@PathVariable Long trashId);
 
     @Operation(summary = "내 쓰레기 목록", description = "현재 인증된 사용자의 모든 쓰레기를 조회합니다.")
-    ApiResponse<List<TrashResult>> getMyTrash(@AuthenticationPrincipal CustomerDetails customerDetails);
+    ApiResponse<List<TrashResultResponse>> getMyTrash(@AuthenticationPrincipal CustomerDetails customerDetails);
+
+    @Operation(summary = "쓰레기 삭제", description = "쓰레기와 해당 이미지(S3)를 함께 삭제합니다.")
+    ApiResponse<Void> deleteTrash(@PathVariable Long trashId, @AuthenticationPrincipal CustomerDetails customerDetails);
 }

src/main/java/com/trashheroesbe/feature/trash/api/admin/TrashTypeAdminController.java

@@ -0,0 +1,25 @@
+package com.trashheroesbe.feature.trash.api.admin;
+
+
+import com.trashheroesbe.feature.trash.application.admin.TrashTypeAdminService;
+import com.trashheroesbe.global.response.ApiResponse;
+import com.trashheroesbe.global.response.type.SuccessCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/admin/trash-types")
+public class TrashTypeAdminController implements TrashTypeAdminControllerApi {
+
+    private final TrashTypeAdminService trashTypeAdminService;
+
+    @Override
+    @PostMapping("/initialize")
+    public ApiResponse<Void> initializeTrashType() {
+        trashTypeAdminService.initializeTrashType();
+        return ApiResponse.success(SuccessCode.OK);
+    }
+}