Refactor: Updated routes and controllers structure, migrated database…

…, added new validations and fields, and fixed bugs

migrations/1714495123940-users.ts

@@ -0,0 +1,24 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class CreateUserMigration1614495123940 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`
+            CREATE TABLE "user" (
+                "id" SERIAL NOT NULL,
+                "firstName" character varying NOT NULL,
+                "lastName" character varying NOT NULL,
+                "email" character varying NOT NULL,
+                "password" character varying NOT NULL,
+                "userType" character varying NOT NULL DEFAULT 'Buyer',
+                CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"),
+                CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id")
+            )
+        `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP TABLE "user"`);
+    }
+
+}

migrations/1714553873264-UpdateUserEntity.ts

@@ -0,0 +1,31 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class CreateUserMigration1614495123940 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`
+            CREATE TABLE "user" (
+                "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+                "firstName" character varying NOT NULL,
+                "lastName" character varying NOT NULL,
+                "email" character varying NOT NULL,
+                "password" character varying NOT NULL,
+                "gender" character varying NOT NULL,
+                "phoneNumber" character varying NOT NULL,
+                "photoUrl" character varying,
+                "verified" boolean NOT NULL,
+                "status" character varying NOT NULL CHECK (status IN ('active', 'suspended')),
+                "userType" character varying NOT NULL DEFAULT 'Buyer' CHECK (userType IN ('Admin', 'Buyer', 'Vendor')),
+                "createdAt" TIMESTAMP NOT NULL DEFAULT now(),
+                "updatedAt" TIMESTAMP NOT NULL DEFAULT now(),
+                CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"),
+                CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id")
+            )
+        `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP TABLE "user"`);
+    }
+
+}

src/controllers/authController.ts

@@ -0,0 +1,51 @@
+import { Request, Response } from 'express';
+import { User } from '../entities/User';;
+import bcrypt from 'bcrypt';
+import { getRepository } from 'typeorm';
+
+
+class UserController {
+    static registerUser = async (req: Request, res: Response) => {
+        const { firstName, lastName, email, password, gender, phoneNumber, userType, status, verified, photoUrl } = req.body;
+
+
+
+        // Validate user input
+        if (!(firstName && lastName && email && password && gender && phoneNumber && verified && photoUrl)) {
+            return res.status(400).json({ error: 'Please fill all the fields' });
+        }
+
+        const userRepository = getRepository(User);
+
+
+        // Check for existing user
+        const existingUser = await userRepository.findOneBy({ email });
+        const existingUserNumber = await userRepository.findOneBy({ phoneNumber });
+
+        if (existingUser || existingUserNumber) {
+            return res.status(400).json({ error: 'Email or phone number already in use' });
+        }
+
+        const saltRounds = 10;
+        const hashedPassword = await bcrypt.hash(password, saltRounds);
+
+        // Create user
+        const user = new User();
+        user.firstName = firstName;
+        user.lastName = lastName;
+        user.email = email;
+        user.password = hashedPassword;
+        user.userType = userType;
+        user.gender = gender;
+        user.phoneNumber = phoneNumber;
+        user.photoUrl = photoUrl;
+        user.status = status ? status : 'active';
+        user.verified = verified;
+
+        // Save user
+        await userRepository.save(user);
+
+        return res.status(201).json({ message: 'User registered successfully' });
+    };
+}
+export { UserController };

src/entities/User.ts

@@ -0,0 +1,69 @@
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  Unique,
+  CreateDateColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+import { IsEmail, IsNotEmpty, IsString, IsBoolean, IsIn } from 'class-validator';
+
+@Entity()
+@Unique(['email'])
+export class User {
+  @PrimaryGeneratedColumn('uuid')
+  @IsNotEmpty()
+  id!: string;
+
+  @Column()
+  @IsNotEmpty()
+  @IsString()
+  firstName!: string;
+
+  @Column()
+  @IsNotEmpty()
+  @IsString()
+  lastName!: string;
+
+  @Column()
+  @IsNotEmpty()
+  @IsEmail()
+  email!: string;
+
+  @Column()
+  @IsNotEmpty()
+  password!: string;
+
+  @Column()
+  @IsNotEmpty()
+  @IsString()
+  gender!: string;
+
+  @Column()
+  @IsNotEmpty()
+  phoneNumber!: string;
+
+  @Column({ nullable: true })
+  photoUrl?: string;
+
+  @Column()
+  @IsNotEmpty()
+  @IsBoolean()
+  verified!: boolean;
+
+  @Column()
+  @IsNotEmpty()
+  @IsIn(['active', 'suspended'])
+  status!: 'active' | 'suspended';
+
+  @Column({ default: "Buyer" })
+  @IsNotEmpty()
+  @IsIn(['Admin', 'Buyer', 'Vendor'])
+  userType!: 'Admin' | 'Buyer' | 'Vendor';
+
+  @CreateDateColumn()
+  createdAt!: Date;
+
+  @UpdateDateColumn()
+  updatedAt!: Date;
+}

src/routes/UserRoutes.ts

@@ -0,0 +1,11 @@
+import {  Router } from 'express';
+import { UserController } from '../controllers/index';
+
+
+const { registerUser } = UserController;
+
+const router = Router();
+
+router.post('/register', registerUser);
+
+export default router;