Hotfix/GitHub update

.github/workflows/build.yaml

@@ -18,13 +18,13 @@ jobs:
         with:
           java-version: 17
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

src/main/java/eu/dissco/core/handlemanager/service/DoiService.java

@@ -164,7 +164,7 @@ private UpsertMediaResult processUpsertRequestMedia(
       List<DigitalMediaRequestAttributes> mediaRequests) throws JsonProcessingException {
     var existingMediaMap = getExistingRecordsFromNormalisedIds(mediaRequests
         .stream()
-        .map(ServiceUtils::normalizeMediaId)
+        .map(DigitalMediaRequestAttributes::getPrimaryMediaId)
         .toList(), PRIMARY_MEDIA_ID.get()
     );
     var newMedia = new ArrayList<DigitalMediaRequestAttributes>();

src/main/java/eu/dissco/core/handlemanager/service/FdoRecordService.java

@@ -65,7 +65,6 @@
 import static eu.dissco.core.handlemanager.domain.fdo.FdoType.MAS;
 import static eu.dissco.core.handlemanager.domain.fdo.FdoType.ORGANISATION;
 import static eu.dissco.core.handlemanager.domain.fdo.FdoType.SOURCE_SYSTEM;
-import static eu.dissco.core.handlemanager.service.ServiceUtils.normalizeMediaId;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -493,7 +492,7 @@ public FdoRecord prepareNewDigitalMediaRecord(DigitalMediaRequestAttributes requ
     fdoAttributes.putAll(
         prepareGeneratedAttributes(handle, FdoType.DIGITAL_MEDIA, timestamp, isDraft));
     fdoAttributes.putAll(prepareGeneratedAttributesDoi(timestamp));
-    return new FdoRecord(handle, FdoType.DIGITAL_MEDIA, fdoAttributes, normalizeMediaId(request),
+    return new FdoRecord(handle, FdoType.DIGITAL_MEDIA, fdoAttributes, request.getPrimaryMediaId(),
         fdoAttributes.values());
   }
 
@@ -503,7 +502,7 @@ public FdoRecord prepareUpdatedDigitalMediaRecord(DigitalMediaRequestAttributes
     var fdoAttributes = prepareUpdatedDigitalMediaAttributes(request,
         previousVersion.handle(), timestamp, previousVersion, incrementVersion);
     return new FdoRecord(previousVersion.handle(), FdoType.DIGITAL_MEDIA, fdoAttributes,
-        normalizeMediaId(request), fdoAttributes.values());
+        request.getPrimaryMediaId(), fdoAttributes.values());
   }
 
   public Map<FdoProfile, FdoAttribute> prepareDigitalMediaAttributes(

src/main/java/eu/dissco/core/handlemanager/service/ServiceUtils.java

@@ -1,6 +1,5 @@
 package eu.dissco.core.handlemanager.service;
 
-import eu.dissco.core.handlemanager.schema.DigitalMediaRequestAttributes;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
@@ -23,8 +22,4 @@ private ServiceUtils() {
     );
   }
 
-  public static String normalizeMediaId(DigitalMediaRequestAttributes request) {
-    return request.getLinkedDigitalObjectPid() + ":" + request.getPrimaryMediaId();
-  }
-
 }

src/test/java/eu/dissco/core/handlemanager/repository/MongoRepositoryIT.java

@@ -3,12 +3,12 @@
 
 import static com.mongodb.client.model.Filters.eq;
 import static com.mongodb.client.model.Filters.in;
-import static eu.dissco.core.handlemanager.testUtils.TestUtils.FDO_LOCAL_ID_MEDIA;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.HANDLE;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.HANDLE_ALT;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.MAPPER;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.NORMALISED_PRIMARY_SPECIMEN_OBJECT_ID_TESTVAL;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.PREFIX;
+import static eu.dissco.core.handlemanager.testUtils.TestUtils.PRIMARY_MEDIA_ID_TESTVAL;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.givenDigitalMediaFdoRecord;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.givenDigitalSpecimenFdoRecord;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.givenHandleFdoRecord;
@@ -217,7 +217,7 @@ void testSearchByPrimaryLocalIdMedia() throws Exception {
 
     // When
     var result = repository.searchByPrimaryLocalId(FdoProfile.PRIMARY_MEDIA_ID.get(),
-        List.of(FDO_LOCAL_ID_MEDIA)).get(0);
+        List.of(PRIMARY_MEDIA_ID_TESTVAL)).get(0);
 
     // Then
     assertThat(result.handle()).isEqualTo(expected.handle());

src/test/java/eu/dissco/core/handlemanager/service/FdoRecordServiceTest.java

@@ -9,7 +9,6 @@
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.CATALOG_ID_TEST;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.CREATED;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.DOC_BUILDER_FACTORY;
-import static eu.dissco.core.handlemanager.testUtils.TestUtils.FDO_LOCAL_ID_MEDIA;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.HANDLE;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.HANDLE_ALT;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.ISSUED_FOR_AGENT_NAME_TESTVAL;
@@ -20,6 +19,7 @@
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.NORMALISED_PRIMARY_SPECIMEN_OBJECT_ID_TESTVAL;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.ORCHESTRATION_URL;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.PREFIX;
+import static eu.dissco.core.handlemanager.testUtils.TestUtils.PRIMARY_MEDIA_ID_TESTVAL;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.ROR_DOMAIN;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.ROR_IDENTIFIER;
 import static eu.dissco.core.handlemanager.testUtils.TestUtils.SPECIMEN_HOST_NAME_TESTVAL;
@@ -315,7 +315,7 @@ void testPrepareNewMediaRecordMin() throws Exception {
   void testPrepareUpdatedMediaRecord() throws Exception {
     // Given
     var previousVersion = givenDigitalMediaFdoRecord(HANDLE);
-    var expected = givenUpdatedFdoRecord(FdoType.DIGITAL_MEDIA, FDO_LOCAL_ID_MEDIA);
+    var expected = givenUpdatedFdoRecord(FdoType.DIGITAL_MEDIA, PRIMARY_MEDIA_ID_TESTVAL);
     var request = givenDigitalMediaUpdated();
 
     // When

src/test/java/eu/dissco/core/handlemanager/testUtils/TestUtils.java

@@ -161,7 +161,6 @@ public class TestUtils {
   public static final String MEDIA_HOST_NAME_TESTVAL = SPECIMEN_HOST_NAME_TESTVAL;
   public static final String LINKED_DO_PID_TESTVAL = HANDLE;
   public static final String PRIMARY_MEDIA_ID_TESTVAL = "https://images.com/ABC";
-  public static final String FDO_LOCAL_ID_MEDIA = HANDLE + ":" + PRIMARY_MEDIA_ID_TESTVAL;
   // Mappings
   public static final String SOURCE_DATA_STANDARD_TESTVAL = "dwc";
   // MAS
@@ -399,7 +398,7 @@ public static FdoRecord givenMongoResponse(String handle, FdoType fdoType, Strin
 
   public static FdoRecord givenDigitalMediaFdoRecord(String handle) throws Exception {
     var attributes = genDigitalMediaAttributes(handle, CREATED);
-    return new FdoRecord(handle, DIGITAL_MEDIA, attributes, FDO_LOCAL_ID_MEDIA,
+    return new FdoRecord(handle, DIGITAL_MEDIA, attributes, PRIMARY_MEDIA_ID_TESTVAL,
         attributes.values());
   }