Fix bugs with deposit record transformation, add helper method for building ingest source managers in tests

Author: bbpennel

migration-util/src/main/java/edu/unc/lib/dcr/migration/deposit/DepositRecordTransformer.java

@@ -232,26 +232,28 @@ private void addManifests() {
 
             // Seek the path to the staged file for this manifest
             Path manifestPath = paths.stream()
-                    .filter(p -> p.endsWith(dsName + ".0"))
+                    .filter(p -> p.toString().endsWith(dsName + ".0"))
                     .findFirst()
-                    .orElseGet(null);
+                    .orElse(null);
 
             if (manifestPath == null) {
+                manifestNum++;
                 log.error("Failed to find path for recorded manifest {} on object {}", dsName, bxc3Pid);
                 continue;
             }
 
+            PID manifestPid = getDepositManifestPid(bxc5Pid, dsName);
             // Transfer the manifest to its permanent storage location
-            URI manifestStoredUri = transferSession.transfer(bxc5Pid, manifestPath.toUri());
+            URI manifestStoredUri = transferSession.transfer(manifestPid, manifestPath.toUri());
 
             // Populate manifest timestamps
             Model manifestModel = ModelFactory.createDefaultModel();
             Resource selfResc = manifestModel.getResource("");
-            selfResc.addLiteral(Fcrepo4Repository.lastModified, created);
-            selfResc.addLiteral(Fcrepo4Repository.created, created);
+            selfResc.addLiteral(DC.title, StringUtils.isBlank(label) ? dsName : label);
+            selfResc.addProperty(Fcrepo4Repository.lastModified, created, XSDDatatype.XSDdateTime);
+            selfResc.addProperty(Fcrepo4Repository.created, created, XSDDatatype.XSDdateTime);
 
             // Create the manifest in fedora
-            PID manifestPid = getDepositManifestPid(bxc5Pid, label);
             repoObjFactory.createOrUpdateBinary(manifestPid, manifestStoredUri, label,
                     mimetype, null, md5, manifestModel);
 
@@ -275,4 +277,8 @@ public void setRepositoryObjectFactory(RepositoryObjectFactory repoObjFactory) {
     public void setTransactionManager(TransactionManager txManager) {
         this.txManager = txManager;
     }
+
+    public PID getPid() {
+        return bxc3Pid;
+    }
 }

migration-util/src/test/java/edu/unc/lib/dcr/migration/deposit/AbstractDepositRecordTransformationIT.java

@@ -0,0 +1,138 @@
+/**
+ * Copyright 2008 The University of North Carolina at Chapel Hill
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package edu.unc.lib.dcr.migration.deposit;
+
+import static edu.unc.lib.dcr.migration.MigrationConstants.toBxc3Uri;
+import static edu.unc.lib.dcr.migration.fcrepo3.ContentModelHelper.FedoraProperty.hasModel;
+import static edu.unc.lib.dcr.migration.fcrepo3.FoxmlDocumentHelpers.PREMIS_DS;
+import static edu.unc.lib.dcr.migration.premis.Premis2Constants.INITIATOR_ROLE;
+import static edu.unc.lib.dcr.migration.premis.Premis2Constants.VIRUS_CHECK_TYPE;
+import static edu.unc.lib.dcr.migration.premis.TestPremisEventHelpers.EVENT_DATE;
+import static edu.unc.lib.dcr.migration.premis.TestPremisEventHelpers.addAgent;
+import static edu.unc.lib.dcr.migration.premis.TestPremisEventHelpers.addEvent;
+import static edu.unc.lib.dcr.migration.premis.TestPremisEventHelpers.createPremisDoc;
+import static edu.unc.lib.dcr.migration.premis.TestPremisEventHelpers.listEventResources;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.Files.newOutputStream;
+import static org.apache.jena.rdf.model.ModelFactory.createDefaultModel;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Path;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.vocabulary.RDF;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.output.XMLOutputter;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
+
+import edu.unc.lib.dcr.migration.fcrepo3.ContentModelHelper.ContentModel;
+import edu.unc.lib.dcr.migration.fcrepo3.FoxmlDocumentBuilder;
+import edu.unc.lib.dl.event.PremisLogger;
+import edu.unc.lib.dl.fcrepo4.BinaryObject;
+import edu.unc.lib.dl.fcrepo4.DepositRecord;
+import edu.unc.lib.dl.fedora.PID;
+import edu.unc.lib.dl.rdf.Premis;
+import edu.unc.lib.dl.util.DateTimeUtil;
+
+/**
+ * @author bbpennel
+ */
+public abstract class AbstractDepositRecordTransformationIT {
+    static {
+        System.setProperty("fcrepo.properties.management", "relaxed");
+    }
+
+    protected final static Date DEFAULT_CREATED_DATE = DateTimeUtil.parseUTCToDate(
+            FoxmlDocumentBuilder.DEFAULT_CREATED_DATE);
+    protected final static Date DEFAULT_MODIFIED_DATE = DateTimeUtil.parseUTCToDate(
+            FoxmlDocumentBuilder.DEFAULT_LAST_MODIFIED);
+
+    @Rule
+    public final TemporaryFolder tmpFolder = new TemporaryFolder();
+
+    protected Path objectsPath;
+
+    protected Path datastreamsPath;
+
+    protected Path serializeFoxml(PID pid, Document doc) throws IOException {
+        Path xmlPath = objectsPath.resolve("uuid_" + pid.getId());
+        OutputStream outStream = newOutputStream(xmlPath);
+        new XMLOutputter().output(doc, outStream);
+        return xmlPath;
+    }
+
+    protected Path writeManifestFile(PID pid, String dsName, String content) throws IOException {
+        Path dsPath = datastreamsPath.resolve("uuid_" + pid.getId() + "+" + dsName + "+" + dsName + ".0");
+        FileUtils.writeStringToFile(dsPath.toFile(), content, UTF_8);
+        return dsPath;
+    }
+
+    protected Model createModelWithTypes(PID pid, ContentModel... models) {
+        Model model = createDefaultModel();
+        Resource resc = model.getResource(toBxc3Uri(pid));
+        for (ContentModel contentModel : models) {
+            resc.addProperty(hasModel.getProperty(), contentModel.getResource());
+        }
+        return model;
+    }
+
+    protected void addPremisLog(PID originalPid) throws IOException {
+        Document premisDoc = createPremisDoc(originalPid);
+        String detail = "virus scan";
+        Element eventEl = addEvent(premisDoc, VIRUS_CHECK_TYPE, detail, EVENT_DATE);
+        addAgent(eventEl, "Name", INITIATOR_ROLE, "virusscanner");
+
+        String premisDsName = "uuid_" + originalPid.getId() + "+" + PREMIS_DS + "+" + PREMIS_DS + ".0";
+        Path xmlPath = datastreamsPath.resolve(premisDsName);
+        OutputStream outStream = newOutputStream(xmlPath);
+        new XMLOutputter().output(premisDoc, outStream);
+    }
+
+    protected BinaryObject getManifestByName(List<BinaryObject> binList, String dsName) {
+        return binList.stream()
+                .filter(b -> b.getPid().getComponentPath().endsWith(dsName))
+                .findFirst()
+                .get();
+    }
+
+    protected void assertManifestDetails(Date expectedTimestamp, String expectedMimetype,
+            String expectedContent, BinaryObject manifestBin) throws IOException {
+        assertEquals(expectedTimestamp, manifestBin.getLastModified());
+        assertEquals(expectedTimestamp, manifestBin.getCreatedDate());
+        assertEquals(expectedMimetype, manifestBin.getMimetype());
+        assertEquals(expectedContent, IOUtils.toString(manifestBin.getBinaryStream(), UTF_8));
+    }
+
+    protected void assertPremisTransformed(DepositRecord depRec) throws IOException {
+        PremisLogger premisLog = depRec.getPremisLog();
+        Model eventsModel = premisLog.getEventsModel();
+        List<Resource> eventRescs = listEventResources(depRec.getPid(), eventsModel);
+        assertEquals(1, eventRescs.size());
+
+        Resource eventResc = eventRescs.get(0);
+        assertEquals("Event type did not match expected value",
+                Premis.VirusCheck, eventResc.getPropertyResourceValue(RDF.type));
+    }
+}