@purpleschool/gptbot 0.2.8 → 0.2.9

package/api/controllers/cloud-payments.ts

@@ -1,4 +1,4 @@
 export const CLOUD_PAYMENTS_CONTROLLER = 'cloud-payments' as const;
 export const CLOUD_PAYMENTS_ROUTES = {
     CALLBACK: 'callback',
-} as const;
+} as const;

package/api/controllers/subscription.ts

@@ -4,4 +4,6 @@ export const SUBSCRIPTION_ROUTES = {
     FIND_BY_UUID: 'by/uuid',
     GET_ALL: 'all',
     BUY: 'buy',
+    GET_MY: 'my',
+    CANCEL: 'cancel',
 } as const;

package/api/routes.ts

@@ -82,7 +82,8 @@ export const REST_API = {
         CREATE: `${ROOT}/${CONTROLLERS.PRODUCT_CONTROLLER}`,
         GET_BY_UUID: (uuid: string): string =>
             `${ROOT}/${CONTROLLERS.PRODUCT_CONTROLLER}/${CONTROLLERS.PRODUCT_ROUTES.FIND_BY_UUID}/${uuid}`,
-        BUY: (uuid: string) => `${ROOT}/${CONTROLLERS.PRODUCT_CONTROLLER}/${CONTROLLERS.PRODUCT_ROUTES.BUY}/${uuid}`,
+        BUY: (uuid: string) =>
+            `${ROOT}/${CONTROLLERS.PRODUCT_CONTROLLER}/${CONTROLLERS.PRODUCT_ROUTES.BUY}/${uuid}`,
     },
     SUBSCRIPTION: {
         GET: `${ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${CONTROLLERS.SUBSCRIPTION_ROUTES.GET_ALL}`,
@@ -91,7 +92,11 @@ export const REST_API = {
         CREATE: `${ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}`,
         GET_BY_UUID: (uuid: string): string =>
             `${ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${CONTROLLERS.SUBSCRIPTION_ROUTES.FIND_BY_UUID}/${uuid}`,
-        BUY: (uuid: string) => `${ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${CONTROLLERS.SUBSCRIPTION_ROUTES.BUY}/${uuid}`,
+        BUY: (uuid: string) =>
+            `${ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${CONTROLLERS.SUBSCRIPTION_ROUTES.BUY}/${uuid}`,
+        GET_MY: `${ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${CONTROLLERS.SUBSCRIPTION_ROUTES.GET_MY}`,
+        CANCEL: (uuid: string) =>
+            `${ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${uuid}/${CONTROLLERS.SUBSCRIPTION_ROUTES.CANCEL}`,
     },
     FILES: {
         UPLOAD_FILE: `${ROOT}/${CONTROLLERS.FILE_CONTROLLER}/${CONTROLLERS.FILE_ROUTES.UPLOAD_FILE}`,

package/build/api/controllers/subscription.js

@@ -6,4 +6,6 @@ exports.SUBSCRIPTION_ROUTES = {
     FIND_BY_UUID: 'by/uuid',
     GET_ALL: 'all',
     BUY: 'buy',
+    GET_MY: 'my',
+    CANCEL: 'cancel',
 };

package/build/api/routes.js

@@ -103,6 +103,8 @@ exports.REST_API = {
         CREATE: `${exports.ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}`,
         GET_BY_UUID: (uuid) => `${exports.ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${CONTROLLERS.SUBSCRIPTION_ROUTES.FIND_BY_UUID}/${uuid}`,
         BUY: (uuid) => `${exports.ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${CONTROLLERS.SUBSCRIPTION_ROUTES.BUY}/${uuid}`,
+        GET_MY: `${exports.ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${CONTROLLERS.SUBSCRIPTION_ROUTES.GET_MY}`,
+        CANCEL: (uuid) => `${exports.ROOT}/${CONTROLLERS.SUBSCRIPTION_CONTROLLER}/${uuid}/${CONTROLLERS.SUBSCRIPTION_ROUTES.CANCEL}`,
     },
     FILES: {
         UPLOAD_FILE: `${exports.ROOT}/${CONTROLLERS.FILE_CONTROLLER}/${CONTROLLERS.FILE_ROUTES.UPLOAD_FILE}`,

package/build/commands/index.js

@@ -26,3 +26,4 @@ __exportStar(require("./message"), exports);
 __exportStar(require("./product"), exports);
 __exportStar(require("./subscription"), exports);
 __exportStar(require("./blog"), exports);
+__exportStar(require("./user-to-subscription"), exports);

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

@@ -4,24 +4,41 @@ exports.PayCommand = void 0;
 const zod_1 = require("zod");
 var PayCommand;
 (function (PayCommand) {
-    PayCommand.RequestSchema = zod_1.z.object({
-        transactionId: zod_1.z.number(),
-        amount: zod_1.z.number(),
-        currency: zod_1.z.string(),
-        paymentAmount: zod_1.z.string(),
-        paymentCurrency: zod_1.z.string(),
-        dateTime: zod_1.z.string(),
-        cardFirstSix: zod_1.z.string(),
-        cardLastFour: zod_1.z.string(),
-        cardType: zod_1.z.string(),
-        cardExpDate: zod_1.z.string(),
-        testMode: zod_1.z.number(),
-        status: zod_1.z.string(),
-        operationType: zod_1.z.string(),
-        gatewayName: zod_1.z.string(),
-        invoiceId: zod_1.z.string(),
-        accountId: zod_1.z.string(),
-    });
+    PayCommand.RequestSchema = zod_1.z
+        .object({
+        TransactionId: zod_1.z.string().transform((transactionId) => parseInt(transactionId, 10)),
+        Amount: zod_1.z.string().transform((amount) => parseInt(amount, 10)),
+        Currency: zod_1.z.string(),
+        PaymentAmount: zod_1.z.string(),
+        PaymentCurrency: zod_1.z.string(),
+        DateTime: zod_1.z.string(),
+        CardFirstSix: zod_1.z.string(),
+        CardLastFour: zod_1.z.string(),
+        CardType: zod_1.z.string(),
+        CardExpDate: zod_1.z.string(),
+        TestMode: zod_1.z.string().transform((testMode) => parseInt(testMode, 10)),
+        Status: zod_1.z.string(),
+        OperationType: zod_1.z.string(),
+        InvoiceId: zod_1.z.string(),
+        AccountId: zod_1.z.string(),
+    })
+        .transform((data) => ({
+        transactionId: data.TransactionId,
+        amount: data.Amount,
+        currency: data.Currency,
+        status: data.Status,
+        paymentAmount: data.PaymentAmount,
+        paymentCurrency: data.PaymentCurrency,
+        dateTime: data.DateTime,
+        cardFirstSix: data.CardFirstSix,
+        cardLastFour: data.CardLastFour,
+        cardType: data.CardType,
+        cardExpDate: data.CardExpDate,
+        testMode: data.TestMode,
+        operationType: data.OperationType,
+        invoiceId: data.InvoiceId,
+        accountId: data.AccountId,
+    }));
     PayCommand.ResponseSchema = zod_1.z.object({
         code: zod_1.z.number(),
     });

package/build/commands/user-to-subscription/get-user-to-subscriptions.command.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetUserToSubscriptionsCommand = void 0;
+const zod_1 = require("zod");
+const user_to_subscription_schema_1 = require("../../models/user-to-subscription.schema");
+var GetUserToSubscriptionsCommand;
+(function (GetUserToSubscriptionsCommand) {
+    GetUserToSubscriptionsCommand.ResponseSchema = zod_1.z.object({
+        data: zod_1.z.array(user_to_subscription_schema_1.UserToSubscriptionSchema),
+    });
+})(GetUserToSubscriptionsCommand || (exports.GetUserToSubscriptionsCommand = GetUserToSubscriptionsCommand = {}));

package/build/commands/user-to-subscription/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./get-user-to-subscriptions.command"), exports);

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FORMATS = void 0;
+exports.CLOUD_PAYMENTS_CANCEL = exports.FORMATS = void 0;
 exports.FORMATS = {
     UTF8: 'utf-8',
     BASE64: 'base64',
     SHA256: 'sha256',
 };
+exports.CLOUD_PAYMENTS_CANCEL = 'https://api.cloudpayments.ru/subscriptions/cancel';

package/build/models/index.js

@@ -26,3 +26,4 @@ __exportStar(require("./product.schema"), exports);
 __exportStar(require("./subscription.schema"), exports);
 __exportStar(require("./order.schema"), exports);
 __exportStar(require("./post.schema"), exports);
+__exportStar(require("./user-to-subscription.schema"), exports);

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserToSubscriptionSchema = void 0;
+const zod_1 = require("zod");
+exports.UserToSubscriptionSchema = zod_1.z.object({
+    uuid: zod_1.z.string(),
+    userId: zod_1.z.string(),
+    subscriptionId: zod_1.z.string(),
+    initTokenBalance: zod_1.z.number(),
+    active: zod_1.z.boolean(),
+    tokenBalance: zod_1.z.number(),
+    status: zod_1.z.string(),
+    endDate: zod_1.z.date().nullable(),
+    createdAt: zod_1.z.date(),
+    updatedAt: zod_1.z.date(),
+});

package/commands/index.ts

@@ -10,3 +10,4 @@ export * from './message';
 export * from './product';
 export * from './subscription';
 export * from './blog';
+export * from './user-to-subscription';

package/commands/payment/pay.command.ts

@@ -1,24 +1,41 @@
 import { z } from 'zod';
 
 export namespace PayCommand {
-    export const RequestSchema = z.object({
-        transactionId: z.number(),
-        amount: z.number(),
-        currency: z.string(),
-        paymentAmount: z.string(),
-        paymentCurrency: z.string(),
-        dateTime: z.string(),
-        cardFirstSix: z.string(),
-        cardLastFour: z.string(),
-        cardType: z.string(),
-        cardExpDate: z.string(),
-        testMode: z.number(),
-        status: z.string(),
-        operationType: z.string(),
-        gatewayName: z.string(),
-        invoiceId: z.string(),
-        accountId: z.string(),
-    });
+    export const RequestSchema = z
+        .object({
+            TransactionId: z.string().transform((transactionId) => parseInt(transactionId, 10)),
+            Amount: z.string().transform((amount) => parseInt(amount, 10)),
+            Currency: z.string(),
+            PaymentAmount: z.string(),
+            PaymentCurrency: z.string(),
+            DateTime: z.string(),
+            CardFirstSix: z.string(),
+            CardLastFour: z.string(),
+            CardType: z.string(),
+            CardExpDate: z.string(),
+            TestMode: z.string().transform((testMode) => parseInt(testMode, 10)),
+            Status: z.string(),
+            OperationType: z.string(),
+            InvoiceId: z.string(),
+            AccountId: z.string(),
+        })
+        .transform((data) => ({
+            transactionId: data.TransactionId,
+            amount: data.Amount,
+            currency: data.Currency,
+            status: data.Status,
+            paymentAmount: data.PaymentAmount,
+            paymentCurrency: data.PaymentCurrency,
+            dateTime: data.DateTime,
+            cardFirstSix: data.CardFirstSix,
+            cardLastFour: data.CardLastFour,
+            cardType: data.CardType,
+            cardExpDate: data.CardExpDate,
+            testMode: data.TestMode,
+            operationType: data.OperationType,
+            invoiceId: data.InvoiceId,
+            accountId: data.AccountId,
+        }));
 
     export type Request = z.infer<typeof RequestSchema>;
 
@@ -27,4 +44,4 @@ export namespace PayCommand {
     });
 
     export type Response = z.infer<typeof ResponseSchema>;
-}
+}

package/commands/user-to-subscription/get-user-to-subscriptions.command.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+import { UserToSubscriptionSchema } from '../../models/user-to-subscription.schema';
+
+export namespace GetUserToSubscriptionsCommand {
+    export const ResponseSchema = z.object({
+        data: z.array(UserToSubscriptionSchema),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user-to-subscription/index.ts

@@ -0,0 +1 @@
+export * from './get-user-to-subscriptions.command';

package/constants/cloud-payments/index.ts

@@ -2,4 +2,7 @@ export const FORMATS = {
     UTF8: 'utf-8',
     BASE64: 'base64',
     SHA256: 'sha256',
-} as const
+} as const;
+
+export const CLOUD_PAYMENTS_CANCEL = 'https://api.cloudpayments.ru/subscriptions/cancel';
+

package/models/index.ts

@@ -10,3 +10,4 @@ export * from './product.schema';
 export * from './subscription.schema';
 export * from './order.schema';
 export * from './post.schema';
+export * from './user-to-subscription.schema';

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

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+
+export const UserToSubscriptionSchema = z.object({
+    uuid: z.string(),
+    userId: z.string(),
+    subscriptionId: z.string(),
+    initTokenBalance: z.number(),
+    active: z.boolean(),
+    tokenBalance: z.number(),
+    status: z.string(),
+    endDate: z.date().nullable(),
+
+    createdAt: z.date(),
+    updatedAt: z.date(),
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purpleschool/gptbot",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "",
   "main": "index.js",
   "scripts": {