updating

prisma/migrations/20260310160733_init/migration.sql

@@ -0,0 +1,10 @@
+/*
+  Warnings:
+
+  - Added the required column `pricing_model` to the `goods` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `unit_type` to the `goods` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE `goods` ADD COLUMN `pricing_model` ENUM('STANDARD', 'GOLD') NOT NULL,
+    ADD COLUMN `unit_type` ENUM('COUNT', 'GRAM', 'KILOGRAM', 'MILLILITER', 'LITER', 'METER', 'HOUR') NOT NULL;

prisma/migrations/20260311090111_init/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `accounts` MODIFY `type` ENUM('PARTNER', 'BUSINESS', 'SUPER_ADMIN', 'ADMIN', 'PROVIDER', 'POS') NOT NULL;

prisma/schema/shared/enum.prisma

@@ -93,6 +93,7 @@ enum UserType {
 enum AccountType {
   PARTNER
   BUSINESS
+  SUPER_ADMIN
   ADMIN
   PROVIDER
   POS

prisma/schema/shared/good.prisma

@@ -1,15 +1,17 @@
 model Good {
-  id                    String    @id @default(uuid())
-  name                  String    @db.VarChar(255)
-  description           String?   @db.Text
-  sku                   String    @db.VarChar(100)
-  local_sku             String?   @unique() @db.VarChar(100)
-  barcode               String?   @unique() @db.VarChar(100)
-  base_sale_price       Decimal?  @default(0.00) @db.Decimal(15, 0)
-  is_default_guild_good Boolean   @default(false)
-  created_at            DateTime  @default(now()) @db.Timestamp(0)
-  updated_at            DateTime  @updatedAt @db.Timestamp(0)
-  deleted_at            DateTime? @db.Timestamp(0)
+  id                    String           @id @default(uuid())
+  name                  String           @db.VarChar(255)
+  is_default_guild_good Boolean          @default(false)
+  sku                   String           @db.VarChar(100)
+  unit_type             UnitType
+  pricing_model         GoodPricingModel
+  description           String?          @db.Text
+  local_sku             String?          @unique() @db.VarChar(100)
+  barcode               String?          @unique() @db.VarChar(100)
+  base_sale_price       Decimal?         @default(0.00) @db.Decimal(15, 0)
+  created_at            DateTime         @default(now()) @db.Timestamp(0)
+  updated_at            DateTime         @updatedAt @db.Timestamp(0)
+  deleted_at            DateTime?        @db.Timestamp(0)
 
   complex_id  String?
   category_id String?

src/common/guards/jwt-auth.guard.ts

@@ -17,8 +17,6 @@ export class JwtAuthGuard implements CanActivate {
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
-    console.log('asd')
-
     const isPublic = this.reflector.getAllAndOverride<boolean>(IS_PUBLIC_KEY, [
       context.getHandler(),
       context.getClass(),

src/common/utils/jwt-user.util.ts

@@ -21,7 +21,6 @@ export function getAccountIdFromJwt(req: Request, jwtService: JwtService): strin
   // const token = authHeader.replace('Bearer ', '')
   try {
     const payload = jwtService.decode(token) as AccessTokenPayload
-    console.log(payload)
 
     return payload?.account_id || null
   } catch {

src/generated/prisma/commonInputTypes.ts

@@ -307,6 +307,20 @@ export type BoolNullableWithAggregatesFilter<$PrismaModel = never> = {
   _max?: Prisma.NestedBoolNullableFilter<$PrismaModel>
 }
 
+export type EnumUnitTypeFilter<$PrismaModel = never> = {
+  equals?: $Enums.UnitType | Prisma.EnumUnitTypeFieldRefInput<$PrismaModel>
+  in?: $Enums.UnitType[]
+  notIn?: $Enums.UnitType[]
+  not?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel> | $Enums.UnitType
+}
+
+export type EnumGoodPricingModelFilter<$PrismaModel = never> = {
+  equals?: $Enums.GoodPricingModel | Prisma.EnumGoodPricingModelFieldRefInput<$PrismaModel>
+  in?: $Enums.GoodPricingModel[]
+  notIn?: $Enums.GoodPricingModel[]
+  not?: Prisma.NestedEnumGoodPricingModelFilter<$PrismaModel> | $Enums.GoodPricingModel
+}
+
 export type DecimalNullableFilter<$PrismaModel = never> = {
   equals?: runtime.Decimal | runtime.DecimalJsLike | number | string | Prisma.DecimalFieldRefInput<$PrismaModel> | null
   in?: runtime.Decimal[] | runtime.DecimalJsLike[] | number[] | string[] | null
@@ -318,6 +332,26 @@ export type DecimalNullableFilter<$PrismaModel = never> = {
   not?: Prisma.NestedDecimalNullableFilter<$PrismaModel> | runtime.Decimal | runtime.DecimalJsLike | number | string | null
 }
 
+export type EnumUnitTypeWithAggregatesFilter<$PrismaModel = never> = {
+  equals?: $Enums.UnitType | Prisma.EnumUnitTypeFieldRefInput<$PrismaModel>
+  in?: $Enums.UnitType[]
+  notIn?: $Enums.UnitType[]
+  not?: Prisma.NestedEnumUnitTypeWithAggregatesFilter<$PrismaModel> | $Enums.UnitType
+  _count?: Prisma.NestedIntFilter<$PrismaModel>
+  _min?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel>
+  _max?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel>
+}
+
+export type EnumGoodPricingModelWithAggregatesFilter<$PrismaModel = never> = {
+  equals?: $Enums.GoodPricingModel | Prisma.EnumGoodPricingModelFieldRefInput<$PrismaModel>
+  in?: $Enums.GoodPricingModel[]
+  notIn?: $Enums.GoodPricingModel[]
+  not?: Prisma.NestedEnumGoodPricingModelWithAggregatesFilter<$PrismaModel> | $Enums.GoodPricingModel
+  _count?: Prisma.NestedIntFilter<$PrismaModel>
+  _min?: Prisma.NestedEnumGoodPricingModelFilter<$PrismaModel>
+  _max?: Prisma.NestedEnumGoodPricingModelFilter<$PrismaModel>
+}
+
 export type DecimalNullableWithAggregatesFilter<$PrismaModel = never> = {
   equals?: runtime.Decimal | runtime.DecimalJsLike | number | string | Prisma.DecimalFieldRefInput<$PrismaModel> | null
   in?: runtime.Decimal[] | runtime.DecimalJsLike[] | number[] | string[] | null
@@ -412,23 +446,6 @@ export type JsonNullableWithAggregatesFilterBase<$PrismaModel = never> = {
   _max?: Prisma.NestedJsonNullableFilter<$PrismaModel>
 }
 
-export type EnumUnitTypeFilter<$PrismaModel = never> = {
-  equals?: $Enums.UnitType | Prisma.EnumUnitTypeFieldRefInput<$PrismaModel>
-  in?: $Enums.UnitType[]
-  notIn?: $Enums.UnitType[]
-  not?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel> | $Enums.UnitType
-}
-
-export type EnumUnitTypeWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.UnitType | Prisma.EnumUnitTypeFieldRefInput<$PrismaModel>
-  in?: $Enums.UnitType[]
-  notIn?: $Enums.UnitType[]
-  not?: Prisma.NestedEnumUnitTypeWithAggregatesFilter<$PrismaModel> | $Enums.UnitType
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel>
-}
-
 export type EnumPaymentMethodTypeFilter<$PrismaModel = never> = {
   equals?: $Enums.PaymentMethodType | Prisma.EnumPaymentMethodTypeFieldRefInput<$PrismaModel>
   in?: $Enums.PaymentMethodType[]
@@ -756,6 +773,20 @@ export type NestedBoolNullableWithAggregatesFilter<$PrismaModel = never> = {
   _max?: Prisma.NestedBoolNullableFilter<$PrismaModel>
 }
 
+export type NestedEnumUnitTypeFilter<$PrismaModel = never> = {
+  equals?: $Enums.UnitType | Prisma.EnumUnitTypeFieldRefInput<$PrismaModel>
+  in?: $Enums.UnitType[]
+  notIn?: $Enums.UnitType[]
+  not?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel> | $Enums.UnitType
+}
+
+export type NestedEnumGoodPricingModelFilter<$PrismaModel = never> = {
+  equals?: $Enums.GoodPricingModel | Prisma.EnumGoodPricingModelFieldRefInput<$PrismaModel>
+  in?: $Enums.GoodPricingModel[]
+  notIn?: $Enums.GoodPricingModel[]
+  not?: Prisma.NestedEnumGoodPricingModelFilter<$PrismaModel> | $Enums.GoodPricingModel
+}
+
 export type NestedDecimalNullableFilter<$PrismaModel = never> = {
   equals?: runtime.Decimal | runtime.DecimalJsLike | number | string | Prisma.DecimalFieldRefInput<$PrismaModel> | null
   in?: runtime.Decimal[] | runtime.DecimalJsLike[] | number[] | string[] | null
@@ -767,6 +798,26 @@ export type NestedDecimalNullableFilter<$PrismaModel = never> = {
   not?: Prisma.NestedDecimalNullableFilter<$PrismaModel> | runtime.Decimal | runtime.DecimalJsLike | number | string | null
 }
 
+export type NestedEnumUnitTypeWithAggregatesFilter<$PrismaModel = never> = {
+  equals?: $Enums.UnitType | Prisma.EnumUnitTypeFieldRefInput<$PrismaModel>
+  in?: $Enums.UnitType[]
+  notIn?: $Enums.UnitType[]
+  not?: Prisma.NestedEnumUnitTypeWithAggregatesFilter<$PrismaModel> | $Enums.UnitType
+  _count?: Prisma.NestedIntFilter<$PrismaModel>
+  _min?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel>
+  _max?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel>
+}
+
+export type NestedEnumGoodPricingModelWithAggregatesFilter<$PrismaModel = never> = {
+  equals?: $Enums.GoodPricingModel | Prisma.EnumGoodPricingModelFieldRefInput<$PrismaModel>
+  in?: $Enums.GoodPricingModel[]
+  notIn?: $Enums.GoodPricingModel[]
+  not?: Prisma.NestedEnumGoodPricingModelWithAggregatesFilter<$PrismaModel> | $Enums.GoodPricingModel
+  _count?: Prisma.NestedIntFilter<$PrismaModel>
+  _min?: Prisma.NestedEnumGoodPricingModelFilter<$PrismaModel>
+  _max?: Prisma.NestedEnumGoodPricingModelFilter<$PrismaModel>
+}
+
 export type NestedDecimalNullableWithAggregatesFilter<$PrismaModel = never> = {
   equals?: runtime.Decimal | runtime.DecimalJsLike | number | string | Prisma.DecimalFieldRefInput<$PrismaModel> | null
   in?: runtime.Decimal[] | runtime.DecimalJsLike[] | number[] | string[] | null
@@ -834,23 +885,6 @@ export type NestedJsonNullableFilterBase<$PrismaModel = never> = {
   not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
 }
 
-export type NestedEnumUnitTypeFilter<$PrismaModel = never> = {
-  equals?: $Enums.UnitType | Prisma.EnumUnitTypeFieldRefInput<$PrismaModel>
-  in?: $Enums.UnitType[]
-  notIn?: $Enums.UnitType[]
-  not?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel> | $Enums.UnitType
-}
-
-export type NestedEnumUnitTypeWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.UnitType | Prisma.EnumUnitTypeFieldRefInput<$PrismaModel>
-  in?: $Enums.UnitType[]
-  notIn?: $Enums.UnitType[]
-  not?: Prisma.NestedEnumUnitTypeWithAggregatesFilter<$PrismaModel> | $Enums.UnitType
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumUnitTypeFilter<$PrismaModel>
-}
-
 export type NestedEnumPaymentMethodTypeFilter<$PrismaModel = never> = {
   equals?: $Enums.PaymentMethodType | Prisma.EnumPaymentMethodTypeFieldRefInput<$PrismaModel>
   in?: $Enums.PaymentMethodType[]

src/generated/prisma/enums.ts

@@ -149,6 +149,7 @@ export type UserType = (typeof UserType)[keyof typeof UserType]
 export const AccountType = {
   PARTNER: 'PARTNER',
   BUSINESS: 'BUSINESS',
+  SUPER_ADMIN: 'SUPER_ADMIN',
   ADMIN: 'ADMIN',
   PROVIDER: 'PROVIDER',
   POS: 'POS'

src/generated/prisma/internal/prismaNamespace.ts

@@ -2339,12 +2339,14 @@ export type CustomerLegalScalarFieldEnum = (typeof CustomerLegalScalarFieldEnum)
 export const GoodScalarFieldEnum = {
   id: 'id',
   name: 'name',
-  description: 'description',
+  is_default_guild_good: 'is_default_guild_good',
   sku: 'sku',
+  unit_type: 'unit_type',
+  pricing_model: 'pricing_model',
+  description: 'description',
   local_sku: 'local_sku',
   barcode: 'barcode',
   base_sale_price: 'base_sale_price',
-  is_default_guild_good: 'is_default_guild_good',
   created_at: 'created_at',
   updated_at: 'updated_at',
   deleted_at: 'deleted_at',
@@ -2670,8 +2672,8 @@ export type CustomerLegalOrderByRelevanceFieldEnum = (typeof CustomerLegalOrderB
 export const GoodOrderByRelevanceFieldEnum = {
   id: 'id',
   name: 'name',
-  description: 'description',
   sku: 'sku',
+  description: 'description',
   local_sku: 'local_sku',
   barcode: 'barcode',
   complex_id: 'complex_id',
@@ -2852,6 +2854,20 @@ export type EnumCustomerTypeFieldRefInput<$PrismaModel> = FieldRefInputType<$Pri
     
 
 
+/**
+ * Reference to a field of type 'UnitType'
+ */
+export type EnumUnitTypeFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'UnitType'>
+    
+
+
+/**
+ * Reference to a field of type 'GoodPricingModel'
+ */
+export type EnumGoodPricingModelFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'GoodPricingModel'>
+    
+
+
 /**
  * Reference to a field of type 'Decimal'
  */
@@ -2873,13 +2889,6 @@ export type EnumQueryModeFieldRefInput<$PrismaModel> = FieldRefInputType<$Prisma
     
 
 
-/**
- * Reference to a field of type 'UnitType'
- */
-export type EnumUnitTypeFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'UnitType'>
-    
-
-
 /**
  * Reference to a field of type 'PaymentMethodType'
  */

src/generated/prisma/internal/prismaNamespaceBrowser.ts

@@ -316,12 +316,14 @@ export type CustomerLegalScalarFieldEnum = (typeof CustomerLegalScalarFieldEnum)
 export const GoodScalarFieldEnum = {
   id: 'id',
   name: 'name',
-  description: 'description',
+  is_default_guild_good: 'is_default_guild_good',
   sku: 'sku',
+  unit_type: 'unit_type',
+  pricing_model: 'pricing_model',
+  description: 'description',
   local_sku: 'local_sku',
   barcode: 'barcode',
   base_sale_price: 'base_sale_price',
-  is_default_guild_good: 'is_default_guild_good',
   created_at: 'created_at',
   updated_at: 'updated_at',
   deleted_at: 'deleted_at',
@@ -647,8 +649,8 @@ export type CustomerLegalOrderByRelevanceFieldEnum = (typeof CustomerLegalOrderB
 export const GoodOrderByRelevanceFieldEnum = {
   id: 'id',
   name: 'name',
-  description: 'description',
   sku: 'sku',
+  description: 'description',
   local_sku: 'local_sku',
   barcode: 'barcode',
   complex_id: 'complex_id',

src/generated/prisma/models/Good.ts

@@ -37,12 +37,14 @@ export type GoodSumAggregateOutputType = {
 export type GoodMinAggregateOutputType = {
   id: string | null
   name: string | null
-  description: string | null
+  is_default_guild_good: boolean | null
   sku: string | null
+  unit_type: $Enums.UnitType | null
+  pricing_model: $Enums.GoodPricingModel | null
+  description: string | null
   local_sku: string | null
   barcode: string | null
   base_sale_price: runtime.Decimal | null
-  is_default_guild_good: boolean | null
   created_at: Date | null
   updated_at: Date | null
   deleted_at: Date | null
@@ -54,12 +56,14 @@ export type GoodMinAggregateOutputType = {
 export type GoodMaxAggregateOutputType = {
   id: string | null
   name: string | null
-  description: string | null
+  is_default_guild_good: boolean | null
   sku: string | null
+  unit_type: $Enums.UnitType | null
+  pricing_model: $Enums.GoodPricingModel | null
+  description: string | null
   local_sku: string | null
   barcode: string | null
   base_sale_price: runtime.Decimal | null
-  is_default_guild_good: boolean | null
   created_at: Date | null
   updated_at: Date | null
   deleted_at: Date | null
@@ -71,12 +75,14 @@ export type GoodMaxAggregateOutputType = {
 export type GoodCountAggregateOutputType = {
   id: number
   name: number
-  description: number
+  is_default_guild_good: number
   sku: number
+  unit_type: number
+  pricing_model: number
+  description: number
   local_sku: number
   barcode: number
   base_sale_price: number
-  is_default_guild_good: number
   created_at: number
   updated_at: number
   deleted_at: number
@@ -98,12 +104,14 @@ export type GoodSumAggregateInputType = {
 export type GoodMinAggregateInputType = {
   id?: true
   name?: true
-  description?: true
+  is_default_guild_good?: true
   sku?: true
+  unit_type?: true
+  pricing_model?: true
+  description?: true
   local_sku?: true
   barcode?: true
   base_sale_price?: true
-  is_default_guild_good?: true
   created_at?: true
   updated_at?: true
   deleted_at?: true
@@ -115,12 +123,14 @@ export type GoodMinAggregateInputType = {
 export type GoodMaxAggregateInputType = {
   id?: true
   name?: true
-  description?: true
+  is_default_guild_good?: true
   sku?: true
+  unit_type?: true
+  pricing_model?: true
+  description?: true
   local_sku?: true
   barcode?: true
   base_sale_price?: true
-  is_default_guild_good?: true
   created_at?: true
   updated_at?: true
   deleted_at?: true
@@ -132,12 +142,14 @@ export type GoodMaxAggregateInputType = {
 export type GoodCountAggregateInputType = {
   id?: true
   name?: true
-  description?: true
+  is_default_guild_good?: true
   sku?: true
+  unit_type?: true
+  pricing_model?: true
+  description?: true
   local_sku?: true
   barcode?: true
   base_sale_price?: true
-  is_default_guild_good?: true
   created_at?: true
   updated_at?: true
   deleted_at?: true
@@ -236,12 +248,14 @@ export type GoodGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArg
 export type GoodGroupByOutputType = {
   id: string
   name: string
-  description: string | null
+  is_default_guild_good: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description: string | null
   local_sku: string | null
   barcode: string | null
   base_sale_price: runtime.Decimal | null
-  is_default_guild_good: boolean
   created_at: Date
   updated_at: Date
   deleted_at: Date | null
@@ -276,12 +290,14 @@ export type GoodWhereInput = {
   NOT?: Prisma.GoodWhereInput | Prisma.GoodWhereInput[]
   id?: Prisma.StringFilter<"Good"> | string
   name?: Prisma.StringFilter<"Good"> | string
-  description?: Prisma.StringNullableFilter<"Good"> | string | null
+  is_default_guild_good?: Prisma.BoolFilter<"Good"> | boolean
   sku?: Prisma.StringFilter<"Good"> | string
+  unit_type?: Prisma.EnumUnitTypeFilter<"Good"> | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFilter<"Good"> | $Enums.GoodPricingModel
+  description?: Prisma.StringNullableFilter<"Good"> | string | null
   local_sku?: Prisma.StringNullableFilter<"Good"> | string | null
   barcode?: Prisma.StringNullableFilter<"Good"> | string | null
   base_sale_price?: Prisma.DecimalNullableFilter<"Good"> | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFilter<"Good"> | boolean
   created_at?: Prisma.DateTimeFilter<"Good"> | Date | string
   updated_at?: Prisma.DateTimeFilter<"Good"> | Date | string
   deleted_at?: Prisma.DateTimeNullableFilter<"Good"> | Date | string | null
@@ -297,12 +313,14 @@ export type GoodWhereInput = {
 export type GoodOrderByWithRelationInput = {
   id?: Prisma.SortOrder
   name?: Prisma.SortOrder
-  description?: Prisma.SortOrderInput | Prisma.SortOrder
+  is_default_guild_good?: Prisma.SortOrder
   sku?: Prisma.SortOrder
+  unit_type?: Prisma.SortOrder
+  pricing_model?: Prisma.SortOrder
+  description?: Prisma.SortOrderInput | Prisma.SortOrder
   local_sku?: Prisma.SortOrderInput | Prisma.SortOrder
   barcode?: Prisma.SortOrderInput | Prisma.SortOrder
   base_sale_price?: Prisma.SortOrderInput | Prisma.SortOrder
-  is_default_guild_good?: Prisma.SortOrder
   created_at?: Prisma.SortOrder
   updated_at?: Prisma.SortOrder
   deleted_at?: Prisma.SortOrderInput | Prisma.SortOrder
@@ -324,10 +342,12 @@ export type GoodWhereUniqueInput = Prisma.AtLeast<{
   OR?: Prisma.GoodWhereInput[]
   NOT?: Prisma.GoodWhereInput | Prisma.GoodWhereInput[]
   name?: Prisma.StringFilter<"Good"> | string
-  description?: Prisma.StringNullableFilter<"Good"> | string | null
-  sku?: Prisma.StringFilter<"Good"> | string
-  base_sale_price?: Prisma.DecimalNullableFilter<"Good"> | runtime.Decimal | runtime.DecimalJsLike | number | string | null
   is_default_guild_good?: Prisma.BoolFilter<"Good"> | boolean
+  sku?: Prisma.StringFilter<"Good"> | string
+  unit_type?: Prisma.EnumUnitTypeFilter<"Good"> | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFilter<"Good"> | $Enums.GoodPricingModel
+  description?: Prisma.StringNullableFilter<"Good"> | string | null
+  base_sale_price?: Prisma.DecimalNullableFilter<"Good"> | runtime.Decimal | runtime.DecimalJsLike | number | string | null
   created_at?: Prisma.DateTimeFilter<"Good"> | Date | string
   updated_at?: Prisma.DateTimeFilter<"Good"> | Date | string
   deleted_at?: Prisma.DateTimeNullableFilter<"Good"> | Date | string | null
@@ -343,12 +363,14 @@ export type GoodWhereUniqueInput = Prisma.AtLeast<{
 export type GoodOrderByWithAggregationInput = {
   id?: Prisma.SortOrder
   name?: Prisma.SortOrder
-  description?: Prisma.SortOrderInput | Prisma.SortOrder
+  is_default_guild_good?: Prisma.SortOrder
   sku?: Prisma.SortOrder
+  unit_type?: Prisma.SortOrder
+  pricing_model?: Prisma.SortOrder
+  description?: Prisma.SortOrderInput | Prisma.SortOrder
   local_sku?: Prisma.SortOrderInput | Prisma.SortOrder
   barcode?: Prisma.SortOrderInput | Prisma.SortOrder
   base_sale_price?: Prisma.SortOrderInput | Prisma.SortOrder
-  is_default_guild_good?: Prisma.SortOrder
   created_at?: Prisma.SortOrder
   updated_at?: Prisma.SortOrder
   deleted_at?: Prisma.SortOrderInput | Prisma.SortOrder
@@ -368,12 +390,14 @@ export type GoodScalarWhereWithAggregatesInput = {
   NOT?: Prisma.GoodScalarWhereWithAggregatesInput | Prisma.GoodScalarWhereWithAggregatesInput[]
   id?: Prisma.StringWithAggregatesFilter<"Good"> | string
   name?: Prisma.StringWithAggregatesFilter<"Good"> | string
-  description?: Prisma.StringNullableWithAggregatesFilter<"Good"> | string | null
+  is_default_guild_good?: Prisma.BoolWithAggregatesFilter<"Good"> | boolean
   sku?: Prisma.StringWithAggregatesFilter<"Good"> | string
+  unit_type?: Prisma.EnumUnitTypeWithAggregatesFilter<"Good"> | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelWithAggregatesFilter<"Good"> | $Enums.GoodPricingModel
+  description?: Prisma.StringNullableWithAggregatesFilter<"Good"> | string | null
   local_sku?: Prisma.StringNullableWithAggregatesFilter<"Good"> | string | null
   barcode?: Prisma.StringNullableWithAggregatesFilter<"Good"> | string | null
   base_sale_price?: Prisma.DecimalNullableWithAggregatesFilter<"Good"> | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolWithAggregatesFilter<"Good"> | boolean
   created_at?: Prisma.DateTimeWithAggregatesFilter<"Good"> | Date | string
   updated_at?: Prisma.DateTimeWithAggregatesFilter<"Good"> | Date | string
   deleted_at?: Prisma.DateTimeNullableWithAggregatesFilter<"Good"> | Date | string | null
@@ -385,12 +409,14 @@ export type GoodScalarWhereWithAggregatesInput = {
 export type GoodCreateInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -403,12 +429,14 @@ export type GoodCreateInput = {
 export type GoodUncheckedCreateInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -421,12 +449,14 @@ export type GoodUncheckedCreateInput = {
 export type GoodUpdateInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -439,12 +469,14 @@ export type GoodUpdateInput = {
 export type GoodUncheckedUpdateInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -457,12 +489,14 @@ export type GoodUncheckedUpdateInput = {
 export type GoodCreateManyInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -474,12 +508,14 @@ export type GoodCreateManyInput = {
 export type GoodUpdateManyMutationInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -488,12 +524,14 @@ export type GoodUpdateManyMutationInput = {
 export type GoodUncheckedUpdateManyInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -521,12 +559,14 @@ export type GoodOrderByRelevanceInput = {
 export type GoodCountOrderByAggregateInput = {
   id?: Prisma.SortOrder
   name?: Prisma.SortOrder
-  description?: Prisma.SortOrder
+  is_default_guild_good?: Prisma.SortOrder
   sku?: Prisma.SortOrder
+  unit_type?: Prisma.SortOrder
+  pricing_model?: Prisma.SortOrder
+  description?: Prisma.SortOrder
   local_sku?: Prisma.SortOrder
   barcode?: Prisma.SortOrder
   base_sale_price?: Prisma.SortOrder
-  is_default_guild_good?: Prisma.SortOrder
   created_at?: Prisma.SortOrder
   updated_at?: Prisma.SortOrder
   deleted_at?: Prisma.SortOrder
@@ -542,12 +582,14 @@ export type GoodAvgOrderByAggregateInput = {
 export type GoodMaxOrderByAggregateInput = {
   id?: Prisma.SortOrder
   name?: Prisma.SortOrder
-  description?: Prisma.SortOrder
+  is_default_guild_good?: Prisma.SortOrder
   sku?: Prisma.SortOrder
+  unit_type?: Prisma.SortOrder
+  pricing_model?: Prisma.SortOrder
+  description?: Prisma.SortOrder
   local_sku?: Prisma.SortOrder
   barcode?: Prisma.SortOrder
   base_sale_price?: Prisma.SortOrder
-  is_default_guild_good?: Prisma.SortOrder
   created_at?: Prisma.SortOrder
   updated_at?: Prisma.SortOrder
   deleted_at?: Prisma.SortOrder
@@ -559,12 +601,14 @@ export type GoodMaxOrderByAggregateInput = {
 export type GoodMinOrderByAggregateInput = {
   id?: Prisma.SortOrder
   name?: Prisma.SortOrder
-  description?: Prisma.SortOrder
+  is_default_guild_good?: Prisma.SortOrder
   sku?: Prisma.SortOrder
+  unit_type?: Prisma.SortOrder
+  pricing_model?: Prisma.SortOrder
+  description?: Prisma.SortOrder
   local_sku?: Prisma.SortOrder
   barcode?: Prisma.SortOrder
   base_sale_price?: Prisma.SortOrder
-  is_default_guild_good?: Prisma.SortOrder
   created_at?: Prisma.SortOrder
   updated_at?: Prisma.SortOrder
   deleted_at?: Prisma.SortOrder
@@ -666,6 +710,14 @@ export type GoodUncheckedUpdateManyWithoutComplexNestedInput = {
   deleteMany?: Prisma.GoodScalarWhereInput | Prisma.GoodScalarWhereInput[]
 }
 
+export type EnumUnitTypeFieldUpdateOperationsInput = {
+  set?: $Enums.UnitType
+}
+
+export type EnumGoodPricingModelFieldUpdateOperationsInput = {
+  set?: $Enums.GoodPricingModel
+}
+
 export type NullableDecimalFieldUpdateOperationsInput = {
   set?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
   increment?: runtime.Decimal | runtime.DecimalJsLike | number | string
@@ -735,12 +787,14 @@ export type GoodUpdateOneWithoutSales_invoice_itemsNestedInput = {
 export type GoodCreateWithoutGuildInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -752,12 +806,14 @@ export type GoodCreateWithoutGuildInput = {
 export type GoodUncheckedCreateWithoutGuildInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -798,12 +854,14 @@ export type GoodScalarWhereInput = {
   NOT?: Prisma.GoodScalarWhereInput | Prisma.GoodScalarWhereInput[]
   id?: Prisma.StringFilter<"Good"> | string
   name?: Prisma.StringFilter<"Good"> | string
-  description?: Prisma.StringNullableFilter<"Good"> | string | null
+  is_default_guild_good?: Prisma.BoolFilter<"Good"> | boolean
   sku?: Prisma.StringFilter<"Good"> | string
+  unit_type?: Prisma.EnumUnitTypeFilter<"Good"> | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFilter<"Good"> | $Enums.GoodPricingModel
+  description?: Prisma.StringNullableFilter<"Good"> | string | null
   local_sku?: Prisma.StringNullableFilter<"Good"> | string | null
   barcode?: Prisma.StringNullableFilter<"Good"> | string | null
   base_sale_price?: Prisma.DecimalNullableFilter<"Good"> | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFilter<"Good"> | boolean
   created_at?: Prisma.DateTimeFilter<"Good"> | Date | string
   updated_at?: Prisma.DateTimeFilter<"Good"> | Date | string
   deleted_at?: Prisma.DateTimeNullableFilter<"Good"> | Date | string | null
@@ -815,12 +873,14 @@ export type GoodScalarWhereInput = {
 export type GoodCreateWithoutComplexInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -832,12 +892,14 @@ export type GoodCreateWithoutComplexInput = {
 export type GoodUncheckedCreateWithoutComplexInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -875,12 +937,14 @@ export type GoodUpdateManyWithWhereWithoutComplexInput = {
 export type GoodCreateWithoutCategoryInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -892,12 +956,14 @@ export type GoodCreateWithoutCategoryInput = {
 export type GoodUncheckedCreateWithoutCategoryInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -935,12 +1001,14 @@ export type GoodUpdateManyWithWhereWithoutCategoryInput = {
 export type GoodCreateWithoutSales_invoice_itemsInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -952,12 +1020,14 @@ export type GoodCreateWithoutSales_invoice_itemsInput = {
 export type GoodUncheckedCreateWithoutSales_invoice_itemsInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -985,12 +1055,14 @@ export type GoodUpdateToOneWithWhereWithoutSales_invoice_itemsInput = {
 export type GoodUpdateWithoutSales_invoice_itemsInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1002,12 +1074,14 @@ export type GoodUpdateWithoutSales_invoice_itemsInput = {
 export type GoodUncheckedUpdateWithoutSales_invoice_itemsInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1019,12 +1093,14 @@ export type GoodUncheckedUpdateWithoutSales_invoice_itemsInput = {
 export type GoodCreateManyGuildInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -1035,12 +1111,14 @@ export type GoodCreateManyGuildInput = {
 export type GoodUpdateWithoutGuildInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1052,12 +1130,14 @@ export type GoodUpdateWithoutGuildInput = {
 export type GoodUncheckedUpdateWithoutGuildInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1069,12 +1149,14 @@ export type GoodUncheckedUpdateWithoutGuildInput = {
 export type GoodUncheckedUpdateManyWithoutGuildInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1085,12 +1167,14 @@ export type GoodUncheckedUpdateManyWithoutGuildInput = {
 export type GoodCreateManyComplexInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -1101,12 +1185,14 @@ export type GoodCreateManyComplexInput = {
 export type GoodUpdateWithoutComplexInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1118,12 +1204,14 @@ export type GoodUpdateWithoutComplexInput = {
 export type GoodUncheckedUpdateWithoutComplexInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1135,12 +1223,14 @@ export type GoodUncheckedUpdateWithoutComplexInput = {
 export type GoodUncheckedUpdateManyWithoutComplexInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1151,12 +1241,14 @@ export type GoodUncheckedUpdateManyWithoutComplexInput = {
 export type GoodCreateManyCategoryInput = {
   id?: string
   name: string
-  description?: string | null
+  is_default_guild_good?: boolean
   sku: string
+  unit_type: $Enums.UnitType
+  pricing_model: $Enums.GoodPricingModel
+  description?: string | null
   local_sku?: string | null
   barcode?: string | null
   base_sale_price?: runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: boolean
   created_at?: Date | string
   updated_at?: Date | string
   deleted_at?: Date | string | null
@@ -1167,12 +1259,14 @@ export type GoodCreateManyCategoryInput = {
 export type GoodUpdateWithoutCategoryInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1184,12 +1278,14 @@ export type GoodUpdateWithoutCategoryInput = {
 export type GoodUncheckedUpdateWithoutCategoryInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1201,12 +1297,14 @@ export type GoodUncheckedUpdateWithoutCategoryInput = {
 export type GoodUncheckedUpdateManyWithoutCategoryInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
   name?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   sku?: Prisma.StringFieldUpdateOperationsInput | string
+  unit_type?: Prisma.EnumUnitTypeFieldUpdateOperationsInput | $Enums.UnitType
+  pricing_model?: Prisma.EnumGoodPricingModelFieldUpdateOperationsInput | $Enums.GoodPricingModel
+  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   local_sku?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   barcode?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   base_sale_price?: Prisma.NullableDecimalFieldUpdateOperationsInput | runtime.Decimal | runtime.DecimalJsLike | number | string | null
-  is_default_guild_good?: Prisma.BoolFieldUpdateOperationsInput | boolean
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   deleted_at?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
@@ -1248,12 +1346,14 @@ export type GoodCountOutputTypeCountSales_invoice_itemsArgs<ExtArgs extends runt
 export type GoodSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
   id?: boolean
   name?: boolean
-  description?: boolean
+  is_default_guild_good?: boolean
   sku?: boolean
+  unit_type?: boolean
+  pricing_model?: boolean
+  description?: boolean
   local_sku?: boolean
   barcode?: boolean
   base_sale_price?: boolean
-  is_default_guild_good?: boolean
   created_at?: boolean
   updated_at?: boolean
   deleted_at?: boolean
@@ -1272,12 +1372,14 @@ export type GoodSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = r
 export type GoodSelectScalar = {
   id?: boolean
   name?: boolean
-  description?: boolean
+  is_default_guild_good?: boolean
   sku?: boolean
+  unit_type?: boolean
+  pricing_model?: boolean
+  description?: boolean
   local_sku?: boolean
   barcode?: boolean
   base_sale_price?: boolean
-  is_default_guild_good?: boolean
   created_at?: boolean
   updated_at?: boolean
   deleted_at?: boolean
@@ -1286,7 +1388,7 @@ export type GoodSelectScalar = {
   guild_id?: boolean
 }
 
-export type GoodOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "name" | "description" | "sku" | "local_sku" | "barcode" | "base_sale_price" | "is_default_guild_good" | "created_at" | "updated_at" | "deleted_at" | "complex_id" | "category_id" | "guild_id", ExtArgs["result"]["good"]>
+export type GoodOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "name" | "is_default_guild_good" | "sku" | "unit_type" | "pricing_model" | "description" | "local_sku" | "barcode" | "base_sale_price" | "created_at" | "updated_at" | "deleted_at" | "complex_id" | "category_id" | "guild_id", ExtArgs["result"]["good"]>
 export type GoodInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
   category?: boolean | Prisma.Good$categoryArgs<ExtArgs>
   complex?: boolean | Prisma.Good$complexArgs<ExtArgs>
@@ -1306,12 +1408,14 @@ export type $GoodPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs =
   scalars: runtime.Types.Extensions.GetPayloadResult<{
     id: string
     name: string
-    description: string | null
+    is_default_guild_good: boolean
     sku: string
+    unit_type: $Enums.UnitType
+    pricing_model: $Enums.GoodPricingModel
+    description: string | null
     local_sku: string | null
     barcode: string | null
     base_sale_price: runtime.Decimal | null
-    is_default_guild_good: boolean
     created_at: Date
     updated_at: Date
     deleted_at: Date | null
@@ -1693,12 +1797,14 @@ export interface Prisma__GoodClient<T, Null = never, ExtArgs extends runtime.Typ
 export interface GoodFieldRefs {
   readonly id: Prisma.FieldRef<"Good", 'String'>
   readonly name: Prisma.FieldRef<"Good", 'String'>
-  readonly description: Prisma.FieldRef<"Good", 'String'>
+  readonly is_default_guild_good: Prisma.FieldRef<"Good", 'Boolean'>
   readonly sku: Prisma.FieldRef<"Good", 'String'>
+  readonly unit_type: Prisma.FieldRef<"Good", 'UnitType'>
+  readonly pricing_model: Prisma.FieldRef<"Good", 'GoodPricingModel'>
+  readonly description: Prisma.FieldRef<"Good", 'String'>
   readonly local_sku: Prisma.FieldRef<"Good", 'String'>
   readonly barcode: Prisma.FieldRef<"Good", 'String'>
   readonly base_sale_price: Prisma.FieldRef<"Good", 'Decimal'>
-  readonly is_default_guild_good: Prisma.FieldRef<"Good", 'Boolean'>
   readonly created_at: Prisma.FieldRef<"Good", 'DateTime'>
   readonly updated_at: Prisma.FieldRef<"Good", 'DateTime'>
   readonly deleted_at: Prisma.FieldRef<"Good", 'DateTime'>

src/generated/prisma/models/SalesInvoiceItem.ts

@@ -622,10 +622,6 @@ export type SalesInvoiceItemUncheckedUpdateManyWithoutInvoiceNestedInput = {
   deleteMany?: Prisma.SalesInvoiceItemScalarWhereInput | Prisma.SalesInvoiceItemScalarWhereInput[]
 }
 
-export type EnumUnitTypeFieldUpdateOperationsInput = {
-  set?: $Enums.UnitType
-}
-
 export type SalesInvoiceItemCreateNestedManyWithoutServiceInput = {
   create?: Prisma.XOR<Prisma.SalesInvoiceItemCreateWithoutServiceInput, Prisma.SalesInvoiceItemUncheckedCreateWithoutServiceInput> | Prisma.SalesInvoiceItemCreateWithoutServiceInput[] | Prisma.SalesInvoiceItemUncheckedCreateWithoutServiceInput[]
   connectOrCreate?: Prisma.SalesInvoiceItemCreateOrConnectWithoutServiceInput | Prisma.SalesInvoiceItemCreateOrConnectWithoutServiceInput[]

src/main.ts

@@ -53,7 +53,7 @@ async function bootstrap() {
 
   // Enable CORS. You can set `CORS_ORIGINS` to a comma-separated list of allowed origins.
   // Defaults include common localhost origins used by front-end dev servers.
-  const defaultOrigins = ['*', 'http://localhost:3001']
+  const defaultOrigins = ['*', 'http://localhost:5000']
   const envOrigins = process.env.CORS_ORIGINS
     ? process.env.CORS_ORIGINS.split(',')
         .map(s => s.trim())

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) {

src/modules/enums/enums.service.ts

@@ -22,8 +22,6 @@ import { ResponseMapper } from 'common/response/response-mapper'
 @Injectable()
 export class EnumsService {
   private prepareData(items: Record<string, string>) {
-    console.log(translates.enums[items[0]])
-
     return Object.values(items).map(item => ({
       name: translates.enums[item] || item,
       value: item,

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

@@ -1,5 +1,6 @@
+import { GoodPricingModel, UnitType } from '@/generated/prisma/enums'
 import { ApiProperty, PartialType } from '@nestjs/swagger'
-import { IsNumber, IsOptional, IsString } from 'class-validator'
+import { IsEnum, IsNumber, IsOptional, IsString } from 'class-validator'
 
 export class CreateGoodDto {
   @IsString()
@@ -19,6 +20,14 @@ 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
+
   @IsOptional()
   @IsString()
   @ApiProperty({ required: false })

src/modules/pos/pos.middleware.ts

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