Merge branch 'dev'

Author: cgendreau

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>ca.gc.aafc</groupId>
   <artifactId>object-store.api</artifactId>
-  <version>1.24</version>
+  <version>1.25</version>
   <packaging>jar</packaging>
 
   <name>Object-Store API</name>
@@ -49,7 +49,7 @@
 
     <asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
     <asciidoctorj.diagram.version>2.0.2</asciidoctorj.diagram.version>
-    <dina-base-api.version>0.137</dina-base-api.version>
+    <dina-base-api.version>0.139</dina-base-api.version>
 
     <postgresql.version>42.4.4</postgresql.version>
 

src/main/java/ca/gc/aafc/objectstore/api/dto/DerivativeDto.java

@@ -42,6 +42,9 @@ public class DerivativeDto implements ca.gc.aafc.dina.dto.JsonApiResource {
   @JsonInclude(Include.NON_EMPTY)
   private String notPubliclyReleasableReason;
 
+  @JsonInclude(Include.NON_EMPTY)
+  private String[] acTags;
+
   @JsonApiRelation
   private DerivativeDto generatedFromDerivative;
 

src/main/java/ca/gc/aafc/objectstore/api/entities/AbstractObjectStoreMetadata.java

@@ -39,6 +39,8 @@ public abstract class AbstractObjectStoreMetadata implements DinaEntity {
   private Boolean publiclyReleasable;
   private String notPubliclyReleasableReason;
 
+  private String[] acTags;
+
   @NaturalId
   @NotNull
   @Column(name = "uuid", unique = true)
@@ -170,6 +172,16 @@ public void setNotPubliclyReleasableReason(String notPubliclyReleasableReason) {
     this.notPubliclyReleasableReason = notPubliclyReleasableReason;
   }
 
+  @Type(type = "string-array")
+  @Column(name = "ac_tags", columnDefinition = "text[]")
+  public String[] getAcTags() {
+    return acTags;
+  }
+
+  public void setAcTags(String[] acTags) {
+    this.acTags = acTags;
+  }
+
   /**
    * Returns fileIdentifier + fileExtension
    *

src/main/java/ca/gc/aafc/objectstore/api/entities/Derivative.java

@@ -26,7 +26,7 @@
 public class Derivative extends AbstractObjectStoreMetadata {
 
   public enum DerivativeType {
-    THUMBNAIL_IMAGE("thumbnail"), LARGE_IMAGE("large");
+    THUMBNAIL_IMAGE("thumbnail"), LARGE_IMAGE("large"), CROPPED_IMAGE("cropped");
 
     private final String suffix;
 
@@ -65,7 +65,8 @@ public Derivative(
     Derivative generatedFromDerivative,
     String dcFormat,
     Boolean publiclyReleasable,
-    String notPubliclyReleasableReason
+    String notPubliclyReleasableReason,
+    String[] acTags
   ) {
     super(
       uuid,
@@ -79,7 +80,8 @@ public Derivative(
       createdOn,
       dcFormat,
       publiclyReleasable,
-      notPubliclyReleasableReason);
+      notPubliclyReleasableReason,
+      acTags);
     this.id = id;
     this.acDerivedFrom = acDerivedFrom;
     this.derivativeType = derivativeType;

src/main/java/ca/gc/aafc/objectstore/api/entities/ObjectStoreMetadata.java

@@ -56,8 +56,6 @@ public class ObjectStoreMetadata extends AbstractObjectStoreMetadata {
 
   private String originalFilename;
 
-  private String[] acTags;
-
   private Map<String, String> managedAttributes;
 
   private UUID acMetadataCreator;
@@ -120,7 +118,8 @@ public ObjectStoreMetadata(
         createdOn,
         dcFormat,
         publiclyReleasable,
-        notPubliclyReleasableReason);
+        notPubliclyReleasableReason,
+        acTags);
     this.id = id;
     this.acCaption = acCaption;
     this.acDigitizationDate = acDigitizationDate;
@@ -130,7 +129,6 @@ public ObjectStoreMetadata(
     this.xmpRightsOwner = xmpRightsOwner;
     this.xmpRightsUsageTerms = xmpRightsUsageTerms;
     this.originalFilename = originalFilename;
-    this.acTags = acTags;
     this.managedAttributes = MapUtils.isNotEmpty(managedAttributeValues) ? managedAttributeValues : new HashMap<>();
     this.acMetadataCreator = acMetadataCreator;
     this.dcCreator = dcCreator;
@@ -190,16 +188,6 @@ public void setOriginalFilename(String originalFilename) {
     this.originalFilename = originalFilename;
   }
 
-  @Type(type = "string-array")
-  @Column(name = "ac_tags", columnDefinition = "text[]")
-  public String[] getAcTags() {
-    return acTags;
-  }
-
-  public void setAcTags(String[] acTags) {
-    this.acTags = acTags;
-  }
-
   @NotNull
   @Column(name = "xmp_rights_web_statement")
   @Size(max = 250)

src/main/java/ca/gc/aafc/objectstore/api/repository/ObjectStoreMetadataRepositoryV2.java

@@ -9,11 +9,10 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.toedter.spring.hateoas.jsonapi.JsonApiModelBuilder;
 
 import ca.gc.aafc.dina.dto.ExternalRelationDto;
-import ca.gc.aafc.dina.dto.JsonApiDto;
 import ca.gc.aafc.dina.dto.JsonApiExternalResource;
+import ca.gc.aafc.dina.exception.ResourceGoneException;
 import ca.gc.aafc.dina.exception.ResourceNotFoundException;
 import ca.gc.aafc.dina.repository.DinaRepositoryV2;
 import ca.gc.aafc.dina.service.AuditService;
@@ -65,33 +64,14 @@ protected JsonApiExternalResource externalRelationDtoToJsonApiExternalResource(
   }
 
   @GetMapping(TMP_V2_TYPE + "/{id}")
-  public ResponseEntity<RepresentationModel<?>> handleFindOne(@PathVariable UUID id, HttpServletRequest req) throws ResourceNotFoundException {
-    String queryString = decodeQueryString(req);
-
-    JsonApiDto<ObjectStoreMetadataDto> jsonApiDto = getOne(id, queryString);
-    if (jsonApiDto == null) {
-      return ResponseEntity.notFound().build();
-    }
-
-    JsonApiModelBuilder builder = createJsonApiModelBuilder(jsonApiDto);
-
-    return ResponseEntity.ok(builder.build());
+  public ResponseEntity<RepresentationModel<?>> onFindOne(@PathVariable UUID id, HttpServletRequest req)
+      throws ResourceNotFoundException, ResourceGoneException {
+    return handleFindOne(id, req);
   }
 
   @GetMapping(TMP_V2_TYPE)
-  public ResponseEntity<RepresentationModel<?>> handleFindAll(HttpServletRequest req) {
-    String queryString = decodeQueryString(req);
-
-    PagedResource<JsonApiDto<ObjectStoreMetadataDto>> dtos;
-    try {
-      dtos = getAll(queryString);
-    } catch (IllegalArgumentException iaEx) {
-      return ResponseEntity.badRequest().build();
-    }
-
-    JsonApiModelBuilder builder = createJsonApiModelBuilder(dtos);
-
-    return ResponseEntity.ok(builder.build());
+  public ResponseEntity<RepresentationModel<?>> onFindAll(HttpServletRequest req) {
+    return handleFindAll(req);
   }
 
 }

src/main/java/ca/gc/aafc/objectstore/api/service/DerivativeService.java

@@ -1,11 +1,11 @@
 package ca.gc.aafc.objectstore.api.service;
 
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.SmartValidator;
 
 import ca.gc.aafc.dina.jpa.BaseDAO;
+import ca.gc.aafc.dina.messaging.DinaEventPublisher;
 import ca.gc.aafc.dina.messaging.EntityChanged;
 import ca.gc.aafc.dina.messaging.message.DocumentOperationType;
 import ca.gc.aafc.dina.service.MessageProducingService;
@@ -39,7 +39,7 @@ public DerivativeService(
     DerivativeGenerationService derivativeGenerationService,
     @NonNull DerivativeValidator validator,
     @NonNull SmartValidator smartValidator,
-    ApplicationEventPublisher eventPublisher
+    DinaEventPublisher<EntityChanged> eventPublisher
   ) {
     super(baseDAO, smartValidator, DerivativeDto.TYPENAME, eventPublisher);
     this.derivativeGenerationService = derivativeGenerationService;

src/main/java/ca/gc/aafc/objectstore/api/service/ObjectStoreMetaDataService.java

@@ -11,11 +11,12 @@
 import javax.validation.ValidationException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.SmartValidator;
 
 import ca.gc.aafc.dina.jpa.BaseDAO;
+import ca.gc.aafc.dina.messaging.DinaEventPublisher;
+import ca.gc.aafc.dina.messaging.EntityChanged;
 import ca.gc.aafc.dina.service.MessageProducingService;
 import ca.gc.aafc.dina.util.UUIDHelper;
 import ca.gc.aafc.objectstore.api.dto.ObjectStoreMetadataDto;
@@ -53,7 +54,7 @@ public ObjectStoreMetaDataService(
       @NonNull SmartValidator smartValidator,
       @NonNull ObjectStoreManagedAttributeValueValidator objectStoreManagedAttributeValueValidator,
       @NonNull ObjectStoreMetadataValidator objectStoreMetadataValidator,
-      ApplicationEventPublisher eventPublisher) {
+      DinaEventPublisher<EntityChanged> eventPublisher) {
     super(baseDAO, smartValidator, ObjectStoreMetadataDto.TYPENAME, eventPublisher);
     this.baseDAO = baseDAO;
     this.defaultValueSetterService = defaultValueSetterService;

src/main/resources/application.yml

@@ -85,6 +85,7 @@ dina:
       queue: dina.export.queue
   export:
     maxObjectExportSize: 2GB
+  apiPrefix: /api/v1
 
 rabbitmq:
   queue: dina.search.queue

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

@@ -19,4 +19,6 @@
     <include file="db/changelog/migrations/14-Add_migration_hint_table.xml"/>
     <include file="db/changelog/migrations/15-Add_publiclyReleasable_To_Derivative.xml"/>
     <include file="db/changelog/migrations/data/1-Reset_ObjectUpload_sha1hex.xml"/>
+    <include file="db/changelog/migrations/16-Add_CROPPED_IMAGE_to_derivative_type.xml"/>
+    <include file="db/changelog/migrations/17-Add_acTags_to_Derivative.xml"/>
 </databaseChangeLog>

src/main/resources/db/changelog/migrations/16-Add_CROPPED_IMAGE_to_derivative_type.xml

@@ -0,0 +1,12 @@
+<?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 https://local.xsd/dbchangelog-4.4.xsd"
+                   objectQuotingStrategy="QUOTE_ONLY_RESERVED_WORDS">
+
+  <changeSet id="16-Add_CROPPED_IMAGE_to_derivative_type" context="schema-change" author="cgendreau" runInTransaction="false">
+    <sql>
+      ALTER TYPE derivative_type ADD VALUE 'CROPPED_IMAGE';
+    </sql>
+  </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog/migrations/17-Add_acTags_to_Derivative.xml

@@ -0,0 +1,12 @@
+<?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 https://local.xsd/dbchangelog-4.4.xsd"
+                   objectQuotingStrategy="QUOTE_ONLY_RESERVED_WORDS">
+
+    <changeSet id="17-Add_acTags_to_Derivative" context="schema-change" author="cgendreau">
+        <addColumn tableName="derivative">
+            <column name="ac_tags" type="TEXT[]"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>

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

@@ -21,6 +21,7 @@
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class DerivativeRepositoryCRUDIT extends BaseIntegrationTest {
@@ -109,6 +110,7 @@ void save() {
       resource.getUuid(),
       new QuerySpec(DerivativeDto.class));
     assertTrue(result.getPubliclyReleasable());
+    assertNotNull(result.getAcTags());
   }
 
   private DerivativeDto newDerivative(UUID fileIdentifier) {

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

@@ -23,6 +23,7 @@ public static DerivativeDto newDerivative(UUID fileIdentifier) {
     dto.setCreatedBy(CREATED_BY);
     dto.setPubliclyReleasable(true);
     dto.setNotPubliclyReleasableReason("Classified");
+    dto.setAcTags(new String[] {"tag 1"});
     return dto;
   }
 }