Refactor: is_archived: bool -> archived_at: timestamp

usdigitalresponse · Dec 16, 2023 · 2325f27 · 2325f27
1 parent 2b4aacd
commit 2325f27
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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]);
 }