core: fixed problem with indexed preservation events UUIDs, which cau…

…sed the events to not have permissions neither the AIP actual state (fixes #1416)
keeps · Dec 6, 2018 · 385f271 · 385f271
1 parent 9294a26
commit 385f271
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/roda-common/roda-common-utils/src/main/java/org/roda/core/util/IdUtils.java b/roda-common/roda-common-utils/src/main/java/org/roda/core/util/IdUtils.java
@@ -17,7 +17,6 @@
 import org.roda.core.data.v2.ip.FileLink;
 import org.roda.core.data.v2.ip.Representation;
 import org.roda.core.data.v2.ip.RepresentationLink;
-import org.roda.core.data.v2.ip.metadata.PreservationMetadata;
 import org.roda.core.data.v2.ip.metadata.PreservationMetadata.PreservationMetadataType;
 import org.roda.core.data.v2.user.RodaPrincipal;
 
@@ -165,11 +164,6 @@ public static String getPreservationId(PreservationMetadataType type, String aip
       IdUtils.createUUID(getFileId(aipId, representationId, fileDirectoryPath, fileId, ID_SEPARATOR)));
   }
 
-  public static String getPreservationId(PreservationMetadata pm) {
-    return getPreservationId(pm.getType(), pm.getAipId(), pm.getRepresentationId(), pm.getFileDirectoryPath(),
-      pm.getFileId());
-  }
-
   public static String getPreservationFileId(String fileId) {
     return URNUtils.createRodaPreservationURN(PreservationMetadataType.FILE, fileId);
   }

diff --git a/roda-core/roda-core/src/main/java/org/roda/core/common/PremisV3Utils.java b/roda-core/roda-core/src/main/java/org/roda/core/common/PremisV3Utils.java
@@ -371,8 +371,7 @@ public static Representation createBaseRepresentation(String aipId, String repre
     Representation representation = Representation.Factory.newInstance();
     ObjectIdentifierComplexType oict = representation.addNewObjectIdentifier();
     oict.setObjectIdentifierType(getStringPlusAuthority(RodaConstants.PREMIS_IDENTIFIER_TYPE_URN));
-    String identifier = IdUtils.getPreservationId(PreservationMetadataType.REPRESENTATION, aipId, representationId,
-      null, null);
+    String identifier = IdUtils.getRepresentationPreservationId(aipId, representationId);
     oict.setObjectIdentifierValue(identifier);
     representation.addNewPreservationLevel().setPreservationLevelValue(getStringPlusAuthority(""));
     return representation;

diff --git a/roda-core/roda-core/src/main/java/org/roda/core/index/IndexModelObserver.java b/roda-core/roda-core/src/main/java/org/roda/core/index/IndexModelObserver.java
@@ -406,8 +406,7 @@ private ReturnWithExceptions<Void, ModelObserver> preservationEventStateUpdated(
     fieldsToUpdate.put(RodaConstants.INDEX_STATE, SolrUtils.formatEnum(state));
     fieldsToUpdate.put(RodaConstants.PRESERVATION_EVENT_AIP_ID, pm.getAipId());
     fieldsToUpdate.put(RodaConstants.INDEX_ID, pm.getId());
-    return SolrUtils.update(index, IndexedPreservationEvent.class, IdUtils.getPreservationId(pm), fieldsToUpdate,
-      (ModelObserver) this);
+    return SolrUtils.update(index, IndexedPreservationEvent.class, pm.getId(), fieldsToUpdate, (ModelObserver) this);
   }
 
   @Override
@@ -970,7 +969,7 @@ private ReturnWithExceptions<Void, ModelObserver> preservationEventPermissionsUp
     updateFields.put(RodaConstants.INDEX_STATE, SolrUtils.formatEnum(state));
     updateFields.put(RodaConstants.PRESERVATION_EVENT_AIP_ID, pm.getAipId());
     updateFields.put(RodaConstants.PRESERVATION_EVENT_ID, pm.getId());
-    return SolrUtils.update(index, IndexedPreservationEvent.class, IdUtils.getPreservationId(pm), updateFields, this);
+    return SolrUtils.update(index, IndexedPreservationEvent.class, pm.getId(), updateFields, this);
 
   }