Rebecca Law
466aabdbea
Added a new endpoint that can be used for organisation or service invitations.
...
The other two invitation endpoints will be removed once the admin app is updated.
2018-02-23 14:15:39 +00:00
Rebecca Law
446e76f1f3
Remove users relationship in organisations
2018-02-23 13:36:42 +00:00
Rebecca Law
7c44171a40
Fix merge conflict in db migration script
2018-02-23 10:57:24 +00:00
Rebecca Law
69cc33f77f
Removed the check for active user when adding a user to an organisation
2018-02-23 10:45:18 +00:00
Rebecca Law
70f9dfc0f6
Added more tests
2018-02-23 10:45:18 +00:00
Rebecca Law
011f93c495
Adding more unit tests
2018-02-23 10:45:18 +00:00
Rebecca Law
13ef2d7bae
- new endpoint to check the token for an org invitation.
...
- new endpoint to add user to organisation
- new endpoint to return users for an organisation
2018-02-23 10:45:18 +00:00
Leo Hemsted
57a174aeb4
add tests for org invite rest, and update conftest
2018-02-23 10:45:18 +00:00
Leo Hemsted
0d9aa5c531
add schema and hook up blueprint
2018-02-23 10:45:18 +00:00
Leo Hemsted
5b71d2f36e
add org invite template to db
2018-02-23 10:45:18 +00:00
Leo Hemsted
a2a1c5e9af
add organisation invite rest and dao
2018-02-23 10:45:18 +00:00
Rebecca Law
444dba994d
Merge pull request #1698 from alphagov/add-exception-for-failed-letters
...
Added a new exception type for DVLAException
2018-02-23 10:42:10 +00:00
Leo Hemsted
c52ca3e7bb
Merge pull request #1681 from alphagov/fix-test-db
...
make sure tests always run in test db
2018-02-22 16:54:57 +00:00
Rebecca Law
385653af44
Added a new exception type for DVLAException.
...
The Notify team needs to investigate when a notification is marked as failed.
We will process the whole file and mark the notifications with the appropriate status, if any are failed an exception is raised.
The exception will trigger a cloud watch error for the team to investigate.
2018-02-22 15:05:37 +00:00
Leo Hemsted
25d6b45ea2
Merge pull request #1692 from alphagov/service-name-change
...
don't return or accept sms_sender in update service anymore
2018-02-22 14:37:47 +00:00
Sakis
18a85a080d
Merge pull request #1693 from alphagov/increase-pool-size
...
Increase DB connection pool size to 10
2018-02-22 11:33:53 +00:00
Leo Hemsted
aedbd37d8b
don't return or accept reply_to_email in update service anymore
...
either
2018-02-22 11:03:35 +00:00
kentsanggds
c01aef2c48
Merge pull request #1694 from alphagov/ken-add-precompiled-letter-permission
...
Add precompiled_letter service permission
2018-02-22 10:27:52 +00:00
Athanasios Voutsadakis
c61ed043b3
Ensure pool size is an integer
2018-02-22 10:27:02 +00:00
Leo Hemsted
ee1be970fc
make test config inherit from dev config
...
gets some secret keys and things set up for free
2018-02-21 18:42:24 +00:00
Leo Hemsted
073c48a0a7
move all static env vars from env.sh to config file in dev
...
There's no reason to have things that never change in environment.sh.
you'll want to update your environment.sh, then restart your shells
(`exec bash` or `exec zsh` etc)
This also changes the database to be set statically in the config, but
overridable from the command line if you need to - for example, jenkins
will override it with the dockerised postgres uri.
2018-02-21 18:12:03 +00:00
Ken Tsang
90e9d99161
Add precompiled_letter service permission
...
- migration script to add precompiled_letter in service_permission_types table and in service permission types list in models.py
2018-02-21 16:26:49 +00:00
Leo Hemsted
01ed4e1e56
Merge pull request #1679 from alphagov/pyup-update-eventlet-0.22.0-to-0.22.1
...
Update eventlet to 0.22.1
2018-02-21 16:26:27 +00:00
Leo Hemsted
a5827f9397
Merge pull request #1682 from alphagov/pyup-update-pytest-xdist-1.22.0-to-1.22.1
...
Update pytest-xdist to 1.22.1
2018-02-21 16:26:10 +00:00
Leo Hemsted
038f37984e
Merge pull request #1689 from alphagov/pyup-update-pytest-3.4.0-to-3.4.1
...
Update pytest to 3.4.1
2018-02-21 16:25:58 +00:00
Leo Hemsted
c173b4b775
Merge pull request #1691 from alphagov/letter-pdf
...
send letters for services without letters_for_pdf
2018-02-21 16:25:33 +00:00
Leo Hemsted
34e98bc14c
send letters for services without letters_for_pdf
...
also make sure that the service isn't in research mode
2018-02-21 15:59:52 +00:00
Athanasios Voutsadakis
dc19e644a6
Increase DB connection pool size to 10
...
This is to address some errors we saw yesterday such as:
`sqlalchemy.exc.TimeoutError: QueuePool limit of size 5 overflow 10
reached, connection timed out, timeout 30`
Related flask-sqlalchemy docs:
http://flask-sqlalchemy.pocoo.org/2.3/config/#configuration-keys
2018-02-21 15:47:58 +00:00
Leo Hemsted
703cee66f0
don't return or accept sms_sender in update service anymore
...
it's no longer a field on the service
2018-02-21 15:45:19 +00:00
Rebecca Law
f248234cfc
Merge pull request #1690 from alphagov/command-to-add-inbound-numbers
...
Added a command to insert inbound numbers from file.
2018-02-21 14:09:17 +00:00
Rebecca Law
28925da575
Fix codestyle
2018-02-21 11:52:52 +00:00
Rebecca Law
9207325501
Added a message about the file format.
2018-02-21 10:30:34 +00:00
Rebecca Law
953a545aea
Added a command to insert inbound numbers from file.
...
Expected file format is one number per line, each phone number should be 07... not 447..
2018-02-21 10:00:17 +00:00
pyup-bot
45af9c14cc
Update pytest from 3.4.0 to 3.4.1
2018-02-20 22:10:50 +00:00
pyup-bot
d9032f8562
Update pytest-xdist from 1.22.0 to 1.22.1
2018-02-19 22:29:29 +00:00
Rebecca Law
e750636a57
Merge pull request #1665 from alphagov/reduce-log-level
...
Reduce logging level
2018-02-19 14:50:30 +00:00
Rebecca Law
927f6e8335
Catch itegrity errors and return 400.
...
When creating or updating an organisation an itegrity error is raise if the name is already used.
This change adds a new error handler for the organisation to catch the named unique index and return a 400 with a sensible message.
We have an other error handler for unique service names which was caught in the error handler for all blueprints. A new error handler for the service_blueprint has been created for catch those specific unique constraints.
This is a nice way to encapulate the specific errors for a specific blueprint.
2018-02-19 14:33:44 +00:00
Rebecca Law
d6a1e694e2
Merge branch 'master' into reduce-log-level
2018-02-19 11:21:06 +00:00
Chris Hill-Scott
a16a14aba5
Merge pull request #1675 from alphagov/pyup-update-pytest-mock-1.6.3-to-1.7.0
...
Update pytest-mock to 1.7.0
2018-02-19 10:38:43 +00:00
pyup-bot
7638df74a9
Update eventlet from 0.22.0 to 0.22.1
2018-02-17 18:25:26 +00:00
pyup-bot
87788d7a84
Update pytest-mock from 1.6.3 to 1.7.0
2018-02-16 21:24:23 +00:00
Leo Hemsted
3556851df9
Merge pull request #1672 from alphagov/org-users
...
Org user DB models
2018-02-16 10:57:27 +00:00
Katie Smith
be8b10a2dd
Merge pull request #1666 from alphagov/remove-unnecessary-code
...
Remove unnecessary code to do with testing service name uniqueness
2018-02-15 16:42:43 +00:00
Katie Smith
a6dae2c81b
Remove unnecessary code to do with testing service name uniqueness
...
notifications-admin has now been changed to always pass the service_id
to the 'service/unique' endpoint. This means we don't need to cover the
case of there being no service_id and the tests can also be updated.
2018-02-15 16:32:09 +00:00
Rebecca Law
c94cbb02b1
Merge pull request #1671 from alphagov/fix-uuid-validation
...
Fix UUID validate in the JSON schema
2018-02-15 14:23:02 +00:00
Leo Hemsted
83b26f4a93
use psycopg2-binary to supress warnings
2018-02-15 14:20:25 +00:00
Leo Hemsted
450deae32a
add user_to_organisation and invited_organisation_users tables
...
similar to user_to_service and invited_users, but without auth types
or permissions
2018-02-15 14:19:24 +00:00
Leo Hemsted
15e31fd6e6
add sms sender to old script
...
we have problems where govuk service is not migrated to sms_senders on new datbases.
update this old script so we don't affect live systems, but when people rebuild their
database from scratch they get the sms sender for govuk notify.
2018-02-15 14:18:22 +00:00
Rebecca Law
52bf6dabcd
The regex to validate uuids was not rejecting uuids with a space at the end.
...
Switched to using a isinstance check on the string.
Added an order by clause to dao_get_template_usage_stats_by_service, it was causing an itermitten failure in the tests.
2018-02-15 13:34:06 +00:00
Chris Hill-Scott
bacfe79501
Merge pull request #1667 from alphagov/wra
...
Add letter logo for Welsh Revenue Authority and East Riding of Yorkshire Council
2018-02-15 12:00:02 +00:00