From 51d1ec09c734ff776cc861537083c0cae6731dbc Mon Sep 17 00:00:00 2001
From: andreas-unleash <andreas@getunleash.ai>
Date: Tue, 7 Jun 2022 10:35:29 +0300
Subject: [PATCH] remove archived

---
 src/lib/db/feature-toggle-store.ts                           | 5 ++---
 src/lib/openapi/spec/feature-schema.ts                       | 3 ---
 .../e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap   | 3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/lib/db/feature-toggle-store.ts b/src/lib/db/feature-toggle-store.ts
index 6866e65e46..f429934dcd 100644
--- a/src/lib/db/feature-toggle-store.ts
+++ b/src/lib/db/feature-toggle-store.ts
@@ -17,7 +17,6 @@ const FEATURE_COLUMNS = [
     'created_at',
     'impression_data',
     'last_seen_at',
-    'archived',
     'archived_at',
 ];
 
@@ -134,7 +133,7 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
         const rows = await this.db
             .select(FEATURE_COLUMNS)
             .from(TABLE)
-            .where({ archived: true })
+            .whereNotNull('archived_at')
             .orderBy('name', 'asc');
         return rows.map(this.rowToFeature);
     }
@@ -235,7 +234,7 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
         const now = new Date();
         const row = await this.db(TABLE)
             .where({ name })
-            .update({ archived: true, archived_at: now })
+            .update({ archived_at: now })
             .returning(FEATURE_COLUMNS);
         return this.rowToFeature(row[0]);
     }
diff --git a/src/lib/openapi/spec/feature-schema.ts b/src/lib/openapi/spec/feature-schema.ts
index be3336e307..ac149e469e 100644
--- a/src/lib/openapi/spec/feature-schema.ts
+++ b/src/lib/openapi/spec/feature-schema.ts
@@ -21,9 +21,6 @@ const schema = {
         description: {
             type: 'string',
         },
-        archived: {
-            type: 'boolean',
-        },
         project: {
             type: 'string',
         },
diff --git a/src/test/e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap b/src/test/e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap
index 9a9277c261..7e6c5fd5bd 100644
--- a/src/test/e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap
+++ b/src/test/e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap
@@ -192,9 +192,6 @@ Object {
       "featureSchema": Object {
         "additionalProperties": false,
         "properties": Object {
-          "archived": Object {
-            "type": "boolean",
-          },
           "archivedAt": Object {
             "format": "date",
             "nullable": true,