From 98f59c50f072f3b27d2ae8237fed3991256582bd Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 9 Nov 2022 11:32:08 +0800
Subject: [PATCH] Remove token in features table

---
 packages/api/src/entity/feature.ts                         | 6 +++---
 packages/db/migrations/0098.do.create_features_table.sql   | 2 +-
 packages/db/migrations/0098.undo.create_features_table.sql | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/api/src/entity/feature.ts b/packages/api/src/entity/feature.ts
index 0216896a4..885a1d503 100644
--- a/packages/api/src/entity/feature.ts
+++ b/packages/api/src/entity/feature.ts
@@ -21,12 +21,12 @@ export class Feature {
   @Column('text')
   name!: string
 
-  @Column('text')
-  token!: string
-
   @Column('timestamp', { nullable: true })
   grantedAt?: Date | null
 
+  @Column('timestamp', { nullable: true })
+  expiredAt?: Date | null
+
   @CreateDateColumn({ default: () => 'CURRENT_TIMESTAMP' })
   createdAt!: Date
 
diff --git a/packages/db/migrations/0098.do.create_features_table.sql b/packages/db/migrations/0098.do.create_features_table.sql
index 618315732..600145299 100755
--- a/packages/db/migrations/0098.do.create_features_table.sql
+++ b/packages/db/migrations/0098.do.create_features_table.sql
@@ -8,8 +8,8 @@ CREATE TABLE IF NOT EXISTS omnivore.features (
     id uuid PRIMARY KEY DEFAULT uuid_generate_v1mc(),
     user_id uuid NOT NULL REFERENCES omnivore.user ON DELETE CASCADE,
     name text NOT NULL,
-    token text NOT NULL,
     granted_at timestamptz,
+    expired_at timestamptz,
     created_at timestamptz NOT NULL DEFAULT current_timestamp,
     updated_at timestamptz NOT NULL DEFAULT current_timestamp,
     UNIQUE (user_id, name)
diff --git a/packages/db/migrations/0098.undo.create_features_table.sql b/packages/db/migrations/0098.undo.create_features_table.sql
index c399a16c9..700211333 100755
--- a/packages/db/migrations/0098.undo.create_features_table.sql
+++ b/packages/db/migrations/0098.undo.create_features_table.sql
@@ -8,7 +8,7 @@ DROP TABLE IF EXISTS omnivore.features;
 
 ALTER TABLE omnivore.user_personalization
     DROP COLUMN IF EXISTS speech_secondary_voice,
-    ALTER COLUMN speech_rate TYPE integer,
-    ALTER COLUMN speech_volume TYPE integer;
+    ALTER COLUMN speech_rate TYPE integer USING speech_rate::integer,
+    ALTER COLUMN speech_volume TYPE integer USING speech_volume::integer;
 
 COMMIT;