fix: deploy api after dynamic properties change

Author: nive1980

gravitee-apim-rest-api/gravitee-apim-rest-api-management-v2/gravitee-apim-rest-api-management-v2-rest/src/test/java/io/gravitee/rest/api/management/v2/rest/mapper/ImportExportApiMapperTest.java

@@ -15,7 +15,6 @@
  */
 package io.gravitee.rest.api.management.v2.rest.mapper;
 
-<<<<<<< HEAD
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -82,83 +81,6 @@ void shouldUseCorsMappperForHttpListener() {
         assertThat(result.getCors().getExposeHeaders()).isEqualTo(expectedCors.getExposeHeaders());
         assertThat(result.getCors().getMaxAge()).isEqualTo(expectedCors.getMaxAge());
         assertThat(result.getCors().getRunPolicies()).isEqualTo(expectedCors.getRunPolicies());
-=======
-import static org.assertj.core.api.Assertions.assertThat;
-
-import io.gravitee.apim.core.api.model.import_definition.ImportDefinition;
-import io.gravitee.apim.core.membership.model.PrimaryOwnerEntity;
-import io.gravitee.rest.api.management.v2.rest.model.ApiV4;
-import io.gravitee.rest.api.management.v2.rest.model.ExportApiV4;
-import io.gravitee.rest.api.management.v2.rest.model.MembershipMemberType;
-import io.gravitee.rest.api.management.v2.rest.model.PrimaryOwner;
-import org.junit.jupiter.api.DisplayNameGeneration;
-import org.junit.jupiter.api.DisplayNameGenerator;
-import org.junit.jupiter.api.Test;
-
-@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-class ImportExportApiMapperTest {
-
-    @Test
-    void should_map_primary_owner_and_media_fields() {
-        // Given
-        var po = new PrimaryOwner().id("po-id").email("po@gravitee.io").displayName("John Doe").type(MembershipMemberType.USER);
-
-        var api = new ApiV4();
-        api.setPrimaryOwner(po);
-
-        var exportApiV4 = new ExportApiV4();
-        exportApiV4.setApi(api);
-        exportApiV4.setApiPicture("picture-bytes");
-        exportApiV4.setApiBackground("bg-bytes");
-
-        // When
-        ImportDefinition importDefinition = ImportExportApiMapper.INSTANCE.toImportDefinition(exportApiV4);
-
-        // Then
-        var apiExport = importDefinition.getApiExport();
-        assertThat(apiExport).isNotNull();
-        assertThat(apiExport.getPicture()).isEqualTo("picture-bytes");
-        assertThat(apiExport.getBackground()).isEqualTo("bg-bytes");
-        assertThat(apiExport.getPrimaryOwner()).isNotNull();
-        assertThat(apiExport.getPrimaryOwner().id()).isEqualTo("po-id");
-        assertThat(apiExport.getPrimaryOwner().email()).isEqualTo("po@gravitee.io");
-        assertThat(apiExport.getPrimaryOwner().displayName()).isEqualTo("John Doe");
-        assertThat(apiExport.getPrimaryOwner().type()).isEqualTo(PrimaryOwnerEntity.Type.USER);
-    }
-
-    @Test
-    void should_default_primary_owner_type_to_user_when_null() {
-        // Given
-        var po = new PrimaryOwner().id("po-id").email("po@gravitee.io").displayName("John Doe"); // no type set
-
-        var api = new ApiV4();
-        api.setPrimaryOwner(po);
-
-        var exportApiV4 = new ExportApiV4();
-        exportApiV4.setApi(api);
-
-        // When
-        var importDefinition = ImportExportApiMapper.INSTANCE.toImportDefinition(exportApiV4);
-
-        // Then
-        assertThat(importDefinition.getApiExport().getPrimaryOwner()).isNotNull();
-        assertThat(importDefinition.getApiExport().getPrimaryOwner().type()).isEqualTo(PrimaryOwnerEntity.Type.USER);
-    }
-
-    @Test
-    void should_not_set_primary_owner_when_absent() {
-        // Given
-        var api = new ApiV4();
-        // no primary owner
-        var exportApiV4 = new ExportApiV4();
-        exportApiV4.setApi(api);
-
-        // When
-        var importDefinition = ImportExportApiMapper.INSTANCE.toImportDefinition(exportApiV4);
-
-        // Then
-        assertThat(importDefinition.getApiExport().getPrimaryOwner()).isNull();
->>>>>>> 5832b9666c (fix: set primary owner for v4 api export)
     }
 
     @Test

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/api/use_case/ImportApiDefinitionUseCaseTest.java

@@ -150,7 +150,10 @@ void setUp() {
             )
         );
         importDefinitionCreateDomainServiceTestInitializer.userCrudService.initWith(
-            List.of(BaseUserEntity.builder().id(USER_ID).firstname("Jane").lastname("Doe").email(USER_EMAIL).build())
+            List.of(
+                BaseUserEntity.builder().id(USER_ID).firstname("Jane").lastname("Doe").email(USER_EMAIL).build(),
+                BaseUserEntity.builder().id("NEW-USER-ID").firstname("Jane1").lastname("Doe1").email(USER_EMAIL).build()
+            )
         );
     }
 
@@ -259,10 +262,10 @@ void should_create_a_new_api_with_primary_owner_as_in_definition() {
             importDefinition.getApiExport().setId(customId);
 
             io.gravitee.apim.core.membership.model.PrimaryOwnerEntity primaryOwner = PrimaryOwnerEntity.builder()
-                .id("NEW-USER-ID")
+                .id(USER_ID)
                 .type(PrimaryOwnerEntity.Type.USER)
                 .email(USER_EMAIL)
-                .displayName("Jane1 Doe1")
+                .displayName("Jane Doe")
                 .build();
             importDefinition.getApiExport().setPrimaryOwner(primaryOwner);
             useCase.execute(new ImportApiDefinitionUseCase.Input(importDefinition, AUDIT_INFO));
@@ -280,7 +283,7 @@ void should_create_a_new_api_with_primary_owner_as_in_definition() {
                     .containsExactly(
                         new IndexableApi(
                             expected,
-                            new PrimaryOwnerEntity("NEW-USER-ID", USER_EMAIL, "Jane1 Doe1", PrimaryOwnerEntity.Type.USER),
+                            new PrimaryOwnerEntity(USER_ID, USER_EMAIL, "Jane Doe", PrimaryOwnerEntity.Type.USER),
                             Map.ofEntries(Map.entry("email-support", USER_EMAIL)),
                             Collections.emptySet()
                         )