Merge pull request #65 from GDSC-KNU/develop

Develop -> Main
GDG-on-Campus-KNU · Feb 22, 2024 · 4777a4a · 4777a4a
2 parents 121a2a2 + 5c2f5bb
commit 4777a4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/gdsc/pikpet/controller/AnimalSearchController.java b/src/main/java/com/gdsc/pikpet/controller/AnimalSearchController.java
@@ -39,6 +39,8 @@ public ResponseEntity<AnimalSearchDto> getAnimals(
     @PostMapping("/image")
     public ResponseEntity<AnimalSearchDto> getAnimalsByImage(
             Authentication authentication,
+            @RequestParam Double lon,
+            @RequestParam Double lat,
             @RequestParam MultipartFile file
     ) throws IOException {
         //TODO: 예외처리
@@ -47,7 +49,7 @@ public ResponseEntity<AnimalSearchDto> getAnimalsByImage(
                 .imageToCategory(Base64.getEncoder().encodeToString(fileContent));
 
         //GeminiFilter -> AnimalFilterCriteria로 변환
-        AnimalFilterCriteria animalFilterCriteria = AnimalFilterCriteria.from(geminiFilter);
+        AnimalFilterCriteria animalFilterCriteria = AnimalFilterCriteria.from(geminiFilter, lon, lat);
         AnimalSearchDto animals = animalService.getAnimals(animalFilterCriteria, (UserSecurityDto) authentication.getPrincipal());
         log.info("geminifilter: {}", geminiFilter);
         return ResponseEntity.ok(animals);

diff --git a/src/main/java/com/gdsc/pikpet/dto/AnimalFilterCriteria.java b/src/main/java/com/gdsc/pikpet/dto/AnimalFilterCriteria.java
@@ -23,7 +23,7 @@ public record AnimalFilterCriteria(
         Integer page,
         List<Color> colors
 ) {
-    public static AnimalFilterCriteria from(GeminiFilter geminiFilter) {
+    public static AnimalFilterCriteria from(GeminiFilter geminiFilter, Double lon, Double lat) {
         AnimalFilterCriteria animalFilterCriteria = new AnimalFilterCriteria(
                 List.of(geminiFilter.species()),
                 List.of(geminiFilter.breed()),
@@ -32,8 +32,8 @@ public static AnimalFilterCriteria from(GeminiFilter geminiFilter) {
                 null,
                  null,
                 null,
-                null,
-                null,
+                lon,
+                lat,
                 0,
                 null //TODO: color 코드로 변경
         );