Ken Tsang
976be24cbc
Refactor test
2017-08-11 12:56:59 +01:00
Ken Tsang
9a55e167f7
Refactored inbound_number dao
2017-08-11 12:56:59 +01:00
Ken Tsang
cfabab0785
Refactor code to add updated_at
2017-08-11 12:56:59 +01:00
Ken Tsang
2cfe85a2af
Refactored inbound_number dao tests
2017-08-11 12:56:59 +01:00
Ken Tsang
e80bc9deb2
Refactor conftest
2017-08-11 12:56:59 +01:00
Ken Tsang
668811197c
Remove whitespace
2017-08-11 12:56:59 +01:00
Ken Tsang
c9f871c0c9
Refatored tests and fixtures for inbound_number
2017-08-11 12:56:59 +01:00
Ken Tsang
5e2d0bf5c6
Update test fixture to provide default provider
2017-08-11 12:56:59 +01:00
Ken Tsang
61c09f142c
Refactored model and dao
2017-08-11 12:56:59 +01:00
Ken Tsang
3c392596a3
Add backref in InboundNumber model
2017-08-11 12:56:59 +01:00
Ken Tsang
4efb3238db
Added test for allocating a service an inbound number twice
2017-08-11 12:56:59 +01:00
Ken Tsang
4de6060694
Add data models, dao for inbound_numbers
2017-08-11 12:56:59 +01:00
Rebecca Law
0f26584761
Merge pull request #1164 from alphagov/check-service-name-is-unique
...
Check service name is unique
2017-08-10 10:21:58 +01:00
Leo Hemsted
e7b13e727a
don't capture logs directly from stdout
...
previously in run_app_paas.sh, we captured stdout from the app and
piped that into the log file. However, this came up with a bunch of
problems, mainly:
* exceptions with stack traces often weren't formatted properly,
and kibana could not parse them
* celery logs were duplicated - we'd collect both the json logs and
the human readable stdout logs.
instead, with the updated utils library, we can use that to log json
straight to the appropriate directory directly.
2017-08-09 15:29:39 +01:00
Rebecca Law
1ec6a3b73d
Created a new service endpoint that checks if the service name or email_from is unique.
...
Why is this needed?
When a user updates a service name they enter the new name in a form, are then asked to confirm the change by entering their password. Then the API call to update_service is called. If we let the update serivce API call fail with the integrity constraint it will be ackward for the user.
2017-08-09 15:12:52 +01:00
Leo Hemsted
14dd18aefc
Merge pull request #1163 from alphagov/letter-template-subject
...
make sure template serialises letter subjects
2017-08-09 12:33:34 +01:00
Leo Hemsted
da02ffa32f
ensure template history serializes using template serialize fn
2017-08-09 12:24:35 +01:00
Leo Hemsted
c9762f75a1
make sure template serialises letter subjects
2017-08-09 11:56:52 +01:00
Imdad Ahad
4d53481737
Merge pull request #1134 from alphagov/imdad-feat-check-notification-table-for-last-template-usage
...
Update the last template usage query to check Notification table
2017-08-09 10:22:21 +01:00
Leo Hemsted
5491adcabd
address_line_2 is a required field
2017-08-07 14:23:44 +01:00
Imdad Ahad
864e356163
Add test to check with notificationhistory but no notification
2017-08-07 13:33:10 +01:00
Imdad Ahad
f5e38a896c
Update the last template usage query to check Notification table:
...
* Don't check the NotificationHistory table (this can cause a timeout)
* Check template actually exists first
2017-08-07 10:19:21 +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
Leo Hemsted
5d61b3644c
add tests for new test-key handling
2017-08-02 11:14:05 +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
dc7a1051a6
Refactor
2017-08-01 14:04:17 +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
8e738b783e
update test_send_notification to account for new uuid mock
2017-07-31 11:10:05 +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
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
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
Rebecca Law
f73b5140ed
Bah! style check
2017-07-25 17:47:08 +01:00
Rebecca Law
b62ee8380c
Use BST to calculate monthly billing
2017-07-25 17:38:53 +01:00
venusbb
fb601daedc
Merge branch 'master' of https://github.com/alphagov/notifications-api into sms_whitelist
2017-07-25 17:14:59 +01:00
Rebecca Law
3d3703750c
Merge pull request #1126 from alphagov/month-billing-table
...
Add transactional for new query
2017-07-25 16:07:53 +01:00
Rebecca Law
e23d38de26
Fix bug in get rates function.
2017-07-25 15:50:14 +01:00
Leo Hemsted
0ce9b94c36
Merge pull request #1075 from alphagov/letter-api-refactor
...
Letter api step 1 - refactor
2017-07-25 14:53:39 +01:00
Rebecca Law
5612ca023e
- Add transactional
...
- Rename function for clarity
2017-07-25 14:26:42 +01:00
Rebecca Law
eaf5cbb868
Add labels to query so that the named tuples can be referenced later.
...
Remove unnecessary function
2017-07-25 11:43:41 +01:00
Rebecca Law
91f29517eb
Merge branch 'master' into month-billing-table
2017-07-24 15:17:36 +01:00
Rebecca Law
3e2b8190b9
- Added a scheduled task to create or update billing for the month, yesterday is used to calculate the start and end date for the month.
...
- The new task has not been added to the beat application yet.
- Added an updated_at column to the monthly billing table, we may want to only calculate from the last updated date rather than the entire month.
2017-07-24 15:13:18 +01:00
