[MODFQMMGR-1037] Remove obsolete entity type properties

Author: bvsharp

src/main/java/org/folio/fqm/service/EntityTypeFlatteningService.java

@@ -126,12 +126,8 @@ private EntityType getFlattenedEntityType(
       .description(originalEntityType.getDescription())
       ._private(originalEntityType.getPrivate())
       .defaultSort(originalEntityType.getDefaultSort())
-      .idView(originalEntityType.getIdView())
-      .customFieldEntityTypeId(originalEntityType.getCustomFieldEntityTypeId())
       .labelAlias(originalEntityType.getLabelAlias())
       .groupByFields(originalEntityType.getGroupByFields())
-      .sourceView(originalEntityType.getSourceView())
-      .sourceViewExtractor(originalEntityType.getSourceViewExtractor())
       .crossTenantQueriesEnabled(originalEntityType.getCrossTenantQueriesEnabled())
       .filterConditions(originalEntityType.getFilterConditions())
       .additionalEcsConditions(originalEntityType.getAdditionalEcsConditions())
@@ -238,12 +234,6 @@ private EntityType getFlattenedEntityType(
       }
     }
 
-    if (flattenedEntityType.getSourceViewExtractor() != null) {
-      flattenedEntityType.sourceViewExtractor(
-        SourceUtils.injectSourceAliasIntoViewExtractor(flattenedEntityType.getSourceViewExtractor(), renamedAliases)
-      );
-    }
-
     if (!CollectionUtils.isEmpty(flattenedEntityType.getFilterConditions())) {
       List<String> newFilterConditions = SourceUtils.injectSourceAliasIntoFilterConditions(
         flattenedEntityType.getFilterConditions(),

src/main/java/org/folio/fqm/service/EntityTypeValidationService.java

@@ -61,24 +61,6 @@ public void validateCustomEntityType(UUID entityTypeId, CustomEntityType customE
     if (customEntityType.getColumns() != null && !customEntityType.getColumns().isEmpty()) {
       throw new InvalidEntityTypeDefinitionException("Custom entity types must not contain columns", customEntityType);
     }
-    if (customEntityType.getCustomFieldEntityTypeId() != null) {
-      throw new InvalidEntityTypeDefinitionException(
-        "Custom field entity type ID must not be defined for custom entity types",
-        customEntityType
-      );
-    }
-    if (customEntityType.getSourceView() != null) {
-      throw new InvalidEntityTypeDefinitionException(
-        "Custom entity types must not contain a sourceView property",
-        customEntityType
-      );
-    }
-    if (customEntityType.getSourceViewExtractor() != null) {
-      throw new InvalidEntityTypeDefinitionException(
-        "Custom entity types must not contain a sourceViewExtractor property",
-        customEntityType
-      );
-    }
     if (Boolean.TRUE.equals(customEntityType.getCrossTenantQueriesEnabled())) {
       throw new InvalidEntityTypeDefinitionException(
         "Custom entity must not have cross-tenant queries enabled",

src/test/java/org/folio/fqm/repository/ResultSetRepositoryArrayTestDataProvider.java

@@ -59,7 +59,6 @@ public class ResultSetRepositoryArrayTestDataProvider implements MockDataProvide
         .valueGetter(":sourceAlias.testJsonbArrayField")
     ))
     .name("TEST_ARRAY_ENTITY_TYPE")
-    .fromClause("TEST_ARRAY_ENTITY_TYPE")
     .sources(List.of(
       new EntityTypeSourceDatabase()
         .type("db")

src/test/java/org/folio/fqm/repository/ResultSetRepositoryTestDataProvider.java

@@ -41,7 +41,6 @@ public class ResultSetRepositoryTestDataProvider implements MockDataProvider {
     )
     .defaultSort(List.of(new EntityTypeDefaultSort().columnName(EntityTypeRepository.ID_FIELD_NAME)))
     .name("TEST_ENTITY_TYPE")
-    .fromClause("TEST_ENTITY_TYPE")
     .sources(List.of(
       new EntityTypeSourceDatabase()
         .type("db")
@@ -62,7 +61,6 @@ public class ResultSetRepositoryTestDataProvider implements MockDataProvider {
         "id", "field1"
       )
     )
-    .fromClause("TEST_GROUP_BY_ENTITY_TYPE")
     .sources(List.of(
       new EntityTypeSourceDatabase()
         .type("db")
@@ -87,7 +85,6 @@ public class ResultSetRepositoryTestDataProvider implements MockDataProvider {
     ))
     .id("6b08439b-4f8e-4468-8046-ea620f5cfb74")
     .name("TEST_ENTITY_TYPE")
-    .fromClause("TEST_ENTITY_TYPE")
     .sources(
       List.of(
         new EntityTypeSourceDatabase()

src/test/java/org/folio/fqm/service/EntityTypeFlatteningServiceTest.java

@@ -545,7 +545,6 @@ void testFlattenSimpleEntityType() {
       )
       .sources(List.of(new EntityTypeSourceDatabase().type("db").alias("source1").target("source1_target")))
       .requiredPermissions(List.of("simple_permission1", "simple_permission2"))
-      .sourceViewExtractor("\"source1\".some_view_extractor")
       .filterConditions(List.of("\"source1\".field1 != 'xyz'"))
       .putAdditionalProperty("isCustom", false);
 

src/test/java/org/folio/fqm/service/EntityTypeValidationServiceTest.java

@@ -198,18 +198,6 @@ static List<Arguments> customEntityTypeInvalidCases() {
     return List.of(
       Arguments.of(customETFactory(b -> b.version(null)), "Custom entity type must have _version=current"),
       Arguments.of(customETFactory(b -> b.version("old")), "Custom entity type must have _version=current"),
-      Arguments.of(
-        customETFactory(b -> b.sourceView("something")),
-        "Custom entity types must not contain a sourceView property"
-      ),
-      Arguments.of(
-        customETFactory(b -> b.sourceViewExtractor("something")),
-        "Custom entity types must not contain a sourceViewExtractor property"
-      ),
-      Arguments.of(
-        customETFactory(b -> b.customFieldEntityTypeId(BASE_VALID_CUSTOM_ENTITY_TYPE.getId())),
-        "Custom field entity type ID must not be defined for custom entity types"
-      ),
       Arguments.of(customETFactory(b -> b.owner(null)), "Custom entity type must have an owner"),
       Arguments.of(customETFactory(b -> b.isCustom(null)), "Entity type .+ is not a custom entity type"),
       Arguments.of(customETFactory(b -> b.isCustom(false)), "Entity type .+ is not a custom entity type"),