chore: updated login controller

src/controllers/UserController.ts

@@ -1,6 +1,6 @@
 // src/controllers/UserController.ts
 import { Request, Response } from "express";
-import { UserService } from "../services/UserServivce";
+import { UserService } from "../services/user.services";
 
 class UserController {
   private userService: UserService;

src/models/article.ts → src/models/helpcentertopic.ts

@@ -4,13 +4,11 @@ import {
   Column,
   CreateDateColumn,
   UpdateDateColumn,
-  ManyToOne,
 } from "typeorm";
 import ExtendedBaseEntity from "./extended-base-entity";
-import { User } from ".";
 
 @Entity()
-export class Article extends ExtendedBaseEntity {
+export class HelpCenterTopic extends ExtendedBaseEntity {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
@@ -20,8 +18,8 @@ export class Article extends ExtendedBaseEntity {
   @Column()
   content: string;
 
-  @ManyToOne(() => User, (user) => user.articles)
-  author: User;
+  @Column()
+  author: string;
 
   @CreateDateColumn()
   createdAt: Date;

src/models/index.ts

@@ -1,5 +1,6 @@
-export * from "./User";
-export * from "./Organization";
-export * from "./Profile";
-export * from "./Product";
-export * from "./article";
+export * from "./user";
+export * from "./organization";
+export * from "./profile";
+export * from "./product";
+export * from "./helpcentertopic";
+export * from "./notification";

src/models/notification.ts

@@ -0,0 +1,21 @@
+import { Entity, PrimaryGeneratedColumn, Column, Unique } from "typeorm";
+import ExtendedBaseEntity from "./extended-base-entity";
+
+@Entity()
+@Unique(["user_id"])
+export class NotificationSetting extends ExtendedBaseEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column()
+  user_id: string;
+
+  @Column()
+  email_notifications: boolean;
+
+  @Column()
+  push_notifications: boolean;
+
+  @Column()
+  sms_notifications: boolean;
+}

src/models/Organization.ts → src/models/organization.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToMany } from "typeorm";
-import { User } from "./User";
+import { User } from "./user";
 import ExtendedBaseEntity from "./extended-base-entity";
 
 @Entity()

src/models/Product.ts → src/models/product.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from "typeorm";
-import { User } from "./User";
+import { User } from "./user";
 import ExtendedBaseEntity from "./extended-base-entity";
 
 @Entity()

src/models/Profile.ts → src/models/profile.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, OneToOne } from "typeorm";
-import { User } from "./User";
+import { User } from "./user";
 import ExtendedBaseEntity from "./extended-base-entity";
 
 @Entity()

src/models/sms.ts

@@ -0,0 +1,28 @@
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  ManyToOne,
+} from "typeorm";
+import ExtendedBaseEntity from "./extended-base-entity";
+import { User } from ".";
+
+@Entity()
+export class Sms extends ExtendedBaseEntity {
+  @PrimaryGeneratedColumn("uuid")
+  id: string;
+
+  @Column()
+  phone_number: string;
+
+  @Column()
+  message: string;
+
+  @Column()
+  @ManyToOne(() => User, (user) => user.id)
+  sender_id: User;
+
+  @CreateDateColumn()
+  createdAt: Date;
+}

src/models/User.ts → src/models/user.ts

@@ -11,7 +11,7 @@ import {
   CreateDateColumn,
   UpdateDateColumn,
 } from "typeorm";
-import { Profile, Product, Organization, Article } from ".";
+import { Profile, Product, Organization } from ".";
 import { IsEmail } from "class-validator";
 import ExtendedBaseEntity from "./extended-base-entity";
 import { getIsInvalidMessage } from "../utils";
@@ -59,9 +59,6 @@ export class User extends ExtendedBaseEntity {
   @JoinTable()
   products: Product[];
 
-  @OneToMany(() => Article, (article) => article.author, { cascade: true })
-  articles: Article[];
-
   @ManyToMany(() => Organization, (organization) => organization.users, {
     cascade: true,
   })

src/services/auth.services.ts

@@ -1,5 +1,5 @@
 import { AppDataSource } from "../data-source";
-import { User } from "../models";
+import { Profile, User } from "../models";
 import { IAuthService, IUserSignUp, IUserLogin } from "../types";
 import { Conflict, HttpError } from "../middleware";
 import { hashPassword, generateNumericOTP, comparePassword } from "../utils";
@@ -92,7 +92,9 @@ export class AuthService implements IAuthService {
     }
   }
 
-  public async login(payload: IUserLogin): Promise<{ access_token: string; user: Partial<User> }> {
+  public async login(
+    payload: IUserLogin
+  ): Promise<{ access_token: string; user: Partial<User> }> {
     const { email, password } = payload;
 
     try {
@@ -107,7 +109,13 @@ export class AuthService implements IAuthService {
         throw new HttpError(401, "Invalid credentials");
       }
 
-      const access_token = jwt.sign({ userId: user.id }, config.TOKEN_SECRET, { expiresIn: "1d" });
+      if (!user.isverified) {
+        throw new HttpError(403, "Email not verified");
+      }
+
+      const access_token = jwt.sign({ userId: user.id }, config.TOKEN_SECRET, {
+        expiresIn: "1d",
+      });
 
       const { password: _, ...userWithoutPassword } = user;
 

src/services/index.ts

@@ -1,2 +1,2 @@
 export * from "./auth.services";
-export * from "./UserServivce";
+export * from "./user.services";

src/services/UserServivce.ts → src/services/user.services.ts

@@ -1,5 +1,5 @@
 // src/services/UserService.ts
-import { User } from "../models/User";
+import { User } from "../models/user";
 import { IUserService } from "../types";
 
 export class UserService implements IUserService {

src/types/index.d.ts

@@ -9,16 +9,21 @@ export interface IRole {
   role: "super_admin" | "admin" | "user";
 }
 
-interface IUserSignUp {
+export interface IUserSignUp {
   firstName: string;
   lastName: string;
   email: string;
   password: string;
   phone: string;
 }
 
+export interface IUserLogin {
+  email: string;
+  password: string;
+}
+
 export interface IAuthService {
-  // login(email: string, password: string): Promise<User>;
+  login(payload: IUserLogin): Promise<unknown>;
   signUp(payload: IUserSignUp, res: unknown): Promise<unknown>;
   verifyEmail(token: string, otp: number): Promise<{ message: string }>;
 }