Release/13.0 - Multiple Submissions (#322)

rmohammed-goaco · jgunnCO · arul-fourseals · web-flow · commit 380706e89871 · 2026-01-14T15:28:00.000Z
* amend schemeeditorcontroller (#302) * url validation updated to accept # symbol (#305) * Fix/gap lss 431 (#306) * url validation updated to accept # symbol * existing unknown chane removed * Lss 701 ownership transfer case sensitive (#309) * Release/3.2 (#28) * Adding constraint on gap_admin table * Adding unique constraint on grant_applicant_organisation_profile table * Removing unique constraints on tables with foreign key constraints * Release/3.3 (#39) Release 3.3 * Release/3.6 (#47) * TMI2-253: Add pre-commit check and update .gitignore to include application-local.properties and .env.local * Fixing unique constraint on indexes (#33) * Fixing unique constraint on indexes * GAP-2070 delete applicant from apply DB (#15) Hard deletes an applicant after an admin deletes them * GAP-2070 grant_beneficiary fk constraint & set null delete cascade (#34) * GAP-2070 fixing not null constraint on created_by * GAP-2148: grant advert not publishing on selected date (#32) * GAP-2148 - fixing view to use UTC * GAP-2148 - fixing scheduled job & setting opening/closing dates to use UTC not BST (#40) - Removing code that formats the excel sheet as this was causing an unacceptable performance problem * GAP-2230: Removing transactional from inserting exports, as this results in the lambda being invoked before exports exist in the DB (#46) * Creates an endpoint which removes applications attached to an advert (#42) (#49) --------- Co-authored-by: paul-lawlor-tco <paul.lawlor1@cabinetoffice.gov.uk> Co-authored-by: Iain Cooper <iain.cooper@cabinetoffice.gov.uk> Co-authored-by: iaincooper-tco <99728291+iaincooper-tco@users.noreply.github.com> Co-authored-by: john-tco <135222889+john-tco@users.noreply.github.com> Co-authored-by: rachelswart <99667350+rachelswart@users.noreply.github.com> Co-authored-by: ConorFayleTCO <141320269+ConorFayleTCO@users.noreply.github.com> Co-authored-by: GavCookCO <99668051+GavCookCO@users.noreply.github.com> Co-authored-by: paul-lawlor-tco <paul.lawlor1@cabinetoffice.gov.uk> * Create DUMMY * Tmi2 501/revert tmi2 496 changes (#129) (#130) * revert tmi2-496 changes * format * Release/6.1 (#136) * Tmi2 501/revert tmi2 496 changes (#129) * revert tmi2-496 changes * format * Adding tables for completion_statistics.sql (#131) * Adding tables for completion_statistics.sql * Formatting... * Tn 154 calculations tables (#132) * Adding tables for completion_statistics.sql * Formatting... * Adding sequence for calculations table id * Tn 154 calculations tables (#133) * Adding tables for completion_statistics.sql * Formatting... * Adding sequence for calculations table id * Fixing incorrect format for migration script name. Combining 2 into 1 * Fixing issue with db migration script (#134) * Adding tables for completion_statistics.sql * Formatting... * Adding sequence for calculations table id * Fixing incorrect format for migration script name. Combining 2 into 1 * Fixing errors in db migration script --------- Co-authored-by: a-lor-cab <107372333+a-lor-cab@users.noreply.github.com> * Fix promoteToProd.yml (#179) * Adds query to find application with no ownership check to allow lambdas to call (#212) * Fix unpublish application form from lambda (#268) (#269) * Updating release 10.0 with develop changes (#274) * Fix unpublish application form from lambda (#268) * GAP-2531: Cascade delete grant export tables createdby column (#270) * GAP-2533: Fix advert scheduler view for BST (#273) * use LocalDateTime for grant opening and closing times (#272) * use LocalDateTime for grant opening and closing times * fix test * fix more tests * Tmi2 740 - Handling new locations for MQ saving to grant_beneficiary table (#271) * Adding two new columns to grant_beneficiary for new locations --------- Co-authored-by: jgunnCO <135321532+jgunnCO@users.noreply.github.com> Co-authored-by: Connor Macqueen <138442814+ConnorTCO@users.noreply.github.com> * GAP-2533: Retrospectively fix BST ads in prod (#276) (#278) * GAP-2533: Retrospectively fix BST ads in prod * GAP-2533: Including release time * GAP-2533: Overriding UTC opening/closing dates as Europe/London time * GAP-2533: Update scheduled closing times too * GAP-2533: Fix syntax * GAP-2533: Hard code datetimes for BST * Improves logs around updating and deleting open search (#280) * Improving logging (#283) * Improving logging II * amend schemeeditorcontroller * Release/12.0 (#308) * amend schemeeditorcontroller (#302) * url validation updated to accept # symbol * existing unknown chane removed (#307) --------- Co-authored-by: jgunnCO <135321532+jgunnCO@users.noreply.github.com> * convert admin email to lowercase --------- Co-authored-by: dominicwest <101722961+dominicwest@users.noreply.github.com> Co-authored-by: dylanwrightCO <135221918+dylanwrightCO@users.noreply.github.com> Co-authored-by: paul-lawlor-tco <paul.lawlor1@cabinetoffice.gov.uk> Co-authored-by: Iain Cooper <iain.cooper@cabinetoffice.gov.uk> Co-authored-by: iaincooper-tco <99728291+iaincooper-tco@users.noreply.github.com> Co-authored-by: john-tco <135222889+john-tco@users.noreply.github.com> Co-authored-by: rachelswart <99667350+rachelswart@users.noreply.github.com> Co-authored-by: ConorFayleTCO <141320269+ConorFayleTCO@users.noreply.github.com> Co-authored-by: GavCookCO <99668051+GavCookCO@users.noreply.github.com> Co-authored-by: Gavin Cook <gavin.cook1@cabinetoffice.gov.uk> Co-authored-by: JamieGunnCO <jamie.gunn@cabinetoffice.gov.uk> Co-authored-by: a-lor-cab <107372333+a-lor-cab@users.noreply.github.com> Co-authored-by: Connor Macqueen <138442814+ConnorTCO@users.noreply.github.com> Co-authored-by: dylanwrightCO <dylan.wright@cabinetoffice.gov.uk> Co-authored-by: jgunnCO <135321532+jgunnCO@users.noreply.github.com> * LSS-550 Update Apache Commons IO to version 2.19.0 (#311) * LSS-712 Updated upload-artifact action version to v4 (#312) * Add health check endpoint and update security configuration to permit… (#314) * Add health check endpoint and update security configuration to permit access * Undo extra indentation * Release/test deployments (#315) * Add health check endpoint and update security configuration to permit access * Undo extra indentation * Add support for multiple submissions for single user on application - Added submission name Add Submission name to LambdaSubmissionDefinition and Submission entity Add event stream for event service tables if it does not exist (Locally) Add troubleshooting * Add support for multiple submissions for single (#318) user on application - Added submission name Add Submission name to LambdaSubmissionDefinition and Submission entity Add event stream for event service tables if it does not exist (Locally) Add troubleshooting * Add support for multiple submissions for single user on application - Added submission name Add Submission name to LambdaSubmissionDefinition and Submission entity Add event stream for event service tables if it does not exist (Locally) Add troubleshooting Fix migrations * Remove event_stream schema creation SQL migration file - Causing mass issues again * Add Flyway migration troubleshooting section to README * Force deployment * Add allowsMultipleSubmissions field to ApplicationFormPatchDTO and ApplicationFormEntity. Update ApplicationFormController and ApplicationFormService to handle null applicationStatus checks. Introduce Flyway migration to add allows_multiple_submissions column to grant_application table. * Update ApplicationFormTestData to include allowsMultipleSubmissions field in ApplicationFormEntity instances. * Add validation annotation to ApplicationFormPatchDTO to ensure at least one field is not null. Introduce AtLeastOneFieldNotNull annotation and its validator for this purpose. * Add submissionName field to ExportedSubmissionsDto and update mapping logic in CustomGrantExportMapperImpl. Implement new method to retrieve submission name from the repository. * Enhance tests for submissionName handling in CustomGrantExportMapperImplTest and GrantExportServiceTest. Add assertions to verify mapping of submissionName and handle null cases. * Temporarly add --disableCentral flag to feature and pushImage workflows as their service is down and blocking pipeline --------- Co-authored-by: jgunnCO <135321532+jgunnCO@users.noreply.github.com> Co-authored-by: Arulelango Jayaraman <arul@fourseals.co.uk> Co-authored-by: dominicwest <101722961+dominicwest@users.noreply.github.com> Co-authored-by: dylanwrightCO <135221918+dylanwrightCO@users.noreply.github.com> Co-authored-by: paul-lawlor-tco <paul.lawlor1@cabinetoffice.gov.uk> Co-authored-by: Iain Cooper <iain.cooper@cabinetoffice.gov.uk> Co-authored-by: iaincooper-tco <99728291+iaincooper-tco@users.noreply.github.com> Co-authored-by: john-tco <135222889+john-tco@users.noreply.github.com> Co-authored-by: rachelswart <99667350+rachelswart@users.noreply.github.com> Co-authored-by: ConorFayleTCO <141320269+ConorFayleTCO@users.noreply.github.com> Co-authored-by: GavCookCO <99668051+GavCookCO@users.noreply.github.com> Co-authored-by: Gavin Cook <gavin.cook1@cabinetoffice.gov.uk> Co-authored-by: JamieGunnCO <jamie.gunn@cabinetoffice.gov.uk> Co-authored-by: a-lor-cab <107372333+a-lor-cab@users.noreply.github.com> Co-authored-by: Connor Macqueen <138442814+ConnorTCO@users.noreply.github.com> Co-authored-by: dylanwrightCO <dylan.wright@cabinetoffice.gov.uk> Co-authored-by: Ben Tadiar <ben@tadtech.co.uk>
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
@@ -40,6 +40,7 @@ jobs:
             --enableRetired
             --disableOssIndex true
             --disableRetireJS true
+            --disableCentral true
 
       - name: Upload Test results
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/pushImage.yml b/.github/workflows/pushImage.yml
@@ -41,6 +41,7 @@ jobs:
           args: >
             --enableRetired
             --disableOssIndex true
+            --disableCentral true
       - name: Upload Test results
         uses: actions/upload-artifact@v4
         with:
diff --git a/README.md b/README.md
@@ -58,6 +58,97 @@ mvn Test -Dtest=className
 mvn Test -Dtest=className#methodName
 ```
 
+## Troubleshooting
+
+### MapStruct Mapper Implementation Not Found
+
+If you encounter an error like:
+
+```
+Parameter X of constructor in ...Service required a bean of type '...Mapper' that could not be found.
+```
+
+This typically means MapStruct hasn't generated the mapper implementation classes. MapStruct generates these during compilation.
+
+**Solution:**
+
+1. **Clean and rebuild the project:**
+   ```bash
+   mvn clean compile
+   ```
+   
+   Or in your IDE:
+   - **IntelliJ IDEA**: Build → Rebuild Project
+   - **Eclipse**: Project → Clean → Clean all projects
+
+2. **Verify annotation processing is enabled:**
+   - **IntelliJ IDEA**: Settings → Build, Execution, Deployment → Compiler → Annotation Processors → Enable annotation processing
+   - **Eclipse**: Project Properties → Java Compiler → Annotation Processing → Enable annotation processing
+
+3. **Check for compilation errors:** If there are any compilation errors in mapper interfaces or related DTOs, MapStruct won't generate the implementation classes. Check the compiler output for errors.
+
+After a successful build, you should see generated mapper implementations in:
+```
+target/generated-sources/annotations/gov/cabinetoffice/gap/adminbackend/mappers/
+```
+
+### Flyway Migration Checksum Mismatch
+
+If you encounter an error during deployment like:
+
+```
+Migration checksum mismatch for migration version X.XX
+-> Applied to database : -336000449
+-> Resolved locally : -252574045
+Either revert the changes to the migration, or run repair to update the schema history.
+```
+
+This occurs when a migration file has been modified after it was already applied to the database. Flyway validates checksums to ensure migration files haven't been changed.
+
+**Important:** Never modify migration files after they've been deployed to any environment. If you need to change something, create a new migration file instead.
+
+#### Solution Options
+
+**Option 1: Use Flyway Repair (Recommended)**
+
+Enable Flyway repair mode temporarily in your deployment configuration:
+
+```properties
+spring.flyway.repair=true
+```
+
+Then restart the application. Flyway will repair all checksums to match the current migration files. After the repair completes, remove this property.
+
+**Option 2: Manually Update Checksum in Database**
+
+If you have direct database access, you can manually update the checksum in the `flyway_schema_history` table:
+
+```sql
+-- Connect to your database and run:
+UPDATE flyway_schema_history 
+SET checksum = <new_checksum>  -- Use the checksum from the error message
+WHERE version = '<version>';
+```
+
+**⚠️ Warning:** Only update the checksum if you're certain the migration file changes don't affect the database schema. If the migration was modified to change the schema, you may need to create a new migration to apply those changes instead.
+
+**Option 3: Use Flyway CLI Repair Command**
+
+If you have access to run commands on your deployment environment:
+
+```bash
+flyway repair -url=jdbc:postgresql://<your-db-host>:5432/<database-name> \
+  -user=<username> -password=<password> \
+  -locations=filesystem:src/main/resources/db/migration
+```
+
+#### Prevention
+
+- **Never modify migration files** after they've been applied to any environment
+- If you need to change something, **create a new migration file** instead
+- Use version control to track migration history
+- Consider using `spring.flyway.validate-on-migrate=true` (already enabled) to catch these issues early
+
 ## System Context Diagram
 ```mermaid
 flowchart TD
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/controllers/ApplicationFormController.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/controllers/ApplicationFormController.java
@@ -215,7 +215,8 @@ public ResponseEntity<GenericErrorDTO> updateApplicationForm(HttpServletRequest
 
             this.applicationFormService.patchApplicationForm(applicationId, applicationFormPatchDTO, false);
 
-            EventType eventType = applicationFormPatchDTO.getApplicationStatus().equals(ApplicationStatusEnum.PUBLISHED)
+            EventType eventType = applicationFormPatchDTO.getApplicationStatus() != null 
+                    && applicationFormPatchDTO.getApplicationStatus().equals(ApplicationStatusEnum.PUBLISHED)
                     ? EventType.APPLICATION_PUBLISHED : EventType.APPLICATION_UPDATED;
 
             logApplicationEvent(eventType, request.getRequestedSessionId(), applicationId.toString());
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/dtos/application/ApplicationFormPatchDTO.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/dtos/application/ApplicationFormPatchDTO.java
@@ -1,20 +1,30 @@
 package gov.cabinetoffice.gap.adminbackend.dtos.application;
 
-import javax.validation.constraints.NotNull;
-
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import gov.cabinetoffice.gap.adminbackend.enums.ApplicationStatusEnum;
-import lombok.AllArgsConstructor;
+import gov.cabinetoffice.gap.adminbackend.validation.AtLeastOneFieldNotNull;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = false)
+@AtLeastOneFieldNotNull
 public class ApplicationFormPatchDTO {
 
-    @NotNull
     private ApplicationStatusEnum applicationStatus;
 
+    private Boolean allowsMultipleSubmissions;
+
+    public ApplicationFormPatchDTO(ApplicationStatusEnum applicationStatus) {
+        this.applicationStatus = applicationStatus;
+    }
+
+    public ApplicationFormPatchDTO(ApplicationStatusEnum applicationStatus, Boolean allowsMultipleSubmissions) {
+        this.applicationStatus = applicationStatus;
+        this.allowsMultipleSubmissions = allowsMultipleSubmissions;
+    }
+
 }
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/dtos/grantExport/ExportedSubmissionsDto.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/dtos/grantExport/ExportedSubmissionsDto.java
@@ -18,4 +18,5 @@ public class ExportedSubmissionsDto {
     private UUID submissionId;
     private GrantExportStatus status;
     private ZonedDateTime submittedDate;
+    private String submissionName;
 }
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/dtos/submission/LambdaSubmissionDefinition.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/dtos/submission/LambdaSubmissionDefinition.java
@@ -18,6 +18,8 @@ public class LambdaSubmissionDefinition {
 
     private String gapId;
 
+    private String submissionName;
+
     private ZonedDateTime submittedDate;
 
     private List<SubmissionSection> sections;
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/entities/ApplicationFormEntity.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/entities/ApplicationFormEntity.java
@@ -54,6 +54,9 @@ public class ApplicationFormEntity extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private ApplicationStatusEnum applicationStatus;
 
+    @Column(name = "allows_multiple_submissions")
+    private Boolean allowsMultipleSubmissions;
+
     @Column(name = "definition", nullable = false, columnDefinition = "json")
     @Type(type = "json")
     private ApplicationDefinitionDTO definition;
@@ -70,6 +73,7 @@ public ApplicationFormEntity(Integer grantSchemeId, String applicationName, Inte
         this.lastUpdateBy = lastUpdateBy;
         this.lastPublished = null;
         this.applicationName = applicationName;
+        this.allowsMultipleSubmissions = false;
         this.definition = definition;
     }
 
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/entities/Submission.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/entities/Submission.java
@@ -77,6 +77,9 @@ public class Submission extends BaseEntity {
     @Column
     private String applicationName;
 
+    @Column(name = "submission_name")
+    private String submissionName;
+
     @Column
     @Enumerated(EnumType.STRING)
     private SubmissionStatus status;
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/mappers/ApplicationFormMapper.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/mappers/ApplicationFormMapper.java
@@ -6,9 +6,11 @@
 import gov.cabinetoffice.gap.adminbackend.dtos.application.questions.QuestionOptionsPatchDTO;
 import gov.cabinetoffice.gap.adminbackend.dtos.application.questions.QuestionOptionsPostDTO;
 import gov.cabinetoffice.gap.adminbackend.entities.ApplicationFormEntity;
+import org.mapstruct.BeanMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +54,7 @@ public interface ApplicationFormMapper {
 
     List<ApplicationFormsFoundDTO> applicationFormFoundViewToDTO(List<ApplicationFormsFoundView> foundView);
 
+    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
     void updateApplicationEntityFromPatchDto(ApplicationFormPatchDTO patchDTO,
             @MappingTarget ApplicationFormEntity applicationFormEntity);
 
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/mappers/CustomGrantExportMapperImpl.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/mappers/CustomGrantExportMapperImpl.java
@@ -60,6 +60,7 @@ public ExportedSubmissionsDto grantExportEntityToExportedSubmissions(GrantExport
         exportedSubmissionsDto.status(grantExportEntity.getStatus());
         exportedSubmissionsDto.name(mapExportedSubmissionName(grantExportEntity));
         exportedSubmissionsDto.submittedDate(mapExportedSubmissionSubmittedDate(grantExportEntity));
+        exportedSubmissionsDto.submissionName(mapExportedSubmissionSubmissionName(grantExportEntity));
 
         return exportedSubmissionsDto.build();
     }
@@ -96,6 +97,20 @@ public ZonedDateTime mapExportedSubmissionSubmittedDate(GrantExportEntity grantE
 
         return submission.get().getSubmittedDate();
     }
+
+    @Override
+    public String mapExportedSubmissionSubmissionName(GrantExportEntity grantExportEntity) {
+        log.info("Getting submission name from grant export {} and submission {}", grantExportEntity.getId(),
+                grantExportEntity.getId().getSubmissionId());
+        final UUID submissionId = grantExportEntity.getId().getSubmissionId();
+        final Optional<Submission> submission = submissionRepository.findById(submissionId);
+        if (submission.isEmpty()) {
+            log.error("Submission not found for id: {}", submissionId);
+            return null;
+        }
+        return submission.get().getSubmissionName();
+    }
+
     private UUID grantExportEntityIdSubmissionId(GrantExportEntity grantExportEntity) {
         if (grantExportEntity == null) {
             return null;
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/mappers/GrantExportMapper.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/mappers/GrantExportMapper.java
@@ -21,6 +21,7 @@ public interface GrantExportMapper {
     @Mapping(target = "name", expression = "java(mapExportedSubmissionName(grantExportEntity))")
     @Mapping(target ="status", source = "status")
     @Mapping(target = "submittedDate", expression = "java(mapExportedSubmissionSubmittedDate(grantExportEntity))")
+    @Mapping(target = "submissionName", expression = "java(mapExportedSubmissionSubmissionName(grantExportEntity))")
     ExportedSubmissionsDto grantExportEntityToExportedSubmissions(GrantExportEntity grantExportEntity);
 
     default String mapExportedSubmissionName(GrantExportEntity grantExportEntity) {
@@ -31,4 +32,8 @@ default ZonedDateTime mapExportedSubmissionSubmittedDate(GrantExportEntity grant
         return null;
     }
 
+    default String mapExportedSubmissionSubmissionName(GrantExportEntity grantExportEntity) {
+        return "";
+    }
+
 }
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/services/ApplicationFormService.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/services/ApplicationFormService.java
@@ -336,14 +336,14 @@ public void patchApplicationForm(Integer applicationId, ApplicationFormPatchDTO
         ApplicationFormEntity application = this.applicationFormRepository.findById(applicationId)
                 .orElseThrow(() -> new NotFoundException("Application with id " + applicationId + " does not exist."));
 
-        if (patchDTO.getApplicationStatus() == ApplicationStatusEnum.PUBLISHED && application.getDefinition()
+        if (patchDTO.getApplicationStatus() != null && patchDTO.getApplicationStatus() == ApplicationStatusEnum.PUBLISHED && application.getDefinition()
                 .getSections().stream().anyMatch(section -> section.getQuestions().isEmpty())) {
             throw new FieldViolationException("sections", "Cannot publish a form with a section that has no questions");
         }
 
         try {
             this.applicationFormMapper.updateApplicationEntityFromPatchDto(patchDTO, application);
-            if (patchDTO.getApplicationStatus().equals(ApplicationStatusEnum.PUBLISHED)) {
+            if (patchDTO.getApplicationStatus() != null && patchDTO.getApplicationStatus().equals(ApplicationStatusEnum.PUBLISHED)) {
                 application.setLastPublished(Instant.now());
             }
 
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/validation/AtLeastOneFieldNotNull.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/validation/AtLeastOneFieldNotNull.java
@@ -0,0 +1,20 @@
+package gov.cabinetoffice.gap.adminbackend.validation;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = AtLeastOneFieldNotNullValidator.class)
+@Documented
+public @interface AtLeastOneFieldNotNull {
+    String message() default "At least one field must be provided";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}
+
diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/validation/AtLeastOneFieldNotNullValidator.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/validation/AtLeastOneFieldNotNullValidator.java
@@ -0,0 +1,25 @@
+package gov.cabinetoffice.gap.adminbackend.validation;
+
+import gov.cabinetoffice.gap.adminbackend.dtos.application.ApplicationFormPatchDTO;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class AtLeastOneFieldNotNullValidator implements ConstraintValidator<AtLeastOneFieldNotNull, ApplicationFormPatchDTO> {
+
+    @Override
+    public void initialize(AtLeastOneFieldNotNull constraintAnnotation) {
+        // No initialization needed
+    }
+
+    @Override
+    public boolean isValid(ApplicationFormPatchDTO dto, ConstraintValidatorContext context) {
+        if (dto == null) {
+            return false;
+        }
+        
+        // Check if at least one field is not null
+        return dto.getApplicationStatus() != null || dto.getAllowsMultipleSubmissions() != null;
+    }
+}
+
diff --git a/src/main/resources/db/migration/V1_102__add_submission_name_to_grant_submission.sql b/src/main/resources/db/migration/V1_102__add_submission_name_to_grant_submission.sql
@@ -0,0 +1,2 @@
+ALTER TABLE grant_submission
+ADD COLUMN IF NOT EXISTS submission_name VARCHAR(255);
diff --git a/src/main/resources/db/migration/V1_103__add_allows_multiple_submissions_to_grant_application.sql b/src/main/resources/db/migration/V1_103__add_allows_multiple_submissions_to_grant_application.sql
@@ -0,0 +1,3 @@
+ALTER TABLE grant_application
+ADD COLUMN IF NOT EXISTS allows_multiple_submissions BOOLEAN DEFAULT false;
+
diff --git a/src/main/resources/db/migration/V1_76__adding_event-service_tables.sql b/src/main/resources/db/migration/V1_76__adding_event-service_tables.sql
@@ -1,6 +1,5 @@
 -- !!!!!  ENSURE event_stream schema has been created  !!!!
--- CREATE schema IF NOT EXISTS event_stream;
-
+CREATE schema IF NOT EXISTS event_stream;
 
 CREATE TABLE IF NOT EXISTS event_stream.event_log
 (
diff --git a/src/test/java/gov/cabinetoffice/gap/adminbackend/mappers/CustomGrantExportMapperImplTest.java b/src/test/java/gov/cabinetoffice/gap/adminbackend/mappers/CustomGrantExportMapperImplTest.java
diff --git a/src/test/java/gov/cabinetoffice/gap/adminbackend/services/GrantExportServiceTest.java b/src/test/java/gov/cabinetoffice/gap/adminbackend/services/GrantExportServiceTest.java
diff --git a/src/test/java/gov/cabinetoffice/gap/adminbackend/testdata/ApplicationFormTestData.java b/src/test/java/gov/cabinetoffice/gap/adminbackend/testdata/ApplicationFormTestData.java

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,5 @@ public class ExportedSubmissionsDto {`
`18`	`18`	`private UUID submissionId;`
`19`	`19`	`private GrantExportStatus status;`
`20`	`20`	`private ZonedDateTime submittedDate;`
	`21`	`+ private String submissionName;`
`21`	`22`	`}`