From c7cd7cd855e4b8b900f2870d8381b0e3f708dc3b Mon Sep 17 00:00:00 2001 From: ahasani194 Date: Tue, 17 Feb 2026 20:16:36 +0330 Subject: [PATCH] refactor: remove console logs, update SaleInvoicePayload interface, and enhance GoodCategoriesService response mapping --- .../response-mapping.interceptor.ts | 3 --- src/common/interfaces/sale-invoice-payload.ts | 7 +++--- src/common/response/response-mapper.ts | 2 -- src/main.ts | 14 +++++++++++- src/modules/auth/jwt-auth.guard.ts | 5 ----- .../good-categories.service.ts | 22 ++++++++++++++----- src/modules/goods/goods.service.ts | 2 -- 7 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/common/interceptors/response-mapping.interceptor.ts b/src/common/interceptors/response-mapping.interceptor.ts index 62a6969..134dbe2 100644 --- a/src/common/interceptors/response-mapping.interceptor.ts +++ b/src/common/interceptors/response-mapping.interceptor.ts @@ -23,8 +23,6 @@ import { map } from 'rxjs/operators' @Injectable() export class ResponseMappingInterceptor implements NestInterceptor { intercept(context: ExecutionContext, next: CallHandler): Observable { - console.log('first') - const http = context.switchToHttp() const response = http.getResponse() const request = http.getRequest() @@ -32,7 +30,6 @@ export class ResponseMappingInterceptor implements NestInterceptor { return next.handle().pipe( map(data => { const statusCode: number = (response as Response)?.statusCode ?? 200 - console.log(data) if (data && typeof data === 'object') { if (Array.isArray((data as any).errors) && statusCode >= 400) { diff --git a/src/common/interfaces/sale-invoice-payload.ts b/src/common/interfaces/sale-invoice-payload.ts index 2723306..2070081 100644 --- a/src/common/interfaces/sale-invoice-payload.ts +++ b/src/common/interfaces/sale-invoice-payload.ts @@ -1,8 +1,7 @@ import { GoldKarat } from '../enums/enums' export interface SaleInvoicePayload { - weight: number - karat: keyof typeof GoldKarat - wages: number - profit: number + karat?: keyof typeof GoldKarat + wages?: number + profit?: number } diff --git a/src/common/response/response-mapper.ts b/src/common/response/response-mapper.ts index 7c9a1a6..5a32747 100644 --- a/src/common/response/response-mapper.ts +++ b/src/common/response/response-mapper.ts @@ -20,8 +20,6 @@ export const ResponseMapper = { }, single(item: T): MapperWrapper { - console.log('asdasdsaasdsa') - return { __mapped: 'single', data: item } }, diff --git a/src/main.ts b/src/main.ts index 86872f3..af6fa6b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -30,7 +30,19 @@ async function bootstrap() { }) .build() const documentFactory = () => SwaggerModule.createDocument(app, config) - SwaggerModule.setup('swagger', app, documentFactory) + SwaggerModule.setup('swagger', app, documentFactory, { + swaggerOptions: { + persistAuthorization: true, + requestInterceptor: req => { + const _tokenStorage = localStorage.getItem('authorized') + if (_tokenStorage) { + const tokenStorage = JSON.parse(_tokenStorage) + req.headers['Authorization'] = `Bearer ${tokenStorage?.bearer?.value}` + } + return req + }, + }, + }) // Set API prefix and enable URI versioning so alls routes live under /api/v1/* app.setGlobalPrefix('api') diff --git a/src/modules/auth/jwt-auth.guard.ts b/src/modules/auth/jwt-auth.guard.ts index 79c0697..2f3e1e0 100644 --- a/src/modules/auth/jwt-auth.guard.ts +++ b/src/modules/auth/jwt-auth.guard.ts @@ -25,9 +25,6 @@ export class JwtAuthGuard implements CanActivate { const req = context.switchToHttp().getRequest() - // Log headers to inspect whether Authorization is present - - // Try token from cookie first, then from Authorization header (Bearer) let token: string | undefined = req.cookies?.accessToken if (!token) { const authHeader = (req.headers.authorization || req.headers.Authorization) as @@ -45,8 +42,6 @@ export class JwtAuthGuard implements CanActivate { secret: process.env.JWT_SECRET || 'secret', }) - console.log(payload) - if (payload.type !== 'POS') throw new UnauthorizedException('Invalid or expired token') diff --git a/src/modules/good-categories/good-categories.service.ts b/src/modules/good-categories/good-categories.service.ts index 191e92c..ea47243 100644 --- a/src/modules/good-categories/good-categories.service.ts +++ b/src/modules/good-categories/good-categories.service.ts @@ -7,22 +7,32 @@ import { CreateGoodCategoryDto } from './dto/create-good-category.dto' export class GoodCategoriesService { constructor(private prisma: PrismaService) {} async findAll(complex_id: string) { - // console.log(account) - const categories = await this.prisma.goodCategory.findMany({ where: { complex_id, }, include: { - goods: { - include: { - _count: true, + _count: { + select: { + goods: true, }, }, }, + omit: { + account_id: true, + complex_id: true, + }, }) - return ResponseMapper.list(categories) + return ResponseMapper.list( + categories.map(category => { + const { _count, ...rest } = category + return { + ...rest, + goods_count: Number(_count.goods), + } + }), + ) } findOne(categoryId: string, complex_id: string) { diff --git a/src/modules/goods/goods.service.ts b/src/modules/goods/goods.service.ts index 7a246e9..8259741 100644 --- a/src/modules/goods/goods.service.ts +++ b/src/modules/goods/goods.service.ts @@ -52,7 +52,6 @@ export class GoodsService { }, }, } - console.log(dataToCreate) const good = await this.prisma.good.create({ data: dataToCreate, @@ -62,7 +61,6 @@ export class GoodsService { deleted_at: true, }, }) - console.log(good) return ResponseMapper.create(good) }