darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-24 09:21:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,238 Commits 128 Branches 60 Tags
ba93fdc0ed70fb17243ddf9fc01778d68e3076c3
Commit Graph

1238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
minglis
ba93fdc0ed Merge pull request #573 from alphagov/new-staging 
New staging
 2016-08-02 14:53:58 +01:00
Martyn Inglis
f939e9220d reverted postgres version 2016-08-02 14:40:56 +01:00
Martyn Inglis
610d37cf47 latest postgres version 2016-08-02 14:35:17 +01:00
Martyn Inglis
0d1732d46d Removed deploy steps from new staging. 
to be added back once merged to master.
 2016-08-02 14:29:27 +01:00
Martyn Inglis
6eb210fae9 Merge branch 'master' into new-staging 2016-08-02 14:24:32 +01:00
Leo Hemsted
7471e3ac62 Merge pull request #571 from alphagov/fix-tests 
use freeze_time whenever we mess with dates
 2016-08-02 11:14:22 +01:00
Leo Hemsted
05ef4911b1 use freeze_time whenever we mess with dates 
also fixed a gotcha where an object was created in a fixture, so the freezetime decorator didn't apply
 2016-08-02 11:02:59 +01:00
Leo Hemsted
cb19e6769d Merge pull request #563 from alphagov/week-agg 
New weekly aggregate function
 2016-08-02 10:27:15 +01:00
Martyn Inglis
7a77312e04 Merge branch 'master' into new-staging 2016-08-02 09:02:32 +01:00
Martyn Inglis
daf85e7787 Reorder the SQL scripts as clash 2016-08-01 15:19:16 +01:00
minglis
54a63c0351 Merge pull request #544 from alphagov/job-notification-history 
Create notification history from jobs
 2016-08-01 15:04:15 +01:00
Chris Hill-Scott
6d03933dd1 Merge pull request #566 from alphagov/fix-newlines-in-html-emails 
Fix newlines in HTML emails
 2016-08-01 14:36:34 +01:00
Chris Hill-Scott
482a435e66 Fix newlines in HTML emails 
Implements:
- [ ] https://github.com/alphagov/notifications-utils/pull/60
 2016-08-01 14:23:10 +01:00
Leo Hemsted
5aa00d8d21 Merge pull request #559 from alphagov/get-stats-for-today 
Get service with stats for today
 2016-08-01 13:38:38 +01:00
Martyn Inglis
cfb29d4404 Ensure the downgrade script targets only DMP services 2016-08-01 12:20:06 +01:00
Leo Hemsted
6edb9324da add indexes to notifications and notification_history 2016-08-01 11:34:20 +01:00
Chris Hill-Scott
5f405f234e Merge pull request #564 from alphagov/fix-markdown-oddities 
Fix Markdown/HTML email oddities
 2016-08-01 11:31:51 +01:00
Chris Hill-Scott
d8ab82b139 Fix Markdown/HTML email oddities 
Depends on:
- [ ] https://github.com/alphagov/notifications-utils/pull/59
 2016-08-01 11:16:18 +01:00
Leo Hemsted
717f1fd4a0 Merge branch 'master' into get-stats-for-today 2016-08-01 10:36:56 +01:00
Martyn Inglis
c665653859 Longer timeout on install as fails on staging 2016-07-29 10:49:48 +01:00
Martyn Inglis
e606202a08 Increase ELB wait time 2016-07-29 10:15:34 +01:00
Martyn Inglis
5c7762f969 Fixed condig to run tests with new style 2016-07-29 10:15:34 +01:00
Martyn Inglis
e56d513828 Change staging config 2016-07-29 10:15:34 +01:00
Martyn Inglis
dbe34f46e6 Reordered imports 2016-07-29 10:15:34 +01:00
Martyn Inglis
5635235269 Debugging 2016-07-29 10:15:34 +01:00
Martyn Inglis
44dffc9d22 Fixed config so properties are shared if possible 2016-07-29 10:15:34 +01:00
Martyn Inglis
9ec52eac02 New config style 2016-07-29 10:15:34 +01:00
Martyn Inglis
7bd1ea1a45 Wrong path to app 2016-07-29 10:15:33 +01:00
Martyn Inglis
d34ae9edbc Fixed some bash if blocks and removed env file from db.py 2016-07-29 10:15:33 +01:00
Martyn Inglis
0bfed1baad Fixing up configs 2016-07-29 10:15:33 +01:00
Martyn Inglis
26890c6436 Added basic elb/instance lookups 2016-07-29 10:15:33 +01:00
Martyn Inglis
0933c153ea Added notify-app if/else block so can run on new staging and preview 2016-07-29 10:15:33 +01:00
Leo Hemsted
e5b0d568fa ensure stats returned for lifespan of service 
even if they've never sent a notification for realsies
 2016-07-28 15:24:21 +01:00
Leo Hemsted
8ad47481d7 add GET /service/<id>/notifications/weekly 
moved format_statistics to a new service/statistics.py file, and
refactored to share code. moved tests as well, to try and enforce
separation between the restful endpoints of rest.py and the logic/
data manipulation of statistics.py
 2016-07-28 13:48:39 +01:00
Leo Hemsted
ce9f2e808b Merge pull request #560 from alphagov/notification-500 
fix notification 500
 2016-07-27 17:16:45 +01:00
Leo Hemsted
444132ad66 rewrite weekly aggregate function to honor week boundaries 
(and not use the stats table, and also be easier to read)
 2016-07-26 17:23:59 +01:00
Adam Shimali
183fc7d639 After doing some tests locally. To get this to run in a reasonable 
amount of time I've made the following changes.

Only migrate jobs for the Digital Marketplace service.

Batch up commits to run per job.
 2016-07-26 16:23:36 +01:00
Leo Hemsted
91393bdb0d ensure /notifications rather than service/:id/notifications in tests 
for content merging
 2016-07-26 15:09:25 +01:00
Leo Hemsted
48eff9a2ee add today_only flag to GET /service/:id 
if both detailed=True and today_only=True are passed in, the stats
returned will only be for today.

if detailed is false or not specified, today_only has no effect
 2016-07-26 14:35:29 +01:00
Leo Hemsted
fd96c854e1 add dao function to get notification stats for a server for toady only 2016-07-26 14:35:29 +01:00
Leo Hemsted
c81b30dba1 separated schemas once more into "with template" and "with personalisation" 
"with personalisation" should only be used by the public notification api
"with template" should be used when we want template name, etc details.

also added an xfail test for correctly constructing notification
personalisation
 2016-07-26 14:34:59 +01:00
Leo Hemsted
b28e7efd14 dont load template contents for job page 
rename the notification_status_schema to make it apparent that it
involves the template, and then don't use it on the job page - the
job page doesn't do anything with the data. won't somebody think of
the cpu cycles! (also means it ignores problems with template
versions)
 2016-07-26 14:34:59 +01:00
minglis
95af32f289 Merge pull request #556 from alphagov/fix-expired-token-error 
Fix bug with expired token error response
 2016-07-26 11:25:09 +01:00
minglis
cd4e271dcf Merge pull request #557 from alphagov/fix-inconsistent-tests 
make tests run consistently
 2016-07-26 11:24:44 +01:00
Leo Hemsted
3df0e8ee2d make tests run consistently 
* tests on API endpoints that we do not explicitly sort should
  either sort the results or compare results in an orderless way
  (e.g. converting to a set)
* tests that touch the provider_details should reset values after
  running, since the provider_details table is not torn down and
  re-created between tests (unlike most tables)
 2016-07-25 09:47:38 +01:00
minglis
c92bac0895 Merge pull request #558 from alphagov/allow_overriding_of_database_connection_in_tests 
Override postgresc connection for jenkins
 2016-07-22 21:02:16 +01:00
Martyn Inglis
a5b8a41ead Override postgresc connection for jenkins 
If TEST_DATABASE is set then the postgres connection is set to that.
Jenkins sets it to the RDS instance that is in that AWS Account
 2016-07-22 20:47:50 +01:00
Rebecca Law
ecd4b76080 Fix bug with expired token error response 2016-07-22 15:10:37 +01:00
Leo Hemsted
85c7aa4a40 Merge pull request #540 from alphagov/dashboard-notifications-api 
detailed service api endpoint
 2016-07-22 14:18:11 +01:00
Leo Hemsted
e6d85644e4 Merge pull request #552 from alphagov/update-utils-markdown-branding 
Update utils for Markdown parsing + subbranding
 2016-07-22 14:17:50 +01:00