Commit Graph

3183 Commits

Author SHA1 Message Date
Chris Hill-Scott
73a6faebcb Merge pull request #1105 from alphagov/pyup-update-pyjwt-1.4.2-to-1.5.2
Update pyjwt to 1.5.2
2017-08-07 09:54:27 +01:00
Chris Hill-Scott
5a5518be37 Merge pull request #1149 from alphagov/no-celery-4-u
Stop trying to upgrade us to Celery Pyup
2017-08-07 09:49:25 +01:00
kentsanggds
6e4f0eed58 Merge pull request #1151 from alphagov/ken-bump-utils-17.8
Bump version to pick up fix for dashes
2017-08-03 15:39:19 +01:00
Ken Tsang
3c050af190 Bump version to pick up fix for dashes 2017-08-03 14:52:13 +01:00
Imdad Ahad
e148fafd53 Merge pull request #1144 from alphagov/imdad-feat-schedule-billing-and-adjust-backfill
Populate monthly billing on a schedule and make backfill less granular
2017-08-03 10:54:16 +01:00
Leo Hemsted
9c940ab8b4 Merge pull request #1136 from alphagov/letter-api
Letter api
2017-08-02 16:15:30 +01:00
Leo Hemsted
372b10f19c fix up tests to be internally consistent
notifications should always have at least one of job and api key, and
the key type should match the api key's key type (or be 'normal')
2017-08-02 15:35:56 +01:00
Imdad Ahad
824063ddb8 Fix to return billing data before a rate begins 2017-08-02 15:32:34 +01:00
Imdad Ahad
5b9377c697 Start populating monthly billing on a schedule 2017-08-02 15:32:32 +01:00
Leo Hemsted
5d61b3644c add tests for new test-key handling 2017-08-02 11:14:05 +01:00
Chris Hill-Scott
eafeeed4f7 Stop trying to upgrade us to Celery Pyup 2017-08-02 11:04:20 +01:00
Chris Hill-Scott
9cd0e0f6b7 Merge pull request #1148 from alphagov/pyup-update-pytest-3.1.3-to-3.2.0
Update pytest to 3.2.0
2017-08-02 10:41:16 +01:00
pyup-bot
d16650c849 Update pytest from 3.1.3 to 3.2.0 2017-08-01 23:40:13 +01:00
Leo Hemsted
13917c9c57 give test letter api notifications a different filename
so they can be distinguished on the frontend.

Also, some related cleanup:

* don't show test api letters on the frontpage
* make sure the subject is returned from the API for letters
* make sure the letter's address is returned for letters
2017-08-01 18:23:29 +01:00
Chris Hill-Scott
f4ec586a6b Merge pull request #1146 from alphagov/bump-utils-quotes-and-linebreaks
Bump utils to 17.7.0
2017-08-01 16:52:27 +01:00
Chris Hill-Scott
1278f15289 Bump utils to 17.7.0
Changes:
https://github.com/alphagov/notifications-utils/compare/17.5.7...17.7.0
2017-08-01 16:18:56 +01:00
Imdad Ahad
2cae9c1fec Merge pull request #1145 from alphagov/imdad-fix-add-celery-back
Fix - Add celery back
2017-08-01 16:09:40 +01:00
Imdad Ahad
588410e834 Add celery 2017-08-01 16:06:03 +01:00
Leo Hemsted
075d2a3346 tighten key_type validation on letters api
when in research mode or test key, dont send letters via api - instead,
just put them straight to success state

when using a team key, flat out reject the request (403)
2017-08-01 15:49:00 +01:00
Imdad Ahad
020928f187 Merge pull request #1137 from alphagov/pyup-update-iso8601-0.1.11-to-0.1.12
Update iso8601 to 0.1.12
2017-08-01 15:34:29 +01:00
Imdad Ahad
88ce89bcae Merge pull request #1112 from alphagov/pyup-update-monotonic-1.2-to-1.3
Update monotonic to 1.3
2017-08-01 15:34:20 +01:00
Imdad Ahad
a6d6fb6190 Merge pull request #1141 from alphagov/imdad-fix-monthly-billing-update
Fix issue where monthly billing data was not being updated
2017-08-01 15:34:12 +01:00
Imdad Ahad
dc7a1051a6 Refactor 2017-08-01 14:04:17 +01:00
Imdad Ahad
a08de0939b Adjust command to backfill (less granular)
Rates began from 05-2016

This adjusts the command to backfill by year.

If 2016, let's backfill from May.
If 2017, let's backfill from the beginning of the year.
2017-08-01 11:36:30 +01:00
Leo Hemsted
33cfe39557 Merge branch 'master' into pyup-update-monotonic-1.2-to-1.3 2017-07-31 18:34:44 +01:00
Leo Hemsted
76ea0dbc76 Merge branch 'master' of github.com:alphagov/notifications-api into letter-api 2017-07-31 18:15:16 +01:00
Imdad Ahad
d01d875f7e Fix issue where monthly billing data was not being updated: 2017-07-31 17:47:53 +01:00
Leo Hemsted
20f3be0bae Merge pull request #1140 from alphagov/credstash
Remove credstash without breaking celery
2017-07-31 14:15:44 +01:00
Leo Hemsted
3cb3cf438e remove SEND_COMBINED 2017-07-31 13:29:30 +01:00
Leo Hemsted
b5dc7642aa remove aws_run_celery file
it's no longer relevant since the switch to PaaS
2017-07-31 11:12:43 +01:00
Leo Hemsted
9c212e78af Revert "Revert "remove credstash""
This reverts commit de41fde0d3.
2017-07-31 11:11:00 +01:00
Leo Hemsted
8e738b783e update test_send_notification to account for new uuid mock 2017-07-31 11:10:05 +01:00
Sakis
cce8ef1c50 Merge pull request #1139 from alphagov/revert-credstash-removal
Revert "remove credstash"
2017-07-28 16:21:00 +01:00
Athanasios Voutsadakis
de41fde0d3 Revert "remove credstash"
This reverts commit 7db1bfbb77.
2017-07-28 16:09:49 +01:00
Leo Hemsted
6c007fb27d Merge pull request #1127 from alphagov/credstash
remove credstash
2017-07-28 10:47:55 +01:00
pyup-bot
c87511959c Update iso8601 from 0.1.11 to 0.1.12 2017-07-27 23:15:02 +01:00
Leo Hemsted
11f8603319 Remove custom error message from personalisation validation
There's no longer a single err msg that fits all problems with
personalisation - since letters expect specific fields there
2017-07-27 16:49:37 +01:00
Leo Hemsted
2ab105aaf4 add tests for letter api notifications 2017-07-27 16:43:55 +01:00
Leo Hemsted
f528236eda make job.created_by nullable
Since letter jobs from the API aren't created by any single individual,
lets make created_by nullable. Note: We'll have to make sure that we
update the admin app to handle these jobs nicely
2017-07-27 12:58:13 +01:00
kentsanggds
2df411a985 Merge pull request #1131 from alphagov/ken-update-email-logo-use-cdn
Update email logo to use logo CDN
2017-07-27 11:50:00 +01:00
Leo Hemsted
11458c421b ensure permissions are correct in sample letter fixtures
sample_letter_* should always include a service that has letter
permissions.

Also, print out the JSON response in the admin_request fixture if the
response code doesn't match
2017-07-27 11:12:09 +01:00
Leo Hemsted
2746bf0318 process letters from api traffic
there are three steps to this

1. Create a job
  * Starts in status 'ready to send'
  * Created by None, since it's from the API
  * original file name 'letter submitted via api'
2. Create a single notification for that job
  * job_row_number 0
  * client reference if provided
  * address line 1 as recipient
3. Trigger the build_dvla_file task
  we know that all the notifications have been created for this job
  (since we just created them ourselves synchronously), so this will
  just create the dvla-format file for the job, and upload it to s3.
2017-07-27 11:12:09 +01:00
Imdad Ahad
3d089bf7f1 Merge pull request #1133 from alphagov/fix-build
Don't drop the columns yet
2017-07-26 15:26:12 +01:00
Rebecca Law
8b6be67bbd make columns nullable 2017-07-26 15:06:09 +01:00
Rebecca Law
5669d0475f Don't drop the columns yet 2017-07-26 14:46:40 +01:00
Rebecca Law
90ef82ef92 Merge pull request #1132 from alphagov/update-updated_at
Removed month and year and replaced it with start_date and end_date.
2017-07-26 13:50:52 +01:00
Rebecca Law
c1f2634c90 Removed month and year and replaced it with start_date and end_date.
This will allow us to sort the data properly.
2017-07-26 13:19:17 +01:00
Ken Tsang
0daf88aff7 Refactored code 2017-07-26 11:05:31 +01:00
Ken Tsang
3e6e75998b Update config to use logo cdn 2017-07-26 11:05:31 +01:00
Rebecca Law
3878ece9ea Merge pull request #1129 from alphagov/use-bst-for-month
Use BST to calculate monthly billing
2017-07-26 09:56:15 +01:00