Merge pull request #954 from exadel-inc/EFRS-1334_optimize_models_retrieval

EFRS-1334: Optimized models retrieval

Author: VolodymyrBushko

java/admin/src/main/java/com/exadel/frs/dto/ui/ModelResponseDto.java

@@ -16,14 +16,17 @@
 
 package com.exadel.frs.dto.ui;
 
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
 import com.exadel.frs.commonservice.enums.ModelType;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 import lombok.NoArgsConstructor;
 
+@JsonInclude(NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
@@ -37,4 +40,4 @@ public class ModelResponseDto {
     private Long subjectCount;
     private Long imageCount;
     private LocalDateTime createdDate;
-}
+}

java/admin/src/main/java/com/exadel/frs/mapper/MlModelMapper.java

@@ -16,8 +16,9 @@
 
 package com.exadel.frs.mapper;
 
-import com.exadel.frs.dto.ui.ModelResponseDto;
 import com.exadel.frs.commonservice.entity.Model;
+import com.exadel.frs.commonservice.entity.ModelProjection;
+import com.exadel.frs.dto.ui.ModelResponseDto;
 import java.util.List;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
@@ -29,5 +30,8 @@ public interface MlModelMapper {
     @Mapping(source = "guid", target = "id")
     ModelResponseDto toResponseDto(Model model, @Context String appGuid);
 
+    @Mapping(source = "guid", target = "id")
+    ModelResponseDto toResponseDto(ModelProjection model, @Context String appGuid);
+
     List<ModelResponseDto> toResponseDto(List<Model> model, @Context String appGuid);
-}
+}

java/admin/src/main/java/com/exadel/frs/service/ModelService.java

@@ -22,6 +22,7 @@
 import com.exadel.frs.commonservice.annotation.CollectStatistics;
 import com.exadel.frs.commonservice.entity.App;
 import com.exadel.frs.commonservice.entity.Model;
+import com.exadel.frs.commonservice.entity.ModelProjection;
 import com.exadel.frs.commonservice.entity.ModelStatisticProjection;
 import com.exadel.frs.commonservice.entity.Subject;
 import com.exadel.frs.commonservice.entity.User;
@@ -132,7 +133,7 @@ public List<ModelResponseDto> getModels(final String appGuid, final Long userId)
 
         return modelRepository.findAllByAppId(app.getId())
                               .stream()
-                              .map(model -> getModelResponseDto(model.getApiKey(), model)).collect(Collectors.toList());
+                              .map(model -> modelMapper.toResponseDto(model, model.apiKey())).collect(Collectors.toList());
     }
 
     private Model createModel(final ModelCreateDto modelCreateDto, final String appGuid, final Long userId) {

java/admin/src/test/java/com/exadel/frs/ModelServiceTest.java

@@ -18,7 +18,9 @@
 
 import com.exadel.frs.commonservice.entity.App;
 import com.exadel.frs.commonservice.entity.Model;
+import com.exadel.frs.commonservice.entity.ModelProjection;
 import com.exadel.frs.commonservice.entity.User;
+import com.exadel.frs.commonservice.enums.ModelType;
 import com.exadel.frs.commonservice.repository.ImgRepository;
 import com.exadel.frs.commonservice.repository.ModelRepository;
 import com.exadel.frs.commonservice.repository.ModelStatisticRepository;
@@ -34,6 +36,7 @@
 import com.exadel.frs.service.ModelService;
 import com.exadel.frs.service.UserService;
 import com.exadel.frs.system.security.AuthorizationManager;
+import java.time.LocalDateTime;
 import lombok.val;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -43,6 +46,8 @@
 import java.util.Optional;
 import java.util.Random;
 
+import static com.exadel.frs.commonservice.enums.ModelType.RECOGNITION;
+import static java.time.LocalDateTime.now;
 import static java.util.UUID.randomUUID;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -140,12 +145,7 @@ void successGetModels() {
                 .id(APPLICATION_ID)
                 .build();
 
-        val model = Model.builder()
-                .id(MODEL_ID)
-                .guid(MODEL_GUID)
-                .apiKey(MODEL_API_KEY)
-                .app(app)
-                .build();
+        val model = new ModelProjection(MODEL_GUID, "1REC", MODEL_API_KEY, RECOGNITION, now());
 
         val user = User.builder()
                 .id(USER_ID)

java/admin/src/test/java/com/exadel/frs/controller/ModelControllerTest.java

@@ -108,10 +108,6 @@ void shouldReturnMessageAndCodeWhenModelNameIsMissingOnUpdate() throws Exception
 
     @Test
     void shouldReturnErrorMessageWhenNameIsMissingOnCreateNewModel() throws Exception {
-        val bodyWithEmptyName = new ModelCreateDto();
-        bodyWithEmptyName.setName("");
-        bodyWithEmptyName.setType("RECOGNITION");
-
         val bodyWithNoName = new ModelCreateDto();
         bodyWithNoName.setType("RECOGNITION");
 
@@ -120,10 +116,6 @@ void shouldReturnErrorMessageWhenNameIsMissingOnCreateNewModel() throws Exceptio
                 .with(user(buildUser()))
                 .contentType(APPLICATION_JSON);
 
-        mockMvc.perform(createNewModelRequest.content(mapper.writeValueAsString(bodyWithEmptyName)))
-               .andExpect(status().isBadRequest())
-               .andExpect(content().string("{\"message\":\"Model name size must be between 1 and 50\",\"code\":26}"));
-
         mockMvc.perform(createNewModelRequest.content(mapper.writeValueAsString(bodyWithNoName)))
                .andExpect(status().isBadRequest())
                .andExpect(content().string("{\"message\":\"Model name cannot be empty\",\"code\":26}"));

java/common/src/main/java/com/exadel/frs/commonservice/entity/ModelProjection.java

@@ -0,0 +1,13 @@
+package com.exadel.frs.commonservice.entity;
+
+import com.exadel.frs.commonservice.enums.ModelType;
+import java.time.LocalDateTime;
+
+public record ModelProjection(
+        String guid,
+        String name,
+        String apiKey,
+        ModelType type,
+        LocalDateTime createdDate) {
+
+}

java/common/src/main/java/com/exadel/frs/commonservice/repository/ModelRepository.java

@@ -17,6 +17,7 @@
 package com.exadel.frs.commonservice.repository;
 
 import com.exadel.frs.commonservice.entity.Model;
+import com.exadel.frs.commonservice.entity.ModelProjection;
 import com.exadel.frs.commonservice.entity.ModelSubjectProjection;
 import com.exadel.frs.commonservice.enums.ModelType;
 import java.util.Set;
@@ -32,11 +33,6 @@
 public interface ModelRepository extends JpaRepository<Model, Long> {
     Optional<Model> findByApiKeyAndType(String apiKey, ModelType type);
 
-    @Query("select distinct m " +
-            "from Model m " +
-            "where m.app.id = :appId")
-    List<Model> findAllByAppId(Long appId);
-
     Stream<Model> findAllByIdIn(Set<Long> ids);
 
     Optional<Model> findByGuid(String guid);
@@ -60,4 +56,16 @@ public interface ModelRepository extends JpaRepository<Model, Long> {
             " GROUP BY " +
             "   m.guid")
     List<ModelSubjectProjection> getModelSubjectsCount();
+
+    @Query("""
+            SELECT DISTINCT
+                new com.exadel.frs.commonservice.entity.ModelProjection(
+                    m.guid, m.name, m.apiKey, m.type, m.createdDate
+                )
+            FROM
+                Model m LEFT JOIN m.app a
+            WHERE
+                a.id = :appId
+            """)
+    List<ModelProjection> findAllByAppId(Long appId);
 }