@purpleschool/gptbot 0.5.54 → 0.5.55

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

@@ -5,9 +5,13 @@ const models_1 = require("../../models");
 const zod_1 = require("zod");
 var RegisterUserCommand;
 (function (RegisterUserCommand) {
-    RegisterUserCommand.RequestSchema = zod_1.z.intersection(models_1.UserSchema.pick({ email: true, password: true }), zod_1.z.object({
-        partnerId: zod_1.z.string().uuid().optional(),
-    }));
+    RegisterUserCommand.RequestSchema = models_1.UserSchema.pick({ email: true, password: true })
+        .extend({
+        partnerId: zod_1.z.string().optional(),
+    })
+        .extend({
+        utm: models_1.UtmSchema.optional(),
+    });
     RegisterUserCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({
             accessToken: zod_1.z.string(),

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

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthWithTelegramWebAppCommand = void 0;
 const zod_1 = require("zod");
+const models_1 = require("../../models");
 var AuthWithTelegramWebAppCommand;
 (function (AuthWithTelegramWebAppCommand) {
     AuthWithTelegramWebAppCommand.RequestBodySchema = zod_1.z.object({
         initData: zod_1.z.string(),
         platform: zod_1.z.string().nullable(),
         partnerId: zod_1.z.string().optional(),
+        utm: models_1.UtmSchema.optional(),
     });
     AuthWithTelegramWebAppCommand.ResponseSchema = zod_1.z.object({
         data: zod_1.z.object({

package/build/constants/errors/errors.js

@@ -960,4 +960,9 @@ exports.ERRORS = {
         message: 'Произошла ошибка при проверке ограничений на длину запроса для чата',
         httpCode: 500,
     },
+    UTM_SAVE_ERROR: {
+        code: 'A218',
+        message: 'Произошла ошибка при сохранении UTM',
+        httpCode: 500,
+    },
 };

package/build/models/index.js

@@ -46,3 +46,4 @@ __exportStar(require("./user-task.schema"), exports);
 __exportStar(require("./user-to-product.schema"), exports);
 __exportStar(require("./user-to-subscription.schema"), exports);
 __exportStar(require("./user.schema"), exports);
+__exportStar(require("./utm.schema"), exports);

package/build/models/utm.schema.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UtmSchema = void 0;
+const zod_1 = require("zod");
+exports.UtmSchema = zod_1.z
+    .object({
+    utmSource: zod_1.z.string().optional().nullable(),
+    utmMedium: zod_1.z.string().optional().nullable(),
+    utmCampaign: zod_1.z.string().optional().nullable(),
+    utmContent: zod_1.z.string().optional().nullable(),
+    utmTerm: zod_1.z.string().optional().nullable(),
+})
+    .refine((data) => Object.values(data).some((value) => value != null && value !== ''), {
+    message: 'At least one UTM parameter must be provided',
+});

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

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

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

@@ -1,10 +1,12 @@
 import { z } from 'zod';
+import { UtmSchema } from '../../models';
 
 export namespace AuthWithTelegramWebAppCommand {
     export const RequestBodySchema = z.object({
         initData: z.string(),
         platform: z.string().nullable(),
         partnerId: z.string().optional(),
+        utm: UtmSchema.optional(),
     });
 
     export type Request = z.infer<typeof RequestBodySchema>;

package/constants/errors/errors.ts

@@ -963,4 +963,9 @@ export const ERRORS = {
         message: 'Произошла ошибка при проверке ограничений на длину запроса для чата',
         httpCode: 500,
     },
+    UTM_SAVE_ERROR: {
+        code: 'A218',
+        message: 'Произошла ошибка при сохранении UTM',
+        httpCode: 500,
+    },
 };

package/models/index.ts

@@ -30,3 +30,4 @@ export * from './user-task.schema';
 export * from './user-to-product.schema';
 export * from './user-to-subscription.schema';
 export * from './user.schema';
+export * from './utm.schema';

package/models/utm.schema.ts

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+
+export const UtmSchema = z
+    .object({
+        utmSource: z.string().optional().nullable(),
+        utmMedium: z.string().optional().nullable(),
+        utmCampaign: z.string().optional().nullable(),
+        utmContent: z.string().optional().nullable(),
+        utmTerm: z.string().optional().nullable(),
+    })
+    .refine((data) => Object.values(data).some((value) => value != null && value !== ''), {
+        message: 'At least one UTM parameter must be provided',
+    });
+
+export type Utm = z.infer<typeof UtmSchema>;

package/package.json

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