@purpleschool/gptbot 0.6.16 → 0.6.18

package/api/controllers/http/prompt-category.ts

@@ -6,5 +6,6 @@ export const PROMPT_CATEGORY_ROUTES = {
     UPDATE: (uuid: string) => `${uuid}`,
     DELETE: (uuid: string) => `${uuid}`,
     FIND_ALL: '',
-    FIND_BY_ALIAS: (alias: string) => `${alias}`,
+    FIND_BY_ALIAS: (alias: string) => `alias/${alias}`,
+    FIND_BY_UUID: (uuid: string) => `uuid/${uuid}`,
 } as const;

package/api/controllers/http/prompt-topic.ts

@@ -5,7 +5,9 @@ export const PROMPT_TOPIC_ROUTES = {
     CREATE: '',
     UPDATE: (uuid: string) => `${uuid}`,
     DELETE: (uuid: string) => `${uuid}`,
-    FIND: (categoryAlias: string) => `find/${categoryAlias}`,
+    FIND_BY_CATEGORY_ALIAS: (categoryAlias: string) => `find/alias/${categoryAlias}`,
+    FIND_BY_CATEGORY_UUID: (categoryUuid: string) => `find/uuid/${categoryUuid}`,
     FIND_ALL: '',
-    FIND_BY_ALIAS: (alias: string) => `${alias}`,
+    FIND_BY_ALIAS: (alias: string) => `alias/${alias}`,
+    FIND_BY_UUID: (uuid: string) => `uuid/${uuid}`,
 } as const;

package/api/controllers/http/subscription.ts

@@ -15,4 +15,5 @@ export const SUBSCRIPTION_ROUTES = {
     CREATE_CUSTOM: 'custom',
     FREE: 'free',
     SUMMARY: 'summary',
+    RECOVER_PAST_DUE: (uuid: string) => `${uuid}/recover-past-due`,
 } as const;

package/api/routes.ts

@@ -213,6 +213,8 @@ export const REST_API = {
         FIND_ALL: `${ROOT}/${CONTROLLERS.PROMPT_CATEGORY_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_CATEGORY_ROUTES.FIND_ALL}`,
         FIND_BY_ALIAS: (alias: string) =>
             `${ROOT}/${CONTROLLERS.PROMPT_CATEGORY_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_CATEGORY_ROUTES.FIND_BY_ALIAS(alias)}`,
+        FIND_BY_UUID: (uuid: string) =>
+            `${ROOT}/${CONTROLLERS.PROMPT_CATEGORY_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_CATEGORY_ROUTES.FIND_BY_UUID(uuid)}`,
     },
     PROMPT_TOPIC_PRIVATE: {
         CREATE: `${ROOT}/${CONTROLLERS.PROMPT_TOPIC_PRIVATE_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.CREATE}`,
@@ -222,10 +224,14 @@ export const REST_API = {
             `${ROOT}/${CONTROLLERS.PROMPT_TOPIC_PRIVATE_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.DELETE(uuid)}`,
     },
     PROMPT_TOPIC_PUBLIC: {
-        FIND: (categoryAlias: string) =>
-            `${ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND(categoryAlias)}`,
+        FIND_BY_CATEGORY_ALIAS: (categoryAlias: string) =>
+            `${ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_BY_CATEGORY_ALIAS(categoryAlias)}`,
+        FIND_BY_CATEGORY_UUID: (categoryUuid: string) =>
+            `${ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_BY_CATEGORY_UUID(categoryUuid)}`,
         FIND_BY_ALIAS: (alias: string) =>
             `${ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_BY_ALIAS(alias)}`,
+        FIND_BY_UUID: (uuid: string) =>
+            `${ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_BY_UUID(uuid)}`,
         FIND_ALL: `${ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_ALL}`,
     },
     PROMPT_PRIVATE: {

package/build/api/controllers/http/prompt-category.js

@@ -8,5 +8,6 @@ exports.PROMPT_CATEGORY_ROUTES = {
     UPDATE: (uuid) => `${uuid}`,
     DELETE: (uuid) => `${uuid}`,
     FIND_ALL: '',
-    FIND_BY_ALIAS: (alias) => `${alias}`,
+    FIND_BY_ALIAS: (alias) => `alias/${alias}`,
+    FIND_BY_UUID: (uuid) => `uuid/${uuid}`,
 };

package/build/api/controllers/http/prompt-topic.js

@@ -7,7 +7,9 @@ exports.PROMPT_TOPIC_ROUTES = {
     CREATE: '',
     UPDATE: (uuid) => `${uuid}`,
     DELETE: (uuid) => `${uuid}`,
-    FIND: (categoryAlias) => `find/${categoryAlias}`,
+    FIND_BY_CATEGORY_ALIAS: (categoryAlias) => `find/alias/${categoryAlias}`,
+    FIND_BY_CATEGORY_UUID: (categoryUuid) => `find/uuid/${categoryUuid}`,
     FIND_ALL: '',
-    FIND_BY_ALIAS: (alias) => `${alias}`,
+    FIND_BY_ALIAS: (alias) => `alias/${alias}`,
+    FIND_BY_UUID: (uuid) => `uuid/${uuid}`,
 };

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

@@ -16,4 +16,5 @@ exports.SUBSCRIPTION_ROUTES = {
     CREATE_CUSTOM: 'custom',
     FREE: 'free',
     SUMMARY: 'summary',
+    RECOVER_PAST_DUE: (uuid) => `${uuid}/recover-past-due`,
 };

package/build/api/routes.js

@@ -206,6 +206,7 @@ exports.REST_API = {
     PROMPT_CATEGORY_PUBLIC: {
         FIND_ALL: `${exports.ROOT}/${CONTROLLERS.PROMPT_CATEGORY_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_CATEGORY_ROUTES.FIND_ALL}`,
         FIND_BY_ALIAS: (alias) => `${exports.ROOT}/${CONTROLLERS.PROMPT_CATEGORY_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_CATEGORY_ROUTES.FIND_BY_ALIAS(alias)}`,
+        FIND_BY_UUID: (uuid) => `${exports.ROOT}/${CONTROLLERS.PROMPT_CATEGORY_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_CATEGORY_ROUTES.FIND_BY_UUID(uuid)}`,
     },
     PROMPT_TOPIC_PRIVATE: {
         CREATE: `${exports.ROOT}/${CONTROLLERS.PROMPT_TOPIC_PRIVATE_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.CREATE}`,
@@ -213,8 +214,10 @@ exports.REST_API = {
         DELETE: (uuid) => `${exports.ROOT}/${CONTROLLERS.PROMPT_TOPIC_PRIVATE_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.DELETE(uuid)}`,
     },
     PROMPT_TOPIC_PUBLIC: {
-        FIND: (categoryAlias) => `${exports.ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND(categoryAlias)}`,
+        FIND_BY_CATEGORY_ALIAS: (categoryAlias) => `${exports.ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_BY_CATEGORY_ALIAS(categoryAlias)}`,
+        FIND_BY_CATEGORY_UUID: (categoryUuid) => `${exports.ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_BY_CATEGORY_UUID(categoryUuid)}`,
         FIND_BY_ALIAS: (alias) => `${exports.ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_BY_ALIAS(alias)}`,
+        FIND_BY_UUID: (uuid) => `${exports.ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_BY_UUID(uuid)}`,
         FIND_ALL: `${exports.ROOT}/${CONTROLLERS.PROMPT_TOPIC_PUBLIC_CONTROLLER}/${CONTROLLERS.PROMPT_TOPIC_ROUTES.FIND_ALL}`,
     },
     PROMPT_PRIVATE: {

package/build/commands/prompt-category/find-prompt-category-by-uuid.command.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindPromptCategoryByUuidCommand = void 0;
+const zod_1 = require("zod");
+const models_1 = require("../../models");
+var FindPromptCategoryByUuidCommand;
+(function (FindPromptCategoryByUuidCommand) {
+    FindPromptCategoryByUuidCommand.RequestSchema = zod_1.z.object({
+        uuid: zod_1.z.string().uuid(),
+    });
+    FindPromptCategoryByUuidCommand.ResponseSchema = zod_1.z.object({
+        data: models_1.PromptCategorySchema,
+    });
+})(FindPromptCategoryByUuidCommand || (exports.FindPromptCategoryByUuidCommand = FindPromptCategoryByUuidCommand = {}));

package/build/commands/prompt-category/index.js

@@ -19,3 +19,4 @@ __exportStar(require("./delete-prompt-category.command"), exports);
 __exportStar(require("./update-prompt-category.command"), exports);
 __exportStar(require("./find-all-prompt-categories.command"), exports);
 __exportStar(require("./find-prompt-category-by-alias.command"), exports);
+__exportStar(require("./find-prompt-category-by-uuid.command"), exports);

package/build/commands/prompt-topic/find-prompt-topic-by-category.command.js

@@ -9,7 +9,8 @@ const models_1 = require("../../models");
 var FindPromptTopicsByCategoryCommand;
 (function (FindPromptTopicsByCategoryCommand) {
     FindPromptTopicsByCategoryCommand.RequestParamSchema = zod_1.default.object({
-        categoryAlias: zod_1.default.string(),
+        categoryAlias: zod_1.default.string().optional(),
+        categoryUuid: zod_1.default.string().uuid().optional(),
     });
     FindPromptTopicsByCategoryCommand.RequestSchema = zod_1.default.object({
         limit: zod_1.default.string().transform((val) => parseInt(val, 10)),

package/build/commands/prompt-topic/find-prompt-topic-by-uuid.command.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindPromptTopicByUuidCommand = void 0;
+const zod_1 = require("zod");
+const models_1 = require("../../models");
+var FindPromptTopicByUuidCommand;
+(function (FindPromptTopicByUuidCommand) {
+    FindPromptTopicByUuidCommand.RequestSchema = zod_1.z.object({
+        uuid: zod_1.z.string().uuid(),
+    });
+    FindPromptTopicByUuidCommand.ResponseSchema = zod_1.z.object({
+        data: models_1.PromptTopicSchema,
+    });
+})(FindPromptTopicByUuidCommand || (exports.FindPromptTopicByUuidCommand = FindPromptTopicByUuidCommand = {}));

package/build/commands/prompt-topic/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./update-prompt-topic.command"), exports);
 __exportStar(require("./find-prompt-topic-by-category.command"), exports);
 __exportStar(require("./find-prompt-topic-by-alias.command"), exports);
 __exportStar(require("./find-all-prompt-topics.command"), exports);
+__exportStar(require("./find-prompt-topic-by-uuid.command"), exports);

package/build/commands/subscription/index.js

@@ -23,6 +23,7 @@ __exportStar(require("./find-subscription.command"), exports);
 __exportStar(require("./get-available-upgrades.command"), exports);
 __exportStar(require("./get-free-subscription.command"), exports);
 __exportStar(require("./get-subscriptions-summary.command"), exports);
+__exportStar(require("./recover-past-due-subscription.command"), exports);
 __exportStar(require("./recover-subscription.command"), exports);
 __exportStar(require("./update-subscription.command"), exports);
 __exportStar(require("./upgrade-subscription.command"), exports);

package/build/commands/subscription/recover-past-due-subscription.command.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecoverPastDueSubscriptionCommand = void 0;
+const zod_1 = require("zod");
+var RecoverPastDueSubscriptionCommand;
+(function (RecoverPastDueSubscriptionCommand) {
+    RecoverPastDueSubscriptionCommand.RequestParamSchema = zod_1.z.object({
+        uuid: zod_1.z.string().uuid(),
+    });
+    RecoverPastDueSubscriptionCommand.ResponseSchema = zod_1.z.object({
+        message: zod_1.z.string(),
+    });
+})(RecoverPastDueSubscriptionCommand || (exports.RecoverPastDueSubscriptionCommand = RecoverPastDueSubscriptionCommand = {}));

package/build/constants/errors/errors.js

@@ -1493,4 +1493,9 @@ exports.ERRORS = {
         message: 'Промпт тема с таким alias уже существует',
         httpCode: 409,
     },
+    SUBSCRIPTION_NOT_PAST_DUE: {
+        code: 'A320',
+        message: 'Подписка не требует повторной оплаты',
+        httpCode: 400,
+    },
 };

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

@@ -6,4 +6,5 @@ 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_PAST_DUE_RECOVER_REQUEST"] = "SENT_PAST_DUE_RECOVER_REQUEST";
 })(USER_TO_SUBSCRIPTION_MARKS || (exports.USER_TO_SUBSCRIPTION_MARKS = USER_TO_SUBSCRIPTION_MARKS = {}));

package/commands/prompt-category/find-prompt-category-by-uuid.command.ts

@@ -0,0 +1,16 @@
+import { z } from 'zod';
+import { PromptCategorySchema } from '../../models';
+
+export namespace FindPromptCategoryByUuidCommand {
+    export const RequestSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: PromptCategorySchema,
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/prompt-category/index.ts

@@ -3,3 +3,4 @@ export * from './delete-prompt-category.command';
 export * from './update-prompt-category.command';
 export * from './find-all-prompt-categories.command';
 export * from './find-prompt-category-by-alias.command';
+export * from './find-prompt-category-by-uuid.command';

package/commands/prompt-topic/find-prompt-topic-by-category.command.ts

@@ -3,7 +3,8 @@ import { PromptTopicWithPromptsSchema } from '../../models';
 
 export namespace FindPromptTopicsByCategoryCommand {
     export const RequestParamSchema = z.object({
-        categoryAlias: z.string(),
+        categoryAlias: z.string().optional(),
+        categoryUuid: z.string().uuid().optional(),
     });
 
     export type RequestParam = z.infer<typeof RequestParamSchema>;

package/commands/prompt-topic/find-prompt-topic-by-uuid.command.ts

@@ -0,0 +1,16 @@
+import { z } from 'zod';
+import { PromptTopicSchema } from '../../models';
+
+export namespace FindPromptTopicByUuidCommand {
+    export const RequestSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: PromptTopicSchema,
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/prompt-topic/index.ts

@@ -4,3 +4,4 @@ export * from './update-prompt-topic.command';
 export * from './find-prompt-topic-by-category.command';
 export * from './find-prompt-topic-by-alias.command';
 export * from './find-all-prompt-topics.command';
+export * from './find-prompt-topic-by-uuid.command';

package/commands/subscription/index.ts

@@ -7,6 +7,7 @@ export * from './find-subscription.command';
 export * from './get-available-upgrades.command';
 export * from './get-free-subscription.command';
 export * from './get-subscriptions-summary.command';
+export * from './recover-past-due-subscription.command';
 export * from './recover-subscription.command';
 export * from './update-subscription.command';
 export * from './upgrade-subscription.command';

package/commands/subscription/recover-past-due-subscription.command.ts

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+
+export namespace RecoverPastDueSubscriptionCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const ResponseSchema = z.object({
+        message: z.string(),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/constants/errors/errors.ts

@@ -1500,4 +1500,9 @@ export const ERRORS = {
         message: 'Промпт тема с таким alias уже существует',
         httpCode: 409,
     },
+    SUBSCRIPTION_NOT_PAST_DUE: {
+        code: 'A320',
+        message: 'Подписка не требует повторной оплаты',
+        httpCode: 400,
+    },
 };

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

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

package/package.json

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