@purpleschool/gptbot 0.7.35-texteditor → 0.7.36-texteditor

package/api/controllers/http/index.ts

@@ -40,6 +40,7 @@ export * from './review';
 export * from './prompt-category';
 export * from './prompt-topic';
 export * from './prompt';
+export * from './user-private';
 export * from './folder';
 export * from './user-to-product';
 export * from './user-to-subscription';

package/api/controllers/http/user-private.ts

@@ -0,0 +1,5 @@
+export const USER_PRIVATE_CONTROLLER = 'users/private' as const;
+
+export const USER_PRIVATE_ROUTES = {
+    GET_USER_BATCH: 'get-by-ids',
+} as const;

package/api/routes.ts

@@ -1,6 +1,5 @@
 import { POST_TYPE } from '../constants';
 import * as CONTROLLERS from './controllers';
-
 export const ROOT = '/api' as const;
 
 export const REST_API = {
@@ -31,6 +30,9 @@ export const REST_API = {
         SEND_NOTIFICATION: `${ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.SEND_NOTIFICATION}`,
         DELETE_ACCOUNT: `${ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.DELETE_ACCOUNT}`,
     },
+    USER_PRIVATE: {
+        GET_USER_BATCH: `${ROOT}/${CONTROLLERS.USER_PRIVATE_CONTROLLER}/${CONTROLLERS.USER_PRIVATE_ROUTES.GET_USER_BATCH}`,
+    },
     PAGE: {
         GET: `${ROOT}/${CONTROLLERS.PAGE_CONTROLLER}/${CONTROLLERS.PAGE_ROUTES.GET_ALL}`,
         PATCH: (uuid: string) => `${ROOT}/${CONTROLLERS.PAGE_CONTROLLER}/${uuid}`,

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

@@ -56,6 +56,7 @@ __exportStar(require("./review"), exports);
 __exportStar(require("./prompt-category"), exports);
 __exportStar(require("./prompt-topic"), exports);
 __exportStar(require("./prompt"), exports);
+__exportStar(require("./user-private"), exports);
 __exportStar(require("./folder"), exports);
 __exportStar(require("./user-to-product"), exports);
 __exportStar(require("./user-to-subscription"), exports);

package/build/api/controllers/http/user-private.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USER_PRIVATE_ROUTES = exports.USER_PRIVATE_CONTROLLER = void 0;
+exports.USER_PRIVATE_CONTROLLER = 'users/private';
+exports.USER_PRIVATE_ROUTES = {
+    GET_USER_BATCH: 'get-by-ids',
+};

package/build/api/routes.js

@@ -60,6 +60,9 @@ exports.REST_API = {
         SEND_NOTIFICATION: `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.SEND_NOTIFICATION}`,
         DELETE_ACCOUNT: `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.DELETE_ACCOUNT}`,
     },
+    USER_PRIVATE: {
+        GET_USER_BATCH: `${exports.ROOT}/${CONTROLLERS.USER_PRIVATE_CONTROLLER}/${CONTROLLERS.USER_PRIVATE_ROUTES.GET_USER_BATCH}`,
+    },
     PAGE: {
         GET: `${exports.ROOT}/${CONTROLLERS.PAGE_CONTROLLER}/${CONTROLLERS.PAGE_ROUTES.GET_ALL}`,
         PATCH: (uuid) => `${exports.ROOT}/${CONTROLLERS.PAGE_CONTROLLER}/${uuid}`,

package/build/commands/user/get-aggregated-user-data.command.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetAggregatedUserData = void 0;
+const zod_1 = require("zod");
+var GetAggregatedUserData;
+(function (GetAggregatedUserData) {
+    GetAggregatedUserData.RequestSchema = zod_1.z.object({
+        uuids: zod_1.z.array(zod_1.z.string().uuid()).min(1),
+    });
+    GetAggregatedUserData.AggregatedUserSchema = zod_1.z.object({
+        uuid: zod_1.z.string().uuid(),
+        email: zod_1.z.string().email().nullable(),
+        telegramId: zod_1.z.number().nullable(),
+        lastActivityAt: zod_1.z.string().datetime(),
+        registeredAt: zod_1.z.string().datetime(),
+        tokenBalance: zod_1.z.number(),
+        hasActiveSubscription: zod_1.z.boolean(),
+        hasActiveProduct: zod_1.z.boolean(),
+        isCustomer: zod_1.z.boolean(),
+    });
+    GetAggregatedUserData.ResponseSchema = zod_1.z.object({
+        data: zod_1.z.array(GetAggregatedUserData.AggregatedUserSchema),
+    });
+})(GetAggregatedUserData || (exports.GetAggregatedUserData = GetAggregatedUserData = {}));

package/build/constants/email/subjects.js

@@ -11,4 +11,5 @@ exports.EMAIL_SUBJECTS = {
     SUBSCRIPTION_RENEWAL_REMINDER: 'Продление подписки',
     RESTORE_PASSWORD: 'Восстановление пароля',
     FAST_REGISTRATION: 'Быстрая регистрация',
+    SUBSCRIPTION_BEFORE_CANCEL: 'Завтра всё изменится',
 };

package/build/constants/subscription/enums/user-to-subscription-marks.enum.js

@@ -6,5 +6,6 @@ var USER_TO_SUBSCRIPTION_MARKS;
     USER_TO_SUBSCRIPTION_MARKS["WITHOUT_AUTO_RENEWAL"] = "WITHOUT_AUTO_RENEWAL";
     USER_TO_SUBSCRIPTION_MARKS["MOCK"] = "MOCK";
     USER_TO_SUBSCRIPTION_MARKS["SENT_RENEWAL_REMINDER"] = "SENT_RENEWAL_REMINDER";
+    USER_TO_SUBSCRIPTION_MARKS["SENT_CANCELLATION_WARNING"] = "SENT_CANCELLATION_WARNING";
     USER_TO_SUBSCRIPTION_MARKS["SENT_PAST_DUE_RECOVER_REQUEST"] = "SENT_PAST_DUE_RECOVER_REQUEST";
 })(USER_TO_SUBSCRIPTION_MARKS || (exports.USER_TO_SUBSCRIPTION_MARKS = USER_TO_SUBSCRIPTION_MARKS = {}));

package/build/models/tools/image-editor/image-editor-config.schema.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageEditorConfigSchema = exports.PromptGroupSchema = exports.SystemPromptSchema = void 0;
+exports.ImageEditorConfigSchema = exports.PromptGroupSchema = exports.SystemPromptSchema = exports.SystemPromptParamsSchema = void 0;
 const zod_1 = require("zod");
 const image_editor_model_schema_1 = require("./image-editor-model.schema");
 const icon_variants_schema_1 = require("../../icon-variants.schema");
+exports.SystemPromptParamsSchema = zod_1.z.object({
+    imageSettings: zod_1.z.object({
+        minImages: zod_1.z.number(),
+        maxImages: zod_1.z.number(),
+    }),
+});
 exports.SystemPromptSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
     title: zod_1.z.string(),
@@ -11,6 +17,7 @@ exports.SystemPromptSchema = zod_1.z.object({
     prompt: zod_1.z.string(),
     allowUserPrompt: zod_1.z.boolean(),
     groupId: zod_1.z.string().uuid(),
+    params: exports.SystemPromptParamsSchema,
     preview: zod_1.z
         .object({
         before: zod_1.z.string(),
@@ -18,6 +25,7 @@ exports.SystemPromptSchema = zod_1.z.object({
     })
         .optional()
         .nullable(),
+    order: zod_1.z.number(),
 });
 exports.PromptGroupSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
@@ -28,5 +36,5 @@ exports.PromptGroupSchema = zod_1.z.object({
 });
 exports.ImageEditorConfigSchema = zod_1.z.object({
     models: zod_1.z.array(image_editor_model_schema_1.ImageEditorModelSchema),
-    promptGroups: zod_1.z.array(exports.SystemPromptSchema),
+    promptGroups: zod_1.z.array(exports.PromptGroupSchema),
 });

package/build/models/tools/image-editor/image-editor-job.schema.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageEditorJobSchema = exports.ImageEditorJobParamsSchema = void 0;
 const zod_1 = require("zod");
 const constants_1 = require("../../../constants");
+const tool_job_schema_1 = require("../../tool-job.schema");
 exports.ImageEditorJobParamsSchema = zod_1.z.object({
     imageUrls: zod_1.z.array(zod_1.z.string()).optional(),
     systemPromptId: zod_1.z.string().optional(),
 });
-exports.ImageEditorJobSchema = zod_1.z.object({
+exports.ImageEditorJobSchema = tool_job_schema_1.ToolJobSchema.extend({
     title: zod_1.z.string(),
     prompt: zod_1.z.string(),
     reaction: zod_1.z.nativeEnum(constants_1.USER_REACTION).nullable(),

package/commands/user/get-aggregated-user-data.command.ts

@@ -0,0 +1,29 @@
+import { z } from 'zod';
+
+export namespace GetAggregatedUserData {
+    export const RequestSchema = z.object({
+        uuids: z.array(z.string().uuid()).min(1),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const AggregatedUserSchema = z.object({
+        uuid: z.string().uuid(),
+        email: z.string().email().nullable(),
+        telegramId: z.number().nullable(),
+        lastActivityAt: z.string().datetime(),
+        registeredAt: z.string().datetime(),
+        tokenBalance: z.number(),
+        hasActiveSubscription: z.boolean(),
+        hasActiveProduct: z.boolean(),
+        isCustomer: z.boolean(),
+    });
+
+    export type AggregatedUser = z.infer<typeof AggregatedUserSchema>;
+
+    export const ResponseSchema = z.object({
+        data: z.array(AggregatedUserSchema),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/constants/email/subjects.ts

@@ -8,4 +8,5 @@ export const EMAIL_SUBJECTS = {
     SUBSCRIPTION_RENEWAL_REMINDER: 'Продление подписки',
     RESTORE_PASSWORD: 'Восстановление пароля',
     FAST_REGISTRATION: 'Быстрая регистрация',
+    SUBSCRIPTION_BEFORE_CANCEL: 'Завтра всё изменится',
 };

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

@@ -2,5 +2,6 @@ export enum USER_TO_SUBSCRIPTION_MARKS {
     WITHOUT_AUTO_RENEWAL = 'WITHOUT_AUTO_RENEWAL',
     MOCK = 'MOCK',
     SENT_RENEWAL_REMINDER = 'SENT_RENEWAL_REMINDER',
+    SENT_CANCELLATION_WARNING = 'SENT_CANCELLATION_WARNING',
     SENT_PAST_DUE_RECOVER_REQUEST = 'SENT_PAST_DUE_RECOVER_REQUEST',
 }

package/models/tools/image-editor/image-editor-config.schema.ts

@@ -2,6 +2,15 @@ import { z } from 'zod';
 import { ImageEditorModelSchema } from './image-editor-model.schema';
 import { IconVariantsSchema } from '../../icon-variants.schema';
 
+export const SystemPromptParamsSchema = z.object({
+    imageSettings: z.object({
+        minImages: z.number(),
+        maxImages: z.number(),
+    }),
+});
+
+export type SystemPromptParams = z.infer<typeof SystemPromptParamsSchema>;
+
 export const SystemPromptSchema = z.object({
     uuid: z.string(),
     title: z.string(),
@@ -9,6 +18,7 @@ export const SystemPromptSchema = z.object({
     prompt: z.string(),
     allowUserPrompt: z.boolean(),
     groupId: z.string().uuid(),
+    params: SystemPromptParamsSchema,
     preview: z
         .object({
             before: z.string(),
@@ -16,6 +26,7 @@ export const SystemPromptSchema = z.object({
         })
         .optional()
         .nullable(),
+    order: z.number(),
 });
 
 export const PromptGroupSchema = z.object({
@@ -28,5 +39,5 @@ export const PromptGroupSchema = z.object({
 
 export const ImageEditorConfigSchema = z.object({
     models: z.array(ImageEditorModelSchema),
-    promptGroups: z.array(SystemPromptSchema),
+    promptGroups: z.array(PromptGroupSchema),
 });

package/models/tools/image-editor/image-editor-job.schema.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { USER_REACTION } from '../../../constants';
+import { ToolJobSchema } from '../../tool-job.schema';
 
 export const ImageEditorJobParamsSchema = z.object({
     imageUrls: z.array(z.string()).optional(),
@@ -8,7 +9,7 @@ export const ImageEditorJobParamsSchema = z.object({
 
 export type ImageEditorJobParams = z.infer<typeof ImageEditorJobParamsSchema>;
 
-export const ImageEditorJobSchema = z.object({
+export const ImageEditorJobSchema = ToolJobSchema.extend({
     title: z.string(),
     prompt: z.string(),
     reaction: z.nativeEnum(USER_REACTION).nullable(),

package/package.json

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