Main

.github/workflows/feature.yml

@@ -40,9 +40,10 @@ jobs:
             --enableRetired
             --disableOssIndex true
             --disableRetireJS true
+            --disableCentral true
 
       - name: Upload Test results
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: DependencyCheck report
           path: ${{github.workspace}}/reports

.github/workflows/pushImage.yml

@@ -41,8 +41,9 @@ jobs:
           args: >
             --enableRetired
             --disableOssIndex true
+            --disableCentral true
       - name: Upload Test results
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: DependencyCheck report
           path: ${{github.workspace}}/reports
@@ -110,7 +111,7 @@ jobs:
         run: docker save --output ${{ steps.docker-image-name.outputs.name }}.tar $ECR_REGISTRY/gap-apply-admin-backend:${{ env.BUILD_VERSION }}
 
       - name: Upload Docker image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.docker-image-name.outputs.name }}
           path: ${{ steps.docker-image-name.outputs.name }}.tar
@@ -148,7 +149,7 @@ jobs:
           echo BUILD_VERSION is ${{ env.BUILD_VERSION }}
 
       - name: Download Docker image
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.build.outputs.docker-image-name }}
 

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

pom.xml

@@ -142,7 +142,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.19.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>

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());

src/main/java/gov/cabinetoffice/gap/adminbackend/controllers/ControllerExceptionHandler.java

@@ -127,7 +127,7 @@ protected ResponseEntity<Object> handleConflict(ObjectOptimisticLockingFailureEx
     /**
      * This overridden method handles controller methods being called with invalid
      * arguments It'll spit back a json representation of a FieldErrorsDTO or a
-     * ClassErrorsDTO
+     * ClassErrorsDTO.
      */
     @Override
     protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotValidException ex,
@@ -140,7 +140,7 @@ protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotV
 
     /**
      * This overridden method handles controller methods which cause bind exceptions It'll
-     * spit back a json representation of a FieldErrorsDTO or a ClassErrorsDTO
+     * spit back a json representation of a FieldErrorsDTO or a ClassErrorsDTO.
      */
     @Override
     protected ResponseEntity<Object> handleBindException(BindException ex, HttpHeaders headers, HttpStatus status,

src/main/java/gov/cabinetoffice/gap/adminbackend/controllers/HealthController.java

@@ -16,4 +16,9 @@ public ResponseEntity<String> getHealthCheck() {
         return ResponseEntity.ok("Service up");
     }
 
+    @GetMapping("/check")
+    public ResponseEntity<String> getHealthCheck2() {
+        return ResponseEntity.ok("Admin API Service up");
+    }
+
 }

src/main/java/gov/cabinetoffice/gap/adminbackend/controllers/SchemeEditorController.java

@@ -55,7 +55,7 @@ public ResponseEntity<List<SchemeEditorsDTO>> getSchemeEditors(@PathVariable fin
     @PostMapping
     public ResponseEntity<String> addEditorToScheme(@PathVariable final Integer schemeId, @RequestBody @Valid final SchemeEditorPostDTO newEditorDto, final HttpServletRequest request) {
         final String jwt = HelperUtils.getJwtFromCookies(request, userServiceConfig.getCookieName());
-        schemeEditorService.addEditorToScheme(schemeId, newEditorDto.getEditorEmailAddress(), jwt);
+        schemeEditorService.addEditorToScheme(schemeId, newEditorDto.getEditorEmailAddress().toLowerCase(), jwt);
         return ResponseEntity.ok("Editor added to scheme successfully");
     }
 

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;
+    }
+
 }

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;
 }

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;

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;
     }
 

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;

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);
 

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;

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 "";
+    }
+
 }

src/main/java/gov/cabinetoffice/gap/adminbackend/repositories/SpotlightBatchRepository.java

@@ -28,8 +28,8 @@ Optional<SpotlightBatch> findByStatusAndSpotlightSubmissionsSizeLessThan(
 
     Optional<List<SpotlightBatch>> findByStatus(@Param("status") SpotlightBatchStatus status);
 
-    @Query("select s from SpotlightBatch s inner join s.spotlightSubmissions spotlightSubmissions where s.status =:status and spotlightSubmissions.mandatoryQuestions.gapId = :gapId")
-    Optional<SpotlightBatch> findByStatusAndSpotlightSubmissions_MandatoryQuestions_GapId(
+    @Query("select s from SpotlightBatch s inner join s.spotlightSubmissions spotlightSubmissions where s.status =:status and spotlightSubmissions.mandatoryQuestions.gapId = :gapId ORDER BY s.created DESC")
+    List<SpotlightBatch> findByStatusAndSpotlightSubmissions_MandatoryQuestions_GapId(
             @Param("status") SpotlightBatchStatus status, @Param("gapId") String gapId);
 
 }