@purpleschool/gptbot 0.12.46 → 0.12.47

package/api/controllers/http/team-account.ts

@@ -20,6 +20,7 @@ export const TEAM_ACCOUNT_ROUTES = {
     GET_STATISTICS_OVERVIEW: 'statistics/overview',
     GET_STATISTICS_BY_MONTH: 'statistics/by-month',
     CREATE_MANUAL_SUBSCRIPTION: 'manual/subscription',
+    CREATE_MANUAL_SUBSCRIPTION_UPGRADE: 'manual/subscription/upgrade',
     CREATE_MANUAL_PRODUCT: 'manual/product',
     CREATE_INVOICE_PAYMENT: 'invoice-payment',
     ADMIN_FIND_BY_NAME: 'admin/find',

package/api/routes.ts

@@ -211,6 +211,7 @@ export const REST_API = {
         CANCEL_TRIAL_SUBSCRIPTION: `${ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CANCEL_TRIAL_SUBSCRIPTION}`,
         GET_BALANCE: `${ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.GET_BALANCE}`,
         CREATE_MANUAL_SUBSCRIPTION: `${ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CREATE_MANUAL_SUBSCRIPTION}`,
+        CREATE_MANUAL_SUBSCRIPTION_UPGRADE: `${ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CREATE_MANUAL_SUBSCRIPTION_UPGRADE}`,
         CREATE_MANUAL_PRODUCT: `${ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CREATE_MANUAL_PRODUCT}`,
         CREATE_INVOICE_PAYMENT: `${ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CREATE_INVOICE_PAYMENT}`,
         ADMIN_FIND_BY_NAME: `${ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.ADMIN_FIND_BY_NAME}`,

package/build/api/controllers/http/team-account.js

@@ -22,6 +22,7 @@ exports.TEAM_ACCOUNT_ROUTES = {
     GET_STATISTICS_OVERVIEW: 'statistics/overview',
     GET_STATISTICS_BY_MONTH: 'statistics/by-month',
     CREATE_MANUAL_SUBSCRIPTION: 'manual/subscription',
+    CREATE_MANUAL_SUBSCRIPTION_UPGRADE: 'manual/subscription/upgrade',
     CREATE_MANUAL_PRODUCT: 'manual/product',
     CREATE_INVOICE_PAYMENT: 'invoice-payment',
     ADMIN_FIND_BY_NAME: 'admin/find',

package/build/api/routes.js

@@ -207,6 +207,7 @@ exports.REST_API = {
         CANCEL_TRIAL_SUBSCRIPTION: `${exports.ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CANCEL_TRIAL_SUBSCRIPTION}`,
         GET_BALANCE: `${exports.ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.GET_BALANCE}`,
         CREATE_MANUAL_SUBSCRIPTION: `${exports.ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CREATE_MANUAL_SUBSCRIPTION}`,
+        CREATE_MANUAL_SUBSCRIPTION_UPGRADE: `${exports.ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CREATE_MANUAL_SUBSCRIPTION_UPGRADE}`,
         CREATE_MANUAL_PRODUCT: `${exports.ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CREATE_MANUAL_PRODUCT}`,
         CREATE_INVOICE_PAYMENT: `${exports.ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.CREATE_INVOICE_PAYMENT}`,
         ADMIN_FIND_BY_NAME: `${exports.ROOT}/${CONTROLLERS.TEAM_ACCOUNT_CONTROLLER}/${CONTROLLERS.TEAM_ACCOUNT_ROUTES.ADMIN_FIND_BY_NAME}`,

package/build/commands/subscription/get-available-upgrades.command.js

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetAvailableUpgradesCommand = void 0;
 const zod_1 = require("zod");
+const constants_1 = require("../../constants");
 const models_1 = require("../../models");
 const subscription_upgrade_schema_1 = require("../../models/subscription-upgrade-schema");
 const subscription_feature_schema_1 = require("../../models/subscription-feature.schema");
 var GetAvailableUpgradesCommand;
 (function (GetAvailableUpgradesCommand) {
     GetAvailableUpgradesCommand.RequestSchema = models_1.SubscriptionSchema.pick({});
+    GetAvailableUpgradesCommand.RequestQuerySchema = zod_1.z.object({
+        billingScope: zod_1.z.nativeEnum(constants_1.BILLING_SCOPE).default(constants_1.BILLING_SCOPE.USER),
+    });
     GetAvailableUpgradesCommand.ResponseSchema = zod_1.z.object({
         features: zod_1.z.record(zod_1.z.string().uuid(), zod_1.z.array(subscription_feature_schema_1.SubscriptionFeatureSchema)),
         subscriptions: zod_1.z.array(subscription_upgrade_schema_1.SubscriptionUpgradeSchema),

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

@@ -10,6 +10,7 @@ var UpgradeSubscriptionCommand;
         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),
+        billingScope: zod_1.z.nativeEnum(constants_1.BILLING_SCOPE).default(constants_1.BILLING_SCOPE.USER),
     });
     UpgradeSubscriptionCommand.RequestParamSchema = models_1.UserToSubscriptionSchema.pick({
         uuid: true,

package/build/commands/team-account/create-manual-team-subscription-upgrade.command.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreateManualTeamSubscriptionUpgradeCommand = void 0;
+const zod_1 = require("zod");
+const models_1 = require("../../models");
+var CreateManualTeamSubscriptionUpgradeCommand;
+(function (CreateManualTeamSubscriptionUpgradeCommand) {
+    CreateManualTeamSubscriptionUpgradeCommand.RequestSchema = zod_1.z.object({
+        teamAccountId: zod_1.z.string().uuid(),
+        subscriptionId: zod_1.z.string().uuid(),
+        durationMonths: zod_1.z.number().int().min(1).max(36).optional(),
+        upgradeFromSubscriptionId: zod_1.z.string().uuid(),
+    });
+    CreateManualTeamSubscriptionUpgradeCommand.ResponseSchema = zod_1.z.object({
+        data: models_1.TeamToSubscriptionSchema,
+    });
+})(CreateManualTeamSubscriptionUpgradeCommand || (exports.CreateManualTeamSubscriptionUpgradeCommand = CreateManualTeamSubscriptionUpgradeCommand = {}));

package/build/commands/team-account/create-team-account-invoice-payment.command.js

@@ -12,9 +12,13 @@ var CreateTeamAccountInvoicePaymentCommand;
         amount: zod_1.z.number().positive(),
         subscriptionUuid: zod_1.z.string().uuid().optional(),
         productUuid: zod_1.z.string().uuid().optional(),
+        upgradeSubscriptionUuid: zod_1.z.string().uuid().optional(),
     })
-        .refine(({ subscriptionUuid, productUuid }) => Number(Boolean(subscriptionUuid)) + Number(Boolean(productUuid)) === 1, {
-        message: 'Нужно передать ровно один идентификатор: subscriptionUuid или productUuid',
+        .refine(({ subscriptionUuid, productUuid, upgradeSubscriptionUuid }) => Number(Boolean(subscriptionUuid)) +
+        Number(Boolean(productUuid)) +
+        Number(Boolean(upgradeSubscriptionUuid)) ===
+        1, {
+        message: 'Нужно передать ровно один идентификатор: subscriptionUuid, productUuid или upgradeSubscriptionUuid',
     });
     CreateTeamAccountInvoicePaymentCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({

package/build/commands/team-account/index.js

@@ -36,6 +36,7 @@ __exportStar(require("./get-team-account-statistics-overview.command"), exports)
 __exportStar(require("./get-team-account-statistics-by-month.command"), exports);
 __exportStar(require("./get-team-account-balance.command"), exports);
 __exportStar(require("./create-manual-team-subscription.command"), exports);
+__exportStar(require("./create-manual-team-subscription-upgrade.command"), exports);
 __exportStar(require("./create-manual-team-product.command"), exports);
 __exportStar(require("./find-team-accounts-by-name.command"), exports);
 __exportStar(require("./find-team-account-by-uuid.command"), exports);

package/build/commands/team-to-subscription/add-team-to-subscription.command.js

@@ -11,6 +11,7 @@ var AddTeamToSubscriptionCommand;
         cloudPaymentsSubscriptionId: zod_1.z.string().optional(),
         zenpaymentsInvoiceNumber: zod_1.z.string().optional(),
         startDate: zod_1.z.coerce.date().optional(),
+        upgradedFromSubscriptionId: zod_1.z.string().uuid().nullable().optional(),
         downgradedFromTeamSubscriptionId: zod_1.z.string().uuid().nullable().optional(),
         orderId: zod_1.z.string().uuid(),
     });

package/build/commands/team-to-subscription/update-team-to-subscription.command.js

@@ -22,6 +22,7 @@ var UpdateTeamToSubscriptionCommand;
         type: true,
         intervalEndDate: true,
         marks: true,
+        upgradedFromSubscriptionId: true,
         downgradedFromTeamSubscriptionId: true,
         orderId: true,
     }).partial();

package/build/models/invoice-for-payment.schema.js

@@ -2,13 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvoiceForPaymentSchema = exports.InvoiceForPaymentPayloadSchema = void 0;
 const zod_1 = require("zod");
-exports.InvoiceForPaymentPayloadSchema = zod_1.z.object({
-    email: zod_1.z.string().email(),
-    name: zod_1.z.string(),
-    inn: zod_1.z.string(),
-    amount: zod_1.z.number(),
-    itemName: zod_1.z.string(),
-});
+exports.InvoiceForPaymentPayloadSchema = zod_1.z.discriminatedUnion('invoiceType', [
+    zod_1.z.object({
+        invoiceType: zod_1.z.literal('purchase'),
+        email: zod_1.z.string().email(),
+        name: zod_1.z.string(),
+        inn: zod_1.z.string(),
+        amount: zod_1.z.number(),
+        itemName: zod_1.z.string(),
+    }),
+    zod_1.z.object({
+        invoiceType: zod_1.z.literal('subscription_upgrade'),
+        email: zod_1.z.string().email(),
+        name: zod_1.z.string(),
+        inn: zod_1.z.string(),
+        amount: zod_1.z.number(),
+        fromSubscriptionName: zod_1.z.string(),
+        toSubscriptionName: zod_1.z.string(),
+        durationMonths: zod_1.z.number(),
+    }),
+]);
 exports.InvoiceForPaymentSchema = zod_1.z.object({
     uuid: zod_1.z.string().uuid(),
     userId: zod_1.z.string().uuid(),

package/build/models/team-account/team-to-subscription.schema.js

@@ -21,6 +21,7 @@ exports.TeamToSubscriptionSchema = zod_1.z.object({
     type: zod_1.z.nativeEnum(constants_1.USER_TO_SUBSCRIPTION_TYPE),
     intervalEndDate: zod_1.z.date().nullable(),
     marks: zod_1.z.array(zod_1.z.nativeEnum(constants_1.USER_TO_SUBSCRIPTION_MARKS)),
+    upgradedFromSubscriptionId: zod_1.z.string().uuid().nullable(),
     downgradedFromTeamSubscriptionId: zod_1.z.string().uuid().nullable(),
     orderId: zod_1.z.string().uuid().nullable(),
     createdAt: zod_1.z.date(),

package/commands/subscription/get-available-upgrades.command.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { BILLING_SCOPE } from '../../constants';
 import { SubscriptionSchema } from '../../models';
 import { SubscriptionUpgradeSchema } from '../../models/subscription-upgrade-schema';
 import { SubscriptionFeatureSchema } from '../../models/subscription-feature.schema';
@@ -8,6 +9,12 @@ export namespace GetAvailableUpgradesCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
+    export const RequestQuerySchema = z.object({
+        billingScope: z.nativeEnum(BILLING_SCOPE).default(BILLING_SCOPE.USER),
+    });
+
+    export type RequestQuery = z.infer<typeof RequestQuerySchema>;
+
     export const ResponseSchema = z.object({
         features: z.record(z.string().uuid(), z.array(SubscriptionFeatureSchema)),
         subscriptions: z.array(SubscriptionUpgradeSchema),

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

@@ -1,12 +1,13 @@
 import { z } from 'zod';
 import { UserToSubscriptionSchema } from '../../models';
-import { PAYMENT_PROVIDER } from '../../constants';
+import { BILLING_SCOPE, 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),
+        billingScope: z.nativeEnum(BILLING_SCOPE).default(BILLING_SCOPE.USER),
     });
 
     export const RequestParamSchema = UserToSubscriptionSchema.pick({

package/commands/team-account/create-manual-team-subscription-upgrade.command.ts

@@ -0,0 +1,19 @@
+import { z } from 'zod';
+import { TeamToSubscriptionSchema } from '../../models';
+
+export namespace CreateManualTeamSubscriptionUpgradeCommand {
+    export const RequestSchema = z.object({
+        teamAccountId: z.string().uuid(),
+        subscriptionId: z.string().uuid(),
+        durationMonths: z.number().int().min(1).max(36).optional(),
+        upgradeFromSubscriptionId: z.string().uuid(),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: TeamToSubscriptionSchema,
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/team-account/create-team-account-invoice-payment.command.ts

@@ -9,13 +9,17 @@ export namespace CreateTeamAccountInvoicePaymentCommand {
             amount: z.number().positive(),
             subscriptionUuid: z.string().uuid().optional(),
             productUuid: z.string().uuid().optional(),
+            upgradeSubscriptionUuid: z.string().uuid().optional(),
         })
         .refine(
-            ({ subscriptionUuid, productUuid }) =>
-                Number(Boolean(subscriptionUuid)) + Number(Boolean(productUuid)) === 1,
+            ({ subscriptionUuid, productUuid, upgradeSubscriptionUuid }) =>
+                Number(Boolean(subscriptionUuid)) +
+                    Number(Boolean(productUuid)) +
+                    Number(Boolean(upgradeSubscriptionUuid)) ===
+                1,
             {
                 message:
-                    'Нужно передать ровно один идентификатор: subscriptionUuid или productUuid',
+                    'Нужно передать ровно один идентификатор: subscriptionUuid, productUuid или upgradeSubscriptionUuid',
             },
         );
 

package/commands/team-account/index.ts

@@ -20,6 +20,7 @@ export * from './get-team-account-statistics-overview.command';
 export * from './get-team-account-statistics-by-month.command';
 export * from './get-team-account-balance.command';
 export * from './create-manual-team-subscription.command';
+export * from './create-manual-team-subscription-upgrade.command';
 export * from './create-manual-team-product.command';
 export * from './find-team-accounts-by-name.command';
 export * from './find-team-account-by-uuid.command';

package/commands/team-to-subscription/add-team-to-subscription.command.ts

@@ -8,6 +8,7 @@ export namespace AddTeamToSubscriptionCommand {
         cloudPaymentsSubscriptionId: z.string().optional(),
         zenpaymentsInvoiceNumber: z.string().optional(),
         startDate: z.coerce.date().optional(),
+        upgradedFromSubscriptionId: z.string().uuid().nullable().optional(),
         downgradedFromTeamSubscriptionId: z.string().uuid().nullable().optional(),
         orderId: z.string().uuid(),
     });

package/commands/team-to-subscription/update-team-to-subscription.command.ts

@@ -22,6 +22,7 @@ export namespace UpdateTeamToSubscriptionCommand {
         type: true,
         intervalEndDate: true,
         marks: true,
+        upgradedFromSubscriptionId: true,
         downgradedFromTeamSubscriptionId: true,
         orderId: true,
     }).partial();

package/models/invoice-for-payment.schema.ts

@@ -1,12 +1,25 @@
 import { z } from 'zod';
 
-export const InvoiceForPaymentPayloadSchema = z.object({
-    email: z.string().email(),
-    name: z.string(),
-    inn: z.string(),
-    amount: z.number(),
-    itemName: z.string(),
-});
+export const InvoiceForPaymentPayloadSchema = z.discriminatedUnion('invoiceType', [
+    z.object({
+        invoiceType: z.literal('purchase'),
+        email: z.string().email(),
+        name: z.string(),
+        inn: z.string(),
+        amount: z.number(),
+        itemName: z.string(),
+    }),
+    z.object({
+        invoiceType: z.literal('subscription_upgrade'),
+        email: z.string().email(),
+        name: z.string(),
+        inn: z.string(),
+        amount: z.number(),
+        fromSubscriptionName: z.string(),
+        toSubscriptionName: z.string(),
+        durationMonths: z.number(),
+    }),
+]);
 
 export const InvoiceForPaymentSchema = z.object({
     uuid: z.string().uuid(),

package/models/team-account/team-to-subscription.schema.ts

@@ -23,6 +23,7 @@ export const TeamToSubscriptionSchema = z.object({
     type: z.nativeEnum(USER_TO_SUBSCRIPTION_TYPE),
     intervalEndDate: z.date().nullable(),
     marks: z.array(z.nativeEnum(USER_TO_SUBSCRIPTION_MARKS)),
+    upgradedFromSubscriptionId: z.string().uuid().nullable(),
     downgradedFromTeamSubscriptionId: z.string().uuid().nullable(),
     orderId: z.string().uuid().nullable(),
     createdAt: z.date(),

package/package.json

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