Commit Graph

3221 Commits

Author SHA1 Message Date
Ken Tsang
c9f871c0c9 Refatored tests and fixtures for inbound_number 2017-08-11 12:56:59 +01:00
Ken Tsang
a127a6e871 Added active flag setting in inbound_number_dao 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
ffc2da2369 Update serialization for services 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
Imdad Ahad
d3e5f3a753 Merge pull request #1150 from alphagov/imdad-migration-remove-month-year-monthly-billing
Drop unused month and year columns from MonthlyBilling
2017-08-11 12:31:38 +01:00
Imdad Ahad
dcecd21f82 Drop unused month and year columns from monthlybilling 2017-08-11 10:44:34 +01:00
Rebecca Law
1b7f3f0238 Merge pull request #1138 from alphagov/pyup-update-flask-migrate-1.3.1-to-2.1.0
Update flask-migrate to 2.1.0
2017-08-10 14:05:48 +01:00
Chris Hill-Scott
432a047b6c Merge pull request #1170 from alphagov/newline-replacement-letters-bugfix
Bump utils to 18.0.1
2017-08-10 12:37:12 +01:00
Chris Hill-Scott
4db008d0a1 Merge pull request #1169 from alphagov/pyup-update-pytest-3.2.0-to-3.2.1
Update pytest to 3.2.1
2017-08-10 12:37:04 +01:00
Chris Hill-Scott
0207c186e8 Bump utils to 18.0.1
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/203
2017-08-10 12:04:25 +01:00
Rebecca Law
318d6aeb7b Remove comment 2017-08-10 11:32:16 +01:00
Rebecca Law
d9d100e20b Merge branch 'master' into pyup-update-flask-migrate-1.3.1-to-2.1.0 2017-08-10 11:22:05 +01:00
Rebecca Law
333ed8f806 Merge pull request #1115 from alphagov/pyup-pin-notifications-python-client-4.3.1
Pin notifications-python-client to latest version 4.3.1
2017-08-10 11:21:03 +01:00
Rebecca Law
32928db6e7 Merge branch 'master' into pyup-pin-notifications-python-client-4.3.1 2017-08-10 10:25:46 +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
pyup-bot
06d4da57ae Update pytest from 3.2.0 to 3.2.1 2017-08-09 22:10:25 +01:00
Leo Hemsted
c1d22047be Merge pull request #1166 from alphagov/fix-logs
fix broken cloudfoundry logs
2017-08-09 16:09:04 +01:00
Leo Hemsted
83fc529cc5 fix broken cloudfoundry logs
wasn't setting log path properly
2017-08-09 16:07:35 +01:00
Leo Hemsted
210cb75706 Merge pull request #1165 from alphagov/logs-cleanup
don't capture logs directly from stdout
2017-08-09 15:48:29 +01:00
Rebecca Law
b227ed450a Got rid of an if 2017-08-09 15:42:40 +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
6c0b59b544 Merge pull request #1158 from alphagov/address-line-2
address_line_2 is a required field
2017-08-07 15:09:54 +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
Chris Hill-Scott
84a32180b3 Merge pull request #1113 from alphagov/pyup-update-jsonschema-2.5.1-to-2.6.0
Update jsonschema to 2.6.0
2017-08-07 09:54:35 +01:00
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