update module and WF

CallmeSen · CallmeSen · commit 209aff1924ab · 2025-12-18T13:25:26.000+07:00
diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml
@@ -26,11 +26,16 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
+        cache-dependency-path: 'Backend/package-lock.json'
     - name: Install dependencies
+      working-directory: ./Backend
       run: npm ci
     - name: Code Quality - Lint
+      working-directory: ./Backend
       run: npm run lint
     - name: Build
+      working-directory: ./Backend
       run: npm run build --if-present
     - name: Run tests
+      working-directory: ./Backend
       run: npm test
diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts
@@ -10,16 +10,16 @@ import { databaseConfig } from 'src/config/db.config';
 import { UserModule } from 'src/modules/users/users.module';
 import { MailModule } from 'src/mails/mail.module';
 import { ConfigModule } from '@nestjs/config';
-import { PaymentModule } from 'src/modules/Payment/payment.module';
-import { NotificationModule } from 'src/modules/notification/notification.module';
+// import { PaymentModule } from 'src/modules/Payment/payment.module';
+// import { NotificationModule } from 'src/modules/notification/notification.module';
 import { LoggerMiddleware } from 'src/middleware/Logging-middleware';
 import { CacheModule } from '@nestjs/cache-manager';
-import { CommentModule } from 'src/modules/comment/comment.module';
+// import { CommentModule } from 'src/modules/comment/comment.module';
 import { ThrottlerModule } from '@nestjs/throttler';
 import { ChatModule } from 'src/chats/chat.module';
-import { OrdersModule } from './modules/orders/orders.module';
-import { CategoriesModule } from './modules/categories/categories.module';
-import { AuthorsModule } from 'src/modules/authors/authors.module';
+// import { OrdersModule } from './modules/orders/orders.module';
+// import { CategoriesModule } from './modules/categories/categories.module';
+// import { AuthorsModule } from 'src/modules/authors/authors.module';
 
 @Module({
   imports: [
@@ -51,12 +51,12 @@ import { AuthorsModule } from 'src/modules/authors/authors.module';
     BooksModule,
     MailModule,
     ChatModule,
-    PaymentModule,
-    NotificationModule,
-    CommentModule,
-    OrdersModule,
-    AuthorsModule,
-    CategoriesModule,
+    // PaymentModule,
+    // NotificationModule,
+    // CommentModule,
+    // OrdersModule,
+    // AuthorsModule,
+    // CategoriesModule,
   ],
   controllers: [AppController],
   providers: [AppService],
diff --git a/backend/src/config/db.config.ts b/backend/src/config/db.config.ts
@@ -3,11 +3,11 @@ import * as dotenv from 'dotenv';
 import { Book } from 'src/modules/books/entities/book.entity';
 import { Cart } from 'src/modules/cart/entities/cart.entity';
 import { CartItem } from 'src/modules/cart/entities/cart.items';
-import { Payment } from 'src/modules/Payment/entity/payment.entity';
+// import { Payment } from 'src/modules/Payment/entity/payment.entity';
 import { User } from 'src/modules/users/entities/user.entity';
-import { Notification } from 'src/modules/notification/entities/notification.entity';
-import { Inventory } from 'src/modules/inventory/entities/inventory.entity';
-import { Comment } from 'src/modules/comment/entities/comment.entity';
+// import { Notification } from 'src/modules/notification/entities/notification.entity';
+// import { Inventory } from 'src/modules/inventory/entities/inventory.entity';
+// import { Comment } from 'src/modules/comment/entities/comment.entity';
 
 dotenv.config();
 
@@ -18,7 +18,7 @@ export const databaseConfig: TypeOrmModuleOptions = {
   username: process.env.DB_USERNAME,
   password: process.env.DB_PASSWORD,
   database: process.env.DB_NAME,
-  entities: [User, Cart, Book,CartItem,Payment,Notification,Inventory,Comment],
+  entities: [User, Cart, Book, CartItem],
   autoLoadEntities: true,
   synchronize: true,
 };
diff --git a/backend/src/interfaces/pagnition.interface.ts b/backend/src/interfaces/pagnition.interface.ts
@@ -1,6 +1,6 @@
 import { InputType, Field, Int, ObjectType } from '@nestjs/graphql';
 import { Book } from 'src/modules/books/entities/book.entity';
-import { Order } from 'src/modules/orders/entities/order.entity';
+// import { Order } from 'src/modules/orders/entities/order.entity';
 import { User } from 'src/modules/users/entities/user.entity';
 
 @InputType()
@@ -60,17 +60,17 @@ export class PaginatedUsers {
 }
 
 
-@ObjectType()
-export class PaginatedOrders {
-  @Field(() => [Order])
-  orders: Order[];
+// @ObjectType()
+// export class PaginatedOrders {
+//   @Field(() => [Order])
+//   orders: Order[];
 
-  @Field(() => Int)
-  total: number;
+//   @Field(() => Int)
+//   total: number;
 
-  @Field(() => Int)
-  page: number;
+//   @Field(() => Int)
+//   page: number;
 
-  @Field(() => Int)
-  limit: number;
-}
+//   @Field(() => Int)
+//   limit: number;
+// }
diff --git a/backend/src/mails/mail.module.ts b/backend/src/mails/mail.module.ts
@@ -4,7 +4,7 @@ import {  forwardRef, Module } from '@nestjs/common';
 import { MailService } from './mail.service';
 import { join } from 'path';
 import {   ConfigService } from '@nestjs/config';
-import { AuthModule } from 'src/modules/auth/auth.module';
+// import { AuthModule } from 'src/modules/auth/auth.module';
 import { UserModule } from 'src/modules/users/users.module';
 
 
@@ -35,7 +35,7 @@ import { UserModule } from 'src/modules/users/users.module';
             inject: [ConfigService],
         }),
         
-        forwardRef(() => AuthModule),
+        // forwardRef(() => AuthModule),
         forwardRef(() => UserModule),
        
     ],
diff --git a/backend/src/mails/mail.service.ts b/backend/src/mails/mail.service.ts
@@ -1,6 +1,6 @@
 import { MailerService } from '@nestjs-modules/mailer';
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
-import { AuthService } from 'src/modules/auth/auth.service';
+// import { AuthService } from 'src/modules/auth/auth.service';
 import { User } from 'src/modules/users/entities/user.entity';
 
 function generateOtp(): string {
@@ -13,8 +13,8 @@ export class MailService {
   constructor(
     private readonly mailerService: MailerService,
 
-    @Inject(forwardRef(() => AuthService))
-    private readonly authService: AuthService,
+    // @Inject(forwardRef(() => AuthService))
+    // private readonly authService: AuthService,
 
   ) { }
 
@@ -56,7 +56,7 @@ export class MailService {
       `,
       });
 
-      await this.authService.savePostcode(email, otp);
+      // await this.authService.savePostcode(email, otp);
 
 
     } catch (error) {
diff --git a/backend/src/modules/books/entities/book.entity.ts b/backend/src/modules/books/entities/book.entity.ts
@@ -1,7 +1,7 @@
 import { ObjectType, Field, Int, Float, ID } from '@nestjs/graphql';
 import { CartItem } from 'src/modules/cart/entities/cart.items';
 import { Entity, PrimaryGeneratedColumn, Column, OneToMany, OneToOne, ManyToOne } from 'typeorm';
-import { Comment } from 'src/modules/comment/entities/comment.entity';
+// import { Comment } from 'src/modules/comment/entities/comment.entity';
 @ObjectType()
 @Entity('books')
 export class Book {
@@ -54,9 +54,9 @@ export class Book {
   @Column({ type: 'varchar', nullable: true })
   id_stripe?: string;
 
-  @Field(() => [Comment], { nullable: true })
-  @OneToMany(() => Comment, (comment) => comment.book, { cascade: true })
-  comments?: Comment[];
+  // @Field(() => [Comment], { nullable: true })
+  // @OneToMany(() => Comment, (comment) => comment.book, { cascade: true })
+  // comments?: Comment[];
 
    @Field(() => Int)
   @Column({ type: 'int', default: 1 })
diff --git a/backend/src/modules/users/entities/user.entity.ts b/backend/src/modules/users/entities/user.entity.ts
@@ -1,8 +1,8 @@
 import { Entity, PrimaryGeneratedColumn, Column, OneToMany, OneToOne, JoinColumn } from 'typeorm';
 import { ObjectType, Field, ID, registerEnumType } from '@nestjs/graphql';
 import { Cart } from 'src/modules/cart/entities/cart.entity';
-import { Payment } from 'src/modules/Payment/entity/payment.entity';
-import { Comment } from 'src/modules/comment/entities/comment.entity';
+// import { Payment } from 'src/modules/Payment/entity/payment.entity';
+// import { Comment } from 'src/modules/comment/entities/comment.entity';
 
 
 export enum UserStatus {
@@ -62,11 +62,11 @@ export class User {
   @OneToOne(() => Cart, (cart) => cart.user, { cascade: true })
   cart: Cart;
 
-  @OneToMany(() => Payment, payment => payment.user)
-  payments: Payment[];
+  // @OneToMany(() => Payment, payment => payment.user)
+  // payments: Payment[];
 
-  @OneToMany(() => Comment, (comment) => comment.user)
-  comments?: Comment[];
+  // @OneToMany(() => Comment, (comment) => comment.user)
+  // comments?: Comment[];
 
   @Field({ nullable: true })
   @Column({ nullable: true })
diff --git a/backend/src/modules/users/users.module.ts b/backend/src/modules/users/users.module.ts
@@ -3,14 +3,14 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { UsersResolver } from './users.resolver';
 import { User } from './entities/user.entity';
 import { UserService } from './users.service';
-import { BlacklistModule } from 'src/modules/Blacklist/blacklist.module';
+// import { BlacklistModule } from 'src/modules/Blacklist/blacklist.module';
 import { MailModule } from 'src/mails/mail.module';
 import { CartModule } from 'src/modules/cart/cart.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([User]),
-    forwardRef(() => BlacklistModule),
+    // forwardRef(() => BlacklistModule),
     forwardRef(() => MailModule),
     forwardRef(() => CartModule),
   ],
diff --git a/backend/src/modules/users/users.service.ts b/backend/src/modules/users/users.service.ts
@@ -8,7 +8,7 @@ import { CacheInterceptor } from "@nestjs/cache-manager";
 import { InjectRepository } from "@nestjs/typeorm";
 import { Repository } from "typeorm";
 import { User } from "src/modules/users/entities/user.entity";
-import { CreateAuthDto } from "../auth/dto/create-auth.dto";
+// import { CreateAuthDto } from "../auth/dto/create-auth.dto";
 import { MailService } from "src/mails/mail.service";
 import { CreateUserDto } from "src/modules/users/dto/create-user.input";
 import { UpdateUserDto } from "src/modules/users/dto/update-user.input";
@@ -109,7 +109,7 @@ export class UserService {
 
   }
 
-  async register(registerDto: CreateAuthDto) {
+  async register(registerDto: any) {
 
     if (await this.checkEmailExist(registerDto.email)) {
 
