DMP-4381: Automatically update createdBy and lastModifiedBy when persisting entities to the database

src/integrationTest/java/uk/gov/hmcts/darts/common/service/TransientObjectDirectoryServiceTest.java

@@ -8,11 +8,13 @@
 import uk.gov.hmcts.darts.audiorequests.model.AudioRequestType;
 import uk.gov.hmcts.darts.common.entity.TransformedMediaEntity;
 import uk.gov.hmcts.darts.common.entity.TransientObjectDirectoryEntity;
+import uk.gov.hmcts.darts.common.entity.UserAccountEntity;
 import uk.gov.hmcts.darts.testutils.IntegrationBase;
 
 import java.time.OffsetDateTime;
 import java.util.UUID;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -37,14 +39,17 @@ void shouldSaveTransientDataLocation() {
 
         MediaRequestEntity mediaRequestEntity = mediaRequestService.getMediaRequestEntityById(mediaRequestEntity1.getId());
         UUID blobId = UUID.fromString("f744a74f-83c0-47e4-8bb2-2fd4d2b68647");
-
+        UserAccountEntity userAccount = dartsDatabase.getUserAccountStub().createAuthorisedIntegrationTestUser(false, "NEWCASTLE");
+        givenBearerTokenExists(userAccount.getEmailAddress());
         TransformedMediaEntity transformedMediaEntity = transformedMediaHelper.createTransformedMediaEntity(
             mediaRequestEntity,
             "aFilename",
             mediaRequestEntity.getStartTime(),
             mediaRequestEntity.getEndTime(),
             1000L
         );
+        assertThat(transformedMediaEntity.getCreatedBy()).isEqualTo(mediaRequestEntity.getCreatedBy());
+        assertThat(transformedMediaEntity.getLastModifiedBy()).isEqualTo(mediaRequestEntity.getCreatedBy());
         TransientObjectDirectoryEntity transientObjectDirectoryEntity = transientObjectDirectoryService.saveTransientObjectDirectoryEntity(
             transformedMediaEntity,
             blobId
@@ -62,5 +67,4 @@ void shouldSaveTransientDataLocation() {
                        .isAfter(OffsetDateTime.parse("2023-07-06T16:05:00.000Z")));
         assertNotNull(transientObjectDirectoryEntity.getLastModifiedBy());
     }
-
 }

src/main/java/uk/gov/hmcts/darts/audio/helper/TransformedMediaHelper.java

@@ -96,14 +96,18 @@ public TransformedMediaEntity createTransformedMediaEntity(MediaRequestEntity me
         entity.setOutputFilename(filename);
         entity.setStartTime(startTime);
         entity.setEndTime(endTime);
-        entity.setCreatedBy(mediaRequest.getCreatedBy());
-        entity.setLastModifiedBy(mediaRequest.getCreatedBy());
         entity.setOutputFormat(audioRequestOutputFormat);
         if (nonNull(fileSize)) {
             entity.setOutputFilesize(fileSize.intValue());
         }
-        transformedMediaRepository.save(entity);
-        return entity;
+        //Ensures createdBy / LastModified does not get overridden by the @CreatedBy / @LastModifiedBy annotaiton
+        TransformedMediaEntity savedTM = transformedMediaRepository.save(entity);
+        savedTM.setLastModifiedBy(mediaRequest.getCreatedBy());
+        savedTM.setCreatedBy(mediaRequest.getCreatedBy());
+        transformedMediaRepository.updateCreatedByLastModifiedBy(entity.getId(),
+                                                                 mediaRequest.getCreatedBy().getId(),
+                                                                 mediaRequest.getCreatedBy().getId());
+        return savedTM;
     }
 
     @SuppressWarnings({"PMD.CognitiveComplexity"})

src/main/java/uk/gov/hmcts/darts/authentication/config/AuthenticationConfiguration.java

@@ -2,9 +2,14 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.AuditorAware;
 import uk.gov.hmcts.darts.authentication.exception.AuthenticationError;
+import uk.gov.hmcts.darts.authorisation.component.UserIdentity;
+import uk.gov.hmcts.darts.common.entity.UserAccountEntity;
 import uk.gov.hmcts.darts.common.exception.DartsApiException;
 
+import java.util.Optional;
+
 @Configuration
 public class AuthenticationConfiguration {
 
@@ -14,4 +19,15 @@ public AuthConfigFallback getNoAuthConfigurationFallback(DefaultAuthConfiguratio
             throw new DartsApiException(AuthenticationError.FAILED_TO_OBTAIN_AUTHENTICATION_CONFIG);
         };
     }
+
+    @Bean
+    public AuditorAware<UserAccountEntity> auditorAware(UserIdentity userIdentity) {
+        return () -> {
+            try {
+                return Optional.ofNullable(userIdentity.getUserAccount());
+            } catch (Exception e) {
+                return Optional.empty();
+            }
+        };
+    }
 }

src/main/java/uk/gov/hmcts/darts/common/entity/base/CreatedBaseEntity.java

@@ -9,6 +9,7 @@
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.envers.NotAudited;
+import org.springframework.data.annotation.CreatedBy;
 import uk.gov.hmcts.darts.common.entity.UserAccountEntity;
 
 import java.time.OffsetDateTime;
@@ -24,6 +25,7 @@ public class CreatedBaseEntity {
     @NotAudited
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "created_by")
+    @CreatedBy
     private UserAccountEntity createdBy;
 
 }

src/main/java/uk/gov/hmcts/darts/common/entity/base/CreatedModifiedBaseEntity.java

@@ -9,6 +9,7 @@
 import lombok.Setter;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.envers.NotAudited;
+import org.springframework.data.annotation.LastModifiedBy;
 import uk.gov.hmcts.darts.common.entity.UserAccountEntity;
 
 import java.time.OffsetDateTime;
@@ -25,5 +26,6 @@ public class CreatedModifiedBaseEntity extends CreatedBaseEntity {
     @NotAudited
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "last_modified_by")
+    @LastModifiedBy
     private UserAccountEntity lastModifiedBy;
 }

src/main/java/uk/gov/hmcts/darts/common/entity/base/MandatoryCreatedBaseEntity.java

@@ -10,6 +10,7 @@
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.envers.NotAudited;
+import org.springframework.data.annotation.CreatedBy;
 import uk.gov.hmcts.darts.common.entity.UserAccountEntity;
 
 import java.time.OffsetDateTime;
@@ -29,6 +30,7 @@ public class MandatoryCreatedBaseEntity {
     @NotAudited
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     @JoinColumn(name = "created_by", nullable = false)
+    @CreatedBy
     private UserAccountEntity createdBy;
 
 }

src/main/java/uk/gov/hmcts/darts/common/entity/base/MandatoryCreatedModifiedBaseEntity.java

@@ -10,6 +10,7 @@
 import lombok.Setter;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.envers.NotAudited;
+import org.springframework.data.annotation.LastModifiedBy;
 import uk.gov.hmcts.darts.common.entity.UserAccountEntity;
 
 import java.time.OffsetDateTime;
@@ -26,5 +27,6 @@ public class MandatoryCreatedModifiedBaseEntity extends MandatoryCreatedBaseEnti
     @NotAudited
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     @JoinColumn(name = "last_modified_by", nullable = false)
+    @LastModifiedBy
     private UserAccountEntity lastModifiedBy;
 }

src/main/java/uk/gov/hmcts/darts/common/repository/TransformedMediaRepository.java

@@ -3,6 +3,7 @@
 import org.springframework.data.domain.Limit;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import uk.gov.hmcts.darts.audio.model.TransformedMediaDetailsDto;
@@ -93,4 +94,12 @@ List<TransformedMediaEntity> findTransformedMedia(Integer mediaId,
                                                       OffsetDateTime requestedAtTo);
 
 
+    @Query(value = """
+        UPDATE darts.transformed_media
+                set created_by = :id1,
+                last_modified_by = :id2
+                where trm_id = :id
+        """, nativeQuery = true)
+    @Modifying
+    void updateCreatedByLastModifiedBy(Integer id, Integer id1, Integer id2);
 }

src/test/java/uk/gov/hmcts/darts/audio/service/impl/AudioTransformationServiceImplTest.java

@@ -50,6 +50,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -177,9 +178,12 @@ void getMediaByHearingIdShouldReturnRepositoryResultsUnmodifiedWhenRepositoryRes
     }
 
     @Test
-    void saveProcessedDataShouldSaveBlobAndSetStatus() {
+    void saveProcessedData_shouldSaveBlobAndSetStatus() {
         final MediaRequestEntity mediaRequestEntity = new MediaRequestEntity();
         mediaRequestEntity.setRequestType(DOWNLOAD);
+        UserAccountEntity userAccount = new UserAccountEntity();
+        userAccount.setId(1);
+        mediaRequestEntity.setCreatedBy(userAccount);
 
         BlobClientUploadResponse blobClientUploadResponse = mock(BlobClientUploadResponseImpl.class);
         UUID blobName = UUID.randomUUID();
@@ -198,9 +202,10 @@ void saveProcessedDataShouldSaveBlobAndSetStatus() {
 
         TransformedMediaEntity transformedMediaEntity = new TransformedMediaEntity();
         transformedMediaEntity.setId(1);
-        when(transformedMediaRepository.save(
-            any()
-        )).thenReturn(transformedMediaEntity);
+        doAnswer(invocation -> invocation.getArgument(0)).when(transformedMediaRepository).save(any());
+
+        when(mockTransientObjectDirectoryEntity.getTransformedMedia())
+            .thenReturn(transformedMediaEntity);
 
         when(mockTransientObjectDirectoryEntity.getTransformedMedia(
         )).thenReturn(transformedMediaEntity);
@@ -543,7 +548,10 @@ void whenCreateTransformMediaEntityIsCalled_thenFilenameFormatSizeShouldBeSet()
 
         MediaRequestEntity mediaRequest = new MediaRequestEntity();
         mediaRequest.setRequestType(AudioRequestType.PLAYBACK);
-
+        UserAccountEntity userAccount = new UserAccountEntity();
+        userAccount.setId(1);
+        mediaRequest.setCreatedBy(userAccount);
+        doAnswer(invocation -> invocation.getArgument(0)).when(transformedMediaRepository).save(any());
         TransformedMediaEntity transformedMediaEntity = transformedMediaHelper.createTransformedMediaEntity(
             mediaRequest,
             "case1_23_Nov_2023.mp3",
@@ -552,6 +560,8 @@ void whenCreateTransformMediaEntityIsCalled_thenFilenameFormatSizeShouldBeSet()
             BINARY_DATA.getLength()
         );
 
+        assertEquals(userAccount, transformedMediaEntity.getCreatedBy());
+        assertEquals(userAccount, transformedMediaEntity.getLastModifiedBy());
         assertEquals(TEST_FILE_NAME, transformedMediaEntity.getOutputFilename());
         assertEquals(TEST_EXTENSION, transformedMediaEntity.getOutputFormat().getExtension());
         assertEquals(TEST_BINARY_STRING.length(), transformedMediaEntity.getOutputFilesize());