Merge pull request #6 from CS3219-AY2425S1/PEER-204-Schema-For-User-Registration

Adding Schema for User Account Registration

Author: sembcorpp

backend/user/drizzle/0001_clammy_grandmaster.sql

@@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS "users" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"email" varchar(255) NOT NULL,
+	"username" varchar(255) NOT NULL,
+	"first_name" varchar(255) NOT NULL,
+	"last_name" varchar(255) NOT NULL,
+	"password" varchar(255) NOT NULL,
+	CONSTRAINT "users_email_unique" UNIQUE("email"),
+	CONSTRAINT "users_username_unique" UNIQUE("username")
+);
+--> statement-breakpoint
+DROP TABLE "tableName";

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

@@ -0,0 +1,78 @@
+{
+  "id": "ecf4404b-9642-42c5-b6d6-deeaeaca7a77",
+  "prevId": "bfb0f47d-1ebe-47d4-b979-8fe9d6305cd4",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "password": {
+          "name": "password",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        },
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "username"
+          ]
+        }
+      }
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}

backend/user/drizzle/meta/_journal.json

@@ -8,6 +8,13 @@
       "when": 1726382290778,
       "tag": "0000_initial_schema",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "7",
+      "when": 1726678203279,
+      "tag": "0001_clammy_grandmaster",
+      "breakpoints": true
     }
   ]
 }

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

@@ -1,5 +1,11 @@
-import { pgTable, uuid } from 'drizzle-orm/pg-core';
+import { pgTable, uuid, varchar } from 'drizzle-orm/pg-core';
 
-export const tableName = pgTable('tableName', {
-  id: uuid('id').unique().primaryKey().defaultRandom(),
+// Define the user table
+export const users = pgTable('users', {
+  id: uuid('id').primaryKey().defaultRandom(), // UUID as primary key with a default random value
+  email: varchar('email', { length: 255 }).unique().notNull(), // Email field, unique and required
+  username: varchar('username', { length: 255 }).unique().notNull(), // Username field, unique and required
+  firstName: varchar('first_name', { length: 255 }).notNull(), // First name field, required
+  lastName: varchar('last_name', { length: 255 }).notNull(), // Last name field, required
+  password: varchar('password', { length: 255 }).notNull(), // Password field, required (hashed password)
 });

backend/user/src/server.ts

@@ -1,6 +1,6 @@
 import express, { json } from 'express';
 import pino from 'pino-http';
-import { db, tableName } from './lib/db';
+import { db, users } from './lib/db';
 
 const app = express();
 app.use(pino());
@@ -14,7 +14,7 @@ app.get('/', async (_req, res) => {
 
 // Ensure DB service is up before running.
 app.get('/test-db', async (_req, res) => {
-  await db.select().from(tableName);
+  await db.select().from(users);
   res.json({ message: 'OK ' });
 });