darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-14 06:31:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,987 Commits 133 Branches 60 Tags
02c824a980db5b3c11294de0eca663452bdb2da3
Commit Graph

6987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leo Hemsted
147c50f87b set sms_sender to be 'GOVUK' if not otherwise specified 
this is a precursor to making the column non-nullable
 2017-05-23 11:33:31 +01:00
Leo Hemsted
f899d74325 Merge pull request #973 from alphagov/40604-or-govuk 
treat 40604 and GOVUK as not having a sender ID
 2017-05-23 11:29:33 +01:00
Leo Hemsted
86c9600b04 use config to get default sender rather than hardcoding 
this means that on non-prod envs, it reflects that environment.

it needs to be a lamdba, because the column object is created at import
time, when current_app.config won't have been loaded - this means that
when you create a Service object, that lambda executes and grabs the
correct default value
 2017-05-23 11:12:37 +01:00
Imdad Ahad
24dfcd2128 Add normalised_to field to notification 2017-05-23 10:44:39 +01:00
kentsanggds
82c0d6a98e Merge pull request #978 from alphagov/ken-refactor-service_permissions-data_model-inc-updated_at 
Ken refactor service permissions data model inc updated at
 2017-05-22 18:08:42 +01:00
Ken Tsang
3d2c12128b Update services test 2017-05-22 17:27:26 +01:00
Ken Tsang
112071a31e Merge branch 'ken-refactor-service_permissions-data_model-inc-updated_at' of https://github.com/alphagov/notifications-api into ken-refactor-service_permissions-data_model-inc-updated_at 2017-05-22 17:26:04 +01:00
Ken Tsang
de7ad6fb95 Refactored service_permissions data model 2017-05-22 17:25:58 +01:00
Ken Tsang
88215f4062 Removed drop columns from service_permissions table 2017-05-22 17:13:50 +01:00
Leo Hemsted
2535a7fe98 set sms_sender to be 'GOVUK' if not otherwise specified 
this is a precursor to making the column non-nullable
 2017-05-22 17:13:35 +01:00
Leo Hemsted
3744463296 treat 40604 and GOVUK as not having a sender ID 
in prep for removing the 40604-as-default, first we need to make sure
that if you either have GOVUK or None as your sms sender, then we send
GOVUK through to the provider
 2017-05-22 17:10:07 +01:00
Ken Tsang
111e9df000 Removed drop columns from service_permissions table 2017-05-22 16:56:43 +01:00
kentsanggds
566166fcbf Merge pull request #974 from alphagov/revert-969-ken-refactor-service_permissions-data_model 
Revert "Refactored service permissisons data model"
 2017-05-22 16:40:14 +01:00
Rebecca Law
76d0783c63 Add beat config for send-scheduled-notifications task to run every 15 minutes. 
Added the missing commit to the update pending
 2017-05-22 16:30:45 +01:00
kentsanggds
f5d3eed7e0 Revert "Refactored service permissisons data model" 2017-05-22 16:05:31 +01:00
Rebecca Law
9bfba52f53 Add pending flag to scheduled_notifications. 
Set pending flag to false when the notification has been sent to provider task.
 2017-05-22 15:07:16 +01:00
Rebecca Law
a57dc18895 Add validation for scheduled_for where the date can not be in the past or more than 24 hours in the future. 2017-05-22 14:39:30 +01:00
Rebecca Law
751abb4b99 Update dateformat for scheduled_for to include minutes. 2017-05-22 14:15:35 +01:00
kentsanggds
39f23c6189 Merge pull request #969 from alphagov/ken-refactor-service_permissions-data_model 
Refactored service permissisons data model
 2017-05-22 14:08:15 +01:00
Rebecca Law
3a3161ecc4 Merge branch 'master' into schedule-api-notification 
Conflicts:
	app/celery/scheduled_tasks.py
	app/v2/notifications/post_notifications.py
	tests/app/celery/test_scheduled_tasks.py
 2017-05-22 14:05:57 +01:00
Ken Tsang
052004bef0 Refactored data model to remove cascade 2017-05-22 13:33:43 +01:00
Imdad Ahad
47f361037e Merge pull request #968 from alphagov/imdad-fix-parse-json-properly-sns-callback 
Fix issue with parsing JSON in SNS callback
 2017-05-22 11:18:35 +01:00
Ken Tsang
28ef9a1853 Refactored service permissisons data model 2017-05-22 10:58:41 +01:00
Imdad Ahad
02db3be37c General refactor 2017-05-22 10:12:18 +01:00
Martyn Inglis
119f0532ab Renamed the API method/url 2017-05-22 10:06:34 +01:00
Rebecca Law
2e864411af Create a server command to run custom db scripts. 2017-05-19 17:04:39 +01:00
Martyn Inglis
f0395e7496 New endpoint to get the count of billable SMS units. 2017-05-19 16:43:05 +01:00
Martyn Inglis
7268bc28fe New array of non-billable states 2017-05-19 16:42:47 +01:00
Martyn Inglis
2a0669636d Add and test new DAO method that counts the billable units multiplied by rate multiplier for a given service for a given time period. 
Currently this is SMS only.

Used by the dashboard for a headline figure.
 2017-05-19 16:42:33 +01:00
Rebecca Law
35e9abe8b5 Merge pull request #965 from alphagov/revert-964-update-international 
Revert "Script to update the international flag from null to false"
 2017-05-19 12:22:35 +01:00
Rebecca Law
315e776ebb Revert "Script to update the international flag from null to false" 2017-05-19 12:22:05 +01:00
Rebecca Law
f00dbfa34f Merge pull request #964 from alphagov/update-international 
Script to update the international flag from null to false
 2017-05-19 10:54:48 +01:00
Rebecca Law
069cf35878 Script to update the international flag from null to false 2017-05-19 10:31:36 +01:00
Imdad Ahad
0e0c18583f Fix test data and how we parse the JSON 2017-05-19 10:16:48 +01:00
Rebecca Law
e2b5bb613b Merge pull request #963 from alphagov/revert-949-update-international 
Revert "Script to update international flag 10,000 rows at a time."
 2017-05-18 15:46:22 +01:00
Rebecca Law
9b79ac2189 Revert "Script to update international flag 10,000 rows at a time." 2017-05-18 15:45:50 +01:00
Rebecca Law
6d9a32bda1 Merge pull request #949 from alphagov/update-international 
Script to update international flag 10,000 rows at a time.
 2017-05-18 14:47:18 +01:00
Rebecca Law
097510b029 Testing the update script 2017-05-18 14:28:49 +01:00
Rebecca Law
a75db81334 Fix name condflicts with migration script 2017-05-18 13:12:05 +01:00
minglis
da6a6f6641 Merge pull request #959 from alphagov/comma-format-message-limit 
Comma-format number when emailing live services
 2017-05-18 11:06:24 +01:00
Rebecca Law
38659cc563 Merge branch 'master' into update-international 2017-05-18 11:01:27 +01:00
minglis
0d35736eee Merge pull request #962 from alphagov/remove-space-from-queue-list 
Removed whitespace from queue list
 2017-05-18 10:24:16 +01:00
Martyn Inglis
ea794705ab Removed whitespace from queue list 2017-05-18 10:24:03 +01:00
minglis
8e4466bc04 Merge pull request #948 from alphagov/async-job-stats 
Async job stats
 2017-05-18 09:52:23 +01:00
Martyn Inglis
8dc7a86148 Merge branch 'master' into async-job-stats 
Conflicts:
	app/dao/services_dao.py
 2017-05-18 09:34:54 +01:00
kentsanggds
7850781245 Merge pull request #961 from alphagov/ken-default-permissions-when-creating-service 
Ken default permissions when creating service
 2017-05-17 16:49:25 +01:00
Ken Tsang
e68c3900e8 Add restricted argument for service mock 2017-05-17 16:06:35 +01:00
Rebecca Law
973cc2c4c9 Changed the scheduled_for datetime to only send and hour of a day to send. 
Also expect the date being passed in is BST. The date is converted to UTC before saving. And converted to BST when returning a notification.
 2017-05-17 15:06:15 +01:00
Chris Hill-Scott
d33e19da28 Merge pull request #950 from alphagov/bump-utils-placeholder-contact 
Output contact blocks with placeholders replaced
 2017-05-17 14:43:13 +01:00
minglis
0b4f0b35d5 Merge pull request #960 from alphagov/fix-created-at-date 
Fix created at date
 2017-05-17 14:24:17 +01:00