@purpleschool/gptbot 0.9.20 → 0.9.22

package/build/commands/cabinet/get-user-statistics-by-month.command.js

@@ -7,7 +7,10 @@ var GetUserStatisticsByMonthCommand;
 (function (GetUserStatisticsByMonthCommand) {
     GetUserStatisticsByMonthCommand.RequestSchema = zod_1.z.object({
         origin: zod_1.z.nativeEnum(constants_1.JOB_REQUEST_ORIGIN).default(constants_1.JOB_REQUEST_ORIGIN.API).optional(),
-        metric: zod_1.z.nativeEnum(constants_1.STATISTICS_METRIC_TYPE).default(constants_1.STATISTICS_METRIC_TYPE.REQUESTS).optional(),
+        metric: zod_1.z
+            .nativeEnum(constants_1.STATISTICS_METRIC_TYPE)
+            .default(constants_1.STATISTICS_METRIC_TYPE.REQUESTS)
+            .optional(),
     });
     GetUserStatisticsByMonthCommand.UserStatisticsByMonthResponseSchema = zod_1.z.object({
         month: zod_1.z.string(),

package/build/commands/product/buy-product.command.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuyProductCommand = void 0;
 const zod_1 = require("zod");
 const models_1 = require("../../models");
+const constants_1 = require("../../constants");
 var BuyProductCommand;
 (function (BuyProductCommand) {
     BuyProductCommand.RequestParamSchema = models_1.ProductSchema.pick({
@@ -11,6 +12,7 @@ var BuyProductCommand;
     BuyProductCommand.RequestSchema = zod_1.z.object({
         useDiscount: zod_1.z.boolean(),
         promocode: zod_1.z.string().optional(),
+        provider: zod_1.z.nativeEnum(constants_1.PAYMENT_PROVIDER).optional().default(constants_1.PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
     const IReceiptOrderSchema = zod_1.z.object({
         items: zod_1.z.array(zod_1.z.object({
@@ -25,6 +27,7 @@ var BuyProductCommand;
         amounts: zod_1.z.object({
             electronic: zod_1.z.number(),
         }),
+        taxationSystem: zod_1.z.number(),
     });
     BuyProductCommand.RequestFastSchema = zod_1.z
         .object({
@@ -42,6 +45,10 @@ var BuyProductCommand;
             .transform((date) => new Date(date))
             .optional(),
         marketingConsent: zod_1.z.boolean().default(false),
+        provider: zod_1.z
+            .nativeEnum(constants_1.PAYMENT_PROVIDER)
+            .optional()
+            .default(constants_1.PAYMENT_PROVIDER.CLOUDPAYMENTS),
     })
         .refine((data) => {
         const hasAdmitadUid = !!data.admitadUid;
@@ -59,7 +66,7 @@ var BuyProductCommand;
         message: 'admitadClickDate cannot be in the future',
         path: ['admitadClickDate'],
     });
-    BuyProductCommand.ResponseSchema = zod_1.z.object({
+    const CloudPaymentsResponseSchema = zod_1.z.object({
         publicId: zod_1.z.string(),
         amount: zod_1.z.number(),
         currency: zod_1.z.string(),
@@ -74,7 +81,23 @@ var BuyProductCommand;
                 CustomerReceipt: IReceiptOrderSchema,
             }),
         }),
+        provider: zod_1.z.literal(constants_1.PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
+    const ZenpaymentsResponseSchema = zod_1.z.object({
+        provider: zod_1.z.literal(constants_1.PAYMENT_PROVIDER.ZENPAYMENTS),
+        checkoutUrl: zod_1.z.string(),
+        orderNumber: zod_1.z.string(),
+        orderIdClient: zod_1.z.string().nullable(),
+        paymentAmount: zod_1.z.number(),
+        currencyCode: zod_1.z.string(),
+        customerEmail: zod_1.z.string(),
+        isSubscription: zod_1.z.boolean(),
+        createdAt: zod_1.z.string(),
+    });
+    BuyProductCommand.ResponseSchema = zod_1.z.discriminatedUnion('provider', [
+        CloudPaymentsResponseSchema,
+        ZenpaymentsResponseSchema,
+    ]);
     BuyProductCommand.ResponseFastSchema = zod_1.z.object({
         data: BuyProductCommand.ResponseSchema,
         restoreToken: zod_1.z.string(),

package/build/commands/subscription/buy-subscription.command.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuySubscriptionCommand = void 0;
 const zod_1 = require("zod");
 const models_1 = require("../../models");
+const constants_1 = require("../../constants");
 var BuySubscriptionCommand;
 (function (BuySubscriptionCommand) {
     BuySubscriptionCommand.RequestParamSchema = models_1.SubscriptionSchema.pick({
@@ -11,6 +12,7 @@ var BuySubscriptionCommand;
     BuySubscriptionCommand.RequestSchema = zod_1.z.object({
         useDiscount: zod_1.z.boolean(),
         promocode: zod_1.z.string().optional(),
+        provider: zod_1.z.nativeEnum(constants_1.PAYMENT_PROVIDER).optional().default(constants_1.PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
     BuySubscriptionCommand.RequestFastSchema = zod_1.z
         .object({
@@ -28,6 +30,10 @@ var BuySubscriptionCommand;
             .transform((date) => new Date(date))
             .optional(),
         marketingConsent: zod_1.z.boolean().default(false),
+        provider: zod_1.z
+            .nativeEnum(constants_1.PAYMENT_PROVIDER)
+            .optional()
+            .default(constants_1.PAYMENT_PROVIDER.CLOUDPAYMENTS),
     })
         .refine((data) => {
         const hasAdmitadUid = !!data.admitadUid;
@@ -59,7 +65,7 @@ var BuySubscriptionCommand;
             electronic: zod_1.z.number(),
         }),
     });
-    BuySubscriptionCommand.ResponseSchema = zod_1.z.object({
+    const CloudPaymentsResponseSchema = zod_1.z.object({
         publicId: zod_1.z.string(),
         amount: zod_1.z.number(),
         currency: zod_1.z.string(),
@@ -80,7 +86,23 @@ var BuySubscriptionCommand;
                 }),
             }),
         }),
+        provider: zod_1.z.literal(constants_1.PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
+    const ZenpaymentsResponseSchema = zod_1.z.object({
+        provider: zod_1.z.literal(constants_1.PAYMENT_PROVIDER.ZENPAYMENTS),
+        checkoutUrl: zod_1.z.string(),
+        orderNumber: zod_1.z.string(),
+        orderIdClient: zod_1.z.string().nullable(),
+        paymentAmount: zod_1.z.number(),
+        currencyCode: zod_1.z.string(),
+        customerEmail: zod_1.z.string(),
+        isSubscription: zod_1.z.boolean(),
+        createdAt: zod_1.z.string(),
+    });
+    BuySubscriptionCommand.ResponseSchema = zod_1.z.discriminatedUnion('provider', [
+        CloudPaymentsResponseSchema,
+        ZenpaymentsResponseSchema,
+    ]);
     BuySubscriptionCommand.ResponseFastSchema = zod_1.z.object({
         data: BuySubscriptionCommand.ResponseSchema,
         restoreToken: zod_1.z.string(),

package/build/commands/subscription/upgrade-subscription.command.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpgradeSubscriptionCommand = void 0;
 const zod_1 = require("zod");
 const models_1 = require("../../models");
+const constants_1 = require("../../constants");
 var UpgradeSubscriptionCommand;
 (function (UpgradeSubscriptionCommand) {
     UpgradeSubscriptionCommand.RequestSchema = zod_1.z.object({
         upgradeSubscriptionId: zod_1.z.string().uuid(),
         promocode: zod_1.z.string().optional(),
+        provider: zod_1.z.nativeEnum(constants_1.PAYMENT_PROVIDER).optional().default(constants_1.PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
     UpgradeSubscriptionCommand.RequestParamSchema = models_1.UserToSubscriptionSchema.pick({
         uuid: true,
@@ -26,7 +28,7 @@ var UpgradeSubscriptionCommand;
             electronic: zod_1.z.number(),
         }),
     });
-    UpgradeSubscriptionCommand.ResponseSchema = zod_1.z.object({
+    const CloudPaymentsResponseSchema = zod_1.z.object({
         publicId: zod_1.z.string(),
         amount: zod_1.z.number(),
         currency: zod_1.z.string(),
@@ -39,7 +41,29 @@ var UpgradeSubscriptionCommand;
         data: zod_1.z.object({
             CloudPayments: zod_1.z.object({
                 CustomerReceipt: IReceiptOrderSchema,
+                recurrent: zod_1.z.object({
+                    period: zod_1.z.number(),
+                    interval: zod_1.z.string(),
+                    amount: zod_1.z.number(),
+                    customerReceipt: IReceiptOrderSchema,
+                }),
             }),
         }),
+        provider: zod_1.z.literal(constants_1.PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
+    const ZenpaymentsResponseSchema = zod_1.z.object({
+        provider: zod_1.z.literal(constants_1.PAYMENT_PROVIDER.ZENPAYMENTS),
+        checkoutUrl: zod_1.z.string(),
+        orderNumber: zod_1.z.string(),
+        orderIdClient: zod_1.z.string().nullable(),
+        paymentAmount: zod_1.z.number(),
+        currencyCode: zod_1.z.string(),
+        customerEmail: zod_1.z.string(),
+        isSubscription: zod_1.z.boolean(),
+        createdAt: zod_1.z.string(),
+    });
+    UpgradeSubscriptionCommand.ResponseSchema = zod_1.z.discriminatedUnion('provider', [
+        CloudPaymentsResponseSchema,
+        ZenpaymentsResponseSchema,
+    ]);
 })(UpgradeSubscriptionCommand || (exports.UpgradeSubscriptionCommand = UpgradeSubscriptionCommand = {}));

package/build/constants/payment/enums/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./payment-history-item-type.enum"), exports);
 __exportStar(require("./payment-status.enum"), exports);
 __exportStar(require("./payment-sort-by.enum"), exports);
+__exportStar(require("./payment-provider.enum"), exports);

package/build/constants/payment/enums/payment-provider.enum.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PAYMENT_PROVIDER = void 0;
+var PAYMENT_PROVIDER;
+(function (PAYMENT_PROVIDER) {
+    PAYMENT_PROVIDER["CLOUDPAYMENTS"] = "cloudpayments";
+    PAYMENT_PROVIDER["ZENPAYMENTS"] = "zenpayments";
+})(PAYMENT_PROVIDER || (exports.PAYMENT_PROVIDER = PAYMENT_PROVIDER = {}));

package/build/constants/tool/enums/index.js

@@ -16,5 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./tool-content-type.enum"), exports);
 __exportStar(require("./tool-job-status.enum"), exports);
-__exportStar(require("./tool-type.enum"), exports);
 __exportStar(require("./job-request-origin.enum"), exports);

package/commands/cabinet/get-user-statistics-by-month.command.ts

@@ -2,10 +2,12 @@ import { z } from 'zod';
 import { JOB_REQUEST_ORIGIN, STATISTICS_METRIC_TYPE } from '../../constants';
 
 export namespace GetUserStatisticsByMonthCommand {
-
     export const RequestSchema = z.object({
         origin: z.nativeEnum(JOB_REQUEST_ORIGIN).default(JOB_REQUEST_ORIGIN.API).optional(),
-        metric: z.nativeEnum(STATISTICS_METRIC_TYPE).default(STATISTICS_METRIC_TYPE.REQUESTS).optional(),
+        metric: z
+            .nativeEnum(STATISTICS_METRIC_TYPE)
+            .default(STATISTICS_METRIC_TYPE.REQUESTS)
+            .optional(),
     });
 
     export type Request = z.infer<typeof RequestSchema>;

package/commands/product/buy-product.command.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { ProductSchema } from '../../models';
+import { PAYMENT_PROVIDER } from '../../constants';
 
 export namespace BuyProductCommand {
     export const RequestParamSchema = ProductSchema.pick({
@@ -9,6 +10,7 @@ export namespace BuyProductCommand {
     export const RequestSchema = z.object({
         useDiscount: z.boolean(),
         promocode: z.string().optional(),
+        provider: z.nativeEnum(PAYMENT_PROVIDER).optional().default(PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
 
     export type RequestParam = z.infer<typeof RequestParamSchema>;
@@ -30,6 +32,7 @@ export namespace BuyProductCommand {
         amounts: z.object({
             electronic: z.number(),
         }),
+        taxationSystem: z.number(),
     });
 
     export const RequestFastSchema = z
@@ -48,6 +51,10 @@ export namespace BuyProductCommand {
                 .transform((date) => new Date(date))
                 .optional(),
             marketingConsent: z.boolean().default(false),
+            provider: z
+                .nativeEnum(PAYMENT_PROVIDER)
+                .optional()
+                .default(PAYMENT_PROVIDER.CLOUDPAYMENTS),
         })
         .refine(
             (data) => {
@@ -72,7 +79,7 @@ export namespace BuyProductCommand {
         );
 
     export type RequestFast = z.infer<typeof RequestFastSchema>;
-    export const ResponseSchema = z.object({
+    const CloudPaymentsResponseSchema = z.object({
         publicId: z.string(),
         amount: z.number(),
         currency: z.string(),
@@ -87,8 +94,26 @@ export namespace BuyProductCommand {
                 CustomerReceipt: IReceiptOrderSchema,
             }),
         }),
+        provider: z.literal(PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
 
+    const ZenpaymentsResponseSchema = z.object({
+        provider: z.literal(PAYMENT_PROVIDER.ZENPAYMENTS),
+        checkoutUrl: z.string(),
+        orderNumber: z.string(),
+        orderIdClient: z.string().nullable(),
+        paymentAmount: z.number(),
+        currencyCode: z.string(),
+        customerEmail: z.string(),
+        isSubscription: z.boolean(),
+        createdAt: z.string(),
+    });
+
+    export const ResponseSchema = z.discriminatedUnion('provider', [
+        CloudPaymentsResponseSchema,
+        ZenpaymentsResponseSchema,
+    ]);
+
     export type Response = z.infer<typeof ResponseSchema>;
 
     export const ResponseFastSchema = z.object({

package/commands/subscription/buy-subscription.command.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { SubscriptionSchema } from '../../models';
+import { PAYMENT_PROVIDER } from '../../constants';
 
 export namespace BuySubscriptionCommand {
     export const RequestParamSchema = SubscriptionSchema.pick({
@@ -9,6 +10,7 @@ export namespace BuySubscriptionCommand {
     export const RequestSchema = z.object({
         useDiscount: z.boolean(),
         promocode: z.string().optional(),
+        provider: z.nativeEnum(PAYMENT_PROVIDER).optional().default(PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
 
     export type Request = z.infer<typeof RequestSchema>;
@@ -28,6 +30,10 @@ export namespace BuySubscriptionCommand {
                 .transform((date) => new Date(date))
                 .optional(),
             marketingConsent: z.boolean().default(false),
+            provider: z
+                .nativeEnum(PAYMENT_PROVIDER)
+                .optional()
+                .default(PAYMENT_PROVIDER.CLOUDPAYMENTS),
         })
         .refine(
             (data) => {
@@ -72,7 +78,7 @@ export namespace BuySubscriptionCommand {
         }),
     });
 
-    export const ResponseSchema = z.object({
+    const CloudPaymentsResponseSchema = z.object({
         publicId: z.string(),
         amount: z.number(),
         currency: z.string(),
@@ -93,8 +99,26 @@ export namespace BuySubscriptionCommand {
                 }),
             }),
         }),
+        provider: z.literal(PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
 
+    const ZenpaymentsResponseSchema = z.object({
+        provider: z.literal(PAYMENT_PROVIDER.ZENPAYMENTS),
+        checkoutUrl: z.string(),
+        orderNumber: z.string(),
+        orderIdClient: z.string().nullable(),
+        paymentAmount: z.number(),
+        currencyCode: z.string(),
+        customerEmail: z.string(),
+        isSubscription: z.boolean(),
+        createdAt: z.string(),
+    });
+
+    export const ResponseSchema = z.discriminatedUnion('provider', [
+        CloudPaymentsResponseSchema,
+        ZenpaymentsResponseSchema,
+    ]);
+
     export type Response = z.infer<typeof ResponseSchema>;
     export const ResponseFastSchema = z.object({
         data: ResponseSchema,

package/commands/subscription/upgrade-subscription.command.ts

@@ -1,10 +1,12 @@
 import { z } from 'zod';
 import { UserToSubscriptionSchema } from '../../models';
+import { PAYMENT_PROVIDER } from '../../constants';
 
 export namespace UpgradeSubscriptionCommand {
     export const RequestSchema = z.object({
         upgradeSubscriptionId: z.string().uuid(),
         promocode: z.string().optional(),
+        provider: z.nativeEnum(PAYMENT_PROVIDER).optional().default(PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
 
     export const RequestParamSchema = UserToSubscriptionSchema.pick({
@@ -30,7 +32,7 @@ export namespace UpgradeSubscriptionCommand {
         }),
     });
 
-    export const ResponseSchema = z.object({
+    const CloudPaymentsResponseSchema = z.object({
         publicId: z.string(),
         amount: z.number(),
         currency: z.string(),
@@ -43,9 +45,33 @@ export namespace UpgradeSubscriptionCommand {
         data: z.object({
             CloudPayments: z.object({
                 CustomerReceipt: IReceiptOrderSchema,
+                recurrent: z.object({
+                    period: z.number(),
+                    interval: z.string(),
+                    amount: z.number(),
+                    customerReceipt: IReceiptOrderSchema,
+                }),
             }),
         }),
+        provider: z.literal(PAYMENT_PROVIDER.CLOUDPAYMENTS),
     });
 
+    const ZenpaymentsResponseSchema = z.object({
+        provider: z.literal(PAYMENT_PROVIDER.ZENPAYMENTS),
+        checkoutUrl: z.string(),
+        orderNumber: z.string(),
+        orderIdClient: z.string().nullable(),
+        paymentAmount: z.number(),
+        currencyCode: z.string(),
+        customerEmail: z.string(),
+        isSubscription: z.boolean(),
+        createdAt: z.string(),
+    });
+
+    export const ResponseSchema = z.discriminatedUnion('provider', [
+        CloudPaymentsResponseSchema,
+        ZenpaymentsResponseSchema,
+    ]);
+
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/constants/cabinet/enums/index.ts

@@ -1,2 +1,2 @@
 export * from './group-by.enum';
-export * from './statistics-metric-type.enum';
+export * from './statistics-metric-type.enum';

package/constants/cabinet/enums/statistics-metric-type.enum.ts

@@ -1,4 +1,4 @@
 export enum STATISTICS_METRIC_TYPE {
-  REQUESTS = 'requests',
-  TOKENS = 'tokens',
-}
+    REQUESTS = 'requests',
+    TOKENS = 'tokens',
+}

package/constants/payment/enums/index.ts

@@ -1,3 +1,4 @@
 export * from './payment-history-item-type.enum';
 export * from './payment-status.enum';
 export * from './payment-sort-by.enum';
+export * from './payment-provider.enum';

package/constants/payment/enums/payment-provider.enum.ts

@@ -0,0 +1,4 @@
+export enum PAYMENT_PROVIDER {
+    CLOUDPAYMENTS = 'cloudpayments',
+    ZENPAYMENTS = 'zenpayments',
+}

package/constants/tool/enums/index.ts

@@ -1,4 +1,3 @@
 export * from './tool-content-type.enum';
 export * from './tool-job-status.enum';
-export * from './tool-type.enum';
 export * from './job-request-origin.enum';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purpleschool/gptbot",
-  "version": "0.9.20",
+  "version": "0.9.22",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/build/constants/tool/enums/tool-type.enum.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TOOL_TYPE = void 0;
-var TOOL_TYPE;
-(function (TOOL_TYPE) {
-    TOOL_TYPE["PARAPHRASE"] = "paraphrase";
-    TOOL_TYPE["TTS"] = "tts";
-    TOOL_TYPE["STT"] = "stt";
-    TOOL_TYPE["IMAGE_GENERATION"] = "image_generation";
-    TOOL_TYPE["IMAGE_EDITOR"] = "image_editor";
-    TOOL_TYPE["MUSIC"] = "music";
-    TOOL_TYPE["INTERIOR_DESIGN"] = "interior_design";
-})(TOOL_TYPE || (exports.TOOL_TYPE = TOOL_TYPE = {}));

package/constants/tool/enums/tool-type.enum.ts

@@ -1,9 +0,0 @@
-export enum TOOL_TYPE {
-    PARAPHRASE = 'paraphrase',
-    TTS = 'tts',
-    STT = 'stt',
-    IMAGE_GENERATION = 'image_generation',
-    IMAGE_EDITOR = 'image_editor',
-    MUSIC = 'music',
-    INTERIOR_DESIGN = 'interior_design',
-}