fix: fetch APIs with the correct repository method

Author: mariano-fernandez

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/cockpit/command/handler/DeployModelCommandHandler.java

@@ -28,9 +28,9 @@
 import io.gravitee.cockpit.api.command.v1.designer.DeployModelReply;
 import io.gravitee.definition.model.DefinitionVersion;
 import io.gravitee.exchange.api.command.CommandHandler;
+import io.gravitee.repository.management.model.Api;
 import io.gravitee.rest.api.model.EnvironmentEntity;
 import io.gravitee.rest.api.model.UserEntity;
-import io.gravitee.rest.api.model.v4.api.ApiEntity;
 import io.gravitee.rest.api.service.EnvironmentService;
 import io.gravitee.rest.api.service.UserService;
 import io.gravitee.rest.api.service.cockpit.model.DeploymentMode;
@@ -106,7 +106,7 @@ public Single<DeployModelReply> handle(DeployModelCommand command) {
                 return message
                     .map(s -> Single.just(new DeployModelReply(command.getId(), s)))
                     .orElseGet(() -> {
-                        final ApiEntity api = apiSearchService.findById(executionContext, apiId);
+                        final Api api = apiSearchService.findRepositoryApiById(executionContext, apiId);
 
                         if (api.getDefinitionVersion() == DefinitionVersion.V2) {
                             return updateV2Api(command, apiId, executionContext, user, mode, swaggerDefinition, labels);

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/cockpit/command/handler/DeployModelCommandHandlerTest.java

@@ -29,6 +29,7 @@
 import io.gravitee.cockpit.api.command.v1.designer.DeployModelReply;
 import io.gravitee.definition.model.DefinitionVersion;
 import io.gravitee.exchange.api.command.CommandStatus;
+import io.gravitee.repository.management.model.Api;
 import io.gravitee.rest.api.model.EnvironmentEntity;
 import io.gravitee.rest.api.model.UserEntity;
 import io.gravitee.rest.api.model.api.ApiEntity;
@@ -105,8 +106,8 @@ public void updates_an_API_DOCUMENTED() {
 
         String apiId = "api#id";
         when(apiSearchService.findIdByEnvironmentIdAndCrossId(ENVIRONMENT_ID, payload.modelId())).thenReturn(Optional.of(apiId));
-        when(apiSearchService.findById(EXECUTION_CONTEXT, apiId)).thenReturn(
-            io.gravitee.rest.api.model.v4.api.ApiEntity.builder().definitionVersion(DefinitionVersion.V2).build()
+        when(apiSearchService.findRepositoryApiById(EXECUTION_CONTEXT, apiId)).thenReturn(
+            Api.builder().definitionVersion(DefinitionVersion.V2).build()
         );
 
         UserEntity user = createUserEntity(payload);
@@ -146,8 +147,8 @@ public void updates_an_API_MOCKED_mode() {
 
         String apiId = "api#id";
         when(apiSearchService.findIdByEnvironmentIdAndCrossId(ENVIRONMENT_ID, payload.modelId())).thenReturn(Optional.of(apiId));
-        when(apiSearchService.findById(EXECUTION_CONTEXT, apiId)).thenReturn(
-            io.gravitee.rest.api.model.v4.api.ApiEntity.builder().definitionVersion(DefinitionVersion.V2).build()
+        when(apiSearchService.findRepositoryApiById(EXECUTION_CONTEXT, apiId)).thenReturn(
+            Api.builder().definitionVersion(DefinitionVersion.V2).build()
         );
 
         UserEntity user = createUserEntity(payload);
@@ -187,8 +188,8 @@ public void updates_an_API_PUBLISHED_mode() {
 
         String apiId = "api#id";
         when(apiSearchService.findIdByEnvironmentIdAndCrossId(ENVIRONMENT_ID, payload.modelId())).thenReturn(Optional.of(apiId));
-        when(apiSearchService.findById(EXECUTION_CONTEXT, apiId)).thenReturn(
-            io.gravitee.rest.api.model.v4.api.ApiEntity.builder().definitionVersion(DefinitionVersion.V2).build()
+        when(apiSearchService.findRepositoryApiById(EXECUTION_CONTEXT, apiId)).thenReturn(
+            Api.builder().definitionVersion(DefinitionVersion.V2).build()
         );
 
         UserEntity user = createUserEntity(payload);

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/cockpit/command/handler/DeployModelV4CommandHandlerTest.java

@@ -196,8 +196,8 @@ public void update_API(DeployModelCommandPayload.DeploymentMode deploymentMode,
             ).thenReturn(Optional.empty());
 
             when(apiSearchService.findIdByEnvironmentIdAndCrossId(ENVIRONMENT_ID, payload.modelId())).thenReturn(Optional.of(apiId));
-            when(apiSearchService.findById(EXECUTION_CONTEXT, apiId)).thenReturn(
-                io.gravitee.rest.api.model.v4.api.ApiEntity.builder().definitionVersion(DefinitionVersion.V4).build()
+            when(apiSearchService.findRepositoryApiById(EXECUTION_CONTEXT, apiId)).thenReturn(
+                io.gravitee.repository.management.model.Api.builder().definitionVersion(DefinitionVersion.V4).build()
             );
 
             when(deployModelToApiUpdateUseCase.execute(any())).thenReturn(new DeployModelToApiUpdateUseCase.Output(new Api()));