From 373b4ac27eecb8b2b0c7ade56704442188be22f6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 28 Nov 2023 11:37:19 -0800 Subject: [PATCH 01/15] changed day to year --- app/config_files/templates.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config_files/templates.json b/app/config_files/templates.json index feec10fb0..ec9e172dd 100644 --- a/app/config_files/templates.json +++ b/app/config_files/templates.json @@ -139,7 +139,7 @@ "((service name)) is now live on Notify.gov.", "", "", - "You can send up to ((message limit)) messages per day.", + "You can send up to ((message limit)) messages per year.", "", "", "As a live service, you’ll need to know who to contact if you have a question, or something goes wrong.", From b4a1069c244e2096e74fb8356c79a0be683991eb Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 29 Nov 2023 11:27:39 -0800 Subject: [PATCH 02/15] updated content --- app/config_files/templates.json | 39 ++------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/app/config_files/templates.json b/app/config_files/templates.json index ec9e172dd..3e771a1cc 100644 --- a/app/config_files/templates.json +++ b/app/config_files/templates.json @@ -136,45 +136,10 @@ "Hi ((name)),", "", "", - "((service name)) is now live on Notify.gov.", + "Congratulations, we have received and reviewed your Go Live submission form. ((service name)) is now live on Notify.gov. With your Notify account you now can send messages for the use case outlined in your Go Live submission form.", "", "", - "You can send up to ((message limit)) messages per year.", - "", - "", - "As a live service, you’ll need to know who to contact if you have a question, or something goes wrong.", - "", - "", - "If our system status page shows a problem, then we’ve been alerted and are working on it – you don’t need to contact us.", - "", - "", - "#Problems or questions out of hours", - "", - "", - "We offer out of hours support for emergencies.", - "", - "", - "It’s only an emergency if:", - "", - "* no one in your team can log in", - "", - "* a ‘technical difficulties’ error appears when you try to upload a file", - "", - "* a 500 response code appears when you try to send messages using the API", - "", - "", - "If you have one of these emergencies, email details to:", - "", - "notify-support@gsa.gov", - "", - "", - "^Only use this email address for out of hours emergencies. Don’t share this address with people outside of your team.", - "", - "", - "We’ll get back to you within 30 minutes and give you hourly updates until the problem’s fixed.", - "", - "", - "For non-emergency problems or questions, use our support page and we’ll reply in office hours.", + "If you have any questions or experience any technical issues, please contact your pilot lead.", "", "", "Thanks", From 34d13efb26d89ccbb69122c679ee11507159c8b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:09:35 +0000 Subject: [PATCH 03/15] Bump flake8-bugbear from 23.11.26 to 23.11.28 Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 23.11.26 to 23.11.28. - [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) - [Commits](https://github.com/PyCQA/flake8-bugbear/compare/23.11.26...23.11.28) --- updated-dependencies: - dependency-name: flake8-bugbear dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 8959b6608..eeca279ad 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1238,13 +1238,13 @@ pyflakes = ">=3.1.0,<3.2.0" [[package]] name = "flake8-bugbear" -version = "23.11.26" +version = "23.11.28" description = "A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle." optional = false python-versions = ">=3.8.1" files = [ - {file = "flake8-bugbear-23.11.26.tar.gz", hash = "sha256:8e36119071bab626b6dab834fadd6d03c06090e9b189e67b4905821df8212fee"}, - {file = "flake8_bugbear-23.11.26-py3-none-any.whl", hash = "sha256:55d00c8a3c48c995c1f0ec0df54f8c9cf530c06035ce53975a03517d2e7f53e5"}, + {file = "flake8-bugbear-23.11.28.tar.gz", hash = "sha256:0ba6c44eaa0e4782da94c5c2607159a0e73569369246cd179cc143a0e16b78ba"}, + {file = "flake8_bugbear-23.11.28-py3-none-any.whl", hash = "sha256:8d0f351d954fd860851710cd8b5b28742b2339c0e58848b103418dd9cddb9aa4"}, ] [package.dependencies] @@ -4697,4 +4697,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "10925d79f398afa263501dac8384b2e278bee2fae47a4eafc8ad94dbf8325cbc" +content-hash = "797a91bf6577d3db59e827235080cbce9d8226da47f6dd01dfacd5be798400c7" diff --git a/pyproject.toml b/pyproject.toml index f894c737d..050fe2f36 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,7 +57,7 @@ black = "^23.11.0" cloudfoundry-client = "*" exceptiongroup = "==1.2.0" flake8 = "^6.1.0" -flake8-bugbear = "^23.11.26" +flake8-bugbear = "^23.11.28" freezegun = "^1.2.2" honcho = "*" isort = "^5.12.0" From c5de6dedc0ce225c1a338c8614ae10cc2d778918 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 30 Nov 2023 14:56:30 -0500 Subject: [PATCH 04/15] Update notifications-utils to 0.2.3 This changeset updates the notification-utils dependency to 0.2.3 to address an issue we found with link formatting in our last production release. Signed-off-by: Carlo Costino --- poetry.lock | 20 +++++--------------- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/poetry.lock b/poetry.lock index eeca279ad..859a6b3bf 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2168,16 +2168,6 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -2562,12 +2552,12 @@ requests = ">=2.0.0" [[package]] name = "notifications-utils" -version = "0.2.2" +version = "0.2.3" description = "" optional = false python-versions = ">=3.9,<3.12" files = [] -develop = true +develop = false [package.dependencies] async-timeout = "^4.0.2" @@ -2580,7 +2570,7 @@ certifi = "^2023.7.22" cffi = "^1.16.0" charset-normalizer = "^3.1.0" click = "^8.1.3" -cryptography = "^41.0.4" +cryptography = "^41.0.6" flask = "^2.3.2" flask-redis = "^0.4.0" geojson = "^3.0.1" @@ -2614,7 +2604,7 @@ werkzeug = "^3.0.1" type = "git" url = "https://github.com/GSA/notifications-utils.git" reference = "HEAD" -resolved_reference = "f43dbe3ac846d2a7c06f98120ca4533043d9f864" +resolved_reference = "4cdd67a377f4a6dea1f96b26ba5a1a4bca9afce3" [[package]] name = "numpy" @@ -4697,4 +4687,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "797a91bf6577d3db59e827235080cbce9d8226da47f6dd01dfacd5be798400c7" +content-hash = "488b03d81918c0e9d5e16292fc563b59ddfc72662d85ff98311e81223f0d10a5" diff --git a/pyproject.toml b/pyproject.toml index 050fe2f36..47d576449 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ marshmallow = "==3.20.1" marshmallow-sqlalchemy = "==0.29.0" newrelic = "*" notifications-python-client = "==8.1.0" -notifications-utils = {git = "https://github.com/GSA/notifications-utils.git", develop = true} +notifications-utils = {git = "https://github.com/GSA/notifications-utils.git"} oscrypto = "==1.3.0" packaging = "==23.2" poetry-dotenv-plugin = "==0.2.0" From 0a5deb23c115a4099fd3b7d75fb7c121f839304c Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 1 Dec 2023 12:32:50 -0800 Subject: [PATCH 05/15] added syntax according to documentation --- app/config_files/templates.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config_files/templates.json b/app/config_files/templates.json index feec10fb0..12793f7fa 100644 --- a/app/config_files/templates.json +++ b/app/config_files/templates.json @@ -83,7 +83,7 @@ "To complete your registration for Notify.gov please click the link below", "", "", - "((url))" + "[Join Service] ((url))" ] }, { From f9f2762761045bc9d3dbcf1fa2c95b8945a92057 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 1 Dec 2023 12:35:35 -0800 Subject: [PATCH 06/15] added syntax according to documentation --- app/config_files/templates.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config_files/templates.json b/app/config_files/templates.json index 12793f7fa..a4b509ea7 100644 --- a/app/config_files/templates.json +++ b/app/config_files/templates.json @@ -22,7 +22,7 @@ "", "Click this link to create an account on Notify.gov:", "", - "((url))", + "[Join Service] ((url))", "", "", "This invitation will stop working at midnight tomorrow. This is to keep ((service_name)) secure." From ed5480b5dfbc653e54c0425cfc79fbe0a37919de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 21:29:53 +0000 Subject: [PATCH 07/15] Bump alembic from 1.12.1 to 1.13.0 Bumps [alembic](https://github.com/sqlalchemy/alembic) from 1.12.1 to 1.13.0. - [Release notes](https://github.com/sqlalchemy/alembic/releases) - [Changelog](https://github.com/sqlalchemy/alembic/blob/main/CHANGES) - [Commits](https://github.com/sqlalchemy/alembic/commits) --- updated-dependencies: - dependency-name: alembic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 22 ++++++++++++++++------ pyproject.toml | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 859a6b3bf..a2343c226 100644 --- a/poetry.lock +++ b/poetry.lock @@ -112,13 +112,13 @@ frozenlist = ">=1.1.0" [[package]] name = "alembic" -version = "1.12.1" +version = "1.13.0" description = "A database migration tool for SQLAlchemy." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "alembic-1.12.1-py3-none-any.whl", hash = "sha256:47d52e3dfb03666ed945becb723d6482e52190917fdb47071440cfdba05d92cb"}, - {file = "alembic-1.12.1.tar.gz", hash = "sha256:bca5877e9678b454706347bc10b97cb7d67f300320fa5c3a94423e8266e2823f"}, + {file = "alembic-1.13.0-py3-none-any.whl", hash = "sha256:a23974ea301c3ee52705db809c7413cecd165290c6679b9998dd6c74342ca23a"}, + {file = "alembic-1.13.0.tar.gz", hash = "sha256:ab4b3b94d2e1e5f81e34be8a9b7b7575fc9dd5398fccb0bef351ec9b14872623"}, ] [package.dependencies] @@ -127,7 +127,7 @@ SQLAlchemy = ">=1.3.0" typing-extensions = ">=4" [package.extras] -tz = ["python-dateutil"] +tz = ["backports.zoneinfo"] [[package]] name = "amqp" @@ -2168,6 +2168,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -4687,4 +4697,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "488b03d81918c0e9d5e16292fc563b59ddfc72662d85ff98311e81223f0d10a5" +content-hash = "25133855a5b2dc6b13247326d81896b0062a18e6e25fa02ed891a5f8290f3138" diff --git a/pyproject.toml b/pyproject.toml index 47d576449..de93dadb2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ readme = "README.md" [tool.poetry.dependencies] python = ">=3.9,<3.12" -alembic = "==1.12.1" +alembic = "==1.13.0" amqp = "==5.2.0" beautifulsoup4 = "==4.12.2" boto3 = "^1.29.6" From 5ff7003719d4070ccc47f1b1a50af092ae0c4860 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 1 Dec 2023 14:26:18 -0800 Subject: [PATCH 08/15] convert link to text link --- app/config_files/templates.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config_files/templates.json b/app/config_files/templates.json index a4b509ea7..91230a580 100644 --- a/app/config_files/templates.json +++ b/app/config_files/templates.json @@ -22,7 +22,7 @@ "", "Click this link to create an account on Notify.gov:", "", - "[Join Service] ((url))", + "[Join Service](url)", "", "", "This invitation will stop working at midnight tomorrow. This is to keep ((service_name)) secure." @@ -83,7 +83,7 @@ "To complete your registration for Notify.gov please click the link below", "", "", - "[Join Service] ((url))" + "[Join Service](url)" ] }, { From e7c3716b96e58b06c3df922a8fbd489f52dac18b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 21:42:03 +0000 Subject: [PATCH 09/15] Bump flake8-bugbear from 23.11.28 to 23.12.2 Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 23.11.28 to 23.12.2. - [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) - [Commits](https://github.com/PyCQA/flake8-bugbear/compare/23.11.28...23.12.2) --- updated-dependencies: - dependency-name: flake8-bugbear dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index a2343c226..fa1204c6b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1238,13 +1238,13 @@ pyflakes = ">=3.1.0,<3.2.0" [[package]] name = "flake8-bugbear" -version = "23.11.28" +version = "23.12.2" description = "A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle." optional = false python-versions = ">=3.8.1" files = [ - {file = "flake8-bugbear-23.11.28.tar.gz", hash = "sha256:0ba6c44eaa0e4782da94c5c2607159a0e73569369246cd179cc143a0e16b78ba"}, - {file = "flake8_bugbear-23.11.28-py3-none-any.whl", hash = "sha256:8d0f351d954fd860851710cd8b5b28742b2339c0e58848b103418dd9cddb9aa4"}, + {file = "flake8-bugbear-23.12.2.tar.gz", hash = "sha256:32b2903e22331ae04885dae25756a32a8c666c85142e933f43512a70f342052a"}, + {file = "flake8_bugbear-23.12.2-py3-none-any.whl", hash = "sha256:83324bad4d90fee4bf64dd69c61aff94debf8073fbd807c8b6a36eec7a2f0719"}, ] [package.dependencies] @@ -4697,4 +4697,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "25133855a5b2dc6b13247326d81896b0062a18e6e25fa02ed891a5f8290f3138" +content-hash = "2a2d611c6fe2471a976dcd14d726dd523d06a5d521ed433ffc63544bb7b6a0d0" diff --git a/pyproject.toml b/pyproject.toml index de93dadb2..0c51cc530 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,7 +57,7 @@ black = "^23.11.0" cloudfoundry-client = "*" exceptiongroup = "==1.2.0" flake8 = "^6.1.0" -flake8-bugbear = "^23.11.28" +flake8-bugbear = "^23.12.2" freezegun = "^1.2.2" honcho = "*" isort = "^5.12.0" From 02480d3a1751fa5dd6846664dc2ee162199effd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 21:54:20 +0000 Subject: [PATCH 10/15] Bump moto from 4.2.10 to 4.2.11 Bumps [moto](https://github.com/getmoto/moto) from 4.2.10 to 4.2.11. - [Release notes](https://github.com/getmoto/moto/releases) - [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md) - [Commits](https://github.com/getmoto/moto/compare/4.2.10...4.2.11) --- updated-dependencies: - dependency-name: moto dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index fa1204c6b..1cd60f963 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2298,13 +2298,13 @@ files = [ [[package]] name = "moto" -version = "4.2.10" +version = "4.2.11" description = "" optional = false python-versions = ">=3.7" files = [ - {file = "moto-4.2.10-py2.py3-none-any.whl", hash = "sha256:5cf0736d1f43cb887498d00b00ae522774bfddb7db1f4994fedea65b290b9f0e"}, - {file = "moto-4.2.10.tar.gz", hash = "sha256:92595fe287474a31ac3ef847941ebb097e8ffb0c3d6c106e47cf573db06933b2"}, + {file = "moto-4.2.11-py2.py3-none-any.whl", hash = "sha256:58c12ab9ee69b6a5d1cddf83611ba4071508f07894317c57844b3ae6dc5bcd38"}, + {file = "moto-4.2.11.tar.gz", hash = "sha256:2da62d52eaa765dfe2762c920f0a88a58f3a09e04581c91db967d92faec848f1"}, ] [package.dependencies] @@ -4697,4 +4697,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "2a2d611c6fe2471a976dcd14d726dd523d06a5d521ed433ffc63544bb7b6a0d0" +content-hash = "ca550cc96aa27ec67a307b945f4f7c98811a7e625e28cb9e02b6a4108799b0d7" diff --git a/pyproject.toml b/pyproject.toml index 0c51cc530..fb1ff3d04 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ freezegun = "^1.2.2" honcho = "*" isort = "^5.12.0" jinja2-cli = {version = "==0.8.2", extras = ["yaml"]} -moto = "==4.2.10" +moto = "==4.2.11" pip-audit = "*" pre-commit = "^3.5.0" pytest = "^7.4.3" From fb70e411a976d8b128de2907b223835bd6bd2a5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 22:24:48 +0000 Subject: [PATCH 11/15] Bump freezegun from 1.2.2 to 1.3.1 Bumps [freezegun](https://github.com/spulec/freezegun) from 1.2.2 to 1.3.1. - [Release notes](https://github.com/spulec/freezegun/releases) - [Changelog](https://github.com/spulec/freezegun/blob/master/CHANGELOG) - [Commits](https://github.com/spulec/freezegun/commits/1.3.1) --- updated-dependencies: - dependency-name: freezegun dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 10 +++++----- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 1cd60f963..7dcdddecf 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1378,13 +1378,13 @@ files = [ [[package]] name = "freezegun" -version = "1.2.2" +version = "1.3.1" description = "Let your Python tests travel through time" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "freezegun-1.2.2-py3-none-any.whl", hash = "sha256:ea1b963b993cb9ea195adbd893a48d573fda951b0da64f60883d7e988b606c9f"}, - {file = "freezegun-1.2.2.tar.gz", hash = "sha256:cd22d1ba06941384410cd967d8a99d5ae2442f57dfafeff2fda5de8dc5c05446"}, + {file = "freezegun-1.3.1-py3-none-any.whl", hash = "sha256:065e77a12624d05531afa87ade12a0b9bdb53495c4573893252a055b545ce3ea"}, + {file = "freezegun-1.3.1.tar.gz", hash = "sha256:48984397b3b58ef5dfc645d6a304b0060f612bcecfdaaf45ce8aff0077a6cb6a"}, ] [package.dependencies] @@ -4697,4 +4697,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "ca550cc96aa27ec67a307b945f4f7c98811a7e625e28cb9e02b6a4108799b0d7" +content-hash = "17c933f0534e3b910702de7dc90a23147f3ffb739a7c76a30dcd4ae09db771c6" diff --git a/pyproject.toml b/pyproject.toml index fb1ff3d04..904b256c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ cloudfoundry-client = "*" exceptiongroup = "==1.2.0" flake8 = "^6.1.0" flake8-bugbear = "^23.12.2" -freezegun = "^1.2.2" +freezegun = "^1.3.1" honcho = "*" isort = "^5.12.0" jinja2-cli = {version = "==0.8.2", extras = ["yaml"]} From eea6933712e0b21ba0c14570c6de32e5b6523e6c Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Mon, 4 Dec 2023 14:53:29 -0800 Subject: [PATCH 12/15] notify-admin-931 --- app/models.py | 5 ++++- app/user/rest.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models.py b/app/models.py index d141d8c29..a95b5da02 100644 --- a/app/models.py +++ b/app/models.py @@ -190,7 +190,7 @@ class User(db.Model): return retval def serialize(self): - return { + x = { "id": self.id, "name": self.name, "email_address": self.email_address, @@ -211,7 +211,10 @@ class User(db.Model): "services": [x.id for x in self.services if x.active], "can_use_webauthn": self.can_use_webauthn, "state": self.state, + "preferred_timezone": self.preferred_timezone, } + print(f"X = {x}") + return x def serialize_for_users_list(self): return { diff --git a/app/user/rest.py b/app/user/rest.py index f49f78c57..65c0d4ebe 100644 --- a/app/user/rest.py +++ b/app/user/rest.py @@ -117,6 +117,7 @@ def update_user_attribute(user_id): recipient = user_to_update.mobile_number reply_to = get_sms_reply_to_for_notify_service(recipient, template) else: + print(f"REST1 returns {user_to_update.serialize()}") return jsonify(data=user_to_update.serialize()), 200 service = Service.query.get(current_app.config["NOTIFY_SERVICE_ID"]) @@ -137,6 +138,8 @@ def update_user_attribute(user_id): ) send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY) + + print(f"REST2 returns {user_to_update.serialize()}") return jsonify(data=user_to_update.serialize()), 200 From 3209c6d7239fc5045bab27964e229956b4c2f1b9 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 5 Dec 2023 07:29:18 -0800 Subject: [PATCH 13/15] remove print statements --- app/models.py | 4 +--- app/user/rest.py | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models.py b/app/models.py index a95b5da02..ae2a2d552 100644 --- a/app/models.py +++ b/app/models.py @@ -190,7 +190,7 @@ class User(db.Model): return retval def serialize(self): - x = { + return { "id": self.id, "name": self.name, "email_address": self.email_address, @@ -213,8 +213,6 @@ class User(db.Model): "state": self.state, "preferred_timezone": self.preferred_timezone, } - print(f"X = {x}") - return x def serialize_for_users_list(self): return { diff --git a/app/user/rest.py b/app/user/rest.py index 65c0d4ebe..25714d94a 100644 --- a/app/user/rest.py +++ b/app/user/rest.py @@ -117,7 +117,6 @@ def update_user_attribute(user_id): recipient = user_to_update.mobile_number reply_to = get_sms_reply_to_for_notify_service(recipient, template) else: - print(f"REST1 returns {user_to_update.serialize()}") return jsonify(data=user_to_update.serialize()), 200 service = Service.query.get(current_app.config["NOTIFY_SERVICE_ID"]) @@ -139,7 +138,6 @@ def update_user_attribute(user_id): send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY) - print(f"REST2 returns {user_to_update.serialize()}") return jsonify(data=user_to_update.serialize()), 200 From c57c4639d009cebec51af7eeeb08a713aaa95b68 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 5 Dec 2023 12:24:06 -0800 Subject: [PATCH 14/15] add migration to fix preferred timezone --- .../versions/0407_fix_preferred_timezone.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 migrations/versions/0407_fix_preferred_timezone.py diff --git a/migrations/versions/0407_fix_preferred_timezone.py b/migrations/versions/0407_fix_preferred_timezone.py new file mode 100644 index 000000000..441b4dcef --- /dev/null +++ b/migrations/versions/0407_fix_preferred_timezone.py @@ -0,0 +1,18 @@ +""" + +Revises: 0406_adjust_agreement_model + +""" +from alembic import op + +down_revision = "0406_adjust_agreement_model" +revision = "0407_fix_preferred_timezone" + + +def upgrade(): + op.execute("update users set preferred_timezone='US/Eastern' where preferred_timezone=''") + + + +def downgrade(): + pass From 38ea0b1405dfa1f912e215d7e86c67b959fbe742 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 5 Dec 2023 13:26:03 -0800 Subject: [PATCH 15/15] fix again --- migrations/versions/0408_fix_timezone_again.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 migrations/versions/0408_fix_timezone_again.py diff --git a/migrations/versions/0408_fix_timezone_again.py b/migrations/versions/0408_fix_timezone_again.py new file mode 100644 index 000000000..b39cb0191 --- /dev/null +++ b/migrations/versions/0408_fix_timezone_again.py @@ -0,0 +1,18 @@ +""" + +Revises: 0407_fix_preferred_timezone + +""" +from alembic import op + +down_revision = "0407_fix_preferred_timezone" +revision = "0408_fix_timezone_again" + + +def upgrade(): + op.execute("update users set preferred_timezone='US/Eastern' where (preferred_timezone='') is not false") + + + +def downgrade(): + pass