mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-07-25 02:19:12 -04:00
* Update QA checklist * Bump cachetools from 6.2.1 to 6.2.2 (#3099) Bumps [cachetools](https://github.com/tkem/cachetools) from 6.2.1 to 6.2.2. - [Changelog](https://github.com/tkem/cachetools/blob/master/CHANGELOG.rst) - [Commits](https://github.com/tkem/cachetools/compare/v6.2.1...v6.2.2) --- updated-dependencies: - dependency-name: cachetools dependency-version: 6.2.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump moto from 5.1.16 to 5.1.17 (#3104) Bumps [moto](https://github.com/getmoto/moto) from 5.1.16 to 5.1.17. - [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/5.1.16...5.1.17) --- updated-dependencies: - dependency-name: moto dependency-version: 5.1.17 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump numpy from 2.3.4 to 2.3.5 (#3103) Bumps [numpy](https://github.com/numpy/numpy) from 2.3.4 to 2.3.5. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v2.3.4...v2.3.5) --- updated-dependencies: - dependency-name: numpy dependency-version: 2.3.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump hypothesis from 6.147.0 to 6.148.1 (#3101) Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.147.0 to 6.148.1. - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.147.0...hypothesis-python-6.148.1) --- updated-dependencies: - dependency-name: hypothesis dependency-version: 6.148.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump js-yaml (#3100) Bumps and [js-yaml](https://github.com/nodeca/js-yaml). These dependencies needed to be updated together. Updates `js-yaml` from 4.1.0 to 4.1.1 - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/4.1.0...4.1.1) Updates `js-yaml` from 3.14.1 to 3.14.2 - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/4.1.0...4.1.1) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 4.1.1 dependency-type: indirect - dependency-name: js-yaml dependency-version: 3.14.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump click from 8.3.0 to 8.3.1 (#3102) Bumps [click](https://github.com/pallets/click) from 8.3.0 to 8.3.1. - [Release notes](https://github.com/pallets/click/releases) - [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/click/compare/8.3.0...8.3.1) --- updated-dependencies: - dependency-name: click dependency-version: 8.3.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump coverage from 7.11.3 to 7.12.0 (#3109) Bumps [coverage](https://github.com/coveragepy/coveragepy) from 7.11.3 to 7.12.0. - [Release notes](https://github.com/coveragepy/coveragepy/releases) - [Changelog](https://github.com/coveragepy/coveragepy/blob/main/CHANGES.rst) - [Commits](https://github.com/coveragepy/coveragepy/compare/7.11.3...7.12.0) --- updated-dependencies: - dependency-name: coverage dependency-version: 7.12.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump hypothesis from 6.148.1 to 6.148.2 (#3108) Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.148.1 to 6.148.2. - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.148.1...hypothesis-python-6.148.2) --- updated-dependencies: - dependency-name: hypothesis dependency-version: 6.148.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump webpack from 5.102.1 to 5.103.0 (#3107) Bumps [webpack](https://github.com/webpack/webpack) from 5.102.1 to 5.103.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.102.1...v5.103.0) --- updated-dependencies: - dependency-name: webpack dependency-version: 5.103.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sass from 1.94.0 to 1.94.1 (#3106) Bumps [sass](https://github.com/sass/dart-sass) from 1.94.0 to 1.94.1. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.94.0...1.94.1) --- updated-dependencies: - dependency-name: sass dependency-version: 1.94.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump bandit from 1.8.6 to 1.9.1 (#3105) Bumps [bandit](https://github.com/PyCQA/bandit) from 1.8.6 to 1.9.1. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.8.6...1.9.1) --- updated-dependencies: - dependency-name: bandit dependency-version: 1.9.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * improve test coverage * org test * test coverage * Bump sass from 1.94.1 to 1.94.2 (#3123) Bumps [sass](https://github.com/sass/dart-sass) from 1.94.1 to 1.94.2. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.94.1...1.94.2) --- updated-dependencies: - dependency-name: sass dependency-version: 1.94.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump redis from 7.0.1 to 7.1.0 (#3122) Bumps [redis](https://github.com/redis/redis-py) from 7.0.1 to 7.1.0. - [Release notes](https://github.com/redis/redis-py/releases) - [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES) - [Commits](https://github.com/redis/redis-py/compare/v7.0.1...v7.1.0) --- updated-dependencies: - dependency-name: redis dependency-version: 7.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump phonenumbers from 9.0.18 to 9.0.19 (#3127) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 9.0.18 to 9.0.19. - [Commits](https://github.com/daviddrysdale/python-phonenumbers/compare/v9.0.18...v9.0.19) --- updated-dependencies: - dependency-name: phonenumbers dependency-version: 9.0.19 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump exceptiongroup from 1.3.0 to 1.3.1 (#3128) Bumps [exceptiongroup](https://github.com/agronholm/exceptiongroup) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/agronholm/exceptiongroup/releases) - [Changelog](https://github.com/agronholm/exceptiongroup/blob/main/CHANGES.rst) - [Commits](https://github.com/agronholm/exceptiongroup/compare/1.3.0...1.3.1) --- updated-dependencies: - dependency-name: exceptiongroup dependency-version: 1.3.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Security update (#3129) * Bump pytest-playwright from 0.7.1 to 0.7.2 (#3133) Bumps [pytest-playwright](https://github.com/microsoft/playwright-pytest) from 0.7.1 to 0.7.2. - [Release notes](https://github.com/microsoft/playwright-pytest/releases) - [Commits](https://github.com/microsoft/playwright-pytest/compare/v0.7.1...v0.7.2) --- updated-dependencies: - dependency-name: pytest-playwright dependency-version: 0.7.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump bandit from 1.9.1 to 1.9.2 (#3131) Bumps [bandit](https://github.com/PyCQA/bandit) from 1.9.1 to 1.9.2. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.9.1...1.9.2) --- updated-dependencies: - dependency-name: bandit dependency-version: 1.9.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pre-commit from 4.4.0 to 4.5.0 (#3132) Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v4.4.0...v4.5.0) --- updated-dependencies: - dependency-name: pre-commit dependency-version: 4.5.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytest from 8.4.2 to 9.0.1 (#3130) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.4.2 to 9.0.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.4.2...9.0.1) --- updated-dependencies: - dependency-name: pytest dependency-version: 9.0.1 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump playwright from 1.56.1 to 1.57.0 (#3134) Bumps [playwright](https://github.com/microsoft/playwright) from 1.56.1 to 1.57.0. - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.56.1...v1.57.0) --- updated-dependencies: - dependency-name: playwright dependency-version: 1.57.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump hypothesis from 6.148.2 to 6.148.3 (#3136) Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.148.2 to 6.148.3. - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.148.2...hypothesis-python-6.148.3) --- updated-dependencies: - dependency-name: hypothesis dependency-version: 6.148.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump werkzeug from 3.1.3 to 3.1.4 (#3143) Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/3.1.3...3.1.4) --- updated-dependencies: - dependency-name: werkzeug dependency-version: 3.1.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump hypothesis from 6.148.3 to 6.148.5 (#3138) Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.148.3 to 6.148.5. - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.148.3...hypothesis-python-6.148.5) --- updated-dependencies: - dependency-name: hypothesis dependency-version: 6.148.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump flake8-bugbear from 25.10.21 to 25.11.29 (#3141) Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 25.10.21 to 25.11.29. - [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) - [Commits](https://github.com/PyCQA/flake8-bugbear/compare/25.10.21...25.11.29) --- updated-dependencies: - dependency-name: flake8-bugbear dependency-version: 25.11.29 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump beautifulsoup4 from 4.14.2 to 4.14.3 (#3137) Bumps [beautifulsoup4](https://www.crummy.com/software/BeautifulSoup/bs4/) from 4.14.2 to 4.14.3. --- updated-dependencies: - dependency-name: beautifulsoup4 dependency-version: 4.14.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump hypothesis from 6.148.5 to 6.148.6 (#3145) Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.148.5 to 6.148.6. - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.148.5...hypothesis-python-6.148.6) --- updated-dependencies: - dependency-name: hypothesis dependency-version: 6.148.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump urllib3 from 2.5.0 to 2.6.0 (#3146) Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/2.5.0...2.6.0) --- updated-dependencies: - dependency-name: urllib3 dependency-version: 2.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump phonenumbers from 9.0.19 to 9.0.20 (#3149) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 9.0.19 to 9.0.20. - [Commits](https://github.com/daviddrysdale/python-phonenumbers/compare/v9.0.19...v9.0.20) --- updated-dependencies: - dependency-name: phonenumbers dependency-version: 9.0.20 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump hypothesis from 6.148.6 to 6.148.7 (#3148) Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.148.6 to 6.148.7. - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.148.6...hypothesis-python-6.148.7) --- updated-dependencies: - dependency-name: hypothesis dependency-version: 6.148.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove SMS Total Message Limit from Org Dash (#3144) * Remove SMS Total Message Limit from Org Dash * update text * pytest * Fix dependabot prs (#3151) * Bump terser-webpack-plugin from 5.3.14 to 5.3.15 Bumps [terser-webpack-plugin](https://github.com/webpack/terser-webpack-plugin) from 5.3.14 to 5.3.15. - [Release notes](https://github.com/webpack/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack/terser-webpack-plugin/blob/main/CHANGELOG.md) - [Commits](https://github.com/webpack/terser-webpack-plugin/compare/v5.3.14...v5.3.15) --- updated-dependencies: - dependency-name: terser-webpack-plugin dependency-version: 5.3.15 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump moto from 5.1.17 to 5.1.18 Bumps [moto](https://github.com/getmoto/moto) from 5.1.17 to 5.1.18. - [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/5.1.17...5.1.18) --- updated-dependencies: - dependency-name: moto dependency-version: 5.1.18 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump pip-audit from 2.9.0 to 2.10.0 Bumps [pip-audit](https://github.com/pypa/pip-audit) from 2.9.0 to 2.10.0. - [Release notes](https://github.com/pypa/pip-audit/releases) - [Changelog](https://github.com/pypa/pip-audit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pypa/pip-audit/compare/v2.9.0...v2.10.0) --- updated-dependencies: - dependency-name: pip-audit dependency-version: 2.10.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 3110 dashboard design feedback & permission changes (#3142) * update org dashboard * allowing org admins to access serviecs within an org * fix test * Allow org admin to send messages within a service * Bump coverage from 7.12.0 to 7.13.0 (#3159) Bumps [coverage](https://github.com/coveragepy/coveragepy) from 7.12.0 to 7.13.0. - [Release notes](https://github.com/coveragepy/coveragepy/releases) - [Changelog](https://github.com/coveragepy/coveragepy/blob/main/CHANGES.rst) - [Commits](https://github.com/coveragepy/coveragepy/compare/7.12.0...7.13.0) --- updated-dependencies: - dependency-name: coverage dependency-version: 7.13.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytest from 9.0.1 to 9.0.2 (#3158) Bumps [pytest](https://github.com/pytest-dev/pytest) from 9.0.1 to 9.0.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/9.0.1...9.0.2) --- updated-dependencies: - dependency-name: pytest dependency-version: 9.0.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sass from 1.94.2 to 1.95.0 (#3157) Bumps [sass](https://github.com/sass/dart-sass) from 1.94.2 to 1.95.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.94.2...1.95.0) --- updated-dependencies: - dependency-name: sass dependency-version: 1.95.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump black from 25.11.0 to 25.12.0 (#3155) Bumps [black](https://github.com/psf/black) from 25.11.0 to 25.12.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/25.11.0...25.12.0) --- updated-dependencies: - dependency-name: black dependency-version: 25.12.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump urllib3 from 2.6.0 to 2.6.1 (#3156) Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/2.6.0...2.6.1) --- updated-dependencies: - dependency-name: urllib3 dependency-version: 2.6.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Beverly Nguyen <Beverly.Nguyen@gsa.gov> Co-authored-by: ccostino <ccostino@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Beverly Nguyen <53159604+heyitsmebev@users.noreply.github.com>
444 lines
14 KiB
Python
444 lines
14 KiB
Python
import calendar
|
|
from datetime import datetime, timedelta
|
|
from functools import partial
|
|
from itertools import groupby
|
|
from zoneinfo import ZoneInfo
|
|
|
|
from flask import abort, jsonify, render_template, request, session, url_for
|
|
from flask_login import current_user
|
|
from werkzeug.utils import redirect
|
|
|
|
from app import (
|
|
billing_api_client,
|
|
job_api_client,
|
|
service_api_client,
|
|
template_statistics_client,
|
|
)
|
|
from app.enums import JobStatus, NotificationStatus, ServicePermission
|
|
from app.main import main
|
|
from app.main.views.user_profile import set_timezone
|
|
from app.statistics_utils import get_formatted_percentage
|
|
from app.utils import DELIVERED_STATUSES, FAILURE_STATUSES, REQUESTED_STATUSES
|
|
from app.utils.time import get_current_financial_year
|
|
from app.utils.user import user_has_permissions
|
|
|
|
|
|
@main.route("/services/<uuid:service_id>/dashboard")
|
|
@user_has_permissions(ServicePermission.VIEW_ACTIVITY, ServicePermission.SEND_MESSAGES, allow_org_user=True)
|
|
def old_service_dashboard(service_id):
|
|
return redirect(url_for(".service_dashboard", service_id=service_id))
|
|
|
|
|
|
@main.route("/services/<uuid:service_id>")
|
|
@user_has_permissions(allow_org_user=True)
|
|
def service_dashboard(service_id):
|
|
|
|
if session.get("invited_user_id"):
|
|
session.pop("invited_user_id", None)
|
|
session["service_id"] = service_id
|
|
|
|
if not current_user.has_permissions(ServicePermission.VIEW_ACTIVITY):
|
|
return redirect(url_for("main.choose_template", service_id=service_id))
|
|
|
|
job_response = job_api_client.get_jobs(service_id)["data"]
|
|
service_data_retention_days = 8
|
|
|
|
active_jobs = [
|
|
job for job in job_response if job["job_status"] != JobStatus.CANCELLED
|
|
]
|
|
job_lists = [
|
|
{**job_dict, "finished_processing": job_is_finished(job_dict)}
|
|
for job_dict in active_jobs
|
|
]
|
|
|
|
total_messages = service_api_client.get_service_message_ratio(service_id)
|
|
messages_remaining = total_messages.get("messages_remaining", 0)
|
|
messages_sent = total_messages.get("messages_sent", 0)
|
|
all_statistics = template_statistics_client.get_template_statistics_for_service(
|
|
service_id, limit_days=8
|
|
)
|
|
template_statistics = aggregate_template_usage(all_statistics)
|
|
return render_template(
|
|
"views/dashboard/dashboard.html",
|
|
jobs=job_lists,
|
|
service_data_retention_days=service_data_retention_days,
|
|
messages_remaining=messages_remaining,
|
|
messages_sent=messages_sent,
|
|
template_statistics=template_statistics,
|
|
most_used_template_count=max(
|
|
[row["count"] for row in template_statistics] or [0]
|
|
),
|
|
)
|
|
|
|
|
|
def job_is_finished(job_dict):
|
|
done_statuses = (
|
|
DELIVERED_STATUSES + FAILURE_STATUSES + [NotificationStatus.CANCELLED]
|
|
)
|
|
processed_count = sum(
|
|
stat["count"]
|
|
for stat in job_dict["statistics"]
|
|
if stat["status"] in done_statuses
|
|
)
|
|
return job_dict["notification_count"] == processed_count
|
|
|
|
|
|
@main.route("/services/<uuid:service_id>/daily-stats.json")
|
|
@user_has_permissions(allow_org_user=True)
|
|
def get_daily_stats(service_id):
|
|
date_range = get_stats_date_range()
|
|
days = date_range["days"]
|
|
user_timezone = request.args.get("timezone", "UTC")
|
|
|
|
stats_utc = service_api_client.get_service_notification_statistics_by_day(
|
|
service_id,
|
|
start_date=date_range["start_date"],
|
|
days=days,
|
|
)
|
|
|
|
local_stats = get_local_daily_stats_for_last_x_days(stats_utc, user_timezone, days)
|
|
return jsonify(local_stats)
|
|
|
|
|
|
def get_local_daily_stats_for_last_x_days(stats_utc, user_timezone, days):
|
|
tz = ZoneInfo(user_timezone)
|
|
today_local = datetime.now(tz).date()
|
|
start_local = today_local - timedelta(days=days - 1)
|
|
|
|
# Generate exactly days local dates, each with zeroed stats
|
|
days_list = [
|
|
(start_local + timedelta(days=i)).strftime("%Y-%m-%d") for i in range(days)
|
|
]
|
|
aggregator = {
|
|
d: {
|
|
"sms": {
|
|
NotificationStatus.DELIVERED: 0,
|
|
"failure": 0,
|
|
NotificationStatus.PENDING: 0,
|
|
"requested": 0,
|
|
},
|
|
"email": {
|
|
NotificationStatus.DELIVERED: 0,
|
|
"failure": 0,
|
|
NotificationStatus.PENDING: 0,
|
|
"requested": 0,
|
|
},
|
|
}
|
|
for d in days_list
|
|
}
|
|
|
|
# Convert each UTC timestamp to local date and iterate
|
|
for utc_ts, data in stats_utc.items():
|
|
utc_dt = datetime.strptime(utc_ts, "%Y-%m-%dT%H:%M:%SZ").replace(
|
|
tzinfo=ZoneInfo("UTC")
|
|
)
|
|
local_day = utc_dt.astimezone(tz).strftime("%Y-%m-%d")
|
|
|
|
if local_day in aggregator:
|
|
for msg_type in ["sms", "email"]:
|
|
for status in [
|
|
NotificationStatus.DELIVERED,
|
|
"failure",
|
|
NotificationStatus.PENDING,
|
|
"requested",
|
|
]:
|
|
aggregator[local_day][msg_type][status] += data[msg_type][status]
|
|
|
|
return aggregator
|
|
|
|
|
|
@main.route("/services/<uuid:service_id>/daily-stats-by-user.json")
|
|
@user_has_permissions(allow_org_user=True)
|
|
def get_daily_stats_by_user(service_id):
|
|
date_range = get_stats_date_range()
|
|
days = date_range["days"]
|
|
user_timezone = request.args.get("timezone", "UTC")
|
|
|
|
stats_utc = service_api_client.get_user_service_notification_statistics_by_day(
|
|
service_id,
|
|
user_id=current_user.id,
|
|
start_date=date_range["start_date"],
|
|
days=days,
|
|
)
|
|
|
|
local_stats = get_local_daily_stats_for_last_x_days(stats_utc, user_timezone, days)
|
|
return jsonify(local_stats)
|
|
|
|
|
|
@main.route("/services/<uuid:service_id>/template-usage")
|
|
@user_has_permissions(ServicePermission.VIEW_ACTIVITY, allow_org_user=True)
|
|
def template_usage(service_id):
|
|
year, current_financial_year = requested_and_current_financial_year(request)
|
|
stats = template_statistics_client.get_monthly_template_usage_for_service(
|
|
service_id, year
|
|
)
|
|
|
|
stats = sorted(stats, key=lambda x: (x["count"]), reverse=True)
|
|
|
|
def get_monthly_template_stats(month_name, stats):
|
|
return {
|
|
"name": month_name,
|
|
"templates_used": [
|
|
{
|
|
"id": stat["template_id"],
|
|
"name": stat["name"],
|
|
"type": stat["type"],
|
|
"requested_count": stat["count"],
|
|
}
|
|
for stat in stats
|
|
if calendar.month_name[int(stat["month"])] == month_name
|
|
],
|
|
}
|
|
|
|
months = [
|
|
get_monthly_template_stats(month, stats)
|
|
for month in get_months_for_financial_year(year, time_format="%B")
|
|
]
|
|
months.reverse()
|
|
|
|
# Get the year from stats
|
|
# If the year is this year, remove months in the future
|
|
if len(stats) > 0:
|
|
stat_year = stats[0]["year"]
|
|
current_year = datetime.now().year
|
|
current_month_num = datetime.now().month
|
|
new_months = []
|
|
if stat_year == current_year:
|
|
for m in months:
|
|
|
|
month_num_full = datetime.strptime(m["name"], "%B").month
|
|
if month_num_full <= current_month_num:
|
|
new_months.append(m)
|
|
months = new_months
|
|
|
|
return render_template(
|
|
"views/dashboard/all-template-statistics.html",
|
|
months=months,
|
|
stats=stats,
|
|
most_used_template_count=max(
|
|
(
|
|
max(
|
|
(
|
|
template["requested_count"]
|
|
for template in month["templates_used"]
|
|
),
|
|
default=0,
|
|
)
|
|
for month in months
|
|
),
|
|
default=0,
|
|
),
|
|
years=get_tuples_of_financial_years(
|
|
partial(url_for, ".template_usage", service_id=service_id),
|
|
start=current_financial_year - 2,
|
|
end=current_financial_year,
|
|
),
|
|
selected_year=year,
|
|
)
|
|
|
|
|
|
@main.route("/services/<uuid:service_id>/usage")
|
|
@user_has_permissions(ServicePermission.MANAGE_SERVICE, allow_org_user=True)
|
|
def usage(service_id):
|
|
year, current_financial_year = requested_and_current_financial_year(request)
|
|
|
|
free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(
|
|
service_id
|
|
)
|
|
|
|
units = billing_api_client.get_monthly_usage_for_service(service_id, year)
|
|
|
|
yearly_usage = billing_api_client.get_annual_usage_for_service(service_id, year)
|
|
|
|
more_stats = format_monthly_stats_to_list(
|
|
service_api_client.get_monthly_notification_stats(service_id, year)["data"]
|
|
)
|
|
return render_template(
|
|
"views/usage.html",
|
|
months=list(get_monthly_usage_breakdown(year, units, more_stats)),
|
|
selected_year=year,
|
|
years=get_tuples_of_financial_years(
|
|
partial(url_for, ".usage", service_id=service_id),
|
|
start=current_financial_year - 2,
|
|
end=current_financial_year,
|
|
),
|
|
**get_annual_usage_breakdown(yearly_usage, free_sms_allowance),
|
|
)
|
|
|
|
|
|
def filter_out_cancelled_stats(template_statistics):
|
|
return [
|
|
s for s in template_statistics if s["status"] != NotificationStatus.CANCELLED
|
|
]
|
|
|
|
|
|
def aggregate_template_usage(template_statistics, sort_key="count"):
|
|
template_statistics = filter_out_cancelled_stats(template_statistics)
|
|
templates = []
|
|
for k, v in groupby(
|
|
sorted(template_statistics, key=lambda x: x["template_id"]),
|
|
key=lambda x: x["template_id"],
|
|
):
|
|
template_stats = list(v)
|
|
first_stat = template_stats[0] if template_stats else None
|
|
templates.append(
|
|
{
|
|
"template_id": k,
|
|
"template_name": first_stat.get("template_name"),
|
|
"template_type": first_stat.get("template_type"),
|
|
"count": sum(s["count"] for s in template_stats),
|
|
"created_by": first_stat.get("created_by"),
|
|
"created_by_id": first_stat.get("created_by_id"),
|
|
"last_used": first_stat.get("last_used"),
|
|
"status": first_stat.get("status"),
|
|
"template_folder": first_stat.get("template_folder"),
|
|
"template_folder_id": first_stat.get("template_folder_id"),
|
|
}
|
|
)
|
|
|
|
return sorted(templates, key=lambda x: x[sort_key], reverse=True)
|
|
|
|
|
|
def get_dashboard_totals(statistics):
|
|
|
|
for msg_type in statistics.values():
|
|
msg_type["failed_percentage"] = get_formatted_percentage(
|
|
msg_type[NotificationStatus.FAILED], msg_type["requested"]
|
|
)
|
|
msg_type["show_warning"] = float(msg_type["failed_percentage"]) > 3
|
|
|
|
return statistics
|
|
|
|
|
|
def get_annual_usage_breakdown(usage, free_sms_fragment_limit):
|
|
sms = get_usage_breakdown_by_type(usage, "sms")
|
|
sms_chargeable_units = sum(row["chargeable_units"] for row in sms)
|
|
sms_free_allowance = free_sms_fragment_limit
|
|
sms_cost = sum(row["cost"] for row in sms)
|
|
|
|
emails = get_usage_breakdown_by_type(usage, "email")
|
|
emails_sent = sum(row["notifications_sent"] for row in emails)
|
|
|
|
return {
|
|
"emails_sent": emails_sent,
|
|
"sms_free_allowance": sms_free_allowance,
|
|
"sms_sent": sms_chargeable_units,
|
|
"sms_allowance_remaining": max(0, (sms_free_allowance - sms_chargeable_units)),
|
|
"sms_cost": sms_cost,
|
|
"sms_breakdown": sms,
|
|
}
|
|
|
|
|
|
def format_monthly_stats_to_list(historical_stats):
|
|
return sorted(
|
|
(
|
|
dict(
|
|
date=key,
|
|
future=yyyy_mm_to_datetime(key) > datetime.utcnow(),
|
|
name=yyyy_mm_to_datetime(key).strftime("%B"),
|
|
**aggregate_status_types(value),
|
|
)
|
|
for key, value in historical_stats.items()
|
|
),
|
|
key=lambda x: x["date"],
|
|
)
|
|
|
|
|
|
def yyyy_mm_to_datetime(string):
|
|
return datetime(int(string[0:4]), int(string[5:7]), 1)
|
|
|
|
|
|
def aggregate_status_types(counts_dict):
|
|
return get_dashboard_totals(
|
|
{
|
|
"{}_counts".format(message_type): {
|
|
NotificationStatus.FAILED: sum(
|
|
stats.get(status, 0) for status in FAILURE_STATUSES
|
|
),
|
|
"requested": sum(stats.get(status, 0) for status in REQUESTED_STATUSES),
|
|
}
|
|
for message_type, stats in counts_dict.items()
|
|
}
|
|
)
|
|
|
|
|
|
def get_months_for_financial_year(year, time_format="%B"):
|
|
return [month.strftime(time_format) for month in (get_months_for_year(1, 13, year))]
|
|
|
|
|
|
def get_current_month_for_financial_year(year):
|
|
# Setting the timezone here because we need to set it somewhere.
|
|
set_timezone()
|
|
current_month = datetime.now().month
|
|
return current_month
|
|
|
|
|
|
def get_stats_date_range():
|
|
current_financial_year = get_current_financial_year()
|
|
current_month = get_current_month_for_financial_year(current_financial_year)
|
|
start_date = datetime.now().strftime("%Y-%m-%d")
|
|
days = 8
|
|
return {
|
|
"current_financial_year": current_financial_year,
|
|
"current_month": current_month,
|
|
"start_date": start_date,
|
|
"days": days,
|
|
}
|
|
|
|
|
|
def get_months_for_year(start, end, year):
|
|
return [datetime(year, month, 1) for month in range(start, end)]
|
|
|
|
|
|
def get_usage_breakdown_by_type(usage, notification_type):
|
|
return [row for row in usage if row["notification_type"] == notification_type]
|
|
|
|
|
|
def get_monthly_usage_breakdown(year, monthly_usage, more_stats):
|
|
sms = get_usage_breakdown_by_type(monthly_usage, "sms")
|
|
|
|
for month in get_months_for_financial_year(year):
|
|
monthly_sms = [row for row in sms if row["month"] == month]
|
|
sms_free_allowance_used = sum(row["free_allowance_used"] for row in monthly_sms)
|
|
sms_cost = sum(row["cost"] for row in monthly_sms)
|
|
sms_breakdown = [row for row in monthly_sms if row["charged_units"]]
|
|
sms_counts = [
|
|
row["sms_counts"]
|
|
for row in more_stats
|
|
if row["sms_counts"] and row["name"] == month
|
|
]
|
|
|
|
yield {
|
|
"month": month,
|
|
"sms_free_allowance_used": sms_free_allowance_used,
|
|
"sms_breakdown": sms_breakdown,
|
|
"sms_cost": sms_cost,
|
|
"sms_counts": sms_counts,
|
|
}
|
|
|
|
|
|
def requested_and_current_financial_year(request):
|
|
try:
|
|
return (
|
|
int(request.args.get("year", get_current_financial_year())),
|
|
get_current_financial_year(),
|
|
)
|
|
except ValueError:
|
|
abort(404)
|
|
|
|
|
|
def get_tuples_of_financial_years(
|
|
partial_url,
|
|
start=2015,
|
|
end=None,
|
|
):
|
|
return (
|
|
(
|
|
"fiscal year",
|
|
year,
|
|
partial_url(year=year),
|
|
"{} to {}".format(year, year + 1),
|
|
)
|
|
for year in reversed(range(start, end + 1))
|
|
)
|