Added imageurl in search

src/main/java/edu/alexu/fitfinder/controller/FavoriteController.java

@@ -10,7 +10,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 @RestController

src/main/java/edu/alexu/fitfinder/controller/SearchController.java

@@ -2,12 +2,13 @@ package edu.alexu.fitfinder.controller;
 
 import edu.alexu.fitfinder.dto.ItemDTO;
 import edu.alexu.fitfinder.dto.SearchRequestDTO;
+import edu.alexu.fitfinder.dto.SearchResponseDTO;
+import edu.alexu.fitfinder.dto.SimilarItemsDTO;
 import edu.alexu.fitfinder.repository.ItemRepo;
 import edu.alexu.fitfinder.service.JwtService;
 import edu.alexu.fitfinder.service.SearchService;
 import edu.alexu.fitfinder.service.StoredItemService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -26,14 +27,20 @@ public class SearchController {
   private final StoredItemService storedItemService;
 
   @PostMapping("/search")
-  public ResponseEntity<?> searchByImageMask(
-      @RequestBody SearchRequestDTO searchInfo)
+  public ResponseEntity<?> searchByImageMask(@RequestBody SearchRequestDTO searchInfo)
       throws Exception {
-
     try {
-      List<Long> vectorIds = searchService.getSimilarIndices(searchInfo);
-      if (vectorIds.isEmpty()) return ResponseEntity.ok().body(new LinkedList<>());
-      return ResponseEntity.ok().body(storedItemService.getProductsByVectorIds(vectorIds));
+      SearchResponseDTO searchResponse = searchService.getSimilarIndices(searchInfo);
+      if (searchResponse.getResults() == null || searchResponse.getResults().length == 0)
+        return ResponseEntity.ok().body(new LinkedList<>());
+      LinkedList<Long> vectorIds = new LinkedList<>();
+      for (SearchResponseDTO.Result result : searchResponse.getResults())
+        vectorIds.add(result.getFaiss_id());
+      return ResponseEntity.ok()
+          .body(
+              new SimilarItemsDTO(
+                  searchResponse.getSegmented_image_url(),
+                  storedItemService.getProductsByVectorIds(vectorIds)));
     } catch (IllegalArgumentException e) {
       return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
     }

src/main/java/edu/alexu/fitfinder/dto/SearchResponseDTO.java

@@ -20,4 +20,5 @@ public class SearchResponseDTO {
 
   String job_id;
   Result[] results;
+  String segmented_image_url ;
 }

src/main/java/edu/alexu/fitfinder/dto/SimilarItemsDTO.java

@@ -0,0 +1,13 @@
+package edu.alexu.fitfinder.dto;
+
+import lombok.*;
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+public class SimilarItemsDTO {
+    String segmented_image_url;
+    List<ItemDTO> items;
+}

src/main/java/edu/alexu/fitfinder/service/SearchService.java

@@ -9,8 +9,6 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import edu.alexu.fitfinder.dto.SearchResponseDTO;
-import java.util.LinkedList;
-import java.util.List;
 
 @Service
 public class SearchService {
@@ -27,7 +25,7 @@ public class SearchService {
     this.webClient = WebClient.builder().baseUrl("https://fitfinder-ai-service.hf.space").build();
   }
 
-  public List<Long> getSimilarIndices(SearchRequestDTO searchInfo)
+  public SearchResponseDTO getSimilarIndices(SearchRequestDTO searchInfo)
       throws InvalidInputException, Exception {
 
     // Validate mask
@@ -60,14 +58,6 @@ public class SearchService {
 
     // Validate response
     if (response == null) throw new Exception();
-
-    // No matched elements
-    LinkedList<Long> vectorIds = new LinkedList<>();
-    if (response.getResults() == null || response.getResults().length == 0) return vectorIds;
-
-    // Extract Vector Ids
-    for (SearchResponseDTO.Result result : response.getResults())
-      vectorIds.add(result.getFaiss_id());
-    return vectorIds;
-  }
+    return response;
+    }
 }