@purpleschool/gptbot 0.5.7 → 0.5.13

package/commands/auth/index.ts

@@ -1,4 +1,4 @@
-export * from './reset-paasword.command';
+export * from './reset-password.command';
 export * from './restore-password.command';
 export * from './login.command';
 export * from './register-user.command';

package/commands/auth/{reset-paasword.command.ts → reset-password.command.ts}

@@ -9,10 +9,6 @@ export namespace ResetPasswordCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        data: z.object({
-            isSuccess: z.boolean(),
-        }),
-    });
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/auth/verify-email-retry.command.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+
+export namespace VerifyEmailRetryCommand {
+    export const RequestSchema = z.object({});
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.void();
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/auth/verify-email.command.ts

@@ -9,10 +9,6 @@ export namespace VerifyEmailCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        data: z.object({
-            isSuccess: z.boolean(),
-        }),
-    });
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/blog/delete-post.command.ts

@@ -8,8 +8,6 @@ export namespace DeletePostCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        isDeleted: z.boolean(),
-    });
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/category/delete-category.command.ts

@@ -8,8 +8,6 @@ export namespace DeleteCategoryCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        isDeleted: z.boolean(),
-    });
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/chat/archive-all.command.ts

@@ -1,11 +1,6 @@
 import { z } from 'zod';
 
 export namespace ArchiveAllCommand {
-    export const ResponseSchema = z.object({
-        data: z.object({
-            isArchived: z.boolean(),
-        }),
-    });
-
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/chat/delete-chat.command.ts

@@ -9,8 +9,6 @@ export namespace DeleteChatCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        isDeleted: z.boolean(),
-    });
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/chat/delete-chat.command.v2.ts

@@ -8,8 +8,6 @@ export namespace DeleteChatV2Command {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        isDeleted: z.boolean(),
-    });
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/index.ts

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

package/commands/page/delete-page.command.ts

@@ -8,8 +8,6 @@ export namespace DeletePageCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        isDeleted: z.boolean(),
-    });
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/payment/get-payment-history.command.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+import { PaymentHistoryItemSchema } from '../../models/payment-history-item.schema';
+
+export namespace GetPaymentHistoryCommand {
+    export const ResponseSchema = z.object({
+        data: z.array(PaymentHistoryItemSchema),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/payment/index.ts

@@ -0,0 +1,2 @@
+export * from './get-payment-history.command';
+export * from './pay.command';

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

@@ -8,8 +8,6 @@ export namespace DeleteProductCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        isDeleted: z.boolean(),
-    });
+    export const ResponseSchema = z.void();
     export type Response = z.infer<typeof ResponseSchema>;
 }

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

@@ -13,9 +13,7 @@ export namespace CancelSubscriptionCommand {
 
     export type Request = z.infer<typeof RequestSchema>;
 
-    export const ResponseSchema = z.object({
-        isSuccess: z.boolean(),
-    });
+    export const ResponseSchema = z.void();
 
     export type Response = z.infer<typeof ResponseSchema>;
 }

package/commands/subscription/create-custom-subscription-plan.command.ts

@@ -0,0 +1,26 @@
+import { z } from 'zod';
+import { SubscriptionSchema } from '../../models';
+
+export namespace CreateCustomSubscriptionPlanCommand {
+    export const RequestSchema = z.object({
+        tokens: z
+            .number()
+            .refine((val) => val % 500 === 0, {
+                message: 'tokens must be a multiple of 500',
+            })
+            .refine((val) => val > 1000, {
+                message: 'tokens must be greater than 1000',
+            })
+            .refine((val) => val <= 10000, {
+                message: 'tokens must be equal or less than 10000',
+            }),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: SubscriptionSchema,
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

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

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { SubscriptionSchema } from '../../models';
+import { SubscriptionSchema, SubscriptionWithSubTypesSchema } from '../../models';
 
 export namespace FindSubscriptionCommand {
     export const RequestSchema = SubscriptionSchema.pick({
@@ -9,7 +9,7 @@ export namespace FindSubscriptionCommand {
     export type Request = z.infer<typeof RequestSchema>;
 
     export const ResponseSchema = z.object({
-        data: z.array(SubscriptionSchema),
+        data: z.array(SubscriptionWithSubTypesSchema),
     });
 
     export type Response = z.infer<typeof ResponseSchema>;

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

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+import { SubscriptionSchema } from '../../models';
+import { SubscriptionUpgradeSchema } from '../../models/subscription-upgrade-schema';
+
+export namespace GetAvailableUpgradesCommand {
+    export const RequestSchema = SubscriptionSchema.pick({});
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: z.array(SubscriptionUpgradeSchema),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/subscription/index.ts

@@ -4,3 +4,6 @@ export * from './create-subscription.command';
 export * from './find-subscription.command';
 export * from './cancel-subscription.command';
 export * from './recover-subscription.command';
+export * from './get-available-upgrades.command';
+export * from './update-subscription.command';
+export * from './create-custom-subscription-plan.command';

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

@@ -7,9 +7,7 @@ export namespace RecoverSubscriptionCommand {
 
     export type RequestParam = z.infer<typeof RequestParamSchema>;
 
-    export const ResponseSchema = z.object({
-        isSuccess: z.boolean(),
-    });
+    export const ResponseSchema = z.void();
 
     export type Response = z.infer<typeof ResponseSchema>;
 }

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

@@ -0,0 +1,46 @@
+import { z } from 'zod';
+import { SubscriptionSchema } from '../../models';
+
+export namespace UpgradeSubscriptionCommand {
+    export const RequestSchema = SubscriptionSchema.pick({
+        uuid: true,
+    });
+
+    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,
+            }),
+        }),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/constants/email/subjects.ts

@@ -0,0 +1,7 @@
+export const EMAIL_SUBJECTS = {
+    WELCOME: 'Добро пожаловать на сервис ruGPT!',
+    EMAIL_VERIFICATION: 'Подтверждение почты',
+    SUBSCRIPTION_PURCHASE: 'Спасибо за покупку подписки',
+    SUBSCRIPTION_CANCEL: 'Нам жаль, что вы от нас уходите(',
+    PRODUCT_PURCHASE: 'Спасибо за покупку тарифа',
+};

package/constants/errors/errors.ts

@@ -510,4 +510,49 @@ export const ERRORS = {
         message: 'Модель ИИ устарела',
         httpCode: 400,
     },
+    EMAIL_ALREADY_VERIFIED: {
+        code: 'A116',
+        message: 'Электронная почта уже подтверждена',
+        httpCode: 400,
+    },
+    GET_UNREGISTERED_SESSION_ERROR: {
+        code: 'A117',
+        message: 'Не удалось получить сессию с данным идентификатором',
+        httpCode: 500,
+    },
+    UNREGISTERED_USER_LIMIT_UPDATE_ERROR: {
+        code: 'A118',
+        message: 'Не удалось обновить баланс пользователя',
+        httpCode: 500,
+    },
+    PAYMENT_HISTORY_ERROR: {
+        code: 'A119',
+        message: 'Не удалось получить историю платежей',
+        httpCode: 500,
+    },
+    SUBSCRIPTION_GET_UPGRADES_ERROR: {
+        code: 'A120',
+        message: 'Не удалось получить информацию о возможных улучшениях для подписки',
+        httpCode: 500,
+    },
+    SUBSCRIPTION_UPGRADE_ERROR: {
+        code: 'A121',
+        message: 'Не удалось улучшить подписку',
+        httpCode: 500,
+    },
+    RECURRENT_UPDATE_ERROR: {
+        code: 'A122',
+        message: 'Не удалось изменить данные подписки',
+        httpCode: 500,
+    },
+    ALREADY_HAS_SUBSCRIPTION: {
+        code: 'A123',
+        message: 'На данной учетной записи уже есть подписка',
+        httpCode: 409,
+    },
+    SUBSCRIPTION_UPGRADE_INVALID: {
+        code: 'A124',
+        message: 'Невозможно улучшить подписку с данными параметрами',
+        httpCode: 400,
+    },
 };

package/constants/order/enums/index.ts

@@ -1 +1,2 @@
 export * from './order-status.enum';
+export * from './order-type.enum';

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

@@ -0,0 +1,4 @@
+export enum ORDER_TYPE {
+    purchase = 'purchase',
+    upgrade = 'upgrade',
+}

package/constants/payment/enums/index.ts

@@ -1 +1,2 @@
 export * from './payment-status.enum';
+export * from './payment-history-item-type.enum';

package/constants/payment/enums/payment-history-item-type.enum.ts

@@ -0,0 +1,4 @@
+export enum PAYMENT_HISTORY_ITEM_TYPE {
+    SUBSCRIPTION = 'subscription',
+    PRODUCT = 'product',
+}

package/constants/subscription/enums/index.ts

@@ -1 +1,5 @@
 export * from './subscription-status.enum';
+export * from './subscription-plan.enum';
+export * from './user-to-subscription-type.enum';
+export * from './subscription-type.enum';
+export * from './subscription-action.enum';

package/constants/subscription/enums/subscription-action.enum.ts

@@ -0,0 +1,6 @@
+export enum SUBSCRIPTION_ACTION {
+    disabled = 'disabled',
+    buy = 'buy',
+    upgrade = 'upgrade',
+    possible_upgrade = 'possible_upgrade',
+}

package/constants/subscription/enums/subscription-plan.enum.ts

@@ -0,0 +1,4 @@
+export enum SUBSCRIPTION_PLAN {
+    system = 'system',
+    custom = 'custom',
+}

package/constants/subscription/enums/subscription-status.enum.ts

@@ -2,4 +2,5 @@ export enum SUBSCRIPTION_STATUS {
     active = 'active',
     canceled = 'canceled',
     expired = 'expired',
+    upgraded = 'upgraded',
 }

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

@@ -0,0 +1,4 @@
+export enum SUBSCRIPTION_TYPE {
+    main = 'main',
+    sub = 'sub',
+}

package/constants/subscription/enums/user-to-subscription-type.enum.ts

@@ -0,0 +1,4 @@
+export enum USER_TO_SUBSCRIPTION_TYPE {
+    paid = 'paid',
+    interval = 'interval',
+}

package/helpers/index.ts

@@ -0,0 +1 @@
+export * from './subscription';

package/helpers/subscription/calc-custom-subscription-price.helper.ts

@@ -0,0 +1,19 @@
+export function calcCustomSubscriptionPrice(tokenCount: number, period: number) {
+    const MIN_TOKEN_COUNT = 1000;
+    const MAX_DISCOUNT = 0.85;
+    const DISCOUNT_PER_STEP = 0.005;
+    const STEP = 500;
+    const BASE_PRICE = 0.95;
+
+    if (tokenCount < 0) {
+        throw new Error('Token count must be a non-negative integer');
+    }
+
+    if (tokenCount < MIN_TOKEN_COUNT) {
+        throw new Error(`Token count must be at least ${MIN_TOKEN_COUNT}`);
+    }
+
+    const discount = Math.max(0, (tokenCount - MIN_TOKEN_COUNT) / STEP) * DISCOUNT_PER_STEP;
+    const priceMultiplier = Math.max(BASE_PRICE - discount, MAX_DISCOUNT);
+    return Math.round(tokenCount * priceMultiplier * period);
+}

package/helpers/subscription/index.ts

@@ -0,0 +1 @@
+export * from './calc-custom-subscription-price.helper';

package/index.ts

@@ -2,3 +2,4 @@ export * from './constants';
 export * from './commands';
 export * from './api';
 export * from './models';
+export * from './helpers';

package/models/message.schema.ts

@@ -8,7 +8,7 @@ import {
 
 export const MessageSchema = z.object({
     uuid: z.string().uuid(),
-    text: z.string(),
+    text: z.string().max(10000),
     chatId: z.nullable(z.string().uuid()),
     role: z.string(),
     tokenUsage: z.number(),

package/models/payment-history-item.schema.ts

@@ -0,0 +1,12 @@
+import { z } from 'zod';
+import { PAYMENT_HISTORY_ITEM_TYPE, PAYMENT_STATUS } from '../constants';
+
+export const PaymentHistoryItemSchema = z.object({
+    uuid: z.string().uuid(),
+    status: z.nativeEnum(PAYMENT_STATUS),
+    sum: z.number(),
+    description: z.string(),
+    type: z.nativeEnum(PAYMENT_HISTORY_ITEM_TYPE),
+    createdAt: z.date(),
+    updatedAt: z.date(),
+});

package/models/subscription-upgrade-schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { SubscriptionSchema } from './subscription.schema';
+
+export const SubscriptionUpgradeSchema = z.intersection(
+    SubscriptionSchema,
+    z.object({
+        upgradePrice: z.number(),
+    }),
+);

package/models/subscription.schema.ts

@@ -1,13 +1,33 @@
 import { z } from 'zod';
 import { FeaturesSchema } from './product.schema';
+import { SUBSCRIPTION_ACTION, SUBSCRIPTION_PLAN, SUBSCRIPTION_TYPE } from '../constants';
 
 export const SubscriptionSchema = z.object({
     uuid: z.string().uuid(),
+    mainSubscriptionId: z.nullable(z.string().uuid()),
     name: z.string().min(3).max(16384),
     requests: z.number(),
     price: z.number(),
     features: z.array(FeaturesSchema),
-    lengthInDays: z.number(),
+    plan: z.nativeEnum(SUBSCRIPTION_PLAN),
+    type: z.nativeEnum(SUBSCRIPTION_TYPE),
+    discount: z.number(),
+    period: z.number(),
+    tokens: z.number(),
     createdAt: z.date(),
     updatedAt: z.date(),
 });
+
+export const SubscriptionWithActionSchema = z.intersection(
+    SubscriptionSchema,
+    z.object({
+        action: z.nativeEnum(SUBSCRIPTION_ACTION),
+    }),
+);
+
+export const SubscriptionWithSubTypesSchema = z.intersection(
+    SubscriptionWithActionSchema,
+    z.object({
+        subTypes: z.array(SubscriptionWithActionSchema),
+    }),
+);

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

@@ -9,6 +9,7 @@ export const UserToSubscriptionSchema = z.object({
     tokenBalance: z.number(),
     status: z.string(),
     endDate: z.date().nullable(),
+    intervalEndDate: z.date().nullable(),
     createdAt: z.date(),
     updatedAt: z.date(),
 });

package/package.json

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