diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ImageSimilaritySearchController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ImageSimilaritySearchController.java index 23839b430..411f44eb8 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ImageSimilaritySearchController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ImageSimilaritySearchController.java @@ -11,10 +11,10 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.iqser.red.service.persistence.management.v1.processor.service.image.ImageSimilarityService; +import com.iqser.red.service.persistence.management.v1.processor.service.ImageSimilarityService; import com.iqser.red.service.persistence.service.v1.api.external.resource.ImageSimilaritySearchResource; -import com.iqser.red.service.persistence.service.v1.api.shared.model.image.ImageSimilaritySearchResponse; import com.iqser.red.service.persistence.service.v1.api.shared.model.image.ImageSimilaritySearchRequest; +import com.iqser.red.service.persistence.service.v1.api.shared.model.image.ImageSimilaritySearchResponse; import com.iqser.red.service.persistence.service.v1.api.shared.mongo.document.ImageDocument; import lombok.RequiredArgsConstructor; @@ -26,17 +26,17 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class ImageSimilaritySearchController implements ImageSimilaritySearchResource { - private final ImageSimilarityService imageSimiliarityService; + private final ImageSimilarityService imageSimilarityService; @SneakyThrows + @PreAuthorize("hasAuthority('" + GET_SIMILIAR_IMAGES + "')") public ResponseEntity getSimilarImages(@RequestBody ImageSimilaritySearchRequest imageSimilaritySearchRequest) { - - log.info("received similiar image search request {}",imageSimilaritySearchRequest); - List similarImages = this.imageSimiliarityService.findSimilarImages(imageSimilaritySearchRequest.getCentroId(), - imageSimilaritySearchRequest.getDistance(), - imageSimilaritySearchRequest.getScope()); + log.info("received similiar image search request {}", imageSimilaritySearchRequest); + List similarImages = this.imageSimilarityService.findSimilarImages(imageSimilaritySearchRequest.getCentroId(), + imageSimilaritySearchRequest.getDistance(), + imageSimilaritySearchRequest.getScope()); List similarImagesIds = new ArrayList<>(); List similarImagesThumbnails = new ArrayList<>(); similarImages.stream() diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ImageSimilarityService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ImageSimilarityService.java index e0e538994..983c3951d 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ImageSimilarityService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ImageSimilarityService.java @@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.Scope; import com.iqser.red.service.persistence.service.v1.api.shared.mongo.document.ImageDocument; import com.iqser.red.service.persistence.service.v1.api.shared.mongo.service.ImageMongoService; @@ -33,12 +32,10 @@ public class ImageSimilarityService { ObjectMapper objectMapper; - //load all recat requests and find similiar images public void saveImages(String templateId, String dossierId, String fileId, String storageId) throws IOException { - //load structure files of all files in template + List imageDocuments = new ArrayList<>(); try (InputStream inputStream = fileManagementStorageService.getObject(TenantContext.getTenantId(), storageId)) { - //load images from structures DocumentStructure documentStructure = objectMapper.readValue(inputStream, DocumentStructure.class); documentStructure.streamAllEntries() .filter(entry -> entry.getType().equals(NodeType.IMAGE)) @@ -64,9 +61,9 @@ public class ImageSimilarityService { public List findSimilarImages(String centroId, double distance, Scope scope) throws Exception { ImageDocument centroImage = this.imageMongoService.findById(centroId); - log.info("image received with id {}: {}",centroId, centroImage); + log.info("image received with id {}: {}", centroId, centroImage); List similarImages = this.imageMongoService.findSimilarImages(centroImage, distance, scope); - log.info("received similar images: {}",similarImages); + log.info("received similar images: {}", similarImages); return similarImages.stream() .collect(Collectors.toList()); }