@purpleschool/gptbot 0.5.30 → 0.5.32

package/api/controllers/http/telegram-connect.ts

@@ -2,4 +2,5 @@ export const TELEGRAM_CONNECT_CONTROLLER = 'telegram-connect' as const;
 
 export const TELEGRAM_CONNECT_ROUTES = {
     CREATE_CONNECTION_LINK: 'connect',
+    CONFIG: 'config',
 } as const;

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

@@ -4,4 +4,5 @@ export const USER_TO_TASK_PRIVATE_ROUTES = {
     MY: 'my',
     START: (uuid: string) => `${uuid}/start`,
     REWARDS: 'rewards',
+    CHECK: (uuid: string) => `${uuid}/check`,
 } as const;

package/api/controllers/index.ts

@@ -1,2 +1 @@
-export * from './amqp';
 export * from './http';

package/build/api/controllers/http/telegram-connect.js

@@ -4,4 +4,5 @@ exports.TELEGRAM_CONNECT_ROUTES = exports.TELEGRAM_CONNECT_CONTROLLER = void 0;
 exports.TELEGRAM_CONNECT_CONTROLLER = 'telegram-connect';
 exports.TELEGRAM_CONNECT_ROUTES = {
     CREATE_CONNECTION_LINK: 'connect',
+    CONFIG: 'config',
 };

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

@@ -6,4 +6,5 @@ exports.USER_TO_TASK_PRIVATE_ROUTES = {
     MY: 'my',
     START: (uuid) => `${uuid}/start`,
     REWARDS: 'rewards',
+    CHECK: (uuid) => `${uuid}/check`,
 };

package/build/api/controllers/index.js

@@ -14,5 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./amqp"), exports);
 __exportStar(require("./http"), exports);

package/build/commands/index.js

@@ -29,6 +29,7 @@ __exportStar(require("./question"), exports);
 __exportStar(require("./referral"), exports);
 __exportStar(require("./subscription"), exports);
 __exportStar(require("./task"), exports);
+__exportStar(require("./telegram"), exports);
 __exportStar(require("./telegram-profile"), exports);
 __exportStar(require("./unregistered-user"), exports);
 __exportStar(require("./user"), exports);

package/build/commands/telegram/get-telegram-config.command.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetTelegramConfigCommand = void 0;
+const zod_1 = require("zod");
+var GetTelegramConfigCommand;
+(function (GetTelegramConfigCommand) {
+    GetTelegramConfigCommand.RequestSchema = zod_1.z.void();
+    GetTelegramConfigCommand.ResponseSchema = zod_1.z.object({
+        tmaLink: zod_1.z.string(),
+    });
+})(GetTelegramConfigCommand || (exports.GetTelegramConfigCommand = GetTelegramConfigCommand = {}));

package/build/{api/controllers/amqp → commands/telegram}/index.js

@@ -14,5 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./telegram-connect"), exports);
-__exportStar(require("./telegram-profile"), exports);
+__exportStar(require("./get-telegram-config.command"), exports);

package/build/commands/telegram-profile/check-telegram-profile-exists.command.js

@@ -5,12 +5,10 @@ const zod_1 = require("zod");
 var CheckTelegramProfileExistsCommand;
 (function (CheckTelegramProfileExistsCommand) {
     CheckTelegramProfileExistsCommand.RequestBodySchema = zod_1.z.object({
-        initData: zod_1.z.string(),
-        platform: zod_1.z.string().nullable(),
+        telegramId: zod_1.z.number(),
     });
     CheckTelegramProfileExistsCommand.ResponseSchema = zod_1.z.object({
-        data: zod_1.z.object({
-            exists: zod_1.z.boolean(),
-        }),
+        isSuccess: zod_1.z.boolean(),
+        exists: zod_1.z.boolean(),
     });
 })(CheckTelegramProfileExistsCommand || (exports.CheckTelegramProfileExistsCommand = CheckTelegramProfileExistsCommand = {}));

package/build/commands/telegram-profile/index.js

@@ -15,8 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auth-with-telegram-web-app.command"), exports);
-__exportStar(require("./check-my-telegram-profile-connected.command"), exports);
 __exportStar(require("./check-telegram-profile-exists.command"), exports);
-__exportStar(require("./connect-telegram-profile-with-verification-code.command"), exports);
 __exportStar(require("./create-telegram-profile-connection-link.command"), exports);
-__exportStar(require("./create-new-user-from-telegram-bot.command"), exports);

package/build/commands/user-to-task/check-task-completion.command.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CheckTaskCompletionCommand = void 0;
+const zod_1 = require("zod");
+const models_1 = require("../../models");
+var CheckTaskCompletionCommand;
+(function (CheckTaskCompletionCommand) {
+    CheckTaskCompletionCommand.RequestParamsSchema = models_1.UserTaskSchema.pick({
+        taskId: true,
+    });
+    CheckTaskCompletionCommand.ResponseSchema = zod_1.z.object({
+        data: models_1.UserTaskSchema,
+    });
+})(CheckTaskCompletionCommand || (exports.CheckTaskCompletionCommand = CheckTaskCompletionCommand = {}));

package/build/commands/user-to-task/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./check-task-completion.command"), exports);
 __exportStar(require("./claim-task-reward.command"), exports);
 __exportStar(require("./get-my-tasks.command"), exports);
 __exportStar(require("./start-task.command"), exports);

package/build/constants/errors/errors.js

@@ -795,4 +795,19 @@ exports.ERRORS = {
         message: 'Произошла ошибка при обновлении Telegram профиля',
         httpCode: 500,
     },
+    TASK_NOT_READY_FOR_CHECK: {
+        code: 'A184',
+        message: 'Задание не готово к проверке',
+        httpCode: 400,
+    },
+    TASK_CHECK_ERROR: {
+        code: 'A185',
+        message: 'Произошла ошибка при проверке задания',
+        httpCode: 500,
+    },
+    TASK_TELEGRAM_CHANNEL_NOT_SUBSCRIBED: {
+        code: 'A186',
+        message: 'Пользователь не подписан на канал',
+        httpCode: 400,
+    },
 };

package/commands/index.ts

@@ -13,6 +13,7 @@ export * from './question';
 export * from './referral';
 export * from './subscription';
 export * from './task';
+export * from './telegram';
 export * from './telegram-profile';
 export * from './unregistered-user';
 export * from './user';

package/commands/telegram/get-telegram-config.command.ts

@@ -0,0 +1,12 @@
+import { z } from 'zod';
+
+export namespace GetTelegramConfigCommand {
+    export const RequestSchema = z.void();
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        tmaLink: z.string(),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/telegram/index.ts

@@ -0,0 +1 @@
+export * from './get-telegram-config.command';

package/commands/telegram-profile/check-telegram-profile-exists.command.ts

@@ -2,16 +2,14 @@ import { z } from 'zod';
 
 export namespace CheckTelegramProfileExistsCommand {
     export const RequestBodySchema = z.object({
-        initData: z.string(),
-        platform: z.string().nullable(),
+        telegramId: z.number(),
     });
 
     export type RequestBody = z.infer<typeof RequestBodySchema>;
 
     export const ResponseSchema = z.object({
-        data: z.object({
-            exists: z.boolean(),
-        }),
+        isSuccess: z.boolean(),
+        exists: z.boolean(),
     });
 
     export type Response = z.infer<typeof ResponseSchema>;

package/commands/telegram-profile/index.ts

@@ -1,6 +1,3 @@
 export * from './auth-with-telegram-web-app.command';
-export * from './check-my-telegram-profile-connected.command';
 export * from './check-telegram-profile-exists.command';
-export * from './connect-telegram-profile-with-verification-code.command';
 export * from './create-telegram-profile-connection-link.command';
-export * from './create-new-user-from-telegram-bot.command';

package/commands/user-to-task/check-task-completion.command.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { UserTaskSchema } from '../../models';
+
+export namespace CheckTaskCompletionCommand {
+    export const RequestParamsSchema = UserTaskSchema.pick({
+        taskId: true,
+    });
+    export type RequestParams = z.infer<typeof RequestParamsSchema>;
+
+    export const ResponseSchema = z.object({
+        data: UserTaskSchema,
+    });
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user-to-task/index.ts

@@ -1,3 +1,4 @@
+export * from './check-task-completion.command';
 export * from './claim-task-reward.command';
 export * from './get-my-tasks.command';
 export * from './start-task.command';

package/constants/errors/errors.ts

@@ -795,4 +795,19 @@ export const ERRORS = {
         message: 'Произошла ошибка при обновлении Telegram профиля',
         httpCode: 500,
     },
+    TASK_NOT_READY_FOR_CHECK: {
+        code: 'A184',
+        message: 'Задание не готово к проверке',
+        httpCode: 400,
+    },
+    TASK_CHECK_ERROR: {
+        code: 'A185',
+        message: 'Произошла ошибка при проверке задания',
+        httpCode: 500,
+    },
+    TASK_TELEGRAM_CHANNEL_NOT_SUBSCRIBED: {
+        code: 'A186',
+        message: 'Пользователь не подписан на канал',
+        httpCode: 400,
+    },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purpleschool/gptbot",
-  "version": "0.5.30",
+  "version": "0.5.32",
   "description": "",
   "main": "index.js",
   "scripts": {

package/api/controllers/amqp/index.ts

@@ -1,2 +0,0 @@
-export * from './telegram-connect';
-export * from './telegram-profile';

package/api/controllers/amqp/telegram-connect.ts

@@ -1,3 +0,0 @@
-export const TELEGRAM_CONNECT_AMQP_ROUTES = {
-    CONNECT_WITH_CODE: 'tg.connect.connect-with-code.rpc',
-};

package/api/controllers/amqp/telegram-profile.ts

@@ -1,3 +0,0 @@
-export const TELEGRAM_PROFILE_AMQP_ROUTES = {
-    CREATE_NEW_USER_FROM_BOT: 'tg.profile.create-new-user-from-bot',
-};

package/build/api/controllers/amqp/telegram-connect.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TELEGRAM_CONNECT_AMQP_ROUTES = void 0;
-exports.TELEGRAM_CONNECT_AMQP_ROUTES = {
-    CONNECT_WITH_CODE: 'tg.connect.connect-with-code.rpc',
-};

package/build/api/controllers/amqp/telegram-profile.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TELEGRAM_PROFILE_AMQP_ROUTES = void 0;
-exports.TELEGRAM_PROFILE_AMQP_ROUTES = {
-    CREATE_NEW_USER_FROM_BOT: 'tg.profile.create-new-user-from-bot',
-};

package/build/commands/telegram-profile/check-my-telegram-profile-connected.command.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CheckMyTelegramProfileConnectedCommand = void 0;
-const zod_1 = require("zod");
-var CheckMyTelegramProfileConnectedCommand;
-(function (CheckMyTelegramProfileConnectedCommand) {
-    CheckMyTelegramProfileConnectedCommand.ResponseSchema = zod_1.z.object({
-        data: zod_1.z.object({
-            connected: zod_1.z.boolean(),
-        }),
-    });
-})(CheckMyTelegramProfileConnectedCommand || (exports.CheckMyTelegramProfileConnectedCommand = CheckMyTelegramProfileConnectedCommand = {}));

package/build/commands/telegram-profile/connect-telegram-profile-with-verification-code.command.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectTelegramProfileWithVerificationCodeCommand = void 0;
-const zod_1 = require("zod");
-const models_1 = require("../../models");
-var ConnectTelegramProfileWithVerificationCodeCommand;
-(function (ConnectTelegramProfileWithVerificationCodeCommand) {
-    ConnectTelegramProfileWithVerificationCodeCommand.RequestSchema = models_1.TelegramUserDataSchema.extend({
-        code: zod_1.z.string(),
-    });
-    ConnectTelegramProfileWithVerificationCodeCommand.ResponseSchema = zod_1.z.object({
-        isSuccess: zod_1.z.boolean(),
-        message: zod_1.z.string().optional(),
-    });
-})(ConnectTelegramProfileWithVerificationCodeCommand || (exports.ConnectTelegramProfileWithVerificationCodeCommand = ConnectTelegramProfileWithVerificationCodeCommand = {}));

package/build/commands/telegram-profile/create-new-user-from-telegram-bot.command.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateNewUserFromTelegramBotCommand = void 0;
-const zod_1 = require("zod");
-const models_1 = require("../../models");
-var CreateNewUserFromTelegramBotCommand;
-(function (CreateNewUserFromTelegramBotCommand) {
-    CreateNewUserFromTelegramBotCommand.RequestSchema = models_1.TelegramUserDataSchema.extend({
-        partnerId: zod_1.z.string().uuid().optional(),
-    });
-    CreateNewUserFromTelegramBotCommand.ResponseSchema = zod_1.z.void();
-})(CreateNewUserFromTelegramBotCommand || (exports.CreateNewUserFromTelegramBotCommand = CreateNewUserFromTelegramBotCommand = {}));

package/commands/telegram-profile/check-my-telegram-profile-connected.command.ts

@@ -1,11 +0,0 @@
-import { z } from 'zod';
-
-export namespace CheckMyTelegramProfileConnectedCommand {
-    export const ResponseSchema = z.object({
-        data: z.object({
-            connected: z.boolean(),
-        }),
-    });
-
-    export type Response = z.infer<typeof ResponseSchema>;
-}

package/commands/telegram-profile/connect-telegram-profile-with-verification-code.command.ts

@@ -1,16 +0,0 @@
-import { z } from 'zod';
-import { TelegramUserDataSchema } from '../../models';
-
-export namespace ConnectTelegramProfileWithVerificationCodeCommand {
-    export const RequestSchema = TelegramUserDataSchema.extend({
-        code: z.string(),
-    });
-
-    export type Request = z.infer<typeof RequestSchema>;
-
-    export const ResponseSchema = z.object({
-        isSuccess: z.boolean(),
-        message: z.string().optional(),
-    });
-    export type Response = z.infer<typeof ResponseSchema>;
-}

package/commands/telegram-profile/create-new-user-from-telegram-bot.command.ts

@@ -1,13 +0,0 @@
-import { z } from 'zod';
-import { TelegramUserDataSchema } from '../../models';
-
-export namespace CreateNewUserFromTelegramBotCommand {
-    export const RequestSchema = TelegramUserDataSchema.extend({
-        partnerId: z.string().uuid().optional(),
-    });
-
-    export type Request = z.infer<typeof RequestSchema>;
-
-    export const ResponseSchema = z.void();
-    export type Response = z.infer<typeof ResponseSchema>;
-}