@purpleschool/gptbot 0.8.84 → 0.8.86

package/api/controllers/http/user.ts

@@ -11,6 +11,7 @@ export const USER_ROUTES = {
     GET_SUBSCRIPTIONS: (uuid: string) => `subscriptions/${uuid}`,
     CANCEL_SUBSCRIPTION: (uuid: string) => `subscriptions/${uuid}/cancel`,
     GET_PRODUCTS: (uuid: string) => `products/${uuid}`,
+    CANCEL_PRODUCT: (uuid: string) => `products/${uuid}/cancel`,
     GET_PAYMENTS: (uuid: string) => `payments/${uuid}`,
     GET_COUNT_NOTIFICATION: 'broadcast/count',
     SEND_NOTIFICATION: 'broadcast',

package/api/routes.ts

@@ -33,6 +33,8 @@ export const REST_API = {
             `${ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.CANCEL_SUBSCRIPTION(uuid)}`,
         GET_PRODUCTS: (uuid: string) =>
             `${ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.GET_PRODUCTS(uuid)}`,
+        CANCEL_PRODUCT: (uuid: string) =>
+            `${ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.CANCEL_PRODUCT(uuid)}`,
         GET_COUNT_NOTIFICATION: `${ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.GET_COUNT_NOTIFICATION}`,
         SEND_NOTIFICATION: `${ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.SEND_NOTIFICATION}`,
         DELETE_ACCOUNT: `${ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.DELETE_ACCOUNT}`,

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

@@ -13,6 +13,7 @@ exports.USER_ROUTES = {
     GET_SUBSCRIPTIONS: (uuid) => `subscriptions/${uuid}`,
     CANCEL_SUBSCRIPTION: (uuid) => `subscriptions/${uuid}/cancel`,
     GET_PRODUCTS: (uuid) => `products/${uuid}`,
+    CANCEL_PRODUCT: (uuid) => `products/${uuid}/cancel`,
     GET_PAYMENTS: (uuid) => `payments/${uuid}`,
     GET_COUNT_NOTIFICATION: 'broadcast/count',
     SEND_NOTIFICATION: 'broadcast',

package/build/api/routes.js

@@ -61,6 +61,7 @@ exports.REST_API = {
         GET_SUBSCRIPTIONS: (uuid) => `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.GET_SUBSCRIPTIONS(uuid)}`,
         CANCEL_SUBSCRIPTION: (uuid) => `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.CANCEL_SUBSCRIPTION(uuid)}`,
         GET_PRODUCTS: (uuid) => `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.GET_PRODUCTS(uuid)}`,
+        CANCEL_PRODUCT: (uuid) => `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.CANCEL_PRODUCT(uuid)}`,
         GET_COUNT_NOTIFICATION: `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.GET_COUNT_NOTIFICATION}`,
         SEND_NOTIFICATION: `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.SEND_NOTIFICATION}`,
         DELETE_ACCOUNT: `${exports.ROOT}/${CONTROLLERS.USER_CONTROLLER}/${CONTROLLERS.USER_ROUTES.DELETE_ACCOUNT}`,

package/build/commands/community/create-community-post.command.js

@@ -11,7 +11,7 @@ var CreateCommunityPostCommand;
         caption: zod_1.z.string().max(500).nullable().optional(),
         toolJobId: zod_1.z.string().uuid(),
         toolType: zod_1.z.nativeEnum(constants_1.COMMUNITY_TOOL_TYPE),
-        trackIndex: zod_1.z.number().optional(),
+        trackId: zod_1.z.string().uuid().optional(),
     });
     CreateCommunityPostCommand.ResponseSchema = zod_1.z.object({
         data: models_1.ResponseCommunityPostSchema,

package/build/commands/user/cancel-user-product.command.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CancelUserProductCommand = void 0;
+const zod_1 = __importDefault(require("zod"));
+var CancelUserProductCommand;
+(function (CancelUserProductCommand) {
+    CancelUserProductCommand.RequestParamSchema = zod_1.default.object({
+        uuid: zod_1.default.string().uuid(),
+    });
+    CancelUserProductCommand.RequestSchema = zod_1.default.object({
+        userToProductId: zod_1.default.string().uuid(),
+    });
+    CancelUserProductCommand.ResponseSchema = zod_1.default.object({
+        data: zod_1.default.object({
+            isCancelled: zod_1.default.boolean(),
+        }),
+    });
+})(CancelUserProductCommand || (exports.CancelUserProductCommand = CancelUserProductCommand = {}));

package/build/commands/user/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./delete-account.command"), exports);
 __exportStar(require("./get-aggregated-user-data.command"), exports);
 __exportStar(require("./get-user-payments.command"), exports);
 __exportStar(require("./cancel-user-subscription.command"), exports);
+__exportStar(require("./cancel-user-product.command"), exports);

package/build/constants/errors/errors.js

@@ -2642,15 +2642,15 @@ exports.ERRORS = {
         message: 'Произошла ошибка при получении модели для генерации изображений',
         httpCode: 500,
     },
-    COMMUNITY_POST_TRACK_INDEX_REQUIRED: {
+    COMMUNITY_POST_TRACK_ID_REQUIRED: {
         code: 'A539',
-        message: 'Индекс трека обязателен для музыкального поста',
+        message: 'ID трека обязателен для музыкального поста',
         httpCode: 400,
     },
-    COMMUNITY_POST_TRACK_INDEX_OUT_OF_RANGE: {
+    COMMUNITY_POST_TRACK_NOT_FOUND: {
         code: 'A540',
-        message: 'Индекс трека выходит за пределы допустимого диапазона',
-        httpCode: 400,
+        message: 'Трек не найден',
+        httpCode: 404,
     },
     COMMUNITY_POST_EXISTANCE_CHECK_ERROR: {
         code: 'A561',
@@ -2672,4 +2672,14 @@ exports.ERRORS = {
         message: 'Для получения награды опубликуйте работу в сообществе',
         httpCode: 400,
     },
+    PRODUCT_OWNERSHIP_ERROR: {
+        code: 'A565',
+        message: 'Пользователь не является владельцем продукта',
+        httpCode: 400,
+    },
+    PRODUCT_CANCEL_ERROR: {
+        code: 'A566',
+        message: 'Нельзя отменить пакет, которым юзер начал пользоваться',
+        httpCode: 400,
+    },
 };

package/build/models/community/community-post-media-data.schema.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommunityPostMediaDataSchema = exports.MusicCommunityMediaSchema = exports.VideoEditorCommunityMediaSchema = exports.VideoCommunityMediaSchema = exports.ImageEditorCommunityMediaSchema = exports.ImageCommunityMediaSchema = void 0;
 const zod_1 = require("zod");
 const constants_1 = require("../../constants");
-const music_track_schema_1 = require("../tools/music/music-track.schema");
 const video_job_schema_1 = require("../tools/video/video-job.schema");
 const file_schema_1 = require("../file.schema");
 const tools_1 = require("../tools");
@@ -37,12 +36,13 @@ exports.MusicCommunityMediaSchema = zod_1.z.object({
     type: zod_1.z.literal(constants_1.COMMUNITY_POST_TYPE.MUSIC),
     params: tools_1.MusicJobParamsSchema,
     prompt: zod_1.z.string(),
-    track: music_track_schema_1.MusicTrackSchema.pick({
-        audioUrl: true,
-        coverUrl: true,
-        duration: true,
-        title: true,
-        tags: true,
+    track: zod_1.z.object({
+        uuid: zod_1.z.string().optional(), // Опционально для backward compatibility
+        audioUrl: zod_1.z.string(),
+        coverUrl: zod_1.z.string(),
+        duration: zod_1.z.number(),
+        title: zod_1.z.string(),
+        tags: zod_1.z.string(),
     }),
 });
 exports.CommunityPostMediaDataSchema = zod_1.z.discriminatedUnion('type', [

package/commands/community/create-community-post.command.ts

@@ -8,7 +8,7 @@ export namespace CreateCommunityPostCommand {
         caption: z.string().max(500).nullable().optional(),
         toolJobId: z.string().uuid(),
         toolType: z.nativeEnum(COMMUNITY_TOOL_TYPE),
-        trackIndex: z.number().optional(),
+        trackId: z.string().uuid().optional(),
     });
     export type RequestBody = z.infer<typeof RequestBodySchema>;
 

package/commands/user/cancel-user-product.command.ts

@@ -0,0 +1,21 @@
+import z from 'zod';
+
+export namespace CancelUserProductCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const RequestSchema = z.object({
+        userToProductId: z.string().uuid(),
+    });
+
+    export const ResponseSchema = z.object({
+        data: z.object({
+            isCancelled: z.boolean(),
+        }),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user/index.ts

@@ -11,3 +11,4 @@ export * from './delete-account.command';
 export * from './get-aggregated-user-data.command';
 export * from './get-user-payments.command';
 export * from './cancel-user-subscription.command';
+export * from './cancel-user-product.command';

package/constants/errors/errors.ts

@@ -2650,15 +2650,15 @@ export const ERRORS = {
         message: 'Произошла ошибка при получении модели для генерации изображений',
         httpCode: 500,
     },
-    COMMUNITY_POST_TRACK_INDEX_REQUIRED: {
+    COMMUNITY_POST_TRACK_ID_REQUIRED: {
         code: 'A539',
-        message: 'Индекс трека обязателен для музыкального поста',
+        message: 'ID трека обязателен для музыкального поста',
         httpCode: 400,
     },
-    COMMUNITY_POST_TRACK_INDEX_OUT_OF_RANGE: {
+    COMMUNITY_POST_TRACK_NOT_FOUND: {
         code: 'A540',
-        message: 'Индекс трека выходит за пределы допустимого диапазона',
-        httpCode: 400,
+        message: 'Трек не найден',
+        httpCode: 404,
     },
     COMMUNITY_POST_EXISTANCE_CHECK_ERROR: {
         code: 'A561',
@@ -2680,4 +2680,14 @@ export const ERRORS = {
         message: 'Для получения награды опубликуйте работу в сообществе',
         httpCode: 400,
     },
+    PRODUCT_OWNERSHIP_ERROR: {
+        code: 'A565',
+        message: 'Пользователь не является владельцем продукта',
+        httpCode: 400,
+    },
+    PRODUCT_CANCEL_ERROR: {
+        code: 'A566',
+        message: 'Нельзя отменить пакет, которым юзер начал пользоваться',
+        httpCode: 400,
+    },
 };

package/models/community/community-post-media-data.schema.ts

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 import { COMMUNITY_POST_TYPE } from '../../constants';
-import { MusicTrackSchema } from '../tools/music/music-track.schema';
 import { VideoJobParamsSchema } from '../tools/video/video-job.schema';
 import { FileSchema } from '../file.schema';
 import { MusicJobParamsSchema } from '../tools';
@@ -39,12 +38,13 @@ export const MusicCommunityMediaSchema = z.object({
     type: z.literal(COMMUNITY_POST_TYPE.MUSIC),
     params: MusicJobParamsSchema,
     prompt: z.string(),
-    track: MusicTrackSchema.pick({
-        audioUrl: true,
-        coverUrl: true,
-        duration: true,
-        title: true,
-        tags: true,
+    track: z.object({
+        uuid: z.string().optional(), // Опционально для backward compatibility
+        audioUrl: z.string(),
+        coverUrl: z.string(),
+        duration: z.number(),
+        title: z.string(),
+        tags: z.string(),
     }),
 });
 

package/package.json

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