@loomcore/api 0.1.8 → 0.1.9

package/dist/databases/postgres/migrations/002-create-organizations-table.migration.js

@@ -46,7 +46,7 @@ export class CreateOrganizationTableMigration {
             `);
         }
         catch (error) {
-            return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: ${error.message}`) };
+            return { success: false, error: new Error(`Error creating meta organization: ${error.message}`) };
         }
         try {
             await this.client.query(`
@@ -69,9 +69,15 @@ export class CreateOrganizationTableMigration {
             return { success: false, error: new Error(`Error dropping organizations table: ${error.message}`) };
         }
         try {
-            await this.client.query(`
+            const result = await this.client.query(`
                 Update "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}' AND "_orgId" = '${_orgId}';
             `);
+            if (result.rowCount === 0) {
+                return {
+                    success: false, error: new Error(`Error updating migration record: Migration record not found.
+                    Migration index: ${this.index}, _orgId: ${_orgId}`)
+                };
+            }
         }
         catch (error) {
             return { success: false, error: new Error(`Error updating migration record: ${error.message}`) };

package/dist/databases/postgres/migrations/setup-for-auth.migration.js

@@ -1,19 +1,28 @@
 import { CreateRefreshTokenTableMigration } from "./004-create-refresh-token-table.migration.js";
 import { CreateMigrationTableMigration } from "./001-create-migrations-table.migration.js";
 import { CreateUsersTableMigration } from "./003-create-users-table.migration.js";
+import { doesTableExist } from "../utils/does-table-exist.util.js";
 export async function setupDatabaseForAuth(client, _orgId) {
-    const migrations = [
-        new CreateMigrationTableMigration(client),
-        new CreateUsersTableMigration(client),
-        new CreateRefreshTokenTableMigration(client),
-    ];
-    try {
-        for (const migration of migrations) {
-            await migration.execute(_orgId);
-        }
+    let runMigrations = [];
+    if (await doesTableExist(client, 'migrations')) {
+        const migrations = await client.query(`
+            SELECT "_id", "index"
+            FROM migrations
+            WHERE "hasRun" = TRUE AND "reverted" = FALSE AND "_orgId" = $1
+        `, [_orgId]);
+        runMigrations = migrations.rows.map((row) => {
+            return row.index;
+        });
     }
-    catch (error) {
-        return { success: false, error: error };
+    let migrationsToRun = [];
+    if (!runMigrations.includes(1))
+        migrationsToRun.push(new CreateMigrationTableMigration(client));
+    if (!runMigrations.includes(3))
+        migrationsToRun.push(new CreateUsersTableMigration(client));
+    if (!runMigrations.includes(4))
+        migrationsToRun.push(new CreateRefreshTokenTableMigration(client));
+    for (const migration of migrationsToRun) {
+        await migration.execute(_orgId);
     }
     return { success: true, error: null };
 }

package/dist/databases/postgres/migrations/setup-for-multitenant.migration.js

@@ -1,12 +1,25 @@
 import { CreateMigrationTableMigration } from "./001-create-migrations-table.migration.js";
 import { CreateOrganizationTableMigration } from "./002-create-organizations-table.migration.js";
+import { doesTableExist } from "../utils/does-table-exist.util.js";
 export async function setupDatabaseForMultitenant(client, orgName, orgCode) {
-    const migrations = [
-        new CreateMigrationTableMigration(client),
-        new CreateOrganizationTableMigration(client, orgName, orgCode),
-    ];
+    let runMigrations = [];
+    if (await doesTableExist(client, 'migrations')) {
+        const migrations = await client.query(`
+            SELECT "_id", "index"
+            FROM migrations
+            WHERE "hasRun" = TRUE AND "reverted" = FALSE AND "_orgId" IS NULL
+        `);
+        runMigrations = migrations.rows.map((row) => {
+            return row.index;
+        });
+    }
+    let migrationsToRun = [];
+    if (!runMigrations.includes(1))
+        migrationsToRun.push(new CreateMigrationTableMigration(client));
+    if (!runMigrations.includes(2))
+        migrationsToRun.push(new CreateOrganizationTableMigration(client, orgName, orgCode));
     try {
-        for (const migration of migrations) {
+        for (const migration of migrationsToRun) {
             await migration.execute();
         }
     }

package/dist/databases/postgres/utils/does-table-exist.util.d.ts

@@ -0,0 +1,2 @@
+import { Client } from "pg";
+export declare function doesTableExist(client: Client, tableName: string): Promise<boolean>;

package/dist/databases/postgres/utils/does-table-exist.util.js

@@ -0,0 +1,8 @@
+export async function doesTableExist(client, tableName) {
+    const result = await client.query(`
+        SELECT EXISTS (
+            SELECT 1 FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = $1
+        )
+    `, [tableName]);
+    return result.rows[0].exists;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {