Remove mandrill #956
Merged
Remove mandrill #956
Conversation
This file contains 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
jonodrew
force-pushed
the
jk-remove-mandrill
branch
3 times, most recently
from
e63f2bb
to
d1883e7
Compare
katstevens
reviewed
Jan 14, 2019
katstevens
suggested changes
Jan 14, 2019
jonodrew
force-pushed
the
jk-remove-mandrill
branch
3 times, most recently
from
aafcb4f
to
e2b50f0
Compare
benvand
reviewed
Jan 17, 2019
benvand
reviewed
Jan 17, 2019
benvand
reviewed
Jan 17, 2019
benvand
reviewed
Jan 17, 2019
benvand
reviewed
Jan 17, 2019
benvand
reviewed
Jan 17, 2019
benvand
reviewed
Jan 17, 2019
jonodrew
force-pushed
the
jk-remove-mandrill
branch
from
e2b50f0
to
d2f39c9
Compare
This commit removes the upload_framework_agreement route. It is a route used for uploading a framework agreement pre-g-cloud 8. As we're about to move to G-Cloud 11, this route is no longer necessary. In the interests of keeping the codebase clean I've removed the route and its corresponding tests. I've also removed the email template, as we're not emailing anyone from this route any more.
This commit removes the use of mandrill from the framework_dashboard route. It's been replaced with notify and a for-loop. I've also had to create a new template in the Notify UI for new DOS applications. The ids for these two templates are in a dictionary that's passed to the DMNotifyClient when it's initialised. The templates that mandrill used have been deleted. The tests have been updated to reflect the fact that notify is called. I've also removed an unnecessary patch in test_framework::test_interest_registered_in_framework_on_post
jonodrew
force-pushed
the
jk-remove-mandrill
branch
from
d2f39c9
to
c58b972
Compare
katstevens
reviewed
Jan 17, 2019
katstevens
reviewed
Jan 17, 2019
katstevens
reviewed
Jan 17, 2019
katstevens
reviewed
Jan 17, 2019
This commit changes existing tests for the `view_contract_variation` view so that they work with the new Notify client. The method we’re testing is instantiated at the top of this class as notify_send_email, so we can use self.notify_send_email to check if it’s called rather than patching all over the place.
jonodrew
force-pushed
the
jk-remove-mandrill
branch
2 times, most recently
from
c7884fe
to
666e108
Compare
This commit switches mandrill for notify when emailing users a confirmation of their agreement to a variation in the framework. This change will require that a developer adds an appropriate template to Notify, or that there is a change in the future to make the template sufficiently generic that we can hard-code it.
jonodrew
force-pushed
the
jk-remove-mandrill
branch
2 times, most recently
from
b185544
to
923378f
Compare
katstevens
reviewed
Jan 18, 2019
katstevens
reviewed
Jan 18, 2019
This commit adds two templates, for g-cloud and digital outcomes and specialists, so the config file. This ensures they're picked up whenever the client is initialised, and means there's only one place to add/remove/replace them.
jonodrew
force-pushed
the
jk-remove-mandrill
branch
from
923378f
to
1ce541b
Compare
katstevens
approved these changes
Jan 18, 2019
benvand
reviewed
Jan 21, 2019
| lot['slug']: [draft for draft in complete_drafts if draft['lotSlug'] == lot['slug']] | ||
| for lot in framework['lots'] | ||
| } | ||
| lot_results = {k: lot_result(v) for k, v in complete_drafts_by_lot.items()} |
There was a problem hiding this comment.
Readability could benefit from (IMO)
lot_results = {lot_slug: lot_result(draft_services) for lot_slug, draft_services in complete_drafts_by_lot.items()}
I think this has the advantage of cementing the structure of the above comprehension. But it's a bit of a nitpick tbh :)
benvand
approved these changes
Jan 21, 2019
|
(👋 bye Mandrill!) |
Not quite...still that pesky Zendesk/Salesforce question to solve! |
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.
The aim of this PR is to remove mandrill from
supplier-frontendentirely. Maintaining multiple clients complicates the codebase and takes up brain space for developers. TicketIn addition, the mandrill client is now deprecated
view_contract_variationroute