@common_ch/common 1.0.176 → 1.0.182

package/build/events/portal/user/user-change-status-event.d.ts

@@ -1,8 +1,5 @@
+import { UserStatusEnum } from "../../../enums/user";
 import { Subjects } from "../../subjects";
-export declare enum UserStatusEnum {
-    active = "active",
-    deactive = "deactive"
-}
 export interface UserChangedStatusInPortalEvent {
     subject: Subjects.UserChangedStatusInPortal;
     data: {

package/build/events/portal/user/user-change-status-event.js

@@ -1,8 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserStatusEnum = void 0;
-var UserStatusEnum;
-(function (UserStatusEnum) {
-    UserStatusEnum["active"] = "active";
-    UserStatusEnum["deactive"] = "deactive";
-})(UserStatusEnum || (exports.UserStatusEnum = UserStatusEnum = {}));

package/build/index.d.ts

@@ -9,6 +9,8 @@ export * from './middlewares/current-admin';
 export * from './middlewares/error-handler';
 export * from './middlewares/require-auth';
 export * from './middlewares/require-auth-admin';
+export * from './middlewares/current-admin-org';
+export * from './middlewares/require-auth-admin-org';
 export * from './events/base-listener';
 export * from './events/base-publisher';
 export * from './events/subjects';

package/build/index.js

@@ -25,6 +25,8 @@ __exportStar(require("./middlewares/current-admin"), exports);
 __exportStar(require("./middlewares/error-handler"), exports);
 __exportStar(require("./middlewares/require-auth"), exports);
 __exportStar(require("./middlewares/require-auth-admin"), exports);
+__exportStar(require("./middlewares/current-admin-org"), exports);
+__exportStar(require("./middlewares/require-auth-admin-org"), exports);
 // export * from './models/app/ai';
 // export * from './models/app/blog';
 // export * from './models/app/discount';

package/build/middlewares/current-admin-org.d.ts

@@ -0,0 +1,16 @@
+import { Request, Response, NextFunction } from 'express';
+interface AdminOrgPayload {
+    _id: string;
+    email: string;
+    username: string;
+    mobile: string;
+}
+declare global {
+    namespace Express {
+        interface Request {
+            currentAdminOrg?: AdminOrgPayload;
+        }
+    }
+}
+export declare const currentAdminOrg: (req: Request, res: Response, next: NextFunction) => void;
+export {};

package/build/middlewares/current-admin-org.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.currentAdminOrg = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const currentAdminOrg = (req, res, next) => {
+    const authHeader = req.headers['authorization'];
+    if (!authHeader || !authHeader.startsWith('Bearer')) {
+        return next();
+    }
+    try {
+        const token = authHeader.split(' ')[1];
+        const payload = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY_ADMIN_ORG);
+        req.currentAdminOrg = payload;
+    }
+    catch (err) { }
+    next();
+};
+exports.currentAdminOrg = currentAdminOrg;

package/build/middlewares/require-auth-admin-org.d.ts

@@ -0,0 +1,2 @@
+import { Request, Response, NextFunction } from 'express';
+export declare const requireAuthAdminOrg: (req: Request, res: Response, next: NextFunction) => void;

package/build/middlewares/require-auth-admin-org.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireAuthAdminOrg = void 0;
+const not_authorized_error_1 = require("../errors/not-authorized-error");
+const requireAuthAdminOrg = (req, res, next) => {
+    if (!req.currentAdminOrg) {
+        throw new not_authorized_error_1.NotAuthorizedError();
+    }
+    next();
+};
+exports.requireAuthAdminOrg = requireAuthAdminOrg;

package/build/models/app/ai-option.d.ts

@@ -1,5 +1,5 @@
 import mongoose from 'mongoose';
-import { AiOptionFieldEnum, AiOptionStatusEnum } from '../../events/portal/ai-option/ai-created-event';
+import { AiOptionFieldEnum, AiOptionStatusEnum } from '../../enums/ai';
 export interface AiOptionAttrs {
     _id: string;
     name: string;

package/build/models/app/ai-option.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AiOption = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
-const ai_created_event_1 = require("../../events/portal/ai-option/ai-created-event");
+const ai_1 = require("../../enums/ai");
 const aiOptionSchema = new mongoose_1.default.Schema({
     name: {
         type: String,
@@ -14,13 +14,13 @@ const aiOptionSchema = new mongoose_1.default.Schema({
     },
     status: {
         type: String,
-        enum: ai_created_event_1.AiOptionStatusEnum,
-        default: ai_created_event_1.AiOptionStatusEnum.active,
+        enum: ai_1.AiOptionStatusEnum,
+        default: ai_1.AiOptionStatusEnum.active,
     },
     field: {
         type: String,
-        enum: ai_created_event_1.AiOptionFieldEnum,
-        default: ai_created_event_1.AiOptionFieldEnum.chat,
+        enum: ai_1.AiOptionFieldEnum,
+        default: ai_1.AiOptionFieldEnum.chat,
     },
     aiId: {
         type: mongoose_1.default.Schema.Types.ObjectId,

package/build/models/app/blog-category.d.ts

@@ -1,8 +1,5 @@
 import mongoose from 'mongoose';
-export declare enum BlogCategoryStatusEnum {
-    active = "active",
-    deactive = "deactive"
-}
+import { BlogCategoryStatusEnum } from '../../enums/category';
 export interface BlogCategoryAttrs {
     _id: string;
     title: string;

package/build/models/app/blog-category.js

@@ -3,14 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlogCategory = exports.BlogCategoryStatusEnum = void 0;
+exports.BlogCategory = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
-var BlogCategoryStatusEnum;
-(function (BlogCategoryStatusEnum) {
-    BlogCategoryStatusEnum["active"] = "active";
-    BlogCategoryStatusEnum["deactive"] = "deactive";
-})(BlogCategoryStatusEnum || (exports.BlogCategoryStatusEnum = BlogCategoryStatusEnum = {}));
+const category_1 = require("../../enums/category");
 const blogCategorySchema = new mongoose_1.default.Schema({
     title: {
         type: String,
@@ -22,8 +18,8 @@ const blogCategorySchema = new mongoose_1.default.Schema({
     },
     status: {
         type: String,
-        enum: BlogCategoryStatusEnum,
-        default: BlogCategoryStatusEnum.active,
+        enum: category_1.BlogCategoryStatusEnum,
+        default: category_1.BlogCategoryStatusEnum.active,
     },
     createdAt: {
         type: mongoose_1.default.Schema.Types.Date,

package/build/models/app/blog.d.ts

@@ -1,5 +1,5 @@
 import mongoose from 'mongoose';
-import { BlogStatusEnum } from '../../events/portal/blog/blog-create-event';
+import { BlogStatusEnum } from '../../enums/blog';
 export interface BlogAttrs {
     _id: string;
     title: string;

package/build/models/app/blog.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Blog = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
-const blog_create_event_1 = require("../../events/portal/blog/blog-create-event");
+const blog_1 = require("../../enums/blog");
 const blogSchema = new mongoose_1.default.Schema({
     title: {
         type: String,
@@ -44,8 +44,8 @@ const blogSchema = new mongoose_1.default.Schema({
     ],
     status: {
         type: String,
-        enum: blog_create_event_1.BlogStatusEnum,
-        default: blog_create_event_1.BlogStatusEnum.active,
+        enum: blog_1.BlogStatusEnum,
+        default: blog_1.BlogStatusEnum.active,
     },
     createdAt: {
         type: mongoose_1.default.Schema.Types.Date,

package/build/models/app/discount.d.ts

@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 import { UserDoc } from './user';
 import { PlanDoc } from './plan';
-import { DiscountStatusEnum, DiscountType } from '../../events/portal/discount/discount-create-event';
+import { DiscountStatusEnum, DiscountType } from '../../enums/discount';
 export interface DiscountAttrs {
     _id: string;
     title: string;

package/build/models/app/discount.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Discount = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
-const discount_create_event_1 = require("../../events/portal/discount/discount-create-event");
+const discount_1 = require("../../enums/discount");
 const discountSchema = new mongoose_1.default.Schema({
     title: {
         type: String,
@@ -14,7 +14,7 @@ const discountSchema = new mongoose_1.default.Schema({
     },
     type: {
         type: String,
-        enum: discount_create_event_1.DiscountType,
+        enum: discount_1.DiscountType,
         required: true,
     },
     amount: {
@@ -33,8 +33,8 @@ const discountSchema = new mongoose_1.default.Schema({
     },
     status: {
         type: String,
-        enum: discount_create_event_1.DiscountStatusEnum,
-        default: discount_create_event_1.DiscountStatusEnum.active,
+        enum: discount_1.DiscountStatusEnum,
+        default: discount_1.DiscountStatusEnum.active,
     },
     users: [{ type: mongoose_1.default.Schema.Types.ObjectId, ref: 'User' }],
     plan: {

package/build/models/app/image.d.ts

@@ -1,10 +1,6 @@
 import mongoose from 'mongoose';
 import { AiAttrs, AiDoc } from './ai';
-export declare enum ImageRoleEnum {
-    system = "system",
-    user = "user",
-    assistant = "assistant"
-}
+import { ImageRoleEnum } from '../../enums/image';
 export interface ImageAttrs {
     userId: string;
     imageName: string;

package/build/models/app/image.js

@@ -3,15 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageModel = exports.ImageRoleEnum = void 0;
+exports.ImageModel = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
-var ImageRoleEnum;
-(function (ImageRoleEnum) {
-    ImageRoleEnum["system"] = "system";
-    ImageRoleEnum["user"] = "user";
-    ImageRoleEnum["assistant"] = "assistant";
-})(ImageRoleEnum || (exports.ImageRoleEnum = ImageRoleEnum = {}));
+const image_1 = require("../../enums/image");
 const ImageSchema = new mongoose_1.default.Schema({
     userId: {
         type: String,
@@ -39,7 +34,7 @@ const ImageSchema = new mongoose_1.default.Schema({
             role: {
                 type: String,
                 required: true,
-                enum: Object.values(ImageRoleEnum),
+                enum: Object.values(image_1.ImageRoleEnum),
             },
             content: {
                 type: String,

package/build/models/app/message.d.ts

@@ -1,10 +1,6 @@
 import mongoose from 'mongoose';
 import { AiAttrs, AiDoc } from './ai';
-export declare enum MessageRoleEnum {
-    system = "system",
-    user = "user",
-    assistant = "assistant"
-}
+import { MessageRoleEnum } from '../../enums/message';
 export interface MessageAttrs {
     userId: string;
     messageName: string;

package/build/models/app/message.js

@@ -3,14 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Message = exports.MessageRoleEnum = void 0;
+exports.Message = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
-var MessageRoleEnum;
-(function (MessageRoleEnum) {
-    MessageRoleEnum["system"] = "system";
-    MessageRoleEnum["user"] = "user";
-    MessageRoleEnum["assistant"] = "assistant";
-})(MessageRoleEnum || (exports.MessageRoleEnum = MessageRoleEnum = {}));
+const message_1 = require("../../enums/message");
 const messageSchema = new mongoose_1.default.Schema({
     userId: {
         type: String,
@@ -55,7 +50,7 @@ const messageSchema = new mongoose_1.default.Schema({
             role: {
                 type: String,
                 required: true,
-                enum: Object.values(MessageRoleEnum),
+                enum: Object.values(message_1.MessageRoleEnum),
             },
             content: {
                 type: String,

package/build/models/app/plan.d.ts

@@ -1,14 +1,7 @@
 import mongoose from 'mongoose';
 import { AiDoc } from './ai';
 import { PlanTypeEnum } from '../../events/types_/plan';
-export declare enum PlanStatusEnum {
-    active = "active",
-    deactive = "deactive"
-}
-export declare enum TypePayEnum {
-    year = "Year",
-    season = "season"
-}
+import { PlanStatusEnum, TypePayEnum } from '../../enums/plan';
 export interface PlanAttrs {
     _id?: string;
     price: string;

package/build/models/app/plan.js

@@ -3,20 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Plan = exports.TypePayEnum = exports.PlanStatusEnum = void 0;
+exports.Plan = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
 const plan_1 = require("../../events/types_/plan");
-var PlanStatusEnum;
-(function (PlanStatusEnum) {
-    PlanStatusEnum["active"] = "active";
-    PlanStatusEnum["deactive"] = "deactive";
-})(PlanStatusEnum || (exports.PlanStatusEnum = PlanStatusEnum = {}));
-var TypePayEnum;
-(function (TypePayEnum) {
-    TypePayEnum["year"] = "Year";
-    TypePayEnum["season"] = "season";
-})(TypePayEnum || (exports.TypePayEnum = TypePayEnum = {}));
+const plan_2 = require("../../enums/plan");
 const planSchema = new mongoose_1.default.Schema({
     price: {
         type: String,
@@ -51,8 +42,8 @@ const planSchema = new mongoose_1.default.Schema({
     },
     status: {
         type: String,
-        enum: PlanStatusEnum,
-        default: PlanStatusEnum.active,
+        enum: plan_2.PlanStatusEnum,
+        default: plan_2.PlanStatusEnum.active,
     },
     type: {
         type: String,
@@ -61,9 +52,9 @@ const planSchema = new mongoose_1.default.Schema({
     },
     typePay: {
         type: String,
-        enum: TypePayEnum,
+        enum: plan_2.TypePayEnum,
         required: false,
-        default: TypePayEnum.season,
+        default: plan_2.TypePayEnum.season,
     },
     createdAt: {
         type: mongoose_1.default.Schema.Types.Date,

package/build/models/app/ticket.d.ts

@@ -1,9 +1,5 @@
 import mongoose from 'mongoose';
-import { TicketStatusEnum, TicketTypeEnum } from '../../events/app/ticket/ticket-created-event';
-export declare enum MessageTypeTicketEnum {
-    user = "user",
-    admin = "admin"
-}
+import { MessageTypeTicketEnum, TicketStatusEnum, TicketTypeEnum } from '../../enums/ticket';
 export interface TicketAttrs {
     userId: string;
     title: string;

package/build/models/app/ticket.js

@@ -3,15 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Ticket = exports.MessageTypeTicketEnum = void 0;
+exports.Ticket = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
-const ticket_created_event_1 = require("../../events/app/ticket/ticket-created-event");
-var MessageTypeTicketEnum;
-(function (MessageTypeTicketEnum) {
-    MessageTypeTicketEnum["user"] = "user";
-    MessageTypeTicketEnum["admin"] = "admin";
-})(MessageTypeTicketEnum || (exports.MessageTypeTicketEnum = MessageTypeTicketEnum = {}));
+const ticket_1 = require("../../enums/ticket");
 const ticketSchema = new mongoose_1.default.Schema({
     userId: {
         type: mongoose_1.default.Schema.Types.ObjectId,
@@ -24,9 +19,9 @@ const ticketSchema = new mongoose_1.default.Schema({
     },
     type: {
         type: String,
-        enum: Object.values(ticket_created_event_1.TicketTypeEnum),
+        enum: Object.values(ticket_1.TicketTypeEnum),
         required: true,
-        default: ticket_created_event_1.TicketTypeEnum.general,
+        default: ticket_1.TicketTypeEnum.general,
     },
     messages: [{
             file: {
@@ -48,7 +43,7 @@ const ticketSchema = new mongoose_1.default.Schema({
             typeMessage: {
                 type: String,
                 required: true,
-                default: MessageTypeTicketEnum.user
+                default: ticket_1.MessageTypeTicketEnum.user
             },
             createdAt: {
                 type: mongoose_1.default.Schema.Types.Date,
@@ -56,8 +51,8 @@ const ticketSchema = new mongoose_1.default.Schema({
         }],
     status: {
         type: String,
-        enum: ticket_created_event_1.TicketStatusEnum,
-        default: ticket_created_event_1.TicketStatusEnum.waitingResponse,
+        enum: ticket_1.TicketStatusEnum,
+        default: ticket_1.TicketStatusEnum.waitingResponse,
     },
     createdAt: {
         type: mongoose_1.default.Schema.Types.Date,

package/build/models/app/transaction.d.ts

@@ -1,10 +1,5 @@
 import mongoose from 'mongoose';
-export declare enum TransactionStatusEnum {
-    success = "success",
-    failed = "failed",
-    unknown = "unknown",
-    expired = "expired"
-}
+import { TransactionStatusEnum } from '../../enums/transaction';
 export interface TransactionAttrs {
     _id?: string;
     description: string;

package/build/models/app/transaction.js

@@ -3,16 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transaction = exports.TransactionStatusEnum = void 0;
+exports.Transaction = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
-var TransactionStatusEnum;
-(function (TransactionStatusEnum) {
-    TransactionStatusEnum["success"] = "success";
-    TransactionStatusEnum["failed"] = "failed";
-    TransactionStatusEnum["unknown"] = "unknown";
-    TransactionStatusEnum["expired"] = "expired";
-})(TransactionStatusEnum || (exports.TransactionStatusEnum = TransactionStatusEnum = {}));
+const transaction_1 = require("../../enums/transaction");
 const transactionSchema = new mongoose_1.default.Schema({
     description: {
         type: String,
@@ -50,8 +44,8 @@ const transactionSchema = new mongoose_1.default.Schema({
     },
     status: {
         type: String,
-        enum: TransactionStatusEnum,
-        default: TransactionStatusEnum.unknown,
+        enum: transaction_1.TransactionStatusEnum,
+        default: transaction_1.TransactionStatusEnum.unknown,
     },
     createdAt: {
         type: mongoose_1.default.Schema.Types.Date,

package/build/models/app/user.d.ts

@@ -1,9 +1,6 @@
 import mongoose from 'mongoose';
 import { PlanDoc } from './plan';
-export declare enum userStatusEnum {
-    active = "active",
-    deactive = "deactive"
-}
+import { UserStatusEnum } from '../../enums/user';
 export interface UserAttrs {
     _id: string;
     walletBalance?: mongoose.Types.Decimal128;
@@ -20,7 +17,7 @@ export interface UserAttrs {
     limit?: boolean;
     username?: string;
     mobile?: string;
-    status?: userStatusEnum;
+    status?: UserStatusEnum;
     name?: string;
     password?: string;
     family?: string;

package/build/models/app/user.js

@@ -12,15 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.User = exports.userStatusEnum = void 0;
+exports.User = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 // import { updateIfCurrentPlugin } from 'mongoose-update-if-current';
 const password_1 = require("../../services/password");
-var userStatusEnum;
-(function (userStatusEnum) {
-    userStatusEnum["active"] = "active";
-    userStatusEnum["deactive"] = "deactive";
-})(userStatusEnum || (exports.userStatusEnum = userStatusEnum = {}));
+const user_1 = require("../../enums/user");
 const userSchema = new mongoose_1.default.Schema({
     email: {
         type: String,
@@ -111,8 +107,8 @@ const userSchema = new mongoose_1.default.Schema({
     },
     status: {
         type: String,
-        enum: userStatusEnum,
-        default: userStatusEnum.active,
+        enum: user_1.UserStatusEnum,
+        default: user_1.UserStatusEnum.active,
     },
     createdAt: {
         type: Number,

package/build/models/app/voice.d.ts

@@ -1,9 +1,6 @@
 import mongoose from 'mongoose';
 import { AiAttrs, AiDoc } from './ai';
-export declare enum SpeechTypeEnum {
-    textToSpeech = "textToSpeech",
-    speechToText = "speechToText"
-}
+import { SpeechTypeEnum } from '../../enums/voice';
 export interface SpeechAttrs {
     userId: string;
     speechName: string;

package/build/models/app/voice.js

@@ -3,14 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpeechModel = exports.SpeechTypeEnum = void 0;
+exports.SpeechModel = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const mongoose_update_if_current_1 = require("mongoose-update-if-current");
-var SpeechTypeEnum;
-(function (SpeechTypeEnum) {
-    SpeechTypeEnum["textToSpeech"] = "textToSpeech";
-    SpeechTypeEnum["speechToText"] = "speechToText";
-})(SpeechTypeEnum || (exports.SpeechTypeEnum = SpeechTypeEnum = {}));
+const voice_1 = require("../../enums/voice");
 const SpeechSchema = new mongoose_1.default.Schema({
     userId: {
         type: String,
@@ -37,7 +33,7 @@ const SpeechSchema = new mongoose_1.default.Schema({
         type: {
             type: String,
             required: true,
-            enum: Object.values(SpeechTypeEnum),
+            enum: Object.values(voice_1.SpeechTypeEnum),
         },
         content: {
             type: String,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@common_ch/common",
-  "version": "1.0.176",
+  "version": "1.0.182",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [