change type of GrantApplicant user_id to reflect migration, fix tests

cabinetoffice · Jul 26, 2023 · 38dd141 · 38dd141
1 parent 3869c3e
commit 38dd141
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/dtos/submission/GrantApplicant.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/dtos/submission/GrantApplicant.java
@@ -7,7 +7,6 @@
 import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 @NoArgsConstructor
 @AllArgsConstructor
@@ -23,7 +22,7 @@ public class GrantApplicant {
     private long id;
 
     @Column
-    private UUID userId;
+    private String userId;
 
     @OneToOne(mappedBy = "applicant")
     @JsonIgnoreProperties

diff --git a/src/test/java/gov/cabinetoffice/gap/adminbackend/services/SubmissionsServiceTest.java b/src/test/java/gov/cabinetoffice/gap/adminbackend/services/SubmissionsServiceTest.java
@@ -96,7 +96,7 @@ void forSingleRowWithGoodData() throws IOException {
             final SubmissionDefinition submissionDefinition = randomSubmissionDefinition(SUBMISSION_DEFINITION).build();
             final Submission submission = RandomSubmissionGenerator.randomSubmission()
                     .status(SubmissionStatus.SUBMITTED)
-                    .createdBy(GrantApplicant.builder().id(1).userId(UUID.randomUUID()).build())
+                    .createdBy(GrantApplicant.builder().id(1).userId(UUID.randomUUID().toString()).build())
                     .definition(submissionDefinition).build();
 
             when(applicationFormService.retrieveApplicationFormSummary(1, false, false)).thenReturn(applicationFormDTO);
@@ -121,13 +121,13 @@ void ignoresBadDataRows() throws IOException {
 
             final SubmissionDefinition goodSubmission = createSubmissionDefinition();
             final Submission goodSubmissionEntity = randomSubmission().status(SubmissionStatus.SUBMITTED)
-                    .createdBy(GrantApplicant.builder().id(1).userId(UUID.randomUUID()).build())
+                    .createdBy(GrantApplicant.builder().id(1).userId(UUID.randomUUID().toString()).build())
                     .gapId("GAP-LL-20221006-1").definition(goodSubmission).build();
 
             final SubmissionDefinition badSubmission = createSubmissionDefinition();
             badSubmission.getSections().get(1).getQuestionById("APPLICANT_ORG_NAME").setResponse(null);
             final Submission badSubmissionEntity = randomSubmission().status(SubmissionStatus.SUBMITTED)
-                    .createdBy(GrantApplicant.builder().id(1).userId(UUID.randomUUID()).build())
+                    .createdBy(GrantApplicant.builder().id(1).userId(UUID.randomUUID().toString()).build())
                     .gapId("GAP-LL-20221006-2").definition(badSubmission).build();
 
             when(submissionRepository.findByApplicationGrantApplicationIdAndStatus(1, SubmissionStatus.SUBMITTED))