Use DeliveryConfigurations instead of old form attributes#2942
Merged
stephencdaly merged 7 commits intoJul 21, 2026
Conversation
stephencdaly
force-pushed
the
prepare-to-drop-submission-type-and-submission-format
branch
2 times, most recently
from
July 20, 2026 10:26
5a2b297 to
ae1c707
Compare
stephencdaly
changed the title
stephencdaly
changed the title
stephencdaly
force-pushed
the
prepare-to-drop-submission-type-and-submission-format
branch
4 times, most recently
from
July 20, 2026 11:45
4310610 to
c9c4760
Compare
stephencdaly
marked this pull request as ready for review
July 20, 2026 12:30
stephencdaly
marked this pull request as draft
July 20, 2026 12:33
stephencdaly
force-pushed
the
prepare-to-drop-submission-type-and-submission-format
branch
from
July 20, 2026 12:36
c9c4760 to
77ae907
Compare
stephencdaly
marked this pull request as ready for review
July 20, 2026 12:38
Now that a form can send submissions by multiple delivery methods, we cannot have columns for "Submission type" and "Submission formats" in the report CSV. Replace these by a single "Delivery methods" column which lists all the delivery methods and their formats for the form.
Update reports to use the `delivery_configurations` rather than 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. The task isn't available if the submission email hasn't been set, so show an error to the user if the email DeliveryConfiguration doesn't exist.
stephencdaly
force-pushed
the
prepare-to-drop-submission-type-and-submission-format
branch
from
July 20, 2026 14:15
77ae907 to
8648566
Compare
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.
stephencdaly
force-pushed
the
prepare-to-drop-submission-type-and-submission-format
branch
from
July 20, 2026 14:21
8648566 to
fb77bf6
Compare
Use delivery_configurations rather than the deprected attributes when determining whether the tasks for email attachments and batch submissions are complete. The submission attachments (CSV or JSON) task should not be shown when only S3 submissions are enabled. If there are no delivery configurations because the submission email has not yet been set, show the task but with a status of "cannot start".
stephencdaly
force-pushed
the
prepare-to-drop-submission-type-and-submission-format
branch
from
July 20, 2026 14:26
fb77bf6 to
1727c89
Compare
stephencdaly
changed the title
stephencdaly
changed the title
|
🎉 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. |
DavidBiddle
approved these changes
Jul 21, 2026
DavidBiddle
left a comment
DavidBiddle
left a comment
Contributor
There was a problem hiding this comment.
Commits are well organised, code change makes sense and I can see the change working in the report, task list and the live form page 🎉
stephencdaly
deleted the
prepare-to-drop-submission-type-and-submission-format
branch
July 21, 2026 10:37
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
2 participants
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 places where we were reading and updating these attributes with only reading and updating the DeliveryConfigurations.
This is in preparation to ignore and drop these columns.
This PR does not update the rake tasks for configuring whether S3 submissions are enabled, this will be done in the next PR.
Things to consider when reviewing