@purpleschool/gptbot 0.7.81 → 0.7.82

package/build/commands/payment/pay.command.js

@@ -22,6 +22,7 @@ var PayCommand;
         OperationType: zod_1.z.string(),
         InvoiceId: zod_1.z.string().optional(),
         AccountId: zod_1.z.string(),
+        Token: zod_1.z.string(),
     })
         .transform((data) => ({
         transactionId: data.TransactionId,
@@ -40,6 +41,7 @@ var PayCommand;
         operationType: data.OperationType,
         invoiceId: data.InvoiceId,
         accountId: data.AccountId,
+        token: data.Token,
     }));
     PayCommand.ResponseSchema = zod_1.z.object({
         code: zod_1.z.number(),

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

@@ -11,34 +11,7 @@ var DowngradeSubscriptionCommand;
     DowngradeSubscriptionCommand.RequestParamSchema = models_1.UserToSubscriptionSchema.pick({
         uuid: true,
     });
-    const IReceiptOrderSchema = zod_1.z.object({
-        items: zod_1.z.array(zod_1.z.object({
-            label: zod_1.z.string(),
-            price: zod_1.z.number(),
-            quantity: zod_1.z.number(),
-            amount: zod_1.z.number(),
-            vat: zod_1.z.number(),
-        })),
-        email: zod_1.z.string(),
-        isBso: zod_1.z.boolean(),
-        amounts: zod_1.z.object({
-            electronic: zod_1.z.number(),
-        }),
-    });
     DowngradeSubscriptionCommand.ResponseSchema = zod_1.z.object({
-        publicId: zod_1.z.string(),
-        amount: zod_1.z.number(),
-        currency: zod_1.z.string(),
-        accountId: zod_1.z.string(),
-        description: zod_1.z.string(),
-        invoiceId: zod_1.z.string(),
-        email: zod_1.z.string(),
-        skin: zod_1.z.string(),
-        autoClose: zod_1.z.number(),
-        data: zod_1.z.object({
-            CloudPayments: zod_1.z.object({
-                CustomerReceipt: IReceiptOrderSchema,
-            }),
-        }),
+        isSuccess: zod_1.z.boolean(),
     });
 })(DowngradeSubscriptionCommand || (exports.DowngradeSubscriptionCommand = DowngradeSubscriptionCommand = {}));

package/build/commands/subscription/get-subscriptions-summary.command.js

@@ -7,7 +7,7 @@ var GetSubscriptionsSummaryCommand;
 (function (GetSubscriptionsSummaryCommand) {
     GetSubscriptionsSummaryCommand.ResponseSchema = zod_1.z.object({
         features: zod_1.z.array(models_1.SubscriptionFeatureSchema),
-        subscriptions: zod_1.z.array(models_1.UserToSubscriptionWithSubscriptionSchema),
+        subscriptions: zod_1.z.array(models_1.UserToSubscriptionWithDowngradeSubscriptionSchema),
         products: zod_1.z.array(models_1.UserToProductWithProductSchema),
     });
 })(GetSubscriptionsSummaryCommand || (exports.GetSubscriptionsSummaryCommand = GetSubscriptionsSummaryCommand = {}));

package/build/constants/cloud-payments/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CLOUD_PAYMENTS_GET_SUBSCRIPTION = exports.CLOUD_PAYMENTS_UPDATE = exports.CLOUD_PAYMENTS_CANCEL = exports.FORMATS = void 0;
+exports.CLOUD_PAYMENTS_CREATE = exports.CLOUD_PAYMENTS_GET_SUBSCRIPTION = exports.CLOUD_PAYMENTS_UPDATE = exports.CLOUD_PAYMENTS_CANCEL = exports.FORMATS = void 0;
 exports.FORMATS = {
     UTF8: 'utf-8',
     BASE64: 'base64',
@@ -9,3 +9,4 @@ exports.FORMATS = {
 exports.CLOUD_PAYMENTS_CANCEL = 'https://api.cloudpayments.ru/subscriptions/cancel';
 exports.CLOUD_PAYMENTS_UPDATE = 'https://api.cloudpayments.ru/subscriptions/update';
 exports.CLOUD_PAYMENTS_GET_SUBSCRIPTION = 'https://api.cloudpayments.ru/subscriptions/get ';
+exports.CLOUD_PAYMENTS_CREATE = 'https://api.cloudpayments.ru/subscriptions/create';

package/build/constants/errors/errors.js

@@ -2301,4 +2301,14 @@ exports.ERRORS = {
         message: 'Минимальная сумма для вывода 5000 рублей',
         httpCode: 400,
     },
+    CREATE_CLOUD_PAYMENTS_SUBSCRIPTION: {
+        code: 'A469',
+        message: 'Не удалось создать подписку у cloud payments',
+        httpCode: 500,
+    },
+    SUBSCRIPTION_ALREADY_DOWNGRADED_ERROR: {
+        code: 'A470',
+        message: 'Подписка уже была понижена и ожидает отключения',
+        httpCode: 400,
+    },
 };

package/build/models/user-to-subscription.schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserToSubscriptionWithSubscriptionSchema = exports.UserToSubscriptionSchema = void 0;
+exports.UserToSubscriptionWithDowngradeSubscriptionSchema = exports.UserToSubscriptionWithSubscriptionSchema = exports.UserToSubscriptionSchema = void 0;
 const zod_1 = require("zod");
 const subscription_schema_1 = require("./subscription.schema");
 exports.UserToSubscriptionSchema = zod_1.z.object({
@@ -23,3 +23,6 @@ exports.UserToSubscriptionSchema = zod_1.z.object({
 exports.UserToSubscriptionWithSubscriptionSchema = zod_1.z.intersection(exports.UserToSubscriptionSchema, zod_1.z.object({
     subscription: subscription_schema_1.SubscriptionSchema,
 }));
+exports.UserToSubscriptionWithDowngradeSubscriptionSchema = zod_1.z.intersection(exports.UserToSubscriptionWithSubscriptionSchema, zod_1.z.object({
+    subscriptionDowngrade: subscription_schema_1.SubscriptionSchema.optional(),
+}));

package/commands/payment/pay.command.ts

@@ -19,6 +19,7 @@ export namespace PayCommand {
             OperationType: z.string(),
             InvoiceId: z.string().optional(),
             AccountId: z.string(),
+            Token: z.string(),
         })
         .transform((data) => ({
             transactionId: data.TransactionId,
@@ -37,6 +38,7 @@ export namespace PayCommand {
             operationType: data.OperationType,
             invoiceId: data.InvoiceId,
             accountId: data.AccountId,
+            token: data.Token,
         }));
 
     export type Request = z.infer<typeof RequestSchema>;

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

@@ -12,38 +12,8 @@ export namespace DowngradeSubscriptionCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    const IReceiptOrderSchema = z.object({
-        items: z.array(
-            z.object({
-                label: z.string(),
-                price: z.number(),
-                quantity: z.number(),
-                amount: z.number(),
-                vat: z.number(),
-            }),
-        ),
-        email: z.string(),
-        isBso: z.boolean(),
-        amounts: z.object({
-            electronic: z.number(),
-        }),
-    });
-
     export const ResponseSchema = z.object({
-        publicId: z.string(),
-        amount: z.number(),
-        currency: z.string(),
-        accountId: z.string(),
-        description: z.string(),
-        invoiceId: z.string(),
-        email: z.string(),
-        skin: z.string(),
-        autoClose: z.number(),
-        data: z.object({
-            CloudPayments: z.object({
-                CustomerReceipt: IReceiptOrderSchema,
-            }),
-        }),
+        isSuccess: z.boolean(),
     });
 
     export type Response = z.infer<typeof ResponseSchema>;

package/commands/subscription/get-subscriptions-summary.command.ts

@@ -2,13 +2,13 @@ import { z } from 'zod';
 import {
     SubscriptionFeatureSchema,
     UserToProductWithProductSchema,
-    UserToSubscriptionWithSubscriptionSchema,
+    UserToSubscriptionWithDowngradeSubscriptionSchema,
 } from '../../models';
 
 export namespace GetSubscriptionsSummaryCommand {
     export const ResponseSchema = z.object({
         features: z.array(SubscriptionFeatureSchema),
-        subscriptions: z.array(UserToSubscriptionWithSubscriptionSchema),
+        subscriptions: z.array(UserToSubscriptionWithDowngradeSubscriptionSchema),
         products: z.array(UserToProductWithProductSchema),
     });
 

package/constants/cloud-payments/index.ts

@@ -9,3 +9,5 @@ export const CLOUD_PAYMENTS_CANCEL = 'https://api.cloudpayments.ru/subscriptions
 export const CLOUD_PAYMENTS_UPDATE = 'https://api.cloudpayments.ru/subscriptions/update';
 
 export const CLOUD_PAYMENTS_GET_SUBSCRIPTION = 'https://api.cloudpayments.ru/subscriptions/get ';
+
+export const CLOUD_PAYMENTS_CREATE = 'https://api.cloudpayments.ru/subscriptions/create';

package/constants/errors/errors.ts

@@ -2309,4 +2309,14 @@ export const ERRORS = {
         message: 'Минимальная сумма для вывода 5000 рублей',
         httpCode: 400,
     },
+    CREATE_CLOUD_PAYMENTS_SUBSCRIPTION: {
+        code: 'A469',
+        message: 'Не удалось создать подписку у cloud payments',
+        httpCode: 500,
+    },
+    SUBSCRIPTION_ALREADY_DOWNGRADED_ERROR: {
+        code: 'A470',
+        message: 'Подписка уже была понижена и ожидает отключения',
+        httpCode: 400,
+    },
 };

package/models/user-to-subscription.schema.ts

@@ -25,3 +25,10 @@ export const UserToSubscriptionWithSubscriptionSchema = z.intersection(
         subscription: SubscriptionSchema,
     }),
 );
+
+export const UserToSubscriptionWithDowngradeSubscriptionSchema = z.intersection(
+    UserToSubscriptionWithSubscriptionSchema,
+    z.object({
+        subscriptionDowngrade: SubscriptionSchema.optional(),
+    }),
+);

package/package.json

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