Refactor code structure for improved readability and maintainability

docker-compose.yml

@@ -91,46 +91,46 @@ services:
     #   retries: 3
     #   start_period: 10s
 
-  seed:
+  # seed:
-    platform: ${DOCKER_PLATFORM:-linux/amd64}
+  #   platform: ${DOCKER_PLATFORM:-linux/amd64}
-    build:
+  #   build:
-      context: .
+  #     context: .
-      dockerfile: Dockerfile
+  #     dockerfile: Dockerfile
-      target: build
+  #     target: build
-      args:
+  #     args:
-        NODE_ENV: ${NODE_ENV:-production}
+  #       NODE_ENV: ${NODE_ENV:-production}
-        PORT: ${PORT}
+  #       PORT: ${PORT}
-        DATABASE_NAME: ${DATABASE_NAME}
+  #       DATABASE_NAME: ${DATABASE_NAME}
-        DATABASE_USER: ${DATABASE_USER}
+  #       DATABASE_USER: ${DATABASE_USER}
-        DATABASE_PASSWORD: ${DATABASE_PASSWORD}
+  #       DATABASE_PASSWORD: ${DATABASE_PASSWORD}
-        DATABASE_PORT: ${DATABASE_PORT}
+  #       DATABASE_PORT: ${DATABASE_PORT}
-        DATABASE_HOST: ${DATABASE_HOST}
+  #       DATABASE_HOST: ${DATABASE_HOST}
-        DATABASE_URL: mysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
+  #       DATABASE_URL: mysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
-        SHADOW_DATABASE_URL: mysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}_shadow
+  #       SHADOW_DATABASE_URL: mysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}_shadow
-        JWT_SECRET: ${JWT_SECRET}
+  #       JWT_SECRET: ${JWT_SECRET}
-        JWT_EXPIRES_IN: ${JWT_EXPIRES_IN}
+  #       JWT_EXPIRES_IN: ${JWT_EXPIRES_IN}
-        OTP_STATIC_CODE: ${OTP_STATIC_CODE}
+  #       OTP_STATIC_CODE: ${OTP_STATIC_CODE}
-    depends_on:
+  #   depends_on:
-      database:
+  #     database:
-        condition: service_healthy
+  #       condition: service_healthy
-    environment:
+  #   environment:
-      NODE_ENV: ${NODE_ENV:-production}
+  #     NODE_ENV: ${NODE_ENV:-production}
-      PORT: ${PORT}
+  #     PORT: ${PORT}
-      DATABASE_NAME: ${DATABASE_NAME}
+  #     DATABASE_NAME: ${DATABASE_NAME}
-      DATABASE_USER: ${DATABASE_USER}
+  #     DATABASE_USER: ${DATABASE_USER}
-      DATABASE_PASSWORD: ${DATABASE_PASSWORD}
+  #     DATABASE_PASSWORD: ${DATABASE_PASSWORD}
-      DATABASE_PORT: ${DATABASE_PORT}
+  #     DATABASE_PORT: ${DATABASE_PORT}
-      DATABASE_HOST: ${DATABASE_HOST}
+  #     DATABASE_HOST: ${DATABASE_HOST}
-      DATABASE_URL: mysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
+  #     DATABASE_URL: mysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
-      SHADOW_DATABASE_URL: mysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}_shadow
+  #     SHADOW_DATABASE_URL: mysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}_shadow
-      JWT_SECRET: ${JWT_SECRET}
+  #     JWT_SECRET: ${JWT_SECRET}
-      JWT_EXPIRES_IN: ${JWT_EXPIRES_IN}
+  #     JWT_EXPIRES_IN: ${JWT_EXPIRES_IN}
-      OTP_STATIC_CODE: ${OTP_STATIC_CODE}
+  #     OTP_STATIC_CODE: ${OTP_STATIC_CODE}
-    networks:
+  #   networks:
-      - psp_consumer_network
+  #     - psp_consumer_network
-    profiles:
+  #   profiles:
-      - tools
+  #     - tools
-    command: ["pnpm", "seed:sku"]
+  #   command: ["pnpm", "seed:sku"]
 
 volumes:
   db_data:

prisma/migrations/20260509071027_create_consumer_account_device/migration.sql

@@ -0,0 +1,32 @@
+/*
+  Warnings:
+
+  - You are about to drop the `consumer_devices` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE `consumer_devices` DROP FOREIGN KEY `consumer_devices_consumer_id_fkey`;
+
+-- DropTable
+DROP TABLE `consumer_devices`;
+
+-- CreateTable
+CREATE TABLE `consumer_account_device` (
+    `id` VARCHAR(191) NOT NULL,
+    `device_id` VARCHAR(191) NOT NULL,
+    `device_name` VARCHAR(191) NULL,
+    `created_at` TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
+    `updated_at` TIMESTAMP(0) NOT NULL,
+    `consumer_account_id` VARCHAR(191) NOT NULL,
+
+    UNIQUE INDEX `consumer_account_device_device_id_key`(`device_id`),
+    UNIQUE INDEX `consumer_account_device_consumer_account_id_key`(`consumer_account_id`),
+    INDEX `consumer_account_device_consumer_account_id_idx`(`consumer_account_id`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- AddForeignKey
+ALTER TABLE `consumer_account_device` ADD CONSTRAINT `consumer_account_device_consumer_account_id_fkey` FOREIGN KEY (`consumer_account_id`) REFERENCES `consumer_accounts`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `sale_invoice_tsp_attempts` ADD CONSTRAINT `sale_invoice_tsp_attempts_invoice_id_fkey` FOREIGN KEY (`invoice_id`) REFERENCES `sales_invoices`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema/application/consumer_account_device.prisma

@@ -0,0 +1,14 @@
+model ConsumerAccountDevice {
+  id          String  @id @default(ulid())
+  device_id   String  @unique
+  device_name String?
+
+  created_at DateTime @default(now()) @db.Timestamp(0)
+  updated_at DateTime @updatedAt @db.Timestamp(0)
+
+  consumer_account_id String          @unique
+  consumer_account    ConsumerAccount @relation(fields: [consumer_account_id], references: [id])
+
+  @@index([consumer_account_id])
+  @@map("consumer_account_device")
+}

prisma/schema/application/consumer_devices.prisma

@@ -1,23 +1,23 @@
-model ConsumerDevices {
+// model ConsumerDevices {
-  uuid           String               @id @unique @db.VarChar(255)
+//   uuid           String               @id @unique @db.VarChar(255)
-  app_version    String               @db.VarChar(20)
+//   app_version    String               @db.VarChar(20)
-  build_number   String               @db.VarChar(20)
+//   build_number   String               @db.VarChar(20)
-  platform       String               @db.VarChar(100)
+//   platform       String               @db.VarChar(100)
-  brand          String               @db.VarChar(100)
+//   brand          String               @db.VarChar(100)
-  model          String               @db.VarChar(100)
+//   model          String               @db.VarChar(100)
-  device         String               @db.VarChar(100)
+//   device         String               @db.VarChar(100)
-  publisher      ApplicationPublisher
+//   publisher      ApplicationPublisher
-  os_version     String               @db.VarChar(20)
+//   os_version     String               @db.VarChar(20)
-  sdk_version    String               @db.VarChar(20)
+//   sdk_version    String               @db.VarChar(20)
-  release_number String               @db.VarChar(20)
+//   release_number String               @db.VarChar(20)
-  user_agent     String?              @db.VarChar(100)
+//   user_agent     String?              @db.VarChar(100)
-  browser_name   String?              @db.VarChar(100)
+//   browser_name   String?              @db.VarChar(100)
-  fcm_token      String?              @db.VarChar(100)
+//   fcm_token      String?              @db.VarChar(100)
-  created_at     DateTime             @default(now()) @db.Timestamp(0)
+//   created_at     DateTime             @default(now()) @db.Timestamp(0)
-  updated_at     DateTime             @updatedAt @db.Timestamp(0)
+//   updated_at     DateTime             @updatedAt @db.Timestamp(0)
-  consumer_id    String
+//   consumer_id    String
-  consumer       Consumer             @relation(fields: [consumer_id], references: [id])
+//   consumer       Consumer             @relation(fields: [consumer_id], references: [id])
 
-  @@index([consumer_id], map: "consumer_devices_consumer_id_fkey")
+//   @@index([consumer_id], map: "consumer_devices_consumer_id_fkey")
-  @@map("consumer_devices")
+//   @@map("consumer_devices")
-}
+// }

prisma/schema/consumer/consumers.prisma

@@ -15,6 +15,7 @@ model ConsumerAccount {
   permission         PermissionConsumer?
   account_allocation LicenseAccountAllocation?
   sales_invoices     SalesInvoice[]
+  account_device     ConsumerAccountDevice?
 
   @@map("consumer_accounts")
 }
@@ -29,7 +30,7 @@ model Consumer {
 
   accounts            ConsumerAccount[]
   business_activities BusinessActivity[]
-  devices             ConsumerDevices[]
+  // devices             ConsumerDevices[]
   individual          ConsumerIndividual?
   legal               ConsumerLegal?
 

src/generated/prisma/browser.ts

@@ -123,10 +123,10 @@ export type ProviderAccount = Prisma.ProviderAccountModel
  */
 export type Provider = Prisma.ProviderModel
 /**
- * Model ConsumerDevices
+ * Model ConsumerAccountDevice
  * 
  */
-export type ConsumerDevices = Prisma.ConsumerDevicesModel
+export type ConsumerAccountDevice = Prisma.ConsumerAccountDeviceModel
 /**
  * Model ApplicationReleasedInfo
  * 

src/generated/prisma/client.ts

@@ -145,10 +145,10 @@ export type ProviderAccount = Prisma.ProviderAccountModel
  */
 export type Provider = Prisma.ProviderModel
 /**
- * Model ConsumerDevices
+ * Model ConsumerAccountDevice
  * 
  */
-export type ConsumerDevices = Prisma.ConsumerDevicesModel
+export type ConsumerAccountDevice = Prisma.ConsumerAccountDeviceModel
 /**
  * Model ApplicationReleasedInfo
  * 

src/generated/prisma/commonInputTypes.ts

@@ -290,23 +290,6 @@ export type EnumProviderRoleWithAggregatesFilter<$PrismaModel = never> = {
   _max?: Prisma.NestedEnumProviderRoleFilter<$PrismaModel>
 }
 
-export type EnumApplicationPublisherFilter<$PrismaModel = never> = {
-  equals?: $Enums.ApplicationPublisher | Prisma.EnumApplicationPublisherFieldRefInput<$PrismaModel>
-  in?: $Enums.ApplicationPublisher[]
-  notIn?: $Enums.ApplicationPublisher[]
-  not?: Prisma.NestedEnumApplicationPublisherFilter<$PrismaModel> | $Enums.ApplicationPublisher
-}
-
-export type EnumApplicationPublisherWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.ApplicationPublisher | Prisma.EnumApplicationPublisherFieldRefInput<$PrismaModel>
-  in?: $Enums.ApplicationPublisher[]
-  notIn?: $Enums.ApplicationPublisher[]
-  not?: Prisma.NestedEnumApplicationPublisherWithAggregatesFilter<$PrismaModel> | $Enums.ApplicationPublisher
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumApplicationPublisherFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumApplicationPublisherFilter<$PrismaModel>
-}
-
 export type BoolFilter<$PrismaModel = never> = {
   equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
   not?: Prisma.NestedBoolFilter<$PrismaModel> | boolean
@@ -1028,23 +1011,6 @@ export type NestedEnumProviderRoleWithAggregatesFilter<$PrismaModel = never> = {
   _max?: Prisma.NestedEnumProviderRoleFilter<$PrismaModel>
 }
 
-export type NestedEnumApplicationPublisherFilter<$PrismaModel = never> = {
-  equals?: $Enums.ApplicationPublisher | Prisma.EnumApplicationPublisherFieldRefInput<$PrismaModel>
-  in?: $Enums.ApplicationPublisher[]
-  notIn?: $Enums.ApplicationPublisher[]
-  not?: Prisma.NestedEnumApplicationPublisherFilter<$PrismaModel> | $Enums.ApplicationPublisher
-}
-
-export type NestedEnumApplicationPublisherWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.ApplicationPublisher | Prisma.EnumApplicationPublisherFieldRefInput<$PrismaModel>
-  in?: $Enums.ApplicationPublisher[]
-  notIn?: $Enums.ApplicationPublisher[]
-  not?: Prisma.NestedEnumApplicationPublisherWithAggregatesFilter<$PrismaModel> | $Enums.ApplicationPublisher
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumApplicationPublisherFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumApplicationPublisherFilter<$PrismaModel>
-}
-
 export type NestedBoolFilter<$PrismaModel = never> = {
   equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
   not?: Prisma.NestedBoolFilter<$PrismaModel> | boolean

src/generated/prisma/internal/prismaNamespace.ts

@@ -405,7 +405,7 @@ export const ModelName = {
   PermissionBusiness: 'PermissionBusiness',
   ProviderAccount: 'ProviderAccount',
   Provider: 'Provider',
-  ConsumerDevices: 'ConsumerDevices',
+  ConsumerAccountDevice: 'ConsumerAccountDevice',
   ApplicationReleasedInfo: 'ApplicationReleasedInfo',
   ConsumerAccount: 'ConsumerAccount',
   Consumer: 'Consumer',
@@ -445,7 +445,7 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
     omit: GlobalOmitOptions
   }
   meta: {
-    modelProps: "adminAccount" | "admin" | "account" | "deviceBrand" | "device" | "licenseChargeTransaction" | "license" | "licenseActivation" | "licenseRenewChargeTransaction" | "licenseRenew" | "partnerAccountQuotaChargeTransaction" | "partnerAccountQuotaCredit" | "licenseAccountAllocation" | "partnerAccount" | "partner" | "permissionConsumer" | "permissionPos" | "permissionComplex" | "permissionBusiness" | "providerAccount" | "provider" | "consumerDevices" | "applicationReleasedInfo" | "consumerAccount" | "consumer" | "consumerIndividual" | "consumerLegal" | "businessActivity" | "complex" | "pos" | "good" | "goodCategory" | "guild" | "measureUnits" | "stockKeepingUnits" | "triggerLog" | "customer" | "customerIndividual" | "customerLegal" | "salesInvoice" | "salesInvoiceItem" | "saleInvoiceTspAttempts" | "salesInvoicePayment" | "salesInvoicePaymentTerminalInfo" | "service" | "serviceCategory"
+    modelProps: "adminAccount" | "admin" | "account" | "deviceBrand" | "device" | "licenseChargeTransaction" | "license" | "licenseActivation" | "licenseRenewChargeTransaction" | "licenseRenew" | "partnerAccountQuotaChargeTransaction" | "partnerAccountQuotaCredit" | "licenseAccountAllocation" | "partnerAccount" | "partner" | "permissionConsumer" | "permissionPos" | "permissionComplex" | "permissionBusiness" | "providerAccount" | "provider" | "consumerAccountDevice" | "applicationReleasedInfo" | "consumerAccount" | "consumer" | "consumerIndividual" | "consumerLegal" | "businessActivity" | "complex" | "pos" | "good" | "goodCategory" | "guild" | "measureUnits" | "stockKeepingUnits" | "triggerLog" | "customer" | "customerIndividual" | "customerLegal" | "salesInvoice" | "salesInvoiceItem" | "saleInvoiceTspAttempts" | "salesInvoicePayment" | "salesInvoicePaymentTerminalInfo" | "service" | "serviceCategory"
     txIsolationLevel: TransactionIsolationLevel
   }
   model: {
@@ -1835,69 +1835,69 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
         }
       }
     }
-    ConsumerDevices: {
+    ConsumerAccountDevice: {
-      payload: Prisma.$ConsumerDevicesPayload<ExtArgs>
+      payload: Prisma.$ConsumerAccountDevicePayload<ExtArgs>
-      fields: Prisma.ConsumerDevicesFieldRefs
+      fields: Prisma.ConsumerAccountDeviceFieldRefs
       operations: {
         findUnique: {
-          args: Prisma.ConsumerDevicesFindUniqueArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload> | null
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload> | null
         }
         findUniqueOrThrow: {
-          args: Prisma.ConsumerDevicesFindUniqueOrThrowArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload>
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload>
         }
         findFirst: {
-          args: Prisma.ConsumerDevicesFindFirstArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload> | null
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload> | null
         }
         findFirstOrThrow: {
-          args: Prisma.ConsumerDevicesFindFirstOrThrowArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload>
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload>
         }
         findMany: {
-          args: Prisma.ConsumerDevicesFindManyArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload>[]
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload>[]
         }
         create: {
-          args: Prisma.ConsumerDevicesCreateArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload>
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload>
         }
         createMany: {
-          args: Prisma.ConsumerDevicesCreateManyArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceCreateManyArgs<ExtArgs>
           result: BatchPayload
         }
         delete: {
-          args: Prisma.ConsumerDevicesDeleteArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload>
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload>
         }
         update: {
-          args: Prisma.ConsumerDevicesUpdateArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload>
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload>
         }
         deleteMany: {
-          args: Prisma.ConsumerDevicesDeleteManyArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceDeleteManyArgs<ExtArgs>
           result: BatchPayload
         }
         updateMany: {
-          args: Prisma.ConsumerDevicesUpdateManyArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceUpdateManyArgs<ExtArgs>
           result: BatchPayload
         }
         upsert: {
-          args: Prisma.ConsumerDevicesUpsertArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerDevicesPayload>
+          result: runtime.Types.Utils.PayloadToResult<Prisma.$ConsumerAccountDevicePayload>
         }
         aggregate: {
-          args: Prisma.ConsumerDevicesAggregateArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateConsumerDevices>
+          result: runtime.Types.Utils.Optional<Prisma.AggregateConsumerAccountDevice>
         }
         groupBy: {
-          args: Prisma.ConsumerDevicesGroupByArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.ConsumerDevicesGroupByOutputType>[]
+          result: runtime.Types.Utils.Optional<Prisma.ConsumerAccountDeviceGroupByOutputType>[]
         }
         count: {
-          args: Prisma.ConsumerDevicesCountArgs<ExtArgs>
+          args: Prisma.ConsumerAccountDeviceCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.ConsumerDevicesCountAggregateOutputType> | number
+          result: runtime.Types.Utils.Optional<Prisma.ConsumerAccountDeviceCountAggregateOutputType> | number
         }
       }
     }
@@ -3766,27 +3766,16 @@ export const ProviderScalarFieldEnum = {
 export type ProviderScalarFieldEnum = (typeof ProviderScalarFieldEnum)[keyof typeof ProviderScalarFieldEnum]
 
 
-export const ConsumerDevicesScalarFieldEnum = {
+export const ConsumerAccountDeviceScalarFieldEnum = {
-  uuid: 'uuid',
+  id: 'id',
-  app_version: 'app_version',
+  device_id: 'device_id',
-  build_number: 'build_number',
+  device_name: 'device_name',
-  platform: 'platform',
-  brand: 'brand',
-  model: 'model',
-  device: 'device',
-  publisher: 'publisher',
-  os_version: 'os_version',
-  sdk_version: 'sdk_version',
-  release_number: 'release_number',
-  user_agent: 'user_agent',
-  browser_name: 'browser_name',
-  fcm_token: 'fcm_token',
   created_at: 'created_at',
   updated_at: 'updated_at',
-  consumer_id: 'consumer_id'
+  consumer_account_id: 'consumer_account_id'
 } as const
 
-export type ConsumerDevicesScalarFieldEnum = (typeof ConsumerDevicesScalarFieldEnum)[keyof typeof ConsumerDevicesScalarFieldEnum]
+export type ConsumerAccountDeviceScalarFieldEnum = (typeof ConsumerAccountDeviceScalarFieldEnum)[keyof typeof ConsumerAccountDeviceScalarFieldEnum]
 
 
 export const ApplicationReleasedInfoScalarFieldEnum = {
@@ -4368,24 +4357,14 @@ export const ProviderOrderByRelevanceFieldEnum = {
 export type ProviderOrderByRelevanceFieldEnum = (typeof ProviderOrderByRelevanceFieldEnum)[keyof typeof ProviderOrderByRelevanceFieldEnum]
 
 
-export const ConsumerDevicesOrderByRelevanceFieldEnum = {
+export const ConsumerAccountDeviceOrderByRelevanceFieldEnum = {
-  uuid: 'uuid',
+  id: 'id',
-  app_version: 'app_version',
+  device_id: 'device_id',
-  build_number: 'build_number',
+  device_name: 'device_name',
-  platform: 'platform',
+  consumer_account_id: 'consumer_account_id'
-  brand: 'brand',
-  model: 'model',
-  device: 'device',
-  os_version: 'os_version',
-  sdk_version: 'sdk_version',
-  release_number: 'release_number',
-  user_agent: 'user_agent',
-  browser_name: 'browser_name',
-  fcm_token: 'fcm_token',
-  consumer_id: 'consumer_id'
 } as const
 
-export type ConsumerDevicesOrderByRelevanceFieldEnum = (typeof ConsumerDevicesOrderByRelevanceFieldEnum)[keyof typeof ConsumerDevicesOrderByRelevanceFieldEnum]
+export type ConsumerAccountDeviceOrderByRelevanceFieldEnum = (typeof ConsumerAccountDeviceOrderByRelevanceFieldEnum)[keyof typeof ConsumerAccountDeviceOrderByRelevanceFieldEnum]
 
 
 export const JsonNullValueFilter = {
@@ -4763,13 +4742,6 @@ export type EnumProviderRoleFieldRefInput<$PrismaModel> = FieldRefInputType<$Pri
     
 
 
-/**
- * Reference to a field of type 'ApplicationPublisher'
- */
-export type EnumApplicationPublisherFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'ApplicationPublisher'>
-    
-
-
 /**
  * Reference to a field of type 'Boolean'
  */
@@ -5011,7 +4983,7 @@ export type GlobalOmitConfig = {
   permissionBusiness?: Prisma.PermissionBusinessOmit
   providerAccount?: Prisma.ProviderAccountOmit
   provider?: Prisma.ProviderOmit
-  consumerDevices?: Prisma.ConsumerDevicesOmit
+  consumerAccountDevice?: Prisma.ConsumerAccountDeviceOmit
   applicationReleasedInfo?: Prisma.ApplicationReleasedInfoOmit
   consumerAccount?: Prisma.ConsumerAccountOmit
   consumer?: Prisma.ConsumerOmit

src/generated/prisma/internal/prismaNamespaceBrowser.ts

@@ -72,7 +72,7 @@ export const ModelName = {
   PermissionBusiness: 'PermissionBusiness',
   ProviderAccount: 'ProviderAccount',
   Provider: 'Provider',
-  ConsumerDevices: 'ConsumerDevices',
+  ConsumerAccountDevice: 'ConsumerAccountDevice',
   ApplicationReleasedInfo: 'ApplicationReleasedInfo',
   ConsumerAccount: 'ConsumerAccount',
   Consumer: 'Consumer',
@@ -357,27 +357,16 @@ export const ProviderScalarFieldEnum = {
 export type ProviderScalarFieldEnum = (typeof ProviderScalarFieldEnum)[keyof typeof ProviderScalarFieldEnum]
 
 
-export const ConsumerDevicesScalarFieldEnum = {
+export const ConsumerAccountDeviceScalarFieldEnum = {
-  uuid: 'uuid',
+  id: 'id',
-  app_version: 'app_version',
+  device_id: 'device_id',
-  build_number: 'build_number',
+  device_name: 'device_name',
-  platform: 'platform',
-  brand: 'brand',
-  model: 'model',
-  device: 'device',
-  publisher: 'publisher',
-  os_version: 'os_version',
-  sdk_version: 'sdk_version',
-  release_number: 'release_number',
-  user_agent: 'user_agent',
-  browser_name: 'browser_name',
-  fcm_token: 'fcm_token',
   created_at: 'created_at',
   updated_at: 'updated_at',
-  consumer_id: 'consumer_id'
+  consumer_account_id: 'consumer_account_id'
 } as const
 
-export type ConsumerDevicesScalarFieldEnum = (typeof ConsumerDevicesScalarFieldEnum)[keyof typeof ConsumerDevicesScalarFieldEnum]
+export type ConsumerAccountDeviceScalarFieldEnum = (typeof ConsumerAccountDeviceScalarFieldEnum)[keyof typeof ConsumerAccountDeviceScalarFieldEnum]
 
 
 export const ApplicationReleasedInfoScalarFieldEnum = {
@@ -959,24 +948,14 @@ export const ProviderOrderByRelevanceFieldEnum = {
 export type ProviderOrderByRelevanceFieldEnum = (typeof ProviderOrderByRelevanceFieldEnum)[keyof typeof ProviderOrderByRelevanceFieldEnum]
 
 
-export const ConsumerDevicesOrderByRelevanceFieldEnum = {
+export const ConsumerAccountDeviceOrderByRelevanceFieldEnum = {
-  uuid: 'uuid',
+  id: 'id',
-  app_version: 'app_version',
+  device_id: 'device_id',
-  build_number: 'build_number',
+  device_name: 'device_name',
-  platform: 'platform',
+  consumer_account_id: 'consumer_account_id'
-  brand: 'brand',
-  model: 'model',
-  device: 'device',
-  os_version: 'os_version',
-  sdk_version: 'sdk_version',
-  release_number: 'release_number',
-  user_agent: 'user_agent',
-  browser_name: 'browser_name',
-  fcm_token: 'fcm_token',
-  consumer_id: 'consumer_id'
 } as const
 
-export type ConsumerDevicesOrderByRelevanceFieldEnum = (typeof ConsumerDevicesOrderByRelevanceFieldEnum)[keyof typeof ConsumerDevicesOrderByRelevanceFieldEnum]
+export type ConsumerAccountDeviceOrderByRelevanceFieldEnum = (typeof ConsumerAccountDeviceOrderByRelevanceFieldEnum)[keyof typeof ConsumerAccountDeviceOrderByRelevanceFieldEnum]
 
 
 export const JsonNullValueFilter = {

src/generated/prisma/models.ts

@@ -29,7 +29,7 @@ export type * from './models/PermissionComplex.js'
 export type * from './models/PermissionBusiness.js'
 export type * from './models/ProviderAccount.js'
 export type * from './models/Provider.js'
-export type * from './models/ConsumerDevices.js'
+export type * from './models/ConsumerAccountDevice.js'
 export type * from './models/ApplicationReleasedInfo.js'
 export type * from './models/ConsumerAccount.js'
 export type * from './models/Consumer.js'

src/generated/prisma/models/Consumer.ts

@@ -184,7 +184,6 @@ export type ConsumerWhereInput = {
   updated_at?: Prisma.DateTimeFilter<"Consumer"> | Date | string
   accounts?: Prisma.ConsumerAccountListRelationFilter
   business_activities?: Prisma.BusinessActivityListRelationFilter
-  devices?: Prisma.ConsumerDevicesListRelationFilter
   individual?: Prisma.XOR<Prisma.ConsumerIndividualNullableScalarRelationFilter, Prisma.ConsumerIndividualWhereInput> | null
   legal?: Prisma.XOR<Prisma.ConsumerLegalNullableScalarRelationFilter, Prisma.ConsumerLegalWhereInput> | null
 }
@@ -197,7 +196,6 @@ export type ConsumerOrderByWithRelationInput = {
   updated_at?: Prisma.SortOrder
   accounts?: Prisma.ConsumerAccountOrderByRelationAggregateInput
   business_activities?: Prisma.BusinessActivityOrderByRelationAggregateInput
-  devices?: Prisma.ConsumerDevicesOrderByRelationAggregateInput
   individual?: Prisma.ConsumerIndividualOrderByWithRelationInput
   legal?: Prisma.ConsumerLegalOrderByWithRelationInput
   _relevance?: Prisma.ConsumerOrderByRelevanceInput
@@ -214,7 +212,6 @@ export type ConsumerWhereUniqueInput = Prisma.AtLeast<{
   updated_at?: Prisma.DateTimeFilter<"Consumer"> | Date | string
   accounts?: Prisma.ConsumerAccountListRelationFilter
   business_activities?: Prisma.BusinessActivityListRelationFilter
-  devices?: Prisma.ConsumerDevicesListRelationFilter
   individual?: Prisma.XOR<Prisma.ConsumerIndividualNullableScalarRelationFilter, Prisma.ConsumerIndividualWhereInput> | null
   legal?: Prisma.XOR<Prisma.ConsumerLegalNullableScalarRelationFilter, Prisma.ConsumerLegalWhereInput> | null
 }, "id">
@@ -249,7 +246,6 @@ export type ConsumerCreateInput = {
   updated_at?: Date | string
   accounts?: Prisma.ConsumerAccountCreateNestedManyWithoutConsumerInput
   business_activities?: Prisma.BusinessActivityCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesCreateNestedManyWithoutConsumerInput
   individual?: Prisma.ConsumerIndividualCreateNestedOneWithoutConsumerInput
   legal?: Prisma.ConsumerLegalCreateNestedOneWithoutConsumerInput
 }
@@ -262,7 +258,6 @@ export type ConsumerUncheckedCreateInput = {
   updated_at?: Date | string
   accounts?: Prisma.ConsumerAccountUncheckedCreateNestedManyWithoutConsumerInput
   business_activities?: Prisma.BusinessActivityUncheckedCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesUncheckedCreateNestedManyWithoutConsumerInput
   individual?: Prisma.ConsumerIndividualUncheckedCreateNestedOneWithoutConsumerInput
   legal?: Prisma.ConsumerLegalUncheckedCreateNestedOneWithoutConsumerInput
 }
@@ -275,7 +270,6 @@ export type ConsumerUpdateInput = {
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   accounts?: Prisma.ConsumerAccountUpdateManyWithoutConsumerNestedInput
   business_activities?: Prisma.BusinessActivityUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUpdateManyWithoutConsumerNestedInput
   individual?: Prisma.ConsumerIndividualUpdateOneWithoutConsumerNestedInput
   legal?: Prisma.ConsumerLegalUpdateOneWithoutConsumerNestedInput
 }
@@ -288,7 +282,6 @@ export type ConsumerUncheckedUpdateInput = {
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   accounts?: Prisma.ConsumerAccountUncheckedUpdateManyWithoutConsumerNestedInput
   business_activities?: Prisma.BusinessActivityUncheckedUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUncheckedUpdateManyWithoutConsumerNestedInput
   individual?: Prisma.ConsumerIndividualUncheckedUpdateOneWithoutConsumerNestedInput
   legal?: Prisma.ConsumerLegalUncheckedUpdateOneWithoutConsumerNestedInput
 }
@@ -352,20 +345,6 @@ export type ConsumerMinOrderByAggregateInput = {
   updated_at?: Prisma.SortOrder
 }
 
-export type ConsumerCreateNestedOneWithoutDevicesInput = {
-  create?: Prisma.XOR<Prisma.ConsumerCreateWithoutDevicesInput, Prisma.ConsumerUncheckedCreateWithoutDevicesInput>
-  connectOrCreate?: Prisma.ConsumerCreateOrConnectWithoutDevicesInput
-  connect?: Prisma.ConsumerWhereUniqueInput
-}
-
-export type ConsumerUpdateOneRequiredWithoutDevicesNestedInput = {
-  create?: Prisma.XOR<Prisma.ConsumerCreateWithoutDevicesInput, Prisma.ConsumerUncheckedCreateWithoutDevicesInput>
-  connectOrCreate?: Prisma.ConsumerCreateOrConnectWithoutDevicesInput
-  upsert?: Prisma.ConsumerUpsertWithoutDevicesInput
-  connect?: Prisma.ConsumerWhereUniqueInput
-  update?: Prisma.XOR<Prisma.XOR<Prisma.ConsumerUpdateToOneWithWhereWithoutDevicesInput, Prisma.ConsumerUpdateWithoutDevicesInput>, Prisma.ConsumerUncheckedUpdateWithoutDevicesInput>
-}
-
 export type ConsumerCreateNestedOneWithoutAccountsInput = {
   create?: Prisma.XOR<Prisma.ConsumerCreateWithoutAccountsInput, Prisma.ConsumerUncheckedCreateWithoutAccountsInput>
   connectOrCreate?: Prisma.ConsumerCreateOrConnectWithoutAccountsInput
@@ -430,70 +409,6 @@ export type ConsumerUpdateOneRequiredWithoutBusiness_activitiesNestedInput = {
   update?: Prisma.XOR<Prisma.XOR<Prisma.ConsumerUpdateToOneWithWhereWithoutBusiness_activitiesInput, Prisma.ConsumerUpdateWithoutBusiness_activitiesInput>, Prisma.ConsumerUncheckedUpdateWithoutBusiness_activitiesInput>
 }
 
-export type ConsumerCreateWithoutDevicesInput = {
-  id?: string
-  type: $Enums.ConsumerType
-  status?: $Enums.ConsumerStatus
-  created_at?: Date | string
-  updated_at?: Date | string
-  accounts?: Prisma.ConsumerAccountCreateNestedManyWithoutConsumerInput
-  business_activities?: Prisma.BusinessActivityCreateNestedManyWithoutConsumerInput
-  individual?: Prisma.ConsumerIndividualCreateNestedOneWithoutConsumerInput
-  legal?: Prisma.ConsumerLegalCreateNestedOneWithoutConsumerInput
-}
-
-export type ConsumerUncheckedCreateWithoutDevicesInput = {
-  id?: string
-  type: $Enums.ConsumerType
-  status?: $Enums.ConsumerStatus
-  created_at?: Date | string
-  updated_at?: Date | string
-  accounts?: Prisma.ConsumerAccountUncheckedCreateNestedManyWithoutConsumerInput
-  business_activities?: Prisma.BusinessActivityUncheckedCreateNestedManyWithoutConsumerInput
-  individual?: Prisma.ConsumerIndividualUncheckedCreateNestedOneWithoutConsumerInput
-  legal?: Prisma.ConsumerLegalUncheckedCreateNestedOneWithoutConsumerInput
-}
-
-export type ConsumerCreateOrConnectWithoutDevicesInput = {
-  where: Prisma.ConsumerWhereUniqueInput
-  create: Prisma.XOR<Prisma.ConsumerCreateWithoutDevicesInput, Prisma.ConsumerUncheckedCreateWithoutDevicesInput>
-}
-
-export type ConsumerUpsertWithoutDevicesInput = {
-  update: Prisma.XOR<Prisma.ConsumerUpdateWithoutDevicesInput, Prisma.ConsumerUncheckedUpdateWithoutDevicesInput>
-  create: Prisma.XOR<Prisma.ConsumerCreateWithoutDevicesInput, Prisma.ConsumerUncheckedCreateWithoutDevicesInput>
-  where?: Prisma.ConsumerWhereInput
-}
-
-export type ConsumerUpdateToOneWithWhereWithoutDevicesInput = {
-  where?: Prisma.ConsumerWhereInput
-  data: Prisma.XOR<Prisma.ConsumerUpdateWithoutDevicesInput, Prisma.ConsumerUncheckedUpdateWithoutDevicesInput>
-}
-
-export type ConsumerUpdateWithoutDevicesInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.EnumConsumerTypeFieldUpdateOperationsInput | $Enums.ConsumerType
-  status?: Prisma.EnumConsumerStatusFieldUpdateOperationsInput | $Enums.ConsumerStatus
-  created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  accounts?: Prisma.ConsumerAccountUpdateManyWithoutConsumerNestedInput
-  business_activities?: Prisma.BusinessActivityUpdateManyWithoutConsumerNestedInput
-  individual?: Prisma.ConsumerIndividualUpdateOneWithoutConsumerNestedInput
-  legal?: Prisma.ConsumerLegalUpdateOneWithoutConsumerNestedInput
-}
-
-export type ConsumerUncheckedUpdateWithoutDevicesInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.EnumConsumerTypeFieldUpdateOperationsInput | $Enums.ConsumerType
-  status?: Prisma.EnumConsumerStatusFieldUpdateOperationsInput | $Enums.ConsumerStatus
-  created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  accounts?: Prisma.ConsumerAccountUncheckedUpdateManyWithoutConsumerNestedInput
-  business_activities?: Prisma.BusinessActivityUncheckedUpdateManyWithoutConsumerNestedInput
-  individual?: Prisma.ConsumerIndividualUncheckedUpdateOneWithoutConsumerNestedInput
-  legal?: Prisma.ConsumerLegalUncheckedUpdateOneWithoutConsumerNestedInput
-}
-
 export type ConsumerCreateWithoutAccountsInput = {
   id?: string
   type: $Enums.ConsumerType
@@ -501,7 +416,6 @@ export type ConsumerCreateWithoutAccountsInput = {
   created_at?: Date | string
   updated_at?: Date | string
   business_activities?: Prisma.BusinessActivityCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesCreateNestedManyWithoutConsumerInput
   individual?: Prisma.ConsumerIndividualCreateNestedOneWithoutConsumerInput
   legal?: Prisma.ConsumerLegalCreateNestedOneWithoutConsumerInput
 }
@@ -513,7 +427,6 @@ export type ConsumerUncheckedCreateWithoutAccountsInput = {
   created_at?: Date | string
   updated_at?: Date | string
   business_activities?: Prisma.BusinessActivityUncheckedCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesUncheckedCreateNestedManyWithoutConsumerInput
   individual?: Prisma.ConsumerIndividualUncheckedCreateNestedOneWithoutConsumerInput
   legal?: Prisma.ConsumerLegalUncheckedCreateNestedOneWithoutConsumerInput
 }
@@ -541,7 +454,6 @@ export type ConsumerUpdateWithoutAccountsInput = {
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   business_activities?: Prisma.BusinessActivityUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUpdateManyWithoutConsumerNestedInput
   individual?: Prisma.ConsumerIndividualUpdateOneWithoutConsumerNestedInput
   legal?: Prisma.ConsumerLegalUpdateOneWithoutConsumerNestedInput
 }
@@ -553,7 +465,6 @@ export type ConsumerUncheckedUpdateWithoutAccountsInput = {
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   business_activities?: Prisma.BusinessActivityUncheckedUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUncheckedUpdateManyWithoutConsumerNestedInput
   individual?: Prisma.ConsumerIndividualUncheckedUpdateOneWithoutConsumerNestedInput
   legal?: Prisma.ConsumerLegalUncheckedUpdateOneWithoutConsumerNestedInput
 }
@@ -566,7 +477,6 @@ export type ConsumerCreateWithoutIndividualInput = {
   updated_at?: Date | string
   accounts?: Prisma.ConsumerAccountCreateNestedManyWithoutConsumerInput
   business_activities?: Prisma.BusinessActivityCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesCreateNestedManyWithoutConsumerInput
   legal?: Prisma.ConsumerLegalCreateNestedOneWithoutConsumerInput
 }
 
@@ -578,7 +488,6 @@ export type ConsumerUncheckedCreateWithoutIndividualInput = {
   updated_at?: Date | string
   accounts?: Prisma.ConsumerAccountUncheckedCreateNestedManyWithoutConsumerInput
   business_activities?: Prisma.BusinessActivityUncheckedCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesUncheckedCreateNestedManyWithoutConsumerInput
   legal?: Prisma.ConsumerLegalUncheckedCreateNestedOneWithoutConsumerInput
 }
 
@@ -606,7 +515,6 @@ export type ConsumerUpdateWithoutIndividualInput = {
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   accounts?: Prisma.ConsumerAccountUpdateManyWithoutConsumerNestedInput
   business_activities?: Prisma.BusinessActivityUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUpdateManyWithoutConsumerNestedInput
   legal?: Prisma.ConsumerLegalUpdateOneWithoutConsumerNestedInput
 }
 
@@ -618,7 +526,6 @@ export type ConsumerUncheckedUpdateWithoutIndividualInput = {
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   accounts?: Prisma.ConsumerAccountUncheckedUpdateManyWithoutConsumerNestedInput
   business_activities?: Prisma.BusinessActivityUncheckedUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUncheckedUpdateManyWithoutConsumerNestedInput
   legal?: Prisma.ConsumerLegalUncheckedUpdateOneWithoutConsumerNestedInput
 }
 
@@ -630,7 +537,6 @@ export type ConsumerCreateWithoutLegalInput = {
   updated_at?: Date | string
   accounts?: Prisma.ConsumerAccountCreateNestedManyWithoutConsumerInput
   business_activities?: Prisma.BusinessActivityCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesCreateNestedManyWithoutConsumerInput
   individual?: Prisma.ConsumerIndividualCreateNestedOneWithoutConsumerInput
 }
 
@@ -642,7 +548,6 @@ export type ConsumerUncheckedCreateWithoutLegalInput = {
   updated_at?: Date | string
   accounts?: Prisma.ConsumerAccountUncheckedCreateNestedManyWithoutConsumerInput
   business_activities?: Prisma.BusinessActivityUncheckedCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesUncheckedCreateNestedManyWithoutConsumerInput
   individual?: Prisma.ConsumerIndividualUncheckedCreateNestedOneWithoutConsumerInput
 }
 
@@ -670,7 +575,6 @@ export type ConsumerUpdateWithoutLegalInput = {
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   accounts?: Prisma.ConsumerAccountUpdateManyWithoutConsumerNestedInput
   business_activities?: Prisma.BusinessActivityUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUpdateManyWithoutConsumerNestedInput
   individual?: Prisma.ConsumerIndividualUpdateOneWithoutConsumerNestedInput
 }
 
@@ -682,7 +586,6 @@ export type ConsumerUncheckedUpdateWithoutLegalInput = {
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   accounts?: Prisma.ConsumerAccountUncheckedUpdateManyWithoutConsumerNestedInput
   business_activities?: Prisma.BusinessActivityUncheckedUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUncheckedUpdateManyWithoutConsumerNestedInput
   individual?: Prisma.ConsumerIndividualUncheckedUpdateOneWithoutConsumerNestedInput
 }
 
@@ -693,7 +596,6 @@ export type ConsumerCreateWithoutBusiness_activitiesInput = {
   created_at?: Date | string
   updated_at?: Date | string
   accounts?: Prisma.ConsumerAccountCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesCreateNestedManyWithoutConsumerInput
   individual?: Prisma.ConsumerIndividualCreateNestedOneWithoutConsumerInput
   legal?: Prisma.ConsumerLegalCreateNestedOneWithoutConsumerInput
 }
@@ -705,7 +607,6 @@ export type ConsumerUncheckedCreateWithoutBusiness_activitiesInput = {
   created_at?: Date | string
   updated_at?: Date | string
   accounts?: Prisma.ConsumerAccountUncheckedCreateNestedManyWithoutConsumerInput
-  devices?: Prisma.ConsumerDevicesUncheckedCreateNestedManyWithoutConsumerInput
   individual?: Prisma.ConsumerIndividualUncheckedCreateNestedOneWithoutConsumerInput
   legal?: Prisma.ConsumerLegalUncheckedCreateNestedOneWithoutConsumerInput
 }
@@ -733,7 +634,6 @@ export type ConsumerUpdateWithoutBusiness_activitiesInput = {
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   accounts?: Prisma.ConsumerAccountUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUpdateManyWithoutConsumerNestedInput
   individual?: Prisma.ConsumerIndividualUpdateOneWithoutConsumerNestedInput
   legal?: Prisma.ConsumerLegalUpdateOneWithoutConsumerNestedInput
 }
@@ -745,7 +645,6 @@ export type ConsumerUncheckedUpdateWithoutBusiness_activitiesInput = {
   created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   accounts?: Prisma.ConsumerAccountUncheckedUpdateManyWithoutConsumerNestedInput
-  devices?: Prisma.ConsumerDevicesUncheckedUpdateManyWithoutConsumerNestedInput
   individual?: Prisma.ConsumerIndividualUncheckedUpdateOneWithoutConsumerNestedInput
   legal?: Prisma.ConsumerLegalUncheckedUpdateOneWithoutConsumerNestedInput
 }
@@ -758,13 +657,11 @@ export type ConsumerUncheckedUpdateWithoutBusiness_activitiesInput = {
 export type ConsumerCountOutputType = {
   accounts: number
   business_activities: number
-  devices: number
 }
 
 export type ConsumerCountOutputTypeSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
   accounts?: boolean | ConsumerCountOutputTypeCountAccountsArgs
   business_activities?: boolean | ConsumerCountOutputTypeCountBusiness_activitiesArgs
-  devices?: boolean | ConsumerCountOutputTypeCountDevicesArgs
 }
 
 /**
@@ -791,13 +688,6 @@ export type ConsumerCountOutputTypeCountBusiness_activitiesArgs<ExtArgs extends
   where?: Prisma.BusinessActivityWhereInput
 }
 
-/**
- * ConsumerCountOutputType without action
- */
-export type ConsumerCountOutputTypeCountDevicesArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.ConsumerDevicesWhereInput
-}
-
 
 export type ConsumerSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
   id?: boolean
@@ -807,7 +697,6 @@ export type ConsumerSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs
   updated_at?: boolean
   accounts?: boolean | Prisma.Consumer$accountsArgs<ExtArgs>
   business_activities?: boolean | Prisma.Consumer$business_activitiesArgs<ExtArgs>
-  devices?: boolean | Prisma.Consumer$devicesArgs<ExtArgs>
   individual?: boolean | Prisma.Consumer$individualArgs<ExtArgs>
   legal?: boolean | Prisma.Consumer$legalArgs<ExtArgs>
   _count?: boolean | Prisma.ConsumerCountOutputTypeDefaultArgs<ExtArgs>
@@ -827,7 +716,6 @@ export type ConsumerOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs =
 export type ConsumerInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
   accounts?: boolean | Prisma.Consumer$accountsArgs<ExtArgs>
   business_activities?: boolean | Prisma.Consumer$business_activitiesArgs<ExtArgs>
-  devices?: boolean | Prisma.Consumer$devicesArgs<ExtArgs>
   individual?: boolean | Prisma.Consumer$individualArgs<ExtArgs>
   legal?: boolean | Prisma.Consumer$legalArgs<ExtArgs>
   _count?: boolean | Prisma.ConsumerCountOutputTypeDefaultArgs<ExtArgs>
@@ -838,7 +726,6 @@ export type $ConsumerPayload<ExtArgs extends runtime.Types.Extensions.InternalAr
   objects: {
     accounts: Prisma.$ConsumerAccountPayload<ExtArgs>[]
     business_activities: Prisma.$BusinessActivityPayload<ExtArgs>[]
-    devices: Prisma.$ConsumerDevicesPayload<ExtArgs>[]
     individual: Prisma.$ConsumerIndividualPayload<ExtArgs> | null
     legal: Prisma.$ConsumerLegalPayload<ExtArgs> | null
   }
@@ -1190,7 +1077,6 @@ export interface Prisma__ConsumerClient<T, Null = never, ExtArgs extends runtime
   readonly [Symbol.toStringTag]: "PrismaPromise"
   accounts<T extends Prisma.Consumer$accountsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.Consumer$accountsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ConsumerAccountPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
   business_activities<T extends Prisma.Consumer$business_activitiesArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.Consumer$business_activitiesArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$BusinessActivityPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
-  devices<T extends Prisma.Consumer$devicesArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.Consumer$devicesArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ConsumerDevicesPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
   individual<T extends Prisma.Consumer$individualArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.Consumer$individualArgs<ExtArgs>>): Prisma.Prisma__ConsumerIndividualClient<runtime.Types.Result.GetResult<Prisma.$ConsumerIndividualPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
   legal<T extends Prisma.Consumer$legalArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.Consumer$legalArgs<ExtArgs>>): Prisma.Prisma__ConsumerLegalClient<runtime.Types.Result.GetResult<Prisma.$ConsumerLegalPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
   /**
@@ -1622,30 +1508,6 @@ export type Consumer$business_activitiesArgs<ExtArgs extends runtime.Types.Exten
   distinct?: Prisma.BusinessActivityScalarFieldEnum | Prisma.BusinessActivityScalarFieldEnum[]
 }
 
-/**
- * Consumer.devices
- */
-export type Consumer$devicesArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ConsumerDevices
-   */
-  select?: Prisma.ConsumerDevicesSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ConsumerDevices
-   */
-  omit?: Prisma.ConsumerDevicesOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ConsumerDevicesInclude<ExtArgs> | null
-  where?: Prisma.ConsumerDevicesWhereInput
-  orderBy?: Prisma.ConsumerDevicesOrderByWithRelationInput | Prisma.ConsumerDevicesOrderByWithRelationInput[]
-  cursor?: Prisma.ConsumerDevicesWhereUniqueInput
-  take?: number
-  skip?: number
-  distinct?: Prisma.ConsumerDevicesScalarFieldEnum | Prisma.ConsumerDevicesScalarFieldEnum[]
-}
-
 /**
  * Consumer.individual
  */

src/generated/prisma/models/ConsumerAccount.ts

@@ -196,6 +196,7 @@ export type ConsumerAccountWhereInput = {
   permission?: Prisma.XOR<Prisma.PermissionConsumerNullableScalarRelationFilter, Prisma.PermissionConsumerWhereInput> | null
   account_allocation?: Prisma.XOR<Prisma.LicenseAccountAllocationNullableScalarRelationFilter, Prisma.LicenseAccountAllocationWhereInput> | null
   sales_invoices?: Prisma.SalesInvoiceListRelationFilter
+  account_device?: Prisma.XOR<Prisma.ConsumerAccountDeviceNullableScalarRelationFilter, Prisma.ConsumerAccountDeviceWhereInput> | null
 }
 
 export type ConsumerAccountOrderByWithRelationInput = {
@@ -211,6 +212,7 @@ export type ConsumerAccountOrderByWithRelationInput = {
   permission?: Prisma.PermissionConsumerOrderByWithRelationInput
   account_allocation?: Prisma.LicenseAccountAllocationOrderByWithRelationInput
   sales_invoices?: Prisma.SalesInvoiceOrderByRelationAggregateInput
+  account_device?: Prisma.ConsumerAccountDeviceOrderByWithRelationInput
   _relevance?: Prisma.ConsumerAccountOrderByRelevanceInput
 }
 
@@ -230,6 +232,7 @@ export type ConsumerAccountWhereUniqueInput = Prisma.AtLeast<{
   permission?: Prisma.XOR<Prisma.PermissionConsumerNullableScalarRelationFilter, Prisma.PermissionConsumerWhereInput> | null
   account_allocation?: Prisma.XOR<Prisma.LicenseAccountAllocationNullableScalarRelationFilter, Prisma.LicenseAccountAllocationWhereInput> | null
   sales_invoices?: Prisma.SalesInvoiceListRelationFilter
+  account_device?: Prisma.XOR<Prisma.ConsumerAccountDeviceNullableScalarRelationFilter, Prisma.ConsumerAccountDeviceWhereInput> | null
 }, "id" | "account_id">
 
 export type ConsumerAccountOrderByWithAggregationInput = {
@@ -267,6 +270,7 @@ export type ConsumerAccountCreateInput = {
   permission?: Prisma.PermissionConsumerCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountUncheckedCreateInput = {
@@ -280,6 +284,7 @@ export type ConsumerAccountUncheckedCreateInput = {
   permission?: Prisma.PermissionConsumerUncheckedCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountUpdateInput = {
@@ -293,6 +298,7 @@ export type ConsumerAccountUpdateInput = {
   permission?: Prisma.PermissionConsumerUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountUncheckedUpdateInput = {
@@ -306,6 +312,7 @@ export type ConsumerAccountUncheckedUpdateInput = {
   permission?: Prisma.PermissionConsumerUncheckedUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountCreateManyInput = {
@@ -448,6 +455,20 @@ export type ConsumerAccountUpdateOneRequiredWithoutPermissionNestedInput = {
   update?: Prisma.XOR<Prisma.XOR<Prisma.ConsumerAccountUpdateToOneWithWhereWithoutPermissionInput, Prisma.ConsumerAccountUpdateWithoutPermissionInput>, Prisma.ConsumerAccountUncheckedUpdateWithoutPermissionInput>
 }
 
+export type ConsumerAccountCreateNestedOneWithoutAccount_deviceInput = {
+  create?: Prisma.XOR<Prisma.ConsumerAccountCreateWithoutAccount_deviceInput, Prisma.ConsumerAccountUncheckedCreateWithoutAccount_deviceInput>
+  connectOrCreate?: Prisma.ConsumerAccountCreateOrConnectWithoutAccount_deviceInput
+  connect?: Prisma.ConsumerAccountWhereUniqueInput
+}
+
+export type ConsumerAccountUpdateOneRequiredWithoutAccount_deviceNestedInput = {
+  create?: Prisma.XOR<Prisma.ConsumerAccountCreateWithoutAccount_deviceInput, Prisma.ConsumerAccountUncheckedCreateWithoutAccount_deviceInput>
+  connectOrCreate?: Prisma.ConsumerAccountCreateOrConnectWithoutAccount_deviceInput
+  upsert?: Prisma.ConsumerAccountUpsertWithoutAccount_deviceInput
+  connect?: Prisma.ConsumerAccountWhereUniqueInput
+  update?: Prisma.XOR<Prisma.XOR<Prisma.ConsumerAccountUpdateToOneWithWhereWithoutAccount_deviceInput, Prisma.ConsumerAccountUpdateWithoutAccount_deviceInput>, Prisma.ConsumerAccountUncheckedUpdateWithoutAccount_deviceInput>
+}
+
 export type EnumConsumerRoleFieldUpdateOperationsInput = {
   set?: $Enums.ConsumerRole
 }
@@ -532,6 +553,7 @@ export type ConsumerAccountCreateWithoutAccountInput = {
   permission?: Prisma.PermissionConsumerCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountUncheckedCreateWithoutAccountInput = {
@@ -544,6 +566,7 @@ export type ConsumerAccountUncheckedCreateWithoutAccountInput = {
   permission?: Prisma.PermissionConsumerUncheckedCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountCreateOrConnectWithoutAccountInput = {
@@ -572,6 +595,7 @@ export type ConsumerAccountUpdateWithoutAccountInput = {
   permission?: Prisma.PermissionConsumerUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountUncheckedUpdateWithoutAccountInput = {
@@ -584,6 +608,7 @@ export type ConsumerAccountUncheckedUpdateWithoutAccountInput = {
   permission?: Prisma.PermissionConsumerUncheckedUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountCreateWithoutAccount_allocationInput = {
@@ -596,6 +621,7 @@ export type ConsumerAccountCreateWithoutAccount_allocationInput = {
   pos?: Prisma.PosCreateNestedOneWithoutAccountInput
   permission?: Prisma.PermissionConsumerCreateNestedOneWithoutConsumer_accountInput
   sales_invoices?: Prisma.SalesInvoiceCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountUncheckedCreateWithoutAccount_allocationInput = {
@@ -608,6 +634,7 @@ export type ConsumerAccountUncheckedCreateWithoutAccount_allocationInput = {
   pos?: Prisma.PosUncheckedCreateNestedOneWithoutAccountInput
   permission?: Prisma.PermissionConsumerUncheckedCreateNestedOneWithoutConsumer_accountInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountCreateOrConnectWithoutAccount_allocationInput = {
@@ -636,6 +663,7 @@ export type ConsumerAccountUpdateWithoutAccount_allocationInput = {
   pos?: Prisma.PosUpdateOneWithoutAccountNestedInput
   permission?: Prisma.PermissionConsumerUpdateOneWithoutConsumer_accountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountUncheckedUpdateWithoutAccount_allocationInput = {
@@ -648,6 +676,7 @@ export type ConsumerAccountUncheckedUpdateWithoutAccount_allocationInput = {
   pos?: Prisma.PosUncheckedUpdateOneWithoutAccountNestedInput
   permission?: Prisma.PermissionConsumerUncheckedUpdateOneWithoutConsumer_accountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountCreateWithoutPermissionInput = {
@@ -660,6 +689,7 @@ export type ConsumerAccountCreateWithoutPermissionInput = {
   pos?: Prisma.PosCreateNestedOneWithoutAccountInput
   account_allocation?: Prisma.LicenseAccountAllocationCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountUncheckedCreateWithoutPermissionInput = {
@@ -672,6 +702,7 @@ export type ConsumerAccountUncheckedCreateWithoutPermissionInput = {
   pos?: Prisma.PosUncheckedCreateNestedOneWithoutAccountInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountCreateOrConnectWithoutPermissionInput = {
@@ -700,6 +731,7 @@ export type ConsumerAccountUpdateWithoutPermissionInput = {
   pos?: Prisma.PosUpdateOneWithoutAccountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountUncheckedUpdateWithoutPermissionInput = {
@@ -712,6 +744,75 @@ export type ConsumerAccountUncheckedUpdateWithoutPermissionInput = {
   pos?: Prisma.PosUncheckedUpdateOneWithoutAccountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedUpdateOneWithoutConsumer_accountNestedInput
+}
+
+export type ConsumerAccountCreateWithoutAccount_deviceInput = {
+  id?: string
+  role: $Enums.ConsumerRole
+  created_at?: Date | string
+  updated_at?: Date | string
+  consumer: Prisma.ConsumerCreateNestedOneWithoutAccountsInput
+  account: Prisma.AccountCreateNestedOneWithoutConsumer_accountInput
+  pos?: Prisma.PosCreateNestedOneWithoutAccountInput
+  permission?: Prisma.PermissionConsumerCreateNestedOneWithoutConsumer_accountInput
+  account_allocation?: Prisma.LicenseAccountAllocationCreateNestedOneWithoutAccountInput
+  sales_invoices?: Prisma.SalesInvoiceCreateNestedManyWithoutConsumer_accountInput
+}
+
+export type ConsumerAccountUncheckedCreateWithoutAccount_deviceInput = {
+  id?: string
+  role: $Enums.ConsumerRole
+  created_at?: Date | string
+  updated_at?: Date | string
+  consumer_id: string
+  account_id: string
+  pos?: Prisma.PosUncheckedCreateNestedOneWithoutAccountInput
+  permission?: Prisma.PermissionConsumerUncheckedCreateNestedOneWithoutConsumer_accountInput
+  account_allocation?: Prisma.LicenseAccountAllocationUncheckedCreateNestedOneWithoutAccountInput
+  sales_invoices?: Prisma.SalesInvoiceUncheckedCreateNestedManyWithoutConsumer_accountInput
+}
+
+export type ConsumerAccountCreateOrConnectWithoutAccount_deviceInput = {
+  where: Prisma.ConsumerAccountWhereUniqueInput
+  create: Prisma.XOR<Prisma.ConsumerAccountCreateWithoutAccount_deviceInput, Prisma.ConsumerAccountUncheckedCreateWithoutAccount_deviceInput>
+}
+
+export type ConsumerAccountUpsertWithoutAccount_deviceInput = {
+  update: Prisma.XOR<Prisma.ConsumerAccountUpdateWithoutAccount_deviceInput, Prisma.ConsumerAccountUncheckedUpdateWithoutAccount_deviceInput>
+  create: Prisma.XOR<Prisma.ConsumerAccountCreateWithoutAccount_deviceInput, Prisma.ConsumerAccountUncheckedCreateWithoutAccount_deviceInput>
+  where?: Prisma.ConsumerAccountWhereInput
+}
+
+export type ConsumerAccountUpdateToOneWithWhereWithoutAccount_deviceInput = {
+  where?: Prisma.ConsumerAccountWhereInput
+  data: Prisma.XOR<Prisma.ConsumerAccountUpdateWithoutAccount_deviceInput, Prisma.ConsumerAccountUncheckedUpdateWithoutAccount_deviceInput>
+}
+
+export type ConsumerAccountUpdateWithoutAccount_deviceInput = {
+  id?: Prisma.StringFieldUpdateOperationsInput | string
+  role?: Prisma.EnumConsumerRoleFieldUpdateOperationsInput | $Enums.ConsumerRole
+  created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
+  updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
+  consumer?: Prisma.ConsumerUpdateOneRequiredWithoutAccountsNestedInput
+  account?: Prisma.AccountUpdateOneRequiredWithoutConsumer_accountNestedInput
+  pos?: Prisma.PosUpdateOneWithoutAccountNestedInput
+  permission?: Prisma.PermissionConsumerUpdateOneWithoutConsumer_accountNestedInput
+  account_allocation?: Prisma.LicenseAccountAllocationUpdateOneWithoutAccountNestedInput
+  sales_invoices?: Prisma.SalesInvoiceUpdateManyWithoutConsumer_accountNestedInput
+}
+
+export type ConsumerAccountUncheckedUpdateWithoutAccount_deviceInput = {
+  id?: Prisma.StringFieldUpdateOperationsInput | string
+  role?: Prisma.EnumConsumerRoleFieldUpdateOperationsInput | $Enums.ConsumerRole
+  created_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
+  updated_at?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
+  consumer_id?: Prisma.StringFieldUpdateOperationsInput | string
+  account_id?: Prisma.StringFieldUpdateOperationsInput | string
+  pos?: Prisma.PosUncheckedUpdateOneWithoutAccountNestedInput
+  permission?: Prisma.PermissionConsumerUncheckedUpdateOneWithoutConsumer_accountNestedInput
+  account_allocation?: Prisma.LicenseAccountAllocationUncheckedUpdateOneWithoutAccountNestedInput
+  sales_invoices?: Prisma.SalesInvoiceUncheckedUpdateManyWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountCreateWithoutConsumerInput = {
@@ -724,6 +825,7 @@ export type ConsumerAccountCreateWithoutConsumerInput = {
   permission?: Prisma.PermissionConsumerCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountUncheckedCreateWithoutConsumerInput = {
@@ -736,6 +838,7 @@ export type ConsumerAccountUncheckedCreateWithoutConsumerInput = {
   permission?: Prisma.PermissionConsumerUncheckedCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountCreateOrConnectWithoutConsumerInput = {
@@ -786,6 +889,7 @@ export type ConsumerAccountCreateWithoutPosInput = {
   permission?: Prisma.PermissionConsumerCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountUncheckedCreateWithoutPosInput = {
@@ -798,6 +902,7 @@ export type ConsumerAccountUncheckedCreateWithoutPosInput = {
   permission?: Prisma.PermissionConsumerUncheckedCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedCreateNestedOneWithoutAccountInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedCreateNestedManyWithoutConsumer_accountInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountCreateOrConnectWithoutPosInput = {
@@ -826,6 +931,7 @@ export type ConsumerAccountUpdateWithoutPosInput = {
   permission?: Prisma.PermissionConsumerUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountUncheckedUpdateWithoutPosInput = {
@@ -838,6 +944,7 @@ export type ConsumerAccountUncheckedUpdateWithoutPosInput = {
   permission?: Prisma.PermissionConsumerUncheckedUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountCreateWithoutSales_invoicesInput = {
@@ -850,6 +957,7 @@ export type ConsumerAccountCreateWithoutSales_invoicesInput = {
   pos?: Prisma.PosCreateNestedOneWithoutAccountInput
   permission?: Prisma.PermissionConsumerCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationCreateNestedOneWithoutAccountInput
+  account_device?: Prisma.ConsumerAccountDeviceCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountUncheckedCreateWithoutSales_invoicesInput = {
@@ -862,6 +970,7 @@ export type ConsumerAccountUncheckedCreateWithoutSales_invoicesInput = {
   pos?: Prisma.PosUncheckedCreateNestedOneWithoutAccountInput
   permission?: Prisma.PermissionConsumerUncheckedCreateNestedOneWithoutConsumer_accountInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedCreateNestedOneWithoutAccountInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedCreateNestedOneWithoutConsumer_accountInput
 }
 
 export type ConsumerAccountCreateOrConnectWithoutSales_invoicesInput = {
@@ -890,6 +999,7 @@ export type ConsumerAccountUpdateWithoutSales_invoicesInput = {
   pos?: Prisma.PosUpdateOneWithoutAccountNestedInput
   permission?: Prisma.PermissionConsumerUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUpdateOneWithoutAccountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountUncheckedUpdateWithoutSales_invoicesInput = {
@@ -902,6 +1012,7 @@ export type ConsumerAccountUncheckedUpdateWithoutSales_invoicesInput = {
   pos?: Prisma.PosUncheckedUpdateOneWithoutAccountNestedInput
   permission?: Prisma.PermissionConsumerUncheckedUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedUpdateOneWithoutAccountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountCreateManyConsumerInput = {
@@ -922,6 +1033,7 @@ export type ConsumerAccountUpdateWithoutConsumerInput = {
   permission?: Prisma.PermissionConsumerUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountUncheckedUpdateWithoutConsumerInput = {
@@ -934,6 +1046,7 @@ export type ConsumerAccountUncheckedUpdateWithoutConsumerInput = {
   permission?: Prisma.PermissionConsumerUncheckedUpdateOneWithoutConsumer_accountNestedInput
   account_allocation?: Prisma.LicenseAccountAllocationUncheckedUpdateOneWithoutAccountNestedInput
   sales_invoices?: Prisma.SalesInvoiceUncheckedUpdateManyWithoutConsumer_accountNestedInput
+  account_device?: Prisma.ConsumerAccountDeviceUncheckedUpdateOneWithoutConsumer_accountNestedInput
 }
 
 export type ConsumerAccountUncheckedUpdateManyWithoutConsumerInput = {
@@ -988,6 +1101,7 @@ export type ConsumerAccountSelect<ExtArgs extends runtime.Types.Extensions.Inter
   permission?: boolean | Prisma.ConsumerAccount$permissionArgs<ExtArgs>
   account_allocation?: boolean | Prisma.ConsumerAccount$account_allocationArgs<ExtArgs>
   sales_invoices?: boolean | Prisma.ConsumerAccount$sales_invoicesArgs<ExtArgs>
+  account_device?: boolean | Prisma.ConsumerAccount$account_deviceArgs<ExtArgs>
   _count?: boolean | Prisma.ConsumerAccountCountOutputTypeDefaultArgs<ExtArgs>
 }, ExtArgs["result"]["consumerAccount"]>
 
@@ -1010,6 +1124,7 @@ export type ConsumerAccountInclude<ExtArgs extends runtime.Types.Extensions.Inte
   permission?: boolean | Prisma.ConsumerAccount$permissionArgs<ExtArgs>
   account_allocation?: boolean | Prisma.ConsumerAccount$account_allocationArgs<ExtArgs>
   sales_invoices?: boolean | Prisma.ConsumerAccount$sales_invoicesArgs<ExtArgs>
+  account_device?: boolean | Prisma.ConsumerAccount$account_deviceArgs<ExtArgs>
   _count?: boolean | Prisma.ConsumerAccountCountOutputTypeDefaultArgs<ExtArgs>
 }
 
@@ -1022,6 +1137,7 @@ export type $ConsumerAccountPayload<ExtArgs extends runtime.Types.Extensions.Int
     permission: Prisma.$PermissionConsumerPayload<ExtArgs> | null
     account_allocation: Prisma.$LicenseAccountAllocationPayload<ExtArgs> | null
     sales_invoices: Prisma.$SalesInvoicePayload<ExtArgs>[]
+    account_device: Prisma.$ConsumerAccountDevicePayload<ExtArgs> | null
   }
   scalars: runtime.Types.Extensions.GetPayloadResult<{
     id: string
@@ -1376,6 +1492,7 @@ export interface Prisma__ConsumerAccountClient<T, Null = never, ExtArgs extends
   permission<T extends Prisma.ConsumerAccount$permissionArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.ConsumerAccount$permissionArgs<ExtArgs>>): Prisma.Prisma__PermissionConsumerClient<runtime.Types.Result.GetResult<Prisma.$PermissionConsumerPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
   account_allocation<T extends Prisma.ConsumerAccount$account_allocationArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.ConsumerAccount$account_allocationArgs<ExtArgs>>): Prisma.Prisma__LicenseAccountAllocationClient<runtime.Types.Result.GetResult<Prisma.$LicenseAccountAllocationPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
   sales_invoices<T extends Prisma.ConsumerAccount$sales_invoicesArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.ConsumerAccount$sales_invoicesArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$SalesInvoicePayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
+  account_device<T extends Prisma.ConsumerAccount$account_deviceArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.ConsumerAccount$account_deviceArgs<ExtArgs>>): Prisma.Prisma__ConsumerAccountDeviceClient<runtime.Types.Result.GetResult<Prisma.$ConsumerAccountDevicePayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
   /**
    * Attaches callbacks for the resolution and/or rejection of the Promise.
    * @param onfulfilled The callback to execute when the Promise is resolved.
@@ -1839,6 +1956,25 @@ export type ConsumerAccount$sales_invoicesArgs<ExtArgs extends runtime.Types.Ext
   distinct?: Prisma.SalesInvoiceScalarFieldEnum | Prisma.SalesInvoiceScalarFieldEnum[]
 }
 
+/**
+ * ConsumerAccount.account_device
+ */
+export type ConsumerAccount$account_deviceArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
+  /**
+   * Select specific fields to fetch from the ConsumerAccountDevice
+   */
+  select?: Prisma.ConsumerAccountDeviceSelect<ExtArgs> | null
+  /**
+   * Omit specific fields from the ConsumerAccountDevice
+   */
+  omit?: Prisma.ConsumerAccountDeviceOmit<ExtArgs> | null
+  /**
+   * Choose, which related nodes to fetch as well
+   */
+  include?: Prisma.ConsumerAccountDeviceInclude<ExtArgs> | null
+  where?: Prisma.ConsumerAccountDeviceWhereInput
+}
+
 /**
  * ConsumerAccount without action
  */

src/modules/application/application.module.ts

@@ -3,11 +3,10 @@ import { JwtService } from '@nestjs/jwt'
 import { AppController } from './application.controller'
 import { AppService } from './application.service'
 import { ApplicationAuthModule } from './auth/auth.module'
-import { ApplicationConfigModule } from './config/config.module'
 
 @Module({
   controllers: [AppController],
   providers: [AppService, JwtService],
-  imports: [ApplicationConfigModule, ApplicationAuthModule],
+  imports: [ApplicationAuthModule],
 })
 export class ApplicationModule {}

src/modules/application/config/config.controller.ts

@@ -1,21 +0,0 @@
-import { Public } from '@/common/decorators/public.decorator'
-import { TokenAccount } from '@/common/decorators/tokenInfo.decorator'
-import { Body, Controller, Get, Param, Post } from '@nestjs/common'
-import { ConfigService } from './config.service'
-import { CreateConfigDto } from './dto/create-config.dto'
-
-@Controller('app/config')
-export class ConfigController {
-  constructor(private readonly configService: ConfigService) {}
-
-  @Get(':id')
-  findOne(@Param('id') uuid: string) {
-    return this.configService.findOne(uuid)
-  }
-
-  @Post()
-  @Public()
-  create(@TokenAccount('userId') consumerId: string, @Body() data: CreateConfigDto) {
-    return this.configService.create(consumerId, data)
-  }
-}

src/modules/application/config/config.module.ts

@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common'
-import { ConfigController } from './config.controller'
-import { ConfigService } from './config.service'
-
-@Module({
-  controllers: [ConfigController],
-  providers: [ConfigService],
-})
-export class ApplicationConfigModule {}

src/modules/application/config/config.service.ts

@@ -1,83 +0,0 @@
-import { QUERY_CONSTANTS } from '@/common/queryConstants'
-import { ConsumerDevicesSelect } from '@/generated/prisma/models'
-import { PrismaService } from '@/prisma/prisma.service'
-import { BadRequestException, Injectable } from '@nestjs/common'
-import { ResponseMapper } from 'common/response/response-mapper'
-import { CreateConfigDto } from './dto/create-config.dto'
-
-@Injectable()
-export class ConfigService {
-  constructor(private prisma: PrismaService) {}
-
-  private readonly defaultSelect: ConsumerDevicesSelect = {
-    uuid: true,
-    app_version: true,
-    brand: true,
-    browser_name: true,
-    build_number: true,
-    device: true,
-    os_version: true,
-    fcm_token: true,
-    model: true,
-    platform: true,
-    release_number: true,
-    sdk_version: true,
-    consumer: {
-      select: {
-        id: true,
-        ...QUERY_CONSTANTS.CONSUMER.infoSelect,
-      },
-    },
-  }
-
-  async findOne(uuid: string) {
-    const config = await this.prisma.consumerDevices.findUnique({
-      where: {
-        uuid,
-      },
-      select: this.defaultSelect,
-    })
-
-    return ResponseMapper.single(config)
-  }
-
-  async create(consumer_id: string, data: CreateConfigDto) {
-    const prevConfig = await this.prisma.consumerDevices.findUnique({
-      where: {
-        uuid: data.uuid,
-      },
-      select: {
-        consumer_id: true,
-      },
-    })
-
-    if (prevConfig && consumer_id !== prevConfig.consumer_id) {
-      throw new BadRequestException('این دستگاه با کاربری دیگری ثبت شده است.')
-    }
-
-    const config = await this.prisma.consumerDevices.upsert({
-      where: {
-        uuid: data.uuid,
-      },
-      update: {
-        ...data,
-        consumer: {
-          connect: {
-            id: consumer_id,
-          },
-        },
-      },
-      create: {
-        ...data,
-        consumer: {
-          connect: {
-            id: consumer_id,
-          },
-        },
-      },
-      select: this.defaultSelect,
-    })
-
-    return ResponseMapper.create(config)
-  }
-}

src/modules/application/config/dto/config-response.dto.ts

@@ -1,4 +0,0 @@
-import type { ConfigService } from '../config.service'
-
-export type ConfigServiceCreateResponseDto = Awaited<ReturnType<ConfigService['create']>>
-export type ConfigServiceFindOneResponseDto = Awaited<ReturnType<ConfigService['findOne']>>

src/modules/application/config/dto/create-config.dto.ts

@@ -1,66 +0,0 @@
-import { ApplicationPlatform, ApplicationPublisher } from '@/generated/prisma/enums'
-import { ApiProperty, PartialType } from '@nestjs/swagger'
-import { IsEnum, IsOptional, IsString } from 'class-validator'
-
-export class CreateConfigDto {
-  @ApiProperty({ required: true })
-  @IsString()
-  uuid: string
-
-  @ApiProperty({ required: true })
-  @IsEnum(ApplicationPublisher)
-  publisher: ApplicationPublisher
-
-  @ApiProperty({ required: true })
-  @IsString()
-  app_version: string
-
-  @ApiProperty({ required: true })
-  @IsString()
-  build_number: string
-
-  @ApiProperty({ required: true })
-  @IsEnum(ApplicationPlatform)
-  platform: ApplicationPlatform
-
-  @ApiProperty({ required: true })
-  @IsString()
-  brand: string
-
-  @ApiProperty({ required: true })
-  @IsString()
-  model: string
-
-  @ApiProperty({ required: true })
-  @IsString()
-  device: string
-
-  @ApiProperty({ required: true })
-  @IsString()
-  os_version: string
-
-  @ApiProperty({ required: true })
-  @IsString()
-  sdk_version: string
-
-  @ApiProperty({ required: true })
-  @IsString()
-  release_number: string
-
-  @ApiProperty({ required: false })
-  @IsString()
-  @IsOptional()
-  browser_name: string
-
-  @ApiProperty({ required: false })
-  @IsString()
-  @IsOptional()
-  user_agent: string
-
-  @ApiProperty({ required: false })
-  @IsString()
-  @IsOptional()
-  fcm_token?: string
-}
-
-export class UpdateConfigDto extends PartialType(CreateConfigDto) {}

src/modules/auth/auth.service.ts

@@ -12,10 +12,11 @@ export class AuthService {
     private authUtils: AuthUtils,
   ) {}
 
-  async login(dto: LoginDto, isPos = false) {
+  async login(dto: LoginDto, isPos = false, deviceId?: string) {
     const { username, password } = dto
 
-    const account = await this.prisma.account.findUnique({
+    const account = await this.prisma.$transaction(async tx => {
+      const account = await tx.account.findUnique({
         where: {
           username,
         },
@@ -26,7 +27,7 @@ export class AuthService {
       }
 
       if (isPos) {
-      const posAccount = await this.prisma.consumerAccount.findUnique({
+        const posAccount = await tx.consumerAccount.findUnique({
           where: {
             account_id: account.id,
           },
@@ -36,6 +37,9 @@ export class AuthService {
         }
       }
 
+      return account
+    })
+
     await this.authUtils.checkAuthPassword(password, account.password)
 
     const preparedData = await this.authUtils.generateLoginResponse(account)

src/modules/pos/sales-invoices/sales-invoices.controller.ts

@@ -39,6 +39,11 @@ export class SalesInvoicesController {
     return this.salesInvoicesService.send(id, posInfo)
   }
 
+  @Post(':id/retry')
+  retry(@Param('id') id: string, @PosInfo() posInfo: IPosPayload) {
+    return this.salesInvoicesService.retry(id, posInfo)
+  }
+
   @Post(':id/revoke')
   revoke(@Param('id') id: string, @PosInfo() posInfo: IPosPayload) {
     return this.salesInvoicesService.revoke(id, posInfo)

src/modules/pos/sales-invoices/sales-invoices.service.ts

@@ -253,6 +253,19 @@ export class SalesInvoicesService {
   }
 
   async send(invoiceId: string, posInfo: IPosPayload) {
+    await this.checkAccessToInvoice(posInfo.consumer_account_id, posInfo.pos_id)
+
+    const invoice = await this.salesInvoiceTaxService.originalSend(
+      posInfo.pos_id,
+      invoiceId,
+    )
+
+    return ResponseMapper.single(invoice)
+  }
+
+  async retry(invoiceId: string, posInfo: IPosPayload) {
+    await this.checkAccessToInvoice(posInfo.consumer_account_id, posInfo.pos_id)
+
     const invoice = await this.salesInvoiceTaxService.originalSend(
       posInfo.pos_id,
       invoiceId,

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

@@ -33,6 +33,52 @@ export class SalesInvoiceTspService {
     private sharedSaleInvoiceCreateService: SharedSaleInvoiceCreateService,
   ) {}
 
+  private mapProviderError(error: any) {
+    const isProviderFailureObject =
+      error &&
+      typeof error === 'object' &&
+      ('provider_request_payload' in error ||
+        'provider_response_payload' in error ||
+        'sent_at' in error ||
+        'received_at' in error)
+
+    if (isProviderFailureObject) {
+      return {
+        hasError: true,
+        status: error.status || TspProviderResponseStatus.FAILURE,
+        message:
+          error.message?.toString() ||
+          'خطا در ارتباط با سامانه مالیاتی. لطفا مجددا تلاش کنید.',
+        provider_request_payload: error.provider_request_payload,
+        provider_response_payload: error.provider_response_payload,
+        sent_at: error.sent_at || new Date().toISOString(),
+        received_at: error.received_at || new Date().toISOString(),
+      }
+    }
+
+    return {
+      hasError: true,
+      status: TspProviderResponseStatus.FAILURE,
+      message:
+        error?.message?.toString() ||
+        'خطا در ارتباط با سامانه مالیاتی. لطفا مجددا تلاش کنید.',
+      provider_response_payload: {
+        error: error?.message || 'fetch failed',
+        cause: error?.cause || null,
+      },
+      sent_at: new Date().toISOString(),
+      received_at: new Date().toISOString(),
+    }
+  }
+
+  private async runProviderCall(fn: () => Promise<any>) {
+    try {
+      return await fn()
+    } catch (error: any) {
+      return this.mapProviderError(error)
+    }
+  }
+
   async originalSend(
     posId: string,
     invoice_id: string,
@@ -40,6 +86,7 @@ export class SalesInvoiceTspService {
     const payload = await buildPayload(this.prisma, invoice_id, posId)
 
     const attemptNumber = await getOriginalResendAttemptNumber(this.prisma, invoice_id)
+    console.log('attemptNumber', attemptNumber)
 
     const attempt = await this.prisma.saleInvoiceTspAttempts.create({
       data: {
@@ -51,7 +98,15 @@ export class SalesInvoiceTspService {
       },
     })
 
-    const result = await trySend(this.tspSwitchService, payload)
+    const result = await this.runProviderCall(() =>
+      trySend(this.tspSwitchService, payload),
+    )
+    if (result?.hasError) {
+      result.provider_request_payload =
+        result.provider_request_payload || JSON.parse(JSON.stringify(payload))
+      result.sent_at = result.sent_at || new Date().toISOString()
+      result.received_at = result.received_at || new Date().toISOString()
+    }
 
     return await onResult(this.prisma, result, attempt.id)
   }
@@ -260,7 +315,16 @@ export class SalesInvoiceTspService {
       },
     )
 
-    const result = await trySend(this.tspSwitchService, correctionPayload)
+    const result = await this.runProviderCall(() =>
+      trySend(this.tspSwitchService, correctionPayload),
+    )
+    if (result?.hasError) {
+      result.provider_request_payload =
+        result.provider_request_payload ||
+        JSON.parse(JSON.stringify(correctionPayload))
+      result.sent_at = result.sent_at || new Date().toISOString()
+      result.received_at = result.received_at || new Date().toISOString()
+    }
 
     console.log('sendResult')
     console.log(result)
@@ -447,7 +511,15 @@ export class SalesInvoiceTspService {
       },
     )
 
-    const result = await this.tspSwitchService.revoke(revokePayload)
+    const result = await this.runProviderCall(() =>
+      this.tspSwitchService.revoke(revokePayload),
+    )
+    if (result?.hasError) {
+      result.provider_request_payload =
+        result.provider_request_payload || JSON.parse(JSON.stringify(revokePayload))
+      result.sent_at = result.sent_at || new Date().toISOString()
+      result.received_at = result.received_at || new Date().toISOString()
+    }
 
     return await onResult(this.prisma, result, attempt.id)
   }

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

@@ -120,7 +120,7 @@ export class NamaProviderSwitchAdapter implements IProviderSwitchAdapter {
         tax_id: null,
         status: TspProviderResponseStatus.NOT_SEND,
       }
-      return failure
+      throw failure
     }
   }
 

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

@@ -31,6 +31,9 @@ export async function getOriginalResendAttemptNumber(
         },
       },
     },
+    orderBy: {
+      created_at: 'desc',
+    },
   })
 
   if (existingAttempt) {
@@ -464,6 +467,8 @@ export async function onResult(
           provider_request_payload: result.provider_request_payload,
           provider_response_payload: JSON.parse(JSON.stringify(result)),
           status: result.status,
+          sent_at: result.sent_at || new Date().toISOString(),
+          received_at: result.received_at || new Date().toISOString(),
           message: result.message?.toString() || 'وجود مشکل در ارسال به سامانه مالیاتی',
         },
         select: {
@@ -507,7 +512,27 @@ export async function onResult(
     }
   }
 
-  throw new NotFoundException(
+  const updatedAttempt = await prisma.saleInvoiceTspAttempts.update({
+    where: {
+      id: attempt_id,
+    },
+    data: {
+      provider_response_payload: {},
+      status: TspProviderResponseStatus.FAILURE,
+      message:
         'متاسفانه امکان ارسال فاکتور به سیستم مالیاتی در حال حاضر وجود ندارد. لطفا بعدا تلاش کنید.',
-  )
+      received_at: new Date().toISOString(),
+    },
+    select: {
+      status: true,
+      invoice: true,
+      message: true,
+    },
+  })
+
+  return {
+    invoice: updatedAttempt.invoice,
+    status: updatedAttempt.status,
+    message: updatedAttempt.message,
+  }
 }