@purpleschool/gptbot 0.7.74 → 0.7.76

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

@@ -9,7 +9,23 @@ var RegisterUserCommand;
         .extend({
         utm: models_1.UtmSchema.optional(),
     })
-        .merge(models_1.UserReferralsSchema);
+        .merge(models_1.UserReferralsSchema)
+        .refine((data) => {
+        const hasAdmitadUid = !!data.admitadUid;
+        const hasAdmitadClickDate = !!data.admitadClickDate;
+        return hasAdmitadUid === hasAdmitadClickDate;
+    }, {
+        message: 'admitadUid and admitadClickDate must be provided together',
+        path: ['admitadUid'],
+    })
+        .refine((data) => {
+        if (!data.admitadClickDate)
+            return true;
+        return new Date(data.admitadClickDate).getTime() <= Date.now();
+    }, {
+        message: 'admitadClickDate cannot be in the future',
+        path: ['admitadClickDate'],
+    });
     RegisterUserCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({
             accessToken: zod_1.z.string(),

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

@@ -12,7 +12,23 @@ var VKLoginCommand;
         device_id: zod_1.z.string(),
         state: zod_1.z.string(),
     })
-        .merge(models_1.UserReferralsSchema);
+        .merge(models_1.UserReferralsSchema)
+        .refine((data) => {
+        const hasAdmitadUid = !!data.admitadUid;
+        const hasAdmitadClickDate = !!data.admitadClickDate;
+        return hasAdmitadUid === hasAdmitadClickDate;
+    }, {
+        message: 'admitadUid and admitadClickDate must be provided together',
+        path: ['admitadUid'],
+    })
+        .refine((data) => {
+        if (!data.admitadClickDate)
+            return true;
+        return new Date(data.admitadClickDate).getTime() <= Date.now();
+    }, {
+        message: 'admitadClickDate cannot be in the future',
+        path: ['admitadClickDate'],
+    });
     VKLoginCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({
             accessToken: zod_1.z.string(),

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

@@ -10,7 +10,23 @@ var YandexLoginCommand;
         code: zod_1.z.string(),
         code_verifier: zod_1.z.string(),
     })
-        .merge(models_1.UserReferralsSchema);
+        .merge(models_1.UserReferralsSchema)
+        .refine((data) => {
+        const hasAdmitadUid = !!data.admitadUid;
+        const hasAdmitadClickDate = !!data.admitadClickDate;
+        return hasAdmitadUid === hasAdmitadClickDate;
+    }, {
+        message: 'admitadUid and admitadClickDate must be provided together',
+        path: ['admitadUid'],
+    })
+        .refine((data) => {
+        if (!data.admitadClickDate)
+            return true;
+        return new Date(data.admitadClickDate).getTime() <= Date.now();
+    }, {
+        message: 'admitadClickDate cannot be in the future',
+        path: ['admitadClickDate'],
+    });
     YandexLoginCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({
             accessToken: zod_1.z.string(),

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

@@ -26,7 +26,8 @@ var BuyProductCommand;
             electronic: zod_1.z.number(),
         }),
     });
-    BuyProductCommand.RequestFastSchema = zod_1.z.object({
+    BuyProductCommand.RequestFastSchema = zod_1.z
+        .object({
         email: zod_1.z.string().email(),
         partnerId: zod_1.z.string().uuid().optional(),
         promocode: zod_1.z.string().optional(),
@@ -34,6 +35,28 @@ var BuyProductCommand;
         webmasterReferralProvidedAt: zod_1.z
             .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), zod_1.z.date())
             .optional(),
+        admitadUid: zod_1.z.string().optional(),
+        admitadClickDate: zod_1.z
+            .string()
+            .datetime()
+            .transform((date) => new Date(date))
+            .optional(),
+    })
+        .refine((data) => {
+        const hasAdmitadUid = !!data.admitadUid;
+        const hasAdmitadClickDate = !!data.admitadClickDate;
+        return hasAdmitadUid === hasAdmitadClickDate;
+    }, {
+        message: 'admitadUid and admitadClickDate must be provided together',
+        path: ['admitadUid'],
+    })
+        .refine((data) => {
+        if (!data.admitadClickDate)
+            return true;
+        return new Date(data.admitadClickDate).getTime() <= Date.now();
+    }, {
+        message: 'admitadClickDate cannot be in the future',
+        path: ['admitadClickDate'],
     });
     BuyProductCommand.ResponseSchema = zod_1.z.object({
         publicId: zod_1.z.string(),

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

@@ -12,7 +12,8 @@ var BuySubscriptionCommand;
         useDiscount: zod_1.z.boolean(),
         promocode: zod_1.z.string().optional(),
     });
-    BuySubscriptionCommand.RequestFastSchema = zod_1.z.object({
+    BuySubscriptionCommand.RequestFastSchema = zod_1.z
+        .object({
         email: zod_1.z.string().email(),
         partnerId: zod_1.z.string().uuid().optional(),
         promocode: zod_1.z.string().optional(),
@@ -20,6 +21,28 @@ var BuySubscriptionCommand;
         webmasterReferralProvidedAt: zod_1.z
             .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), zod_1.z.date())
             .optional(),
+        admitadUid: zod_1.z.string().optional(),
+        admitadClickDate: zod_1.z
+            .string()
+            .datetime()
+            .transform((date) => new Date(date))
+            .optional(),
+    })
+        .refine((data) => {
+        const hasAdmitadUid = !!data.admitadUid;
+        const hasAdmitadClickDate = !!data.admitadClickDate;
+        return hasAdmitadUid === hasAdmitadClickDate;
+    }, {
+        message: 'admitadUid and admitadClickDate must be provided together',
+        path: ['admitadUid'],
+    })
+        .refine((data) => {
+        if (!data.admitadClickDate)
+            return true;
+        return new Date(data.admitadClickDate).getTime() <= Date.now();
+    }, {
+        message: 'admitadClickDate cannot be in the future',
+        path: ['admitadClickDate'],
     });
     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

@@ -5,7 +5,21 @@ const zod_1 = require("zod");
 const models_1 = require("../../models");
 var CreateTelegramAuthLinkCommand;
 (function (CreateTelegramAuthLinkCommand) {
-    CreateTelegramAuthLinkCommand.RequestSchema = models_1.UserReferralsSchema;
+    CreateTelegramAuthLinkCommand.RequestSchema = models_1.UserReferralsSchema.refine((data) => {
+        const hasAdmitadUid = !!data.admitadUid;
+        const hasAdmitadClickDate = !!data.admitadClickDate;
+        return hasAdmitadUid === hasAdmitadClickDate;
+    }, {
+        message: 'admitadUid and admitadClickDate must be provided together',
+        path: ['admitadUid'],
+    }).refine((data) => {
+        if (!data.admitadClickDate)
+            return true;
+        return new Date(data.admitadClickDate).getTime() <= Date.now();
+    }, {
+        message: 'admitadClickDate cannot be in the future',
+        path: ['admitadClickDate'],
+    });
     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

@@ -14,6 +14,12 @@ var AuthWithTelegramWebAppCommand;
             .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), zod_1.z.date())
             .optional(),
         utm: models_1.UtmSchema.optional(),
+        admitadUid: zod_1.z.string().optional(),
+        admitadClickDate: zod_1.z
+            .string()
+            .datetime()
+            .transform((date) => new Date(date))
+            .optional(),
     });
     AuthWithTelegramWebAppCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({

package/build/constants/errors/errors.js

@@ -2239,10 +2239,12 @@ exports.ERRORS = {
     MUSIC_MAX_SYMBOLS_EXCEEDED: {
         code: 'A458',
         message: 'Превышена максимальная количество символов',
+        httpCode: 400,
     },
     MUSIC_INVALID_VOCAL: {
         code: 'A459',
         message: 'Выбран неверный голос для вокала',
+        httpCode: 400,
     },
     MUSIC_JOB_DELETE_ERROR: {
         code: 'A460',

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

@@ -12,4 +12,10 @@ exports.UserReferralsSchema = zod_1.default.object({
         .string()
         .transform((date) => new Date(date))
         .optional(),
+    admitadUid: zod_1.default.string().optional(),
+    admitadClickDate: zod_1.default
+        .string()
+        .datetime()
+        .transform((date) => new Date(date))
+        .optional(),
 });

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

@@ -6,7 +6,28 @@ export namespace RegisterUserCommand {
         .extend({
             utm: UtmSchema.optional(),
         })
-        .merge(UserReferralsSchema);
+        .merge(UserReferralsSchema)
+        .refine(
+            (data) => {
+                const hasAdmitadUid = !!data.admitadUid;
+                const hasAdmitadClickDate = !!data.admitadClickDate;
+                return hasAdmitadUid === hasAdmitadClickDate;
+            },
+            {
+                message: 'admitadUid and admitadClickDate must be provided together',
+                path: ['admitadUid'],
+            },
+        )
+        .refine(
+            (data) => {
+                if (!data.admitadClickDate) return true;
+                return new Date(data.admitadClickDate).getTime() <= Date.now();
+            },
+            {
+                message: 'admitadClickDate cannot be in the future',
+                path: ['admitadClickDate'],
+            },
+        );
 
     export type Request = z.infer<typeof RequestSchema>;
 

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

@@ -9,7 +9,28 @@ export namespace VKLoginCommand {
             device_id: z.string(),
             state: z.string(),
         })
-        .merge(UserReferralsSchema);
+        .merge(UserReferralsSchema)
+        .refine(
+            (data) => {
+                const hasAdmitadUid = !!data.admitadUid;
+                const hasAdmitadClickDate = !!data.admitadClickDate;
+                return hasAdmitadUid === hasAdmitadClickDate;
+            },
+            {
+                message: 'admitadUid and admitadClickDate must be provided together',
+                path: ['admitadUid'],
+            },
+        )
+        .refine(
+            (data) => {
+                if (!data.admitadClickDate) return true;
+                return new Date(data.admitadClickDate).getTime() <= Date.now();
+            },
+            {
+                message: 'admitadClickDate cannot be in the future',
+                path: ['admitadClickDate'],
+            },
+        );
 
     export type Request = z.infer<typeof RequestSchema>;
 

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

@@ -7,7 +7,28 @@ export namespace YandexLoginCommand {
             code: z.string(),
             code_verifier: z.string(),
         })
-        .merge(UserReferralsSchema);
+        .merge(UserReferralsSchema)
+        .refine(
+            (data) => {
+                const hasAdmitadUid = !!data.admitadUid;
+                const hasAdmitadClickDate = !!data.admitadClickDate;
+                return hasAdmitadUid === hasAdmitadClickDate;
+            },
+            {
+                message: 'admitadUid and admitadClickDate must be provided together',
+                path: ['admitadUid'],
+            },
+        )
+        .refine(
+            (data) => {
+                if (!data.admitadClickDate) return true;
+                return new Date(data.admitadClickDate).getTime() <= Date.now();
+            },
+            {
+                message: 'admitadClickDate cannot be in the future',
+                path: ['admitadClickDate'],
+            },
+        );
 
     export type Request = z.infer<typeof RequestSchema>;
 

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

@@ -32,15 +32,43 @@ export namespace BuyProductCommand {
         }),
     });
 
-    export const RequestFastSchema = z.object({
-        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 const RequestFastSchema = z
+        .object({
+            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(),
+            admitadUid: z.string().optional(),
+            admitadClickDate: z
+                .string()
+                .datetime()
+                .transform((date) => new Date(date))
+                .optional(),
+        })
+        .refine(
+            (data) => {
+                const hasAdmitadUid = !!data.admitadUid;
+                const hasAdmitadClickDate = !!data.admitadClickDate;
+                return hasAdmitadUid === hasAdmitadClickDate;
+            },
+            {
+                message: 'admitadUid and admitadClickDate must be provided together',
+                path: ['admitadUid'],
+            },
+        )
+        .refine(
+            (data) => {
+                if (!data.admitadClickDate) return true;
+                return new Date(data.admitadClickDate).getTime() <= Date.now();
+            },
+            {
+                message: 'admitadClickDate cannot be in the future',
+                path: ['admitadClickDate'],
+            },
+        );
 
     export type RequestFast = z.infer<typeof RequestFastSchema>;
     export const ResponseSchema = z.object({

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

@@ -12,15 +12,43 @@ export namespace BuySubscriptionCommand {
     });
 
     export type Request = z.infer<typeof RequestSchema>;
-    export const RequestFastSchema = z.object({
-        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 const RequestFastSchema = z
+        .object({
+            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(),
+            admitadUid: z.string().optional(),
+            admitadClickDate: z
+                .string()
+                .datetime()
+                .transform((date) => new Date(date))
+                .optional(),
+        })
+        .refine(
+            (data) => {
+                const hasAdmitadUid = !!data.admitadUid;
+                const hasAdmitadClickDate = !!data.admitadClickDate;
+                return hasAdmitadUid === hasAdmitadClickDate;
+            },
+            {
+                message: 'admitadUid and admitadClickDate must be provided together',
+                path: ['admitadUid'],
+            },
+        )
+        .refine(
+            (data) => {
+                if (!data.admitadClickDate) return true;
+                return new Date(data.admitadClickDate).getTime() <= Date.now();
+            },
+            {
+                message: 'admitadClickDate cannot be in the future',
+                path: ['admitadClickDate'],
+            },
+        );
 
     export type RequestFast = z.infer<typeof RequestFastSchema>;
 

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

@@ -2,7 +2,26 @@ import { z } from 'zod';
 import { UserReferralsSchema } from '../../models';
 
 export namespace CreateTelegramAuthLinkCommand {
-    export const RequestSchema = UserReferralsSchema;
+    export const RequestSchema = UserReferralsSchema.refine(
+        (data) => {
+            const hasAdmitadUid = !!data.admitadUid;
+            const hasAdmitadClickDate = !!data.admitadClickDate;
+            return hasAdmitadUid === hasAdmitadClickDate;
+        },
+        {
+            message: 'admitadUid and admitadClickDate must be provided together',
+            path: ['admitadUid'],
+        },
+    ).refine(
+        (data) => {
+            if (!data.admitadClickDate) return true;
+            return new Date(data.admitadClickDate).getTime() <= Date.now();
+        },
+        {
+            message: 'admitadClickDate cannot be in the future',
+            path: ['admitadClickDate'],
+        },
+    );
 
     export type Request = z.infer<typeof RequestSchema>;
 

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

@@ -11,6 +11,12 @@ export namespace AuthWithTelegramWebAppCommand {
             .preprocess((val) => (typeof val === 'string' ? new Date(val) : val), z.date())
             .optional(),
         utm: UtmSchema.optional(),
+        admitadUid: z.string().optional(),
+        admitadClickDate: z
+            .string()
+            .datetime()
+            .transform((date) => new Date(date))
+            .optional(),
     });
 
     export type Request = z.infer<typeof RequestBodySchema>;

package/constants/errors/errors.ts

@@ -2247,10 +2247,12 @@ export const ERRORS = {
     MUSIC_MAX_SYMBOLS_EXCEEDED: {
         code: 'A458',
         message: 'Превышена максимальная количество символов',
+        httpCode: 400,
     },
     MUSIC_INVALID_VOCAL: {
         code: 'A459',
         message: 'Выбран неверный голос для вокала',
+        httpCode: 400,
     },
     MUSIC_JOB_DELETE_ERROR: {
         code: 'A460',

package/models/user-referrals.schema.ts

@@ -7,4 +7,10 @@ export const UserReferralsSchema = z.object({
         .string()
         .transform((date) => new Date(date))
         .optional(),
+    admitadUid: z.string().optional(),
+    admitadClickDate: z
+        .string()
+        .datetime()
+        .transform((date) => new Date(date))
+        .optional(),
 });

package/package.json

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