Prepare to drop old columns that have been replaced by DeliveryConfigurations#2942
Draft
stephencdaly wants to merge 9 commits into
Draft
Prepare to drop old columns that have been replaced by DeliveryConfigurations#2942stephencdaly wants to merge 9 commits into
stephencdaly wants to merge 9 commits into
Conversation
Update reports to use the `delivery_configurations` rather then the deprecated `submission_type`, `submission_format`,`send_daily_submission_batch` and `send_weekly_submission_batch` attributes.
When enabling/disabling CSV/JSON submission attachments, only read and upate the immediate email delivery configuration, rather than the deprecated submission_type and submission_format fields on the form.
Only read and update the form's DeliveryConfigurations when updating whether daily/weekly batch submission emails are enabled. This will allow us to remove the `send_daily_submission_batch` and `send_weekly_submission_batch` attributes from the Form model.
These translations are for an input object that no longer exists
Use delivery_configurations instead of deprectated submission_type, submission_format, send_daily_submission_batch and send_weekly_submission_batch fields on the live form page.
Use delivery_configurations rather than the deprected attributes when determining whether the tasks for email attachments and batch submissions are complete.
Update the rake tasks for enabling/disabling S3 and email submissions to have the following tasks: - enable_s3 - disable_s3 - enable_email - disable_email These tasks will now only edit the delivery_configurations and not edit the submission_type and submission_format which are deprecated and unused. The new tasks make it possible to have both S3 and email submissions enabled at the same time.
This has been run on all environments and needs to be deleted so we can ignore the deprecated Form columns.
The following attributes are no longer used by forms-admin or forms-runner, so can be ignored in preparation for dropping the columns: - submission_type - submission_format - send_daily_submission_batch - send_weekly_submission_batch
stephencdaly
force-pushed
the
prepare-to-drop-submission-type-and-submission-format
branch
from
July 17, 2026 18:03
5f97934 to
5a2b297
Compare
|
🎉 A review copy of this PR has been deployed! You can reach it at: https://pr-2942.admin.review.forms.service.gov.uk/ It may take 5 minutes or so for the application to be fully deployed and working. If it still isn't ready For the sign in details and more information, see the review apps wiki page. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem does this pull request solve?
Trello card: https://trello.com/c/WMnjLlJV
The following columns have been replaced by the delivery_configurations table, and are no longer used by forms-runner
Replace all places where we were reading and updating these attributes with only reading and updating the DeliveryConfigurations. Mark the columns as ignored so we can drop them in a subsequent PR.
Things to consider when reviewing