feat(user): record user's first and last name

tfkhdyt · Sep 28, 2023 · c69da2c · c69da2c
1 parent 607e74f
commit c69da2c
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 15 deletions.
diff --git a/drizzle/0000_foamy_shinko_yamashiro.sql → drizzle/0000_zippy_hemingway.sql b/drizzle/0000_foamy_shinko_yamashiro.sql → drizzle/0000_zippy_hemingway.sql
@@ -1,5 +1,7 @@
 CREATE TABLE `users` (
 	`id` integer PRIMARY KEY NOT NULL,
-	`username` text(50) NOT NULL,
+	`username` text(50),
+	`first_name` text(255),
+	`last_name` text(255),
 	`credits` integer DEFAULT 3
 );
diff --git a/drizzle/meta/0000_snapshot.json b/drizzle/meta/0000_snapshot.json
@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "6e40828e-5f67-457d-b1fc-bac818a29d7e",
+  "id": "add0072b-fb22-4265-a6f1-868a4ec26d05",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "users": {
@@ -18,7 +18,21 @@
           "name": "username",
           "type": "text(50)",
           "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
           "autoincrement": false
         },
         "credits": {

diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1695787466171,
-      "tag": "0000_foamy_shinko_yamashiro",
+      "when": 1695874253165,
+      "tag": "0000_zippy_hemingway",
       "breakpoints": true
     }
   ]

diff --git a/src/db/postgres/schemas/user.schema.ts b/src/db/postgres/schemas/user.schema.ts
@@ -2,7 +2,9 @@ import { integer, sqliteTable, text } from 'drizzle-orm/sqlite-core'
 
 export const users = sqliteTable('users', {
   id: integer('id').primaryKey(),
-  username: text('username', { length: 50 }).notNull(),
+  username: text('username', { length: 50 }),
+  firstName: text('first_name', { length: 255 }),
+  lastName: text('last_name', { length: 255 }),
   credits: integer('credits').default(3),
 })
 

diff --git a/src/middlewares/user.middleware.ts b/src/middlewares/user.middleware.ts
@@ -1,22 +1,49 @@
 import { MyContext } from '../interfaces/context'
-import { addUser, findUserByID } from '../repositories/user.repository'
+import {
+  addUser,
+  findUserByID,
+  updateUser,
+} from '../repositories/user.repository'
 
 export const checkUserMiddleware = async (
   ctx: MyContext,
   next: () => Promise<void>,
 ) => {
   try {
-    const userId = ctx.from?.id
-    const username = ctx.from?.username
-    if (!userId || !username)
+    const user = ctx.from
+    if (!user) {
       throw new Error('User ID atau Username anda tidak valid')
+    }
+    const { id, username, first_name: firstName, last_name: lastName } = user
+
+    let userData = await findUserByID(id)
+    if (userData.length === 0) {
+      userData = await addUser({ id, username, firstName, lastName })
+    } else {
+      const {
+        username: usernameDb,
+        firstName: firstNameDb,
+        lastName: lastNameDb,
+      } = userData[0]
 
-    let user = await findUserByID(userId)
-    if (user.length === 0) {
-      user = await addUser({ id: userId, username })
+      if (
+        usernameDb !== username ||
+        firstNameDb !== firstName ||
+        lastNameDb !== lastName
+      ) {
+        const updatedUser = await updateUser(id, {
+          username,
+          firstName,
+          lastName,
+        })
+        if (updatedUser.length === 0) {
+          throw new Error('Gagal untuk memperbarui akun')
+        }
+        userData = updatedUser
+      }
     }
 
-    ctx.user = user[0]
+    ctx.user = userData[0]
 
     await next()
   } catch (error) {

diff --git a/src/repositories/user.repository.ts b/src/repositories/user.repository.ts
@@ -1,14 +1,18 @@
 import { eq, lt, sql } from 'drizzle-orm'
+import { NewUser } from './../db/postgres/schemas/user.schema'
 
 import { db } from '../db/postgres'
-import { NewUser, users } from '../db/postgres/schemas/user.schema'
+import { users } from '../db/postgres/schemas/user.schema'
 
 export const findUserByID = async (id: number) =>
   await db.select().from(users).where(eq(users.id, id))
 
 export const addUser = async (user: NewUser) =>
   await db.insert(users).values(user).returning()
 
+export const updateUser = async (id: number, user: NewUser) =>
+  await db.update(users).set(user).where(eq(users.id, id)).returning()
+
 export const decreaseCredits = async (userId: number) =>
   await db
     .update(users)