Skip to content

Release/13.4#341

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

Release/13.4#341
rmohammed-goaco merged 5 commits into
mainfrom
develop

Conversation

@rmohammed-goaco
Copy link
Copy Markdown
Contributor

@rmohammed-goaco rmohammed-goaco commented May 18, 2026

No description provided.

rmohammed-goaco and others added 5 commits March 12, 2026 12:25
* Update GrantMandatoryQuestionFundingLocation enum to replace 'OUTSIDE_UK' with 'INTERNATIONAL'

* Update GrantMandatoryQuestionFundingLocation enum to replace 'INTERNATIONAL' with 'OUTSIDE_UK'
* Add submission anonymisation feature

- Introduced SubmissionAnonymisationConfigProperties for configuration settings.
- Added EXPIRED status to SubmissionStatus enum.
- Enhanced GrantAttachmentRepository and GrantMandatoryQuestionRepository with delete methods for submissions.
- Updated SubmissionRepository with methods for anonymising submissions and deleting related data.
- Implemented SubmissionAnonymisationScheduler to handle scheduled anonymisation of submissions.
- Created SubmissionAnonymisationService to manage the anonymisation process, including S3 object deletion and database cleanup.
- Added application properties for submission anonymisation configuration.
- Created database migration to document the new EXPIRED status in the submission table.

* Refactor SubmissionAnonymisationConfigProperties

- Removed Lombok annotations: @builder, @AllArgsConstructor, and @NoArgsConstructor.
- Simplified the class by retaining only @Getter and @Setter annotations.
- Adjusted the default value for daysBeforeExpiry to 90, ensuring clarity in configuration settings.

* Enhance S3Service to support deletion of attachments using S3 URI

- Updated deleteAttachment method to accept an S3 URI instead of just the object key.
- Extracted bucket name and key from the S3 URI for improved flexibility.
- Added logging to indicate which bucket and object are being deleted.
- Ensured deletion from both the specified bucket and the attachments bucket.

* Refactor SubmissionAnonymisationService to improve S3 deletion handling

- Updated the S3 deletion logic to abort anonymisation if any deletion fails, ensuring the submission remains in IN_PROGRESS for retry.
- Enhanced logging to provide clearer context on failures during S3 object deletion, improving traceability and error handling.
…antExportMapper (#340)

- Added a new field `gapId` to the `ExportedSubmissionsDto` class.
- Updated the `CustomGrantExportMapperImpl` to map the `gapId` from `GrantExportEntity`.
- Enhanced the `GrantExportMapper` interface to include the new mapping method for `gapId`.
@rmohammed-goaco rmohammed-goaco marked this pull request as ready for review May 18, 2026 12:33
@rmohammed-goaco rmohammed-goaco merged commit 0742a7c into main May 18, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant