Merge pull request #86 from andrewwippler/feature/frontend-uploads

Fix migrations for live DB
andrewwippler · Jul 27, 2024 · 0df8e70 · 0df8e70
2 parents e5c50c9 + f9c167c
commit 0df8e70
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 18 deletions.
diff --git a/api/app/models/user.ts b/api/app/models/user.ts
@@ -82,7 +82,7 @@ export default class User extends compose(BaseModel, AuthFinder) {
   static accessTokens = DbAccessTokensProvider.forModel(User, {
     expiresIn: '30 days',
     prefix: 'oat_',
-    table: 'api_tokens',
+    table: 'auth_access_tokens',
     type: 'auth_token',
     tokenSecretLength: 40,
   })

diff --git a/api/database/migrations/1721989136144_create_auth_access_tokens_table.ts b/api/database/migrations/1721989136144_create_auth_access_tokens_table.ts
@@ -1,10 +1,11 @@
 import { BaseSchema } from '@adonisjs/lucid/schema'
 
 export default class extends BaseSchema {
-  protected tableName = 'api_tokens'
+  protected tableName = 'auth_access_tokens'
 
   async up() {
-    this.schema.alterTable(this.tableName, (table) => {
+    this.schema.createTable(this.tableName, (table) => {
+      table.increments('id')
       table
         .integer('tokenable_id')
         .notNullable()
@@ -13,25 +14,18 @@ export default class extends BaseSchema {
         .inTable('users')
         .onDelete('CASCADE')
 
+      table.string('type').notNullable()
+      table.string('name').nullable()
       table.string('hash').notNullable()
       table.text('abilities').notNullable()
+      table.timestamp('created_at')
       table.timestamp('updated_at')
       table.timestamp('last_used_at').nullable()
-      table.string('name').nullable().alter()
-      table.dropColumn('token')
+      table.timestamp('expires_at').nullable()
     })
   }
 
   async down() {
-    this.schema.alterTable(this.tableName, (table) => {
-      table.dropColumn('last_used_at')
-      table.dropColumn('updated_at')
-      table.dropColumn('abilities')
-      table.dropColumn('hash')
-      table.dropForeign('tokenable_id')
-      table.string('name').notNullable().alter()
-      table.string('token', 64).notNullable().unique()
-    })
+    this.schema.dropTable(this.tableName)
   }
-
-}
+}
diff --git a/api/database/migrations/1722051530896_delete_api_tokens.ts b/api/database/migrations/1722051530896_delete_api_tokens.ts
@@ -0,0 +1,26 @@
+import { BaseSchema } from '@adonisjs/lucid/schema'
+
+export default class extends BaseSchema {
+  protected tableName = 'api_tokens'
+
+  async up() {
+    this.schema.dropTable(this.tableName)
+  }
+
+  async down() {
+    this.schema.createTable(this.tableName, (table) => {
+      table.increments('id').primary()
+      table.integer('user_id').unsigned().index('user_id')
+      table.foreign('user_id').references('users.id').onDelete('cascade')
+      table.string('name').notNullable()
+      table.string('type').notNullable()
+      table.string('token', 64).notNullable().unique()
+
+      /**
+       * Uses timestampz for PostgreSQL and DATETIME2 for MSSQL
+       */
+      table.timestamp('expires_at', { useTz: true }).nullable()
+      table.timestamp('created_at', { useTz: true }).notNullable()
+    })
+  }
+}
diff --git a/api/tests/bootstrap.ts b/api/tests/bootstrap.ts
@@ -32,8 +32,8 @@ export const runnerHooks: Required<Pick<Config, 'setup' | 'teardown'>> = {
 }
 
 export const reporters: Config['reporters'] = {
-   activated: ['ndjson'],
- // activated: ['spec'],
+  //  activated: ['ndjson'],
+ activated: ['spec'],
 }