From f588d0f2e99db598c4627b488cf5a37b986bc3ca Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Sun, 29 Oct 2023 16:52:25 -0400
Subject: [PATCH 01/12] knex: Add is_archived col to subrecipients table

---
 ...29204021_add_subrecipients_archived_col.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 packages/server/migrations/20231029204021_add_subrecipients_archived_col.js

diff --git a/packages/server/migrations/20231029204021_add_subrecipients_archived_col.js b/packages/server/migrations/20231029204021_add_subrecipients_archived_col.js
new file mode 100644
index 000000000..76720f28b
--- /dev/null
+++ b/packages/server/migrations/20231029204021_add_subrecipients_archived_col.js
@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+    return knex.schema.table('arpa_subrecipients', (table) => {
+        table.boolean('is_archived').notNullable().defaultTo(false);
+    });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+    return knex.schema.table('arpa_subrecipients', (table) => {
+        table.dropColumn('is_archived');
+    });
+};

From a152fbea7a13c4e187ec41bd2d44fae8aaa0f016 Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Sun, 29 Oct 2023 17:31:12 -0400
Subject: [PATCH 02/12] Add db helper: archiveRecipient

---
 .../src/arpa_reporter/db/arpa-subrecipients.js   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
index 5c983e5da..c6cd57df7 100644
--- a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
+++ b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
@@ -14,6 +14,21 @@ function baseQuery(trns) {
         .leftJoin('users AS users2', 'arpa_subrecipients.updated_by', 'users2.id');
 }
 
+async function archiveRecipient(id, { updatedByUser }, trns = knex) {
+    const query = trns('arpa_subrecipients')
+        .where('id', id)
+        .returning('*');
+
+    if (updatedByUser) {
+        query.update('updated_by', updatedByUser.id);
+        query.update('updated_at', knex.fn.now());
+    }
+
+    query.update('is_archived', knex.raw('NOT ??', ['is_archived']));
+
+    return query.then((rows) => rows[0]);
+}
+
 async function createRecipient(recipient, trns = knex) {
     const tenantId = useTenantId();
     if (!(recipient.uei || recipient.tin)) {
@@ -74,6 +89,7 @@ async function listRecipientsForReportingPeriod(periodId, trns = knex) {
 }
 
 module.exports = {
+    archiveRecipient,
     createRecipient,
     getRecipient,
     findRecipient,

From 1af680ec3e26361da6ba00ab4de8ba5f7b7b631e Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Sun, 29 Oct 2023 17:31:36 -0400
Subject: [PATCH 03/12] Add route: /api/subrecipients/archive/:id

---
 .../src/arpa_reporter/routes/subrecipients.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/arpa_reporter/routes/subrecipients.js b/packages/server/src/arpa_reporter/routes/subrecipients.js
index 83c3d8d36..74db4ad1c 100644
--- a/packages/server/src/arpa_reporter/routes/subrecipients.js
+++ b/packages/server/src/arpa_reporter/routes/subrecipients.js
@@ -3,7 +3,9 @@ const express = require('express');
 const router = express.Router();
 const { requireUser } = require('../../lib/access-helpers');
 
-const { listRecipients, getRecipient, updateRecipient } = require('../db/arpa-subrecipients');
+const {
+    listRecipients, getRecipient, updateRecipient, archiveRecipient,
+} = require('../db/arpa-subrecipients');
 const { getRules } = require('../services/validation-rules');
 
 router.get('/', requireUser, async (req, res) => {
@@ -46,6 +48,21 @@ router.post('/:id', requireUser, async (req, res) => {
     res.json({ recipient: updatedRecipient });
 });
 
+router.post('/archive/:id', requireUser, async (req, res) => {
+    const id = Number(req.params.id);
+    const { user } = req.session;
+
+    const recipient = await getRecipient(id);
+    if (!recipient || recipient.tenant_id !== req.session.user.tenant_id) {
+        res.sendStatus(404);
+        res.end();
+        return;
+    }
+
+    const updatedRecipient = await archiveRecipient(recipient.id, { updatedByUser: user });
+    res.json({ recipient: updatedRecipient });
+});
+
 module.exports = router;
 
 // NOTE: This file was copied from src/server/routes/subrecipients.js (git @ ada8bfdc98) in the arpa-reporter repo on 2022-09-23T20:05:47.735Z

From fef281bd9c13efa4ade35fbe343380e1671e6bec Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Sun, 29 Oct 2023 17:32:40 -0400
Subject: [PATCH 04/12] UI: Add archive/restore actions to subrecipients view

---
 .../src/arpa_reporter/views/Subrecipients.vue | 81 +++++++++++++------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/packages/client/src/arpa_reporter/views/Subrecipients.vue b/packages/client/src/arpa_reporter/views/Subrecipients.vue
index 259fc085c..858456d76 100644
--- a/packages/client/src/arpa_reporter/views/Subrecipients.vue
+++ b/packages/client/src/arpa_reporter/views/Subrecipients.vue
@@ -1,3 +1,9 @@
+<style scoped>
+  .strikethrough {
+    text-decoration: line-through;
+  }
+</style>
+
 <template>
   <div>
     <h2>Sub-recipients</h2>
@@ -23,31 +29,35 @@
       </div>
 
       <template slot="table-row" slot-scope="props">
-        <span v-if="props.column.field === 'upload_id'">
-          <router-link :to="`/uploads/${props.row.upload_id}`">
-            {{ props.row.upload_id }}
-          </router-link>
-        </span>
-
-        <ul v-else-if="props.column.field === 'record'" class="list-group list-group-flush">
-          <template v-for="(value, col) in props.row.json">
-            <template v-if="col === 'Unique_Entity_Identifier__c' || col === 'EIN__c'">
+        <div :class="{strikethrough: props.row.is_archived && props.column.field !== 'edit'}">
+          <span v-if="props.column.field === 'upload_id'">
+            <router-link :to="`/uploads/${props.row.upload_id}`">
+              {{ props.row.upload_id }}
+            </router-link>
+          </span>
+
+          <ul v-else-if="props.column.field === 'record'" class="list-group list-group-flush">
+            <template v-for="(value, col) in props.row.json">
+              <template v-if="col === 'Unique_Entity_Identifier__c' || col === 'EIN__c'">
+              </template>
+
+              <li v-else class="list-group-item" :key="col">
+                <span class="font-weight-bold">{{ col }}: </span>
+                {{ value }}
+              </li>
             </template>
-
-            <li v-else class="list-group-item" :key="col">
-              <span class="font-weight-bold">{{ col }}: </span>
-              {{ value }}
-            </li>
-          </template>
-        </ul>
-
-        <span v-else-if="props.column.field === 'edit'">
-          <router-link tag="button" class="btn btn-sm btn-secondary" :to="`/subrecipients/${props.row.id}`">Edit</router-link>
-        </span>
-
-        <span v-else>
-          {{props.formattedRow[props.column.field]}}
-        </span>
+          </ul>
+
+          <span class="d-flex flex-column" v-else-if="props.column.field === 'edit'" >
+            <router-link v-if="!props.row.is_archived" tag="button" class="btn btn-sm btn-secondary mb-2" :to="`/subrecipients/${props.row.id}`">Edit</router-link>
+            <button v-if="props.row.is_archived" class="btn btn-sm btn-primary" @click="archiveSubrecipient(props.row.id)">Restore</button>
+            <button v-else class="btn btn-sm btn-outline-danger" @click="archiveSubrecipient(props.row.id)">Archive</button>
+          </span>
+
+          <span v-else>
+            {{props.formattedRow[props.column.field]}}
+          </span>
+        </div>
       </template>
 
     </vue-good-table>
@@ -59,7 +69,7 @@ import moment from 'moment';
 import 'vue-good-table/dist/vue-good-table.css';
 import { VueGoodTable } from 'vue-good-table';
 
-import { getJson } from '../store/index';
+import { getJson, post } from '../store/index';
 
 export default {
   name: 'Subrecipients',
@@ -71,7 +81,9 @@ export default {
   },
   computed: {
     rows() {
-      return this.recipients.map((r) => ({ ...r, json: JSON.parse(r.record) }));
+      const rows = this.recipients.map((r) => ({ ...r, json: JSON.parse(r.record) }));
+      console.log(rows);
+      return rows;
     },
     columns() {
       return [
@@ -123,6 +135,23 @@ export default {
       this.$refs.recipientsTable.reset();
       this.$refs.recipientsTable.changeSort([]);
     },
+
+    async archiveSubrecipient(id) {
+      this.loading = true;
+
+      const result = await post(`/api/subrecipients/archive/${id}`);
+      if (result.error) {
+        this.$store.commit('addAlert', {
+          text: `archiveSubrecipient Error (${result.status}): ${result.error}`,
+          level: 'err',
+        });
+      } else {
+        this.recipients = this.recipients.map((recipient) => (recipient.id === id ? result.recipient : recipient));
+      }
+
+      this.loading = false;
+    },
+
     async loadRecipients() {
       this.loading = true;
 

From b4a297063c870bcfe1ec6a6eb9f773c3db691879 Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Sun, 29 Oct 2023 17:38:45 -0400
Subject: [PATCH 05/12] /api/export: Exclude archived subrecipients from
 treasury report

---
 packages/server/src/arpa_reporter/db/arpa-subrecipients.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
index c6cd57df7..3d57e0488 100644
--- a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
+++ b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
@@ -85,7 +85,7 @@ async function listRecipients(trns = knex) {
 }
 
 async function listRecipientsForReportingPeriod(periodId, trns = knex) {
-    return baseQuery(trns).where('reporting_period_id', periodId);
+    return baseQuery(trns).where('reporting_period_id', periodId).where('is_archived', false);
 }
 
 module.exports = {

From 33933a81b9bef8beb36d51f9f540905f43fd5947 Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Mon, 30 Oct 2023 22:08:11 -0400
Subject: [PATCH 06/12] Improve naming for archive toggling method

Also add a couple doc comments for additional clarity.
---
 .../src/arpa_reporter/views/Subrecipients.vue    | 16 ++++++++++++----
 .../src/arpa_reporter/db/arpa-subrecipients.js   |  9 +++++++--
 .../src/arpa_reporter/routes/subrecipients.js    |  4 ++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/arpa_reporter/views/Subrecipients.vue b/packages/client/src/arpa_reporter/views/Subrecipients.vue
index 858456d76..0f4840049 100644
--- a/packages/client/src/arpa_reporter/views/Subrecipients.vue
+++ b/packages/client/src/arpa_reporter/views/Subrecipients.vue
@@ -50,8 +50,8 @@
 
           <span class="d-flex flex-column" v-else-if="props.column.field === 'edit'" >
             <router-link v-if="!props.row.is_archived" tag="button" class="btn btn-sm btn-secondary mb-2" :to="`/subrecipients/${props.row.id}`">Edit</router-link>
-            <button v-if="props.row.is_archived" class="btn btn-sm btn-primary" @click="archiveSubrecipient(props.row.id)">Restore</button>
-            <button v-else class="btn btn-sm btn-outline-danger" @click="archiveSubrecipient(props.row.id)">Archive</button>
+            <button v-if="props.row.is_archived" class="btn btn-sm btn-primary" @click="archiveOrRestoreSubrecipient(props.row.id)">Restore</button>
+            <button v-else class="btn btn-sm btn-outline-danger" @click="archiveOrRestoreSubrecipient(props.row.id)">Archive</button>
           </span>
 
           <span v-else>
@@ -136,13 +136,21 @@ export default {
       this.$refs.recipientsTable.changeSort([]);
     },
 
-    async archiveSubrecipient(id) {
+    /**
+     * Archive or restore a subrecipient.
+     *
+     * Call this method to taggle the `is_archived` flag for a subrecipient record.
+     *
+     * @param {*} id
+     * The ID of the subrecipient to archive or restore.
+     */
+    async archiveOrRestoreSubrecipient(id) {
       this.loading = true;
 
       const result = await post(`/api/subrecipients/archive/${id}`);
       if (result.error) {
         this.$store.commit('addAlert', {
-          text: `archiveSubrecipient Error (${result.status}): ${result.error}`,
+          text: `archiveOrRestoreSubrecipient Error (${result.status}): ${result.error}`,
           level: 'err',
         });
       } else {
diff --git a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
index 3d57e0488..9931c38c8 100644
--- a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
+++ b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
@@ -14,7 +14,12 @@ function baseQuery(trns) {
         .leftJoin('users AS users2', 'arpa_subrecipients.updated_by', 'users2.id');
 }
 
-async function archiveRecipient(id, { updatedByUser }, trns = knex) {
+/**
+ * Archive or restore a subrecipient.
+ *
+ * Call t his method to toggle the `is_archived` column in the arpa_subrecipients table.
+ */
+async function archiveOrRestoreRecipient(id, { updatedByUser }, trns = knex) {
     const query = trns('arpa_subrecipients')
         .where('id', id)
         .returning('*');
@@ -89,7 +94,7 @@ async function listRecipientsForReportingPeriod(periodId, trns = knex) {
 }
 
 module.exports = {
-    archiveRecipient,
+    archiveOrRestoreRecipient,
     createRecipient,
     getRecipient,
     findRecipient,
diff --git a/packages/server/src/arpa_reporter/routes/subrecipients.js b/packages/server/src/arpa_reporter/routes/subrecipients.js
index 74db4ad1c..5a7e960a4 100644
--- a/packages/server/src/arpa_reporter/routes/subrecipients.js
+++ b/packages/server/src/arpa_reporter/routes/subrecipients.js
@@ -4,7 +4,7 @@ const router = express.Router();
 const { requireUser } = require('../../lib/access-helpers');
 
 const {
-    listRecipients, getRecipient, updateRecipient, archiveRecipient,
+    listRecipients, getRecipient, updateRecipient, archiveOrRestoreRecipient,
 } = require('../db/arpa-subrecipients');
 const { getRules } = require('../services/validation-rules');
 
@@ -59,7 +59,7 @@ router.post('/archive/:id', requireUser, async (req, res) => {
         return;
     }
 
-    const updatedRecipient = await archiveRecipient(recipient.id, { updatedByUser: user });
+    const updatedRecipient = await archiveOrRestoreRecipient(recipient.id, { updatedByUser: user });
     res.json({ recipient: updatedRecipient });
 });
 

From 8b05e5494a04d274a37e08f1504869237f7ba410 Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Sun, 5 Nov 2023 18:38:57 -0500
Subject: [PATCH 07/12] Refactor: is_archived: bool -> archived_at: timestamp

---
 packages/client/src/arpa_reporter/views/Subrecipients.vue | 8 ++++----
 .../20231029204021_add_subrecipients_archived_col.js      | 4 ++--
 .../server/src/arpa_reporter/db/arpa-subrecipients.js     | 7 +++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/arpa_reporter/views/Subrecipients.vue b/packages/client/src/arpa_reporter/views/Subrecipients.vue
index 0f4840049..98cc5516e 100644
--- a/packages/client/src/arpa_reporter/views/Subrecipients.vue
+++ b/packages/client/src/arpa_reporter/views/Subrecipients.vue
@@ -29,7 +29,7 @@
       </div>
 
       <template slot="table-row" slot-scope="props">
-        <div :class="{strikethrough: props.row.is_archived && props.column.field !== 'edit'}">
+        <div :class="{strikethrough: props.row.archived_at && props.column.field !== 'edit'}">
           <span v-if="props.column.field === 'upload_id'">
             <router-link :to="`/uploads/${props.row.upload_id}`">
               {{ props.row.upload_id }}
@@ -49,8 +49,8 @@
           </ul>
 
           <span class="d-flex flex-column" v-else-if="props.column.field === 'edit'" >
-            <router-link v-if="!props.row.is_archived" tag="button" class="btn btn-sm btn-secondary mb-2" :to="`/subrecipients/${props.row.id}`">Edit</router-link>
-            <button v-if="props.row.is_archived" class="btn btn-sm btn-primary" @click="archiveOrRestoreSubrecipient(props.row.id)">Restore</button>
+            <router-link v-if="!props.row.archived_at" tag="button" class="btn btn-sm btn-secondary mb-2" :to="`/subrecipients/${props.row.id}`">Edit</router-link>
+            <button v-if="props.row.archived_at" class="btn btn-sm btn-primary" @click="archiveOrRestoreSubrecipient(props.row.id)">Restore</button>
             <button v-else class="btn btn-sm btn-outline-danger" @click="archiveOrRestoreSubrecipient(props.row.id)">Archive</button>
           </span>
 
@@ -139,7 +139,7 @@ export default {
     /**
      * Archive or restore a subrecipient.
      *
-     * Call this method to taggle the `is_archived` flag for a subrecipient record.
+     * Call this method to archive or unarchive a subrecipient record.
      *
      * @param {*} id
      * The ID of the subrecipient to archive or restore.
diff --git a/packages/server/migrations/20231029204021_add_subrecipients_archived_col.js b/packages/server/migrations/20231029204021_add_subrecipients_archived_col.js
index 76720f28b..54ba31d2f 100644
--- a/packages/server/migrations/20231029204021_add_subrecipients_archived_col.js
+++ b/packages/server/migrations/20231029204021_add_subrecipients_archived_col.js
@@ -4,7 +4,7 @@
  */
 exports.up = function (knex) {
     return knex.schema.table('arpa_subrecipients', (table) => {
-        table.boolean('is_archived').notNullable().defaultTo(false);
+        table.timestamp('archived_at');
     });
 };
 
@@ -14,6 +14,6 @@ exports.up = function (knex) {
  */
 exports.down = function (knex) {
     return knex.schema.table('arpa_subrecipients', (table) => {
-        table.dropColumn('is_archived');
+        table.dropColumn('archived_at');
     });
 };
diff --git a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
index 9931c38c8..da2f8dc77 100644
--- a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
+++ b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
@@ -17,7 +17,7 @@ function baseQuery(trns) {
 /**
  * Archive or restore a subrecipient.
  *
- * Call t his method to toggle the `is_archived` column in the arpa_subrecipients table.
+ * Call t his method to archive or restore an arpa_subrecipients table.
  */
 async function archiveOrRestoreRecipient(id, { updatedByUser }, trns = knex) {
     const query = trns('arpa_subrecipients')
@@ -29,7 +29,10 @@ async function archiveOrRestoreRecipient(id, { updatedByUser }, trns = knex) {
         query.update('updated_at', knex.fn.now());
     }
 
-    query.update('is_archived', knex.raw('NOT ??', ['is_archived']));
+    query.update(
+        'archived_at',
+        knex.raw('CASE WHEN archived_at IS NULL THEN ?? ELSE NULL END', [knex.fn.now()]),
+    );
 
     return query.then((rows) => rows[0]);
 }

From 8a74b3fd388002814697d4e60db0f4c92b607f87 Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Fri, 15 Dec 2023 23:48:56 -0500
Subject: [PATCH 08/12] fix check for recipients function

---
 packages/server/src/arpa_reporter/db/arpa-subrecipients.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
index da2f8dc77..fcd2587a9 100644
--- a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
+++ b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
@@ -93,7 +93,7 @@ async function listRecipients(trns = knex) {
 }
 
 async function listRecipientsForReportingPeriod(periodId, trns = knex) {
-    return baseQuery(trns).where('reporting_period_id', periodId).where('is_archived', false);
+    return baseQuery(trns).where('reporting_period_id', periodId).whereNotNull('is_archived');
 }
 
 module.exports = {

From aa675d5e0eb701c856678b1bb07b78160a7ba03d Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Sat, 16 Dec 2023 00:13:31 -0500
Subject: [PATCH 09/12] update migration timestamp

---
 ...ed_col.js => 20231216051219_add_subrecipients_archived_col.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/server/migrations/{20231029204021_add_subrecipients_archived_col.js => 20231216051219_add_subrecipients_archived_col.js} (100%)

diff --git a/packages/server/migrations/20231029204021_add_subrecipients_archived_col.js b/packages/server/migrations/20231216051219_add_subrecipients_archived_col.js
similarity index 100%
rename from packages/server/migrations/20231029204021_add_subrecipients_archived_col.js
rename to packages/server/migrations/20231216051219_add_subrecipients_archived_col.js

From d514442b0ec4bf31729772664e686b2b407a63d6 Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Wed, 17 Jan 2024 19:03:54 -0500
Subject: [PATCH 10/12] Update timestamp on new migration

---
 ...ed_col.js => 20240118000244_add_subrecipients_archived_col.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/server/migrations/{20231216051219_add_subrecipients_archived_col.js => 20240118000244_add_subrecipients_archived_col.js} (100%)

diff --git a/packages/server/migrations/20231216051219_add_subrecipients_archived_col.js b/packages/server/migrations/20240118000244_add_subrecipients_archived_col.js
similarity index 100%
rename from packages/server/migrations/20231216051219_add_subrecipients_archived_col.js
rename to packages/server/migrations/20240118000244_add_subrecipients_archived_col.js

From f179015e5e149abddec7bc80428f0199d65f51f7 Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Wed, 17 Jan 2024 20:32:20 -0500
Subject: [PATCH 11/12] Isolate audit-report.spec.js from .env

---
 .../__tests__/arpa_reporter/server/lib/audit-report.spec.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/server/__tests__/arpa_reporter/server/lib/audit-report.spec.js b/packages/server/__tests__/arpa_reporter/server/lib/audit-report.spec.js
index ccc087b2b..2cc5d8ba4 100644
--- a/packages/server/__tests__/arpa_reporter/server/lib/audit-report.spec.js
+++ b/packages/server/__tests__/arpa_reporter/server/lib/audit-report.spec.js
@@ -11,6 +11,8 @@ const audit_report = require('../../../../src/arpa_reporter/lib/audit-report');
 const aws = require('../../../../src/lib/gost-aws');
 const { withTenantId } = require('../helpers/with-tenant-id');
 
+const OLD_AUDIT_REPORT_BUCKET = process.env.AUDIT_REPORT_BUCKET;
+
 function handleUploadFake(type) {
     if (type === 'success') {
         return () => {
@@ -26,7 +28,11 @@ function handleUploadFake(type) {
 
 describe('audit report generation', () => {
     const sandbox = sinon.createSandbox();
+    beforeEach(() => {
+        process.env.AUDIT_REPORT_BUCKET = 'arpa-audit-reports';
+    });
     afterEach(() => {
+        process.env.AUDIT_REPORT_BUCKET = OLD_AUDIT_REPORT_BUCKET;
         sandbox.restore();
     });
     it('sendEmailWithLink creates a presigned url and sends email to recipient', async () => {

From 7b12bc4647b980e5503d2f80269f164ffd31ca8c Mon Sep 17 00:00:00 2001
From: Andrew Hyndman <ajhyndman@outlook.com.au>
Date: Wed, 17 Jan 2024 20:34:20 -0500
Subject: [PATCH 12/12] fixup! Refactor: is_archived: bool -> archived_at:
 timestamp

---
 packages/server/src/arpa_reporter/db/arpa-subrecipients.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
index fcd2587a9..3b394f365 100644
--- a/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
+++ b/packages/server/src/arpa_reporter/db/arpa-subrecipients.js
@@ -93,7 +93,7 @@ async function listRecipients(trns = knex) {
 }
 
 async function listRecipientsForReportingPeriod(periodId, trns = knex) {
-    return baseQuery(trns).where('reporting_period_id', periodId).whereNotNull('is_archived');
+    return baseQuery(trns).where('reporting_period_id', periodId).whereNotNull('archived_at');
 }
 
 module.exports = {