Feature/12

.platform/nginx.conf

@@ -37,7 +37,7 @@ http {
       location / {
           proxy_pass          http://springboot;
                   # CORS 관련 헤더 추가
-          add_header 'Access-Control-Allow-Origin' '*';
+          add_header 'Access-Control-Allow-Origin' 'http://13.209.82.5';
           add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
           add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type';
           proxy_http_version  1.1;

src/main/java/com/hackerton/demo/domain/Keyword/ChatService.java → src/main/java/com/hackerton/demo/domain/keyword/ChatService.java

@@ -1,4 +1,4 @@
-package com.hackerton.demo.domain.Keyword;
+package com.hackerton.demo.domain.keyword;
 
 import com.theokanning.openai.completion.chat.ChatCompletionChoice;
 import lombok.RequiredArgsConstructor;
@@ -9,7 +9,6 @@
 import com.theokanning.openai.service.OpenAiService;
 
 import java.time.Duration;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,10 +23,12 @@ public class ChatService {
 
     private final KeywordRespository keywordRespository;
 
+    private final PlaceRepository placeRepository;
+
     public List<KeywordDto> createGptComment(String content) {
         this.openAiService = new OpenAiService(apiKey, Duration.ofSeconds(20));
         String prompt = content + "대신 딱 10개만 아무런 부가 설명 없이 키워드만 알려줘.";
-        System.out.println(prompt);
+
         ChatCompletionRequest requester = ChatCompletionRequest.builder()
                 .model(MODEL)
                 .maxTokens(2048)
@@ -79,4 +80,61 @@ private List<KeywordDto> convertToKeywordDtos(List<Keyword> keywords) {
         }
         return keywordDtos;
     }
+
+    public List<PlaceDto> createGptPlace(String content) {
+        this.openAiService = new OpenAiService(apiKey, Duration.ofSeconds(20));
+        String prompt = content + "를 할 수 있는 대한민국에 있는 장소 5개만 부가 설명 없이 장소명만 알려줘. 장소명 말고 다른 설명은 필요 없어.";
+
+        ChatCompletionRequest requester = ChatCompletionRequest.builder()
+                .model(MODEL)
+                .maxTokens(2048)
+                .temperature(0.8)
+                .messages(List.of(
+                        new ChatMessage("user", prompt)
+                )).build();
+
+        ChatCompletionChoice chatCompletionResult = openAiService.createChatCompletion(requester).getChoices().get(0);
+        String contentResult = chatCompletionResult.getMessage().getContent();
+
+        return extractPlaces(contentResult);
+    }
+
+    private List<PlaceDto> extractPlaces(String content) {
+        List<PlaceDto> placeDtos = new ArrayList<>();
+
+        // 개행 문자로 분할하여 리스트로 변환
+        String[] placeArray = content.split("\\r?\\n");
+
+        for (String placeName : placeArray) {
+            String cleanName = placeName.replaceAll("\\d+\\.\\s*", "");
+            PlaceDto placeDto = PlaceDto.builder().placeName(cleanName).build();
+            placeDtos.add(placeDto);
+        }
+
+        List<Place> places = placeRepository.saveAll(convertToPlace(placeDtos));
+
+        return convertToPlaceDtos(places);
+    }
+
+    private List<Place> convertToPlace(List<PlaceDto> placeDtos) {
+        List<Place> places = new ArrayList<>();
+        for (PlaceDto dto : placeDtos) {
+            Place place = new Place();
+            place.setPlaceName(dto.getPlaceName());
+            places.add(place);
+        }
+        return places;
+    }
+
+    private List<PlaceDto> convertToPlaceDtos(List<Place> places) {
+        List<PlaceDto> placeDtos = new ArrayList<>();
+        for (Place place : places) {
+            PlaceDto dto = PlaceDto.builder()
+                    .placeName(place.getPlaceName())
+                    .build();
+            placeDtos.add(dto);
+        }
+        return placeDtos;
+    }
+
 }

src/main/java/com/hackerton/demo/domain/Keyword/GptController.java → src/main/java/com/hackerton/demo/domain/keyword/GptController.java

@@ -1,4 +1,4 @@
-package com.hackerton.demo.domain.Keyword;
+package com.hackerton.demo.domain.keyword;
 
 import com.hackerton.demo.domain.common.ApiResponse;
 import com.hackerton.demo.domain.common.ApiResponseStatus;
@@ -19,7 +19,7 @@ public class GptController {
     private final ChatService chatService;
 
     @GetMapping("/result")
-    @Operation(summary = "음석인식/텍스트 ChatGPT로 전달하여 키워드 추출", description = "음성인식/텍스트를 통해 ChatGPT 검색을 실행합니다. " + "검색 결과를 List로 반환하여 Keyword에 저장합니다.")
+    @Operation(summary = "음성인식/텍스트 ChatGPT로 전달하여 키워드 추출", description = "음성인식/텍스트를 통해 ChatGPT 검색을 실행합니다. " + "검색 결과를 List로 반환하여 Keyword에 저장합니다.")
     @ApiResponses({
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "GET_SUCCESS", description = "조회 성공"),
     })
@@ -28,4 +28,15 @@ public ResponseEntity<ApiResponse<List<KeywordDto>>> createGptComment(@RequestPa
         ApiResponse<List<KeywordDto>> apiResponse = new ApiResponse<>(ApiResponseStatus.GET_SUCCESS, keywordDtos);
         return ResponseEntity.ok(apiResponse);
     }
+
+    @GetMapping("/result/place")
+    @Operation(summary = "선택된 키워드와 관련된 장소 추천", description = "키워드와 관련된 장소를 추천합니다.")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "GET_SUCCESS", description = "조회 성공"),
+    })
+    public ResponseEntity<ApiResponse<List<PlaceDto>>> createGptPlace(@RequestParam String content) {
+        List<PlaceDto> placeDtos = chatService.createGptPlace(content);
+        ApiResponse<List<PlaceDto>> apiResponse = new ApiResponse<>(ApiResponseStatus.GET_SUCCESS, placeDtos);
+        return ResponseEntity.ok(apiResponse);
+    }
 }

src/main/java/com/hackerton/demo/domain/Keyword/Keyword.java → src/main/java/com/hackerton/demo/domain/keyword/Keyword.java

@@ -1,4 +1,4 @@
-package com.hackerton.demo.domain.Keyword;
+package com.hackerton.demo.domain.keyword;
 
 import com.hackerton.demo.domain.common.BaseEntity;
 import jakarta.persistence.*;
@@ -9,7 +9,6 @@
 @Setter
 @Builder
 @NoArgsConstructor(access = AccessLevel.PUBLIC)
-
 @AllArgsConstructor
 public class Keyword extends BaseEntity {
 

src/main/java/com/hackerton/demo/domain/Keyword/KeywordDto.java → src/main/java/com/hackerton/demo/domain/keyword/KeywordDto.java

@@ -1,12 +1,10 @@
-package com.hackerton.demo.domain.Keyword;
+package com.hackerton.demo.domain.keyword;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
-
 @Builder
 @Getter
 @NoArgsConstructor

src/main/java/com/hackerton/demo/domain/Keyword/KeywordRespository.java → src/main/java/com/hackerton/demo/domain/keyword/KeywordRespository.java

@@ -1,4 +1,4 @@
-package com.hackerton.demo.domain.Keyword;
+package com.hackerton.demo.domain.keyword;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/com/hackerton/demo/domain/keyword/Place.java

@@ -0,0 +1,20 @@
+package com.hackerton.demo.domain.keyword;
+
+import com.hackerton.demo.domain.common.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PUBLIC)
+@AllArgsConstructor
+public class Place extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "place_id")
+    private Long id;
+
+    private String placeName;
+}

src/main/java/com/hackerton/demo/domain/keyword/PlaceDto.java

@@ -0,0 +1,14 @@
+package com.hackerton.demo.domain.keyword;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class PlaceDto {
+    private String placeName;
+}

src/main/java/com/hackerton/demo/domain/keyword/PlaceRepository.java

@@ -0,0 +1,8 @@
+package com.hackerton.demo.domain.keyword;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PlaceRepository extends JpaRepository<Place, Long> {
+}