From 3524e9e82f328dfca1f9441a361700d56a051cba Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Wed, 27 Jan 2021 16:51:51 -0500
Subject: [PATCH 01/37] Remove --runInBand

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94b2ee5164..12f042baf1 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "server:debug": "nodemon src/index.js --exec babel-node --inspect",
     "client": "yarn --cwd frontend start",
     "test": "jest src",
-    "test:ci": "cross-env JEST_JUNIT_OUTPUT_DIR=reports JEST_JUNIT_OUTPUT_NAME=unit.xml POSTGRES_USERNAME=postgres POSTGRES_DB=ttasmarthub CURRENT_USER_ID=5 CI=true jest src --runInBand --coverage --reporters=default --reporters=jest-junit",
+    "test:ci": "cross-env JEST_JUNIT_OUTPUT_DIR=reports JEST_JUNIT_OUTPUT_NAME=unit.xml POSTGRES_USERNAME=postgres POSTGRES_DB=ttasmarthub CURRENT_USER_ID=5 CI=true jest src --coverage --reporters=default --reporters=jest-junit",
     "test:all": "yarn test:ci && yarn --cwd frontend test:ci",
     "lint": "eslint src",
     "lint:ci": "eslint -f eslint-formatter-multiple src",

From 60b68e0b1af1dc23de1b6a92d6675b03a5295a4e Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Mon, 1 Feb 2021 11:12:39 -0500
Subject: [PATCH 02/37] Add some docs around testing

---
 docs/testing.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docs/testing.md

diff --git a/docs/testing.md b/docs/testing.md
new file mode 100644
index 0000000000..ef828edbb9
--- /dev/null
+++ b/docs/testing.md
@@ -0,0 +1,31 @@
+# Testing
+
+## Tips and Caveats when writing tests
+
+
+### Handling async/promises
+
+When writing tests that rely on asynchronous operations, such as writing to the database, take care to make sure that those operations are resolved before any tests that rely on them run. If you need to create database records in a setup function such as `beforeAll`, you will want to make sure all async/promise operations resolve before subsequent tests run. You can make sure multiple await (promise) operations resolve by using [`Promise.all()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/all) (which takes an iterable of promises).
+
+Here's how that might look:
+
+```
+let a = await someAsyncFun();
+let b = await anotherAsyncFun();
+
+return Promise.all([a, b]);
+```
+
+
+## Testing in Docker
+
+When running tests in Docker, be aware that there are tests that will modify/delete database records. For tests to run, the 'db' service needs to exist and `db:migrate` and `db:seed` need to have been run (to create the tables and populate certain records).
+
+In the `docker-compose.yml` configuration, the database is set up to persist to a volume, "dbdata", so database records will persist between runs of the 'db' service, unless you remove that volume explicitly (e.g. `docker volume rm` or `docker-compose down --volumes`).
+
+
+### Notes on docker-compose and multiple configurations
+
+`docker-compose` has a feature for providing multiple `docker-compose.*.yml` files where subsequent files can override settings in previous files, which sounds like it would suit the use case of running docker for local development and for testing. However, the ability to [override configurations](https://docs.docker.com/compose/extends/#adding-and-overriding-configuration) is limited. While experimenting with overrides, it became clear that doing so would require a minimum of three docker-compose.yml files: one "base", one for local development, one for running tests. Trying to compose docker-compose.yml files would be complicated.
+
+In addition, while experimenting with multiple configuration files, it became clear that docker was unable to differentiate between different versions of the same service. Trying to override the 'db' service for testing would not work as expected: if the local/dev 'db' service had already been created, that one would be used when tests were run.

From 8484d6ec91f6cc74b1bbd6b71fdbbd0f61432186 Mon Sep 17 00:00:00 2001
From: Daniel Riquiac Gopar <danielriquiacgopar@danielrrmacbook.lan>
Date: Mon, 1 Feb 2021 13:05:09 -0800
Subject: [PATCH 03/37] Allow search to be case-insensitive

---
 frontend/src/pages/Admin/__tests__/index.js | 21 +++++++++++++++++++--
 frontend/src/pages/Admin/index.js           |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/Admin/__tests__/index.js b/frontend/src/pages/Admin/__tests__/index.js
index d73fa2767e..96cd540cad 100644
--- a/frontend/src/pages/Admin/__tests__/index.js
+++ b/frontend/src/pages/Admin/__tests__/index.js
@@ -29,7 +29,7 @@ describe('Admin Page', () => {
     const users = [
       {
         id: 2,
-        email: 'email',
+        email: 'gs@hogwarts.com',
         name: undefined,
         homeRegionId: 1,
         role: 'Grantee Specialist',
@@ -37,7 +37,7 @@ describe('Admin Page', () => {
       },
       {
         id: 3,
-        email: 'email',
+        email: 'potter@hogwarts.com',
         name: 'Harry Potter',
         homeRegionId: 1,
         role: 'Grantee Specialist',
@@ -63,6 +63,23 @@ describe('Admin Page', () => {
         expect(links[0]).toHaveTextContent('Harry Potter');
       });
 
+      it('User list is filterable by email', async () => {
+        const filter = await screen.findByLabelText('Filter Users');
+        userEvent.type(filter, '@hogwarts.com');
+        const sideNav = screen.getByTestId('sidenav');
+        const links = within(sideNav).getAllByRole('link');
+        expect(links.length).toBe(2);
+      })
+
+      it('user filtering is case-insentive', async () => {
+        const filter = await screen.findByLabelText('Filter Users');
+        userEvent.type(filter, 'harry');
+        const sideNav = screen.getByTestId('sidenav');
+        const links = within(sideNav).getAllByRole('link');
+        expect(links.length).toBe(1);
+        expect(links[0]).toHaveTextContent('Harry Potter');
+      })
+
       it('allows a user to be selected', async () => {
         const button = await screen.findByText('Harry Potter');
         userEvent.click(button);
diff --git a/frontend/src/pages/Admin/index.js b/frontend/src/pages/Admin/index.js
index 4c1fe51a31..c4e9802977 100644
--- a/frontend/src/pages/Admin/index.js
+++ b/frontend/src/pages/Admin/index.js
@@ -81,7 +81,7 @@ function Admin(props) {
 
   const filteredUsers = _.filter(users, (u) => {
     const { email, name } = u;
-    return `${email}${name}`.includes(userSearch);
+    return `${email}${name}`.toLowerCase().includes(userSearch.toLowerCase());
   });
 
   const onSave = async (newUser) => {

From 4ef5971baf8683d7b98ef6d74fe4f0e9ba328b6e Mon Sep 17 00:00:00 2001
From: Daniel Riquiac Gopar <danielriquiacgopar@danielrrmacbook.lan>
Date: Mon, 1 Feb 2021 13:18:42 -0800
Subject: [PATCH 04/37] Fix Eslint issue

---
 frontend/src/pages/Admin/__tests__/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Admin/__tests__/index.js b/frontend/src/pages/Admin/__tests__/index.js
index 96cd540cad..417bfd905f 100644
--- a/frontend/src/pages/Admin/__tests__/index.js
+++ b/frontend/src/pages/Admin/__tests__/index.js
@@ -69,7 +69,7 @@ describe('Admin Page', () => {
         const sideNav = screen.getByTestId('sidenav');
         const links = within(sideNav).getAllByRole('link');
         expect(links.length).toBe(2);
-      })
+      });
 
       it('user filtering is case-insentive', async () => {
         const filter = await screen.findByLabelText('Filter Users');
@@ -78,7 +78,7 @@ describe('Admin Page', () => {
         const links = within(sideNav).getAllByRole('link');
         expect(links.length).toBe(1);
         expect(links[0]).toHaveTextContent('Harry Potter');
-      })
+      });
 
       it('allows a user to be selected', async () => {
         const button = await screen.findByText('Harry Potter');

From 3f43234e6051cd0175a86d82ec5871520a580e06 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Mon, 1 Feb 2021 16:25:52 -0500
Subject: [PATCH 05/37] Fix example

---
 docs/testing.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/testing.md b/docs/testing.md
index ef828edbb9..6184aba6d6 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -10,8 +10,8 @@ When writing tests that rely on asynchronous operations, such as writing to the
 Here's how that might look:
 
 ```
-let a = await someAsyncFun();
-let b = await anotherAsyncFun();
+let a = someAsyncFun();
+let b = anotherAsyncFun();
 
 return Promise.all([a, b]);
 ```

From deac317ffba5ec7b11a52f7a7ae41e0e2b922a3a Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Tue, 26 Jan 2021 15:42:12 -0500
Subject: [PATCH 06/37] Rename docker-compose file used for dynamic security
 scans

---
 .circleci/config.yml                              | 12 ++++++------
 docker-compose-test.yml => docker-compose-dss.yml |  0
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename docker-compose-test.yml => docker-compose-dss.yml (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b9adf5ba70..7265c80d1f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -240,12 +240,12 @@ jobs:
       - run:
           name: Start up local server
           command: | # production style build (single BE server with static FE)
-            docker-compose -f docker-compose-test.yml run --rm server yarn install --production=false
-            docker-compose -f docker-compose-test.yml run --rm server yarn --cwd frontend install --production=false
-            docker-compose -f docker-compose-test.yml run --rm server yarn build
-            docker-compose -f docker-compose-test.yml run --rm server yarn --cwd frontend run build
-            docker-compose -f docker-compose-test.yml up -d
-            docker-compose -f docker-compose-test.yml exec server yarn db:migrate:ci
+            docker-compose -f docker-compose-dss.yml run --rm server yarn install --production=false
+            docker-compose -f docker-compose-dss.yml run --rm server yarn --cwd frontend install --production=false
+            docker-compose -f docker-compose-dss.yml run --rm server yarn build
+            docker-compose -f docker-compose-dss.yml run --rm server yarn --cwd frontend run build
+            docker-compose -f docker-compose-dss.yml up -d
+            docker-compose -f docker-compose-dss.yml exec server yarn db:migrate:ci
       - run:
           name: Pull OWASP ZAP docker image
           command: docker pull owasp/zap2docker-weekly
diff --git a/docker-compose-test.yml b/docker-compose-dss.yml
similarity index 100%
rename from docker-compose-test.yml
rename to docker-compose-dss.yml

From f3f90222c78658ca0e6616ede22afc188d3568fd Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Wed, 27 Jan 2021 16:11:08 -0500
Subject: [PATCH 07/37] Create bin/docker script, which will make command
 composition easier

---
 bin/docker | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100755 bin/docker

diff --git a/bin/docker b/bin/docker
new file mode 100755
index 0000000000..1d304f39e1
--- /dev/null
+++ b/bin/docker
@@ -0,0 +1,195 @@
+#!/bin/bash
+
+hr="=========="
+
+sequelizecli="node_modules/.bin/sequelize"
+
+setup() {
+    # First, setup up frontend and backend, install dependencies
+    # yarn docker:deps
+    setup_backend
+    setup_frontend
+
+    db_setup ""
+
+    # Stop the db manually?
+    # db_stop
+}
+
+setup_backend() {
+    echo "${hr} Setting up backend ${hr}"
+    docker-compose run --rm backend yarn install
+}
+
+setup_frontend() {
+    echo "${hr} Setting up frontend ${hr}"
+    docker-compose run --rm frontend yarn install
+}
+
+teardown() {
+    docker-compose down --volumes
+}
+
+db_migrate() {
+    local -a options=(status undo)
+    local option="${1}"
+    # If 'undo' param provided undo
+    if [[ "undo" == "${option}" ]]; then
+        echo "${hr} Undoing db migrations ${hr}"
+        docker-compose run --rm backend "$sequelizecli" db:migrate:undo
+        exit 0
+    fi
+
+    if [[ "status" == "${option}" ]]; then
+        echo "${hr} Checking db migration status ${hr}"
+        docker-compose run --rm backend "$sequelizecli" db:migrate:status
+        exit 0
+    fi
+
+    # Create/update database tables
+    # yarn docker:db:migrate
+    echo "${hr} Migrating db ${hr}"
+    docker-compose run --rm backend "$sequelizecli" db:migrate
+}
+
+db_seed() {
+    local option="${1}"
+    # If 'undo' param provided undo
+    if [[ "undo" == "${option}" ]]; then
+        echo "${hr} Unseeding db ${hr}"
+        docker-compose run --rm backend "$sequelizecli" db:seed:undo:all
+        exit 0
+    fi
+
+    # Populate db with data
+    # yarn docker:db:seed
+    echo "${hr} Seeding database ${hr}"
+    docker-compose run --rm backend yarn db:seed
+}
+
+db_setup() {
+    db_migrate ""
+    db_seed ""
+}
+
+db_stop() {
+    docker-compose stop db
+}
+
+# Need reliable way to remove db volume and only db volume
+# db_destroy() {
+#     db_stop
+#     docker-compose rm -v -- db
+#     docker volume prune
+# }
+
+db() {
+    declare -a options=(setup migrate seed stop)
+    option="${1}"
+    for i in "${options[@]}"; do
+        if [ "${i}" == "${option}" ]; then
+            shift 2>/dev/null
+            "db_${option}" "$@"
+            exit 0
+        fi
+    done
+
+    # If no matching option, print options
+    echo "db expects one of the following: ${options[*]}"
+    exit 1
+}
+
+test_frontend() {
+    echo "${hr} Running frontend tests ${hr}"
+    docker-compose run --rm frontend yarn test:ci
+}
+
+test_backend() {
+    echo "${hr} Running backend tests ${hr}"
+    docker-compose run --rm backend yarn test:ci
+}
+
+# tests plural, because `test` is a builtin shell command
+tests() {
+    declare -a options=(frontend backend)
+    option="${1}"
+
+    # Check if user specified 'frontend' or 'backend' option
+    if [[ -n $option ]]; then
+        for i in "${options[@]}"; do
+            if [ "${i}" == "${option}" ]; then
+                "test_${option}"
+                exit 0
+            fi
+        done
+    fi
+
+    # Otherwise, run both
+    test_frontend
+    test_backend
+
+}
+
+lint_backend() {
+    echo "${hr} Linting backend ${hr}"
+    docker-compose run --rm backend yarn lint:ci
+}
+
+lint_frontend() {
+    echo "${hr} Linting frontend ${hr}"
+    docker-compose run --rm frontend yarn lint:ci
+}
+
+lint() {
+    local -a options=(frontend backend)
+    option="${1}"
+
+    for i in "${options[@]}"; do
+        if [[ "${i}" == "$option" ]]; then
+            "lint_${option}"
+            exit 0
+        fi
+    done
+
+    lint_frontend
+    lint_backend
+}
+
+start() {
+    docker-compose up
+}
+
+stop() {
+    docker-compose down
+}
+
+# ====== Main =====
+
+# Pull first param as subcommand, default to 'usage' if no args provided
+subcommand="${1-usage}";
+# Shift parameters, so $@a has remaining params
+shift 2>/dev/null
+
+# If subcommand is empty string, print usage
+if [ -z "$subcommand" ]; then
+    usage
+    exit 1
+fi
+
+usage() {
+    echo "Please provide a subcommand: ${commands[*]}"
+}
+
+# Array of subcommands
+declare -a commands=(usage setup teardown start stop db lint tests)
+
+# Loop over commands array, look for match with $subcommand. Execute fn if match
+for i in "${commands[@]}"; do
+    if [[ "${i}" == "${subcommand}" ]]; then
+        "${subcommand}" "$@"
+        exit 0
+    fi
+done
+
+# If we didn't run a subcommand and exit already, print usage
+usage

From 44af291dd235220a8ec2842d6a5c3442d42954e8 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Wed, 27 Jan 2021 16:51:51 -0500
Subject: [PATCH 08/37] Remove --runInBand

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94b2ee5164..12f042baf1 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "server:debug": "nodemon src/index.js --exec babel-node --inspect",
     "client": "yarn --cwd frontend start",
     "test": "jest src",
-    "test:ci": "cross-env JEST_JUNIT_OUTPUT_DIR=reports JEST_JUNIT_OUTPUT_NAME=unit.xml POSTGRES_USERNAME=postgres POSTGRES_DB=ttasmarthub CURRENT_USER_ID=5 CI=true jest src --runInBand --coverage --reporters=default --reporters=jest-junit",
+    "test:ci": "cross-env JEST_JUNIT_OUTPUT_DIR=reports JEST_JUNIT_OUTPUT_NAME=unit.xml POSTGRES_USERNAME=postgres POSTGRES_DB=ttasmarthub CURRENT_USER_ID=5 CI=true jest src --coverage --reporters=default --reporters=jest-junit",
     "test:all": "yarn test:ci && yarn --cwd frontend test:ci",
     "lint": "eslint src",
     "lint:ci": "eslint -f eslint-formatter-multiple src",

From 9b422f35b4f750430fa98d18149739de01937550 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Wed, 27 Jan 2021 17:45:18 -0500
Subject: [PATCH 09/37] Add option parsing and rename docker script

---
 bin/{docker => docker-run} | 101 ++++++++++++++++++++++++++++---------
 1 file changed, 78 insertions(+), 23 deletions(-)
 rename bin/{docker => docker-run} (65%)

diff --git a/bin/docker b/bin/docker-run
similarity index 65%
rename from bin/docker
rename to bin/docker-run
index 1d304f39e1..765a26575d 100755
--- a/bin/docker
+++ b/bin/docker-run
@@ -2,7 +2,23 @@
 
 hr="=========="
 
-sequelizecli="node_modules/.bin/sequelize"
+declare sequelizecli="node_modules/.bin/sequelize"
+
+declare -a environments=("local" "test")
+declare env="local"
+
+# Array of subcommands
+declare -a subcommands=(
+    usage
+    setup
+    teardown
+    start
+    stop
+    db
+    lint
+    tests
+)
+
 
 setup() {
     # First, setup up frontend and backend, install dependencies
@@ -163,33 +179,72 @@ stop() {
     docker-compose down
 }
 
+usage() {
+    # shellcheck disable=SC2086
+    cat <<EOF >&2
+Run commands in Docker containers
+Usage: $0 [-h] [-e env] <subcommand...>
+Subcommands:
+    ${subcommands[*]}
+EOF
+}
+
 # ====== Main =====
 
-# Pull first param as subcommand, default to 'usage' if no args provided
-subcommand="${1-usage}";
-# Shift parameters, so $@a has remaining params
-shift 2>/dev/null
+main() {
+    # Parse -options
+    while getopts ":e:h" opt; do
+        case $opt in
+            e)
+                env="${OPTARG-local}"
+                local env_match=0
+                for e in "${environments[@]}"; do
+                    if [[ "$e" == "$env" ]]; then
+                        env_match=1;
+                        break;
+                    fi
+                done
+                if [[ $env_match -eq 0 ]]; then
+                    echo "Invalid environment '${env}'";
+                    exit 1;
+                fi
+                ;;
+            h)
+                usage
+                exit
+                ;;
+            \?)
+                echo "Invalid option" >&2
+                echo
+                ;;
+        esac
+    done
 
-# If subcommand is empty string, print usage
-if [ -z "$subcommand" ]; then
-    usage
-    exit 1
-fi
+    # After parsing options, shift so $@ has only params
+    shift $((OPTIND -1))
 
-usage() {
-    echo "Please provide a subcommand: ${commands[*]}"
-}
+    # Pull first param as subcommand, default to 'usage' if no args provided
+    local subcmd="${1-usage}";
 
-# Array of subcommands
-declare -a commands=(usage setup teardown start stop db lint tests)
+    # Shift parameters, so $@a has remaining params
+    shift 2>/dev/null
 
-# Loop over commands array, look for match with $subcommand. Execute fn if match
-for i in "${commands[@]}"; do
-    if [[ "${i}" == "${subcommand}" ]]; then
-        "${subcommand}" "$@"
-        exit 0
+    # If subcommand is empty string, print usage
+    if [ -z "$subcmd" ]; then
+        usage
+        exit 1
     fi
-done
 
-# If we didn't run a subcommand and exit already, print usage
-usage
+    # Loop over subcommands, look for match with $subcommand. Execute fn if match
+    for i in "${subcommands[@]}"; do
+        if [[ "${i}" == "${subcmd}" ]]; then
+            "${subcmd}" "$@"
+            exit 0
+        fi
+    done
+
+    # If we didn't run a subcommand and exit already, print usage
+    usage
+}
+
+main "${@-}"

From 84b24b86c079b0b66d341372991a13d64ef93aa9 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Wed, 27 Jan 2021 18:55:25 -0500
Subject: [PATCH 10/37] Multiple docker-compose configs for multiple
 environments

---
 bin/docker-run           | 61 +++++++++++++++++++++++++++++-----------
 docker-compose.local.yml | 12 ++++++++
 docker-compose.test.yml  |  7 +++++
 docker-compose.yml       |  6 ----
 4 files changed, 64 insertions(+), 22 deletions(-)
 create mode 100644 docker-compose.local.yml
 create mode 100644 docker-compose.test.yml

diff --git a/bin/docker-run b/bin/docker-run
index 765a26575d..533eeaa2a4 100755
--- a/bin/docker-run
+++ b/bin/docker-run
@@ -5,7 +5,8 @@ hr="=========="
 declare sequelizecli="node_modules/.bin/sequelize"
 
 declare -a environments=("local" "test")
-declare env="local"
+
+declare -a conf
 
 # Array of subcommands
 declare -a subcommands=(
@@ -34,16 +35,18 @@ setup() {
 
 setup_backend() {
     echo "${hr} Setting up backend ${hr}"
-    docker-compose run --rm backend yarn install
+    docker-compose "${conf[@]}" run --rm backend yarn install
 }
 
 setup_frontend() {
     echo "${hr} Setting up frontend ${hr}"
-    docker-compose run --rm frontend yarn install
+    docker-compose "${conf[@]}" run --rm frontend yarn install
 }
 
 teardown() {
-    docker-compose down --volumes
+    docker-compose \
+        "${conf[@]}" \
+        down --volumes
 }
 
 db_migrate() {
@@ -52,20 +55,20 @@ db_migrate() {
     # If 'undo' param provided undo
     if [[ "undo" == "${option}" ]]; then
         echo "${hr} Undoing db migrations ${hr}"
-        docker-compose run --rm backend "$sequelizecli" db:migrate:undo
+        docker-compose "${conf[@]}" run --rm backend "$sequelizecli" db:migrate:undo
         exit 0
     fi
 
     if [[ "status" == "${option}" ]]; then
         echo "${hr} Checking db migration status ${hr}"
-        docker-compose run --rm backend "$sequelizecli" db:migrate:status
+        docker-compose "${conf[@]}" run --rm backend "$sequelizecli" db:migrate:status
         exit 0
     fi
 
     # Create/update database tables
     # yarn docker:db:migrate
     echo "${hr} Migrating db ${hr}"
-    docker-compose run --rm backend "$sequelizecli" db:migrate
+    docker-compose "${conf[@]}" run --rm backend "$sequelizecli" db:migrate
 }
 
 db_seed() {
@@ -73,14 +76,14 @@ db_seed() {
     # If 'undo' param provided undo
     if [[ "undo" == "${option}" ]]; then
         echo "${hr} Unseeding db ${hr}"
-        docker-compose run --rm backend "$sequelizecli" db:seed:undo:all
+        docker-compose "${conf[@]}" run --rm backend "$sequelizecli" db:seed:undo:all
         exit 0
     fi
 
     # Populate db with data
     # yarn docker:db:seed
     echo "${hr} Seeding database ${hr}"
-    docker-compose run --rm backend yarn db:seed
+    docker-compose "${conf[@]}" run --rm backend yarn db:seed
 }
 
 db_setup() {
@@ -89,7 +92,7 @@ db_setup() {
 }
 
 db_stop() {
-    docker-compose stop db
+    docker-compose "${conf[@]}" stop db
 }
 
 # Need reliable way to remove db volume and only db volume
@@ -117,12 +120,12 @@ db() {
 
 test_frontend() {
     echo "${hr} Running frontend tests ${hr}"
-    docker-compose run --rm frontend yarn test:ci
+    docker-compose "${conf[@]}" run --rm frontend yarn test:ci
 }
 
 test_backend() {
     echo "${hr} Running backend tests ${hr}"
-    docker-compose run --rm backend yarn test:ci
+    docker-compose "${conf[@]}" run --rm backend yarn test:ci
 }
 
 # tests plural, because `test` is a builtin shell command
@@ -148,12 +151,12 @@ tests() {
 
 lint_backend() {
     echo "${hr} Linting backend ${hr}"
-    docker-compose run --rm backend yarn lint:ci
+    docker-compose "${conf[@]}" run --rm backend yarn lint:ci
 }
 
 lint_frontend() {
     echo "${hr} Linting frontend ${hr}"
-    docker-compose run --rm frontend yarn lint:ci
+    docker-compose "${conf[@]}" run --rm frontend yarn lint:ci
 }
 
 lint() {
@@ -172,13 +175,36 @@ lint() {
 }
 
 start() {
-    docker-compose up
+    docker-compose "${conf[@]}" up
 }
 
 stop() {
-    docker-compose down
+    docker-compose "${conf[@]}" down
 }
 
+# ===== Process env configs
+
+# We want to specify multiple config files, per
+# https://docs.docker.com/compose/extends/#multiple-compose-files
+compose_conf() {
+    local env="${1}"
+    local envfile="docker-compose.${env}.yml"
+
+    if [[ ! -e "$envfile" ]]; then
+        echo "$envfile does not appear to exist!"
+        exit 1
+    fi
+
+    configs=(
+        '-f docker-compose.yml'
+        "-f docker-compose.${env}.yml"
+    )
+
+    echo "${configs[@]}"
+}
+
+# ===== Usage =====
+
 usage() {
     # shellcheck disable=SC2086
     cat <<EOF >&2
@@ -192,6 +218,7 @@ EOF
 # ====== Main =====
 
 main() {
+    local env="local"
     # Parse -options
     while getopts ":e:h" opt; do
         case $opt in
@@ -235,6 +262,8 @@ main() {
         exit 1
     fi
 
+    conf=($(compose_conf "$env"))
+
     # Loop over subcommands, look for match with $subcommand. Execute fn if match
     for i in "${subcommands[@]}"; do
         if [[ "${i}" == "${subcmd}" ]]; then
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
new file mode 100644
index 0000000000..0ce8c997b4
--- /dev/null
+++ b/docker-compose.local.yml
@@ -0,0 +1,12 @@
+version: "3.5"
+services:
+  backend:
+    environment:
+      - POSTGRES_HOST=postgres_docker_dev
+  db:
+    container_name: postgres_docker_dev
+    volumes:
+      - dbdata:/var/lib/postgresql/data
+
+volumes:
+  dbdata:
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 0000000000..3953f45f96
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,7 @@
+version: "3.5"
+services:
+  backend:
+    environment:
+      - POSTGRES_HOST=postgres_docker_test
+  db:
+    container_name: postgres_docker_test
diff --git a/docker-compose.yml b/docker-compose.yml
index e3fda8a1b9..30e74cd554 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,6 @@ services:
       - "8080:8080"
     depends_on:
       - db
-    environment:
-      - POSTGRES_HOST=postgres_docker
     volumes:
       - ".:/app:rw"
   frontend:
@@ -36,12 +34,9 @@ services:
       - BACKEND_PROXY=http://backend:8080
   db:
     image: postgres:12.4
-    container_name: postgres_docker
     env_file: .env
     ports:
       - "6543:5432"
-    volumes:
-      - dbdata:/var/lib/postgresql/data
   minio:
     image: minio/minio
     env_file: .env
@@ -57,5 +52,4 @@ services:
 
 
 volumes:
-  dbdata: {}
   miniodata: {}

From 92a41c4f75a48c57a40498f122a7cf8ccc1e618d Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Thu, 28 Jan 2021 12:26:52 -0500
Subject: [PATCH 11/37] bin/docker-run fixes, improvements

---
 bin/docker-run | 61 +++++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/bin/docker-run b/bin/docker-run
index 533eeaa2a4..0bea731f25 100755
--- a/bin/docker-run
+++ b/bin/docker-run
@@ -2,14 +2,12 @@
 
 hr="=========="
 
-declare sequelizecli="node_modules/.bin/sequelize"
-
-declare -a environments=("local" "test")
-
-declare -a conf
+readonly SEQUELIZE_CLI="node_modules/.bin/sequelize"
+readonly DEFAULT_ENV='local'
+readonly -a ENVIRONMENTS=("$DEFAULT_ENV" "test")
 
 # Array of subcommands
-declare -a subcommands=(
+readonly -a subcommands=(
     usage
     setup
     teardown
@@ -20,6 +18,8 @@ declare -a subcommands=(
     tests
 )
 
+declare -a conf
+
 
 setup() {
     # First, setup up frontend and backend, install dependencies
@@ -55,20 +55,20 @@ db_migrate() {
     # If 'undo' param provided undo
     if [[ "undo" == "${option}" ]]; then
         echo "${hr} Undoing db migrations ${hr}"
-        docker-compose "${conf[@]}" run --rm backend "$sequelizecli" db:migrate:undo
+        docker-compose "${conf[@]}" run --rm backend "$SEQUELIZE_CLI" db:migrate:undo
         exit 0
     fi
 
     if [[ "status" == "${option}" ]]; then
         echo "${hr} Checking db migration status ${hr}"
-        docker-compose "${conf[@]}" run --rm backend "$sequelizecli" db:migrate:status
+        docker-compose "${conf[@]}" run --rm backend "$SEQUELIZE_CLI" db:migrate:status
         exit 0
     fi
 
     # Create/update database tables
     # yarn docker:db:migrate
     echo "${hr} Migrating db ${hr}"
-    docker-compose "${conf[@]}" run --rm backend "$sequelizecli" db:migrate
+    docker-compose "${conf[@]}" run --rm backend "$SEQUELIZE_CLI" db:migrate
 }
 
 db_seed() {
@@ -76,7 +76,7 @@ db_seed() {
     # If 'undo' param provided undo
     if [[ "undo" == "${option}" ]]; then
         echo "${hr} Unseeding db ${hr}"
-        docker-compose "${conf[@]}" run --rm backend "$sequelizecli" db:seed:undo:all
+        docker-compose "${conf[@]}" run --rm backend "$SEQUELIZE_CLI" db:seed:undo:all
         exit 0
     fi
 
@@ -217,24 +217,32 @@ EOF
 
 # ====== Main =====
 
+check_env() {
+    local env_match=0
+    for e in "${ENVIRONMENTS[@]}"; do
+        if [[ "$e" == "${1}" ]]; then
+            env_match=1;
+            break;
+        fi
+    done
+    if [[ $env_match -eq 0 ]]; then
+        echo "Invalid environment '${1}'";
+        echo "Valid environments are: ${ENVIRONMENTS[*]}"
+        exit 1;
+    fi
+}
+
 main() {
-    local env="local"
+    docker_env="${DOCKER_ENV:-$DEFAULT_ENV}"
+    local env_conf="$docker_env"
+    check_env "$env_conf"
+
     # Parse -options
     while getopts ":e:h" opt; do
         case $opt in
             e)
-                env="${OPTARG-local}"
-                local env_match=0
-                for e in "${environments[@]}"; do
-                    if [[ "$e" == "$env" ]]; then
-                        env_match=1;
-                        break;
-                    fi
-                done
-                if [[ $env_match -eq 0 ]]; then
-                    echo "Invalid environment '${env}'";
-                    exit 1;
-                fi
+                env_conf="${OPTARG:-$env_conf}"
+                check_env "$env_conf"
                 ;;
             h)
                 usage
@@ -251,7 +259,7 @@ main() {
     shift $((OPTIND -1))
 
     # Pull first param as subcommand, default to 'usage' if no args provided
-    local subcmd="${1-usage}";
+    local subcmd="${1:-usage}";
 
     # Shift parameters, so $@a has remaining params
     shift 2>/dev/null
@@ -262,7 +270,8 @@ main() {
         exit 1
     fi
 
-    conf=($(compose_conf "$env"))
+    # 'conf' is an array, so we follow https://github.com/koalaman/shellcheck/wiki/SC2207
+    IFS=" " read -r -a conf <<< "$(compose_conf "$env_conf")"
 
     # Loop over subcommands, look for match with $subcommand. Execute fn if match
     for i in "${subcommands[@]}"; do
@@ -276,4 +285,4 @@ main() {
     usage
 }
 
-main "${@-}"
+main "$@"

From 32f38c88813113731c536cd6430bd273aec799c9 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Thu, 28 Jan 2021 13:27:07 -0500
Subject: [PATCH 12/37] Minor docker-run improvements

---
 bin/docker-run | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/bin/docker-run b/bin/docker-run
index 0bea731f25..e65860aa7a 100755
--- a/bin/docker-run
+++ b/bin/docker-run
@@ -5,6 +5,7 @@ hr="=========="
 readonly SEQUELIZE_CLI="node_modules/.bin/sequelize"
 readonly DEFAULT_ENV='local'
 readonly -a ENVIRONMENTS=("$DEFAULT_ENV" "test")
+readonly DB_SERVICE='db'
 
 # Array of subcommands
 readonly -a subcommands=(
@@ -15,7 +16,7 @@ readonly -a subcommands=(
     stop
     db
     lint
-    tests
+    'test'
 )
 
 declare -a conf
@@ -102,6 +103,15 @@ db_stop() {
 #     docker volume prune
 # }
 
+db_exists() {
+    # TODO: Less naive detection of database service/image/volume
+    db_lookup="$(docker-compose images --quiet $DB_SERVICE)"
+    if [[ -n "$db_lookup" ]]; then
+        return 1
+    fi
+    return 0
+}
+
 db() {
     declare -a options=(setup migrate seed stop)
     option="${1}"
@@ -124,12 +134,20 @@ test_frontend() {
 }
 
 test_backend() {
+    # Check if db_exists, if not setup db
+    local -i has_db
+    has_db=$(db_exists)
+    if [[ has_db -eq 0 ]]; then
+        echo "${hr} Setting up database prior to testing ${hr}"
+        db_setup
+    fi
     echo "${hr} Running backend tests ${hr}"
     docker-compose "${conf[@]}" run --rm backend yarn test:ci
+    db_stop
 }
 
-# tests plural, because `test` is a builtin shell command
-tests() {
+# 'run_tests', because `test` is a builtin shell command
+run_tests() {
     declare -a options=(frontend backend)
     option="${1}"
 
@@ -276,6 +294,9 @@ main() {
     # Loop over subcommands, look for match with $subcommand. Execute fn if match
     for i in "${subcommands[@]}"; do
         if [[ "${i}" == "${subcmd}" ]]; then
+            if [[ "${subcmd}" == "test" ]]; then
+                subcmd="run_tests";
+            fi
             "${subcmd}" "$@"
             exit 0
         fi

From de13b1febdd9abaf1a5ed9ab87e24aee43b76765 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Fri, 29 Jan 2021 10:40:09 -0500
Subject: [PATCH 13/37] Change 'conf' to be a string, since that's how it gets
 used. Echo cmds before running them

---
 bin/docker-run | 70 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 19 deletions(-)

diff --git a/bin/docker-run b/bin/docker-run
index e65860aa7a..d84e35ebe8 100755
--- a/bin/docker-run
+++ b/bin/docker-run
@@ -19,8 +19,15 @@ readonly -a subcommands=(
     'test'
 )
 
-declare -a conf
-
+# conf should be assigned a string like `-f docker-compose.yml -f docker-compose.locale.yml`/conf
+declare conf
+
+# Expects a command as a string, which it will echo and then execute
+echo_exec() {
+    local cmd="${1}"
+    echo "$cmd"
+    $cmd
+}
 
 setup() {
     # First, setup up frontend and backend, install dependencies
@@ -36,17 +43,19 @@ setup() {
 
 setup_backend() {
     echo "${hr} Setting up backend ${hr}"
-    docker-compose "${conf[@]}" run --rm backend yarn install
+    echo_exec "docker-compose ${conf} run --rm backend yarn install"
 }
 
 setup_frontend() {
     echo "${hr} Setting up frontend ${hr}"
-    docker-compose "${conf[@]}" run --rm frontend yarn install
+    echo_exec "docker-compose ${conf} run --rm frontend yarn install"
+    echo "$cmd"
+    $cmd
 }
 
 teardown() {
     docker-compose \
-        "${conf[@]}" \
+        "${conf}" \
         down --volumes
 }
 
@@ -56,20 +65,26 @@ db_migrate() {
     # If 'undo' param provided undo
     if [[ "undo" == "${option}" ]]; then
         echo "${hr} Undoing db migrations ${hr}"
-        docker-compose "${conf[@]}" run --rm backend "$SEQUELIZE_CLI" db:migrate:undo
+        echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate:undo"
+        echo "$cmd"
+        $cmd
         exit 0
     fi
 
     if [[ "status" == "${option}" ]]; then
         echo "${hr} Checking db migration status ${hr}"
-        docker-compose "${conf[@]}" run --rm backend "$SEQUELIZE_CLI" db:migrate:status
+        echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate:status"
+        echo "$cmd"
+        $cmd
         exit 0
     fi
 
     # Create/update database tables
     # yarn docker:db:migrate
     echo "${hr} Migrating db ${hr}"
-    docker-compose "${conf[@]}" run --rm backend "$SEQUELIZE_CLI" db:migrate
+    echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate"
+    echo "$cmd"
+    $cmd
 }
 
 db_seed() {
@@ -77,14 +92,18 @@ db_seed() {
     # If 'undo' param provided undo
     if [[ "undo" == "${option}" ]]; then
         echo "${hr} Unseeding db ${hr}"
-        docker-compose "${conf[@]}" run --rm backend "$SEQUELIZE_CLI" db:seed:undo:all
+        echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:seed:undo:all"
+        echo "$cmd"
+        $cmd
         exit 0
     fi
 
     # Populate db with data
     # yarn docker:db:seed
     echo "${hr} Seeding database ${hr}"
-    docker-compose "${conf[@]}" run --rm backend yarn db:seed
+    echo_exec "docker-compose ${conf} run --rm backend yarn db:seed"
+    echo "$cmd"
+    $cmd
 }
 
 db_setup() {
@@ -93,7 +112,9 @@ db_setup() {
 }
 
 db_stop() {
-    docker-compose "${conf[@]}" stop db
+   echo_exec "docker-compose ${conf} stop db"
+    echo "$cmd"
+    $cmd
 }
 
 # Need reliable way to remove db volume and only db volume
@@ -130,7 +151,9 @@ db() {
 
 test_frontend() {
     echo "${hr} Running frontend tests ${hr}"
-    docker-compose "${conf[@]}" run --rm frontend yarn test:ci
+    echo_exec "docker-compose ${conf} run --rm frontend yarn test:ci"
+    echo "$cmd"
+    $cmd
 }
 
 test_backend() {
@@ -142,7 +165,9 @@ test_backend() {
         db_setup
     fi
     echo "${hr} Running backend tests ${hr}"
-    docker-compose "${conf[@]}" run --rm backend yarn test:ci
+    echo_exec "docker-compose ${conf} run --rm backend yarn test:ci"
+    echo "$cmd"
+    $cmd
     db_stop
 }
 
@@ -169,12 +194,16 @@ run_tests() {
 
 lint_backend() {
     echo "${hr} Linting backend ${hr}"
-    docker-compose "${conf[@]}" run --rm backend yarn lint:ci
+    echo_exec "docker-compose ${conf} run --rm backend yarn lint:ci"
+    echo "$cmd"
+    $cmd
 }
 
 lint_frontend() {
     echo "${hr} Linting frontend ${hr}"
-    docker-compose "${conf[@]}" run --rm frontend yarn lint:ci
+    echo_exec "docker-compose ${conf} run --rm frontend yarn lint:ci"
+    echo "$cmd"
+    $cmd
 }
 
 lint() {
@@ -193,11 +222,15 @@ lint() {
 }
 
 start() {
-    docker-compose "${conf[@]}" up
+    echo_exec "docker-compose ${conf} up"
+    echo "$cmd"
+    $cmd
 }
 
 stop() {
-    docker-compose "${conf[@]}" down
+    echo_exec "docker-compose ${conf} down"
+    echo "$cmd"
+    $cmd
 }
 
 # ===== Process env configs
@@ -288,8 +321,7 @@ main() {
         exit 1
     fi
 
-    # 'conf' is an array, so we follow https://github.com/koalaman/shellcheck/wiki/SC2207
-    IFS=" " read -r -a conf <<< "$(compose_conf "$env_conf")"
+    conf=$(compose_conf "$env_conf")
 
     # Loop over subcommands, look for match with $subcommand. Execute fn if match
     for i in "${subcommands[@]}"; do

From a232a9155c190fbdc5acf1cbe6484803f1e40072 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Fri, 29 Jan 2021 12:48:13 -0500
Subject: [PATCH 14/37] docker-run: 'test' uses test env by default

---
 bin/docker-run | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/bin/docker-run b/bin/docker-run
index d84e35ebe8..46f51db433 100755
--- a/bin/docker-run
+++ b/bin/docker-run
@@ -4,7 +4,8 @@ hr="=========="
 
 readonly SEQUELIZE_CLI="node_modules/.bin/sequelize"
 readonly DEFAULT_ENV='local'
-readonly -a ENVIRONMENTS=("$DEFAULT_ENV" "test")
+readonly TEST_ENV='test'
+readonly -a ENVIRONMENTS=("$DEFAULT_ENV" "$TEST_ENV")
 readonly DB_SERVICE='db'
 
 # Array of subcommands
@@ -21,6 +22,7 @@ readonly -a subcommands=(
 
 # conf should be assigned a string like `-f docker-compose.yml -f docker-compose.locale.yml`/conf
 declare conf
+declare -i env_override=0
 
 # Expects a command as a string, which it will echo and then execute
 echo_exec() {
@@ -112,7 +114,7 @@ db_setup() {
 }
 
 db_stop() {
-   echo_exec "docker-compose ${conf} stop db"
+    echo_exec "docker-compose ${conf} stop db"
     echo "$cmd"
     $cmd
 }
@@ -252,6 +254,7 @@ compose_conf() {
     )
 
     echo "${configs[@]}"
+    return 0
 }
 
 # ===== Usage =====
@@ -285,6 +288,9 @@ check_env() {
 
 main() {
     docker_env="${DOCKER_ENV:-$DEFAULT_ENV}"
+    if [[ -n "$DOCKER_ENV" ]]; then
+        env_override=1
+    fi
     local env_conf="$docker_env"
     check_env "$env_conf"
 
@@ -294,6 +300,7 @@ main() {
             e)
                 env_conf="${OPTARG:-$env_conf}"
                 check_env "$env_conf"
+                env_override=1
                 ;;
             h)
                 usage
@@ -327,6 +334,12 @@ main() {
     for i in "${subcommands[@]}"; do
         if [[ "${i}" == "${subcmd}" ]]; then
             if [[ "${subcmd}" == "test" ]]; then
+                if [[ $env_override -eq 0 ]]; then
+                    echo "${hr}> Test commands use 'test' config, unless overridden <${hr}"
+                    conf=$(compose_conf "$TEST_ENV")
+                else
+                    echo "Running tests in '$env_conf'"
+                fi
                 subcmd="run_tests";
             fi
             "${subcmd}" "$@"

From ac43405c04826797c2fe7bce2b4f55b23deafda6 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Fri, 29 Jan 2021 16:19:07 -0500
Subject: [PATCH 15/37] Undo the composed compose files; docker-compose wasn't
 handling differend db instances differently

---
 bin/docker-run           | 26 +++++++++--------------
 docker-compose.local.yml | 12 -----------
 docker-compose.test.yml  | 45 +++++++++++++++++++++++++++++++++++++++-
 docker-compose.yml       |  6 ++++++
 4 files changed, 60 insertions(+), 29 deletions(-)
 delete mode 100644 docker-compose.local.yml

diff --git a/bin/docker-run b/bin/docker-run
index 46f51db433..ac40ce54d0 100755
--- a/bin/docker-run
+++ b/bin/docker-run
@@ -120,11 +120,10 @@ db_stop() {
 }
 
 # Need reliable way to remove db volume and only db volume
-# db_destroy() {
-#     db_stop
-#     docker-compose rm -v -- db
-#     docker volume prune
-# }
+db_destroy() {
+    echo "${hr} Destroying db ${hr}"
+    echo_exec "docker-compose ${conf} down --volumes"
+}
 
 db_exists() {
     # TODO: Less naive detection of database service/image/volume
@@ -154,8 +153,6 @@ db() {
 test_frontend() {
     echo "${hr} Running frontend tests ${hr}"
     echo_exec "docker-compose ${conf} run --rm frontend yarn test:ci"
-    echo "$cmd"
-    $cmd
 }
 
 test_backend() {
@@ -168,9 +165,7 @@ test_backend() {
     fi
     echo "${hr} Running backend tests ${hr}"
     echo_exec "docker-compose ${conf} run --rm backend yarn test:ci"
-    echo "$cmd"
-    $cmd
-    db_stop
+    db_destroy
 }
 
 # 'run_tests', because `test` is a builtin shell command
@@ -243,17 +238,16 @@ compose_conf() {
     local env="${1}"
     local envfile="docker-compose.${env}.yml"
 
+    if [[ "$env" == "local" ]]; then
+        envfile="docker-compose.yml"
+    fi
+
     if [[ ! -e "$envfile" ]]; then
         echo "$envfile does not appear to exist!"
         exit 1
     fi
 
-    configs=(
-        '-f docker-compose.yml'
-        "-f docker-compose.${env}.yml"
-    )
-
-    echo "${configs[@]}"
+    echo "-f ${envfile}"
     return 0
 }
 
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
deleted file mode 100644
index 0ce8c997b4..0000000000
--- a/docker-compose.local.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "3.5"
-services:
-  backend:
-    environment:
-      - POSTGRES_HOST=postgres_docker_dev
-  db:
-    container_name: postgres_docker_dev
-    volumes:
-      - dbdata:/var/lib/postgresql/data
-
-volumes:
-  dbdata:
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 3953f45f96..1776c0854b 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,7 +1,50 @@
 version: "3.5"
 services:
   backend:
+    build:
+      context: .
+    command: yarn server
+    user: ${CURRENT_USER:-root}
+    ports:
+      - "8080:8080"
+    depends_on:
+      - testdb
     environment:
       - POSTGRES_HOST=postgres_docker_test
-  db:
+    volumes:
+      - ".:/app:rw"
+  frontend:
+    build:
+      context: .
+    command: yarn start
+    user: ${CURRENT_USER:-root}
+    stdin_open: true
+    ports:
+      - "3000:3000"
+    volumes:
+      - "./frontend:/app:rw"
+      - "./scripts:/app/scripts"
+    environment:
+      - BACKEND_PROXY=http://backend:8080
+  testdb:
+    image: postgres:12.4
     container_name: postgres_docker_test
+    env_file: .env
+    ports:
+      - "6543:5432"
+  minio:
+    image: minio/minio
+    env_file: .env
+    ports:
+      - "9000:9000"
+    volumes:
+      - miniodata:/data
+    command: server /data
+  aws-cli:
+    image: amazon/aws-cli
+    env_file: .env
+    command: ["--endpoint-url", "$S3_ENDPOINT", "s3api", "create-bucket", "--bucket", "$S3_BUCKET"]
+
+
+volumes:
+  miniodata: {}
diff --git a/docker-compose.yml b/docker-compose.yml
index 30e74cd554..e3fda8a1b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,8 @@ services:
       - "8080:8080"
     depends_on:
       - db
+    environment:
+      - POSTGRES_HOST=postgres_docker
     volumes:
       - ".:/app:rw"
   frontend:
@@ -34,9 +36,12 @@ services:
       - BACKEND_PROXY=http://backend:8080
   db:
     image: postgres:12.4
+    container_name: postgres_docker
     env_file: .env
     ports:
       - "6543:5432"
+    volumes:
+      - dbdata:/var/lib/postgresql/data
   minio:
     image: minio/minio
     env_file: .env
@@ -52,4 +57,5 @@ services:
 
 
 volumes:
+  dbdata: {}
   miniodata: {}

From 188b05f75d63755454204f48878f95e8bd2ef8f6 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Fri, 29 Jan 2021 16:20:16 -0500
Subject: [PATCH 16/37] Remove 2-liners in favor of echo_exec function

---
 bin/docker-run | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/bin/docker-run b/bin/docker-run
index ac40ce54d0..8061cbfdae 100755
--- a/bin/docker-run
+++ b/bin/docker-run
@@ -51,8 +51,6 @@ setup_backend() {
 setup_frontend() {
     echo "${hr} Setting up frontend ${hr}"
     echo_exec "docker-compose ${conf} run --rm frontend yarn install"
-    echo "$cmd"
-    $cmd
 }
 
 teardown() {
@@ -68,16 +66,12 @@ db_migrate() {
     if [[ "undo" == "${option}" ]]; then
         echo "${hr} Undoing db migrations ${hr}"
         echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate:undo"
-        echo "$cmd"
-        $cmd
         exit 0
     fi
 
     if [[ "status" == "${option}" ]]; then
         echo "${hr} Checking db migration status ${hr}"
         echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate:status"
-        echo "$cmd"
-        $cmd
         exit 0
     fi
 
@@ -85,8 +79,6 @@ db_migrate() {
     # yarn docker:db:migrate
     echo "${hr} Migrating db ${hr}"
     echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate"
-    echo "$cmd"
-    $cmd
 }
 
 db_seed() {
@@ -95,8 +87,6 @@ db_seed() {
     if [[ "undo" == "${option}" ]]; then
         echo "${hr} Unseeding db ${hr}"
         echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:seed:undo:all"
-        echo "$cmd"
-        $cmd
         exit 0
     fi
 
@@ -104,8 +94,6 @@ db_seed() {
     # yarn docker:db:seed
     echo "${hr} Seeding database ${hr}"
     echo_exec "docker-compose ${conf} run --rm backend yarn db:seed"
-    echo "$cmd"
-    $cmd
 }
 
 db_setup() {
@@ -115,8 +103,6 @@ db_setup() {
 
 db_stop() {
     echo_exec "docker-compose ${conf} stop db"
-    echo "$cmd"
-    $cmd
 }
 
 # Need reliable way to remove db volume and only db volume
@@ -192,15 +178,11 @@ run_tests() {
 lint_backend() {
     echo "${hr} Linting backend ${hr}"
     echo_exec "docker-compose ${conf} run --rm backend yarn lint:ci"
-    echo "$cmd"
-    $cmd
 }
 
 lint_frontend() {
     echo "${hr} Linting frontend ${hr}"
     echo_exec "docker-compose ${conf} run --rm frontend yarn lint:ci"
-    echo "$cmd"
-    $cmd
 }
 
 lint() {
@@ -220,14 +202,10 @@ lint() {
 
 start() {
     echo_exec "docker-compose ${conf} up"
-    echo "$cmd"
-    $cmd
 }
 
 stop() {
     echo_exec "docker-compose ${conf} down"
-    echo "$cmd"
-    $cmd
 }
 
 # ===== Process env configs

From ece7bb4b25a2f4fb920435b48e569198bf190405 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Fri, 29 Jan 2021 16:40:59 -0500
Subject: [PATCH 17/37] docker-run: Make default config a readonly var

---
 bin/docker-run | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/docker-run b/bin/docker-run
index 8061cbfdae..f5aed4bb72 100755
--- a/bin/docker-run
+++ b/bin/docker-run
@@ -3,6 +3,7 @@
 hr="=========="
 
 readonly SEQUELIZE_CLI="node_modules/.bin/sequelize"
+readonly DEFAULT_CONFIG='docker-compose.yml'
 readonly DEFAULT_ENV='local'
 readonly TEST_ENV='test'
 readonly -a ENVIRONMENTS=("$DEFAULT_ENV" "$TEST_ENV")
@@ -217,7 +218,7 @@ compose_conf() {
     local envfile="docker-compose.${env}.yml"
 
     if [[ "$env" == "local" ]]; then
-        envfile="docker-compose.yml"
+        envfile="$DEFAULT_CONFIG"
     fi
 
     if [[ ! -e "$envfile" ]]; then

From c8886f0d4364cb21e2af2d683d815bf90e8365ca Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Mon, 1 Feb 2021 17:18:35 -0500
Subject: [PATCH 18/37] Add simpler run-tests script. Improve
 docker-compose.test.yml with namespaced services, remove minodata volume.

---
 bin/run-tests           | 11 +++++++++++
 docker-compose.test.yml | 29 ++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100755 bin/run-tests

diff --git a/bin/run-tests b/bin/run-tests
new file mode 100755
index 0000000000..a1b7f9a63e
--- /dev/null
+++ b/bin/run-tests
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo "Running tests in using test config 'docker-compose.test.yml'"
+
+docker-compose \
+    -f 'docker-compose.test.yml' \
+    run test-backend bash -c "yarn db:migrate; yarn db:seed; yarn test:ci"
+wait
+docker-compose \
+    -f 'docker-compose.test.yml' \
+    down --volumes
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 1776c0854b..8ffc9491db 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,6 +1,6 @@
 version: "3.5"
 services:
-  backend:
+  test-backend:
     build:
       context: .
     command: yarn server
@@ -8,12 +8,14 @@ services:
     ports:
       - "8080:8080"
     depends_on:
-      - testdb
+      - test-db
     environment:
       - POSTGRES_HOST=postgres_docker_test
     volumes:
       - ".:/app:rw"
-  frontend:
+    networks:
+      - test
+  test-frontend:
     build:
       context: .
     command: yarn start
@@ -25,26 +27,31 @@ services:
       - "./frontend:/app:rw"
       - "./scripts:/app/scripts"
     environment:
-      - BACKEND_PROXY=http://backend:8080
-  testdb:
+      - BACKEND_PROXY=http://test-backend:8080
+    networks:
+      - test
+  test-db:
     image: postgres:12.4
     container_name: postgres_docker_test
     env_file: .env
     ports:
       - "6543:5432"
-  minio:
+    networks:
+      - test
+  test-minio:
     image: minio/minio
     env_file: .env
     ports:
       - "9000:9000"
-    volumes:
-      - miniodata:/data
     command: server /data
+    networks:
+      - test
   aws-cli:
     image: amazon/aws-cli
     env_file: .env
     command: ["--endpoint-url", "$S3_ENDPOINT", "s3api", "create-bucket", "--bucket", "$S3_BUCKET"]
+    networks:
+      - test
 
-
-volumes:
-  miniodata: {}
+networks:
+  test:

From 8b0beced865b3a9733bb5c61123dcc9d33451981 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Mon, 1 Feb 2021 17:20:07 -0500
Subject: [PATCH 19/37] Remove bin/docker-run since we are no longer composing
 multiple docker-compose files. Small scripts from here on out

---
 bin/docker-run | 327 -------------------------------------------------
 1 file changed, 327 deletions(-)
 delete mode 100755 bin/docker-run

diff --git a/bin/docker-run b/bin/docker-run
deleted file mode 100755
index f5aed4bb72..0000000000
--- a/bin/docker-run
+++ /dev/null
@@ -1,327 +0,0 @@
-#!/bin/bash
-
-hr="=========="
-
-readonly SEQUELIZE_CLI="node_modules/.bin/sequelize"
-readonly DEFAULT_CONFIG='docker-compose.yml'
-readonly DEFAULT_ENV='local'
-readonly TEST_ENV='test'
-readonly -a ENVIRONMENTS=("$DEFAULT_ENV" "$TEST_ENV")
-readonly DB_SERVICE='db'
-
-# Array of subcommands
-readonly -a subcommands=(
-    usage
-    setup
-    teardown
-    start
-    stop
-    db
-    lint
-    'test'
-)
-
-# conf should be assigned a string like `-f docker-compose.yml -f docker-compose.locale.yml`/conf
-declare conf
-declare -i env_override=0
-
-# Expects a command as a string, which it will echo and then execute
-echo_exec() {
-    local cmd="${1}"
-    echo "$cmd"
-    $cmd
-}
-
-setup() {
-    # First, setup up frontend and backend, install dependencies
-    # yarn docker:deps
-    setup_backend
-    setup_frontend
-
-    db_setup ""
-
-    # Stop the db manually?
-    # db_stop
-}
-
-setup_backend() {
-    echo "${hr} Setting up backend ${hr}"
-    echo_exec "docker-compose ${conf} run --rm backend yarn install"
-}
-
-setup_frontend() {
-    echo "${hr} Setting up frontend ${hr}"
-    echo_exec "docker-compose ${conf} run --rm frontend yarn install"
-}
-
-teardown() {
-    docker-compose \
-        "${conf}" \
-        down --volumes
-}
-
-db_migrate() {
-    local -a options=(status undo)
-    local option="${1}"
-    # If 'undo' param provided undo
-    if [[ "undo" == "${option}" ]]; then
-        echo "${hr} Undoing db migrations ${hr}"
-        echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate:undo"
-        exit 0
-    fi
-
-    if [[ "status" == "${option}" ]]; then
-        echo "${hr} Checking db migration status ${hr}"
-        echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate:status"
-        exit 0
-    fi
-
-    # Create/update database tables
-    # yarn docker:db:migrate
-    echo "${hr} Migrating db ${hr}"
-    echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:migrate"
-}
-
-db_seed() {
-    local option="${1}"
-    # If 'undo' param provided undo
-    if [[ "undo" == "${option}" ]]; then
-        echo "${hr} Unseeding db ${hr}"
-        echo_exec "docker-compose ${conf} run --rm backend $SEQUELIZE_CLI db:seed:undo:all"
-        exit 0
-    fi
-
-    # Populate db with data
-    # yarn docker:db:seed
-    echo "${hr} Seeding database ${hr}"
-    echo_exec "docker-compose ${conf} run --rm backend yarn db:seed"
-}
-
-db_setup() {
-    db_migrate ""
-    db_seed ""
-}
-
-db_stop() {
-    echo_exec "docker-compose ${conf} stop db"
-}
-
-# Need reliable way to remove db volume and only db volume
-db_destroy() {
-    echo "${hr} Destroying db ${hr}"
-    echo_exec "docker-compose ${conf} down --volumes"
-}
-
-db_exists() {
-    # TODO: Less naive detection of database service/image/volume
-    db_lookup="$(docker-compose images --quiet $DB_SERVICE)"
-    if [[ -n "$db_lookup" ]]; then
-        return 1
-    fi
-    return 0
-}
-
-db() {
-    declare -a options=(setup migrate seed stop)
-    option="${1}"
-    for i in "${options[@]}"; do
-        if [ "${i}" == "${option}" ]; then
-            shift 2>/dev/null
-            "db_${option}" "$@"
-            exit 0
-        fi
-    done
-
-    # If no matching option, print options
-    echo "db expects one of the following: ${options[*]}"
-    exit 1
-}
-
-test_frontend() {
-    echo "${hr} Running frontend tests ${hr}"
-    echo_exec "docker-compose ${conf} run --rm frontend yarn test:ci"
-}
-
-test_backend() {
-    # Check if db_exists, if not setup db
-    local -i has_db
-    has_db=$(db_exists)
-    if [[ has_db -eq 0 ]]; then
-        echo "${hr} Setting up database prior to testing ${hr}"
-        db_setup
-    fi
-    echo "${hr} Running backend tests ${hr}"
-    echo_exec "docker-compose ${conf} run --rm backend yarn test:ci"
-    db_destroy
-}
-
-# 'run_tests', because `test` is a builtin shell command
-run_tests() {
-    declare -a options=(frontend backend)
-    option="${1}"
-
-    # Check if user specified 'frontend' or 'backend' option
-    if [[ -n $option ]]; then
-        for i in "${options[@]}"; do
-            if [ "${i}" == "${option}" ]; then
-                "test_${option}"
-                exit 0
-            fi
-        done
-    fi
-
-    # Otherwise, run both
-    test_frontend
-    test_backend
-
-}
-
-lint_backend() {
-    echo "${hr} Linting backend ${hr}"
-    echo_exec "docker-compose ${conf} run --rm backend yarn lint:ci"
-}
-
-lint_frontend() {
-    echo "${hr} Linting frontend ${hr}"
-    echo_exec "docker-compose ${conf} run --rm frontend yarn lint:ci"
-}
-
-lint() {
-    local -a options=(frontend backend)
-    option="${1}"
-
-    for i in "${options[@]}"; do
-        if [[ "${i}" == "$option" ]]; then
-            "lint_${option}"
-            exit 0
-        fi
-    done
-
-    lint_frontend
-    lint_backend
-}
-
-start() {
-    echo_exec "docker-compose ${conf} up"
-}
-
-stop() {
-    echo_exec "docker-compose ${conf} down"
-}
-
-# ===== Process env configs
-
-# We want to specify multiple config files, per
-# https://docs.docker.com/compose/extends/#multiple-compose-files
-compose_conf() {
-    local env="${1}"
-    local envfile="docker-compose.${env}.yml"
-
-    if [[ "$env" == "local" ]]; then
-        envfile="$DEFAULT_CONFIG"
-    fi
-
-    if [[ ! -e "$envfile" ]]; then
-        echo "$envfile does not appear to exist!"
-        exit 1
-    fi
-
-    echo "-f ${envfile}"
-    return 0
-}
-
-# ===== Usage =====
-
-usage() {
-    # shellcheck disable=SC2086
-    cat <<EOF >&2
-Run commands in Docker containers
-Usage: $0 [-h] [-e env] <subcommand...>
-Subcommands:
-    ${subcommands[*]}
-EOF
-}
-
-# ====== Main =====
-
-check_env() {
-    local env_match=0
-    for e in "${ENVIRONMENTS[@]}"; do
-        if [[ "$e" == "${1}" ]]; then
-            env_match=1;
-            break;
-        fi
-    done
-    if [[ $env_match -eq 0 ]]; then
-        echo "Invalid environment '${1}'";
-        echo "Valid environments are: ${ENVIRONMENTS[*]}"
-        exit 1;
-    fi
-}
-
-main() {
-    docker_env="${DOCKER_ENV:-$DEFAULT_ENV}"
-    if [[ -n "$DOCKER_ENV" ]]; then
-        env_override=1
-    fi
-    local env_conf="$docker_env"
-    check_env "$env_conf"
-
-    # Parse -options
-    while getopts ":e:h" opt; do
-        case $opt in
-            e)
-                env_conf="${OPTARG:-$env_conf}"
-                check_env "$env_conf"
-                env_override=1
-                ;;
-            h)
-                usage
-                exit
-                ;;
-            \?)
-                echo "Invalid option" >&2
-                echo
-                ;;
-        esac
-    done
-
-    # After parsing options, shift so $@ has only params
-    shift $((OPTIND -1))
-
-    # Pull first param as subcommand, default to 'usage' if no args provided
-    local subcmd="${1:-usage}";
-
-    # Shift parameters, so $@a has remaining params
-    shift 2>/dev/null
-
-    # If subcommand is empty string, print usage
-    if [ -z "$subcmd" ]; then
-        usage
-        exit 1
-    fi
-
-    conf=$(compose_conf "$env_conf")
-
-    # Loop over subcommands, look for match with $subcommand. Execute fn if match
-    for i in "${subcommands[@]}"; do
-        if [[ "${i}" == "${subcmd}" ]]; then
-            if [[ "${subcmd}" == "test" ]]; then
-                if [[ $env_override -eq 0 ]]; then
-                    echo "${hr}> Test commands use 'test' config, unless overridden <${hr}"
-                    conf=$(compose_conf "$TEST_ENV")
-                else
-                    echo "Running tests in '$env_conf'"
-                fi
-                subcmd="run_tests";
-            fi
-            "${subcmd}" "$@"
-            exit 0
-        fi
-    done
-
-    # If we didn't run a subcommand and exit already, print usage
-    usage
-}
-
-main "$@"

From 43e18c98b6b383976cd56c7396acb5b8d3756a24 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Mon, 1 Feb 2021 17:25:35 -0500
Subject: [PATCH 20/37] One last rename

---
 .circleci/config.yml                             | 12 ++++++------
 docker-compose-dss.yml => docker-compose.dss.yml |  0
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename docker-compose-dss.yml => docker-compose.dss.yml (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7265c80d1f..4141476207 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -240,12 +240,12 @@ jobs:
       - run:
           name: Start up local server
           command: | # production style build (single BE server with static FE)
-            docker-compose -f docker-compose-dss.yml run --rm server yarn install --production=false
-            docker-compose -f docker-compose-dss.yml run --rm server yarn --cwd frontend install --production=false
-            docker-compose -f docker-compose-dss.yml run --rm server yarn build
-            docker-compose -f docker-compose-dss.yml run --rm server yarn --cwd frontend run build
-            docker-compose -f docker-compose-dss.yml up -d
-            docker-compose -f docker-compose-dss.yml exec server yarn db:migrate:ci
+            docker-compose -f docker-compose.dss.yml run --rm server yarn install --production=false
+            docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend install --production=false
+            docker-compose -f docker-compose.dss.yml run --rm server yarn build
+            docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend run build
+            docker-compose -f docker-compose.dss.yml up -d
+            docker-compose -f docker-compose.dss.yml exec server yarn db:migrate:ci
       - run:
           name: Pull OWASP ZAP docker image
           command: docker pull owasp/zap2docker-weekly
diff --git a/docker-compose-dss.yml b/docker-compose.dss.yml
similarity index 100%
rename from docker-compose-dss.yml
rename to docker-compose.dss.yml

From 90c4e502edb12a7d496d81a5a551c83542ccd4d0 Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Mon, 1 Feb 2021 18:41:14 -0600
Subject: [PATCH 21/37] Managers can add notes and set status of reports

 * Review page is now different if the user looking at the page is the
approving manager
 * Manager's review page includes the user's additional note and allows
the manager to leave a manager note
 * Manager note added to DB
 * Report state is shown in the side nav's "review" section once it
leaves "draft" mode
 * Policy, service and route added to update status of a report
---
 frontend/src/App.js                           |   2 +-
 .../components/Navigator/__tests__/index.js   |   5 +-
 .../Navigator/components/SideNav.css          |   7 +-
 .../Navigator/components/SideNav.js           |   8 +-
 .../src/components/Navigator/constants.js     |   2 +
 frontend/src/components/Navigator/index.js    |  16 +-
 frontend/src/fetchers/activityReports.js      |   6 +
 .../ActivityReport/Pages/ReviewSubmit.css     |   8 +
 .../ActivityReport/Pages/ReviewSubmit.js      | 166 ++++++++++++++----
 .../Pages/__tests__/ReviewSubmit.js           |  34 +++-
 .../src/pages/ActivityReport/Pages/index.js   |  36 ++--
 .../pages/ActivityReport/__tests__/index.js   |   1 +
 frontend/src/pages/ActivityReport/index.js    |  26 ++-
 src/middleware/authMiddleware.test.js         |   7 +
 ...8-add-manager-notes-to-activity-reports.js |  16 ++
 src/models/activityReport.js                  |   4 +
 src/policies/activityReport.js                |   4 +
 src/policies/activityReport.test.js           |  14 ++
 src/routes/activityReports/handlers.js        |  33 +++-
 src/routes/activityReports/handlers.test.js   |  43 ++++-
 src/routes/activityReports/index.js           |   9 +-
 src/services/activityReports.js               |  11 ++
 22 files changed, 376 insertions(+), 82 deletions(-)
 create mode 100644 frontend/src/pages/ActivityReport/Pages/ReviewSubmit.css
 create mode 100644 src/migrations/20210201174748-add-manager-notes-to-activity-reports.js

diff --git a/frontend/src/App.js b/frontend/src/App.js
index c992efaef2..88b9b04c9f 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -76,7 +76,7 @@ function App() {
         <Route
           path="/activity-reports/:activityReportId/:currentPage?"
           render={({ match }) => (
-            <ActivityReport match={match} />
+            <ActivityReport match={match} user={user} />
           )}
         />
         {admin
diff --git a/frontend/src/components/Navigator/__tests__/index.js b/frontend/src/components/Navigator/__tests__/index.js
index fde326316e..a11f34e5f7 100644
--- a/frontend/src/components/Navigator/__tests__/index.js
+++ b/frontend/src/components/Navigator/__tests__/index.js
@@ -42,7 +42,7 @@ const pages = [
     label: 'review page',
     path: 'review',
     review: true,
-    render: (hookForm, allComplete, formData, submitted, onSubmit) => (
+    render: (hookForm, allComplete, formData, onSubmit) => (
       <div>
         <button type="button" data-testid="review" onClick={onSubmit}>Continue</button>
       </div>
@@ -59,6 +59,9 @@ describe('Navigator', () => {
       <Navigator
         submitted={false}
         initialData={initialData}
+        status="draft"
+        onReview={() => {}}
+        approvingManager={false}
         defaultValues={{ first: '', second: '' }}
         pages={pages}
         currentPage={currentPage}
diff --git a/frontend/src/components/Navigator/components/SideNav.css b/frontend/src/components/Navigator/components/SideNav.css
index 685fc85f03..d917223677 100644
--- a/frontend/src/components/Navigator/components/SideNav.css
+++ b/frontend/src/components/Navigator/components/SideNav.css
@@ -49,8 +49,13 @@
   color: #f8f8f8;
 }
 
+.smart-hub--tag-needs-action {
+  background-color: #f9e0e4;
+  color: #d42240;
+}
+
 .smart-hub--tag {
-  width: 84px;
+  width: 94px;
   text-align: center;
   font-weight: normal;
   display: inline-block;
diff --git a/frontend/src/components/Navigator/components/SideNav.js b/frontend/src/components/Navigator/components/SideNav.js
index f1e172ff23..7de4990ba3 100644
--- a/frontend/src/components/Navigator/components/SideNav.js
+++ b/frontend/src/components/Navigator/components/SideNav.js
@@ -13,7 +13,7 @@ import moment from 'moment';
 import Container from '../../Container';
 import './SideNav.css';
 import {
-  NOT_STARTED, IN_PROGRESS, COMPLETE, SUBMITTED,
+  NOT_STARTED, IN_PROGRESS, COMPLETE, SUBMITTED, APPROVED, NEEDS_ACTION,
 } from '../constants';
 
 const tagClass = (state) => {
@@ -26,6 +26,10 @@ const tagClass = (state) => {
       return 'smart-hub--tag-complete';
     case SUBMITTED:
       return 'smart-hub--tag-submitted';
+    case APPROVED:
+      return 'smart-hub--tag-submitted';
+    case NEEDS_ACTION:
+      return 'smart-hub--tag-needs-action';
     default:
       return '';
   }
@@ -46,7 +50,7 @@ function SideNav({
       >
         <span className="margin-left-2">{page.label}</span>
         <span className="margin-left-auto margin-right-2">
-          {page.state
+          {page.state !== 'draft'
             && (
             <Tag className={`smart-hub--tag ${tagClass(page.state)}`}>
               {page.state}
diff --git a/frontend/src/components/Navigator/constants.js b/frontend/src/components/Navigator/constants.js
index 35cbee5d85..b644ef86cb 100644
--- a/frontend/src/components/Navigator/constants.js
+++ b/frontend/src/components/Navigator/constants.js
@@ -2,3 +2,5 @@ export const NOT_STARTED = 'Not started';
 export const IN_PROGRESS = 'In progress';
 export const COMPLETE = 'Complete';
 export const SUBMITTED = 'Submitted';
+export const APPROVED = 'Approved';
+export const NEEDS_ACTION = 'Needs Action';
diff --git a/frontend/src/components/Navigator/index.js b/frontend/src/components/Navigator/index.js
index 1b7f0c2650..a50fb62a24 100644
--- a/frontend/src/components/Navigator/index.js
+++ b/frontend/src/components/Navigator/index.js
@@ -15,7 +15,7 @@ import moment from 'moment';
 import Container from '../Container';
 
 import {
-  IN_PROGRESS, COMPLETE, SUBMITTED,
+  IN_PROGRESS, COMPLETE,
 } from './constants';
 import SideNav from './components/SideNav';
 import NavigatorHeader from './components/NavigatorHeader';
@@ -24,11 +24,13 @@ function Navigator({
   initialData,
   pages,
   onFormSubmit,
-  submitted,
+  onReview,
   currentPage,
   additionalData,
   onSave,
   autoSaveInterval,
+  approvingManager,
+  status,
 }) {
   const [formData, updateFormData] = useState(initialData);
   const [errorMessage, updateErrorMessage] = useState();
@@ -36,7 +38,6 @@ function Navigator({
   const { pageState } = formData;
 
   const page = pages.find((p) => p.path === currentPage);
-  const submittedNavState = submitted ? SUBMITTED : null;
   const allComplete = _.every(pageState, (state) => state === COMPLETE);
 
   const hookForm = useForm({
@@ -101,7 +102,7 @@ function Navigator({
   const navigatorPages = pages.map((p) => {
     const current = p.position === page.position;
     const stateOfPage = current ? IN_PROGRESS : pageState[p.position];
-    const state = p.review ? submittedNavState : stateOfPage;
+    const state = p.review ? status : stateOfPage;
     return {
       label: p.label,
       onNavigation: () => onSaveForm(false, p.position),
@@ -128,9 +129,10 @@ function Navigator({
               hookForm,
               allComplete,
               formData,
-              submitted,
               onFormSubmit,
               additionalData,
+              onReview,
+              approvingManager,
             )}
           {!page.review
             && (
@@ -156,8 +158,10 @@ function Navigator({
 Navigator.propTypes = {
   initialData: PropTypes.shape({}),
   onFormSubmit: PropTypes.func.isRequired,
-  submitted: PropTypes.bool.isRequired,
   onSave: PropTypes.func.isRequired,
+  status: PropTypes.string.isRequired,
+  onReview: PropTypes.func.isRequired,
+  approvingManager: PropTypes.bool.isRequired,
   pages: PropTypes.arrayOf(
     PropTypes.shape({
       review: PropTypes.bool.isRequired,
diff --git a/frontend/src/fetchers/activityReports.js b/frontend/src/fetchers/activityReports.js
index 5e4e92f4b3..476d4d734e 100644
--- a/frontend/src/fetchers/activityReports.js
+++ b/frontend/src/fetchers/activityReports.js
@@ -39,3 +39,9 @@ export const getCollaborators = async (region) => {
   const collaborators = await get(url);
   return collaborators.json();
 };
+
+export const reviewReport = async (reportId, data) => {
+  const url = join(activityReportUrl, reportId.toString(10), 'review');
+  const report = await put(url, data);
+  return report.json();
+};
diff --git a/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.css b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.css
new file mode 100644
index 0000000000..82dbcd2e28
--- /dev/null
+++ b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.css
@@ -0,0 +1,8 @@
+.smart-hub--creator-notes {
+  padding: 1rem;
+  background-color: #f8f8f8;
+}
+
+#status {
+  max-width: 270px;
+}
diff --git a/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
index 6670b9f252..4b5e12f3d7 100644
--- a/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
+++ b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import {
   Dropdown, Form, Label, Fieldset, Textarea, Alert, Button, Accordion,
@@ -6,16 +6,52 @@ import {
 import { Helmet } from 'react-helmet';
 
 import Container from '../../../components/Container';
+import './ReviewSubmit.css';
+
+const possibleStatus = [
+  'Approved',
+  'Needs Action',
+];
 
 const ReviewSubmit = ({
-  hookForm, allComplete, onSubmit, submitted, reviewItems, approvers,
+  hookForm,
+  allComplete,
+  onSubmit,
+  onReview,
+  reviewItems,
+  approvers,
+  approvingManager,
+  initialData,
 }) => {
   const { handleSubmit, register, formState } = hookForm;
+  const { additionalNotes } = initialData;
   const { isValid } = formState;
   const valid = allComplete && isValid;
 
-  const onFormSubmit = (data) => {
-    onSubmit(data);
+  const [submitted, updateSubmitted] = useState(false);
+  const [reviewed, updateReviewed] = useState(false);
+  const [error, updateError] = useState();
+
+  const onFormSubmit = async (data) => {
+    try {
+      await onSubmit(data);
+      updateSubmitted(true);
+      updateError();
+    } catch (e) {
+      updateSubmitted(false);
+      updateError('Unable to submit report');
+    }
+  };
+
+  const onFormReview = async (data) => {
+    try {
+      await onReview(data);
+      updateReviewed(true);
+      updateError();
+    } catch (e) {
+      updateReviewed(false);
+      updateError('Unable to review report');
+    }
   };
 
   const setValue = (e) => {
@@ -32,44 +68,92 @@ const ReviewSubmit = ({
       </Helmet>
       <Accordion bordered={false} items={reviewItems} />
       <Container skipTopPadding className="margin-top-2 padding-top-2">
-        <h3>Submit Report</h3>
-        {submitted
-        && (
-        <Alert noIcon className="margin-y-4" type="success">
-          <b>Success</b>
-          <br />
-          This report was successfully submitted for approval
-        </Alert>
-        )}
-        {!allComplete
-        && (
+        {error && (
         <Alert noIcon className="margin-y-4" type="error">
-          <b>Incomplete report</b>
+          <b>Error</b>
           <br />
-          This report cannot be submitted until all sections are complete
+          {error}
         </Alert>
         )}
-        <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormSubmit)}>
-          <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Additional Notes">
-            <Label htmlFor="additionalNotes">Creator notes</Label>
-            <Textarea inputRef={register} id="additionalNotes" name="additionalNotes" />
-          </Fieldset>
-          <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
-            <p className="margin-top-4">
-              Submitting this form for approval means that you will no longer be in draft mode.
-              Please review all information in each section before submitting to your manager for
-              approval.
-            </p>
-            <Label htmlFor="approvingManagerId">Approving manager</Label>
-            <Dropdown id="approvingManagerId" name="approvingManagerId" inputRef={register({ setValueAs: setValue, required: true })}>
-              <option name="default" value="" disabled hidden>Select a Manager...</option>
-              {approvers.map((approver) => (
-                <option key={approver.id} value={approver.id}>{approver.name}</option>
-              ))}
-            </Dropdown>
-          </Fieldset>
-          <Button type="submit" disabled={!valid}>Submit for approval</Button>
-        </Form>
+        {!approvingManager
+          && (
+            <>
+              {submitted
+              && (
+              <Alert noIcon className="margin-y-4" type="success">
+                <b>Success</b>
+                <br />
+                This report was successfully submitted for approval
+              </Alert>
+              )}
+              {!allComplete
+              && (
+              <Alert noIcon className="margin-y-4" type="error">
+                <b>Incomplete report</b>
+                <br />
+                This report cannot be submitted until all sections are complete
+              </Alert>
+              )}
+              <h2>Submit Report</h2>
+              <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormSubmit)}>
+                <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Additional Notes">
+                  <Label htmlFor="additionalNotes">Creator notes</Label>
+                  <Textarea inputRef={register} id="additionalNotes" name="additionalNotes" />
+                </Fieldset>
+                <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
+                  <p className="margin-top-4">
+                    Submitting this form for approval means that you will no longer be in draft
+                    mode. Please review all information in each section before submitting to your
+                    manager for approval.
+                  </p>
+                  <Label htmlFor="approvingManagerId">Approving manager</Label>
+                  <Dropdown id="approvingManagerId" name="approvingManagerId" inputRef={register({ setValueAs: setValue, required: true })}>
+                    <option name="default" value="" disabled hidden>Select a Manager...</option>
+                    {approvers.map((approver) => (
+                      <option key={approver.id} value={approver.id}>{approver.name}</option>
+                    ))}
+                  </Dropdown>
+                </Fieldset>
+                <Button type="submit" disabled={!valid}>Submit for approval</Button>
+              </Form>
+            </>
+          )}
+        {approvingManager
+          && (
+            <>
+              {reviewed
+              && (
+              <Alert noIcon className="margin-y-4" type="success">
+                <b>Success</b>
+                <br />
+                Your review of this report was successfully submitted
+              </Alert>
+              )}
+              <h2>Review and approve report</h2>
+              <div className="smart-hub--creator-notes">
+                <p>
+                  <span className="text-bold">Creator notes</span>
+                  <br />
+                  <br />
+                  { additionalNotes || 'No creator notes' }
+                </p>
+              </div>
+              <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormReview)}>
+                <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
+                  <Label htmlFor="managerNotes">Manager notes</Label>
+                  <Textarea inputRef={register} id="managerNotes" name="managerNotes" />
+                </Fieldset>
+                <Label htmlFor="status">Choose report status</Label>
+                <Dropdown id="status" name="status" defaultValue="" inputRef={register({ required: true })}>
+                  <option name="default" value="" disabled hidden>- Select -</option>
+                  {possibleStatus.map((status) => (
+                    <option key={status} value={status}>{status}</option>
+                  ))}
+                </Dropdown>
+                <Button type="submit" disabled={!valid}>Submit</Button>
+              </Form>
+            </>
+          )}
       </Container>
     </>
   );
@@ -84,7 +168,11 @@ ReviewSubmit.propTypes = {
   ).isRequired,
   allComplete: PropTypes.bool.isRequired,
   onSubmit: PropTypes.func.isRequired,
-  submitted: PropTypes.bool.isRequired,
+  onReview: PropTypes.func.isRequired,
+  approvingManager: PropTypes.bool.isRequired,
+  initialData: PropTypes.shape({
+    additionalNotes: PropTypes.string,
+  }).isRequired,
   // eslint-disable-next-line react/forbid-prop-types
   hookForm: PropTypes.object.isRequired,
   reviewItems: PropTypes.arrayOf(
diff --git a/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js b/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
index d6f97d10b2..351ad059f0 100644
--- a/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
+++ b/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
@@ -13,31 +13,42 @@ const approvers = [
 
 const RenderReview = ({
   // eslint-disable-next-line react/prop-types
-  allComplete, submitted, initialData, onSubmit,
+  allComplete, initialData, onSubmit, onReview, approvingManagerId, approvingManager,
 }) => {
   const hookForm = useForm({
     mode: 'onChange',
-    defaultValues: { ...initialData, approvingManagerId: null },
+    defaultValues: { ...initialData, approvingManagerId },
   });
   return (
     <ReviewSubmit
       allComplete={allComplete}
-      submitted={submitted}
       onSubmit={onSubmit}
       reviewItems={[]}
       approvers={approvers}
       hookForm={hookForm}
+      initialData={initialData}
+      onReview={onReview}
+      approvingManager={approvingManager}
     />
   );
 };
 
-const renderReview = (allComplete, submitted, initialData = {}, onSubmit = () => {}) => {
+const renderReview = (
+  allComplete,
+  approvingManager = false,
+  initialData = {},
+  onSubmit = () => {},
+  onReview = () => {},
+  approvingManagerId = null,
+) => {
   render(
     <RenderReview
       allComplete={allComplete}
-      submitted={submitted}
       onSubmit={onSubmit}
       initialData={initialData}
+      approvingManager={approvingManager}
+      onReview={onReview}
+      approvingManagerId={approvingManagerId}
     />,
   );
 };
@@ -45,6 +56,14 @@ const renderReview = (allComplete, submitted, initialData = {}, onSubmit = () =>
 const selectLabel = 'Approving manager';
 
 describe('ReviewSubmit', () => {
+  describe('when the user is the approving manager', () => {
+    it('shows the manager UI', async () => {
+      renderReview(true, true);
+      const header = await screen.findByText('Review and approve report');
+      expect(header).toBeVisible();
+    });
+  });
+
   describe('when the form is not complete', () => {
     it('an error alert is shown', async () => {
       renderReview(false, false);
@@ -79,13 +98,14 @@ describe('ReviewSubmit', () => {
   });
 
   it('a success modal is shown once submitted', async () => {
-    renderReview(true, true);
+    renderReview(true, false, {}, () => {}, () => {}, 1);
+    userEvent.click(await screen.findByTestId('button'));
     const alert = await screen.findByTestId('alert');
     expect(alert).toHaveClass('usa-alert--success');
   });
 
   it('initializes the form with "initialData"', async () => {
-    renderReview(true, true, { additionalNotes: 'test' });
+    renderReview(true, false, { additionalNotes: 'test' });
     const textBox = await screen.findByLabelText('Creator notes');
     await waitFor(() => expect(textBox).toHaveValue('test'));
   });
diff --git a/frontend/src/pages/ActivityReport/Pages/index.js b/frontend/src/pages/ActivityReport/Pages/index.js
index eaf5e5533b..b8907e27c6 100644
--- a/frontend/src/pages/ActivityReport/Pages/index.js
+++ b/frontend/src/pages/ActivityReport/Pages/index.js
@@ -26,19 +26,29 @@ const reviewPage = {
   review: true,
   label: 'Review and submit',
   path: 'review',
-  render: (hookForm, allComplete, formData, submitted, onSubmit, additionalData) => (
-    <ReviewSubmit
-      approvers={additionalData.approvers}
-      allComplete={allComplete}
-      onSubmit={onSubmit}
-      submitted={submitted}
-      hookForm={hookForm}
-      reviewItems={
-        pages.map((p) => reviewItem(p.path, p.label, p.sections, formData))
-      }
-      initialData={formData}
-    />
-  ),
+  render:
+    (
+      hookForm,
+      allComplete,
+      formData,
+      onSubmit,
+      additionalData,
+      onReview,
+      approvingManager,
+    ) => (
+      <ReviewSubmit
+        approvers={additionalData.approvers}
+        allComplete={allComplete}
+        onSubmit={onSubmit}
+        onReview={onReview}
+        hookForm={hookForm}
+        approvingManager={approvingManager}
+        reviewItems={
+          pages.map((p) => reviewItem(p.path, p.label, p.sections, formData))
+        }
+        initialData={formData}
+      />
+    ),
 };
 
 export default [...pages, reviewPage];
diff --git a/frontend/src/pages/ActivityReport/__tests__/index.js b/frontend/src/pages/ActivityReport/__tests__/index.js
index b68a17b4bc..b58b199490 100644
--- a/frontend/src/pages/ActivityReport/__tests__/index.js
+++ b/frontend/src/pages/ActivityReport/__tests__/index.js
@@ -43,6 +43,7 @@ const renderActivityReport = (id, location = 'activity-summary') => {
     <Router history={history}>
       <ActivityReport
         match={{ params: { currentPage: location, activityReportId: id }, path: '', url: '' }}
+        user={{ id: 1 }}
       />
     </Router>,
   );
diff --git a/frontend/src/pages/ActivityReport/index.js b/frontend/src/pages/ActivityReport/index.js
index 7177a288c5..b8966e062a 100644
--- a/frontend/src/pages/ActivityReport/index.js
+++ b/frontend/src/pages/ActivityReport/index.js
@@ -3,6 +3,7 @@
   multiple pages. Each "page" is defined in the `./Pages` directory.
 */
 import React, { useState, useEffect, useRef } from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { Helmet } from 'react-helmet';
 import ReactRouterPropTypes from 'react-router-prop-types';
@@ -22,6 +23,7 @@ import {
   createReport,
   getCollaborators,
   getApprovers,
+  reviewReport,
 } from '../../fetchers/activityReports';
 
 const defaultValues = {
@@ -52,14 +54,15 @@ const region = 1;
 const pagesByPos = _.keyBy(pages.filter((p) => !p.review), (page) => page.position);
 const defaultPageState = _.mapValues(pagesByPos, () => NOT_STARTED);
 
-function ActivityReport({ match }) {
+function ActivityReport({ match, user }) {
   const { params: { currentPage, activityReportId } } = match;
   const history = useHistory();
-  const [submitted, updateSubmitted] = useState();
+  const [status, updateStatus] = useState();
   const [error, updateError] = useState();
   const [loading, updateLoading] = useState(true);
   const [initialFormData, updateInitialFormData] = useState(defaultValues);
   const [initialAdditionalData, updateAdditionalData] = useState({});
+  const [approvingManager, updateApprovingManager] = useState(false);
   const reportId = useRef();
 
   useEffect(() => {
@@ -84,7 +87,8 @@ function ActivityReport({ match }) {
         reportId.current = activityReportId;
         updateAdditionalData({ recipients, collaborators, approvers });
         updateInitialFormData(report);
-        updateSubmitted(report.status === 'submitted');
+        updateStatus(report.status || 'draft');
+        updateApprovingManager(report.approvingManagerId === user.id);
         updateError();
       } catch (e) {
         updateError('Unable to load activity report');
@@ -93,7 +97,7 @@ function ActivityReport({ match }) {
       }
     };
     fetch();
-  }, [activityReportId]);
+  }, [activityReportId, user.id]);
 
   if (loading) {
     return (
@@ -144,7 +148,12 @@ function ActivityReport({ match }) {
 
   const onFormSubmit = async (data) => {
     const report = await submitReport(reportId.current, data);
-    updateSubmitted(report.status === 'submitted');
+    updateStatus(report.status);
+  };
+
+  const onReview = async (data) => {
+    const report = await reviewReport(reportId.current, data);
+    updateStatus(report.status);
   };
 
   return (
@@ -153,12 +162,14 @@ function ActivityReport({ match }) {
       <h1 className="new-activity-report">New activity report for Region 14</h1>
       <Navigator
         currentPage={currentPage}
-        submitted={submitted}
         additionalData={initialAdditionalData}
         initialData={{ ...defaultValues, ...initialFormData }}
         pages={pages}
         onFormSubmit={onFormSubmit}
         onSave={onSave}
+        status={status}
+        approvingManager={approvingManager}
+        onReview={onReview}
       />
     </>
   );
@@ -166,6 +177,9 @@ function ActivityReport({ match }) {
 
 ActivityReport.propTypes = {
   match: ReactRouterPropTypes.match.isRequired,
+  user: PropTypes.shape({
+    id: PropTypes.number,
+  }).isRequired,
 };
 
 export default ActivityReport;
diff --git a/src/middleware/authMiddleware.test.js b/src/middleware/authMiddleware.test.js
index c77041b7bf..20b188fe03 100644
--- a/src/middleware/authMiddleware.test.js
+++ b/src/middleware/authMiddleware.test.js
@@ -38,8 +38,13 @@ describe('authMiddleware', () => {
     })
   );
 
+  const destroyUser = async (user) => (
+    User.destroy({ where: { id: user.id } })
+  );
+
   it('should allow access if user data is present', async () => {
     await setupUser(mockUser);
+    process.env.CURRENT_USER_ID = 63;
 
     const mockNext = jest.fn();
     const mockSession = jest.fn();
@@ -55,6 +60,7 @@ describe('authMiddleware', () => {
     await authMiddleware(mockRequest, mockResponse, mockNext);
     expect(mockResponse.redirect).not.toHaveBeenCalled();
     expect(mockNext).toHaveBeenCalled();
+    await destroyUser(mockUser);
   });
 
   it('should redirect to login if user data is not present', async () => {
@@ -125,6 +131,7 @@ describe('authMiddleware', () => {
     await authMiddleware(mockRequest, mockResponse, mockNext);
     expect(mockResponse.redirect).not.toHaveBeenCalled();
     expect(mockNext).toHaveBeenCalled();
+    await destroyUser(user);
   });
 
   it('require authorization if variables are set NOT for UAT or accessibility testing', async () => {
diff --git a/src/migrations/20210201174748-add-manager-notes-to-activity-reports.js b/src/migrations/20210201174748-add-manager-notes-to-activity-reports.js
new file mode 100644
index 0000000000..137ee344a2
--- /dev/null
+++ b/src/migrations/20210201174748-add-manager-notes-to-activity-reports.js
@@ -0,0 +1,16 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    queryInterface.addColumn(
+      'ActivityReports',
+      'managerNotes',
+      {
+        type: Sequelize.DataTypes.TEXT,
+        allowNull: true,
+      },
+    );
+  },
+
+  down: async (queryInterface) => {
+    queryInterface.removeColumn('ActivityReports', 'managerNotes');
+  },
+};
diff --git a/src/models/activityReport.js b/src/models/activityReport.js
index 0c00b30f69..7309dc23e1 100644
--- a/src/models/activityReport.js
+++ b/src/models/activityReport.js
@@ -95,6 +95,10 @@ export default (sequelize, DataTypes) => {
       type: DataTypes.INTEGER,
       allowNull: false,
     },
+    managerNotes: {
+      type: DataTypes.TEXT,
+      allowNull: true,
+    },
     status: {
       allowNull: false,
       type: DataTypes.STRING,
diff --git a/src/policies/activityReport.js b/src/policies/activityReport.js
index f501e5d387..2c1800bf2c 100644
--- a/src/policies/activityReport.js
+++ b/src/policies/activityReport.js
@@ -15,6 +15,10 @@ export default class ActivityReport {
     this.activityReport = activityReport;
   }
 
+  canReview() {
+    return this.isApprovingManager();
+  }
+
   canCreate() {
     return this.canWriteInRegion();
   }
diff --git a/src/policies/activityReport.test.js b/src/policies/activityReport.test.js
index 93e2967164..d434842ac5 100644
--- a/src/policies/activityReport.test.js
+++ b/src/policies/activityReport.test.js
@@ -42,6 +42,20 @@ const manager = user(true, false, 3);
 const otherUser = user(false, true, 4);
 
 describe('Activity Report policies', () => {
+  describe('canReview', () => {
+    it('is true if the user is the approving manager', () => {
+      const report = activityReport(author.id, null, 'submitted', manager.id);
+      const policy = new ActivityReport(manager, report);
+      expect(policy.canReview()).toBeTruthy();
+    });
+
+    it('is false if the user is not the approving manager', () => {
+      const report = activityReport(author.id);
+      const policy = new ActivityReport(author, report);
+      expect(policy.canReview()).toBeFalsy();
+    });
+  });
+
   describe('canCreate', () => {
     it('is true if the user has write permissions in the region', () => {
       const report = activityReport(author.id);
diff --git a/src/routes/activityReports/handlers.js b/src/routes/activityReports/handlers.js
index 9dfe50714d..9950db5f87 100644
--- a/src/routes/activityReports/handlers.js
+++ b/src/routes/activityReports/handlers.js
@@ -2,7 +2,7 @@ import handleErrors from '../../lib/apiErrorHandler';
 import SCOPES from '../../middleware/scopeConstants';
 import ActivityReport from '../../policies/activityReport';
 import {
-  possibleRecipients, activityReportById, createOrUpdate,
+  possibleRecipients, activityReportById, createOrUpdate, review,
 } from '../../services/activityReports';
 import { userById, usersWithPermissions } from '../../services/users';
 
@@ -31,6 +31,33 @@ export async function getApprovers(req, res) {
   }
 }
 
+/**
+ * Review a report setting it's status to approved or needs action
+ *
+ * @param {*} req - request
+ * @param {*} res - response
+ */
+export async function reviewReport(req, res) {
+  try {
+    const { activityReportId } = req.params;
+    const { status, managerNotes } = req.body;
+
+    const user = await userById(req.session.userId);
+    const report = await activityReportById(activityReportId);
+    const authorization = new ActivityReport(user, report);
+
+    if (!authorization.canReview()) {
+      res.sendStatus(403);
+      return;
+    }
+
+    const savedReport = await review(report, status, managerNotes);
+    res.json(savedReport);
+  } catch (error) {
+    await handleErrors(req, res, error, logContext);
+  }
+}
+
 /**
  * Flags a report as submitted for approval
  *
@@ -42,7 +69,7 @@ export async function submitReport(req, res) {
     const { activityReportId } = req.params;
     const { approvingManagerId, additionalNotes } = req.body;
     const newReport = { approvingManagerId, additionalNotes };
-    newReport.status = 'submitted';
+    newReport.status = 'Submitted';
 
     const user = await userById(req.session.userId);
     const report = await activityReportById(activityReportId);
@@ -53,7 +80,7 @@ export async function submitReport(req, res) {
       return;
     }
 
-    const savedReport = await createOrUpdate(newReport, activityReportId);
+    const savedReport = await createOrUpdate(newReport, report);
     res.json(savedReport);
   } catch (error) {
     await handleErrors(req, res, error, logContext);
diff --git a/src/routes/activityReports/handlers.test.js b/src/routes/activityReports/handlers.test.js
index 3f364e3475..995ee787ea 100644
--- a/src/routes/activityReports/handlers.test.js
+++ b/src/routes/activityReports/handlers.test.js
@@ -1,7 +1,15 @@
 import {
-  getReport, saveReport, createReport, getActivityRecipients, getApprovers, submitReport,
+  getReport,
+  saveReport,
+  createReport,
+  getActivityRecipients,
+  getApprovers,
+  submitReport,
+  reviewReport,
 } from './handlers';
-import { activityReportById, createOrUpdate, possibleRecipients } from '../../services/activityReports';
+import {
+  activityReportById, createOrUpdate, possibleRecipients, review,
+} from '../../services/activityReports';
 import { userById, usersWithPermissions } from '../../services/users';
 import ActivityReport from '../../policies/activityReport';
 
@@ -9,6 +17,7 @@ jest.mock('../../services/activityReports', () => ({
   activityReportById: jest.fn(),
   createOrUpdate: jest.fn(),
   possibleRecipients: jest.fn(),
+  review: jest.fn(),
 }));
 
 jest.mock('../../services/users', () => ({
@@ -43,6 +52,36 @@ describe('Activity Report handlers', () => {
     jest.clearAllMocks();
   });
 
+  describe('reviewReport', () => {
+    const request = {
+      ...mockRequest,
+      params: { activityReportId: 1 },
+      body: { status: 'Approved', managerNotes: 'notes' },
+    };
+
+    it('returns the new status', async () => {
+      ActivityReport.mockImplementationOnce(() => ({
+        canReview: () => true,
+      }));
+      activityReportById.mockResolvedValue({ status: 'Approved' });
+      review.mockResolvedValue({ status: 'Approved' });
+      userById.mockResolvedValue({
+        id: 1,
+      });
+      await reviewReport(request, mockResponse);
+      expect(mockResponse.json).toHaveBeenCalledWith({ status: 'Approved' });
+    });
+
+    it('handles unauthorizedRequests', async () => {
+      ActivityReport.mockImplementationOnce(() => ({
+        canReview: () => false,
+      }));
+      activityReportById.mockResolvedValue({ status: 'Approved' });
+      await reviewReport(request, mockResponse);
+      expect(mockResponse.sendStatus).toHaveBeenCalledWith(403);
+    });
+  });
+
   describe('submitReport', () => {
     const request = {
       ...mockRequest,
diff --git a/src/routes/activityReports/index.js b/src/routes/activityReports/index.js
index 7683d23c8a..3559cf5a59 100644
--- a/src/routes/activityReports/index.js
+++ b/src/routes/activityReports/index.js
@@ -1,6 +1,12 @@
 import express from 'express';
 import {
-  getApprovers, submitReport, saveReport, createReport, getReport, getActivityRecipients,
+  getApprovers,
+  submitReport,
+  saveReport,
+  createReport,
+  getReport,
+  getActivityRecipients,
+  reviewReport,
 } from './handlers';
 
 const router = express.Router();
@@ -14,6 +20,7 @@ router.get('/approvers', getApprovers);
 router.get('/activity-recipients', getActivityRecipients);
 router.get('/:activityReportId', getReport);
 router.put('/:activityReportId', saveReport);
+router.put('/:activityReportId/review', reviewReport);
 router.post('/:activityReportId/submit', submitReport);
 
 export default router;
diff --git a/src/services/activityReports.js b/src/services/activityReports.js
index 9e601fcd67..b81b93784b 100644
--- a/src/services/activityReports.js
+++ b/src/services/activityReports.js
@@ -107,6 +107,17 @@ async function create(report, transaction) {
   return ActivityReport.create(report, { transaction });
 }
 
+export async function review(report, status, managerNotes) {
+  const updatedReport = await report.update({
+    status,
+    managerNotes,
+  },
+  {
+    fields: ['status', 'managerNotes'],
+  });
+  return updatedReport;
+}
+
 export function activityReportById(activityReportId) {
   return ActivityReport.findOne({
     where: {

From 975711e37f7f5aef06c342a217ad0a3e1499306d Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Mon, 1 Feb 2021 19:15:26 -0600
Subject: [PATCH 22/37] Add API docs

---
 .../paths/activity-reports/review.yaml        | 40 +++++++++++++++++++
 docs/openapi/paths/index.yaml                 |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 docs/openapi/paths/activity-reports/review.yaml

diff --git a/docs/openapi/paths/activity-reports/review.yaml b/docs/openapi/paths/activity-reports/review.yaml
new file mode 100644
index 0000000000..4b2e397bb5
--- /dev/null
+++ b/docs/openapi/paths/activity-reports/review.yaml
@@ -0,0 +1,40 @@
+put:
+  tags:
+    - activity-reports
+  summary: Review an activity report
+  description: >
+    An approving manager reviews an activity report to determine if it requires
+    any additional updates. If the report needs updates the manager sets the status to
+    'Needs Action', otherwise to 'Approved'
+  requestBody:
+    description: The status and any manager notes
+    required: true
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            status:
+              type: string
+              description: The status of the report after review
+            managerNotes:
+              type: string
+              description: Any notes the manager needs to relay to the author/collaborators of the report
+  parameters:
+    - in: path
+      name: activityReportId
+      required: true
+      schema:
+        type: number
+  responses:
+    200:
+      description: The new status of the activity report
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              status:
+                type: string
+              managerNotes:
+                type: string
diff --git a/docs/openapi/paths/index.yaml b/docs/openapi/paths/index.yaml
index d3b0a8f797..af6eaf2bce 100644
--- a/docs/openapi/paths/index.yaml
+++ b/docs/openapi/paths/index.yaml
@@ -22,5 +22,7 @@
   $ref: './activity-reports/activity-reports-id.yaml'
 '/activity-reports/{activityReportId}/submit':
   $ref: './activity-reports/submit.yaml'
+'/activity-reports/{activityReportId}/review':
+  $ref: './activity-reports/review.yaml'
 '/files':
   $ref: './files.yaml'

From fe19276da5421cd8fc0ec831f53784772054102d Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Mon, 1 Feb 2021 19:17:34 -0600
Subject: [PATCH 23/37] Update DB diagram

---
 docs/logical_data_model.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/logical_data_model.md b/docs/logical_data_model.md
index d2c956d07f..f2e1517474 100644
--- a/docs/logical_data_model.md
+++ b/docs/logical_data_model.md
@@ -1,7 +1,7 @@
 Logical Data Model
 ==================
 
-<img src="http://www.plantuml.com/plantuml/png/nLVRRjms47tNL_2jhG4RHOkYG604ITnDuOTk3TlvW5bfh6LBSjZXoEd2zhzNNAQgg9LTPjNBIsATkHyUNlPD463fhAb23GRLrsVVVrTLNoYu9zqepxGnQ8Fwg6MhmBK66rKpVGpg3b6gyAjs7XYiCjgXx3mgOjbILTK6Gb0V0h9wg9GwKNssLqexmRQ7pizRTCWWsBn-tPkt0KFqlOnEGLYxjaSTM1n_-oqvN7TsWpo6JnHQq6OCYHQ3hnIwpiRiPF4QMqtkSjJ4bzz-yvMwNhrVNQ_M5wiRvRkDqVLPSWndkjcdhXbZbs-b3nHjCGXOlxTqlfcnFFqvUifJClp9PD0XnKrD7e_9e5I3eMRjHPCRq4NZN25R7KBnI5r0Bc0xBlh0DH-vHY7oL12sv_EVMDdVkXvRCHE74ZR8nmzDRhn27UlnfqNPKgP-JcNUKRFBuU391NmElw061tpXe6JcvFUIP6_9wxeyPYYJuegKnMHA5Zjc7TPQOlhBvkzYzbqi5yYF1AQC0wM2W7HXZCI4Tpnnq-4zaxsnm1AsY78hS6KW2cf3P13SeexJihtKTjlR2aYFAVulqXcSOA5UbrTwjixqUZhwL6lJG2Mi9yyKE15KGbX-0C79eEYQ0tGvCL421Hlvc05pQahZKjGH6bx4nPfSwlgO2tnPwRUrw7ijkslqn59IdZ5Gn_N-3PRTGT0qEbvSODOacAag2VtdkojWqRNsaUbiBpHez3toxgU3cwtfXkkmmLfRC9aQut23R3C8XidwWXgTtEuypjoPq_VXuPxmJ2s3ZV4H1sROdITh94I0MvGhyftPTphdmmY1t8p1vunCpEbOd3K8f7aEB3KvmTyb6m1Ql974pY-1tD6FBWD1FYH1lTlzoo-sJs7BfJqINTdsWcnF53ISRwBK-6STEod43ST0GTnwS5vELDR-1Ha36s8Gul-AhyyLP0pfsuz_giV7KtfGIJC9UQBJqyU7qQ-GAlquEiHJr9o1pE2_VtDKwT7vzBY7uh5V9Ve7j-52g-8_1sXAUNQcul-ZbFDGAZfaco2fS9nyAF5fb1pBUOv9db_gHDsBBXdXcTkqLEQJxS3KVBJFc_-IzVC-Rz0rdJL_0000">
+<img src="http://www.plantuml.com/plantuml/png/nLVRRkCs47tNL_2jRO04HOkYm29Ox6xgBV9GDqYo7p2M9Z9RaiCEHzaQIVwzeeaGeksaNAkNbyGwSpyy5AbtGO1biAO9BHXKtvxz-4FJVANWddIdFDFAe0tgivQr0jSRx5JBz3ceEqHfmk_QUM2mocY7il6eY6LDJTCQ245z2iZgeL7gH8tPtYZj1FiHEZ_lqI63OFVsxMXU1mpHzp8w1M7j-X5rO77wxDVaS3dO5V8KFb5eGPif95eClb7e1XkpayLhx3MvoqaJNt__tJVgUl5nSRrONYnkb1zMHhTdoJ6SwMwRkcMCNRwNCL2qnI1W_TOo-Ew0vUbvz9IdPlYJdK5pYfkMF1wJGQaEGylQYoQNqLdZN25R7KBrI4D0hc0xBdhccezSen1vgWZRylbFhEmVmuWjc8b33HlauuCcDrsXWVNqqQAigL0_fp8VgDkKSF3a0hw4Nr276PyvA9b3ydjDihVaTLiVaykak2fbCPcQnOvPyrfBJ7_P_LtCjelv0lcPmDHne5GGa25CaPZmZdVSTFZ8P6yii8GrejmAN1c8WbeH6GGtg-EqRA-rtO-s2j9ZYl-BT0OdMAdN-PLUhBDtF1txLklJG3Mi9yyKk2UeYB3y188xWwBhzj3vn4G9L6paOmOigQcDYr77Q7WU5qjogUjZ3l1vfT-tek-rRAxH4qjDUSP00xVRErXn1a7NwNXmWLcIOA6g9FHVxww0HRVQHwQBlT2XqVV8cr_sJhPkoCTXXwssO0ernk6oR0i8ycHZGOrERZSU3voPk_V3_JtXcNe66-CZ3iomEK_MI8W0zoXNv0UpxVIG3oC4SWSClc1arvnUYmSD0ccUFKjBJl1FAGQ07cyaiVDR83T25jm8ShbIHr_630Jvb8JsOVClt-IUmsPBVYB6kcq7nLwfQBZSNAdnBteTfH2NNmyLSSliF9keilqBCWPMn234_nLVNoh863As7t-gnyTJUb19CmbvejFJnuV9rqcJFfhsyHHro40c-s_l8aswZ3uzRg5u73I9_koM3xec_jb3KygpCnN_JrCUX5BHd2qZHU5nybpYUPG2AtcEILvUwaJTgou5uONRRgd2fzY1gVbeFspEiiQNVTwXwmPh_W80">
 
 UML Source
 ----------
@@ -150,6 +150,7 @@ class ActivityReport {
   ttaType : array<string>
   context : string
   pageState : json
+  managerNotes : string
   * userId : integer(32) REFERENCES public.Users.id
   * lastUpdatedById : integer(32) REFERENCES public.Users.id
   * regionId : integer(32) REFERENCES public.Region.id
@@ -199,7 +200,7 @@ NonGrantee ||-{ ActivityParticipant
 Instructions
 ------------
 
-1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/umla/nLVRRjms47tNL_2jhG4RHOkYG604ITnDuOTk3TlvW5bfh6LBSjZXoEd2zhzNNAQgg9LTPjNBIsATkHyUNlPD463fhAb23GRLrsVVVrTLNoYu9zqepxGnQ8Fwg6MhmBK66rKpVGpg3b6gyAjs7XYiCjgXx3mgOjbILTK6Gb0V0h9wg9GwKNssLqexmRQ7pizRTCWWsBn-tPkt0KFqlOnEGLYxjaSTM1n_-oqvN7TsWpo6JnHQq6OCYHQ3hnIwpiRiPF4QMqtkSjJ4bzz-yvMwNhrVNQ_M5wiRvRkDqVLPSWndkjcdhXbZbs-b3nHjCGXOlxTqlfcnFFqvUifJClp9PD0XnKrD7e_9e5I3eMRjHPCRq4NZN25R7KBnI5r0Bc0xBlh0DH-vHY7oL12sv_EVMDdVkXvRCHE74ZR8nmzDRhn27UlnfqNPKgP-JcNUKRFBuU391NmElw061tpXe6JcvFUIP6_9wxeyPYYJuegKnMHA5Zjc7TPQOlhBvkzYzbqi5yYF1AQC0wM2W7HXZCI4Tpnnq-4zaxsnm1AsY78hS6KW2cf3P13SeexJihtKTjlR2aYFAVulqXcSOA5UbrTwjixqUZhwL6lJG2Mi9yyKE15KGbX-0C79eEYQ0tGvCL421Hlvc05pQahZKjGH6bx4nPfSwlgO2tnPwRUrw7ijkslqn59IdZ5Gn_N-3PRTGT0qEbvSODOacAag2VtdkojWqRNsaUbiBpHez3toxgU3cwtfXkkmmLfRC9aQut23R3C8XidwWXgTtEuypjoPq_VXuPxmJ2s3ZV4H1sROdITh94I0MvGhyftPTphdmmY1t8p1vunCpEbOd3K8f7aEB3KvmTyb6m1Ql974pY-1tD6FBWD1FYH1lTlzoo-sJs7BfJqINTdsWcnF53ISRwBK-6STEod43ST0GTnwS5vELDR-1Ha36s8Gul-AhyyLP0pfsuz_giV7KtfGIJC9UQBJqyU7qQ-GAlquEiHJr9o1pE2_VtDKwT7vzBY7uh5V9Ve7j-52g-8_1sXAUNQcul-ZbFDGAZfaco2fS9nyAF5fb1pBUOv9db_gHDsBBXdXcTkqLEQJxS3KVBJFc_-IzVC-Rz0rdJL_0000)
+1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/png/nLVRRkCs47tNL_2jRO04HOkYm29Ox6xgBV9GDqYo7p2M9Z9RaiCEHzaQIVwzeeaGeksaNAkNbyGwSpyy5AbtGO1biAO9BHXKtvxz-4FJVANWddIdFDFAe0tgivQr0jSRx5JBz3ceEqHfmk_QUM2mocY7il6eY6LDJTCQ245z2iZgeL7gH8tPtYZj1FiHEZ_lqI63OFVsxMXU1mpHzp8w1M7j-X5rO77wxDVaS3dO5V8KFb5eGPif95eClb7e1XkpayLhx3MvoqaJNt__tJVgUl5nSRrONYnkb1zMHhTdoJ6SwMwRkcMCNRwNCL2qnI1W_TOo-Ew0vUbvz9IdPlYJdK5pYfkMF1wJGQaEGylQYoQNqLdZN25R7KBrI4D0hc0xBdhccezSen1vgWZRylbFhEmVmuWjc8b33HlauuCcDrsXWVNqqQAigL0_fp8VgDkKSF3a0hw4Nr276PyvA9b3ydjDihVaTLiVaykak2fbCPcQnOvPyrfBJ7_P_LtCjelv0lcPmDHne5GGa25CaPZmZdVSTFZ8P6yii8GrejmAN1c8WbeH6GGtg-EqRA-rtO-s2j9ZYl-BT0OdMAdN-PLUhBDtF1txLklJG3Mi9yyKk2UeYB3y188xWwBhzj3vn4G9L6paOmOigQcDYr77Q7WU5qjogUjZ3l1vfT-tek-rRAxH4qjDUSP00xVRErXn1a7NwNXmWLcIOA6g9FHVxww0HRVQHwQBlT2XqVV8cr_sJhPkoCTXXwssO0ernk6oR0i8ycHZGOrERZSU3voPk_V3_JtXcNe66-CZ3iomEK_MI8W0zoXNv0UpxVIG3oC4SWSClc1arvnUYmSD0ccUFKjBJl1FAGQ07cyaiVDR83T25jm8ShbIHr_630Jvb8JsOVClt-IUmsPBVYB6kcq7nLwfQBZSNAdnBteTfH2NNmyLSSliF9keilqBCWPMn234_nLVNoh863As7t-gnyTJUb19CmbvejFJnuV9rqcJFfhsyHHro40c-s_l8aswZ3uzRg5u73I9_koM3xec_jb3KygpCnN_JrCUX5BHd2qZHU5nybpYUPG2AtcEILvUwaJTgou5uONRRgd2fzY1gVbeFspEiiQNVTwXwmPh_W80)
 2. Copy and paste the final UML into the UML Source section
 3. Update the img src and edit link target to the current values
 

From 13ff30fc8e82e66f233a416710bc20eac4112fd8 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Tue, 2 Feb 2021 10:53:06 -0500
Subject: [PATCH 24/37] Simplify networking, remove unused containers per
 @dcmcand

---
 docker-compose.test.yml | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 8ffc9491db..222520beba 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -3,55 +3,36 @@ services:
   test-backend:
     build:
       context: .
+    container_name: test-backend
     command: yarn server
     user: ${CURRENT_USER:-root}
-    ports:
-      - "8080:8080"
     depends_on:
       - test-db
     environment:
-      - POSTGRES_HOST=postgres_docker_test
+      - POSTGRES_HOST=test-db
     volumes:
       - ".:/app:rw"
     networks:
-      - test
+      - ttadp-test
   test-frontend:
     build:
       context: .
     command: yarn start
     user: ${CURRENT_USER:-root}
     stdin_open: true
-    ports:
-      - "3000:3000"
     volumes:
       - "./frontend:/app:rw"
       - "./scripts:/app/scripts"
     environment:
       - BACKEND_PROXY=http://test-backend:8080
     networks:
-      - test
+      - ttadp-test
   test-db:
     image: postgres:12.4
-    container_name: postgres_docker_test
+    container_name: test-db
     env_file: .env
-    ports:
-      - "6543:5432"
     networks:
-      - test
-  test-minio:
-    image: minio/minio
-    env_file: .env
-    ports:
-      - "9000:9000"
-    command: server /data
-    networks:
-      - test
-  aws-cli:
-    image: amazon/aws-cli
-    env_file: .env
-    command: ["--endpoint-url", "$S3_ENDPOINT", "s3api", "create-bucket", "--bucket", "$S3_BUCKET"]
-    networks:
-      - test
-
+      - ttadp-test
+# Use non-default network so we don't conflict with the developer environment
 networks:
-  test:
+  ttadp-test:

From e56cf189fe49ced1011d9c0c7f5b442edb822ab0 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Tue, 2 Feb 2021 12:49:52 -0500
Subject: [PATCH 25/37] update failing tests

---
 src/routes/admin/user.test.js     |  5 ++++-
 src/routes/files/handlers.test.js | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/routes/admin/user.test.js b/src/routes/admin/user.test.js
index b10c1506d2..c7c40ff1b7 100644
--- a/src/routes/admin/user.test.js
+++ b/src/routes/admin/user.test.js
@@ -55,7 +55,10 @@ describe('User route handler', () => {
     jest.clearAllMocks();
   });
   afterAll(async () => {
-    await User.destroy({ where: {} });
+    await User.destroy({ where: { id: 49 } });
+    await User.destroy({ where: { id: 50 } });
+    await User.destroy({ where: { id: 52 } });
+    await User.destroy({ where: { id: 53 } });
     db.sequelize.close();
   });
 
diff --git a/src/routes/files/handlers.test.js b/src/routes/files/handlers.test.js
index c5c77f5029..be08229cb1 100644
--- a/src/routes/files/handlers.test.js
+++ b/src/routes/files/handlers.test.js
@@ -16,21 +16,21 @@ const ORIGINAL_ENV = process.env;
 jest.mock('../../lib/s3Uploader');
 
 const mockUser = {
-  id: process.env.CURRENT_USER_ID,
+  id: 100,
   homeRegionId: 1,
   permissions: [
     {
-      userId: process.env.CURRENT_USER_ID,
+      userId: 100,
       regionId: 5,
       scopeId: SCOPES.READ_WRITE_REPORTS,
     },
     {
-      userId: process.env.CURRENT_USER_ID,
+      userId: 100,
       regionId: 6,
       scopeId: SCOPES.READ_WRITE_REPORTS,
     },
     {
-      userId: process.env.CURRENT_USER_ID,
+      userId: 100,
       regionId: 14,
       scopeId: SCOPES.SITE_ACCESS,
     },
@@ -63,6 +63,7 @@ describe('File Upload', () => {
       report = await ActivityReport.create(reportObject);
       process.env.NODE_ENV = 'test';
       process.env.BYPASS_AUTH = 'true';
+      process.env.CURRENT_USER_ID = 100;
     });
     afterAll(async () => {
       await File.destroy({ where: {} });
@@ -104,6 +105,7 @@ describe('File Upload', () => {
       report = await ActivityReport.create(reportObject);
       process.env.NODE_ENV = 'test';
       process.env.BYPASS_AUTH = 'true';
+      process.env.CURRENT_USER_ID = 100;
     });
     afterAll(async () => {
       await File.destroy({ where: {} });

From 486acd4d56132a0e1b6c2bc4f737c9af8112c1f3 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Tue, 2 Feb 2021 15:16:25 -0500
Subject: [PATCH 26/37] Add section on caveats with creating/deleting databas
 records

---
 docs/testing.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/testing.md b/docs/testing.md
index 6184aba6d6..788e671a2e 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -16,6 +16,13 @@ let b = anotherAsyncFun();
 return Promise.all([a, b]);
 ```
 
+### Creating/deleting database records
+
+Some tests will require interactions with the database, but at present all tests run using the same instance of the database. That means that any records you create or delete can potentially affect tests elsewhere. On top of that, tests run in parallel, so database operations may run in an unexpected order. That can mean tests may pass various times only to fail due to missing or unexpected records in the database when your tests run.
+
+To mitigate issues with missing or unexpected records causing failing tests, you can try a few approaches. One approach is to avoid using the database if your test doesn't actually require it. You may be able to use mock models or responses rather than interact with the database. If your test does require the database, you should create the records you need before your tests run and delete the records you created (and no others) when your tests finish. If you `Model.create`, make sure you `Model.destroy()` the records you created.
+
+When writing tests that create database records, it might also help to use a `try...catch` to catch errors in database transactions and log meaningful output. Sequelize error messages can be vague, and it might help others to see more informative messages.
 
 ## Testing in Docker
 

From b14eeb98b8ff1bb0235daad8d106728d918fb8a8 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Tue, 2 Feb 2021 15:40:38 -0500
Subject: [PATCH 27/37] Split run-test into multiple steps, per @dcmcand

---
 bin/run-tests | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/run-tests b/bin/run-tests
index a1b7f9a63e..79a6e0163d 100755
--- a/bin/run-tests
+++ b/bin/run-tests
@@ -1,11 +1,24 @@
 #!/bin/bash
 
 echo "Running tests in using test config 'docker-compose.test.yml'"
+# Start containers
+docker-compose -f 'docker-compose.test.yml' up -d
 
-docker-compose \
-    -f 'docker-compose.test.yml' \
-    run test-backend bash -c "yarn db:migrate; yarn db:seed; yarn test:ci"
-wait
+# Let postgres initialize
+echo "Give postgres a few seconds to start up..."
+sleep 5
+
+# Migrate and seed db
+docker exec test-backend bash -c "yarn db:migrate"
+docker exec test-backend bash -c "yarn db:seed;"
+
+# Test backend
+docker exec test-backend bash -c "yarn test:ci"
+
+# Test frontend
+docker exec test-backend bash -c "yarn --cwd frontend run test:ci"
+
+# Cleanup
 docker-compose \
     -f 'docker-compose.test.yml' \
     down --volumes

From 11b92b9ad19b0b674031716bcfc0081bc2b9570a Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Tue, 2 Feb 2021 15:00:31 -0600
Subject: [PATCH 28/37] Fix API docs. Split review page into components. Add
 DECIMAL_BASE

---
 .../paths/activity-reports/review.yaml        |   6 +
 docs/openapi/paths/collaborators.yaml         |   2 +-
 frontend/src/Constants.js                     |   2 +
 frontend/src/fetchers/Admin.js                |   3 +-
 frontend/src/fetchers/activityReports.js      |   9 +-
 .../Pages/ApproverReviewPage.js               |  64 ++++++++++
 .../ActivityReport/Pages/ReviewSubmit.js      | 114 ++++--------------
 .../Pages/SubmitterReviewPage.js              |  82 +++++++++++++
 frontend/src/pages/Admin/PermissionHelpers.js |  11 +-
 frontend/src/pages/Admin/UserPermissions.js   |   4 +-
 frontend/src/pages/Admin/UserSection.js       |   7 +-
 .../pages/Admin/__tests__/UserPermissions.js  |   4 +-
 frontend/src/pages/Admin/index.js             |   3 +-
 13 files changed, 204 insertions(+), 107 deletions(-)
 create mode 100644 frontend/src/pages/ActivityReport/Pages/ApproverReviewPage.js
 create mode 100644 frontend/src/pages/ActivityReport/Pages/SubmitterReviewPage.js

diff --git a/docs/openapi/paths/activity-reports/review.yaml b/docs/openapi/paths/activity-reports/review.yaml
index 4b2e397bb5..0156f6d371 100644
--- a/docs/openapi/paths/activity-reports/review.yaml
+++ b/docs/openapi/paths/activity-reports/review.yaml
@@ -17,6 +17,9 @@ put:
             status:
               type: string
               description: The status of the report after review
+              enum:
+                - Approved
+                - Needs Action
             managerNotes:
               type: string
               description: Any notes the manager needs to relay to the author/collaborators of the report
@@ -36,5 +39,8 @@ put:
             properties:
               status:
                 type: string
+                enum:
+                 - Approved
+                 - Needs Action
               managerNotes:
                 type: string
diff --git a/docs/openapi/paths/collaborators.yaml b/docs/openapi/paths/collaborators.yaml
index 8c0bd058a1..547f39767d 100644
--- a/docs/openapi/paths/collaborators.yaml
+++ b/docs/openapi/paths/collaborators.yaml
@@ -20,4 +20,4 @@ get:
           schema:
             type: array
             items:
-              $ref: '../../index.yaml#/components/schemas/selectableUser'
+              $ref: '../index.yaml#/components/schemas/selectableUser'
diff --git a/frontend/src/Constants.js b/frontend/src/Constants.js
index 9bc3f54ac6..df2b978d90 100644
--- a/frontend/src/Constants.js
+++ b/frontend/src/Constants.js
@@ -64,3 +64,5 @@ export const REGIONS = [
   11,
   12,
 ];
+
+export const DECIMAL_BASE = 10;
diff --git a/frontend/src/fetchers/Admin.js b/frontend/src/fetchers/Admin.js
index 2ea28e313d..7897c8792e 100644
--- a/frontend/src/fetchers/Admin.js
+++ b/frontend/src/fetchers/Admin.js
@@ -1,5 +1,6 @@
 import join from 'url-join';
 import { get, put } from './index';
+import { DECIMAL_BASE } from '../Constants';
 
 export const getUsers = async () => {
   const users = await get((join('/', 'api', 'admin', 'users')));
@@ -7,6 +8,6 @@ export const getUsers = async () => {
 };
 
 export const updateUser = async (userId, data) => {
-  const user = await put((join('/', 'api', 'admin', 'users', userId.toString(10))), data);
+  const user = await put((join('/', 'api', 'admin', 'users', userId.toString(DECIMAL_BASE))), data);
   return user.json();
 };
diff --git a/frontend/src/fetchers/activityReports.js b/frontend/src/fetchers/activityReports.js
index 476d4d734e..ace889f1c5 100644
--- a/frontend/src/fetchers/activityReports.js
+++ b/frontend/src/fetchers/activityReports.js
@@ -1,5 +1,6 @@
 import join from 'url-join';
 import { get, put, post } from './index';
+import { DECIMAL_BASE } from '../Constants';
 
 const activityReportUrl = join('/', 'api', 'activity-reports');
 
@@ -9,13 +10,13 @@ export const getApprovers = async (region) => {
 };
 
 export const submitReport = async (reportId, data) => {
-  const url = join(activityReportUrl, reportId.toString(10), 'submit');
+  const url = join(activityReportUrl, reportId.toString(DECIMAL_BASE), 'submit');
   const report = await post(url, data);
   return report.json();
 };
 
 export const saveReport = async (reportId, data) => {
-  const report = await put(join(activityReportUrl, reportId.toString(10)), data);
+  const report = await put(join(activityReportUrl, reportId.toString(DECIMAL_BASE)), data);
   return report.json();
 };
 
@@ -25,7 +26,7 @@ export const createReport = async (data) => {
 };
 
 export const getReport = async (reportId) => {
-  const report = await get(join(activityReportUrl, reportId.toString(10)));
+  const report = await get(join(activityReportUrl, reportId.toString(DECIMAL_BASE)));
   return report.json();
 };
 
@@ -41,7 +42,7 @@ export const getCollaborators = async (region) => {
 };
 
 export const reviewReport = async (reportId, data) => {
-  const url = join(activityReportUrl, reportId.toString(10), 'review');
+  const url = join(activityReportUrl, reportId.toString(DECIMAL_BASE), 'review');
   const report = await put(url, data);
   return report.json();
 };
diff --git a/frontend/src/pages/ActivityReport/Pages/ApproverReviewPage.js b/frontend/src/pages/ActivityReport/Pages/ApproverReviewPage.js
new file mode 100644
index 0000000000..96856aa8ec
--- /dev/null
+++ b/frontend/src/pages/ActivityReport/Pages/ApproverReviewPage.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Dropdown, Form, Label, Fieldset, Textarea, Alert, Button,
+} from '@trussworks/react-uswds';
+
+const possibleStatus = [
+  'Approved',
+  'Needs Action',
+];
+
+const ApproverReviewPage = ({
+  reviewed,
+  additionalNotes,
+  register,
+  valid,
+  handleSubmit,
+  onFormReview,
+}) => (
+  <>
+    {reviewed
+      && (
+      <Alert noIcon className="margin-y-4" type="success">
+        <b>Success</b>
+        <br />
+        Your review of this report was successfully submitted
+      </Alert>
+      )}
+    <h2>Review and approve report</h2>
+    <div className="smart-hub--creator-notes">
+      <p>
+        <span className="text-bold">Creator notes</span>
+        <br />
+        <br />
+        { additionalNotes || 'No creator notes' }
+      </p>
+    </div>
+    <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormReview)}>
+      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
+        <Label htmlFor="managerNotes">Manager notes</Label>
+        <Textarea inputRef={register} id="managerNotes" name="managerNotes" />
+      </Fieldset>
+      <Label htmlFor="status">Choose report status</Label>
+      <Dropdown id="status" name="status" defaultValue="" inputRef={register({ required: true })}>
+        <option name="default" value="" disabled hidden>- Select -</option>
+        {possibleStatus.map((status) => (
+          <option key={status} value={status}>{status}</option>
+        ))}
+      </Dropdown>
+      <Button type="submit" disabled={!valid}>Submit</Button>
+    </Form>
+  </>
+);
+
+ApproverReviewPage.propTypes = {
+  reviewed: PropTypes.bool.isRequired,
+  additionalNotes: PropTypes.string.isRequired,
+  register: PropTypes.func.isRequired,
+  valid: PropTypes.bool.isRequired,
+  handleSubmit: PropTypes.func.isRequired,
+  onFormReview: PropTypes.func.isRequired,
+};
+
+export default ApproverReviewPage;
diff --git a/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
index 4b5e12f3d7..68a9974ff8 100644
--- a/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
+++ b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
@@ -1,18 +1,15 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import {
-  Dropdown, Form, Label, Fieldset, Textarea, Alert, Button, Accordion,
+  Alert, Accordion,
 } from '@trussworks/react-uswds';
 import { Helmet } from 'react-helmet';
 
 import Container from '../../../components/Container';
+import SubmitterReviewPage from './SubmitterReviewPage';
+import ApproverReviewPage from './ApproverReviewPage';
 import './ReviewSubmit.css';
 
-const possibleStatus = [
-  'Approved',
-  'Needs Action',
-];
-
 const ReviewSubmit = ({
   hookForm,
   allComplete,
@@ -54,13 +51,6 @@ const ReviewSubmit = ({
     }
   };
 
-  const setValue = (e) => {
-    if (e === '') {
-      return null;
-    }
-    return parseInt(e, 10);
-  };
-
   return (
     <>
       <Helmet>
@@ -76,84 +66,28 @@ const ReviewSubmit = ({
         </Alert>
         )}
         {!approvingManager
-          && (
-            <>
-              {submitted
-              && (
-              <Alert noIcon className="margin-y-4" type="success">
-                <b>Success</b>
-                <br />
-                This report was successfully submitted for approval
-              </Alert>
-              )}
-              {!allComplete
-              && (
-              <Alert noIcon className="margin-y-4" type="error">
-                <b>Incomplete report</b>
-                <br />
-                This report cannot be submitted until all sections are complete
-              </Alert>
-              )}
-              <h2>Submit Report</h2>
-              <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormSubmit)}>
-                <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Additional Notes">
-                  <Label htmlFor="additionalNotes">Creator notes</Label>
-                  <Textarea inputRef={register} id="additionalNotes" name="additionalNotes" />
-                </Fieldset>
-                <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
-                  <p className="margin-top-4">
-                    Submitting this form for approval means that you will no longer be in draft
-                    mode. Please review all information in each section before submitting to your
-                    manager for approval.
-                  </p>
-                  <Label htmlFor="approvingManagerId">Approving manager</Label>
-                  <Dropdown id="approvingManagerId" name="approvingManagerId" inputRef={register({ setValueAs: setValue, required: true })}>
-                    <option name="default" value="" disabled hidden>Select a Manager...</option>
-                    {approvers.map((approver) => (
-                      <option key={approver.id} value={approver.id}>{approver.name}</option>
-                    ))}
-                  </Dropdown>
-                </Fieldset>
-                <Button type="submit" disabled={!valid}>Submit for approval</Button>
-              </Form>
-            </>
-          )}
+        && (
+        <SubmitterReviewPage
+          submitted={submitted}
+          allComplete={allComplete}
+          register={register}
+          approvers={approvers}
+          valid={valid}
+          handleSubmit={handleSubmit}
+          onFormSubmit={onFormSubmit}
+        />
+        )}
         {approvingManager
-          && (
-            <>
-              {reviewed
-              && (
-              <Alert noIcon className="margin-y-4" type="success">
-                <b>Success</b>
-                <br />
-                Your review of this report was successfully submitted
-              </Alert>
-              )}
-              <h2>Review and approve report</h2>
-              <div className="smart-hub--creator-notes">
-                <p>
-                  <span className="text-bold">Creator notes</span>
-                  <br />
-                  <br />
-                  { additionalNotes || 'No creator notes' }
-                </p>
-              </div>
-              <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormReview)}>
-                <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
-                  <Label htmlFor="managerNotes">Manager notes</Label>
-                  <Textarea inputRef={register} id="managerNotes" name="managerNotes" />
-                </Fieldset>
-                <Label htmlFor="status">Choose report status</Label>
-                <Dropdown id="status" name="status" defaultValue="" inputRef={register({ required: true })}>
-                  <option name="default" value="" disabled hidden>- Select -</option>
-                  {possibleStatus.map((status) => (
-                    <option key={status} value={status}>{status}</option>
-                  ))}
-                </Dropdown>
-                <Button type="submit" disabled={!valid}>Submit</Button>
-              </Form>
-            </>
-          )}
+        && (
+        <ApproverReviewPage
+          reviewed={reviewed}
+          additionalNotes={additionalNotes}
+          register={register}
+          valid={valid}
+          handleSubmit={handleSubmit}
+          onFormReview={onFormReview}
+        />
+        )}
       </Container>
     </>
   );
diff --git a/frontend/src/pages/ActivityReport/Pages/SubmitterReviewPage.js b/frontend/src/pages/ActivityReport/Pages/SubmitterReviewPage.js
new file mode 100644
index 0000000000..62cf6e7609
--- /dev/null
+++ b/frontend/src/pages/ActivityReport/Pages/SubmitterReviewPage.js
@@ -0,0 +1,82 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import {
+  Dropdown, Form, Label, Fieldset, Textarea, Alert, Button,
+} from '@trussworks/react-uswds';
+
+import { DECIMAL_BASE } from '../../../Constants';
+
+const SubmitterReviewPage = ({
+  submitted,
+  allComplete,
+  register,
+  approvers,
+  valid,
+  handleSubmit,
+  onFormSubmit,
+}) => {
+  const setValue = (e) => {
+    if (e === '') {
+      return null;
+    }
+    return parseInt(e, DECIMAL_BASE);
+  };
+  return (
+    <>
+      {submitted
+  && (
+  <Alert noIcon className="margin-y-4" type="success">
+    <b>Success</b>
+    <br />
+    This report was successfully submitted for approval
+  </Alert>
+  )}
+      {!allComplete
+  && (
+  <Alert noIcon className="margin-y-4" type="error">
+    <b>Incomplete report</b>
+    <br />
+    This report cannot be submitted until all sections are complete
+  </Alert>
+  )}
+      <h2>Submit Report</h2>
+      <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormSubmit)}>
+        <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Additional Notes">
+          <Label htmlFor="additionalNotes">Creator notes</Label>
+          <Textarea inputRef={register} id="additionalNotes" name="additionalNotes" />
+        </Fieldset>
+        <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
+          <p className="margin-top-4">
+            Submitting this form for approval means that you will no longer be in draft
+            mode. Please review all information in each section before submitting to your
+            manager for approval.
+          </p>
+          <Label htmlFor="approvingManagerId">Approving manager</Label>
+          <Dropdown id="approvingManagerId" name="approvingManagerId" inputRef={register({ setValueAs: setValue, required: true })}>
+            <option name="default" value="" disabled hidden>Select a Manager...</option>
+            {approvers.map((approver) => (
+              <option key={approver.id} value={approver.id}>{approver.name}</option>
+            ))}
+          </Dropdown>
+        </Fieldset>
+        <Button type="submit" disabled={!valid}>Submit for approval</Button>
+      </Form>
+    </>
+  );
+};
+
+SubmitterReviewPage.propTypes = {
+  submitted: PropTypes.bool.isRequired,
+  allComplete: PropTypes.bool.isRequired,
+  register: PropTypes.func.isRequired,
+  approvers: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+  })).isRequired,
+  valid: PropTypes.bool.isRequired,
+  handleSubmit: PropTypes.func.isRequired,
+  onFormSubmit: PropTypes.func.isRequired,
+};
+
+export default SubmitterReviewPage;
diff --git a/frontend/src/pages/Admin/PermissionHelpers.js b/frontend/src/pages/Admin/PermissionHelpers.js
index 7c507f1cd6..050312cfc0 100644
--- a/frontend/src/pages/Admin/PermissionHelpers.js
+++ b/frontend/src/pages/Admin/PermissionHelpers.js
@@ -1,8 +1,13 @@
 import _ from 'lodash';
-import { REGIONAL_SCOPES, GLOBAL_SCOPES, REGIONS } from '../../Constants';
+import {
+  REGIONAL_SCOPES,
+  GLOBAL_SCOPES,
+  REGIONS,
+  DECIMAL_BASE,
+} from '../../Constants';
 
-const regionalScopeIds = Object.keys(REGIONAL_SCOPES).map((s) => parseInt(s, 10));
-const globalScopeIds = Object.keys(GLOBAL_SCOPES).map((s) => parseInt(s, 10));
+const regionalScopeIds = Object.keys(REGIONAL_SCOPES).map((s) => parseInt(s, DECIMAL_BASE));
+const globalScopeIds = Object.keys(GLOBAL_SCOPES).map((s) => parseInt(s, DECIMAL_BASE));
 const allScopes = { ...REGIONAL_SCOPES, ...GLOBAL_SCOPES };
 
 export function scopeFromId(scopeId) {
diff --git a/frontend/src/pages/Admin/UserPermissions.js b/frontend/src/pages/Admin/UserPermissions.js
index f8ec91c504..89446dc4c9 100644
--- a/frontend/src/pages/Admin/UserPermissions.js
+++ b/frontend/src/pages/Admin/UserPermissions.js
@@ -5,7 +5,7 @@ import {
   Checkbox, Grid, Fieldset,
 } from '@trussworks/react-uswds';
 
-import { REGIONAL_SCOPES } from '../../Constants';
+import { REGIONAL_SCOPES, DECIMAL_BASE } from '../../Constants';
 import PermissionCheckboxLabel from './components/PermissionCheckboxLabel';
 import CurrentPermissions from './components/CurrentPermissions';
 import RegionDropdown from '../../components/RegionDropdown';
@@ -82,7 +82,7 @@ function UserPermissions({
 
   const onSelectedRegionChange = (e) => {
     const { value } = e.target;
-    updateSelectedRegion(parseInt(value, 10));
+    updateSelectedRegion(parseInt(value, DECIMAL_BASE));
   };
 
   return (
diff --git a/frontend/src/pages/Admin/UserSection.js b/frontend/src/pages/Admin/UserSection.js
index a7e3938ae5..f9cb4710f4 100644
--- a/frontend/src/pages/Admin/UserSection.js
+++ b/frontend/src/pages/Admin/UserSection.js
@@ -7,6 +7,7 @@ import {
 import UserInfo from './UserInfo';
 import UserPermissions from './UserPermissions';
 import { userGlobalPermissions, userRegionalPermissions } from './PermissionHelpers';
+import { DECIMAL_BASE } from '../../Constants';
 
 const NUMBER_FIELDS = [
   'homeRegionId',
@@ -29,13 +30,13 @@ function UserSection({ user, onSave }) {
     const { name, value } = e.target;
     updateUser({
       ...formUser,
-      [name]: NUMBER_FIELDS.includes(name) ? parseInt(value, 10) : value,
+      [name]: NUMBER_FIELDS.includes(name) ? parseInt(value, DECIMAL_BASE) : value,
     });
   };
 
   const onPermissionChange = (e, strRegion) => {
-    const scope = parseInt(e.target.name, 10);
-    const region = parseInt(strRegion, 10);
+    const scope = parseInt(e.target.name, DECIMAL_BASE);
+    const region = parseInt(strRegion, DECIMAL_BASE);
     const { checked } = e.target;
 
     if (checked) {
diff --git a/frontend/src/pages/Admin/__tests__/UserPermissions.js b/frontend/src/pages/Admin/__tests__/UserPermissions.js
index 90691e3123..7afc5a6a0a 100644
--- a/frontend/src/pages/Admin/__tests__/UserPermissions.js
+++ b/frontend/src/pages/Admin/__tests__/UserPermissions.js
@@ -5,7 +5,7 @@ import { render, screen, within } from '@testing-library/react';
 
 import UserPermissions from '../UserPermissions';
 import { withText } from '../../../testHelpers';
-import { SCOPE_IDS } from '../../../Constants';
+import { SCOPE_IDS, DECIMAL_BASE } from '../../../Constants';
 
 const {
   READ_ACTIVITY_REPORTS,
@@ -46,7 +46,7 @@ describe('UserPermissions', () => {
 
     it('has correct global permissions checked', () => {
       const checkbox = screen.getByRole('checkbox', { checked: true });
-      expect(checkbox.name).toBe(ADMIN.toString(10));
+      expect(checkbox.name).toBe(ADMIN.toString(DECIMAL_BASE));
     });
 
     it('displays the current regional permissions', () => {
diff --git a/frontend/src/pages/Admin/index.js b/frontend/src/pages/Admin/index.js
index 4c1fe51a31..59e9431b5f 100644
--- a/frontend/src/pages/Admin/index.js
+++ b/frontend/src/pages/Admin/index.js
@@ -9,6 +9,7 @@ import UserSection from './UserSection';
 import NavLink from '../../components/NavLink';
 import Container from '../../components/Container';
 import { updateUser, getUsers } from '../../fetchers/Admin';
+import { DECIMAL_BASE } from '../../Constants';
 
 /**
  * Render the left hand user navigation in the Admin UI. Use the user's full name
@@ -65,7 +66,7 @@ function Admin(props) {
   useEffect(() => {
     if (userId) {
       updateSelectedUser(users.find((u) => (
-        u.id === parseInt(userId, 10)
+        u.id === parseInt(userId, DECIMAL_BASE)
       )));
       updateSaved(false);
     }

From 25e5f1f2bd30e45c39ea04e11541179490fa1ded Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Tue, 2 Feb 2021 17:05:14 -0500
Subject: [PATCH 29/37] Switch shortcut, also per @dcmcand

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 12f042baf1..2c560b4b5f 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "docker:deps": "docker-compose run --rm backend yarn install && docker-compose run --rm frontend yarn install",
     "docker:start": "docker-compose up",
     "docker:stop": "docker-compose down",
-    "docker:test": "docker-compose run --rm backend yarn test:ci && docker-compose run --rm frontend yarn test:ci",
+    "docker:test": "./bin/run-tests",
     "docker:test:be": "docker-compose run --rm backend yarn test",
     "docker:lint": "docker-compose run --rm backend yarn lint:ci && docker-compose run --rm frontend yarn lint:ci",
     "docker:shell:frontend": "docker-compose run --rm frontend /bin/bash",

From a50285fb21f392f89f3ef2a53c5ed3238889db43 Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Thu, 4 Feb 2021 09:58:18 -0600
Subject: [PATCH 30/37] Increase wait time for the server to spin up in
 cucummber ci tests

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4141476207..206e1f7ff0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,7 +228,7 @@ jobs:
       - run:
           name: Run cucumber
           command: |
-            sleep 5
+            sleep 10
             yarn cucumber:ci
       - store_artifacts:
           path: reports/

From d29a75d3a6223d0af640790524f32844d71da126 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Thu, 4 Feb 2021 14:20:02 -0500
Subject: [PATCH 31/37] Document bin/run-tests, make sure frontend tests run in
 frontend instance

---
 bin/run-tests   | 2 +-
 docs/testing.md | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/run-tests b/bin/run-tests
index 79a6e0163d..49745897cf 100755
--- a/bin/run-tests
+++ b/bin/run-tests
@@ -16,7 +16,7 @@ docker exec test-backend bash -c "yarn db:seed;"
 docker exec test-backend bash -c "yarn test:ci"
 
 # Test frontend
-docker exec test-backend bash -c "yarn --cwd frontend run test:ci"
+docker exec test-frontend bash -c "yarn --cwd frontend run test:ci"
 
 # Cleanup
 docker-compose \
diff --git a/docs/testing.md b/docs/testing.md
index 788e671a2e..2f5b366cd6 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -26,6 +26,12 @@ When writing tests that create database records, it might also help to use a `tr
 
 ## Testing in Docker
 
+### Using `./bin/run-tests`
+
+To simplify running tests in Docker, there is a bash script, `./bin/run-tests` that will run the appropriate commands to start `test-` variations of the services used in tests. You should be able to run tests using that command while your development Docker environment is running. The script uses a separate `docker-compose.test.yml` which does not create a user-accessible network and cleans up after itself once tests have run.
+
+### Running tests in your development Docker environment
+
 When running tests in Docker, be aware that there are tests that will modify/delete database records. For tests to run, the 'db' service needs to exist and `db:migrate` and `db:seed` need to have been run (to create the tables and populate certain records).
 
 In the `docker-compose.yml` configuration, the database is set up to persist to a volume, "dbdata", so database records will persist between runs of the 'db' service, unless you remove that volume explicitly (e.g. `docker volume rm` or `docker-compose down --volumes`).

From 3f477886f45409f2ca6cbb7e6d3f3fea60ea0ce0 Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Thu, 4 Feb 2021 14:55:08 -0600
Subject: [PATCH 32/37] Feedback from PR

 * Display save message when creating a new report.
 * Only users that can write the report send an update request to the
server
---
 frontend/src/App.js                           |  4 +-
 frontend/src/components/Navigator/index.js    |  7 ++-
 .../pages/ActivityReport/__tests__/index.js   |  3 +
 frontend/src/pages/ActivityReport/index.js    | 61 ++++++++++++++-----
 src/policies/user.js                          |  3 +-
 5 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/frontend/src/App.js b/frontend/src/App.js
index 88b9b04c9f..f218439bcf 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -75,8 +75,8 @@ function App() {
         />
         <Route
           path="/activity-reports/:activityReportId/:currentPage?"
-          render={({ match }) => (
-            <ActivityReport match={match} user={user} />
+          render={({ match, location }) => (
+            <ActivityReport location={location} match={match} user={user} />
           )}
         />
         {admin
diff --git a/frontend/src/components/Navigator/index.js b/frontend/src/components/Navigator/index.js
index a44701635f..a2ce7c76bb 100644
--- a/frontend/src/components/Navigator/index.js
+++ b/frontend/src/components/Navigator/index.js
@@ -22,6 +22,7 @@ import NavigatorHeader from './components/NavigatorHeader';
 
 function Navigator({
   initialData,
+  initialLastUpdated,
   pages,
   onFormSubmit,
   onReview,
@@ -35,7 +36,7 @@ function Navigator({
 }) {
   const [formData, updateFormData] = useState(initialData);
   const [errorMessage, updateErrorMessage] = useState();
-  const [lastSaveTime, updateLastSaveTime] = useState();
+  const [lastSaveTime, updateLastSaveTime] = useState(initialLastUpdated);
   const { pageState } = formData;
 
   const page = pages.find((p) => p.path === currentPage);
@@ -77,8 +78,8 @@ function Navigator({
       const result = await onSave(data, newIndex);
       if (result) {
         updateLastSaveTime(moment());
+        updateErrorMessage();
       }
-      updateErrorMessage();
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(error);
@@ -159,6 +160,7 @@ function Navigator({
 
 Navigator.propTypes = {
   initialData: PropTypes.shape({}),
+  initialLastUpdated: PropTypes.instanceOf(moment),
   onFormSubmit: PropTypes.func.isRequired,
   onSave: PropTypes.func.isRequired,
   status: PropTypes.string.isRequired,
@@ -183,6 +185,7 @@ Navigator.defaultProps = {
   initialData: {},
   additionalData: {},
   autoSaveInterval: 1000 * 60 * 2,
+  initialLastUpdated: null,
 };
 
 export default Navigator;
diff --git a/frontend/src/pages/ActivityReport/__tests__/index.js b/frontend/src/pages/ActivityReport/__tests__/index.js
index b58b199490..d5ca519fce 100644
--- a/frontend/src/pages/ActivityReport/__tests__/index.js
+++ b/frontend/src/pages/ActivityReport/__tests__/index.js
@@ -43,6 +43,9 @@ const renderActivityReport = (id, location = 'activity-summary') => {
     <Router history={history}>
       <ActivityReport
         match={{ params: { currentPage: location, activityReportId: id }, path: '', url: '' }}
+        location={{
+          state: undefined, hash: '', pathname: '', search: '',
+        }}
         user={{ id: 1 }}
       />
     </Router>,
diff --git a/frontend/src/pages/ActivityReport/index.js b/frontend/src/pages/ActivityReport/index.js
index 85fcd9cdf7..ef1b785c0b 100644
--- a/frontend/src/pages/ActivityReport/index.js
+++ b/frontend/src/pages/ActivityReport/index.js
@@ -9,6 +9,7 @@ import { Helmet } from 'react-helmet';
 import ReactRouterPropTypes from 'react-router-prop-types';
 import { useHistory, Redirect } from 'react-router-dom';
 import { Alert } from '@trussworks/react-uswds';
+import moment from 'moment';
 
 import pages from './Pages';
 import Navigator from '../../components/Navigator';
@@ -65,7 +66,7 @@ const region = 1;
 const pagesByPos = _.keyBy(pages.filter((p) => !p.review), (page) => page.position);
 const defaultPageState = _.mapValues(pagesByPos, () => NOT_STARTED);
 
-function ActivityReport({ match, user }) {
+function ActivityReport({ match, user, location }) {
   const { params: { currentPage, activityReportId } } = match;
   const history = useHistory();
   const [status, updateStatus] = useState();
@@ -74,8 +75,18 @@ function ActivityReport({ match, user }) {
   const [initialFormData, updateInitialFormData] = useState(defaultValues);
   const [initialAdditionalData, updateAdditionalData] = useState({});
   const [approvingManager, updateApprovingManager] = useState(false);
+  const [canWrite, updateCanWrite] = useState(false);
+  const [initialLastUpdated, updateInitialLastUpdated] = useState();
   const reportId = useRef();
 
+  const showLastUpdatedTime = (location.state && location.state.showLastUpdatedTime) || false;
+
+  useEffect(() => {
+    // Clear history state once mounted and activityReportId changes. This prevents someone from
+    // seeing a save message if they refresh the page after creating a new report.
+    history.replace();
+  }, [activityReportId, history]);
+
   useEffect(() => {
     const fetch = async () => {
       try {
@@ -90,16 +101,30 @@ function ActivityReport({ match, user }) {
         if (activityReportId !== 'new') {
           apiCalls.push(getReport(activityReportId));
         } else {
-          apiCalls.push(Promise.resolve({ ...defaultValues, pageState: defaultPageState }));
+          apiCalls.push(
+            Promise.resolve({ ...defaultValues, pageState: defaultPageState, userId: user.id }),
+          );
         }
 
         const [recipients, collaborators, approvers, report] = await Promise.all(apiCalls);
 
         reportId.current = activityReportId;
+
+        const isCollaborator = report.collaborators
+          && report.collaborators.find((u) => u.id === user.id);
+        const isAuthor = report.userId === user.id;
+        const canWriteReport = isCollaborator || isAuthor;
+
         updateAdditionalData({ recipients, collaborators, approvers });
         updateInitialFormData(report);
         updateStatus(report.status || 'draft');
         updateApprovingManager(report.approvingManagerId === user.id);
+        updateCanWrite(canWriteReport);
+
+        if (showLastUpdatedTime) {
+          updateInitialLastUpdated(moment(report.updatedAt));
+        }
+
         updateError();
       } catch (e) {
         updateError('Unable to load activity report');
@@ -108,7 +133,7 @@ function ActivityReport({ match, user }) {
       }
     };
     fetch();
-  }, [activityReportId, user.id]);
+  }, [activityReportId, user.id, showLastUpdatedTime]);
 
   if (loading) {
     return (
@@ -134,27 +159,33 @@ function ActivityReport({ match, user }) {
 
   const updatePage = (position) => {
     const page = pages.find((p) => p.position === position);
-    history.push(`/activity-reports/${reportId.current}/${page.path}`);
+    const state = {};
+    if (activityReportId === 'new' && reportId.current !== 'new') {
+      state.showLastUpdatedTime = true;
+    }
+    history.replace(`/activity-reports/${reportId.current}/${page.path}`, state);
   };
 
   const onSave = async (data, newIndex) => {
     const { activityRecipientType, activityRecipients } = data;
-    let saved = false;
-    if (reportId.current === 'new') {
-      if (activityRecipientType && activityRecipients && activityRecipients.length > 0) {
-        const savedReport = await createReport({ ...data, regionId: region }, {});
-        reportId.current = savedReport.id;
-        saved = true;
+    let updatedReport = false;
+    if (canWrite) {
+      if (reportId.current === 'new') {
+        if (activityRecipientType && activityRecipients && activityRecipients.length > 0) {
+          const savedReport = await createReport({ ...data, regionId: region }, {});
+          reportId.current = savedReport.id;
+          updatedReport = false;
+        }
+      } else {
+        await saveReport(reportId.current, data, {});
+        updatedReport = true;
       }
-    } else {
-      await saveReport(reportId.current, data, {});
-      saved = true;
     }
 
     if (newIndex) {
       updatePage(newIndex);
     }
-    return saved;
+    return updatedReport;
   };
 
   const onFormSubmit = async (data) => {
@@ -172,6 +203,7 @@ function ActivityReport({ match, user }) {
       <Helmet titleTemplate="%s - Activity Report - TTA Smart Hub" defaultTitle="TTA Smart Hub - Activity Report" />
       <h1 className="new-activity-report">New activity report for Region 14</h1>
       <Navigator
+        initialLastUpdated={initialLastUpdated}
         reportId={reportId.current}
         currentPage={currentPage}
         additionalData={initialAdditionalData}
@@ -189,6 +221,7 @@ function ActivityReport({ match, user }) {
 
 ActivityReport.propTypes = {
   match: ReactRouterPropTypes.match.isRequired,
+  location: ReactRouterPropTypes.location.isRequired,
   user: PropTypes.shape({
     id: PropTypes.number,
   }).isRequired,
diff --git a/src/policies/user.js b/src/policies/user.js
index e462c8dc8c..1fede401d0 100644
--- a/src/policies/user.js
+++ b/src/policies/user.js
@@ -9,7 +9,8 @@ export default class Users {
   canViewUsersInRegion(region) {
     const permissions = this.user.permissions.find(
       (permission) => (
-        permission.scopeId === SCOPES.READ_WRITE_REPORTS
+        (permission.scopeId === SCOPES.READ_WRITE_REPORTS
+          || permission.scopeId === SCOPES.APPROVE_REPORTS)
         && permission.regionId === region),
     );
     return !_.isUndefined(permissions);

From c99ba9ac9f41df1f9c50a03895b659e9757690d0 Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Thu, 4 Feb 2021 16:49:47 -0600
Subject: [PATCH 33/37] Add frontend tests

---
 .../Pages/__tests__/ReviewSubmit.js           | 47 ++++++++++++++++++-
 .../pages/ActivityReport/__tests__/index.js   | 23 ++++++++-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js b/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
index 351ad059f0..e8d615aab0 100644
--- a/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
+++ b/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
@@ -5,6 +5,7 @@ import userEvent from '@testing-library/user-event';
 import { useForm } from 'react-hook-form';
 
 import ReviewSubmit from '../ReviewSubmit';
+import { withText } from '../../../../testHelpers';
 
 const approvers = [
   { id: 1, name: 'user 1' },
@@ -36,7 +37,7 @@ const RenderReview = ({
 const renderReview = (
   allComplete,
   approvingManager = false,
-  initialData = {},
+  initialData = { additionalNotes: '' },
   onSubmit = () => {},
   onReview = () => {},
   approvingManagerId = null,
@@ -62,6 +63,27 @@ describe('ReviewSubmit', () => {
       const header = await screen.findByText('Review and approve report');
       expect(header).toBeVisible();
     });
+
+    it('allows the manager to review the report', async () => {
+      const onReview = jest.fn();
+      renderReview(true, true, { additionalNotes: '', status: 'Approved' }, () => {}, onReview);
+      const reviewButton = await screen.findByRole('button');
+      userEvent.click(reviewButton);
+      await waitFor(() => expect(onReview).toHaveBeenCalled());
+    });
+
+    it('the review button handles errors', async () => {
+      const onReview = jest.fn();
+      onReview.mockImplementation(() => {
+        throw new Error();
+      });
+
+      renderReview(true, true, { additionalNotes: '', status: 'Approved' }, () => {}, onReview);
+      const reviewButton = await screen.findByRole('button');
+      userEvent.click(reviewButton);
+      const error = await screen.findByTestId('alert');
+      expect(error).toHaveTextContent('Unable to review report');
+    });
   });
 
   describe('when the form is not complete', () => {
@@ -95,6 +117,29 @@ describe('ReviewSubmit', () => {
       userEvent.selectOptions(screen.getByTestId('dropdown'), ['1']);
       expect(await screen.findByRole('button')).toBeEnabled();
     });
+
+    it('the submit button calls onSubmit', async () => {
+      const onSubmit = jest.fn();
+      renderReview(true, false, {}, onSubmit, () => {}, 1);
+      const button = await screen.findByRole('button');
+      expect(button).toBeEnabled();
+      userEvent.click(button);
+      await waitFor(() => expect(onSubmit).toHaveBeenCalled());
+    });
+
+    it('the submit button handles errors', async () => {
+      const onSubmit = jest.fn();
+      onSubmit.mockImplementation(() => {
+        throw new Error();
+      });
+
+      renderReview(true, false, {}, onSubmit, () => {}, 1);
+      const button = await screen.findByRole('button');
+      expect(button).toBeEnabled();
+      userEvent.click(button);
+      const error = await screen.findByTestId('alert');
+      expect(error).toHaveTextContent('Unable to submit report');
+    });
   });
 
   it('a success modal is shown once submitted', async () => {
diff --git a/frontend/src/pages/ActivityReport/__tests__/index.js b/frontend/src/pages/ActivityReport/__tests__/index.js
index d5ca519fce..690c3d6d3a 100644
--- a/frontend/src/pages/ActivityReport/__tests__/index.js
+++ b/frontend/src/pages/ActivityReport/__tests__/index.js
@@ -35,16 +35,17 @@ const formData = () => ({
   startDate: moment().format('MM/DD/YYYY'),
   targetPopulations: ['target 1'],
   topics: 'first',
+  updatedAt: new Date().toISOString(),
 });
 const history = createMemoryHistory();
 
-const renderActivityReport = (id, location = 'activity-summary') => {
+const renderActivityReport = (id, location = 'activity-summary', showLastUpdatedTime = null) => {
   render(
     <Router history={history}>
       <ActivityReport
         match={{ params: { currentPage: location, activityReportId: id }, path: '', url: '' }}
         location={{
-          state: undefined, hash: '', pathname: '', search: '',
+          state: { showLastUpdatedTime }, hash: '', pathname: '', search: '',
         }}
         user={{ id: 1 }}
       />
@@ -66,6 +67,24 @@ describe('ActivityReport', () => {
     fetchMock.get('/api/activity-reports/approvers?region=1', []);
   });
 
+  describe('last saved time', () => {
+    it('is shown if history.state.showLastUpdatedTime is true', async () => {
+      const data = formData();
+      fetchMock.get('/api/activity-reports/1', data);
+      renderActivityReport('1', 'activity-summary', true);
+      await screen.findByRole('group', { name: 'Who was the activity for?' });
+      expect(await screen.findByTestId('alert')).toBeVisible();
+    });
+
+    it('is not shown if history.state.showLastUpdatedTime is null', async () => {
+      const data = formData();
+      fetchMock.get('/api/activity-reports/1', data);
+      renderActivityReport('1', 'activity-summary');
+      await screen.findByRole('group', { name: 'Who was the activity for?' });
+      expect(screen.queryByTestId('alert')).toBeNull();
+    });
+  });
+
   it('defaults to activity summary if no page is in the url', async () => {
     renderActivityReport('new', null);
     await waitFor(() => expect(history.location.pathname).toEqual('/activity-reports/new/activity-summary'));

From e027cdf6d38b9b3ee949d74d1c1577a3e2a78a43 Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Thu, 4 Feb 2021 16:53:24 -0600
Subject: [PATCH 34/37] Remove unused import

---
 .../src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js b/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
index e8d615aab0..5e0a31baaf 100644
--- a/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
+++ b/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
@@ -5,7 +5,6 @@ import userEvent from '@testing-library/user-event';
 import { useForm } from 'react-hook-form';
 
 import ReviewSubmit from '../ReviewSubmit';
-import { withText } from '../../../../testHelpers';
 
 const approvers = [
   { id: 1, name: 'user 1' },

From c08eb4c7d35b47781278693758f9eef9c1885326 Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Fri, 5 Feb 2021 11:11:25 -0500
Subject: [PATCH 35/37] Somehow service == container_name for docker-compose
 exec

---
 docker-compose.test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 222520beba..46d93e3edc 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -17,6 +17,7 @@ services:
   test-frontend:
     build:
       context: .
+    container_name: test-frontend
     command: yarn start
     user: ${CURRENT_USER:-root}
     stdin_open: true

From 6cf1025f84c54071108a7ec122ff448d09419adc Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Fri, 5 Feb 2021 11:12:48 -0500
Subject: [PATCH 36/37] Add param to run-tests to choose to run only frontend
 or backend tests. More echo statements, too

---
 bin/run-tests   | 62 +++++++++++++++++++++++++++++++++++--------------
 docs/testing.md |  2 ++
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/bin/run-tests b/bin/run-tests
index 49745897cf..f8c9e0b25f 100755
--- a/bin/run-tests
+++ b/bin/run-tests
@@ -1,24 +1,52 @@
 #!/bin/bash
 
-echo "Running tests in using test config 'docker-compose.test.yml'"
-# Start containers
-docker-compose -f 'docker-compose.test.yml' up -d
+declare -a options=(frontend backend)
+declare lr=">>>>>>>>"
 
-# Let postgres initialize
-echo "Give postgres a few seconds to start up..."
-sleep 5
+echo_heading() {
+    echo
+    echo "$lr" "$*"
+}
 
-# Migrate and seed db
-docker exec test-backend bash -c "yarn db:migrate"
-docker exec test-backend bash -c "yarn db:seed;"
+main(){
+    local opt=""
 
-# Test backend
-docker exec test-backend bash -c "yarn test:ci"
+    for o in "${options[@]}"; do
+        if [[ "${1}" == "$o"  ]]; then
+            opt="$o";
+        fi
+    done
 
-# Test frontend
-docker exec test-frontend bash -c "yarn --cwd frontend run test:ci"
+    echo_heading "Running tests in using test config 'docker-compose.test.yml'"
+    # Start containers
+    docker-compose -f 'docker-compose.test.yml' up -d
 
-# Cleanup
-docker-compose \
-    -f 'docker-compose.test.yml' \
-    down --volumes
+    # Let postgres initialize
+    echo_heading "Giving postgres a few seconds to start up..."
+    sleep 5
+
+    # Migrate and seed db
+    echo_heading "Migrating & seeding db"
+    docker exec test-backend bash -c "yarn db:migrate"
+    docker exec test-backend bash -c "yarn db:seed;"
+
+    if [[ "$opt" == "backend" || -z "$opt" ]]; then
+        # Test backend
+        echo_heading "Running backend tests"
+        docker exec test-backend bash -c "yarn test:ci"
+    fi
+
+    if [[ "$opt" == "frontend" || -z "$opt" ]]; then
+        # Test frontend
+        echo_heading "Running frontend tests"
+        docker exec test-frontend bash -c "yarn --cwd frontend run test:ci"
+    fi
+
+    # Cleanup
+    echo_heading "Cleaning up test containers"
+    docker-compose \
+        -f 'docker-compose.test.yml' \
+        down --volumes
+}
+
+main "$@"
diff --git a/docs/testing.md b/docs/testing.md
index 2f5b366cd6..df8b710a1f 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -30,6 +30,8 @@ When writing tests that create database records, it might also help to use a `tr
 
 To simplify running tests in Docker, there is a bash script, `./bin/run-tests` that will run the appropriate commands to start `test-` variations of the services used in tests. You should be able to run tests using that command while your development Docker environment is running. The script uses a separate `docker-compose.test.yml` which does not create a user-accessible network and cleans up after itself once tests have run.
 
+By default, `./bin/run-tests` will run both backend and frontend tests. If you want to run only one set of tests, supply 'frontend' or 'backend' as a parameter. So to run only the backend tests, you'd run `./bin/run-tests backend`.
+
 ### Running tests in your development Docker environment
 
 When running tests in Docker, be aware that there are tests that will modify/delete database records. For tests to run, the 'db' service needs to exist and `db:migrate` and `db:seed` need to have been run (to create the tables and populate certain records).

From c4c7bd4a5e500bb9a52f67f35117cd67993d81df Mon Sep 17 00:00:00 2001
From: Daniel Cloud <daniel.cloud@adhocteam.us>
Date: Fri, 5 Feb 2021 11:53:26 -0500
Subject: [PATCH 37/37] Check exit codes of docker cmds, and 'log' errors.
 Return exit_code equal to number of errors that occurred.

---
 bin/run-tests   | 45 +++++++++++++++++++++++++++++++++++----------
 docs/testing.md |  2 ++
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/bin/run-tests b/bin/run-tests
index f8c9e0b25f..a7c694c4d6 100755
--- a/bin/run-tests
+++ b/bin/run-tests
@@ -2,13 +2,20 @@
 
 declare -a options=(frontend backend)
 declare lr=">>>>>>>>"
+declare -i exit_code=0
 
-echo_heading() {
-    echo
-    echo "$lr" "$*"
+log() {
+    echo "$lr $*"
 }
 
-main(){
+check_exit() {
+    if [[ "$1" -ne 0 ]]; then
+        echo "$lr last docker-compose command failed"
+        ((exit_code++))
+    fi
+}
+
+main() {
     local opt=""
 
     for o in "${options[@]}"; do
@@ -17,36 +24,54 @@ main(){
         fi
     done
 
-    echo_heading "Running tests in using test config 'docker-compose.test.yml'"
+    log "Running tests in using test config 'docker-compose.test.yml'"
     # Start containers
     docker-compose -f 'docker-compose.test.yml' up -d
+    check_exit "$?"
 
     # Let postgres initialize
-    echo_heading "Giving postgres a few seconds to start up..."
+    echo
+    log "Giving postgres a few seconds to start up..."
     sleep 5
 
     # Migrate and seed db
-    echo_heading "Migrating & seeding db"
+    echo
+    log "Migrating & seeding db"
     docker exec test-backend bash -c "yarn db:migrate"
+    check_exit "$?"
     docker exec test-backend bash -c "yarn db:seed;"
+    check_exit "$?"
 
     if [[ "$opt" == "backend" || -z "$opt" ]]; then
         # Test backend
-        echo_heading "Running backend tests"
+        echo
+        log "Running backend tests"
         docker exec test-backend bash -c "yarn test:ci"
+        check_exit "$?"
     fi
 
     if [[ "$opt" == "frontend" || -z "$opt" ]]; then
         # Test frontend
-        echo_heading "Running frontend tests"
+        echo
+        log "Running frontend tests"
         docker exec test-frontend bash -c "yarn --cwd frontend run test:ci"
+        check_exit "$?"
     fi
 
     # Cleanup
-    echo_heading "Cleaning up test containers"
+    echo
+    log "Cleaning up test containers"
     docker-compose \
         -f 'docker-compose.test.yml' \
         down --volumes
+    check_exit "$?"
+
+    if [[ $exit_code -ne 0 ]]; then
+        echo
+        log "Errors occurred during script execution"
+    fi
+
+    exit "$exit_code"
 }
 
 main "$@"
diff --git a/docs/testing.md b/docs/testing.md
index df8b710a1f..5268d7fe57 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -30,6 +30,8 @@ When writing tests that create database records, it might also help to use a `tr
 
 To simplify running tests in Docker, there is a bash script, `./bin/run-tests` that will run the appropriate commands to start `test-` variations of the services used in tests. You should be able to run tests using that command while your development Docker environment is running. The script uses a separate `docker-compose.test.yml` which does not create a user-accessible network and cleans up after itself once tests have run.
 
+This script is written such that it will log errors, but won't exit if a docker command fails. It will count the number of errors and the number of errors will be the exit code (`$?`) for the script. So if three docker commands fail, the exit code would be 3.
+
 By default, `./bin/run-tests` will run both backend and frontend tests. If you want to run only one set of tests, supply 'frontend' or 'backend' as a parameter. So to run only the backend tests, you'd run `./bin/run-tests backend`.
 
 ### Running tests in your development Docker environment