updating

src/modules/admin/admin.middleware.ts

@@ -4,9 +4,6 @@ import { NextFunction, Request, Response } from 'express'
 @Injectable()
 export class AdminMiddleware implements NestMiddleware {
   use(req: Request, _res: Response, next: NextFunction) {
-    console.log('first')
-    // @ts-ignore
-    console.log(req.dataPayload)
     // const a = reqTokenPayload()
     // console.log(a)
 

src/modules/admin/guilds/goods/dto/create-good.dto.ts

@@ -1,7 +1,8 @@
+import { GoodPricingModel, UnitType } from '@/generated/prisma/enums'
 import { ApiProperty, PartialType } from '@nestjs/swagger'
-import { IsNumber, IsOptional, IsString } from 'class-validator'
+import { IsEnum, IsOptional, IsString } from 'class-validator'
 
-export class CreateGoodDto {
+export class CreateGuildGoodDto {
   @IsString()
   @ApiProperty()
   name: string
@@ -10,30 +11,22 @@ export class CreateGoodDto {
   @ApiProperty()
   sku: string
 
-  @IsOptional()
   @IsString()
   @ApiProperty({ required: true })
   category_id: string
 
-  @IsString()
-  @IsOptional()
-  @ApiProperty({ required: false })
-  local_sku?: string
+  @IsEnum(UnitType)
+  @ApiProperty({ required: true, enum: UnitType })
+  unit_type: UnitType
 
-  @IsOptional()
-  @IsString()
-  @ApiProperty({ required: false })
-  barcode?: string
+  @IsEnum(GoodPricingModel)
+  @ApiProperty({ required: true, enum: GoodPricingModel })
+  pricing_model: GoodPricingModel
 
   @IsOptional()
   @IsString()
   @ApiProperty({ required: false })
   description?: string
-
-  @IsOptional()
-  @IsNumber()
-  @ApiProperty({ required: false })
-  base_sale_price?: number
 }
 
-export class UpdateGoodDto extends PartialType(CreateGoodDto) {}
+export class UpdateGuildGoodDto extends PartialType(CreateGuildGoodDto) {}

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

@@ -1,5 +1,5 @@
 import { Body, Controller, Get, Param, Post } from '@nestjs/common'
-import { CreateGoodDto } from './dto/create-good.dto'
+import { CreateGuildGoodDto } from './dto/create-good.dto'
 import { GoodsService } from './goods.service'
 
 @Controller('admin/guilds/:guildId/goods')
@@ -17,7 +17,7 @@ export class GoodsController {
   }
 
   @Post()
-  create(@Param('guildId') guildId: string, @Body() data: CreateGoodDto) {
+  create(@Param('guildId') guildId: string, @Body() data: CreateGuildGoodDto) {
     return this.goodsService.create(guildId, data)
   }
 }

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

@@ -2,7 +2,7 @@ import { GoodOmit } from '@/generated/prisma/models'
 import { PrismaService } from '@/prisma/prisma.service'
 import { Injectable } from '@nestjs/common'
 import { ResponseMapper } from 'common/response/response-mapper'
-import { CreateGoodDto } from './dto/create-good.dto'
+import { CreateGuildGoodDto } from './dto/create-good.dto'
 
 @Injectable()
 export class GoodsService {
@@ -24,6 +24,14 @@ export class GoodsService {
           guild_id: guildId,
           is_default_guild_good: true,
         },
+        include: {
+          category: {
+            select: {
+              id: true,
+              name: true,
+            },
+          },
+        },
         omit: this.goodOmit,
       }),
       this.prisma.good.count(),
@@ -41,13 +49,22 @@ export class GoodsService {
         is_default_guild_good: true,
       },
 
+      include: {
+        category: {
+          select: {
+            id: true,
+            name: true,
+          },
+        },
+      },
+
       omit: this.goodOmit,
     })
 
     return ResponseMapper.single(good)
   }
 
-  async create(guild_id: string, data: CreateGoodDto) {
+  async create(guild_id: string, data: CreateGuildGoodDto) {
     const { category_id, ...rest } = data
 
     const good = await this.prisma.good.create({

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

@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Post, Put } from '@nestjs/common'
+import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
 import { ApiTags } from '@nestjs/swagger'
 import { CreateGuildDto } from './dto/create-guild.dto'
 import { UpdateGuildDto } from './dto/update-guild.dto'
@@ -24,7 +24,7 @@ export class GuildsController {
     return await this.guildsService.create(data)
   }
 
-  @Put(':id')
+  @Patch(':id')
   async update(@Param('id') id: string, @Body() data: UpdateGuildDto) {
     return await this.guildsService.update(id, data)
   }

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

@@ -1,7 +1,7 @@
 import { IsDateString, IsEnum, IsOptional, IsString } from 'class-validator'
 import { AccountStatus, LicenseStatus, POSType } from 'generated/prisma/enums'
 
-export class CreateLicenseDto {
+export class CreatePartnerLicenseDto {
   @IsString()
   first_name: string
 

src/modules/admin/partners/licenses/licenses.controller.ts

@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, Param, Post, Put } from '@nestjs/common'
-import { CreateLicenseDto, UpdateLicenseDto } from './dto/license.dto'
+import { CreatePartnerLicenseDto, UpdateLicenseDto } from './dto/license.dto'
 import { PartnerLicensesService } from './licenses.service'
 
 @Controller('admin/partners/:partnerId/licenses')
@@ -17,7 +17,10 @@ export class PartnerLicensesController {
   }
 
   @Post()
-  async create(@Param('partnerId') partnerId: string, @Body() data: CreateLicenseDto) {
+  async create(
+    @Param('partnerId') partnerId: string,
+    @Body() data: CreatePartnerLicenseDto,
+  ) {
     return this.licensesService.create(partnerId, data)
   }
 

src/modules/admin/partners/licenses/licenses.service.ts

@@ -1,7 +1,7 @@
 import { PrismaService } from '@/prisma/prisma.service'
 import { Injectable } from '@nestjs/common'
 import { ResponseMapper } from 'common/response/response-mapper'
-import { CreateLicenseDto, UpdateLicenseDto } from './dto/license.dto'
+import { CreatePartnerLicenseDto, UpdateLicenseDto } from './dto/license.dto'
 
 @Injectable()
 export class PartnerLicensesService {
@@ -105,7 +105,7 @@ export class PartnerLicensesService {
     return ResponseMapper.single(license)
   }
 
-  async create(partnerId: string, data: CreateLicenseDto) {
+  async create(partnerId: string, data: CreatePartnerLicenseDto) {
     // const license = await this.prisma.$transaction(async tx => {
     //   const user = await tx.user.upsert({
     //     where: {

src/modules/admin/providers/dto/provider.dto.ts

@@ -1,20 +1,15 @@
+import { ApiProperty } from '@nestjs/swagger'
 import { IsOptional, IsString } from 'class-validator'
 
 export class CreateProviderDto {
   @IsString()
+  @ApiProperty()
   name: string
 
   @IsOptional()
   @IsString()
+  @ApiProperty()
   code?: string
 }
 
-export class UpdateProviderDto {
-  @IsOptional()
-  @IsString()
-  name?: string
-
-  @IsOptional()
-  @IsString()
-  code?: string
-}
+export class UpdateProviderDto extends CreateProviderDto {}

src/modules/admin/providers/providers.controller.ts

@@ -3,7 +3,7 @@ import { ApiTags } from '@nestjs/swagger'
 import { CreateProviderDto, UpdateProviderDto } from './dto/provider.dto'
 import { ProvidersService } from './providers.service'
 
-@ApiTags('Admin Partners')
+@ApiTags('Admin Providers')
 @Controller('admin/providers')
 export class ProvidersController {
   constructor(private readonly providersService: ProvidersService) {}

src/modules/admin/translate/translate.service.ts

@@ -30,6 +30,7 @@ export class TranslateService {
         licenses: 'لایسنس',
         business_activity: 'فعالیت‌ اقتصادی',
         user: 'کاربر',
+        guild: 'صنف',
       },
       singular: {
         users: 'کاربر',

src/modules/admin/users/users.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, Param, Post, Put } from '@nestjs/common'
+import { Body, Controller, Delete, Get, Param, Patch, Post } from '@nestjs/common'
 import { CreateUserDto, UpdateUserDto } from './dto/user.dto'
 import { AdminUsersService } from './users.service'
 
@@ -21,7 +21,7 @@ export class AdminUsersController {
     return this.usersService.create(data as CreateUserDto)
   }
 
-  @Put(':id')
+  @Patch(':id')
   async update(@Param('id') id: string, @Body() data: any) {
     return this.usersService.update(id, data as UpdateUserDto)
   }

src/modules/admin/users/users.service.ts

@@ -1,5 +1,5 @@
 import { PrismaService } from '@/prisma/prisma.service'
-import { Injectable } from '@nestjs/common'
+import { Injectable, NotFoundException } from '@nestjs/common'
 import { ResponseMapper } from 'common/response/response-mapper'
 import { CreateUserDto, UpdateUserDto } from './dto/user.dto'
 
@@ -22,6 +22,10 @@ export class AdminUsersService {
     const user = await this.prisma.user.findUnique({
       where: { id },
     })
+
+    if (!user) {
+      throw new NotFoundException('کاربری یافت نشد')
+    }
     return ResponseMapper.single({
       ...user,
       fullname: `${user?.first_name} ${user?.last_name}`,
@@ -33,7 +37,7 @@ export class AdminUsersService {
   }
 
   async update(id: string, data: UpdateUserDto) {
-    return this.prisma.user.update({ where: { id }, data: data as UpdateUserDto })
+    return this.prisma.user.update({ where: { id }, data })
   }
 
   async delete(id: string) {