Merge branch 'develop' into hotfix/gpg-key-rename

.circleci/config.yml

@@ -8,7 +8,7 @@ orbs:
 executors:
   docker-executor:
     docker:
-      - image: cimg/python:3.10.4
+      - image: cimg/python:3.10.8
         user: root
   machine-executor:
     machine:

docs/Product-Strategy/Roadmap-and-Backlog.md

@@ -29,7 +29,7 @@ This is the first release to the production environment including the ATO and re
 
 
 ## Release 2: Pilot Release
-This release will allow users to securely upload data into our system in production, replacing a less secure way of doing so, while increasing communication with the users and not increasing burden for OFA Admin staff. This release will allow approximately 15 STTs to pilot the use of login, upload, and download of files, while maintaining TDRS on the backend. While this type of workflow isn't our long term workflow, including it at this point delivers value to the users more quickly and provides the team valuable user feedback to validate and improve the application features. 
+This release will allow users to securely upload data into our system in production, replacing a less secure way of doing so, while increasing communication with the users and not increasing burden for OFA Admin staff. This release will allow approximately 20 STTs to pilot the use of login, upload, and download of files, while maintaining TDRS on the backend. While this type of workflow isn't our long term workflow, including it at this point delivers value to the users more quickly and provides the team valuable user feedback to validate and improve the application features. 
 
 
 | Outcome |
@@ -40,12 +40,11 @@ This release will allow users to securely upload data into our system in product
 | Users can resubmit files with error fixes. |
 | Users will receive email notifications on the status of their account and data. |
 | Users can differentiate TANF and SSP files upon submission. |
-| A research oriented TDP environment is created. |
 
 
 
 ## Release 3: Parity, Data Parsing, Automated Status, Notifications
-This release will parse and validate submitted data and store accepted data in a database. This workflow will include additional automated email notifications and user-friendly in-app error messages to help users better understand their data errors and submission history. This release will also include Django admin enhancements and onboard all users as it will meet parity with the legacy TANF Data Reporting System.
+This major release will parse and validate submitted data and store accepted data in a database. This workflow will include additional automated email notifications and user-friendly in-app error messages to help users better understand their data errors and submission history. This release will also include Django admin enhancements and onboard all users as it will meet parity with the legacy TANF Data Reporting System.
 
 | Outcome |
 | -------- | 
@@ -54,7 +53,9 @@ This release will parse and validate submitted data and store accepted data in a
 | Users receive easy to understand error messages. |
 | Users can view their submission history. |
 | All users will submit all of their data through TDP . |
+| Users will receive email notifications on the state of their submitted data. |
 | TDP enhancements for System administrator users. |
+| A research oriented TDP environment is created. |
 
 
 ## Release 4 and Beyond

docs/Sprint-Review/sprint-59-summary.md

@@ -0,0 +1,53 @@
+# Sprint 59 Summary
+10/26/22-11/08/22
+Velocity: 28
+## Sprint Goals
+* Complete the v2 email notifications, SSP vs. TANF data differentiation and update the knowledge center in preparation for the v2.2 pilot expansion.
+
+
+
+## Tickets
+### Closed/Merged/Completed (Done/Demo, Closed)
+* [#992 - As an OFA admin/STT user, I want to be notified if I change selections after a file has been uploaded but not yet submitted](https://github.com/raft-tech/TANF-app/issues/992)
+* [#1755 As an STT data analyst, I need to tell TDP which data report I am uploading](https://github.com/raft-tech/TANF-app/issues/1755)
+* [#1844 - As a TDP user, I want to be notified when my account will soon be deactivated](https://github.com/raft-tech/TANF-app/issues/1844)
+* [#1845 - As a STT Data Analyst, I want to be notified when data for my program has been submitted.](https://github.com/raft-tech/TANF-app/issues/1845)
+* [#2083 - As django admin, I need to manually set pilot users to approved](https://github.com/raft-tech/TANF-app/issues/2083)
+* [#2132 - Knowledge center documentation for common onboarding problems](https://github.com/raft-tech/TANF-app/issues/2132)
+* [#2140 - As a grantee user submitting data I always want to see the confirmation/error message](https://github.com/raft-tech/TANF-app/issues/2140)
+* [#2154 - As a user, I need the filename for SSP section to be correctly assigned after uploading the file](https://github.com/raft-tech/TANF-app/issues/2154)
+* [#2239 - As an admin, I need to see the correct string representation of data file fiscal period in LogEntry mode](https://github.com/raft-tech/TANF-app/issues/2239)
+
+### Ready to Merge
+* N/A
+
+### Submitted (QASP Review, OCIO Review)
+* [#1351 - Elasticsearch - Define Index Mappings (TANF Section 1)](https://github.com/raft-tech/TANF-app/issues/1351)
+* [#1866 - As tech lead, I want an automated database backup lifecycle implemented](https://github.com/raft-tech/TANF-app/issues/1866)
+
+
+## Moved to Next Sprint (Raft Review, In Progress, Current Sprint Backlog)
+
+### Blocked
+* [#1977 - SPIKE: As tech lead, I want updating JWT_KEY for Login.gov to be secure and accessible](https://github.com/raft-tech/TANF-app/issues/1977)
+
+### Raft Review
+* N/A
+
+### In Progress
+* [#1544 - [SPIKE] Add Nginx configuration - increase security and performance](https://github.com/raft-tech/TANF-app/issues/1544)
+* [#2193 - [Research Spike] Trial run for error report production](https://github.com/raft-tech/TANF-app/issues/2193)
+
+
+
+### Current Sprint Backlog
+* [#2118 - Persist environment variables across application rebuilds/restages.](https://github.com/raft-tech/TANF-app/issues/2118)
+
+## Agenda for Sprint 59 Demo
+* [#992 - As an OFA admin/STT user, I want to be notified if I change selections after a file has been uploaded but not yet submitted](https://github.com/raft-tech/TANF-app/issues/992)
+* [#1755 As an STT data analyst, I need to tell TDP which data report I am uploading](https://github.com/raft-tech/TANF-app/issues/1755)
+* [#1844 - As a TDP user, I want to be notified when my account will soon be deactivated](https://github.com/raft-tech/TANF-app/issues/1844) - Talk Thorugh
+* [#1845 - As a STT Data Analyst, I want to be notified when data for my program has been submitted.](https://github.com/raft-tech/TANF-app/issues/1845)
+* [#2132 - Knowledge center documentation for common onboarding problems](https://github.com/raft-tech/TANF-app/issues/2132)
+* [#2140 - As a grantee user submitting data I always want to see the confirmation/error message](https://github.com/raft-tech/TANF-app/issues/2140)
+* [#2154 - As a user, I need the filename for SSP section to be correctly assigned after uploading the file](https://github.com/raft-tech/TANF-app/issues/2154)

docs/Technical-Documentation/buildpack-changelog.md

@@ -1,4 +1,8 @@
 ## Buildpacks Changelog
+- 11/09/2022 [python-buildpack v1.8.3](https://github.com/cloudfoundry/python-buildpack/releases/tag/v1.8.3)
+
+- 11/09/2022 [nginx-buildpack v1.1.45](https://github.com/cloudfoundry/nginx-buildpack/releases/tag/v1.1.45)
+
 - 09/06/2022 [python-buildpack v1.7.55](https://github.com/cloudfoundry/python-buildpack/releases/tag/v1.7.55)
 
 - 09/06/2022 [nginx-buildpack v1.1.39](https://github.com/cloudfoundry/nginx-buildpack/releases/tag/v1.1.39)

tdrs-backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10.4-slim-buster
+FROM python:3.10.8-slim-buster
 ENV PYTHONUNBUFFERED 1
 
 ARG user=tdpuser
@@ -8,7 +8,7 @@ ARG gid=1000
 ENV DJANGO_SETTINGS_MODULE=tdpservice.settings.local
 ENV DJANGO_CONFIGURATION=Local
 # Allows docker to cache installed dependencies between builds
-COPY Pipfile Pipfile.lock /tdpapp/
+COPY Pipfile /tdpapp/
 WORKDIR /tdpapp/
 # Download latest listing of available packages:
 RUN apt-get -y update
@@ -17,7 +17,7 @@ RUN apt-get -y upgrade
 # Install a new package:
 RUN apt-get install -y gcc && apt-get install -y graphviz && apt-get install -y graphviz-dev
 # Install pipenv
-RUN pip install --upgrade pip pipenv && pipenv install --dev --system --deploy
+RUN pip install --upgrade pip pipenv && pipenv install --dev --system --deploy --skip-lock
 
 # Adds our application code to the image
 COPY . /tdpapp

tdrs-backend/Pipfile

@@ -4,7 +4,7 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-awscli = "*"
+awscli = "1.27.5"
 awscli-local = "*"
 factory-boy = "*"
 flake8 = "*"
@@ -21,7 +21,7 @@ pytest-factoryboy = "*"
 
 [packages]
 pytz = "2022.1"
-boto3 = "==1.24.51"
+boto3 = "==1.26.5"
 cryptography = "==3.4.7"
 dj-database-url = "==0.5.0"
 django = "==3.2.15"
@@ -54,4 +54,4 @@ paramiko = "==2.11.0"
 pytest_sftpserver = "==1.3.0"
 
 [requires]
-python_version = "3.10.4"
+python_version = "3.10.8"