26908 Update managed_attribute_type postgres enum

Updated postgres enum + updated tests

Author: cgendreau

.gitignore

@@ -8,4 +8,5 @@ docker-compose.override.yml
 /*.env
 /*.idea
 /*.vscode
+/*.iml
 dbchangelog-4.4.xsd

src/main/resources/db/changelog/db.changelog-master.xml

@@ -15,5 +15,6 @@
     <include file="db/changelog/migrations/10-Update_jsonb_path_exists_varchar_function.xml"/>
     <include file="db/changelog/migrations/11-Align_managed_attribute_with_collection-api.xml"/>
     <include file="db/changelog/migrations/12-Add_support_for_type_Link.xml"/>
+    <include file="db/changelog/migrations/13-Update_managed_attribute_type_postgres_enum.xml"/>
 
 </databaseChangeLog>

src/main/resources/db/changelog/migrations/13-Update_managed_attribute_type_postgres_enum.xml

@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no" ?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog db/changelog/xsd/dbchangelog-4.4.xsd"
+                   objectQuotingStrategy="QUOTE_ONLY_RESERVED_WORDS">
+
+  <changeSet id="13-Update_managed_attribute_type_postgres_enum" context="schema-change" author="cgendreau" runInTransaction="false">
+    <sql>
+      ALTER TYPE managed_attribute_type ADD VALUE 'DATE';
+    </sql>
+    <sql>
+      ALTER TYPE managed_attribute_type ADD VALUE 'BOOL';
+    </sql>
+  </changeSet>
+</databaseChangeLog>

src/test/java/ca/gc/aafc/objectstore/api/repository/ObjectStoreManagedAttributeRepositoryCRUDIT.java

@@ -9,6 +9,7 @@
 import javax.inject.Inject;
 
 import ca.gc.aafc.objectstore.api.BaseIntegrationTest;
+import ca.gc.aafc.objectstore.api.testsupport.fixtures.ObjectStoreManagedAttributeFixture;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -62,12 +63,11 @@ public void findManagedAttribute_whenNoFieldsAreSelected_manageAttributeReturned
 
   @Test
   public void create_WithAuthenticatedUser_SetsCreatedBy() {
-    ObjectStoreManagedAttributeDto ma = new ObjectStoreManagedAttributeDto();
-    ma.setUuid(UUID.randomUUID());
+    ObjectStoreManagedAttributeDto ma = ObjectStoreManagedAttributeFixture
+        .newObjectStoreManagedAttribute();
     ma.setName("name");
     ma.setManagedAttributeType(ManagedAttributeType.STRING);
     ma.setAcceptedValues(new String[] { "dosal" });
-    ma.setMultilingualDescription(MultilingualDescriptionFactory.newMultilingualDescription().build());
 
     ObjectStoreManagedAttributeDto result = managedResourceRepository.findOne(
       managedResourceRepository.create(ma).getUuid(),
@@ -77,13 +77,10 @@ public void create_WithAuthenticatedUser_SetsCreatedBy() {
 
   @Test
   void findOneByKey_whenKeyProvided_managedAttributeFetched() {
-    ObjectStoreManagedAttributeDto newAttribute = new ObjectStoreManagedAttributeDto();
+    ObjectStoreManagedAttributeDto newAttribute = ObjectStoreManagedAttributeFixture
+        .newObjectStoreManagedAttribute();
     newAttribute.setName("Object Store Attribute 1");
     newAttribute.setManagedAttributeType(ManagedAttributeType.INTEGER);
-    newAttribute.setCreatedBy("poffm");
-    newAttribute.setMultilingualDescription(
-      MultilingualDescriptionFactory.newMultilingualDescription().build()
-      );
 
     UUID newAttributeUuid = managedResourceRepository.create(newAttribute).getUuid();
 

src/test/java/ca/gc/aafc/objectstore/api/repository/ObjectStoreMetadataRepositoryCRUDIT.java

@@ -1,18 +1,20 @@
 package ca.gc.aafc.objectstore.api.repository;
 
+import ca.gc.aafc.dina.entity.ManagedAttribute;
 import ca.gc.aafc.objectstore.api.BaseIntegrationTest;
+import ca.gc.aafc.objectstore.api.dto.ObjectStoreManagedAttributeDto;
 import ca.gc.aafc.objectstore.api.dto.ObjectStoreMetadataDto;
 import ca.gc.aafc.objectstore.api.dto.ObjectSubtypeDto;
 import ca.gc.aafc.objectstore.api.entities.Derivative;
 import ca.gc.aafc.objectstore.api.entities.ObjectStoreManagedAttribute;
 import ca.gc.aafc.objectstore.api.entities.ObjectStoreMetadata;
 import ca.gc.aafc.objectstore.api.entities.ObjectSubtype;
 import ca.gc.aafc.objectstore.api.entities.ObjectUpload;
-import ca.gc.aafc.objectstore.api.testsupport.factories.MultilingualDescriptionFactory;
 import ca.gc.aafc.objectstore.api.testsupport.factories.ObjectStoreManagedAttributeFactory;
 import ca.gc.aafc.objectstore.api.testsupport.factories.ObjectStoreMetadataFactory;
 import ca.gc.aafc.objectstore.api.testsupport.factories.ObjectSubtypeFactory;
 import ca.gc.aafc.objectstore.api.testsupport.factories.ObjectUploadFactory;
+import ca.gc.aafc.objectstore.api.testsupport.fixtures.ObjectStoreManagedAttributeFixture;
 import io.crnk.core.queryspec.QuerySpec;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.AfterEach;
@@ -36,7 +38,8 @@ public class ObjectStoreMetadataRepositoryCRUDIT extends BaseIntegrationTest {
   @Inject
   private ObjectStoreResourceRepository objectStoreResourceRepository;
 
-  private ObjectStoreManagedAttribute testManagedAttribute;
+  @Inject
+  private ObjectStoreManagedAttributeResourceRepository managedResourceRepository;
 
   private ObjectSubtypeDto acSubtype;
 
@@ -48,19 +51,17 @@ private ObjectStoreMetadata createTestObjectStoreMetadata() {
     return testObjectStoreMetadata;
   }
 
-  private void createTestManagedAttribute() {
-    testManagedAttribute = ObjectStoreManagedAttributeFactory.newManagedAttribute()
-    .acceptedValues(new String[]{"dosal"})
-    .multilingualDescription(MultilingualDescriptionFactory.newMultilingualDescription().build())
+  private ObjectStoreManagedAttribute createTestManagedAttribute() {
+    ObjectStoreManagedAttribute testManagedAttribute = ObjectStoreManagedAttributeFactory.newManagedAttribute()
+    .acceptedValues(new String[]{"dorsal"})
     .build();
-    managedAttributeService.create(testManagedAttribute);
+    return managedAttributeService.create(testManagedAttribute);
   }
 
   @BeforeEach
   public void setup() {
     objectUpload = createObjectUpload();
     createAcSubtype();
-    createTestManagedAttribute();
   }
 
   /**
@@ -109,6 +110,9 @@ public void findMeta_whenNoFieldsAreSelected_MetadataReturnedWithAllFields() {
 
   @Test
   public void create_ValidResource_ResourcePersisted() {
+
+    ObjectStoreManagedAttribute testManagedAttribute = createTestManagedAttribute();
+
     ObjectUpload objectUploadTest = ObjectUploadFactory.newObjectUpload().build();
     objectUploadService.create(objectUploadTest);
 
@@ -219,6 +223,31 @@ private void assertRelationshipsRemoved(UUID metadataUUID) {
     ObjectStoreMetadata result = objectStoreMetaDataService.findOne(updateMetadataDto.getUuid());
     Assertions.assertNull(result.getAcSubtype());
   }
+
+  @Test
+  public void create_onManagedAttributeValue_validationOccur() {
+
+    ObjectStoreManagedAttributeDto newAttribute = ObjectStoreManagedAttributeFixture.newObjectStoreManagedAttribute();
+    newAttribute.setManagedAttributeType(ManagedAttribute.ManagedAttributeType.DATE);
+    newAttribute.setAcceptedValues(null);
+    newAttribute = managedResourceRepository.create(newAttribute);
+
+    ObjectStoreMetadata testMetadata = createTestObjectStoreMetadata();
+    ObjectStoreMetadataDto testMetadataDto = fetchMetaById(testMetadata.getUuid());
+
+    // Put an invalid value for Date
+    testMetadataDto.setManagedAttributeValues(Map.of(newAttribute.getKey(), "zxy"));
+    assertThrows(ValidationException.class, () -> objectStoreResourceRepository.save(testMetadataDto));
+
+    // Fix the value
+    testMetadataDto.setManagedAttributeValues(Map.of(newAttribute.getKey(), "2022-02-02"));
+    objectStoreResourceRepository.save(testMetadataDto);
+
+    //cleanup
+    objectStoreResourceRepository.delete(testMetadata.getUuid());
+
+    // can't delete managed attribute for now since the check for key in use is using a fresh transaction
+  }
 
   private ObjectStoreMetadataDto newMetaDto() {
     ObjectStoreMetadataDto parentDTO = new ObjectStoreMetadataDto();

src/test/java/ca/gc/aafc/objectstore/api/testsupport/fixtures/ObjectStoreManagedAttributeFixture.java

@@ -0,0 +1,19 @@
+package ca.gc.aafc.objectstore.api.testsupport.fixtures;
+
+import ca.gc.aafc.objectstore.api.dto.ObjectStoreManagedAttributeDto;
+import ca.gc.aafc.objectstore.api.testsupport.factories.MultilingualDescriptionFactory;
+import org.apache.commons.lang3.RandomStringUtils;
+
+public class ObjectStoreManagedAttributeFixture {
+
+  public static ObjectStoreManagedAttributeDto newObjectStoreManagedAttribute() {
+    ObjectStoreManagedAttributeDto collectionManagedAttributeDto = new ObjectStoreManagedAttributeDto();
+    collectionManagedAttributeDto.setName(RandomStringUtils.randomAlphabetic(5));
+    collectionManagedAttributeDto.setAcceptedValues(new String[]{"value"});
+    collectionManagedAttributeDto.setCreatedBy("created by");
+    collectionManagedAttributeDto.setMultilingualDescription(
+        MultilingualDescriptionFactory.newMultilingualDescription().build()
+    );
+    return collectionManagedAttributeDto;
+  }
+}