feat: add stock keeping units management

- Created migration to drop `type` column from `stock_keeping_units` table.
- Added `Guild` model to Prisma schema.
- Implemented `BusinessActivitiesQueryService` for querying business activities.
- Developed `GoodsSharedService` for handling goods creation and updates.
- Introduced DTOs for creating and updating stock keeping units.
- Created controller and service for managing stock keeping units.
- Implemented response DTOs for stock keeping units service.
- Established module for stock keeping units management.

src/modules/admin/admin.module.ts

@@ -9,7 +9,6 @@ import { AdminGuildsModule } from './guilds/guilds.module'
 import { AdminLicensesModule } from './licenses/licenses.module'
 import { AdminPartnersModule } from './partners/partners.module'
 import { AdminProvidersModule } from './providers/providers.module'
-import { AdminStockKeepingUnitsModule } from './stock-keeping-units/stock-keeping-units.module'
 import { AdminTranslateModule } from './translate/translate.module'
 import { AdminUserAccountsModule } from './users/accounts/accounts.module'
 import { AdminUsersModule } from './users/users.module'
@@ -26,7 +25,6 @@ import { AdminUsersModule } from './users/users.module'
     AdminGuildsModule,
     AdminDeviceBrandsModule,
     AdminDevicesModule,
-    AdminStockKeepingUnitsModule,
     AdminLicensesModule,
     AdminConsumersModule,
   ],

src/modules/admin/consumers/business-activities/business-activities.module.ts

@@ -1,3 +1,4 @@
+import { BusinessActivitiesQueryService } from '@/common/services/businessActivities/business-activities-query.service'
 import { PrismaModule } from '@/prisma/prisma.module'
 import { Module } from '@nestjs/common'
 import { BusinessActivitiesController } from './business-activities.controller'
@@ -7,6 +8,6 @@ import { AdminBusinessActivityComplexesModule } from './complexes/complexes.modu
 @Module({
   imports: [PrismaModule, AdminBusinessActivityComplexesModule],
   controllers: [BusinessActivitiesController],
-  providers: [BusinessActivitiesService],
+  providers: [BusinessActivitiesService, BusinessActivitiesQueryService],
 })
 export class AdminConsumerBusinessActivitiesModule {}

src/modules/admin/consumers/business-activities/business-activities.service.ts

@@ -1,43 +1,35 @@
+import { BusinessActivitiesQueryService } from '@/common/services/businessActivities/business-activities-query.service'
 import { BusinessActivitySelect } from '@/generated/prisma/models'
-import { PrismaService } from '@/prisma/prisma.service'
 import { Injectable } from '@nestjs/common'
 import { ResponseMapper } from 'common/response/response-mapper'
 
 @Injectable()
 export class BusinessActivitiesService {
-  constructor(private readonly prisma: PrismaService) {}
+  defaultSelect: BusinessActivitySelect
 
-  defaultSelect = {
-    guild: {
-      select: {
-        id: true,
-        code: true,
-        name: true,
-      },
-    },
-    id: true,
-    name: true,
-    economic_code: true,
-    fiscal_id: true,
-    partner_token: true,
-    created_at: true,
-  } as BusinessActivitySelect
+  constructor(
+    private readonly businessActivitiesQueryService: BusinessActivitiesQueryService,
+  ) {
+    this.defaultSelect = {
+      ...this.businessActivitiesQueryService.baseSelect,
+    } as BusinessActivitySelect
+  }
 
   async findAll(consumer_id: string) {
-    const businessActivities = await this.prisma.businessActivity.findMany({
-      where: {
+    const businessActivities =
+      await this.businessActivitiesQueryService.findAllByConsumer(
         consumer_id,
-      },
-      select: this.defaultSelect,
-    })
+        this.defaultSelect,
+      )
     return ResponseMapper.list(businessActivities)
   }
 
   async findOne(consumer_id: string, id: string) {
-    const businessActivity = await this.prisma.businessActivity.findUnique({
-      where: { consumer_id, id },
-      select: this.defaultSelect,
-    })
+    const businessActivity = await this.businessActivitiesQueryService.findOneByConsumer(
+      consumer_id,
+      id,
+      this.defaultSelect,
+    )
     return ResponseMapper.single(businessActivity)
   }
 

src/modules/admin/consumers/licenses/dto/license.dto.ts

@@ -1,6 +1,5 @@
-import { LicenseStatus } from '@/generated/prisma/enums'
 import { ApiProperty, PartialType } from '@nestjs/swagger'
-import { IsDateString, IsEnum } from 'class-validator'
+import { IsDateString } from 'class-validator'
 
 export class CreateLicenseDto {
   @ApiProperty({ required: true, default: new Date().toISOString() })
@@ -24,8 +23,4 @@ export class CreateLicenseDto {
   partner_id: string
 }
 
-export class UpdateLicenseDto extends PartialType(CreateLicenseDto) {
-  @ApiProperty({ enum: LicenseStatus })
-  @IsEnum(LicenseStatus)
-  status?: LicenseStatus
-}
+export class UpdateLicenseDto extends PartialType(CreateLicenseDto) {}

src/modules/admin/guilds/goods/goods.controller.ts

@@ -29,7 +29,7 @@ export class GoodsController {
   }
 
   @Post()
-  @UseInterceptors(FileInterceptor('file', multerImageOptions))
+  @UseInterceptors(FileInterceptor('image', multerImageOptions))
   @ApiConsumes('multipart/form-data')
   @ApiBody({
     schema: {

src/modules/admin/guilds/guilds.module.ts

@@ -4,9 +4,15 @@ import { GuildGoodCategoriesModule } from './good-categories/good-categories.mod
 import { GuildGoodsModule } from './goods/goods.module'
 import { GuildsController } from './guilds.controller'
 import { GuildsService } from './guilds.service'
+import { AdminStockKeepingUnitsModule } from './stock-keeping-units/stock-keeping-units.module'
 
 @Module({
-  imports: [PrismaModule, GuildGoodsModule, GuildGoodCategoriesModule],
+  imports: [
+    PrismaModule,
+    GuildGoodsModule,
+    GuildGoodCategoriesModule,
+    AdminStockKeepingUnitsModule,
+  ],
   providers: [GuildsService],
   controllers: [GuildsController],
 })

src/modules/admin/guilds/guilds.service.ts

@@ -1,4 +1,5 @@
 import { ResponseMapper } from '@/common/response/response-mapper'
+import { translateEnumValue } from '@/common/utils'
 import { PrismaService } from '@/prisma/prisma.service'
 import { Injectable } from '@nestjs/common'
 import { CreateGuildDto } from './dto/create-guild.dto'
@@ -8,6 +9,15 @@ import { UpdateGuildDto } from './dto/update-guild.dto'
 export class GuildsService {
   constructor(private prisma: PrismaService) {}
 
+  private readonly dataMapper = (guild: any) => {
+    const { _count, invoice_template, ...rest } = guild
+    return {
+      ...rest,
+      businessActivitiesCount: guild._count.business_activities,
+      invoice_template: translateEnumValue('InvoiceTemplateType', guild.invoice_template),
+    }
+  }
+
   async findAll() {
     const [guilds, total] = await this.prisma.$transaction([
       this.prisma.guild.findMany({
@@ -22,16 +32,7 @@ export class GuildsService {
       this.prisma.guild.count(),
     ])
 
-    return ResponseMapper.paginate(
-      guilds.map(guild => {
-        const { _count, ...rest } = guild
-        return {
-          ...rest,
-          businessActivitiesCount: guild._count.business_activities,
-        }
-      }),
-      { total },
-    )
+    return ResponseMapper.paginate(guilds.map(this.dataMapper), { total })
   }
 
   async findOne(id: string) {
@@ -46,7 +47,9 @@ export class GuildsService {
       },
     })
 
-    return ResponseMapper.single(guild)
+    const mappedData = this.dataMapper(guild)
+
+    return ResponseMapper.single(mappedData)
   }
 
   async create(data: CreateGuildDto) {

src/modules/admin/guilds/stock-keeping-units/stock-keeping-units.controller.ts

@@ -1,36 +1,40 @@
 import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
 import { ApiTags } from '@nestjs/swagger'
+import { CreateStockKeepingUnitDto } from './dto/create-stock-keeping-unit.dto'
 import type {
   StockKeepingUnitsServiceCreateResponseDto,
   StockKeepingUnitsServiceFindAllResponseDto,
   StockKeepingUnitsServiceUpdateResponseDto,
 } from './dto/stock-keeping-units-response.dto'
-import { CreateStockKeepingUnitDto } from './dto/create-stock-keeping-unit.dto'
 import { UpdateStockKeepingUnitDto } from './dto/update-stock-keeping-unit.dto'
 import { StockKeepingUnitsService } from './stock-keeping-units.service'
 
 @ApiTags('AdminStockKeepingUnits')
-@Controller('admin/stock-keeping-units')
+@Controller('admin/guilds/:guildId/stock-keeping-units')
 export class StockKeepingUnitsController {
   constructor(private readonly service: StockKeepingUnitsService) {}
 
   @Get()
-  async findAll(): Promise<StockKeepingUnitsServiceFindAllResponseDto> {
-    return this.service.findAll()
+  async findAll(
+    @Param('guildId') guildId: string,
+  ): Promise<StockKeepingUnitsServiceFindAllResponseDto> {
+    return this.service.findAll(guildId)
   }
 
   @Post()
   async create(
+    @Param('guildId') guildId: string,
     @Body() data: CreateStockKeepingUnitDto,
   ): Promise<StockKeepingUnitsServiceCreateResponseDto> {
-    return this.service.create(data)
+    return this.service.create(guildId, data)
   }
 
   @Patch(':id')
   async update(
+    @Param('guildId') guildId: string,
     @Param('id') id: string,
     @Body() data: UpdateStockKeepingUnitDto,
   ): Promise<StockKeepingUnitsServiceUpdateResponseDto> {
-    return this.service.update(id, data)
+    return this.service.update(guildId, id, data)
   }
 }

src/modules/admin/guilds/stock-keeping-units/stock-keeping-units.service.ts

@@ -0,0 +1,53 @@
+import { PrismaService } from '@/prisma/prisma.service'
+import { Injectable } from '@nestjs/common'
+import { ResponseMapper } from 'common/response/response-mapper'
+import { CreateStockKeepingUnitDto } from './dto/create-stock-keeping-unit.dto'
+import { UpdateStockKeepingUnitDto } from './dto/update-stock-keeping-unit.dto'
+
+@Injectable()
+export class StockKeepingUnitsService {
+  constructor(private readonly prisma: PrismaService) {}
+
+  private mapData(data: any) {
+    const { name, is_foreign, is_domestic, ...rest } = data
+    return {
+      ...rest,
+      name: `${name} ${is_domestic ? 'اختصاصی' : 'عمومی'} ${is_foreign ? 'خارجی' : 'داخلی'}`,
+    }
+  }
+
+  async findAll(guild_id: string) {
+    const items = await this.prisma.stockKeepingUnits.findMany({
+      where: { guild_id },
+      orderBy: { created_at: 'desc' },
+    })
+
+    const mappedData = items.map(this.mapData)
+
+    return ResponseMapper.list(mappedData)
+  }
+
+  async create(guild_id: string, data: CreateStockKeepingUnitDto) {
+    const item = await this.prisma.stockKeepingUnits.create({
+      data: {
+        ...data,
+        guild: {
+          connect: {
+            id: guild_id,
+          },
+        },
+      },
+    })
+
+    const mappedData = this.mapData(item)
+    return ResponseMapper.create(mappedData)
+  }
+
+  async update(guild_id: string, id: string, data: UpdateStockKeepingUnitDto) {
+    const item = await this.prisma.stockKeepingUnits.update({
+      where: { guild_id, id },
+      data,
+    })
+    return ResponseMapper.update(item)
+  }
+}

src/modules/admin/licenses/dto/license.dto.ts

@@ -1,6 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger'
-import { IsDateString, IsEnum, IsOptional, IsString } from 'class-validator'
-import { LicenseStatus } from 'generated/prisma/enums'
+import { IsDateString, IsOptional, IsString } from 'class-validator'
 
 export class CreateLicenseDto {
   @IsString()
@@ -35,7 +34,4 @@ export class UpdateLicenseDto {
 
   @IsDateString()
   expires_at?: string
-
-  @IsEnum(LicenseStatus)
-  status?: LicenseStatus
 }

src/modules/admin/stock-keeping-units/stock-keeping-units.service.ts

@@ -1,30 +0,0 @@
-import { PrismaService } from '@/prisma/prisma.service'
-import { Injectable } from '@nestjs/common'
-import { ResponseMapper } from 'common/response/response-mapper'
-import { CreateStockKeepingUnitDto } from './dto/create-stock-keeping-unit.dto'
-import { UpdateStockKeepingUnitDto } from './dto/update-stock-keeping-unit.dto'
-
-@Injectable()
-export class StockKeepingUnitsService {
-  constructor(private readonly prisma: PrismaService) {}
-
-  async findAll() {
-    const items = await this.prisma.stockKeepingUnits.findMany({
-      orderBy: { created_at: 'desc' },
-    })
-    return ResponseMapper.list(items)
-  }
-
-  async create(data: CreateStockKeepingUnitDto) {
-    const item = await this.prisma.stockKeepingUnits.create({ data })
-    return ResponseMapper.create(item)
-  }
-
-  async update(id: string, data: UpdateStockKeepingUnitDto) {
-    const item = await this.prisma.stockKeepingUnits.update({
-      where: { id },
-      data,
-    })
-    return ResponseMapper.update(item)
-  }
-}

src/modules/consumer/business-activities/business-activities.module.ts

@@ -1,3 +1,4 @@
+import { BusinessActivitiesQueryService } from '@/common/services/businessActivities/business-activities-query.service'
 import { PrismaModule } from '@/prisma/prisma.module'
 import { Module } from '@nestjs/common'
 import { BusinessActivitiesController } from './business-activities.controller'
@@ -12,6 +13,6 @@ import { ConsumerBusinessActivityGoodsModule } from './goods/goods.module'
     ConsumerBusinessActivityGoodsModule,
   ],
   controllers: [BusinessActivitiesController],
-  providers: [BusinessActivitiesService],
+  providers: [BusinessActivitiesService, BusinessActivitiesQueryService],
 })
 export class ConsumerBusinessActivitiesModule {}

src/modules/consumer/business-activities/business-activities.service.ts

@@ -1,3 +1,4 @@
+import { BusinessActivitiesQueryService } from '@/common/services/businessActivities/business-activities-query.service'
 import { BusinessActivitySelect } from '@/generated/prisma/models'
 import { PrismaService } from '@/prisma/prisma.service'
 import { Injectable } from '@nestjs/common'
@@ -5,37 +6,28 @@ import { ResponseMapper } from 'common/response/response-mapper'
 
 @Injectable()
 export class BusinessActivitiesService {
-  constructor(private readonly prisma: PrismaService) {}
-
-  defaultSelect: BusinessActivitySelect = {
-    id: true,
-    name: true,
-    economic_code: true,
-    created_at: true,
-    partner_token: true,
-    fiscal_id: true,
-    invoice_number_sequence: true,
-    guild: {
-      select: {
-        id: true,
-        code: true,
-        name: true,
-      },
-    },
-
-    license_activation: {
-      select: {
-        id: true,
-        starts_at: true,
-        expires_at: true,
-        license: {
-          select: {
-            activation: {
-              select: {
-                account_allocations: {
-                  select: {
-                    id: true,
-                    account_id: true,
+  defaultSelect: BusinessActivitySelect
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly businessActivitiesQueryService: BusinessActivitiesQueryService,
+  ) {
+    this.defaultSelect = {
+      ...this.businessActivitiesQueryService.baseSelect,
+      invoice_number_sequence: true,
+      license_activation: {
+        select: {
+          id: true,
+          starts_at: true,
+          expires_at: true,
+          license: {
+            select: {
+              activation: {
+                select: {
+                  account_allocations: {
+                    select: {
+                      id: true,
+                      account_id: true,
+                    },
                   },
                 },
               },
@@ -43,7 +35,7 @@ export class BusinessActivitiesService {
           },
         },
       },
-    },
+    }
   }
 
   private readonly prepareBusinessActivityResponse = (businessActivity: any) => {
@@ -64,22 +56,23 @@ export class BusinessActivitiesService {
   }
 
   async findAll(consumer_id: string) {
-    const businessActivities = await this.prisma.businessActivity.findMany({
-      where: {
+    const businessActivities =
+      await this.businessActivitiesQueryService.findAllByConsumer(
         consumer_id,
-      },
-      select: this.defaultSelect,
-    })
+        this.defaultSelect,
+      )
     return ResponseMapper.list(
       businessActivities.map(this.prepareBusinessActivityResponse),
     )
   }
 
   async findOne(consumer_id: string, id: string) {
-    const businessActivity = await this.prisma.businessActivity.findUniqueOrThrow({
-      where: { consumer_id, id },
-      select: this.defaultSelect,
-    })
+    const businessActivity = await this.businessActivitiesQueryService.findOneByConsumer(
+      consumer_id,
+      id,
+      this.defaultSelect,
+      true,
+    )
     return ResponseMapper.single(this.prepareBusinessActivityResponse(businessActivity))
   }
 

src/modules/consumer/business-activities/complexes/poses/sales-invoices/sales-invoice-items/dto/create-sales-invoice-item.dto.ts

@@ -1,7 +1,6 @@
 import { ApiProperty, PartialType } from '@nestjs/swagger'
-import { IsEnum, IsNumber, IsObject, IsOptional, IsString } from 'class-validator'
+import { IsNumber, IsObject, IsOptional, IsString } from 'class-validator'
 import type { SaleInvoiceType } from 'common/interfaces/sale-invoice-payload'
-import { UnitType } from 'generated/prisma/enums'
 
 export class CreateSalesInvoiceItemDto {
   @IsNumber()
@@ -24,9 +23,9 @@ export class CreateSalesInvoiceItemDto {
   @ApiProperty({ required: true })
   invoice_id: string
 
-  @IsEnum(UnitType)
-  @ApiProperty({ enum: Object.values(UnitType) })
-  unit_type: UnitType
+  // @IsEnum(UnitType)
+  // @ApiProperty({ enum: Object.values(UnitType) })
+  // unit_type: UnitType
 
   @IsOptional()
   @IsString()

src/modules/consumer/business-activities/goods/goods.controller.ts

@@ -1,9 +1,23 @@
 import { TokenAccount } from '@/common/decorators/tokenInfo.decorator'
-import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
-import { ApiTags } from '@nestjs/swagger'
+import { multerImageOptions } from '@/multer.config'
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  Patch,
+  Post,
+  UploadedFile,
+  UseInterceptors,
+} from '@nestjs/common'
+import { FileInterceptor } from '@nestjs/platform-express'
+import { ApiBody, ApiConsumes, ApiTags } from '@nestjs/swagger'
 import { CreateGoodDto, UpdateGoodDto } from './dto/good.dto'
+import type {
+  ConsumerBusinessActivityGoodsServiceFindAllResponseDto,
+  ConsumerBusinessActivityGoodsServiceFindOneResponseDto,
+} from './dto/goods-response.dto'
 import { ConsumerBusinessActivityGoodsService } from './goods.service'
-import type { ConsumerBusinessActivityGoodsServiceCreateResponseDto, ConsumerBusinessActivityGoodsServiceFindAllResponseDto, ConsumerBusinessActivityGoodsServiceFindOneResponseDto, ConsumerBusinessActivityGoodsServiceUpdateResponseDto } from './dto/goods-response.dto'
 
 @ApiTags('ConsumerBusinessActivityGoods')
 @Controller('consumer/business_activities/:businessActivityId/goods')
@@ -29,22 +43,44 @@ export class ConsumerBusinessActivityGoodsController {
   }
 
   @Post()
-  async create(
+  @UseInterceptors(FileInterceptor('image', multerImageOptions))
+  @ApiConsumes('multipart/form-data')
+  @ApiBody({
+    schema: {
+      type: 'object',
+      properties: {
+        image: { type: 'string', format: 'binary' },
+      },
+    },
+  })
+  create(
     @Param('businessActivityId') businessActivityId: string,
     @Body() data: CreateGoodDto,
-  ): Promise<ConsumerBusinessActivityGoodsServiceCreateResponseDto> {
-    return this.service.create(businessActivityId, data)
+    @UploadedFile() file: Express.Multer.File,
+  ) {
+    return this.service.create(businessActivityId, data, file)
   }
 
   @Patch(':id')
-  async update(
+  @UseInterceptors(FileInterceptor('image', multerImageOptions))
+  @ApiConsumes('multipart/form-data')
+  @ApiBody({
+    schema: {
+      type: 'object',
+      properties: {
+        image: { type: 'string', format: 'binary' },
+      },
+    },
+  })
+  update(
     @TokenAccount('userId') consumer_id: string,
     @Param('businessActivityId') businessActivityId: string,
 
     @Param('id') id: string,
     @Body() data: UpdateGoodDto,
-  ): Promise<ConsumerBusinessActivityGoodsServiceUpdateResponseDto> {
-    return this.service.update(consumer_id, businessActivityId, id, data)
+    @UploadedFile() file: Express.Multer.File,
+  ) {
+    return this.service.update(consumer_id, businessActivityId, id, data, file)
   }
 
   // @Delete(':id')

src/modules/consumer/business-activities/goods/goods.module.ts

@@ -1,10 +1,11 @@
+import { UploaderModule } from '@/modules/uploader/uploader.module'
 import { PrismaModule } from '@/prisma/prisma.module'
 import { Module } from '@nestjs/common'
 import { ConsumerBusinessActivityGoodsController } from './goods.controller'
 import { ConsumerBusinessActivityGoodsService } from './goods.service'
 
 @Module({
-  imports: [PrismaModule],
+  imports: [PrismaModule, UploaderModule],
   controllers: [ConsumerBusinessActivityGoodsController],
   providers: [ConsumerBusinessActivityGoodsService],
   exports: [ConsumerBusinessActivityGoodsService],

src/modules/consumer/business-activities/goods/goods.service.ts

@@ -1,4 +1,6 @@
+import { UploadedFileTypes } from '@/common/enums/enums'
 import { GoodSelect } from '@/generated/prisma/models'
+import { UploaderService } from '@/modules/uploader/uploader.service'
 import { PrismaService } from '@/prisma/prisma.service'
 import { Injectable } from '@nestjs/common'
 import { ResponseMapper } from 'common/response/response-mapper'
@@ -6,7 +8,10 @@ import { CreateGoodDto, UpdateGoodDto } from './dto/good.dto'
 
 @Injectable()
 export class ConsumerBusinessActivityGoodsService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly uploaderService: UploaderService,
+  ) {}
 
   defaultSelect: GoodSelect = {
     id: true,
@@ -64,12 +69,25 @@ export class ConsumerBusinessActivityGoodsService {
     return ResponseMapper.single(good)
   }
 
-  async create(business_activity_id: string, data: CreateGoodDto) {
+  async create(
+    business_activity_id: string,
+    data: CreateGoodDto,
+    file: Express.Multer.File,
+  ) {
     const { category_id, sku_id, measure_unit_id, ...rest } = data
+    let image_url = ''
+    if (file) {
+      const uploadedUrl = await this.uploaderService.uploadFile(
+        file,
+        UploadedFileTypes.GOOD,
+      )
+      image_url = uploadedUrl || ''
+    }
 
     const good = await this.prisma.good.create({
       data: {
         ...rest,
+        image_url,
         business_activity: {
           connect: {
             id: business_activity_id,
@@ -100,39 +118,61 @@ export class ConsumerBusinessActivityGoodsService {
     business_activity_id: string,
     id: string,
     data: UpdateGoodDto,
+    file: Express.Multer.File,
   ) {
-    const { category_id, sku_id, measure_unit_id, ...rest } = data
-    const good = await this.prisma.good.update({
-      where: {
-        business_activity: {
-          id: business_activity_id,
-          consumer_id,
-        },
-        id,
-      },
-      data: {
-        business_activity: {
-          connect: {
+    const good = await this.prisma.$transaction(async tx => {
+      const { category_id, sku_id, measure_unit_id, ...rest } = data
+      let image_url = ''
+      if (file) {
+        const uploadedUrl = await this.uploaderService.uploadFile(
+          file,
+          UploadedFileTypes.GOOD,
+        )
+        image_url = uploadedUrl || ''
+      }
+
+      const prevImage = await tx.good.findUnique({
+        where: { id },
+        select: { image_url: true },
+      })
+
+      if (image_url && prevImage?.image_url) {
+        this.uploaderService.deleteFile(prevImage.image_url, UploadedFileTypes.GOOD)
+      }
+
+      return await tx.good.update({
+        where: {
+          business_activity: {
             id: business_activity_id,
+            consumer_id,
           },
+          id,
         },
-        category: {
-          connect: {
-            id: category_id,
+        data: {
+          image_url,
+          business_activity: {
+            connect: {
+              id: business_activity_id,
+            },
           },
-        },
-        sku: {
-          connect: {
-            id: sku_id,
+          category: {
+            connect: {
+              id: category_id,
+            },
           },
-        },
-        measure_unit: {
-          connect: {
-            id: measure_unit_id,
+          sku: {
+            connect: {
+              id: sku_id,
+            },
           },
+          measure_unit: {
+            connect: {
+              id: measure_unit_id,
+            },
+          },
+          ...rest,
         },
-        ...rest,
-      },
+      })
     })
     return ResponseMapper.update(good)
   }

src/modules/enums/enums.controller.ts

@@ -114,4 +114,10 @@ export class EnumsController {
   async getTspProviderResponseStatus(): Promise<EnumsServiceGetEnumValuesResponseDto> {
     return this.enumsService.getEnumValues('TspProviderResponseStatus')
   }
+
+  @Get('invoice_templates')
+  @PublicWithToken()
+  async getInvoiceTemplates(): Promise<EnumsServiceGetEnumValuesResponseDto> {
+    return this.enumsService.getEnumValues('InvoiceTemplateType')
+  }
 }

src/modules/enums/enums.service.ts

@@ -1,7 +1,6 @@
 import translates from '@/common/constants/translates/translates'
 import { translateEnumValue } from '@/common/utils/enum-translator.util'
 import {
-  AccountRole,
   AccountStatus,
   AccountType,
   ApplicationPlatform,
@@ -14,8 +13,7 @@ import {
   ConsumerType,
   CustomerType,
   GoodPricingModel,
-  LicenseStatus,
-  LicenseType,
+  InvoiceTemplateType,
   PartnerRole,
   PartnerStatus,
   PaymentMethodType,
@@ -23,19 +21,13 @@ import {
   POSStatus,
   POSType,
   ProviderRole,
-  ProviderStatus,
   SKUGuildType,
-  TokenType,
-  TspProviderCustomerType,
   TspProviderRequestType,
   TspProviderResponseStatus,
   TspProviderType,
-  UnitType,
-  UserStatus,
-  UserType,
 } from '@/generated/prisma/enums'
 import { Injectable } from '@nestjs/common'
-import { GoldKarat } from 'common/enums/enums'
+import { GoldKarat, TspProviderCustomerType } from 'common/enums/enums'
 import { ResponseMapper } from 'common/response/response-mapper'
 
 @Injectable()
@@ -57,23 +49,15 @@ export class EnumsService {
     return {
       PaymentMethodType: this.prepareData(PaymentMethodType, 'PaymentMethodType'),
       GoldKarat: this.prepareData(GoldKarat, 'GoldKarat'),
-      UserStatus: this.prepareData(UserStatus, 'UserStatus'),
-      AccountRole: this.prepareData(AccountRole, 'AccountRole'),
       AccountStatus: this.prepareData(AccountStatus, 'AccountStatus'),
       POSStatus: this.prepareData(POSStatus, 'POSStatus'),
       POSRole: this.prepareData(POSRole, 'POSRole'),
-      LicenseType: this.prepareData(LicenseType, 'LicenseType'),
-      LicenseStatus: this.prepareData(LicenseStatus, 'LicenseStatus'),
       POSType: this.prepareData(POSType, 'POSType'),
-      UserType: this.prepareData(UserType, 'UserType'),
       AccountType: this.prepareData(AccountType, 'AccountType'),
       PartnerRole: this.prepareData(PartnerRole, 'PartnerRole'),
       BusinessRole: this.prepareData(BusinessRole, 'BusinessRole'),
       ComplexRole: this.prepareData(ComplexRole, 'ComplexRole'),
       ProviderRole: this.prepareData(ProviderRole, 'ProviderRole'),
-      ProviderStatus: this.prepareData(ProviderStatus, 'ProviderStatus'),
-      TokenType: this.prepareData(TokenType, 'TokenType'),
-      UnitType: this.prepareData(UnitType, 'UnitType'),
       GoodPricingModel: this.prepareData(GoodPricingModel, 'GoodPricingModel'),
       ConsumerRole: this.prepareData(ConsumerRole, 'ConsumerRole'),
       ConsumerStatus: this.prepareData(ConsumerStatus, 'ConsumerStatus'),
@@ -103,10 +87,11 @@ export class EnumsService {
         'TspProviderCustomerType',
       ),
       SKUGuildType: this.prepareData(SKUGuildType, 'SKUGuildType'),
+      InvoiceTemplateType: this.prepareData(InvoiceTemplateType, 'InvoiceTemplateType'),
     }
   }
 
-  getEnumValues(enumName: string) {
+  getEnumValues(enumName: keyof typeof translates.enums) {
     const enums = this.getAllEnums()
     return ResponseMapper.list(enums[enumName] || [])
   }

src/modules/partners/consumers/consumers.service.ts

@@ -210,10 +210,14 @@ export class PartnerConsumersService {
         }
 
         if (existingConsumer) {
-          ;`مشتری با نام ${existingConsumer.individual!.first_name} ${existingConsumer.individual!.last_name} یا این کد ملی، از قبل توسط شما ایجاد شده است.`
+          consumerExistError = `مشتری با نام ${existingConsumer.individual!.first_name} ${existingConsumer.individual!.last_name} یا این کد ملی، از قبل توسط شما ایجاد شده است.`
         }
       }
 
+      if (consumerExistError) {
+        throw new BadRequestException(consumerExistError)
+      }
+
       return await tx.consumer.create({
         data: createConsumerData,
         select: this.defaultSelect,

src/modules/partners/consumers/licenses/dto/license.dto.ts

@@ -1,6 +1,5 @@
-import { LicenseStatus } from '@/generated/prisma/enums'
 import { ApiProperty, PartialType } from '@nestjs/swagger'
-import { IsDateString, IsEnum } from 'class-validator'
+import { IsDateString } from 'class-validator'
 
 export class CreateLicenseDto {
   @ApiProperty({ required: true, default: new Date().toISOString() })
@@ -24,8 +23,4 @@ export class CreateLicenseDto {
   partner_id: string
 }
 
-export class UpdateLicenseDto extends PartialType(CreateLicenseDto) {
-  @ApiProperty({ enum: LicenseStatus })
-  @IsEnum(LicenseStatus)
-  status?: LicenseStatus
-}
+export class UpdateLicenseDto extends PartialType(CreateLicenseDto) {}

src/modules/pos/goods/dto/create-good.dto.ts

@@ -1,4 +1,4 @@
-import { GoodPricingModel, UnitType } from '@/generated/prisma/enums'
+import { GoodPricingModel } from '@/generated/prisma/enums'
 import { ApiProperty, PartialType } from '@nestjs/swagger'
 import { IsEnum, IsNumber, IsOptional, IsString } from 'class-validator'
 
@@ -20,10 +20,6 @@ export class CreateGoodDto {
   @ApiProperty()
   local_sku: string
 
-  @IsEnum(UnitType)
-  @ApiProperty({ required: true, enum: UnitType })
-  unit_type: UnitType
-
   @IsEnum(GoodPricingModel)
   @ApiProperty({ required: true, enum: GoodPricingModel })
   pricing_model: GoodPricingModel

src/modules/tspProviders/dto/provider-switch.dto.ts

@@ -1,3 +1,4 @@
+import { TspProviderCustomerType } from '@/common/enums/enums'
 import {
   SharedCreateSalesInvoiceItemDto,
   SharedCreateSalesInvoicePaymentsDto,
@@ -6,7 +7,6 @@ import {
   CustomerType,
   InvoiceTemplateType,
   PaymentMethodType,
-  TspProviderCustomerType,
   TspProviderRequestType,
   TspProviderResponseStatus,
   TspProviderType,

src/modules/tspProviders/sales-invoice-tsp.service.ts

@@ -1,10 +1,10 @@
 import { SharedSaleInvoiceCreateService } from '@/common/services/saleInvoices/sale-invoice-create.service'
 import { PrismaService } from '@/prisma/prisma.service'
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common'
+import { TspProviderCustomerType } from 'common/enums/enums'
 import {
   CustomerType,
   Prisma,
-  TspProviderCustomerType,
   TspProviderRequestType,
   TspProviderResponseStatus,
 } from 'generated/prisma/client'
@@ -12,7 +12,6 @@ import {
   TspProviderActionResponseDto,
   TspProviderCorrectionInvoicePayloadDto,
   TspProviderCorrectionSendPayloadDto,
-  TspProviderCorrectionSendResponseDto,
   TspProviderOriginalSendPayloadDto,
   TspProviderRevokePayloadDto,
   TspProviderSendItemResultDto,
@@ -37,9 +36,12 @@ export class SalesInvoiceTspService {
     invoice_id: string,
   ): Promise<TspProviderActionResponseDto> {
     const payload = await this.buildPayload(invoice_id, posId)
+
+    const attemptNumber = await this.getOriginalResendAttemptNumber(invoice_id)
+
     const attempt = await this.prisma.saleInvoiceTspAttempts.create({
       data: {
-        attempt_no: 1,
+        attempt_no: attemptNumber,
         invoice_id,
         status: TspProviderResponseStatus.QUEUED,
         request_payload: JSON.parse(JSON.stringify(payload)),
@@ -49,7 +51,7 @@ export class SalesInvoiceTspService {
 
     const result = await this.trySend(payload)
 
-    return await this.onCreateCorrectionResult(result, attempt.id)
+    return await this.onResult(result, attempt.id)
   }
 
   async sendBulk(consumer_id: string, invoice_ids: string[]): Promise<void> {
@@ -259,7 +261,7 @@ export class SalesInvoiceTspService {
 
     console.log('sendResult')
     console.log(result)
-    return this.onCreateCorrectionResult(result, attempt.id)
+    return this.onResult(result, attempt.id)
 
     // const countByGoodId = (goodIds: string[]): Map<string, number> => {
     //   const counts = new Map<string, number>()
@@ -444,83 +446,46 @@ export class SalesInvoiceTspService {
 
     const result = await this.tspSwitchService.revoke(revokePayload)
 
-    return await this.onCreateCorrectionResult(result, attempt.id)
+    return await this.onResult(result, attempt.id)
   }
 
-  private async getPosId(
-    consumer_account_id: string,
-    invoice_id: string,
-  ): Promise<string> {
-    const now = new Date()
-    console.log(consumer_account_id, invoice_id)
-    const saleInvoice = await this.prisma.salesInvoice.findUnique({
+  private async getOriginalResendAttemptNumber(invoice_id: string): Promise<number> {
+    let attemptNumber = 1
+
+    const existingAttempt = await this.prisma.saleInvoiceTspAttempts.findFirst({
       where: {
-        id: invoice_id,
-        pos: {
-          complex: {
-            business_activity: {
-              consumer: {
-                accounts: {
-                  some: {
-                    id: consumer_account_id,
-                  },
-                },
-              },
-            },
-          },
-        },
+        invoice_id,
       },
-      select: {
-        pos: {
+      include: {
+        invoice: {
           select: {
-            id: true,
-            complex: {
-              select: {
-                business_activity: {
-                  select: {
-                    name: true,
-                    license_activation: {
-                      select: {
-                        expires_at: true,
-                        license_renews: {
-                          select: {
-                            expires_at: true,
-                          },
-                        },
-                      },
-                    },
-                  },
-                },
-              },
-            },
+            type: true,
           },
         },
       },
     })
 
-    if (!saleInvoice) {
-      throw new NotFoundException('متاسفانه فاکتور مورد نظر یافت نشد.')
-    }
+    if (existingAttempt) {
+      attemptNumber = existingAttempt.attempt_no + 1
+      if (existingAttempt.invoice.type !== TspProviderRequestType.ORIGINAL) {
+        throw new BadRequestException(
+          'فقط فاکتورهای اصلی قابل ارسال مجدد به سامانه مالیاتی هستند.',
+        )
+      }
 
-    const { license_activation, name: businessName } =
-      saleInvoice.pos.complex.business_activity
-    let expired = !license_activation || false
-    if (license_activation) {
-      const { expires_at, license_renews } = license_activation
-      if (expires_at < now) {
-        for (const renew of license_renews) {
-          if (renew.expires_at > now) {
-            expired = false
-            break
-          }
-        }
+      if (existingAttempt.status === TspProviderResponseStatus.SUCCESS) {
+        throw new BadRequestException(
+          'فاکتور تایید شده از طرف سازمان مالیاتی قابل ارسال مجدد نیست.',
+        )
+      }
+      if (existingAttempt.status === TspProviderResponseStatus.QUEUED) {
+        throw new BadRequestException(
+          'در حال حاضر فاکتور شما در حال بررسی توسط سازمان مالیاتی است.',
+        )
       }
     }
-    if (expired) {
-      throw new NotFoundException(`متاسفانه مجوز ${businessName} منقضی شده است.`)
-    }
 
-    return saleInvoice.pos.id
+    return attemptNumber
   }
 
   private async buildRevokePayload(
@@ -732,8 +697,8 @@ export class SalesInvoiceTspService {
       invoice_date: new Date(),
 
       customer_type: invoice.customer?.type
-        ? TspProviderCustomerType.Known
-        : TspProviderCustomerType.Unknown,
+        ? TspProviderCustomerType.KNOWN
+        : TspProviderCustomerType.UNKNOWN,
       customer: invoice.customer?.type
         ? {
             type: invoice.customer.type,
@@ -881,8 +846,8 @@ export class SalesInvoiceTspService {
       type: TspProviderRequestType.ORIGINAL,
       tsp_provider: partner.tsp_provider!,
       customer_type: invoice.customer?.type
-        ? TspProviderCustomerType.Known
-        : TspProviderCustomerType.Unknown,
+        ? TspProviderCustomerType.KNOWN
+        : TspProviderCustomerType.UNKNOWN,
       customer: invoice.customer?.type
         ? {
             type: invoice.customer.type,
@@ -907,14 +872,6 @@ export class SalesInvoiceTspService {
     }
   }
 
-  private async tryCorrection(
-    payload: TspProviderCorrectionSendPayloadDto,
-  ): Promise<TspProviderCorrectionSendResponseDto | null> {
-    const taxResult = await this.tspSwitchService.correction(payload)
-
-    return taxResult || null
-  }
-
   private async trySend(
     payload: TspProviderOriginalSendPayloadDto,
   ): Promise<TspProviderSendItemResultDto | null> {
@@ -923,7 +880,7 @@ export class SalesInvoiceTspService {
     return taxResult || null
   }
 
-  private async onCreateCorrectionResult(
+  private async onResult(
     result: any,
     attempt_id: string,
   ): Promise<TspProviderActionResponseDto> {
@@ -960,7 +917,8 @@ export class SalesInvoiceTspService {
           status: result.status,
           sent_at: result.sent_at,
           received_at: result.received_at,
-          message: 'ارسال با موفقیت انجام شد.',
+          message:
+            result.message?.toString() || 'فاکتور با موفقیت به سامانه مالیاتی ارسال شد.',
         },
         select: {
           status: true,
@@ -981,5 +939,3 @@ export class SalesInvoiceTspService {
     }
   }
 }
-
-// {"type": "ORIGINAL", "items": [{"sku": "2720000044726", "good_id": "01KQHY48M299C9BG2D06DMWK4E", "payload": {"karat": "18", "wages": 40000000, "profit": 48000000, "commission": 40000000}, "sku_vat": "0", "discount": "0", "quantity": 2, "service_id": null, "unit_price": 200000000, "measure_unit": "63", "total_amount": 540800000, "good_snapshot": {"good": {"id": "01KQHY48M299C9BG2D06DMWK4E", "sku": {"id": "01KQHXE2D4XEFSDK4DSV2J6GT2", "VAT": "0", "code": "2720000044726", "name": "گوشواره طلا زیورالات ساخته شده از طلا"}, "name": "گوشواره", "barcode": null, "category": {"id": "01KQHY48CF6X2TK2AG09MKDVKQ", "name": "زیورآلات"}, "image_url": null, "local_sku": null, "measure_unit": {"id": "01KQHY489HE02787SE8TWDE18S", "code": "63", "name": "گرم"}, "pricing_model": "GOLD", "base_sale_price": "0"}}, "invoice_item_id": "01KQMZTMDC4M4T7VE9GFZJEW4E"}], "payments": [{"amount": 540800000, "paid_at": "2026-05-02T18:39:46.000Z", "payment_method": "CASH"}], "fiscal_id": "A296T3", "tsp_token": "pfFE6QxOJxUIhzkpUCPWYMR5", "invoice_id": "98c3377d-4e42-4703-97f0-38c3b3c8e87f", "invoice_date": "2026-05-02T18:39:46.000Z", "total_amount": 540800000, "tsp_provider": "NAMA", "customer_type": "Unknown", "economic_code": "14003579468", "invoice_number": 13, "invoice_template": "GOLD_JEWELRY"}

src/modules/tspProviders/switch/nama/nama-provider.util.ts

@@ -1,8 +1,8 @@
+import { TspProviderCustomerType } from '@/common/enums/enums'
 import {
   CustomerType,
   InvoiceTemplateType,
   PaymentMethodType,
-  TspProviderCustomerType,
   TspProviderRequestType,
   TspProviderResponseStatus,
 } from '@/generated/prisma/enums'
@@ -23,6 +23,8 @@ import {
 
 export class NamaProviderUtils {
   mapResponseStatus(status: NamaProviderResponseStatus): TspProviderResponseStatus {
+    console.log('NAMA status', status)
+
     switch (status.toUpperCase()) {
       case NamaProviderResponseStatus.SUCCESS:
       case NamaProviderResponseStatus.POSTED:
@@ -161,9 +163,9 @@ export class NamaProviderUtils {
 
   private mapTspProviderCustomerType(type?: TspProviderCustomerType) {
     switch (type) {
-      case TspProviderCustomerType.Known:
+      case TspProviderCustomerType.KNOWN:
         return '1'
-      case TspProviderCustomerType.Unknown:
+      case TspProviderCustomerType.UNKNOWN:
         return '2'
       default:
         return '3'