From 3cb1d7a63f2d176d706de690fc4e07164afa3ec7 Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Wed, 10 Feb 2021 09:55:54 -0600
Subject: [PATCH 01/18] Add displayId virtual field to activity reports

---
 src/models/activityReport.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/models/activityReport.js b/src/models/activityReport.js
index e61fcaa1ac..ae04010e93 100644
--- a/src/models/activityReport.js
+++ b/src/models/activityReport.js
@@ -37,6 +37,12 @@ export default (sequelize, DataTypes) => {
     }
   }
   ActivityReport.init({
+    displayId: {
+      type: DataTypes.VIRTUAL,
+      get() {
+        return `R${this.regionId.toString().padStart(2, '0')}-AR-${this.id}`;
+      },
+    },
     userId: {
       type: DataTypes.INTEGER,
     },

From d20e195b6e7c52456af394bfd236e63969a2da74 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Fri, 12 Feb 2021 16:16:25 -0500
Subject: [PATCH 02/18] add queue components for backend app

---
 .env.example                 |   3 +-
 package.json                 |   3 +-
 src/routes/files/handlers.js |  22 +++++-
 src/services/queue.js        |  10 +++
 yarn.lock                    | 132 ++++++++++++++++++++++++++++++++++-
 5 files changed, 164 insertions(+), 6 deletions(-)
 create mode 100644 src/services/queue.js

diff --git a/.env.example b/.env.example
index 05f7a3ca49..81ec2cfe04 100644
--- a/.env.example
+++ b/.env.example
@@ -46,4 +46,5 @@ MINIO_ROOT_USER=EXAMPLEID
 # if using docker
 CLAMAV_ENDPOINT=http://clamav-rest:8080
 # if running locally
-# CLAMAV_ENDPOINT=http://localhost:8081
\ No newline at end of file
+# CLAMAV_ENDPOINT=http://localhost:8081
+REDIS_PASS=SUPERSECUREPASSWORD
\ No newline at end of file
diff --git a/package.json b/package.json
index 35ea5df26f..73cf22de65 100644
--- a/package.json
+++ b/package.json
@@ -139,6 +139,7 @@
     "adm-zip": "^0.5.1",
     "aws-sdk": "^2.826.0",
     "axios": "^0.21.1",
+    "bull": "^3.20.1",
     "chromedriver": "^87.0.0",
     "client-oauth2": "^4.3.3",
     "cookie-session": "^1.4.0",
@@ -153,8 +154,8 @@
     "helmet": "^4.1.0",
     "http-codes": "^1.0.0",
     "lodash": "^4.17.20",
-    "multiparty": "^4.2.2",
     "moment": "^2.29.1",
+    "multiparty": "^4.2.2",
     "mz": "^2.7.0",
     "newrelic": "^7.0.1",
     "pg": "^8.3.3",
diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index ab98d64736..80b02f38b9 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -3,6 +3,7 @@ import * as fs from 'fs';
 import handleErrors from '../../lib/apiErrorHandler';
 import { File } from '../../models';
 import s3Uploader from '../../lib/s3Uploader';
+import addToScanQueue from '../../services/queue';
 
 const fileType = require('file-type');
 const multiparty = require('multiparty');
@@ -16,6 +17,15 @@ const logContext = {
   namespace,
 };
 
+const fileStatuses = {
+  uploading: 'UPLOADING',
+  uploaded: 'UPLOADED',
+  uploadFailed: 'UPLOAD_FAILED',
+  scanning: 'SCANNING',
+  approved: 'APPROVED',
+  rejected: 'REJECTED',
+};
+
 export const createFileMetaData = async (
   originalFileName, s3FileName, reportId, attachmentType, fileSize) => {
   const newFile = {
@@ -98,11 +108,19 @@ export default async function uploadHandler(req, res) {
     }
     try {
       await s3Uploader(buffer, fileName, type);
-      await updateStatus(metadata.id, 'UPLOADED');
+      await updateStatus(metadata.id, fileStatuses.uploaded);
       res.status(200).send({ id: metadata.id });
     } catch (err) {
       if (metadata) {
-        await updateStatus(metadata.id, 'UPLOAD_FAILED');
+        await updateStatus(metadata.id, fileStatuses.uploaded);
+      }
+      await handleErrors(req, res, err, logContext);
+    }
+    try {
+      await addToScanQueue({ key: metadata.key });
+    } catch (err) {
+      if (metadata) {
+        await updateStatus(metadata.id, fileStatuses.rejected);
       }
       await handleErrors(req, res, err, logContext);
     }
diff --git a/src/services/queue.js b/src/services/queue.js
new file mode 100644
index 0000000000..ab831d9354
--- /dev/null
+++ b/src/services/queue.js
@@ -0,0 +1,10 @@
+import Queue from 'bull';
+
+const REDIS_PORT = process.env.REDIS_PORT || 6379;
+const { REDIS_HOST, REDIS_PASS } = process.env;
+
+const scanQueue = new Queue('scan', `redis://${REDIS_HOST}:${REDIS_PORT}`, { redis: { password: REDIS_PASS } });
+
+export default async function addToScanQueue(fileKey) {
+  await scanQueue.add(fileKey);
+}
diff --git a/yarn.lock b/yarn.lock
index a5852cc0f2..88d02c01da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2703,6 +2703,22 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
+bull@^3.20.1:
+  version "3.20.1"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-3.20.1.tgz#97c4156f48001565baf3c04b81267a5604f40754"
+  integrity sha512-wDwpVu47WKaGhiguEPa/US5UMrtGLPKNPiGFPo4OgVs3EEGzJEWwv3LRPfjJVIf1COdMAN/yowGhZwYmoOonjQ==
+  dependencies:
+    cron-parser "^2.13.0"
+    debuglog "^1.0.0"
+    get-port "^5.1.1"
+    ioredis "^4.22.0"
+    lodash "^4.17.19"
+    p-timeout "^3.2.0"
+    promise.prototype.finally "^3.1.2"
+    semver "^7.3.2"
+    util.promisify "^1.0.1"
+    uuid "^8.3.0"
+
 byte-length@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/byte-length/-/byte-length-1.0.2.tgz#ba5a5909240b0121c079b7f7b15248d6f08223cc"
@@ -3030,6 +3046,11 @@ clsx@^1.1.0:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
 
+cluster-key-slot@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
+  integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -3352,6 +3373,14 @@ create-require@^1.1.0, create-require@^1.1.1:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
+cron-parser@^2.13.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.18.0.tgz#de1bb0ad528c815548371993f81a54e5a089edcf"
+  integrity sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==
+  dependencies:
+    is-nan "^1.3.0"
+    moment-timezone "^0.5.31"
+
 cron@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/cron/-/cron-1.8.2.tgz#4ac5e3c55ba8c163d84f3407bde94632da8370ce"
@@ -3535,6 +3564,11 @@ debug@^3.1.0, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -3635,6 +3669,11 @@ delegate@^3.1.2:
   resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
   integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
 
+denque@^1.1.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de"
+  integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==
+
 depcheck@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/depcheck/-/depcheck-1.3.1.tgz#b4765503da3e6ba1f3810dad0c34c0a649e7e91d"
@@ -3970,7 +4009,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.17.0-next.1:
+es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1:
   version "1.17.7"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
   integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
@@ -4888,6 +4927,11 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-port@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -5479,6 +5523,22 @@ invariant@2.2.4, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
+ioredis@^4.22.0:
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.22.0.tgz#a2e18a29300ffb759670d7ed7023fcf6592031a2"
+  integrity sha512-mtC+jNFMPRxReWx0HodDbcwj34Gj5pK/P4+aE6Nh0pdqgtZKvxUh4z2lVtLjqnRIvMhKaBnIgMYFR8qH/xtttA==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.1.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    p-map "^2.1.0"
+    redis-commands "1.7.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.0.1"
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -5690,6 +5750,14 @@ is-installed-globally@^0.3.1:
     global-dirs "^2.0.1"
     is-path-inside "^3.0.1"
 
+is-nan@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
 is-negative-zero@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
@@ -7092,6 +7160,16 @@ lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
 
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -7452,6 +7530,13 @@ moment-timezone@^0.5.21, moment-timezone@^0.5.x:
   dependencies:
     moment ">= 2.9.0"
 
+moment-timezone@^0.5.31:
+  version "0.5.33"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
+  integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==
+  dependencies:
+    moment ">= 2.9.0"
+
 "moment@>= 2.9.0", moment@^2.24.0, moment@^2.29.1:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
@@ -8054,6 +8139,11 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-map@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -8066,6 +8156,13 @@ p-reduce@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
   integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
 
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -8530,6 +8627,15 @@ progress@^2.0.0, progress@^2.0.1, progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise.prototype.finally@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
+  integrity sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.0"
+    function-bind "^1.1.1"
+
 prompts@^2.0.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
@@ -8939,6 +9045,23 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
+redis-commands@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89"
+  integrity sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==
+
+redis-errors@^1.0.0, redis-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
+
+redis-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
+  dependencies:
+    redis-errors "^1.0.0"
+
 redoc-cli@^0.9.12:
   version "0.9.13"
   resolved "https://registry.yarnpkg.com/redoc-cli/-/redoc-cli-0.9.13.tgz#f754011ab5e7e92ff620266eaa5755b70e0b480c"
@@ -9900,6 +10023,11 @@ stacktrace-js@^2.0.2:
     stack-generator "^2.0.5"
     stacktrace-gps "^3.0.4"
 
+standard-as-callback@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.0.1.tgz#ed8bb25648e15831759b6023bdb87e6b60b38126"
+  integrity sha512-NQOxSeB8gOI5WjSaxjBgog2QFw55FV8TkS6Y07BiB3VJ8xNTvUYm0wl0s8ObgQ5NhdpnNfigMIKjgPESzgr4tg==
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -10830,7 +10958,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@^1.0.0:
+util.promisify@^1.0.0, util.promisify@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b"
   integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==

From ed7f390a76734279eed80a98bd49ba91c3f6cb1a Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Fri, 12 Feb 2021 16:16:25 -0500
Subject: [PATCH 03/18] add queue components for backend app

---
 .env.example                 |   3 +-
 package.json                 |   3 +-
 src/routes/files/handlers.js |  22 +++++-
 src/services/queue.js        |  10 +++
 yarn.lock                    | 132 ++++++++++++++++++++++++++++++++++-
 5 files changed, 164 insertions(+), 6 deletions(-)
 create mode 100644 src/services/queue.js

diff --git a/.env.example b/.env.example
index 05f7a3ca49..81ec2cfe04 100644
--- a/.env.example
+++ b/.env.example
@@ -46,4 +46,5 @@ MINIO_ROOT_USER=EXAMPLEID
 # if using docker
 CLAMAV_ENDPOINT=http://clamav-rest:8080
 # if running locally
-# CLAMAV_ENDPOINT=http://localhost:8081
\ No newline at end of file
+# CLAMAV_ENDPOINT=http://localhost:8081
+REDIS_PASS=SUPERSECUREPASSWORD
\ No newline at end of file
diff --git a/package.json b/package.json
index 35ea5df26f..73cf22de65 100644
--- a/package.json
+++ b/package.json
@@ -139,6 +139,7 @@
     "adm-zip": "^0.5.1",
     "aws-sdk": "^2.826.0",
     "axios": "^0.21.1",
+    "bull": "^3.20.1",
     "chromedriver": "^87.0.0",
     "client-oauth2": "^4.3.3",
     "cookie-session": "^1.4.0",
@@ -153,8 +154,8 @@
     "helmet": "^4.1.0",
     "http-codes": "^1.0.0",
     "lodash": "^4.17.20",
-    "multiparty": "^4.2.2",
     "moment": "^2.29.1",
+    "multiparty": "^4.2.2",
     "mz": "^2.7.0",
     "newrelic": "^7.0.1",
     "pg": "^8.3.3",
diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index 0a967abeec..1a907e84c8 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -3,6 +3,7 @@ import * as fs from 'fs';
 import handleErrors from '../../lib/apiErrorHandler';
 import { File } from '../../models';
 import s3Uploader from '../../lib/s3Uploader';
+import addToScanQueue from '../../services/queue';
 
 import ActivityReportPolicy from '../../policies/activityReport';
 import { activityReportById } from '../../services/activityReports';
@@ -20,6 +21,15 @@ const logContext = {
   namespace,
 };
 
+const fileStatuses = {
+  uploading: 'UPLOADING',
+  uploaded: 'UPLOADED',
+  uploadFailed: 'UPLOAD_FAILED',
+  scanning: 'SCANNING',
+  approved: 'APPROVED',
+  rejected: 'REJECTED',
+};
+
 export const createFileMetaData = async (
   originalFileName, s3FileName, reportId, attachmentType, fileSize) => {
   const newFile = {
@@ -111,11 +121,19 @@ export default async function uploadHandler(req, res) {
     }
     try {
       await s3Uploader(buffer, fileName, type);
-      await updateStatus(metadata.id, 'UPLOADED');
+      await updateStatus(metadata.id, fileStatuses.uploaded);
       res.status(200).send({ id: metadata.id });
     } catch (err) {
       if (metadata) {
-        await updateStatus(metadata.id, 'UPLOAD_FAILED');
+        await updateStatus(metadata.id, fileStatuses.uploaded);
+      }
+      await handleErrors(req, res, err, logContext);
+    }
+    try {
+      await addToScanQueue({ key: metadata.key });
+    } catch (err) {
+      if (metadata) {
+        await updateStatus(metadata.id, fileStatuses.rejected);
       }
       await handleErrors(req, res, err, logContext);
     }
diff --git a/src/services/queue.js b/src/services/queue.js
new file mode 100644
index 0000000000..ab831d9354
--- /dev/null
+++ b/src/services/queue.js
@@ -0,0 +1,10 @@
+import Queue from 'bull';
+
+const REDIS_PORT = process.env.REDIS_PORT || 6379;
+const { REDIS_HOST, REDIS_PASS } = process.env;
+
+const scanQueue = new Queue('scan', `redis://${REDIS_HOST}:${REDIS_PORT}`, { redis: { password: REDIS_PASS } });
+
+export default async function addToScanQueue(fileKey) {
+  await scanQueue.add(fileKey);
+}
diff --git a/yarn.lock b/yarn.lock
index a5852cc0f2..88d02c01da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2703,6 +2703,22 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
+bull@^3.20.1:
+  version "3.20.1"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-3.20.1.tgz#97c4156f48001565baf3c04b81267a5604f40754"
+  integrity sha512-wDwpVu47WKaGhiguEPa/US5UMrtGLPKNPiGFPo4OgVs3EEGzJEWwv3LRPfjJVIf1COdMAN/yowGhZwYmoOonjQ==
+  dependencies:
+    cron-parser "^2.13.0"
+    debuglog "^1.0.0"
+    get-port "^5.1.1"
+    ioredis "^4.22.0"
+    lodash "^4.17.19"
+    p-timeout "^3.2.0"
+    promise.prototype.finally "^3.1.2"
+    semver "^7.3.2"
+    util.promisify "^1.0.1"
+    uuid "^8.3.0"
+
 byte-length@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/byte-length/-/byte-length-1.0.2.tgz#ba5a5909240b0121c079b7f7b15248d6f08223cc"
@@ -3030,6 +3046,11 @@ clsx@^1.1.0:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
 
+cluster-key-slot@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
+  integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -3352,6 +3373,14 @@ create-require@^1.1.0, create-require@^1.1.1:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
+cron-parser@^2.13.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.18.0.tgz#de1bb0ad528c815548371993f81a54e5a089edcf"
+  integrity sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==
+  dependencies:
+    is-nan "^1.3.0"
+    moment-timezone "^0.5.31"
+
 cron@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/cron/-/cron-1.8.2.tgz#4ac5e3c55ba8c163d84f3407bde94632da8370ce"
@@ -3535,6 +3564,11 @@ debug@^3.1.0, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -3635,6 +3669,11 @@ delegate@^3.1.2:
   resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
   integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
 
+denque@^1.1.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de"
+  integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==
+
 depcheck@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/depcheck/-/depcheck-1.3.1.tgz#b4765503da3e6ba1f3810dad0c34c0a649e7e91d"
@@ -3970,7 +4009,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.17.0-next.1:
+es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1:
   version "1.17.7"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
   integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
@@ -4888,6 +4927,11 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-port@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -5479,6 +5523,22 @@ invariant@2.2.4, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
+ioredis@^4.22.0:
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.22.0.tgz#a2e18a29300ffb759670d7ed7023fcf6592031a2"
+  integrity sha512-mtC+jNFMPRxReWx0HodDbcwj34Gj5pK/P4+aE6Nh0pdqgtZKvxUh4z2lVtLjqnRIvMhKaBnIgMYFR8qH/xtttA==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.1.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    p-map "^2.1.0"
+    redis-commands "1.7.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.0.1"
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -5690,6 +5750,14 @@ is-installed-globally@^0.3.1:
     global-dirs "^2.0.1"
     is-path-inside "^3.0.1"
 
+is-nan@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
 is-negative-zero@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
@@ -7092,6 +7160,16 @@ lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
 
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -7452,6 +7530,13 @@ moment-timezone@^0.5.21, moment-timezone@^0.5.x:
   dependencies:
     moment ">= 2.9.0"
 
+moment-timezone@^0.5.31:
+  version "0.5.33"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
+  integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==
+  dependencies:
+    moment ">= 2.9.0"
+
 "moment@>= 2.9.0", moment@^2.24.0, moment@^2.29.1:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
@@ -8054,6 +8139,11 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-map@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -8066,6 +8156,13 @@ p-reduce@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
   integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
 
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -8530,6 +8627,15 @@ progress@^2.0.0, progress@^2.0.1, progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise.prototype.finally@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
+  integrity sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.0"
+    function-bind "^1.1.1"
+
 prompts@^2.0.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
@@ -8939,6 +9045,23 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
+redis-commands@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89"
+  integrity sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==
+
+redis-errors@^1.0.0, redis-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
+
+redis-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
+  dependencies:
+    redis-errors "^1.0.0"
+
 redoc-cli@^0.9.12:
   version "0.9.13"
   resolved "https://registry.yarnpkg.com/redoc-cli/-/redoc-cli-0.9.13.tgz#f754011ab5e7e92ff620266eaa5755b70e0b480c"
@@ -9900,6 +10023,11 @@ stacktrace-js@^2.0.2:
     stack-generator "^2.0.5"
     stacktrace-gps "^3.0.4"
 
+standard-as-callback@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.0.1.tgz#ed8bb25648e15831759b6023bdb87e6b60b38126"
+  integrity sha512-NQOxSeB8gOI5WjSaxjBgog2QFw55FV8TkS6Y07BiB3VJ8xNTvUYm0wl0s8ObgQ5NhdpnNfigMIKjgPESzgr4tg==
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -10830,7 +10958,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@^1.0.0:
+util.promisify@^1.0.0, util.promisify@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b"
   integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==

From bb5db6a72ec3d953daad443c3726ab7e0f8e3332 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Fri, 12 Feb 2021 16:48:46 -0500
Subject: [PATCH 04/18] fix backend tests

---
 src/routes/files/handlers.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index 1a907e84c8..cd06ee5cb8 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -37,7 +37,7 @@ export const createFileMetaData = async (
     originalFileName,
     attachmentType,
     key: s3FileName,
-    status: 'UPLOADING',
+    status: fileStatuses.uploading,
     fileSize,
   };
   let file;
@@ -131,9 +131,10 @@ export default async function uploadHandler(req, res) {
     }
     try {
       await addToScanQueue({ key: metadata.key });
+      await updateStatus(metadata.id, fileStatuses.scanning);
     } catch (err) {
       if (metadata) {
-        await updateStatus(metadata.id, fileStatuses.rejected);
+        await updateStatus(metadata.id, fileStatuses.uploaded);
       }
       await handleErrors(req, res, err, logContext);
     }

From f938f4902e357eb7d9f82afc084a20011966cfa1 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Mon, 15 Feb 2021 09:21:49 -0500
Subject: [PATCH 05/18] Squashed commit of the following:

commit 58963104f798ea5db486a5f2bec46ade84f60b24
Merge: 55a2a37 c0394f1
Author: kryswisnaskas <krystyna@adhocteam.us>
Date:   Fri Feb 12 17:39:27 2021 -0500

    Merge pull request #150 from adhocteam/kw-display-reports

    Display reports

commit c0394f14b6a727356a7cf88e8c86a17814d5944a
Merge: 9189f61 55a2a37
Author: kryswisnaskas <krystyna@adhocteam.us>
Date:   Fri Feb 12 17:13:40 2021 -0500

    Merge branch 'main' into kw-display-reports

commit 55a2a3759ecf2418e6f1e980b68fc22880b21892
Merge: e985f60 61cb04e
Author: kryswisnaskas <krystyna@adhocteam.us>
Date:   Fri Feb 12 17:11:28 2021 -0500

    Merge pull request #163 from adhocteam/kw-secure-cookie

    Add explicit cookie-session options

commit 61cb04ee5578f1abdd3480cbe032e6ea8489b6f6
Merge: 4ba76a9 6740fd5
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 12 16:56:17 2021 -0500

    Merge branch 'kw-secure-cookie' of https://github.com/adhocteam/Head-Start-TTADP into kw-secure-cookie

commit 4ba76a9bc6d58e25bd01c6524f5de4997eb995a4
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 12 16:55:58 2021 -0500

    Remove one of secure cookie settings

commit 6740fd5524cac971f4dfb418a51d931f15614ef2
Merge: fa3f81e e985f60
Author: kryswisnaskas <krystyna@adhocteam.us>
Date:   Fri Feb 12 16:54:01 2021 -0500

    Merge branch 'main' into kw-secure-cookie

commit 9189f61623405a056c701b1c5fbd9b3e6f0f697d
Merge: c1f7ba4 e985f60
Author: Ryan Ahearn <ryan.ahearn@gsa.gov>
Date:   Fri Feb 12 14:23:56 2021 -0500

    Merge branch 'main' into kw-display-reports

commit c1f7ba4f2f88fcee4f2e2c62f3e7d98de28e6a3b
Merge: f3881d1 79a4808
Author: kryswisnaskas <krystyna@adhocteam.us>
Date:   Fri Feb 12 12:57:14 2021 -0500

    Merge branch 'main' into kw-display-reports

commit f3881d1ec491c09887e0b14c40512fcca1791ee8
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 12 12:26:40 2021 -0500

    Fix lint errors

commit 112ccd61e5efe2d65afc440e201266b2c2c1d296
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 12 11:10:37 2021 -0500

    Update yarn.lock

commit cdc95f18e103b2c2c010f14514c81d3c07db5d34
Merge: 1b1ce8c 8751dcf
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 12 10:18:13 2021 -0500

    Merge branch 'kw-display-reports' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports

commit 1b1ce8c9ecbb80eba7ea12d9a39524ef8874cbc6
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 12 10:17:49 2021 -0500

    Added scrollbars; removed test; modified styles

commit fa3f81e630270a3932394d470e68fb5705870247
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Wed Feb 10 16:22:08 2021 -0500

    Add explicit cookie session options

commit 8751dcf79c355c50c2d96a19ffb140ffc2b5ba5c
Merge: 3d8382b c5b47a7
Author: kryswisnaskas <krystyna@adhocteam.us>
Date:   Wed Feb 10 12:51:09 2021 -0500

    Merge branch 'main' into kw-display-reports

commit 3d8382bb8372f2e982aafbfa860dc58b99fc7b15
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Wed Feb 10 12:25:43 2021 -0500

    Fix merge issue

commit 3d4b1ac7b06f419125f9c6dbb9b37062d28e6bd1
Merge: 6c5e287 16c743f
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Wed Feb 10 11:50:02 2021 -0500

    Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports

commit 6c5e2878cd9a04a0b355e8265959942c1c276b3b
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Wed Feb 10 11:46:58 2021 -0500

    Remove blank lines

commit ff3b8b50d4ad082c2a03f71637b7f67084840792
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Wed Feb 10 11:21:03 2021 -0500

    Remove sorting

commit 1da28b02bde2683884e29dc4ca295b77c55a8798
Merge: c3b37b4 d1c5786
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Wed Feb 10 09:32:54 2021 -0500

    Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports

commit c3b37b4d9895868b8410d23dc5a5a3379f50f780
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Tue Feb 9 17:47:17 2021 -0500

    Adjust test

commit 4af7bd898421a5c653bea544721a53d652a0142a
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Tue Feb 9 17:33:38 2021 -0500

    Remove whitespace to satisfy eslint

commit 253e568da4d0cc2c68ee887a5fbf6d26e4885938
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Tue Feb 9 17:10:15 2021 -0500

    Combine values from multiples

commit 23cf654819d90eb305d06fbf2de4e542c1446431
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Tue Feb 9 14:31:56 2021 -0500

    Fix new eslint errors

commit e4e51eca691418d3e746cadc0400a689721091d8
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Tue Feb 9 14:31:34 2021 -0500

    Fix new eslint errors

commit 4b8a95d53cdb93e882a44c7ef18362bd7465366c
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Tue Feb 9 13:42:36 2021 -0500

    Add role acronyms to display

commit 809a57be547ab4bb134bee5277d339017ea82241
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Tue Feb 9 12:23:42 2021 -0500

    Update open api doc

commit 55c78db252bd9ae916413889d2220456c782add5
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Tue Feb 9 09:02:27 2021 -0500

    Fix cucumber test

commit f106cc20667bb481fb1cdf04765dad36fee2b68d
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Mon Feb 8 20:26:38 2021 -0500

    Modified cucumber test

commit a21b9d2718c0cbab3a2973d967295acac3a2a8fe
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Mon Feb 8 20:12:33 2021 -0500

    Modified cucumber test

commit 0561da4f236f12ca46e3ad0e8f4c0f5edb083274
Merge: 664b52f a99fe60
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Mon Feb 8 19:40:25 2021 -0500

    Merge branch 'kw-display-reports' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports

commit 664b52f105756b306fa2a3f7402ba9d8768ab415
Merge: 158b2cd 0277d73
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Mon Feb 8 19:39:54 2021 -0500

    Merge branch 'js-282-fix-cucumber-tests' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports

commit a99fe60c1557f224092cf4ba8a1897842a086a9e
Merge: 158b2cd 9f5bb95
Author: kryswisnaskas <krystyna@adhocteam.us>
Date:   Mon Feb 8 19:30:27 2021 -0500

    Merge branch 'main' into kw-display-reports

commit 158b2cd65e25880dd49cbdd135e4c142ad0534b8
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Mon Feb 8 19:15:28 2021 -0500

    Fix lint errors

commit e4dae31b089922e256052d0f832a83312a73d915
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Mon Feb 8 18:08:49 2021 -0500

    Added more tests

commit 04bba1c6584282d746fbf096b697553ba2f39c79
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 5 16:51:33 2021 -0500

    Fix lint errors

commit 95b3a38333a608d6c7f9654b4fc0dae6ba4f0067
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 5 15:05:51 2021 -0500

    Fix merge conflict

commit 7d9805f5e8a75ba74aadeddeb90c17f25b2499d6
Merge: 4b6a542 5a31b94
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 5 14:39:14 2021 -0500

    Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports

commit 4b6a54296bc759fb2386b8ab0e8e008311e5a973
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 5 13:59:37 2021 -0500

    Remove unused module

commit 67566d360d6795d5a4033c8fc175826b7f50af85
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 5 13:58:32 2021 -0500

    Fix lint errors

commit 6de8f8e0cfd15c5292d617a611192a6a099c9348
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 5 12:24:20 2021 -0500

    Fix merge issue

commit 6431825e5137a97a24808d0e03c6d1fc5da98311
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 5 11:48:46 2021 -0500

    Correct merge error

commit 75f763987016314f512de6784fe0812cdf5d0656
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Feb 5 11:46:04 2021 -0500

    Added tests, empty report

commit 69ccf1322d9518ad2453f6ee43b1f5482aef332a
Merge: a2bd6c0 8e5d3ef
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Wed Feb 3 17:18:26 2021 -0500

    Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports

commit a2bd6c0dfd317993d4bcf577fd86322d1e865273
Merge: a716599 4c3a436
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Sat Jan 30 10:07:19 2021 -0500

    Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports

commit a71659956c1648367b1e5c160777eedcae9c1ce9
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Fri Jan 29 13:50:53 2021 -0500

    Added sorting

commit cedfeb000f3c79f0920467377c77e34d32e92d43
Author: kryswisnaskas <krystyna.wisnaskas@gmail.com>
Date:   Wed Jan 27 12:47:28 2021 -0500

    Landing page checkpoint commit
---
 cucumber/features/activityReport.feature      |   2 +-
 .../features/steps/activityReportSteps.js     |  11 +-
 cucumber/features/steps/homePageSteps.js      |   4 +-
 docs/openapi/index.yaml                       |  34 +++
 .../activity-reports/activity-reports.yaml    |  12 +
 frontend/package.json                         |   2 +
 frontend/src/App.css                          |   5 +-
 frontend/src/App.js                           |  58 +++--
 frontend/src/components/Header.js             |   2 +-
 frontend/src/components/LandingLayout.js      |  17 ++
 frontend/src/components/MainLayout.js         |  17 ++
 frontend/src/fetchers/activityReports.js      |   5 +
 frontend/src/pages/ActivityReport/index.css   |   4 +-
 frontend/src/pages/Landing/__tests__/index.js | 170 ++++++++++++++
 frontend/src/pages/Landing/index.css          | 165 +++++++++++++
 frontend/src/pages/Landing/index.js           | 222 ++++++++++++++++++
 frontend/src/pages/Landing/mocks.js           | 110 +++++++++
 frontend/yarn.lock                            |  42 +++-
 src/app.js                                    |   1 +
 src/models/activityReport.js                  |  10 +
 src/models/user.js                            |   9 +
 src/routes/activityReports/handlers.js        |  17 +-
 src/routes/activityReports/index.js           |   2 +
 src/services/activityReports.js               |  43 ++++
 24 files changed, 930 insertions(+), 34 deletions(-)
 create mode 100644 frontend/src/components/LandingLayout.js
 create mode 100644 frontend/src/components/MainLayout.js
 create mode 100644 frontend/src/pages/Landing/__tests__/index.js
 create mode 100644 frontend/src/pages/Landing/index.css
 create mode 100644 frontend/src/pages/Landing/index.js
 create mode 100644 frontend/src/pages/Landing/mocks.js

diff --git a/cucumber/features/activityReport.feature b/cucumber/features/activityReport.feature
index 0340d198d3..4999a35692 100644
--- a/cucumber/features/activityReport.feature
+++ b/cucumber/features/activityReport.feature
@@ -1,7 +1,7 @@
 Feature: TTA Smarthub Activity Report
     Scenario: Report can be filled out
         Given I am logged in
-        And I am on the activity reports page
+        And I am on the landing page
         Then I see "New activity report for Region 14" message
         When I select "Non-Grantee"
         Then I see "QRIS System" as an option in the "Non-grantee name(s)" multiselect
diff --git a/cucumber/features/steps/activityReportSteps.js b/cucumber/features/steps/activityReportSteps.js
index 089b147136..14875ee8ab 100644
--- a/cucumber/features/steps/activityReportSteps.js
+++ b/cucumber/features/steps/activityReportSteps.js
@@ -5,14 +5,21 @@ const {
 const assertTrue = require('assert');
 const scope = require('../support/scope');
 
-Given('I am on the activity reports page', async () => {
+Given('I am on the landing page', async () => {
   const page = scope.context.currentPage;
-  const selector = 'a[href$="activity-reports/new"]';
+  const selector = 'a[href$="activity-reports"]';
   await Promise.all([
     page.waitForNavigation(),
     page.click(selector),
   ]);
   await scope.context.currentPage.waitForSelector('h1');
+
+  const selectorNewReport = 'a[href$="activity-reports/new"]';
+  await Promise.all([
+    page.waitForNavigation(),
+    page.click(selectorNewReport),
+  ]);
+  await scope.context.currentPage.waitForSelector('h1');
 });
 
 When('I select {string}', async (inputLabel) => {
diff --git a/cucumber/features/steps/homePageSteps.js b/cucumber/features/steps/homePageSteps.js
index 38dfd55d64..7a53b3e102 100644
--- a/cucumber/features/steps/homePageSteps.js
+++ b/cucumber/features/steps/homePageSteps.js
@@ -22,7 +22,7 @@ Given('I am logged in', async () => {
 
   const loginLinkSelector = 'a[href$="api/login"]';
   // const homeLinkSelector = 'a[href$="/"]';
-  const activityReportsSelector = 'a[href$="activity-reports/new"]';
+  const activityReportsSelector = 'a[href$="activity-reports"]';
 
   await page.goto(scope.uri);
   await page.waitForSelector('em'); // Page title
@@ -52,7 +52,7 @@ Then('I see {string} message', async (string) => {
 
 Then('I see {string} link', async (string) => {
   const page = scope.context.currentPage;
-  const selector = 'a[href$="activity-reports/new"]';
+  const selector = 'a[href$="activity-reports"]';
 
   await page.waitForSelector(selector);
   const value = await page.$eval(selector, (el) => el.textContent);
diff --git a/docs/openapi/index.yaml b/docs/openapi/index.yaml
index 6e0f2c523e..6d37f859f9 100644
--- a/docs/openapi/index.yaml
+++ b/docs/openapi/index.yaml
@@ -113,6 +113,40 @@ components:
           description: The type of the activity, Training or Technical Assistance (or both)
           items:
             type: string
+    shortActivityReport:
+      type: object
+      description: >
+        This object represents a shorter version of a report on an activity that a specialist has completed
+        with 1 to many grants or non-grantees
+      properties:
+        id:
+          type: number
+        regionId:
+          type: number
+          description: Home region id of the activity report user
+        startDate:
+          type: string
+        lastSaved:
+          type: string
+        topics:
+          type: array
+          description: Topics covered during the TTA
+          items:
+            type: string
+        activityRecipients:
+          type: array
+          description: Activity recipients - grantees or non-grantees
+          items:
+            type: object
+        collaborators:
+          type: array
+          description: Collaborating user names
+          items:
+            type: object
+        status:
+          type: string
+          enum: ['approved', 'draft', 'submitted']
+          description: The current state of the report
     selectableUser:
       type: object
       description: >
diff --git a/docs/openapi/paths/activity-reports/activity-reports.yaml b/docs/openapi/paths/activity-reports/activity-reports.yaml
index e5ea38db56..4cbd9faebd 100644
--- a/docs/openapi/paths/activity-reports/activity-reports.yaml
+++ b/docs/openapi/paths/activity-reports/activity-reports.yaml
@@ -1,3 +1,15 @@
+get:
+  tags:
+    - activity-reports
+  description: Gets activity reports from the database.
+  responses:
+    200:
+      description: Successfully retrieved activity reports
+      content:
+        application/json:
+          schema:
+            type: object
+            $ref: '../../index.yaml#/components/schemas/shortActivityReport'
 post:
   tags:
     - activity-reports
diff --git a/frontend/package.json b/frontend/package.json
index 9269b1d928..bb3279c263 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -33,6 +33,8 @@
     "react-select": "^3.1.0",
     "react-stickynode": "^3.0.4",
     "react-with-direction": "^1.3.1",
+    "simplebar": "^5.3.0",
+    "simplebar-react": "^2.3.0",
     "url-join": "^4.0.1",
     "use-deep-compare-effect": "^1.6.1",
     "uswds": "^2.9.0"
diff --git a/frontend/src/App.css b/frontend/src/App.css
index 5c6c84b592..63835bb77d 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -3,8 +3,8 @@
   top: 0;
   z-index: -1;
   left: 0;
-  width: 100%;
-  height: 345px;
+  width: 200px;
+  height: 100%;
   content: "";
   background-color: #264a64;
 }
@@ -38,3 +38,4 @@ body {
 .SingleDatePickerInput__disabled {
   opacity: 0.7;
 }
+
diff --git a/frontend/src/App.js b/frontend/src/App.js
index f218439bcf..2fe90c2e1a 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -3,7 +3,6 @@ import 'uswds/dist/css/uswds.css';
 import '@trussworks/react-uswds/lib/index.css';
 
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
-import { GridContainer } from '@trussworks/react-uswds';
 import { Helmet } from 'react-helmet';
 
 import { fetchUser, fetchLogout } from './fetchers/Auth';
@@ -15,11 +14,14 @@ import Admin from './pages/Admin';
 import Unauthenticated from './pages/Unauthenticated';
 import NotFound from './pages/NotFound';
 import Home from './pages/Home';
+import Landing from './pages/Landing';
 import ActivityReport from './pages/ActivityReport';
 import isAdmin from './permissions';
 import 'react-dates/initialize';
 import 'react-dates/lib/css/_datepicker.css';
 import './App.css';
+import MainLayout from './components/MainLayout';
+import LandingLayout from './components/LandingLayout';
 
 function App() {
   const [user, updateUser] = useState();
@@ -58,6 +60,7 @@ function App() {
   }
 
   const admin = isAdmin(user);
+
   const renderAuthenticatedRoutes = () => (
     <div role="main" id="main-content">
       <IdleModal
@@ -66,33 +69,42 @@ function App() {
         logoutUser={logout}
       />
       <Switch>
+        <Route
+          exact
+          path="/activity-reports"
+          render={({ match }) => (
+            <LandingLayout><Landing match={match} /></LandingLayout>
+          )}
+        />
+
         <Route
           exact
           path="/"
           render={() => (
-            <Home />
+            <MainLayout><Home /></MainLayout>
           )}
         />
+
         <Route
           path="/activity-reports/:activityReportId/:currentPage?"
           render={({ match, location }) => (
-            <ActivityReport location={location} match={match} user={user} />
-          )}
-        />
-        {admin
-        && (
-        <Route
-          path="/admin/:userId?"
-          render={({ match }) => (
-            <Admin match={match} />
+            <MainLayout>
+              <ActivityReport location={location} match={match} user={user} />
+            </MainLayout>
           )}
         />
+
+        {admin && (
+          <Route
+            path="/admin/:userId?"
+            render={({ match }) => <MainLayout><Admin match={match} /></MainLayout>}
+          />
         )}
+
         <Route
-          render={() => (
-            <NotFound />
-          )}
+          render={() => <MainLayout><NotFound /></MainLayout>}
         />
+
       </Switch>
     </div>
   );
@@ -103,17 +115,21 @@ function App() {
         <meta charSet="utf-8" />
       </Helmet>
       <BrowserRouter>
-        {authenticated && <a className="usa-skipnav" href="#main-content">Skip to main content</a>}
+        {authenticated && (
+          <a className="usa-skipnav" href="#main-content">
+            Skip to main content
+          </a>
+        )}
         <UserContext.Provider value={{ user, authenticated, logout }}>
           <Header authenticated={authenticated} admin={admin} />
           <div className="background-stripe" />
           <section className="usa-section">
-            <GridContainer>
-              {!authenticated
-        && <Unauthenticated loggedOut={loggedOut} timedOut={timedOut} />}
-              {authenticated
-        && renderAuthenticatedRoutes()}
-            </GridContainer>
+
+            {!authenticated && (
+            <Unauthenticated loggedOut={loggedOut} timedOut={timedOut} />
+            )}
+            {authenticated && renderAuthenticatedRoutes()}
+
           </section>
         </UserContext.Provider>
       </BrowserRouter>
diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js
index c37713f735..496d5b7133 100644
--- a/frontend/src/components/Header.js
+++ b/frontend/src/components/Header.js
@@ -14,7 +14,7 @@ function Header({ authenticated, admin }) {
     <NavLink exact to="/">
       Home
     </NavLink>,
-    <NavLink to="/activity-reports/new">
+    <NavLink to="/activity-reports">
       Activity Reports
     </NavLink>,
   ];
diff --git a/frontend/src/components/LandingLayout.js b/frontend/src/components/LandingLayout.js
new file mode 100644
index 0000000000..bb3d40e4f3
--- /dev/null
+++ b/frontend/src/components/LandingLayout.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Grid } from '@trussworks/react-uswds';
+
+function LandingLayout({ children }) {
+  return (
+    <Grid row>
+      <Grid tablet={{ col: true }} className="smart-hub--fit-content">{children}</Grid>
+    </Grid>
+  );
+}
+
+LandingLayout.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default LandingLayout;
diff --git a/frontend/src/components/MainLayout.js b/frontend/src/components/MainLayout.js
new file mode 100644
index 0000000000..2f3d0a3248
--- /dev/null
+++ b/frontend/src/components/MainLayout.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { GridContainer } from '@trussworks/react-uswds';
+
+function MainLayout({ children }) {
+  return (
+    <GridContainer>
+      {children}
+    </GridContainer>
+  );
+}
+
+MainLayout.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default MainLayout;
diff --git a/frontend/src/fetchers/activityReports.js b/frontend/src/fetchers/activityReports.js
index ff1ea8ddd3..429f4dee9c 100644
--- a/frontend/src/fetchers/activityReports.js
+++ b/frontend/src/fetchers/activityReports.js
@@ -30,6 +30,11 @@ export const getReport = async (reportId) => {
   return report.json();
 };
 
+export const getReports = async () => {
+  const reports = await get(activityReportUrl);
+  return reports.json();
+};
+
 export const getRecipients = async () => {
   const recipients = await get(join(activityReportUrl, 'activity-recipients'));
   return recipients.json();
diff --git a/frontend/src/pages/ActivityReport/index.css b/frontend/src/pages/ActivityReport/index.css
index 70db45783a..17e6810454 100644
--- a/frontend/src/pages/ActivityReport/index.css
+++ b/frontend/src/pages/ActivityReport/index.css
@@ -6,9 +6,7 @@
   font-style: normal;
   line-height: normal;
   letter-spacing: normal;
-  color: #ffffff;
   margin-bottom: 40px;
-  margin-top: 40px;
 }
 
 .smart-hub--form-section {
@@ -66,4 +64,4 @@
   border-bottom-left-radius: 4px;
   border-bottom-right-radius: 4px;
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
-}
\ No newline at end of file
+}
diff --git a/frontend/src/pages/Landing/__tests__/index.js b/frontend/src/pages/Landing/__tests__/index.js
new file mode 100644
index 0000000000..4774a095d9
--- /dev/null
+++ b/frontend/src/pages/Landing/__tests__/index.js
@@ -0,0 +1,170 @@
+import '@testing-library/jest-dom';
+import React from 'react';
+import {
+  render, screen,
+} from '@testing-library/react';
+import { MemoryRouter } from 'react-router';
+import fetchMock from 'fetch-mock';
+
+import UserContext from '../../../UserContext';
+import Landing from '../index';
+import activityReports from '../mocks';
+import * as page from '../index';
+
+describe('Landing Page', () => {
+  beforeEach(() => {
+    fetchMock.get('/api/activity-reports', activityReports);
+    const user = {
+      name: 'test@test.com',
+    };
+
+    render(
+      <MemoryRouter>
+        <UserContext.Provider value={{ user }}>
+          <Landing authenticated />
+        </UserContext.Provider>
+      </MemoryRouter>,
+    );
+  });
+  afterEach(() => fetchMock.restore());
+
+  test('displays activity reports heading', async () => {
+    expect(await screen.findByText('Activity Reports')).toBeVisible();
+  });
+
+  test('displays report id column', async () => {
+    const reportIdColumnHeader = await screen.findByRole('columnheader', {
+      name: /report id/i,
+    });
+    expect(reportIdColumnHeader).toBeVisible();
+  });
+
+  test('displays grantee column', async () => {
+    const granteeColumnHeader = await screen.findByRole('columnheader', {
+      name: /grantee/i,
+    });
+    expect(granteeColumnHeader).toBeVisible();
+  });
+
+  test('displays start date column', async () => {
+    const startDateColumnHeader = await screen.findByRole('columnheader', {
+      name: /start date/i,
+    });
+    expect(startDateColumnHeader).toBeVisible();
+  });
+
+  test('displays creator column', async () => {
+    const creatorColumnHeader = await screen.findByRole('columnheader', {
+      name: /creator/i,
+    });
+    expect(creatorColumnHeader).toBeVisible();
+  });
+
+  test('displays topics column', async () => {
+    const topicsColumnHeader = await screen.findByRole('columnheader', {
+      name: /topic\(s\)/i,
+    });
+    expect(topicsColumnHeader).toBeVisible();
+  });
+
+  test('displays the correct report id', async () => {
+    const reportIdLink = await screen.findByRole('link', {
+      name: /r14-000001/i,
+    });
+
+    expect(reportIdLink).toBeVisible();
+    expect(reportIdLink.closest('a')).toHaveAttribute(
+      'href',
+      '/activity-reports/1/activity-summary',
+    );
+  });
+
+  test('displays the correct grantees', async () => {
+    const grantees = await screen.findByRole('cell', {
+      name: /johnston-romaguera\njohnston-romaguera\ngrantee name/i,
+    });
+    const nonGrantees = await screen.findByRole('cell', {
+      name: /qris system/i,
+    });
+
+    expect(grantees).toBeVisible();
+    expect(nonGrantees).toBeVisible();
+  });
+
+  test('displays the correct start date', async () => {
+    const startDate = await screen.findByRole('cell', {
+      name: /02\/08\/2021/i,
+    });
+
+    expect(startDate).toBeVisible();
+  });
+
+  test('displays the correct topics', async () => {
+    const topics = await screen.findByRole('cell', {
+      name: /behavioral \/ mental health\nclass: instructional support/i,
+    });
+
+    expect(topics).toBeVisible();
+  });
+
+  test('displays the correct collaborators', async () => {
+    const collaborators = await screen.findByRole('cell', {
+      name: /cucumber user, gs\nhermione granger, ss/i,
+    });
+
+    expect(collaborators).toBeVisible();
+    expect(collaborators.firstChild).toHaveClass('smart-hub--ellipsis');
+    expect(collaborators.firstChild.children.length).toBe(2);
+    expect(collaborators.firstChild.firstChild).toHaveClass('usa-tag smart-hub--table-collection');
+    expect(collaborators.firstChild.firstChild).toHaveTextContent('Cucumber User');
+    expect(collaborators.firstChild.lastChild).toHaveTextContent('Hermione Granger');
+  });
+
+  test('displays the correct last saved dates', async () => {
+    const lastSavedDates = await screen.findAllByText(/02\/04\/2021/i);
+
+    expect(lastSavedDates.length).toBe(2);
+  });
+
+  test('displays the correct statuses', async () => {
+    const statuses = await screen.findAllByText(/draft/i);
+
+    expect(statuses.length).toBe(2);
+  });
+
+  test('displays the options buttons', async () => {
+    const optionButtons = await screen.findAllByRole('button', /.../i);
+
+    expect(optionButtons.length).toBe(2);
+  });
+
+  test('activityReportId is correct', () => {
+    const spy = jest.spyOn(page, 'activityReportId');
+    const reportId = page.activityReportId(333, 9);
+
+    expect(spy).toHaveBeenCalled();
+    expect(reportId).toBe('R09-000333');
+
+    spy.mockRestore();
+  });
+});
+
+describe('Landing Page error', () => {
+  afterEach(() => fetchMock.restore());
+
+  it('handles errors by displaying an error message', async () => {
+    fetchMock.get('/api/activity-reports', 500);
+    render(<MemoryRouter><Landing authenticated /></MemoryRouter>);
+    const alert = await screen.findByRole('alert');
+    expect(alert).toHaveTextContent('Unable to fetch reports');
+  });
+
+  it('displays an empty row if there are no reports', async () => {
+    fetchMock.get('/api/activity-reports', []);
+    render(<MemoryRouter><Landing authenticated /></MemoryRouter>);
+    const rowCells = await screen.findAllByRole('cell');
+    expect(rowCells.length).toBe(8);
+    const grantee = rowCells[0];
+    expect(grantee).toHaveTextContent('');
+  });
+});
diff --git a/frontend/src/pages/Landing/index.css b/frontend/src/pages/Landing/index.css
new file mode 100644
index 0000000000..caf97fd2b9
--- /dev/null
+++ b/frontend/src/pages/Landing/index.css
@@ -0,0 +1,165 @@
+.landing {
+  max-width: fit-content;
+}
+  
+.pagination ul {
+  display: table-caption;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+.pagination li {
+  display: inline-block;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+h1.landing {
+  font-size: 45px;
+  font-family: 'Times New Roman', Times, serif;
+}
+
+.landing .usa-table {
+  line-height: 1.5;
+}
+
+.landing .usa-table caption {
+  font-size: 19px;
+  padding: 14px 0px 17px 20px;
+  margin-bottom: -0.25rem;
+}
+
+.landing .usa-table thead th {
+  font-size: 13px;
+  white-space: nowrap;
+  background-color: white;
+  border-top: solid 1.5px;
+  border-color: #ECEEF1;
+  border-bottom: none;
+}
+
+.landing .usa-table--borderless th:first-child {
+  padding-left: 20px;
+}
+
+.landing .usa-table td {
+  font-size: 15px;
+  white-space: nowrap;
+  background-color: transparent;
+  border-style: none;
+}
+
+.landing .usa-table th {
+  font-size: 15px;
+  white-space: nowrap;
+  background-color: transparent;
+  border-style: none;
+}
+
+.landing .usa-button {
+  margin-left: 45px;
+  vertical-align: middle;
+}
+
+.usa-table tr:nth-child(odd) {
+  background-color:#F8F8F8;
+}
+
+.usa-section {
+  margin-left: 250px;
+}
+
+.smart-hub--table-collection {
+  background: #ECEEF1;
+  color: #21272D;
+  text-align: center;
+  font-weight: normal;
+  text-transform: none;
+  font-size: 14px;
+}
+
+.smart-hub--status-draft {
+  background: #E2EFF7;
+  color: #0166AB;
+}
+
+.smart-hub--status-submitted {
+  background: #eceef1;
+  color: #475260;
+}
+
+.smart-hub--status-approved {
+  background: #f0fcf4;
+  color: #148439;
+}
+
+.smart-hub--status- {
+  background: #f8f8f8;
+}
+
+.smart-hub--table-tag-status {
+  text-align: center;
+  font-weight: bold;
+  text-transform: capitalize;
+}
+
+.smart-hub--ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: inline-block;
+  width: 210px;
+  vertical-align: middle;
+}
+
+.smart-hub--dotdotdot {
+  font-size: 25px;
+  font-weight: bold;
+  border: none;
+  background: transparent;
+  padding-bottom: 15px;
+  line-height: 0.75;
+}
+
+.smart-hub--plus {
+  font-size: 40px;
+}
+
+.smart-hub--new-report {
+  margin-left: 10px;
+  margin-top: 7px;
+  float: right;
+}
+
+.smart-hub--new-report-btn {
+  line-height: 0.5;
+  min-width: 220px;
+}
+
+.smart-hub--create-new-report {
+  padding-top: 30px;
+}
+
+thead th.ascending::after {
+  content: "▲";
+  display: inline-block;
+  margin-left: 0.25em;
+}
+
+thead th.descending::after {
+  content: "▼";
+  display: inline-block;
+  margin-left: 0.25em;
+}
+
+.landing .usa-alert {
+  padding: 20px;
+}
+
+.inline-size {
+  inline-size: fit-content;
+}
+
+.simplebar-scrollbar:before {
+  background: #c5c5c5;
+}
diff --git a/frontend/src/pages/Landing/index.js b/frontend/src/pages/Landing/index.js
new file mode 100644
index 0000000000..3152da2246
--- /dev/null
+++ b/frontend/src/pages/Landing/index.js
@@ -0,0 +1,222 @@
+import React, { useState, useEffect } from 'react';
+import {
+  Tag, Table, Alert, Grid,
+} from '@trussworks/react-uswds';
+import { Helmet } from 'react-helmet';
+import { Link } from 'react-router-dom';
+import SimpleBar from 'simplebar-react';
+import 'simplebar/dist/simplebar.min.css';
+
+import Container from '../../components/Container';
+import { getReports } from '../../fetchers/activityReports';
+import 'uswds/dist/css/uswds.css';
+import '@trussworks/react-uswds/lib/index.css';
+import './index.css';
+
+export const activityReportId = (id, regionId) => `R${
+  regionId < 10
+    ? `0${regionId}`
+    : regionId
+}-${id <= 999999 ? `00000${id}`.slice(-6) : id}`;
+
+function renderReports(reports) {
+  const emptyReport = {
+    id: '',
+    activityRecipients: [],
+    startDate: '',
+    author: '',
+    topics: [],
+    collaborators: [],
+    lastSaved: '',
+    status: '',
+  };
+
+  const displayReports = reports.length ? reports : [emptyReport];
+
+  return displayReports.map((report) => {
+    const {
+      id,
+      activityRecipients,
+      startDate,
+      author,
+      topics,
+      collaborators,
+      lastSaved,
+      status,
+      regionId,
+    } = report;
+
+    const recipientsTitle = activityRecipients.reduce(
+      (result, ar) => `${result + (ar.grant ? ar.grant.grantee.name : ar.name)}\n`,
+      '',
+    );
+
+    const recipients = activityRecipients.map((ar) => (
+      <Tag
+        key={`${ar.name.slice(1, 3)}_${ar.id}`}
+        className="smart-hub--table-collection"
+      >
+        {ar.grant ? ar.grant.grantee.name : ar.name}
+      </Tag>
+    ));
+
+    const topicsTitle = topics.reduce(
+      (result, topic) => `${result + topic}\n`,
+      '',
+    );
+
+    const topicsWithTags = topics.map((topic) => (
+      <Tag
+        key={topic.slice(1, 13)}
+        className="smart-hub--table-collection"
+      >
+        {topic}
+      </Tag>
+    ));
+
+    const collaboratorsTitle = collaborators.reduce(
+      (result, collaborator) => `${result + collaborator.fullName}\n`,
+      '',
+    );
+
+    const collaboratorsWithTags = collaborators.map((collaborator) => (
+      <Tag
+        key={collaborator.fullName.slice(1, 13)}
+        className="smart-hub--table-collection"
+      >
+        {collaborator.fullName}
+      </Tag>
+    ));
+
+    const fullId = !id
+      ? ''
+      : activityReportId(id, regionId);
+
+    return (
+      <tr key={`landing_${id}`}>
+        <th scope="row">
+          <Link
+            to={`/activity-reports/${id}/activity-summary`}
+            href={`/activity-reports/${id}/activity-summary`}
+          >
+            {fullId}
+          </Link>
+        </th>
+        <td>
+          <span className="smart-hub--ellipsis" title={recipientsTitle}>
+            {recipients}
+          </span>
+        </td>
+        <td>{startDate}</td>
+        <td>
+          <span className="smart-hub--ellipsis" title={author.fullName}>
+            {author.fullName}
+          </span>
+        </td>
+        <td>
+          <span className="smart-hub--ellipsis" title={topicsTitle}>
+            {topicsWithTags}
+          </span>
+        </td>
+        <td>
+          <span className="smart-hub--ellipsis" title={collaboratorsTitle}>
+            {collaboratorsWithTags}
+          </span>
+        </td>
+        <td>{lastSaved}</td>
+        <td>
+          <Tag
+            className={`smart-hub--table-tag-status smart-hub--status-${status}`}
+          >
+            {status}
+          </Tag>
+        </td>
+        <td>
+          <button type="button" className="smart-hub--dotdotdot">
+            ...
+          </button>
+        </td>
+      </tr>
+    );
+  });
+}
+
+function Landing() {
+  const [isLoaded, setIsLoaded] = useState(false);
+  const [reports, updateReports] = useState([]);
+  const [error, updateError] = useState();
+
+  useEffect(() => {
+    async function fetchReports() {
+      setIsLoaded(false);
+      try {
+        const reps = await getReports();
+        updateReports(reps);
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.log(e);
+        updateError('Unable to fetch reports');
+      }
+      setIsLoaded(true);
+    }
+    fetchReports();
+  }, []);
+
+  if (!isLoaded) {
+    return <div>Loading...</div>;
+  }
+
+  return (
+    <>
+      <Helmet>
+        <title>Landing</title>
+      </Helmet>
+      <Grid row gap>
+        <Grid col={3}>
+          <h1 className="landing">Activity Reports</h1>
+        </Grid>
+        <Grid className="smart-hub--create-new-report">
+          <Link
+            to="/activity-reports/new"
+            referrerPolicy="same-origin"
+            className="usa-button smart-hub--new-report-btn"
+            variant="unstyled"
+          >
+            <span className="smart-hub--plus">+</span>
+            <span className="smart-hub--new-report">New Activity Report</span>
+          </Link>
+        </Grid>
+      </Grid>
+      <Grid row>
+        {error && (
+          <Alert type="error" role="alert">
+            {error}
+          </Alert>
+        )}
+      </Grid>
+      <SimpleBar>
+        <Container className="landing inline-size" padding={0}>
+          <Table className="usa-table usa-table--borderless usa-table--striped">
+            <caption>Activity reports</caption>
+            <thead>
+              <tr>
+                <th scope="col">Report ID</th>
+                <th scope="col">Grantee</th>
+                <th scope="col">Start date</th>
+                <th scope="col">Creator</th>
+                <th scope="col">Topic(s)</th>
+                <th scope="col">Collaborator(s)</th>
+                <th scope="col">Last saved</th>
+                <th scope="col">Status</th>
+                <th scope="col" aria-label="..." />
+              </tr>
+            </thead>
+            <tbody>{renderReports(reports)}</tbody>
+          </Table>
+        </Container>
+      </SimpleBar>
+    </>
+  );
+}
+
+export default Landing;
diff --git a/frontend/src/pages/Landing/mocks.js b/frontend/src/pages/Landing/mocks.js
new file mode 100644
index 0000000000..ea5451f1c2
--- /dev/null
+++ b/frontend/src/pages/Landing/mocks.js
@@ -0,0 +1,110 @@
+const activityReports = [
+  {
+    startDate: '02/08/2021',
+    lastSaved: '02/04/2021',
+    id: 1,
+    regionId: 14,
+    topics: ['Behavioral / Mental Health', 'CLASS: Instructional Support'],
+    status: 'draft',
+    activityRecipients: [
+      {
+        activityRecipientId: 5,
+        name: 'Johnston-Romaguera - 14CH00003',
+        id: 1,
+        grant: {
+          id: 5,
+          number: '14CH00003',
+          grantee: {
+            name: 'Johnston-Romaguera',
+          },
+        },
+        nonGrantee: null,
+      },
+      {
+        activityRecipientId: 4,
+        name: 'Johnston-Romaguera - 14CH00002',
+        id: 2,
+        grant: {
+          id: 4,
+          number: '14CH00002',
+          grantee: {
+            name: 'Johnston-Romaguera',
+          },
+        },
+        nonGrantee: null,
+      },
+      {
+        activityRecipientId: 1,
+        name: 'Grantee Name - 14CH1234',
+        id: 3,
+        grant: {
+          id: 1,
+          number: '14CH1234',
+          grantee: {
+            name: 'Grantee Name',
+          },
+        },
+        nonGrantee: null,
+      },
+    ],
+    author: {
+      fullName: 'Kiwi, GS',
+      name: 'Kiwi',
+      role: 'Grants Specialist',
+      homeRegionId: 14,
+    },
+    collaborators: [
+      {
+        fullName: 'Orange, GS',
+        name: 'Orange',
+        role: 'Grants Specialist',
+      },
+      {
+        fullName: 'Hermione Granger, SS',
+        name: 'Hermione Granger',
+        role: 'System Specialist',
+      },
+    ],
+  },
+  {
+    startDate: '02/01/2021',
+    lastSaved: '02/04/2021',
+    id: 2,
+    regionId: 14,
+    topics: [],
+    status: 'draft',
+    activityRecipients: [
+      {
+        activityRecipientId: 3,
+        name: 'QRIS System',
+        id: 31,
+        grant: null,
+        nonGrantee: {
+          id: 3,
+          name: 'QRIS System',
+          createdAt: '2021-02-03T21:00:57.149Z',
+          updatedAt: '2021-02-03T21:00:57.149Z',
+        },
+      },
+    ],
+    author: {
+      fullName: 'Kiwi, GS',
+      name: 'Kiwi',
+      role: 'Grants Specialist',
+      homeRegionId: 14,
+    },
+    collaborators: [
+      {
+        fullName: 'Cucumber User, GS',
+        name: 'Cucumber User',
+        role: 'Grantee Specialist',
+      },
+      {
+        fullName: 'Hermione Granger, SS',
+        name: 'Hermione Granger',
+        role: 'System Specialist',
+      },
+    ],
+  },
+];
+export default activityReports;
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 005956f0e0..c84e8d1b84 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -3083,6 +3083,11 @@ camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+can-use-dom@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
+  integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=
+
 caniuse-api@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -3540,6 +3545,11 @@ core-js@^3.0.0, core-js@^3.5.0, core-js@^3.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47"
   integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==
 
+core-js@^3.0.1:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0"
+  integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -7351,7 +7361,7 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
-lodash.debounce@^4.0.7:
+lodash.debounce@^4.0.7, lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
@@ -7406,6 +7416,11 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "^3.0.0"
 
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
+
 lodash.union@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
@@ -10150,6 +10165,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+resize-observer-polyfill@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -10615,6 +10635,26 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+simplebar-react@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/simplebar-react/-/simplebar-react-2.3.0.tgz#c5fdd4042a7c603687684407fa7b20e9dc1f8fab"
+  integrity sha512-ZhWEe4UkshSJ9xPG1F/W58UMJdA3fzgtXGrYsya3hxdMbIYoKUKEhdBsqdMoeaLGyn/5dbMPqDLinkLeg0W0cQ==
+  dependencies:
+    prop-types "^15.6.1"
+    simplebar "^5.3.0"
+
+simplebar@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-5.3.0.tgz#857de63296401ed0c3026845514fe5db69795be5"
+  integrity sha512-LgrGdIWpwHLLlI9HqfnGql62H/iZlF0KDZ7w3ZNbd2ZLwh9NKsODLHPzQgUlqQ8aZe7Y6/1xJMXK1PU5e810+w==
+  dependencies:
+    can-use-dom "^0.1.0"
+    core-js "^3.0.1"
+    lodash.debounce "^4.0.8"
+    lodash.memoize "^4.1.2"
+    lodash.throttle "^4.1.1"
+    resize-observer-polyfill "^1.5.1"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
diff --git a/src/app.js b/src/app.js
index acc92b0c87..a962c8600c 100644
--- a/src/app.js
+++ b/src/app.js
@@ -29,6 +29,7 @@ app.use(cookieSession({
 
   // Cookie Options. httpOnly is set by default to true for https
   sameSite: 'lax',
+  secureProxy: true,
 }));
 
 if (process.env.NODE_ENV === 'production') {
diff --git a/src/models/activityReport.js b/src/models/activityReport.js
index 1e6f9d6260..ac17fe52fc 100644
--- a/src/models/activityReport.js
+++ b/src/models/activityReport.js
@@ -140,6 +140,16 @@ export default (sequelize, DataTypes) => {
     ttaType: {
       type: DataTypes.ARRAY(DataTypes.STRING),
     },
+    updatedAt: {
+      allowNull: false,
+      type: DataTypes.DATE,
+    },
+    lastSaved: {
+      type: DataTypes.VIRTUAL,
+      get() {
+        return moment(this.updatedAt).format('MM/DD/YYYY');
+      },
+    },
   }, {
     sequelize,
     modelName: 'ActivityReport',
diff --git a/src/models/user.js b/src/models/user.js
index 36bf38253b..bd7ee0591d 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -55,6 +55,15 @@ export default (sequelize, DataTypes) => {
       },
     },
     role: DataTypes.ENUM(roles),
+    fullName: {
+      type: DataTypes.VIRTUAL,
+      get() {
+        if (this.role) {
+          return this.role === 'TTAC' ? `${this.name}, ${this.role}` : `${this.name}, ${this.role.split(' ').map((word) => word[0]).join('')}`;
+        }
+        return this.name;
+      },
+    },
     lastLogin: DataTypes.DATE,
   }, {
     sequelize,
diff --git a/src/routes/activityReports/handlers.js b/src/routes/activityReports/handlers.js
index 5afc38e65e..8ef9027c53 100644
--- a/src/routes/activityReports/handlers.js
+++ b/src/routes/activityReports/handlers.js
@@ -3,7 +3,7 @@ import SCOPES from '../../middleware/scopeConstants';
 import ActivityReport from '../../policies/activityReport';
 import User from '../../policies/user';
 import {
-  possibleRecipients, activityReportById, createOrUpdate, review,
+  possibleRecipients, activityReportById, createOrUpdate, review, activityReports,
 } from '../../services/activityReports';
 import { goalsForGrants } from '../../services/goals';
 import { userById, usersWithPermissions } from '../../services/users';
@@ -143,6 +143,21 @@ export async function getReport(req, res) {
   res.json(report);
 }
 
+/**
+ * Retrieve activity reports
+ *
+ * @param {*} req - request
+ * @param {*} res - response
+ */
+export async function getReports(req, res) {
+  const reports = await activityReports();
+  if (!reports) {
+    res.sendStatus(404);
+  } else {
+    res.json(reports);
+  }
+}
+
 /**
  * save an activity report
  *
diff --git a/src/routes/activityReports/index.js b/src/routes/activityReports/index.js
index aba195e8ea..adb0024595 100644
--- a/src/routes/activityReports/index.js
+++ b/src/routes/activityReports/index.js
@@ -5,6 +5,7 @@ import {
   saveReport,
   createReport,
   getReport,
+  getReports,
   getActivityRecipients,
   getGoals,
   reviewReport,
@@ -21,6 +22,7 @@ router.get('/approvers', getApprovers);
 router.get('/activity-recipients', getActivityRecipients);
 router.get('/goals', getGoals);
 router.get('/:activityReportId', getReport);
+router.get('/', getReports);
 router.put('/:activityReportId', saveReport);
 router.put('/:activityReportId/review', reviewReport);
 router.post('/:activityReportId/submit', submitReport);
diff --git a/src/services/activityReports.js b/src/services/activityReports.js
index 3235dd0c7a..e90b69b805 100644
--- a/src/services/activityReports.js
+++ b/src/services/activityReports.js
@@ -193,6 +193,49 @@ export function activityReportById(activityReportId) {
   });
 }
 
+export function activityReports() {
+  return ActivityReport.findAll({
+    attributes: ['id', 'startDate', 'lastSaved', 'topics', 'status', 'regionId'],
+    include: [
+      {
+        model: ActivityRecipient,
+        attributes: ['id', 'name', 'activityRecipientId'],
+        as: 'activityRecipients',
+        required: false,
+        include: [
+          {
+            model: Grant,
+            attributes: ['id', 'number'],
+            as: 'grant',
+            required: false,
+            include: [{
+              model: Grantee,
+              as: 'grantee',
+              attributes: ['name'],
+            }],
+          },
+          {
+            model: NonGrantee,
+            as: 'nonGrantee',
+            required: false,
+          },
+        ],
+      },
+      {
+        model: User,
+        attributes: ['name', 'role', 'fullName', 'homeRegionId'],
+        as: 'author',
+      },
+      {
+        model: User,
+        attributes: ['name', 'role', 'fullName'],
+        as: 'collaborators',
+        through: { attributes: [] },
+      },
+    ],
+  });
+}
+
 export async function createOrUpdate(newActivityReport, report) {
   let savedReport;
   const {

From 28af6c1ef647c3a274683f6a206f9b56e88ff435 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Mon, 15 Feb 2021 10:00:48 -0500
Subject: [PATCH 06/18] add adr for redis and worker

---
 docs/adr/0013-add-job-queue-and-worker.md | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 docs/adr/0013-add-job-queue-and-worker.md

diff --git a/docs/adr/0013-add-job-queue-and-worker.md b/docs/adr/0013-add-job-queue-and-worker.md
new file mode 100644
index 0000000000..1d387c1aa7
--- /dev/null
+++ b/docs/adr/0013-add-job-queue-and-worker.md
@@ -0,0 +1,26 @@
+# 13. Add job queue and worker
+
+# Date
+20201-02-13
+
+## Status
+
+Accepted
+
+## Context
+
+In order to satisfy the [RA-5](https://nvd.nist.gov/800-53/Rev4/control/RA-5)
+control around vulnerability scanning, we wish to scan all user-uploaded files
+with a malware detection service. We want to satisfy the following requirements.
+1. Scanning can be done asyncronously so as not to negatively impact the user experience.
+2. Scanning should be loosely coupled to main application to allow for more resiliance and fault tolerance.
+3. Scanning should be retried if malware detection service is unavailable.
+4. Scanning should run on a seperate instance to prevent a negative impact to the user experience.
+
+## Decision
+
+We will use redis as a queue and build a worker node which will take jobs from the queue, send them to the malware detection service and then update the database with the scan results.
+
+## Consequences
+
+All of the above requirements are filled. This does introduce some additional complexity in the form of a redis instance and worker instance. However, cloud.gov supplies managed redis instances and the worker will be built on top of an official node.js buildpack, so any additional maintenance from running these instances is negligable.
\ No newline at end of file

From a92ce72120f045897b27bff462ee8309d54a8697 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Mon, 15 Feb 2021 10:28:59 -0500
Subject: [PATCH 07/18] Try limiting workers for frontend tests

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe300d4fb2..b912533503 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -203,7 +203,7 @@ jobs:
             ./run-yarn-audit.sh;
       - run:
           name: Test frontend
-          command: yarn --cwd frontend run test:ci
+          command: yarn --cwd frontend run test:ci --maxWorkers=50%
       - store_test_results:
           path: frontend/reports/
       - store_artifacts:

From 491abf6828dc351824db0b9eb42ada619d7f1a5a Mon Sep 17 00:00:00 2001
From: Daniel Riquiac Gopar <danielriquiacgopar@danielrrmacbook.lan>
Date: Mon, 15 Feb 2021 10:34:24 -0800
Subject: [PATCH 08/18] Convert some string types to text types

---
 .../20210215181557-convert-string-types-to-text.js    | 11 +++++++++++
 src/models/activityReport.js                          |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 src/migrations/20210215181557-convert-string-types-to-text.js

diff --git a/src/migrations/20210215181557-convert-string-types-to-text.js b/src/migrations/20210215181557-convert-string-types-to-text.js
new file mode 100644
index 0000000000..2066d7fac4
--- /dev/null
+++ b/src/migrations/20210215181557-convert-string-types-to-text.js
@@ -0,0 +1,11 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.changeColumn('ActivityReports', 'additionalNotes', { type: Sequelize.TEXT });
+    await queryInterface.changeColumn('ActivityReports', 'context', { type: Sequelize.TEXT });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.changeColumn('ActivityReports', 'additionalNotes', { type: Sequelize.STRING });
+    await queryInterface.changeColumn('ActivityReports', 'context', { type: Sequelize.STRING });
+  },
+};
diff --git a/src/models/activityReport.js b/src/models/activityReport.js
index ac17fe52fc..5e19f732a0 100644
--- a/src/models/activityReport.js
+++ b/src/models/activityReport.js
@@ -52,7 +52,7 @@ export default (sequelize, DataTypes) => {
       type: DataTypes.STRING,
     },
     additionalNotes: {
-      type: DataTypes.STRING,
+      type: DataTypes.TEXT,
     },
     numberOfParticipants: {
       type: DataTypes.INTEGER,
@@ -94,7 +94,7 @@ export default (sequelize, DataTypes) => {
       type: DataTypes.ARRAY(DataTypes.STRING),
     },
     context: {
-      type: DataTypes.STRING,
+      type: DataTypes.TEXT,
     },
     pageState: {
       type: DataTypes.JSON,

From 385c5e499cfc381cd44b859f7f2af5c148c13e11 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Mon, 15 Feb 2021 13:51:35 -0500
Subject: [PATCH 09/18] Add additional statuses for file uploads

---
 .../20210215161922-add-statuses-to-file-model.js     | 12 ++++++++++++
 src/models/file.js                                   | 11 ++++++++++-
 src/routes/files/handlers.js                         |  8 +++++---
 src/routes/files/handlers.test.js                    |  2 ++
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 src/migrations/20210215161922-add-statuses-to-file-model.js

diff --git a/src/migrations/20210215161922-add-statuses-to-file-model.js b/src/migrations/20210215161922-add-statuses-to-file-model.js
new file mode 100644
index 0000000000..561f4fc8ae
--- /dev/null
+++ b/src/migrations/20210215161922-add-statuses-to-file-model.js
@@ -0,0 +1,12 @@
+module.exports = {
+  up: async (queryInterface) => {
+    await queryInterface.sequelize.query('ALTER TYPE "enum_Files_status" ADD VALUE \'QUEUEING_FAILED\';');
+    await queryInterface.sequelize.query('ALTER TYPE "enum_Files_status" ADD VALUE \'SCANNING_QUEUED\';');
+  },
+  down: async (queryInterface) => {
+    let query = 'DELETE FROM pg_enum WHERE enumlabel = \'QUEUEING_FAILED\' AND enumtypid = ( SELECT oid FROM pg_type WHERE typname = \'enum_Files_status\')';
+    await queryInterface.sequelize.query(query);
+    query = 'DELETE FROM pg_enum WHERE enumlabel = \'SCANNING_QUEUED\' AND enumtypid = ( SELECT oid FROM pg_type WHERE typname = \'enum_Files_status\')';
+    await queryInterface.sequelize.query(query);
+  },
+};
diff --git a/src/models/file.js b/src/models/file.js
index 95dd7aa194..523a5e5bd1 100644
--- a/src/models/file.js
+++ b/src/models/file.js
@@ -26,7 +26,16 @@ module.exports = (sequelize, DataTypes) => {
       allowNull: false,
     },
     status: {
-      type: DataTypes.ENUM('UPLOADING', 'UPLOADED', 'UPLOAD_FAILED', 'SCANNING', 'APPROVED', 'REJECTED'),
+      type: DataTypes.ENUM(
+        'UPLOADING',
+        'UPLOADED',
+        'UPLOAD_FAILED',
+        'QUEUEING_FAILED',
+        'SCANNING_QUEUED',
+        'SCANNING',
+        'APPROVED',
+        'REJECTED',
+      ),
       allowNull: false,
     },
     attachmentType: {
diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index cd06ee5cb8..b22c32799d 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -25,6 +25,8 @@ const fileStatuses = {
   uploading: 'UPLOADING',
   uploaded: 'UPLOADED',
   uploadFailed: 'UPLOAD_FAILED',
+  queued: 'SCANNING_QUEUED',
+  queueingFailed: 'QUEUEING_FAILED',
   scanning: 'SCANNING',
   approved: 'APPROVED',
   rejected: 'REJECTED',
@@ -125,16 +127,16 @@ export default async function uploadHandler(req, res) {
       res.status(200).send({ id: metadata.id });
     } catch (err) {
       if (metadata) {
-        await updateStatus(metadata.id, fileStatuses.uploaded);
+        await updateStatus(metadata.id, fileStatuses.uploadFailed);
       }
       await handleErrors(req, res, err, logContext);
     }
     try {
       await addToScanQueue({ key: metadata.key });
-      await updateStatus(metadata.id, fileStatuses.scanning);
+      await updateStatus(metadata.id, fileStatuses.queued);
     } catch (err) {
       if (metadata) {
-        await updateStatus(metadata.id, fileStatuses.uploaded);
+        await updateStatus(metadata.id, fileStatuses.queueingFailed);
       }
       await handleErrors(req, res, err, logContext);
     }
diff --git a/src/routes/files/handlers.test.js b/src/routes/files/handlers.test.js
index 0355e87214..006943fb28 100644
--- a/src/routes/files/handlers.test.js
+++ b/src/routes/files/handlers.test.js
@@ -7,6 +7,7 @@ import db, {
 } from '../../models';
 import app from '../../app';
 import s3Uploader from '../../lib/s3Uploader';
+import addToScanQueue from '../../services/queue';
 import SCOPES from '../../middleware/scopeConstants';
 import { REPORT_STATUSES } from '../../constants';
 import ActivityReportPolicy from '../../policies/activityReport';
@@ -18,6 +19,7 @@ const request = require('supertest');
 const ORIGINAL_ENV = process.env;
 
 jest.mock('../../lib/s3Uploader');
+jest.mock('../../services/queue');
 
 const mockUser = {
   id: 100,

From 51b2474c948d745f48dee6115a6f8857d8f0715e Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Mon, 15 Feb 2021 13:56:27 -0500
Subject: [PATCH 10/18] disable eslint for test case

---
 src/routes/files/handlers.test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/routes/files/handlers.test.js b/src/routes/files/handlers.test.js
index 006943fb28..4861a5dcdb 100644
--- a/src/routes/files/handlers.test.js
+++ b/src/routes/files/handlers.test.js
@@ -7,6 +7,8 @@ import db, {
 } from '../../models';
 import app from '../../app';
 import s3Uploader from '../../lib/s3Uploader';
+// disable this to allow mocking this function
+// eslint-disable-next-line no-unused-vars
 import addToScanQueue from '../../services/queue';
 import SCOPES from '../../middleware/scopeConstants';
 import { REPORT_STATUSES } from '../../constants';

From 32d894d58e404948b7a8426e998f952a1321d15a Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date: Mon, 15 Feb 2021 21:02:10 +0000
Subject: [PATCH 11/18] Update handlers.js

---
 src/routes/files/handlers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index b22c32799d..d542e6d1a7 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -130,6 +130,7 @@ export default async function uploadHandler(req, res) {
         await updateStatus(metadata.id, fileStatuses.uploadFailed);
       }
       await handleErrors(req, res, err, logContext);
+      return
     }
     try {
       await addToScanQueue({ key: metadata.key });

From 1a40fd6bc014106c1e7e674668a842556dc7ac55 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date: Mon, 15 Feb 2021 21:09:22 +0000
Subject: [PATCH 12/18] Update handlers.js

---
 src/routes/files/handlers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index d542e6d1a7..c07fd700d5 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -130,7 +130,7 @@ export default async function uploadHandler(req, res) {
         await updateStatus(metadata.id, fileStatuses.uploadFailed);
       }
       await handleErrors(req, res, err, logContext);
-      return
+      return;
     }
     try {
       await addToScanQueue({ key: metadata.key });

From c790db93ad8389e92d0cb30aefe4d903f0dda2f8 Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Tue, 16 Feb 2021 11:25:34 -0600
Subject: [PATCH 13/18] Add display ID to API doc

---
 docs/openapi/index.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/openapi/index.yaml b/docs/openapi/index.yaml
index 6d37f859f9..dc4bebba5f 100644
--- a/docs/openapi/index.yaml
+++ b/docs/openapi/index.yaml
@@ -24,6 +24,11 @@ components:
       properties:
         id:
           type: number
+        displayId:
+          type: string
+          description: >
+            A human readable report ID, of the form `R[Region]-AR-[ID]`. A report with
+            the ID of 20 in region 8 would have a displayId of `R08-AR-20`
         userId:
           type: number
           description: The id of the author of the report

From b7824e41cac3546a1ac0e2a2446c9b7ed012a95d Mon Sep 17 00:00:00 2001
From: Daniel Riquiac Gopar <danielriquiacgopar@danielrrmacbook.lan>
Date: Tue, 16 Feb 2021 09:44:54 -0800
Subject: [PATCH 14/18] Wrap in Promise and add extra field

---
 .../20210215181557-convert-string-types-to-text.js | 14 ++++++++++----
 src/models/activityReport.js                       |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/migrations/20210215181557-convert-string-types-to-text.js b/src/migrations/20210215181557-convert-string-types-to-text.js
index 2066d7fac4..9283bcbc0a 100644
--- a/src/migrations/20210215181557-convert-string-types-to-text.js
+++ b/src/migrations/20210215181557-convert-string-types-to-text.js
@@ -1,11 +1,17 @@
 module.exports = {
   up: async (queryInterface, Sequelize) => {
-    await queryInterface.changeColumn('ActivityReports', 'additionalNotes', { type: Sequelize.TEXT });
-    await queryInterface.changeColumn('ActivityReports', 'context', { type: Sequelize.TEXT });
+    Promise.all([
+      queryInterface.changeColumn('ActivityReports', 'additionalNotes', { type: Sequelize.TEXT }),
+      queryInterface.changeColumn('ActivityReports', 'context', { type: Sequelize.TEXT }),
+      queryInterface.changeColumn('ActivityReports', 'resourcesUsed', { type: Sequelize.TEXT }),
+    ]);
   },
 
   down: async (queryInterface, Sequelize) => {
-    await queryInterface.changeColumn('ActivityReports', 'additionalNotes', { type: Sequelize.STRING });
-    await queryInterface.changeColumn('ActivityReports', 'context', { type: Sequelize.STRING });
+    Promise.all([
+      queryInterface.changeColumn('ActivityReports', 'additionalNotes', { type: Sequelize.STRING }),
+      queryInterface.changeColumn('ActivityReports', 'context', { type: Sequelize.STRING }),
+      queryInterface.changeColumn('ActivityReports', 'resourcesUsed', { type: Sequelize.STRING }),
+    ]);
   },
 };
diff --git a/src/models/activityReport.js b/src/models/activityReport.js
index 5e19f732a0..295fb29468 100644
--- a/src/models/activityReport.js
+++ b/src/models/activityReport.js
@@ -49,7 +49,7 @@ export default (sequelize, DataTypes) => {
       allowNull: true,
     },
     resourcesUsed: {
-      type: DataTypes.STRING,
+      type: DataTypes.TEXT,
     },
     additionalNotes: {
       type: DataTypes.TEXT,

From 74d12432d038c18c345c947b5c42148f4eb9a270 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date: Tue, 16 Feb 2021 18:23:24 +0000
Subject: [PATCH 15/18] Log queuing errors instead of calling handleErrors

---
 src/routes/files/handlers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index c07fd700d5..0b13116969 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -8,6 +8,7 @@ import addToScanQueue from '../../services/queue';
 import ActivityReportPolicy from '../../policies/activityReport';
 import { activityReportById } from '../../services/activityReports';
 import { userById } from '../../services/users';
+import logger from '../../logger';
 
 const fileType = require('file-type');
 const multiparty = require('multiparty');
@@ -138,8 +139,8 @@ export default async function uploadHandler(req, res) {
     } catch (err) {
       if (metadata) {
         await updateStatus(metadata.id, fileStatuses.queueingFailed);
+        logger.error(`${logContext} Failed to queue ${metadata.originalFileName}. Error: ${err}`);
       }
-      await handleErrors(req, res, err, logContext);
     }
   });
 }

From c37b3ed779e77f85dd7910674388b297a4b403b7 Mon Sep 17 00:00:00 2001
From: Ryan Ahearn <ryan.ahearn@gsa.gov>
Date: Wed, 17 Feb 2021 10:43:41 -0500
Subject: [PATCH 16/18] Update clamav network policies for new port

---
 terraform/dev/main.tf          | 18 ++++--------------
 terraform/dev/variables.tf     | 10 ++--------
 terraform/prod/main.tf         | 18 ++++--------------
 terraform/prod/variables.tf    | 10 ++--------
 terraform/sandbox/main.tf      |  8 ++++----
 terraform/sandbox/variables.tf | 10 ++--------
 terraform/staging/main.tf      |  8 ++++----
 terraform/staging/variables.tf | 10 ++--------
 8 files changed, 24 insertions(+), 68 deletions(-)

diff --git a/terraform/dev/main.tf b/terraform/dev/main.tf
index 6376102e0a..eba094859c 100644
--- a/terraform/dev/main.tf
+++ b/terraform/dev/main.tf
@@ -74,13 +74,8 @@ resource "cloudfoundry_service_instance" "document_upload_bucket" {
 # ClamAV networking
 ###
 
-data "cloudfoundry_app" "clamav_server" {
-  name_or_id = var.clamav_server_app_name
-  space      = data.cloudfoundry_space.space.id
-}
-
-data "cloudfoundry_app" "clamav_rest" {
-  name_or_id = var.clamav_rest_app_name
+data "cloudfoundry_app" "clamav_api" {
+  name_or_id = var.clamav_api_app_name
   space      = data.cloudfoundry_space.space.id
 }
 
@@ -90,14 +85,9 @@ data "cloudfoundry_app" "ttahub" {
 }
 
 resource "cloudfoundry_network_policy" "clamav_routing" {
-  policy {
-    source_app      = data.cloudfoundry_app.clamav_rest.id
-    destination_app = data.cloudfoundry_app.clamav_server.id
-    port            = "3310"
-  }
   policy {
     source_app      = data.cloudfoundry_app.ttahub.id
-    destination_app = data.cloudfoundry_app.clamav_rest.id
-    port            = "8080"
+    destination_app = data.cloudfoundry_app.clamav_api.id
+    port            = "9443"
   }
 }
diff --git a/terraform/dev/variables.tf b/terraform/dev/variables.tf
index 5e4cb0330a..a7249198e4 100644
--- a/terraform/dev/variables.tf
+++ b/terraform/dev/variables.tf
@@ -45,14 +45,8 @@ variable "env" {
   default     = "dev"
 }
 
-variable "clamav_server_app_name" {
-  type        = string
-  description = "app name for clamd server"
-  default     = "clamav-server-ttahub-dev"
-}
-
-variable "clamav_rest_app_name" {
+variable "clamav_api_app_name" {
   type        = string
   description = "app name for clamav api server"
-  default     = "clamav-rest-ttahub-dev"
+  default     = "clamav-api-ttahub-dev"
 }
diff --git a/terraform/prod/main.tf b/terraform/prod/main.tf
index e7b4643a73..3a777d073c 100644
--- a/terraform/prod/main.tf
+++ b/terraform/prod/main.tf
@@ -77,13 +77,8 @@ resource "cloudfoundry_service_instance" "document_upload_bucket" {
 # Run them after the ttahub and ClamAV apps have all been deployed
 ###
 
-data "cloudfoundry_app" "clamav_server" {
-  name_or_id = var.clamav_server_app_name
-  space      = data.cloudfoundry_space.space.id
-}
-
-data "cloudfoundry_app" "clamav_rest" {
-  name_or_id = var.clamav_rest_app_name
+data "cloudfoundry_app" "clamav_api" {
+  name_or_id = var.clamav_api_app_name
   space      = data.cloudfoundry_space.space.id
 }
 
@@ -93,14 +88,9 @@ data "cloudfoundry_app" "ttahub" {
 }
 
 resource "cloudfoundry_network_policy" "clamav_routing" {
-  policy {
-    source_app      = data.cloudfoundry_app.clamav_rest.id
-    destination_app = data.cloudfoundry_app.clamav_server.id
-    port            = "3310"
-  }
   policy {
     source_app      = data.cloudfoundry_app.ttahub.id
-    destination_app = data.cloudfoundry_app.clamav_rest.id
-    port            = "8080"
+    destination_app = data.cloudfoundry_app.clamav_api.id
+    port            = "9443"
   }
 }
diff --git a/terraform/prod/variables.tf b/terraform/prod/variables.tf
index e1f0011323..27d44dd6f0 100644
--- a/terraform/prod/variables.tf
+++ b/terraform/prod/variables.tf
@@ -45,14 +45,8 @@ variable "env" {
   default     = "prod"
 }
 
-variable "clamav_server_app_name" {
-  type        = string
-  description = "app name for clamd server"
-  default     = "clamav-server-ttahub-prod"
-}
-
-variable "clamav_rest_app_name" {
+variable "clamav_api_app_name" {
   type        = string
   description = "app name for clamav api server"
-  default     = "clamav-rest-ttahub-prod"
+  default     = "clamav-api-ttahub-prod"
 }
diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index 8a915eb2dc..613937c82f 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -80,8 +80,8 @@ data "cloudfoundry_space" "dev_space" {
   name     = var.cf_dev_space_name
 }
 
-data "cloudfoundry_app" "clamav_rest" {
-  name_or_id = var.clamav_rest_app_name
+data "cloudfoundry_app" "clamav_api" {
+  name_or_id = var.clamav_api_app_name
   space      = data.cloudfoundry_space.dev_space.id
 }
 
@@ -93,7 +93,7 @@ data "cloudfoundry_app" "ttahub" {
 resource "cloudfoundry_network_policy" "clamav_routing" {
   policy {
     source_app      = data.cloudfoundry_app.ttahub.id
-    destination_app = data.cloudfoundry_app.clamav_rest.id
-    port            = "8080"
+    destination_app = data.cloudfoundry_app.clamav_api.id
+    port            = "9443"
   }
 }
diff --git a/terraform/sandbox/variables.tf b/terraform/sandbox/variables.tf
index 69a51069fd..d731d46c3e 100644
--- a/terraform/sandbox/variables.tf
+++ b/terraform/sandbox/variables.tf
@@ -45,16 +45,10 @@ variable "env" {
   default     = "sandbox"
 }
 
-variable "clamav_server_app_name" {
-  type        = string
-  description = "app name for clamd server"
-  default     = "clamav-server-ttahub-dev"
-}
-
-variable "clamav_rest_app_name" {
+variable "clamav_api_app_name" {
   type        = string
   description = "app name for clamav api server"
-  default     = "clamav-rest-ttahub-dev"
+  default     = "clamav-api-ttahub-dev"
 }
 
 variable "cf_dev_space_name" {
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 1455404849..468a7921e7 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -80,8 +80,8 @@ data "cloudfoundry_space" "dev_space" {
   name     = var.cf_dev_space_name
 }
 
-data "cloudfoundry_app" "clamav_rest" {
-  name_or_id = var.clamav_rest_app_name
+data "cloudfoundry_app" "clamav_api" {
+  name_or_id = var.clamav_api_app_name
   space      = data.cloudfoundry_space.dev_space.id
 }
 
@@ -93,7 +93,7 @@ data "cloudfoundry_app" "ttahub" {
 resource "cloudfoundry_network_policy" "clamav_routing" {
   policy {
     source_app      = data.cloudfoundry_app.ttahub.id
-    destination_app = data.cloudfoundry_app.clamav_rest.id
-    port            = "8080"
+    destination_app = data.cloudfoundry_app.clamav_api.id
+    port            = "9443"
   }
 }
diff --git a/terraform/staging/variables.tf b/terraform/staging/variables.tf
index 3b250393c8..179d0baaf0 100644
--- a/terraform/staging/variables.tf
+++ b/terraform/staging/variables.tf
@@ -45,16 +45,10 @@ variable "env" {
   default     = "staging"
 }
 
-variable "clamav_server_app_name" {
-  type        = string
-  description = "app name for clamd server"
-  default     = "clamav-server-ttahub-dev"
-}
-
-variable "clamav_rest_app_name" {
+variable "clamav_api_app_name" {
   type        = string
   description = "app name for clamav api server"
-  default     = "clamav-rest-ttahub-dev"
+  default     = "clamav-api-ttahub-dev"
 }
 
 variable "cf_dev_space_name" {

From 8e0e3c8659ff204cb03ef217833b7e68888f4bbc Mon Sep 17 00:00:00 2001
From: Ryan Ahearn <ryan.ahearn@gsa.gov>
Date: Wed, 17 Feb 2021 10:43:56 -0500
Subject: [PATCH 17/18] Update boundary diagram with new clamav port & protocol

---
 docs/boundary_diagram.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/boundary_diagram.md b/docs/boundary_diagram.md
index dccb960325..9095c3b3ab 100644
--- a/docs/boundary_diagram.md
+++ b/docs/boundary_diagram.md
@@ -1,7 +1,7 @@
 System Boundary Diagram
 =======================
 
-![rendered boundary diagram](http://www.plantuml.com/plantuml/png/dLP1Rniv3xtdL_3BeKY19kwNz50i5eiwiPjcaMpTZDjU2WIoXXvhev5KaR9hBFhVTwYC9nuxNHGz9DP8ukEZI3xf3R6Ad6fxy3_Zj4qbme8vq6-3GLIhayhm8iqIOTJUCJe-qRuUg38QvPOsXJIuU7KyiShnnvlhWLMCnCtKtOLth8p3U184cmrRXEbq24Mj8iExD8EPJwvKSGrBWwk32KRoxYZa7uVs1Hm-Rlr860-RcQ43TEMnq04_1rxiO1u-t-2Kk4Jh6xGUpcWpUzYRNZQWFa9dGw1S2PVJcmRll6Lvf5Oa33uNSEcN5zQdyl0v_7C0qEtGCbdvPRCj3q-QSRi7e5WJOtqt_iQ2TAViR7iRMA_AuvcookdCBZiQNfyt3FhMdPSx5KmFOZYv-e_TqIVEf_7xCwlM6EaFU3HzM2JncoE3jn9JN0D7DPyR3OHnQJIs-8zdmducNBMEM1fMRBphLhlG0RfgE5gjLWtnqEFHBulFE8DX2DRe32US_l8b_bcyWF6t496QDDoYqYmh8qEXWNb8cFRMecRAWALYTG8toR895i4uOZbRWfYSCwwIK7Qv-NYFiQMtGoel_OZNUR9MlYSOvpxMC5Fwlefo322OGYxpWH2zHgAdtMkhQYN5yzPO1D8gyynfpNbHzV2JZAuSOtJAWdfa0utVHvFS7ob8JT6-ez4iPw6S2MDFN4KiFbp3IB6QAS9DyTsE2XcsPWHj_xSdxUQcIh7ptS_X3ttIMGjUdC4iwNlamsuYjoJxY0GabQHXBkUWY91_78NKdVJbhVpknJ2sYXeafHTvwaF2XE3dsmdwsyy8s3yaohlMqVS3-Vj-yD19H--AST7Ooq-cQLnb4GfJENZllhYRjqDO6WLJK-FnkI8ifLB0HvXSVGAjOlcbsLNu57LsVncLOyHCTrjYAb9tf1H93M1vExoP7AiGebysW8LIHUweNdixN4MqHainuWfkPRp9cd799u8Rxmpxc6kkYQZPiYsEMm0togaA8JmKiJGBF0Fhgwen5SnyBS3bU3gOl2-QVn-dWz7uUZmTmz6hLsVF6tJ1RXkyXnmn-CW4Z1PhvBWMEDQXPxYb_8y2MMTENKF_70td6I6QQi7W7LZZxW-6re8MT2qLIr1YC9gn11KHqEcu3lArCho0wNK1_pyvXUGi4e7d1SQL8GJ1BKyEq9LvAAoxgjw-jqg_Sj9xRG4pAxseqJ7rwFU2xoBUr-iG_JSZkeLV4nBJpwTY3wlBpQ-3zaIoKonH7ihXTaWW873q-kNhbq-PjXqLaQF19NOjiPVbtUBgcQl42tJIuOoKPKzitm-RwTFTikgCbXZDV0sc54jUxuVUkJmtFQUTQaPK9GrMqOXNOKp8457xMERu0tsrdNaNzIyZz0ZGsLFc6tKMssNGWAuCtZZUO_7BCBj4EkL5zrLabKH98QYeQjoy9VAM7Ghx02K-2G3F88M6L7iVf1vY9vcjb4bxRQJpucfmCOA92MYDmttDp4zQISAbORciHDZV5SSIUlJMebnl9OA85Xdsyf3f0sWJjKLjn5SUNbpjQAvSqLLxEnRTqsbFV3icapIpXXRPiK0r2q3Dzz7fQLlw7Ujjvxwk3SF2-tiH93ENZjum0lOGauE7qmZTQMImHv2Tr-G8W_Nhtil2Ew2aDHBDastX6k06wLgjxqOxklqmUzlUc7dY3ReorVPV)
+![rendered boundary diagram](http://www.plantuml.com/plantuml/png/dLPHRnit37xFh-3oKAH04sDfNpOCGvtOJJCagvjpsvS2WQoZRIqwIHKfkyRG_pvHELzySJCKVKYiayIF7qNoaruJgyYfiGU_6ATjgX6Mp85-7moYMfyi32_JB156xHsZunFjcu6ger5kPLD8W_DNnnEh77-ulXfOnKYSfsxFlMDb7CQJ8DXis29CfqEe6XKPtgOPp7nojOeRM1bS7qmmadT7eVmuj2_Wy67h1y9uc6U63j3Lnq87_1nu-GZpyFaMfyOLMf_HUZYZxUnXRtgLGNs4peP0kHekfjSPxwnbUQJM90m-LN3XL-VMf_hmEVnx0D3jq3AvyAkyhGnFyhZT0r1jYB6v7NzbGRfLThQx3QnNzV5CMULqOLSS3Q_ECeE-TUVbLWNJWnXEBlzdT_I9osdyySog3KRw4nvCxnT9_9R8u8t453V0KStdHWDXN1cDBVx3cR2V2LUj8zQ65HllkjKkT82k6exMwtKc7dey-cNn2MSm3C4QNU24qz--nh-g5p3-6Y9IJiCDAisoCZ8KCinzmhIt5ZLJ0QmLgnEuJfPDi0Z64SlP4iJad76B7CeUDn_lCBRq7f4gIq_nEalMolS4uzp71cPAtosY70C8PY4dV214hv7e--wrLOsIudbZB09fLNYMj9Qyg6RuKKQNZZ4wPK4zi87izy6az4SAKbEqxsWqArcePyBO4oyYLk-lOAHOpHJXjlXkHfKCMpE2jl_RatPpiqYnyztFuPC-wMKBNhs4MT9to8VTH6b9zX49I2f9mrpEGH4XFns5r9tqvOtyxiKmjeeoajBBClK-OKBmyzq4_UDd1Epl4-LTw-ZRWVnzExZlfAEtrRZAzl9JQ1gti0YLMJXuvpwxwpT3M1a5KzFWyPaYhALIm4UON7u4hMBzEU-gV8gwkB-8oZ5YeRihCGjIjwGKIGrWVJEydXoh4A9VPS1AgQfqLA-z7QuZMgEb674DDpBUPisuv1F1jNU6VImrboFAMtR5SGVWMZcrG0ZtHIpD0i_0-iKYcmfckHRWOZmTJDvL-T-7wM0qlXfFnt3qwjNBvnbTiDi6xo5733uo0QF51Zbk18vrw1dkAF-3G3Q5KzVGFqR3UKQ8Ph5ay0wiSNS7Gsj12xgMYYMeCHZDM8EA2EXqt0JvMXjUmlIgWbzFJY4vYqJWUObnRGX1SEkJ0tHr6GhhhgftxwtQhvtqNbl0p4el6tHCFVgzuBk8z_KwHF_LY6xXbuJ4zEEfsCFgSlFpe3sHx1HBb8TAk3j8WW97lprXsxPKH8u6LzZrn5wQzwjhnrmbNgAJ5cUaedjY-swOfq_twwerMc4qymsOMYnvinzxv_BCz9nsiXbHrJHOHoDUXJ4XGqJjOqq25-YBxSoxg7yMeKz0gctVV2lFOhiA6j3LmHl7-on-5cQFo5PwqNqHNIMHKWWggWQtZucovIaA7K2DtmM0Pv129jLU2Ac7s6bcgsNINrljFBySd8zWOW9Qut1VDCkRLf9mOLXkAr7sjzMnX1wzjIZtMuqWgaM6lRna-W3QH6rH6_5LXkUNZqHNxkX5UprMtTjfJtqx9fCqiuQMnR50vGMW_7rqUjgMViTwrxbl6iEmzFvE5CdCfQMtZ80znEJW_ZH2Tne5x07aqNDoXC7wJUzfuHrGqXg9vicsS1au8rsfpUteaN3VpzwqLsQPU8skJetz3m00)
 
 UML Source
 ----------
@@ -40,7 +40,7 @@ end note
 Rel(www_s3, personnel, "download file attachments", "https GET (443)")
 Rel(aws_alb, cloudgov_router, "proxies requests", "https GET/POST/PUT/DELETE (443)")
 Rel(cloudgov_router, www_app, "proxies requests", "https GET/POST/PUT/DELETE (443)")
-Rel(worker_app, clamav, "scans files", "http POST (8080)")
+Rel(worker_app, clamav, "scans files", "https POST (9443)")
 Rel(worker_app, HSES, "retrieve Grantee data", "https GET (443)")
 Rel(www_app, HSES, "authenticates user", "OAuth2")
 Rel(personnel, HSES, "verify identity", "https GET/POST (443)")
@@ -65,7 +65,7 @@ Lay_R(HSES, aws)
 Instructions
 ------------
 
-1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/uml/dLP1Rniv3xtdL_3BeKY19kwNz50i5eiwiPjcaMpTZDjU2WIoXXvhev5KaR9hBFhVTwYC9nuxNHGz9DP8ukEZI3xf3R6Ad6fxy3_Zj4qbme8vq6-3GLIhayhm8iqIOTJUCJe-qRuUg38QvPOsXJIuU7KyiShnnvlhWLMCnCtKtOLth8p3U184cmrRXEbq24Mj8iExD8EPJwvKSGrBWwk32KRoxYZa7uVs1Hm-Rlr860-RcQ43TEMnq04_1rxiO1u-t-2Kk4Jh6xGUpcWpUzYRNZQWFa9dGw1S2PVJcmRll6Lvf5Oa33uNSEcN5zQdyl0v_7C0qEtGCbdvPRCj3q-QSRi7e5WJOtqt_iQ2TAViR7iRMA_AuvcookdCBZiQNfyt3FhMdPSx5KmFOZYv-e_TqIVEf_7xCwlM6EaFU3HzM2JncoE3jn9JN0D7DPyR3OHnQJIs-8zdmducNBMEM1fMRBphLhlG0RfgE5gjLWtnqEFHBulFE8DX2DRe32US_l8b_bcyWF6t496QDDoYqYmh8qEXWNb8cFRMecRAWALYTG8toR895i4uOZbRWfYSCwwIK7Qv-NYFiQMtGoel_OZNUR9MlYSOvpxMC5Fwlefo322OGYxpWH2zHgAdtMkhQYN5yzPO1D8gyynfpNbHzV2JZAuSOtJAWdfa0utVHvFS7ob8JT6-ez4iPw6S2MDFN4KiFbp3IB6QAS9DyTsE2XcsPWHj_xSdxUQcIh7ptS_X3ttIMGjUdC4iwNlamsuYjoJxY0GabQHXBkUWY91_78NKdVJbhVpknJ2sYXeafHTvwaF2XE3dsmdwsyy8s3yaohlMqVS3-Vj-yD19H--AST7Ooq-cQLnb4GfJENZllhYRjqDO6WLJK-FnkI8ifLB0HvXSVGAjOlcbsLNu57LsVncLOyHCTrjYAb9tf1H93M1vExoP7AiGebysW8LIHUweNdixN4MqHainuWfkPRp9cd799u8Rxmpxc6kkYQZPiYsEMm0togaA8JmKiJGBF0Fhgwen5SnyBS3bU3gOl2-QVn-dWz7uUZmTmz6hLsVF6tJ1RXkyXnmn-CW4Z1PhvBWMEDQXPxYb_8y2MMTENKF_70td6I6QQi7W7LZZxW-6re8MT2qLIr1YC9gn11KHqEcu3lArCho0wNK1_pyvXUGi4e7d1SQL8GJ1BKyEq9LvAAoxgjw-jqg_Sj9xRG4pAxseqJ7rwFU2xoBUr-iG_JSZkeLV4nBJpwTY3wlBpQ-3zaIoKonH7ihXTaWW873q-kNhbq-PjXqLaQF19NOjiPVbtUBgcQl42tJIuOoKPKzitm-RwTFTikgCbXZDV0sc54jUxuVUkJmtFQUTQaPK9GrMqOXNOKp8457xMERu0tsrdNaNzIyZz0ZGsLFc6tKMssNGWAuCtZZUO_7BCBj4EkL5zrLabKH98QYeQjoy9VAM7Ghx02K-2G3F88M6L7iVf1vY9vcjb4bxRQJpucfmCOA92MYDmttDp4zQISAbORciHDZV5SSIUlJMebnl9OA85Xdsyf3f0sWJjKLjn5SUNbpjQAvSqLLxEnRTqsbFV3icapIpXXRPiK0r2q3Dzz7fQLlw7Ujjvxwk3SF2-tiH93ENZjum0lOGauE7qmZTQMImHv2Tr-G8W_Nhtil2Ew2aDHBDastX6k06wLgjxqOxklqmUzlUc7dY3ReorVPV)
+1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/uml/dLPHRnit37xFh-3oKAH04sDfNpOCGvtOJJCagvjpsvS2WQoZRIqwIHKfkyRG_pvHELzySJCKVKYiayIF7qNoaruJgyYfiGU_6ATjgX6Mp85-7moYMfyi32_JB156xHsZunFjcu6ger5kPLD8W_DNnnEh77-ulXfOnKYSfsxFlMDb7CQJ8DXis29CfqEe6XKPtgOPp7nojOeRM1bS7qmmadT7eVmuj2_Wy67h1y9uc6U63j3Lnq87_1nu-GZpyFaMfyOLMf_HUZYZxUnXRtgLGNs4peP0kHekfjSPxwnbUQJM90m-LN3XL-VMf_hmEVnx0D3jq3AvyAkyhGnFyhZT0r1jYB6v7NzbGRfLThQx3QnNzV5CMULqOLSS3Q_ECeE-TUVbLWNJWnXEBlzdT_I9osdyySog3KRw4nvCxnT9_9R8u8t453V0KStdHWDXN1cDBVx3cR2V2LUj8zQ65HllkjKkT82k6exMwtKc7dey-cNn2MSm3C4QNU24qz--nh-g5p3-6Y9IJiCDAisoCZ8KCinzmhIt5ZLJ0QmLgnEuJfPDi0Z64SlP4iJad76B7CeUDn_lCBRq7f4gIq_nEalMolS4uzp71cPAtosY70C8PY4dV214hv7e--wrLOsIudbZB09fLNYMj9Qyg6RuKKQNZZ4wPK4zi87izy6az4SAKbEqxsWqArcePyBO4oyYLk-lOAHOpHJXjlXkHfKCMpE2jl_RatPpiqYnyztFuPC-wMKBNhs4MT9to8VTH6b9zX49I2f9mrpEGH4XFns5r9tqvOtyxiKmjeeoajBBClK-OKBmyzq4_UDd1Epl4-LTw-ZRWVnzExZlfAEtrRZAzl9JQ1gti0YLMJXuvpwxwpT3M1a5KzFWyPaYhALIm4UON7u4hMBzEU-gV8gwkB-8oZ5YeRihCGjIjwGKIGrWVJEydXoh4A9VPS1AgQfqLA-z7QuZMgEb674DDpBUPisuv1F1jNU6VImrboFAMtR5SGVWMZcrG0ZtHIpD0i_0-iKYcmfckHRWOZmTJDvL-T-7wM0qlXfFnt3qwjNBvnbTiDi6xo5733uo0QF51Zbk18vrw1dkAF-3G3Q5KzVGFqR3UKQ8Ph5ay0wiSNS7Gsj12xgMYYMeCHZDM8EA2EXqt0JvMXjUmlIgWbzFJY4vYqJWUObnRGX1SEkJ0tHr6GhhhgftxwtQhvtqNbl0p4el6tHCFVgzuBk8z_KwHF_LY6xXbuJ4zEEfsCFgSlFpe3sHx1HBb8TAk3j8WW97lprXsxPKH8u6LzZrn5wQzwjhnrmbNgAJ5cUaedjY-swOfq_twwerMc4qymsOMYnvinzxv_BCz9nsiXbHrJHOHoDUXJ4XGqJjOqq25-YBxSoxg7yMeKz0gctVV2lFOhiA6j3LmHl7-on-5cQFo5PwqNqHNIMHKWWggWQtZucovIaA7K2DtmM0Pv129jLU2Ac7s6bcgsNINrljFBySd8zWOW9Qut1VDCkRLf9mOLXkAr7sjzMnX1wzjIZtMuqWgaM6lRna-W3QH6rH6_5LXkUNZqHNxkX5UprMtTjfJtqx9fCqiuQMnR50vGMW_7rqUjgMViTwrxbl6iEmzFvE5CdCfQMtZ80znEJW_ZH2Tne5x07aqNDoXC7wJUzfuHrGqXg9vicsS1au8rsfpUteaN3VpzwqLsQPU8skJetz3m00)
 1. Copy and paste the final UML into the UML Source section
 1. Update the img src and edit link target to the current values
 

From 4c04457c91976f574bc0bb12f886352f587dd338 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <chuck.mcandrew@adhocteam.us>
Date: Wed, 17 Feb 2021 11:57:54 -0500
Subject: [PATCH 18/18] update handler.test.js and switch to auditLogger

---
 src/routes/files/handlers.js      | 4 ++--
 src/routes/files/handlers.test.js | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index 0b13116969..1e6538acad 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -8,7 +8,7 @@ import addToScanQueue from '../../services/queue';
 import ActivityReportPolicy from '../../policies/activityReport';
 import { activityReportById } from '../../services/activityReports';
 import { userById } from '../../services/users';
-import logger from '../../logger';
+import { auditLogger } from '../../logger';
 
 const fileType = require('file-type');
 const multiparty = require('multiparty');
@@ -139,7 +139,7 @@ export default async function uploadHandler(req, res) {
     } catch (err) {
       if (metadata) {
         await updateStatus(metadata.id, fileStatuses.queueingFailed);
-        logger.error(`${logContext} Failed to queue ${metadata.originalFileName}. Error: ${err}`);
+        auditLogger.error(`${logContext} Failed to queue ${metadata.originalFileName}. Error: ${err}`);
       }
     }
   });
diff --git a/src/routes/files/handlers.test.js b/src/routes/files/handlers.test.js
index 4861a5dcdb..4264adf96f 100644
--- a/src/routes/files/handlers.test.js
+++ b/src/routes/files/handlers.test.js
@@ -7,9 +7,7 @@ import db, {
 } from '../../models';
 import app from '../../app';
 import s3Uploader from '../../lib/s3Uploader';
-// disable this to allow mocking this function
-// eslint-disable-next-line no-unused-vars
-import addToScanQueue from '../../services/queue';
+import * as queue from '../../services/queue';
 import SCOPES from '../../middleware/scopeConstants';
 import { REPORT_STATUSES } from '../../constants';
 import ActivityReportPolicy from '../../policies/activityReport';
@@ -21,7 +19,6 @@ const request = require('supertest');
 const ORIGINAL_ENV = process.env;
 
 jest.mock('../../lib/s3Uploader');
-jest.mock('../../services/queue');
 
 const mockUser = {
   id: 100,
@@ -47,6 +44,7 @@ const mockUser = {
 
 const mockSession = jest.fn();
 mockSession.userId = mockUser.id;
+const mockAddToScanQueue = jest.spyOn(queue, 'default').mockImplementation(() => jest.fn());
 
 const reportObject = {
   activityRecipientType: 'grantee',
@@ -97,6 +95,7 @@ describe('File Upload', () => {
           fileId = res.body.id;
           expect(s3Uploader).toHaveBeenCalled();
         });
+      expect(mockAddToScanQueue).toHaveBeenCalled();
     });
     it('checks the metadata was uploaded to the database', async () => {
       ActivityReportPolicy.mockImplementation(() => ({