From 2a2c020627542c45fe76abd66422c3cfb11bb964 Mon Sep 17 00:00:00 2001 From: ahasani194 Date: Sat, 16 May 2026 18:00:08 +0330 Subject: [PATCH] refactor: update Dockerfile cache identifiers and clean up console logs across multiple services --- Dockerfile | 5 ++--- scripts/seedStockKeepingUnits.ts | 13 ----------- .../business-activities-query.service.ts | 6 +++-- src/common/utils/enum-translator.util.ts | 2 -- src/main.ts | 8 ------- .../business-activities.service.ts | 6 ++--- .../consumer/statistics/statistics.service.ts | 22 ++++++++++++++----- src/modules/pos/pos.service.ts | 2 -- .../switch/nama/nama-provider.adapter.ts | 2 -- 9 files changed, 25 insertions(+), 41 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff3a895..6b4f95d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN npm config set registry ${NPM_REGISTRY} \ FROM base AS build COPY package.json pnpm-lock.yaml ./ -RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \ +RUN --mount=type=cache,id=pnpm-store-build,sharing=locked,target=/pnpm/store \ pnpm install --frozen-lockfile COPY . . @@ -26,9 +26,8 @@ RUN pnpm run build FROM base AS prod-deps COPY package.json pnpm-lock.yaml ./ -RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \ +RUN --mount=type=cache,id=pnpm-store-prod,sharing=locked,target=/pnpm/store \ pnpm install --prod --frozen-lockfile \ - && pnpm store prune \ && rm -rf /root/.npm /root/.cache FROM node:22-slim AS runtime diff --git a/scripts/seedStockKeepingUnits.ts b/scripts/seedStockKeepingUnits.ts index 80a63e4..62c49d2 100644 --- a/scripts/seedStockKeepingUnits.ts +++ b/scripts/seedStockKeepingUnits.ts @@ -132,19 +132,6 @@ async function main() { }) upserted++ } - - console.log( - JSON.stringify( - { - csvPath: absolutePath, - totalRows: rows.length, - upserted, - skipped, - }, - null, - 2, - ), - ) } main() diff --git a/src/common/services/businessActivities/business-activities-query.service.ts b/src/common/services/businessActivities/business-activities-query.service.ts index c1441fb..3bbef07 100644 --- a/src/common/services/businessActivities/business-activities-query.service.ts +++ b/src/common/services/businessActivities/business-activities-query.service.ts @@ -14,7 +14,7 @@ export class BusinessActivitiesQueryService { async findAllByConsumer(consumer_id: string, select: BusinessActivitySelect) { const businessActivities = await this.prisma.businessActivity.findMany({ where: { consumer_id }, - select, + select: this.baseSelect, }) return businessActivities.map(QUERY_CONSTANTS.BUSINESS_ACTIVITIES.mappedData) } @@ -34,9 +34,11 @@ export class BusinessActivitiesQueryService { const businessActivity = await this.prisma.businessActivity.findUnique({ where: { consumer_id, id }, - select, + select: QUERY_CONSTANTS.BUSINESS_ACTIVITIES.select, }) + console.log('businessActivity', businessActivity) + return QUERY_CONSTANTS.BUSINESS_ACTIVITIES.mappedData(businessActivity) } } diff --git a/src/common/utils/enum-translator.util.ts b/src/common/utils/enum-translator.util.ts index dbb45b6..03b87ee 100644 --- a/src/common/utils/enum-translator.util.ts +++ b/src/common/utils/enum-translator.util.ts @@ -12,8 +12,6 @@ export function translateEnumValue( enumKey: keyof typeof translates.enums, value: string | null | undefined, ): EnumTranslatedValue { - console.log(enumKey, value) - const enumsRegistry = translates.enums as EnumsRegistry const enumMap = enumsRegistry[String(enumKey)] diff --git a/src/main.ts b/src/main.ts index 5801f64..476542d 100644 --- a/src/main.ts +++ b/src/main.ts @@ -64,8 +64,6 @@ async function bootstrap() { .filter(Boolean) : [] - console.log('envOrigins', envOrigins) - const allowedOrigins = (envOrigins.length ? envOrigins : defaultOrigins).filter(Boolean) const isOriginAllowed = (origin: string) => { @@ -77,8 +75,6 @@ async function bootstrap() { const rootDomain = pattern.slice(2) return hostname === rootDomain || hostname.endsWith(`.${rootDomain}`) } - console.log('origin', origin, 'pattern', pattern, 'hostname', hostname) - console.log(hostname === pattern || origin === pattern) return hostname === pattern || origin === pattern }) @@ -90,18 +86,14 @@ async function bootstrap() { app.enableCors({ origin: (origin, callback) => { if (!origin) { - console.log('1') callback(null, true) return } if (isOriginAllowed(origin)) { - console.log('2') - callback(null, true) return } - console.log('3') callback(new Error('Not allowed by CORS'), false) }, diff --git a/src/modules/consumer/business-activities/business-activities.service.ts b/src/modules/consumer/business-activities/business-activities.service.ts index 0b88046..735131b 100644 --- a/src/modules/consumer/business-activities/business-activities.service.ts +++ b/src/modules/consumer/business-activities/business-activities.service.ts @@ -61,9 +61,7 @@ export class BusinessActivitiesService { consumer_id, this.defaultSelect, ) - return ResponseMapper.list( - businessActivities.map(this.prepareBusinessActivityResponse), - ) + return ResponseMapper.list(businessActivities) } async findOne(consumer_id: string, id: string) { @@ -72,7 +70,7 @@ export class BusinessActivitiesService { id, this.defaultSelect, ) - return ResponseMapper.single(this.prepareBusinessActivityResponse(businessActivity)) + return ResponseMapper.single(businessActivity) } async update(consumer_id: string, id: string, data: any) { diff --git a/src/modules/consumer/statistics/statistics.service.ts b/src/modules/consumer/statistics/statistics.service.ts index 8a2bb8a..dccac7c 100644 --- a/src/modules/consumer/statistics/statistics.service.ts +++ b/src/modules/consumer/statistics/statistics.service.ts @@ -1,3 +1,6 @@ +import { QUERY_CONSTANTS } from '@/common/queryConstants' +import { translateEnumValue } from '@/common/utils' +import { TspProviderResponseStatus } from '@/generated/prisma/enums' import { PrismaService } from '@/prisma/prisma.service' import { Injectable } from '@nestjs/common' import { ResponseMapper } from 'common/response/response-mapper' @@ -6,6 +9,18 @@ import { ResponseMapper } from 'common/response/response-mapper' export class StatisticsService { constructor(private readonly prisma: PrismaService) {} + private readonly invoiceMapper = (invoice: any) => { + const { tsp_attempts, ...rest } = invoice || {} + + return { + ...rest, + status: translateEnumValue( + 'TspProviderResponseStatus', + invoice.tsp_attempts?.[0]?.status || TspProviderResponseStatus.NOT_SEND, + ), + } + } + async getInvoices(consumer_id: string) { const startOfToday = new Date() startOfToday.setHours(0, 0, 0, 0) @@ -20,10 +35,7 @@ export class StatisticsService { }, }, select: { - id: true, - code: true, - total_amount: true, - created_at: true, + ...QUERY_CONSTANTS.SALE_INVOICE.summarySelect, consumer_account: { select: { role: true, @@ -54,6 +66,6 @@ export class StatisticsService { }, }, }) - return ResponseMapper.list(invoices) + return ResponseMapper.list(invoices.map(this.invoiceMapper)) } } diff --git a/src/modules/pos/pos.service.ts b/src/modules/pos/pos.service.ts index 47bf046..7c15388 100644 --- a/src/modules/pos/pos.service.ts +++ b/src/modules/pos/pos.service.ts @@ -10,8 +10,6 @@ export class PosService { constructor(private readonly prisma: PrismaService) {} async getInfo(pos_id: string) { - console.log('pos_id', pos_id) - const pos = await this.prisma.pos.findUniqueOrThrow({ where: { id: pos_id, diff --git a/src/modules/tspProviders/switch/nama/nama-provider.adapter.ts b/src/modules/tspProviders/switch/nama/nama-provider.adapter.ts index d3f2228..053b331 100644 --- a/src/modules/tspProviders/switch/nama/nama-provider.adapter.ts +++ b/src/modules/tspProviders/switch/nama/nama-provider.adapter.ts @@ -80,8 +80,6 @@ export class NamaProviderSwitchAdapter implements IProviderSwitchAdapter { ): Promise { const mappedRequest = this.namaProviderUtils.mapToNamaRequestDto(payload) try { - console.log(mappedRequest) - const response = await this.httpClient.request( this.buildSendUrl(), {