Skip to content

Release/13.4 #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmohammed-goaco merged 5 commits into from
May 18, 2026
Merged

Release/13.4 #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8825598
Release/13.2 (#332)
rmohammed-goaco Mar 12, 2026
d7a3b50
Release/13.3 (#334)
rmohammed-goaco Mar 24, 2026
9968a87
Merge branch 'main' into develop
rmohammed-goaco Mar 24, 2026
ef16ad4
Merge branch 'main' into develop
rmohammed-goaco May 12, 2026
3be2311
Add gapId to ExportedSubmissionsDto and implement mapping in CustomGr…
rmohammed-goaco May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...main/java/gov/cabinetoffice/gap/adminbackend/dtos/grantExport/ExportedSubmissionsDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@Builder
public class ExportedSubmissionsDto {

private String gapId;
private String name;
private String zipFileLocation;
private UUID submissionId;
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/gov/cabinetoffice/gap/adminbackend/mappers/CustomGrantExportMapperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public ExportedSubmissionsDto grantExportEntityToExportedSubmissions(GrantExport
exportedSubmissionsDto.name(mapExportedSubmissionName(grantExportEntity));
exportedSubmissionsDto.submittedDate(mapExportedSubmissionSubmittedDate(grantExportEntity));
exportedSubmissionsDto.submissionName(mapExportedSubmissionSubmissionName(grantExportEntity));
exportedSubmissionsDto.gapId(mapExportedSubmissionGapId(grantExportEntity));

return exportedSubmissionsDto.build();
}
Expand Down Expand Up @@ -111,6 +112,19 @@ public String mapExportedSubmissionSubmissionName(GrantExportEntity grantExportE
return submission.get().getSubmissionName();
}

@Override
public String mapExportedSubmissionGapId(GrantExportEntity grantExportEntity) {
log.info("Getting gap ID 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().getGapId();
}

private UUID grantExportEntityIdSubmissionId(GrantExportEntity grantExportEntity) {
if (grantExportEntity == null) {
return null;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/gov/cabinetoffice/gap/adminbackend/mappers/GrantExportMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public interface GrantExportMapper {
@Mapping(target ="status", source = "status")
@Mapping(target = "submittedDate", expression = "java(mapExportedSubmissionSubmittedDate(grantExportEntity))")
@Mapping(target = "submissionName", expression = "java(mapExportedSubmissionSubmissionName(grantExportEntity))")
@Mapping(target = "gapId", expression = "java(mapExportedSubmissionGapId(grantExportEntity))")
ExportedSubmissionsDto grantExportEntityToExportedSubmissions(GrantExportEntity grantExportEntity);

default String mapExportedSubmissionName(GrantExportEntity grantExportEntity) {
Expand All @@ -36,4 +37,8 @@ default String mapExportedSubmissionSubmissionName(GrantExportEntity grantExport
return "";
}

default String mapExportedSubmissionGapId(GrantExportEntity grantExportEntity) {
return "";
}

}
Loading