@purpleschool/gptbot 0.7.72 → 0.7.74

package/api/controllers/http/promocode.ts

@@ -6,5 +6,4 @@ export const PROMOCODE_ROUTES = {
     VALIDATE: 'validate',
     FIND_BY_UUID: 'by/uuid',
     UPSELL: 'upsell',
-    WEBMASTER: 'referral',
 } as const;

package/api/controllers/http/webmaster.ts

@@ -1,4 +1,4 @@
-export const WEBMASTER_CONTROLLER_PRIVATE = 'private/referral' as const;
+export const WEBMASTER_CONTROLLER_PRIVATE = 'private/webmaster' as const;
 
 export const WEBMASTER_ROUTES = {
     GET_MY: 'my',

package/build/api/controllers/http/promocode.js

@@ -8,5 +8,4 @@ exports.PROMOCODE_ROUTES = {
     VALIDATE: 'validate',
     FIND_BY_UUID: 'by/uuid',
     UPSELL: 'upsell',
-    WEBMASTER: 'referral',
 };

package/build/api/controllers/http/webmaster.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WEBMASTER_ROUTES = exports.WEBMASTER_CONTROLLER_PRIVATE = void 0;
-exports.WEBMASTER_CONTROLLER_PRIVATE = 'private/referral';
+exports.WEBMASTER_CONTROLLER_PRIVATE = 'private/webmaster';
 exports.WEBMASTER_ROUTES = {
     GET_MY: 'my',
     GET_BALANCE_OVERVIEW: 'overview',

package/build/commands/auth/register-user.command.js

@@ -6,12 +6,10 @@ const zod_1 = require("zod");
 var RegisterUserCommand;
 (function (RegisterUserCommand) {
     RegisterUserCommand.RequestSchema = models_1.UserSchema.pick({ email: true, password: true })
-        .extend({
-        partnerId: zod_1.z.string().optional(),
-    })
         .extend({
         utm: models_1.UtmSchema.optional(),
-    });
+    })
+        .merge(models_1.UserReferralsSchema);
     RegisterUserCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({
             accessToken: zod_1.z.string(),

package/build/commands/auth/vk-login.command.js

@@ -2,14 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VKLoginCommand = void 0;
 const zod_1 = require("zod");
+const models_1 = require("../../models");
 var VKLoginCommand;
 (function (VKLoginCommand) {
-    VKLoginCommand.RequestSchema = zod_1.z.object({
+    VKLoginCommand.RequestSchema = zod_1.z
+        .object({
         code: zod_1.z.string(),
         code_verifier: zod_1.z.string(),
         device_id: zod_1.z.string(),
         state: zod_1.z.string(),
-    });
+    })
+        .merge(models_1.UserReferralsSchema);
     VKLoginCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({
             accessToken: zod_1.z.string(),

package/build/commands/auth/yandex-login.command.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YandexLoginCommand = void 0;
 const zod_1 = require("zod");
+const models_1 = require("../../models");
 var YandexLoginCommand;
 (function (YandexLoginCommand) {
-    YandexLoginCommand.RequestSchema = zod_1.z.object({
+    YandexLoginCommand.RequestSchema = zod_1.z
+        .object({
         code: zod_1.z.string(),
         code_verifier: zod_1.z.string(),
-    });
+    })
+        .merge(models_1.UserReferralsSchema);
     YandexLoginCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({
             accessToken: zod_1.z.string(),

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

@@ -30,6 +30,10 @@ var BuyProductCommand;
         email: zod_1.z.string().email(),
         partnerId: zod_1.z.string().uuid().optional(),
         promocode: zod_1.z.string().optional(),
+        webmasterAlias: zod_1.z.string().optional(),
+        webmasterReferralProvidedAt: zod_1.z
+            .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), zod_1.z.date())
+            .optional(),
     });
     BuyProductCommand.ResponseSchema = zod_1.z.object({
         publicId: zod_1.z.string(),

package/build/commands/promocode/index.js

@@ -20,4 +20,3 @@ __exportStar(require("./find-promocode.command"), exports);
 __exportStar(require("./get-upsell-offer.command"), exports);
 __exportStar(require("./update-promocode.command"), exports);
 __exportStar(require("./validate-promocode.command"), exports);
-__exportStar(require("./get-webmaster-promocode.command"), exports);

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

@@ -16,6 +16,10 @@ var BuySubscriptionCommand;
         email: zod_1.z.string().email(),
         partnerId: zod_1.z.string().uuid().optional(),
         promocode: zod_1.z.string().optional(),
+        webmasterAlias: zod_1.z.string().optional(),
+        webmasterReferralProvidedAt: zod_1.z
+            .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), zod_1.z.date())
+            .optional(),
     });
     const IReceiptOrderSchema = zod_1.z.object({
         items: zod_1.z.array(zod_1.z.object({

package/build/commands/telegram-auth/create-telegram-auth-link.command.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateTelegramAuthLinkCommand = void 0;
 const zod_1 = require("zod");
+const models_1 = require("../../models");
 var CreateTelegramAuthLinkCommand;
 (function (CreateTelegramAuthLinkCommand) {
+    CreateTelegramAuthLinkCommand.RequestSchema = models_1.UserReferralsSchema;
     CreateTelegramAuthLinkCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({
             uuid: zod_1.z.string().uuid(),

package/build/commands/telegram-profile/auth-with-telegram-web-app.command.js

@@ -9,6 +9,10 @@ var AuthWithTelegramWebAppCommand;
         initData: zod_1.z.string(),
         platform: zod_1.z.string().nullable(),
         partnerId: zod_1.z.string().optional(),
+        webmasterAlias: zod_1.z.string().optional(),
+        webmasterReferralProvidedAt: zod_1.z
+            .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), zod_1.z.date())
+            .optional(),
         utm: models_1.UtmSchema.optional(),
     });
     AuthWithTelegramWebAppCommand.ResponseSchema = zod_1.z.object({

package/build/commands/user/get-me.command.js

@@ -14,6 +14,7 @@ var GetMeCommand;
             role: zod_1.z.nativeEnum(constants_1.ROLE),
             signupMethod: zod_1.z.nativeEnum(constants_1.SIGNUP_METHOD),
             telegramId: zod_1.z.number().nullable(),
+            webmasterId: zod_1.z.string().uuid().nullable(),
         }),
     });
 })(GetMeCommand || (exports.GetMeCommand = GetMeCommand = {}));

package/build/constants/errors/errors.js

@@ -2279,4 +2279,9 @@ exports.ERRORS = {
         message: 'У вас нет доступа к этой модели Writer',
         httpCode: 403,
     },
+    WEBMASTER_BONUS_APPLY_ERROR: {
+        code: 'A449',
+        message: 'Не удалось применить бонусы вебмастеру',
+        httpCode: 500,
+    },
 };

package/build/constants/promocode/enums/promocode-promotion.enum.js

@@ -6,5 +6,4 @@ var PROMOCODE_PROMOTION;
     PROMOCODE_PROMOTION["BONUS"] = "bonus";
     PROMOCODE_PROMOTION["CHAT_UPSELL"] = "chat_upsell";
     PROMOCODE_PROMOTION["DAILY_STREAK"] = "daily_streak";
-    PROMOCODE_PROMOTION["WEBMASTER"] = "webmaster";
 })(PROMOCODE_PROMOTION || (exports.PROMOCODE_PROMOTION = PROMOCODE_PROMOTION = {}));

package/build/models/index.js

@@ -68,3 +68,4 @@ __exportStar(require("./users-filter-notification.schema"), exports);
 __exportStar(require("./daily-streak"), exports);
 __exportStar(require("./webmaster.schema"), exports);
 __exportStar(require("./webmaster-balance.schema"), exports);
+__exportStar(require("./user-referrals.schema"), exports);

package/build/models/promocode.schema.js

@@ -15,7 +15,6 @@ exports.PromocodeSchema = zod_1.z.object({
     endDate: zod_1.z.date().nullable(),
     userId: zod_1.z.string().uuid().nullable(),
     unregisteredUserId: zod_1.z.string().uuid().nullable(),
-    webmasterId: zod_1.z.string().uuid().nullable(),
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date(),
 });

package/build/models/user-referrals.schema.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserReferralsSchema = void 0;
+const zod_1 = __importDefault(require("zod"));
+exports.UserReferralsSchema = zod_1.default.object({
+    partnerId: zod_1.default.string().uuid().optional(),
+    webmasterAlias: zod_1.default.string().optional(),
+    webmasterReferralProvidedAt: zod_1.default
+        .string()
+        .transform((date) => new Date(date))
+        .optional(),
+});

package/build/models/webmaster-balance.schema.js

@@ -10,7 +10,6 @@ exports.WebmasterBalanceSchema = zod_1.default.object({
     uuid: zod_1.default.string().uuid(),
     webmasterId: zod_1.default.string().uuid(),
     orderId: zod_1.default.string().uuid().nullable(),
-    promocodeId: zod_1.default.string().uuid().nullable(),
     sourceUserId: zod_1.default.string().uuid().nullable(),
     amount: zod_1.default.number(),
     type: zod_1.default.nativeEnum(constants_1.WEBMASTER_BALANCE_TYPE),

package/commands/auth/register-user.command.ts

@@ -1,14 +1,12 @@
-import { UserSchema, UtmSchema } from '../../models';
+import { UserReferralsSchema, UserSchema, UtmSchema } from '../../models';
 import { z } from 'zod';
 
 export namespace RegisterUserCommand {
     export const RequestSchema = UserSchema.pick({ email: true, password: true })
-        .extend({
-            partnerId: z.string().optional(),
-        })
         .extend({
             utm: UtmSchema.optional(),
-        });
+        })
+        .merge(UserReferralsSchema);
 
     export type Request = z.infer<typeof RequestSchema>;
 

package/commands/auth/vk-login.command.ts

@@ -1,12 +1,15 @@
 import { z } from 'zod';
+import { UserReferralsSchema } from '../../models';
 
 export namespace VKLoginCommand {
-    export const RequestSchema = z.object({
-        code: z.string(),
-        code_verifier: z.string(),
-        device_id: z.string(),
-        state: z.string(),
-    });
+    export const RequestSchema = z
+        .object({
+            code: z.string(),
+            code_verifier: z.string(),
+            device_id: z.string(),
+            state: z.string(),
+        })
+        .merge(UserReferralsSchema);
 
     export type Request = z.infer<typeof RequestSchema>;
 

package/commands/auth/yandex-login.command.ts

@@ -1,10 +1,13 @@
 import { z } from 'zod';
+import { UserReferralsSchema } from '../../models';
 
 export namespace YandexLoginCommand {
-    export const RequestSchema = z.object({
-        code: z.string(),
-        code_verifier: z.string(),
-    });
+    export const RequestSchema = z
+        .object({
+            code: z.string(),
+            code_verifier: z.string(),
+        })
+        .merge(UserReferralsSchema);
 
     export type Request = z.infer<typeof RequestSchema>;
 

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

@@ -36,6 +36,10 @@ export namespace BuyProductCommand {
         email: z.string().email(),
         partnerId: z.string().uuid().optional(),
         promocode: z.string().optional(),
+        webmasterAlias: z.string().optional(),
+        webmasterReferralProvidedAt: z
+            .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), z.date())
+            .optional(),
     });
 
     export type RequestFast = z.infer<typeof RequestFastSchema>;

package/commands/promocode/index.ts

@@ -4,4 +4,3 @@ export * from './find-promocode.command';
 export * from './get-upsell-offer.command';
 export * from './update-promocode.command';
 export * from './validate-promocode.command';
-export * from './get-webmaster-promocode.command';

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

@@ -16,6 +16,10 @@ export namespace BuySubscriptionCommand {
         email: z.string().email(),
         partnerId: z.string().uuid().optional(),
         promocode: z.string().optional(),
+        webmasterAlias: z.string().optional(),
+        webmasterReferralProvidedAt: z
+            .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), z.date())
+            .optional(),
     });
 
     export type RequestFast = z.infer<typeof RequestFastSchema>;

package/commands/telegram-auth/create-telegram-auth-link.command.ts

@@ -1,6 +1,11 @@
 import { z } from 'zod';
+import { UserReferralsSchema } from '../../models';
 
 export namespace CreateTelegramAuthLinkCommand {
+    export const RequestSchema = UserReferralsSchema;
+
+    export type Request = z.infer<typeof RequestSchema>;
+
     export const ResponseSchema = z.object({
         data: z.object({
             uuid: z.string().uuid(),

package/commands/telegram-profile/auth-with-telegram-web-app.command.ts

@@ -6,6 +6,10 @@ export namespace AuthWithTelegramWebAppCommand {
         initData: z.string(),
         platform: z.string().nullable(),
         partnerId: z.string().optional(),
+        webmasterAlias: z.string().optional(),
+        webmasterReferralProvidedAt: z
+            .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), z.date())
+            .optional(),
         utm: UtmSchema.optional(),
     });
 

package/commands/user/get-me.command.ts

@@ -14,6 +14,7 @@ export namespace GetMeCommand {
             role: z.nativeEnum(ROLE),
             signupMethod: z.nativeEnum(SIGNUP_METHOD),
             telegramId: z.number().nullable(),
+            webmasterId: z.string().uuid().nullable(),
         }),
     });
 

package/constants/errors/errors.ts

@@ -2287,4 +2287,9 @@ export const ERRORS = {
         message: 'У вас нет доступа к этой модели Writer',
         httpCode: 403,
     },
+    WEBMASTER_BONUS_APPLY_ERROR: {
+        code: 'A449',
+        message: 'Не удалось применить бонусы вебмастеру',
+        httpCode: 500,
+    },
 };

package/constants/promocode/enums/promocode-promotion.enum.ts

@@ -2,5 +2,4 @@ export enum PROMOCODE_PROMOTION {
     BONUS = 'bonus',
     CHAT_UPSELL = 'chat_upsell',
     DAILY_STREAK = 'daily_streak',
-    WEBMASTER = 'webmaster',
 }

package/models/index.ts

@@ -52,3 +52,4 @@ export * from './users-filter-notification.schema';
 export * from './daily-streak';
 export * from './webmaster.schema';
 export * from './webmaster-balance.schema';
+export * from './user-referrals.schema';

package/models/promocode.schema.ts

@@ -13,7 +13,6 @@ export const PromocodeSchema = z.object({
     endDate: z.date().nullable(),
     userId: z.string().uuid().nullable(),
     unregisteredUserId: z.string().uuid().nullable(),
-    webmasterId: z.string().uuid().nullable(),
 
     createdAt: z.date(),
     updatedAt: z.date(),

package/models/user-referrals.schema.ts

@@ -0,0 +1,10 @@
+import z from 'zod';
+
+export const UserReferralsSchema = z.object({
+    partnerId: z.string().uuid().optional(),
+    webmasterAlias: z.string().optional(),
+    webmasterReferralProvidedAt: z
+        .string()
+        .transform((date) => new Date(date))
+        .optional(),
+});

package/models/webmaster-balance.schema.ts

@@ -5,7 +5,6 @@ export const WebmasterBalanceSchema = z.object({
     uuid: z.string().uuid(),
     webmasterId: z.string().uuid(),
     orderId: z.string().uuid().nullable(),
-    promocodeId: z.string().uuid().nullable(),
     sourceUserId: z.string().uuid().nullable(),
     amount: z.number(),
     type: z.nativeEnum(WEBMASTER_BALANCE_TYPE),

package/package.json

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

package/build/commands/promocode/get-webmaster-promocode.command.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetWebmasterPromocodeCommand = void 0;
-const zod_1 = require("zod");
-const models_1 = require("../../models");
-var GetWebmasterPromocodeCommand;
-(function (GetWebmasterPromocodeCommand) {
-    GetWebmasterPromocodeCommand.RequestSchema = models_1.WebmasterSchema.pick({ alias: true });
-    GetWebmasterPromocodeCommand.ResponseSchema = zod_1.z.object({
-        data: zod_1.z.object({
-            isEligible: zod_1.z.boolean(),
-            promocode: zod_1.z.string().nullable(),
-            amount: zod_1.z.number().nullable(),
-            endDate: zod_1.z.date().nullable(),
-        }),
-    });
-})(GetWebmasterPromocodeCommand || (exports.GetWebmasterPromocodeCommand = GetWebmasterPromocodeCommand = {}));

package/commands/promocode/get-webmaster-promocode.command.ts

@@ -1,19 +0,0 @@
-import { z } from 'zod';
-import { WebmasterSchema } from '../../models';
-
-export namespace GetWebmasterPromocodeCommand {
-    export const RequestSchema = WebmasterSchema.pick({ alias: true });
-
-    export type Request = z.infer<typeof RequestSchema>;
-
-    export const ResponseSchema = z.object({
-        data: z.object({
-            isEligible: z.boolean(),
-            promocode: z.string().nullable(),
-            amount: z.number().nullable(),
-            endDate: z.date().nullable(),
-        }),
-    });
-
-    export type Response = z.infer<typeof ResponseSchema>;
-}