PEER-255 Fix Seeding logic

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

backend/user/drizzle/0000_initial_schema.sql

@@ -1,3 +1,15 @@
+DO $$ BEGIN
+ CREATE TYPE "public"."action" AS ENUM('SEED');
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "admin" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"created_at" timestamp DEFAULT now(),
+	"action" "action" NOT NULL
+);
+--> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "users" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
 	"email" varchar(255) NOT NULL,

backend/user/drizzle/meta/0000_snapshot.json

@@ -1,9 +1,40 @@
 {
-  "id": "d0b8800a-d4b6-49f8-b2cf-57f4a64fc64a",
+  "id": "f01e3d91-1038-48b8-a073-a6a9a8a308fd",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
   "tables": {
+    "public.admin": {
+      "name": "admin",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "action": {
+          "name": "action",
+          "type": "action",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "public.users": {
       "name": "users",
       "schema": "",
@@ -86,7 +117,15 @@
       }
     }
   },
-  "enums": {},
+  "enums": {
+    "public.action": {
+      "name": "action",
+      "schema": "public",
+      "values": [
+        "SEED"
+      ]
+    }
+  },
   "schemas": {},
   "sequences": {},
   "_meta": {

backend/user/drizzle/meta/_journal.json

@@ -5,7 +5,7 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1727623675374,
+      "when": 1728143079049,
       "tag": "0000_initial_schema",
       "breakpoints": true
     }

backend/user/entrypoint.sh

@@ -1,14 +1,9 @@
 #!/bin/sh
-if [ ! -f db-init ]
-then
-echo "migrating..."
+
+# Drizzle will handle its own logic to remove conflicts
 npm run db:prod:migrate
-echo "migration complete"
-echo "seeding..."
+
+# Checks admin table and will not seed if data exists
 npm run db:prod:seed
-echo "seeding complete"
-touch .db-init
-echo "db-init created"
-fi
 
 npm run start

backend/user/src/lib/db/schema.ts

@@ -1,4 +1,4 @@
-import { integer, pgTable, smallint, timestamp, uuid, varchar } from 'drizzle-orm/pg-core';
+import { integer, pgEnum, pgTable, smallint, timestamp, uuid, varchar } from 'drizzle-orm/pg-core';
 
 // Define the user table
 export const users = pgTable('users', {
@@ -12,3 +12,11 @@ export const users = pgTable('users', {
   unlockTime: timestamp('unlock_time', { precision: 6, withTimezone: true }), // If failed counts > limit, block all attempts until this time.
   attemptedQuestions: integer('attempted_questions').array(),
 });
+
+export const actionEnum = pgEnum('action', ['SEED']);
+
+export const admin = pgTable('admin', {
+  id: uuid('id').primaryKey().notNull().defaultRandom(),
+  createdAt: timestamp('created_at').defaultNow(),
+  action: actionEnum('action').notNull(),
+});

backend/user/src/lib/db/seed.ts

@@ -1,5 +1,6 @@
 import { generatePasswordHash } from '@/lib/passwords';
-import { db, users as usersTable } from '.';
+import { admin as adminTable, db, users as usersTable } from '.';
+import { eq } from 'drizzle-orm';
 
 const TEST_USER_CREDENTIALS = {
   username: 'testuser01',
@@ -13,6 +14,13 @@ const main = async () => {
   await db.transaction(async (tx) => {
     // Clear all users
     try {
+      const seedRecords = await tx.select().from(adminTable).where(eq(adminTable.action, 'SEED'));
+      if (seedRecords && seedRecords.length > 0) {
+        console.info(
+          `[Users]: Seeded already at: ${(seedRecords[seedRecords.length - 1].createdAt ?? new Date()).toLocaleString()}`
+        );
+        return;
+      }
       await tx.delete(usersTable);
 
       const password = generatePasswordHash(TEST_USER_CREDENTIALS.password);
@@ -24,6 +32,7 @@ const main = async () => {
           password,
         })
         .onConflictDoNothing();
+      await tx.insert(adminTable).values({ action: 'SEED' });
     } catch (error) {
       console.error('[Users]: An error occurred while seeding: ' + String(error));
       process.exit(1);

docker-compose.yaml

@@ -84,8 +84,6 @@ services:
       # Docker Compose Specific for Service Discovery
       - EXPRESS_DB_HOST=user-db
       - EXPRESS_DB_PORT=5432
-    volumes: 
-      - user-service:/data/user-express
     depends_on:
       user-db:
         condition: service_healthy
@@ -96,13 +94,6 @@ services:
     entrypoint: ["/bin/sh", "entrypoint.sh"]
 
 volumes:
-  user-service:
-    external: false
-  question-service:
-    external: false
-  collab-service:
-    external: false
-
   # Persistent Volumes for Databases
   user-db-docker:
     external: true