npm_microservice 1.0.19 → 1.0.20

package/dist/service.js

@@ -7,8 +7,8 @@ var __commonJS = (cb, mod) => function __require() {
 var require_config = __commonJS({
   "src/config.js"(exports2, module2) {
     require("dotenv").config({ quiet: true, override: true });
-    var Redis2 = require("ioredis");
-    var redis = new Redis2({
+    var Redis = require("ioredis");
+    var redis = new Redis({
       host: process.env.REDIS_HOST || "128.199.195.180",
       port: process.env.REDIS_PORT || 6379,
       password: process.env.REDIS_PASSWORD || "WZyB5Z7BRRgvrzuGzRwB"
@@ -189,14 +189,11 @@ var require_CacheService = __commonJS({
       // nhớ gán ở subclass
       module = null;
       // module
-      configService = "gateway";
+      configService = "microservice";
       // module
       timeCache = 3600;
       // cache 60p
       redis = null;
-      constructor() {
-        this.redis = new Redis();
-      }
       buildCacheKeyUrl(path, params = {}) {
         const q = qs.stringify(params, { arrayFormat: "brackets", encode: true });
         const full = `${path}${q ? "?" + q : ""}`;
@@ -233,6 +230,24 @@ var require_CacheService = __commonJS({
         const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
         await this.setCache(key, value, ttl);
       }
+      async deleteById(id) {
+        const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+        await this.deleteCache(key);
+      }
+      async deleteByIds(ids = []) {
+        if (!this.isCache || !this.redis) return;
+        const keys = ids.map(
+          (id) => `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`
+        );
+        if (keys.length) {
+          await this.redis.del(...keys);
+        }
+      }
+      // Xóa cache theo key
+      async deleteCache(key) {
+        if (!this.isCache || !this.redis) return;
+        await this.redis.del(key);
+      }
     };
     module2.exports = CacheService;
   }
@@ -248,13 +263,8 @@ var require_BaseService = __commonJS({
     var BaseService = class extends CacheService {
       baseUrl = "";
       headers = {};
-      isCache = false;
-      // bật/tắt cache mặc định
-      service = null;
-      // nhớ gán ở subclass
-      timeCache = 300;
-      // 300s = 5 phút
       constructor(baseUrl = "", defaultHeaders = {}) {
+        super(baseUrl, defaultHeaders);
         this.baseUrl = baseUrl;
         this.setHeader(defaultHeaders);
         this.redis = CONFIG_REDIS;
@@ -283,14 +293,14 @@ var require_BaseService = __commonJS({
         };
         return this;
       }
-      async request(method, url, options = {}, cacheKey2 = null, cacheOption = {}) {
+      async request(method, url, options = {}, cacheOption = {}) {
         var _a, _b;
         const isGet = method.toLowerCase() === "get";
-        const enableCache = cacheOption.isCache ?? this.isCache;
+        const enableCache = cacheOption.isCache ?? false;
         if (isGet && enableCache) {
-          cacheKey2 = cacheKey2 || this.buildCacheKeyUrl(url, options.params);
-          const cached = await this.getCacheByKey(cacheKey2);
-          if (cached) return JSON.parse(cached);
+          let cacheKey = (cacheOption == null ? void 0 : cacheOption.cacheKey) ?? this.buildCacheKeyUrl(url, options.params);
+          const cached = await this.getCacheByKey(cacheKey);
+          if (cached) return cached;
         }
         try {
           if (isGet) {
@@ -305,10 +315,10 @@ var require_BaseService = __commonJS({
           });
           const data = res.data;
           if (isGet && enableCache) {
-            cacheKey2 = cacheKey2 || this.buildCacheKeyUrl(url, options.params);
+            let cacheKey = cacheOption.cacheKey ?? this.buildCacheKeyUrl(url, options.params);
             const ttl = cacheOption.timeCache || this.timeCache;
-            await CONFIG_REDIS.set(cacheKey2, JSON.stringify(data), "EX", ttl);
-            console.log(`[CACHE SET] ${cacheKey2} - TTL ${ttl}s`);
+            await this.setCache(cacheKey, data, ttl);
+            console.log(`[CACHE SET] ${cacheKey} - TTL ${ttl}s`);
           }
           const duration = (Date.now() - startTime) / 1e3;
           if (duration > 5) {
@@ -347,39 +357,67 @@ var require_BaseService = __commonJS({
         return `${url}${queryString ? "?" + queryString : ""}`;
       }
       async all(query = {}, cacheOption = {}) {
+        let { filter = {} } = query;
+        const useCache = this.isCache && filter && filter._id && Object.keys(filter).length === 1;
+        if (useCache) {
+          let ids = Array.isArray(filter._id) ? filter._id : [filter._id];
+          return this.details(ids);
+        }
         if (query.order_by && Array.isArray(query.order_by)) {
           query.order_by = query.order_by.slice(0, 2);
           if (query.order_by[1] && !["asc", "desc"].includes(query.order_by[1])) {
             query.order_by[1] = "asc";
           }
         }
-        return this.request(
-          "get",
-          this.baseUrl,
-          { params: query },
-          null,
-          cacheOption
-        );
+        return this.request("get", this.baseUrl, { params: query }, cacheOption);
+      }
+      async details(ids = [], options = {}, cacheOption = {}) {
+        const enableCache = cacheOption.isCache ?? this.isCache;
+        let dataCache = [];
+        if (enableCache) {
+          dataCache = await this.getCacheByIds(ids);
+          const cachedIds = dataCache.filter((item) => item && Object.keys(item).length > 0).map((item) => item._id);
+          ids = ids.filter((id) => !cachedIds.includes(id));
+        }
+        if (ids.length === 0) return dataCache;
+        let params = { params: { filter: { _id: ids }, limit: ids.length } };
+        const datas = await this.request("get", this.baseUrl, params, cacheOption);
+        const rows = [...dataCache];
+        if (enableCache && Array.isArray(datas)) {
+          for (const item of datas) {
+            if (item._id) {
+              await this.setCacheById(item._id, item, this.timeCache);
+              rows.push(item);
+            }
+          }
+        }
+        return rows;
       }
       async detail(id, cacheOption = {}) {
         const enableCache = cacheOption.isCache ?? this.isCache;
-        if (enableCache && this.getCacheById(id)) return this.getCacheById(id);
-        return this.request(
-          "get",
-          `${this.baseUrl}/${id}`,
-          {},
-          cacheKey,
-          cacheOption
-        );
+        if (enableCache) {
+          let data = await this.getCacheById(id);
+          if (data) return data;
+        }
+        let url = `${this.baseUrl}/${id}`;
+        return this.request("get", url, {}, cacheOption);
       }
       async create(data) {
         return this.request("post", this.baseUrl, { data });
       }
       async update(id, data) {
-        return this.request("put", `${this.baseUrl}/${id}`, { data });
+        let response = this.request("put", `${this.baseUrl}/${id}`, { data });
+        if (response && (response == null ? void 0 : response.status) == "success" && this.isCache) {
+          this.deleteById(id);
+        }
+        return response;
       }
       async delete(id) {
-        return this.request("delete", `${this.baseUrl}/${id}`);
+        let response = this.request("delete", `${this.baseUrl}/${id}`);
+        if (response && (response == null ? void 0 : response.status) == "success" && this.isCache) {
+          this.deleteById(id);
+        }
+        return response;
       }
     };
     module2.exports = BaseService;
@@ -448,8 +486,9 @@ var require_BannerService = __commonJS({
     var BannerService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.BannerService);
-        this.service = "AppBannerService";
         this.isCache = true;
+        this.module = "bannerService";
+        this.service = "app";
       }
     };
     module2.exports = BannerService;
@@ -464,8 +503,9 @@ var require_CategoryService = __commonJS({
     var CategoryService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.CategoryService);
-        this.service = "AppCategoryService";
         this.isCache = true;
+        this.module = "categoryService";
+        this.service = "app";
       }
     };
     module2.exports = CategoryService;
@@ -480,8 +520,9 @@ var require_NewService = __commonJS({
     var NewService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.NewService);
-        this.service = "App.NewService";
         this.isCache = true;
+        this.module = "newService";
+        this.service = "app";
       }
       async category(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/app/category";
@@ -506,7 +547,8 @@ var require_RecommendedCourseService = __commonJS({
     var RecommendedCourseService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.RecommendedCourseService);
-        this.service = "recommended_level";
+        this.module = "RecommendedCourseService";
+        this.service = "app";
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -522,6 +564,8 @@ var require_SettingAppService = __commonJS({
     var SettingAppService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.SettingAppService);
+        this.module = "settingService";
+        this.service = "app";
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -537,7 +581,7 @@ var require_TargetService = __commonJS({
     var TargetService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.TargetAppService);
-        this.isCache = false;
+        this.module = "targetService";
         this.service = "app";
       }
       async updateTargetContact(data) {
@@ -561,7 +605,8 @@ var require_AppTestService = __commonJS({
     var AppTestService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.AppTestService);
-        this.service = "AppTestService";
+        this.module = "testService";
+        this.service = "app";
       }
       async category(filter = {}) {
         this.service = "app_category";
@@ -590,7 +635,8 @@ var require_CategoryService2 = __commonJS({
           Authorization: `Bearer ${API_MICROSERVICE_TOKEN}`
         });
         this.isCache = true;
-        this.service = "app_banner";
+        this.module = "categoryService";
+        this.service = "call_center";
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -602,14 +648,18 @@ var require_CategoryService2 = __commonJS({
 var require_TicketActivityService = __commonJS({
   "src/services/call_center/TicketActivityService.js"(exports2, module2) {
     var BaseService = require_BaseService();
-    var { CONFIG_ROUTER_SERVICE, API_MICROSERVICE_TOKEN } = require_config();
+    var {
+      CONFIG_ROUTER_SERVICE,
+      API_MICROSERVICE_TOKEN
+    } = require_config();
     var TicketActivityService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.CallCenter.TicketActivityService, {
           Authorization: `Bearer ${API_MICROSERVICE_TOKEN}`
         });
         this.isCache = true;
-        this.service = "app_banner";
+        this.module = "ticketActivityService";
+        this.service = "call_center";
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -630,8 +680,8 @@ var require_TicketService = __commonJS({
         super(CONFIG_ROUTER_SERVICE.CallCenter.TicketService, {
           Authorization: `Bearer ${API_MICROSERVICE_TOKEN}`
         });
-        this.isCache = true;
-        this.service = "CallCenter.TicketService";
+        this.module = "ticketService";
+        this.service = "call_center";
       }
       async comment(id, data) {
         let url = `${this.baseUrl}/${id}/comment`;
@@ -690,10 +740,6 @@ var require_TicketService = __commonJS({
         this.service = "ticket-topics";
         return this.request("get", url);
       }
-      async close(params) {
-        const url = `${CONFIG_ROUTER_SERVICE.BASE_URL}/call-center/ticket/${params.ticket_id}/close`;
-        return this.request("post", url, { data: params });
-      }
       async create(params) {
         const url = `${CONFIG_ROUTER_SERVICE.BASE_URL}/call-center/ticket`;
         return this.request("post", url, { data: params });
@@ -728,7 +774,8 @@ var require_TicketTemplateService = __commonJS({
           Authorization: `Bearer ${API_MICROSERVICE_TOKEN}`
         });
         this.isCache = true;
-        this.service = "app_banner";
+        this.module = "ticketTemplateService";
+        this.service = "call_center";
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -750,7 +797,8 @@ var require_TicketTopicService = __commonJS({
           Authorization: `Bearer ${API_MICROSERVICE_TOKEN}`
         });
         this.isCache = true;
-        this.service = "app_banner";
+        this.module = "ticketTopicService";
+        this.service = "call_center";
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -772,7 +820,8 @@ var require_ContactsService = __commonJS({
           Authorization: `Bearer ${API_MICROSERVICE_TOKEN}`
         });
         this.isCache = true;
-        this.service = "contacts";
+        this.module = "contactsService";
+        this.service = "crm";
       }
       async findEmailOrPhone(input) {
         let filter = {};
@@ -806,7 +855,8 @@ var require_DeviceService = __commonJS({
     var DeviceService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Crm.DeviceService);
-        this.service = "Crm.devices";
+        this.module = "deviceService";
+        this.service = "crm";
       }
     };
     module2.exports = DeviceService;
@@ -1162,8 +1212,9 @@ var require_EmployeeService = __commonJS({
     var EmployeeService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.EmployeeService);
-        this.service = "EmployeeService";
-        console.log("run EmployeeService");
+        this.isCache = true;
+        this.module = "employeeService";
+        this.service = "hr";
       }
     };
     module2.exports = EmployeeService;
@@ -1179,8 +1230,9 @@ var require_EmployeeShiftService = __commonJS({
     var EmployeeShiftService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.EmployeeShiftService);
-        this.service = "EmployeeShiftService";
         this.isCache = true;
+        this.module = "employeeShiftService";
+        this.service = "hr";
       }
     };
     module2.exports = EmployeeShiftService;
@@ -1195,8 +1247,9 @@ var require_HolidayService = __commonJS({
     var HolidayService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.HolidayService);
-        this.service = "HolidayService";
         this.isCache = true;
+        this.module = "holidayService";
+        this.service = "hr";
       }
     };
     module2.exports = HolidayService;
@@ -1211,7 +1264,9 @@ var require_JobTitleService = __commonJS({
     var JobTitleService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.JobTitleService);
-        this.service = "JobTitleService";
+        this.isCache = true;
+        this.module = "jobTitleService";
+        this.service = "hr";
       }
     };
     module2.exports = JobTitleService;
@@ -1226,8 +1281,9 @@ var require_PositionService = __commonJS({
     var PositionService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.PositionService);
-        this.service = "hrPositionService";
-        console.log("run hrPositionService");
+        this.isCache = true;
+        this.module = "positionService";
+        this.service = "hr";
       }
     };
     module2.exports = PositionService;
@@ -1242,7 +1298,9 @@ var require_ReasonTypeService = __commonJS({
     var ReasonTypeService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.ReasonTypeService);
-        this.service = "ReasonTypeService";
+        this.isCache = true;
+        this.module = "reasonTypeService";
+        this.service = "hr";
       }
     };
     module2.exports = ReasonTypeService;
@@ -1328,8 +1386,9 @@ var require_SettingDocumentService = __commonJS({
     var SettingDocumentService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.SettingDocumentService);
-        this.service = "SettingDocumentService";
         this.isCache = true;
+        this.module = "settingDocumentService";
+        this.service = "hr";
       }
     };
     module2.exports = SettingDocumentService;
@@ -1344,8 +1403,9 @@ var require_ShiftService = __commonJS({
     var ShiftService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.ShiftService);
-        this.service = "DepartmentService";
         this.isCache = true;
+        this.module = "shiftService";
+        this.service = "hr";
       }
       async storeFirst(data) {
         let url = `${this.baseUrl}/store-first`;
@@ -1365,8 +1425,8 @@ var require_ShiftsCustomerCareService = __commonJS({
     var ShiftsCustomerCareService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.ShiftsCustomerCareService);
-        this.service = "ShiftsCustomerCareService";
-        this.isCache = true;
+        this.module = "shiftsCustomerCareService";
+        this.service = "hr";
       }
     };
     module2.exports = ShiftsCustomerCareService;
@@ -1381,7 +1441,9 @@ var require_TicketExtendService = __commonJS({
     var TicketExtendService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.TicketExtendService);
-        this.service = "HR.TicketExtendService";
+        this.isCache = true;
+        this.module = "ticketExtendService";
+        this.service = "hr";
       }
     };
     module2.exports = TicketExtendService;
@@ -1396,7 +1458,8 @@ var require_TicketService2 = __commonJS({
     var TicketService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.TicketService);
-        this.service = "HR.TicketService";
+        this.module = "ticketService";
+        this.service = "hr";
       }
       async approved(data) {
         let url = `${this.baseUrl}/approve`;
@@ -1415,7 +1478,9 @@ var require_TicketTypeService = __commonJS({
     var TicketTypeService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Hr.TicketTypeService);
-        this.service = "HR.TicketTypeService";
+        this.isCache = true;
+        this.module = "ticketTypeService";
+        this.service = "hr";
       }
     };
     module2.exports = TicketTypeService;
@@ -1648,8 +1713,9 @@ var require_AlbumCategoryService = __commonJS({
     var AlbumCategoryService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.AlbumCategoryService);
-        this.service = "Lms.AlbumCategoryService";
         this.isCache = true;
+        this.module = "albumCategoryService";
+        this.service = "lms";
       }
     };
     module2.exports = AlbumCategoryService;
@@ -1664,8 +1730,9 @@ var require_AlbumFileService = __commonJS({
     var AlbumFileService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.AlbumFileService);
-        this.service = "Lms.AlbumFileService";
-        this.isCache = false;
+        this.isCache = true;
+        this.module = "albumFileService";
+        this.service = "lms";
       }
     };
     module2.exports = AlbumFileService;
@@ -1680,8 +1747,9 @@ var require_AlbumService = __commonJS({
     var AlbumService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.AlbumService);
-        this.service = "albumService";
-        this.isCache = false;
+        this.isCache = true;
+        this.module = "albumService";
+        this.service = "lms";
       }
       async category(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/cate_album";
@@ -1711,8 +1779,9 @@ var require_ClassScheduleService = __commonJS({
     var ClassScheduleService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.ClassScheduleService);
-        this.service = "Lms.ClassScheduleService";
         this.isCache = true;
+        this.module = "classScheduleService";
+        this.service = "lms";
       }
     };
     module2.exports = ClassScheduleService;
@@ -1727,8 +1796,9 @@ var require_ClassesService = __commonJS({
     var ClassesService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.ClassesService);
-        this.service = "ClassesService";
         this.isCache = true;
+        this.module = "classesService";
+        this.service = "lms";
       }
     };
     module2.exports = ClassesService;
@@ -1743,8 +1813,9 @@ var require_CourseLessonService = __commonJS({
     var CourseLessonService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.CourseLessonService);
-        this.service = "Lms.CourseLessonService";
-        this.isCache = false;
+        this.isCache = true;
+        this.module = "courseLessonService";
+        this.service = "lms";
       }
     };
     module2.exports = CourseLessonService;
@@ -1759,8 +1830,9 @@ var require_CoursePriceService = __commonJS({
     var CoursePriceService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.CoursePriceService);
-        this.service = "Lms.CoursePriceService";
-        this.isCache = false;
+        this.isCache = true;
+        this.module = "coursePriceService";
+        this.service = "lms";
       }
     };
     module2.exports = CoursePriceService;
@@ -1775,8 +1847,9 @@ var require_CourseProductService = __commonJS({
     var CourseProductService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.CourseProductService);
-        this.service = "Lms.CourseProductService";
-        this.isCache = false;
+        this.isCache = true;
+        this.module = "courseProductService";
+        this.service = "lms";
       }
     };
     module2.exports = CourseProductService;
@@ -1791,8 +1864,9 @@ var require_CourseService = __commonJS({
     var CourseService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.CourseService);
-        this.service = "Lms.CourseService";
-        this.isCache = false;
+        this.isCache = true;
+        this.module = "courseService";
+        this.service = "lms";
       }
     };
     module2.exports = CourseService;
@@ -1807,8 +1881,9 @@ var require_DocumentCategoryService = __commonJS({
     var DocumentCategoryService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.DocumentCategoryService);
-        this.service = "Lms.DocumentCategoryService";
-        this.isCache = false;
+        this.isCache = true;
+        this.module = "documentCategoryService";
+        this.service = "lms";
       }
     };
     module2.exports = DocumentCategoryService;
@@ -1823,8 +1898,9 @@ var require_DocumentService2 = __commonJS({
     var DocumentService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.DocumentService);
-        this.service = "Lms.DocumentService";
-        this.isCache = false;
+        this.isCache = true;
+        this.module = "documentService";
+        this.service = "lms";
       }
       async studentDocument(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/student-documents";
@@ -1863,8 +1939,9 @@ var require_LicenseService = __commonJS({
     var LicenseService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.LicenseService);
-        this.service = "LicenseService";
-        this.isCache = true;
+        this.isCache = false;
+        this.module = "licenseService";
+        this.service = "lms";
       }
     };
     module2.exports = LicenseService;
@@ -1879,8 +1956,9 @@ var require_PracticeResultService = __commonJS({
     var PracticeResultService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.PracticeResultService);
-        this.service = "Lms.PracticeResultService";
         this.isCache = false;
+        this.module = "practiceResultService";
+        this.service = "lms";
       }
       async practiceResult(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/practices-result";
@@ -1900,8 +1978,9 @@ var require_PracticeService = __commonJS({
     var PracticeService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.PracticeService);
-        this.service = "Lms.PracticeService";
         this.isCache = false;
+        this.module = "practiceService";
+        this.service = "lms";
       }
       async practiceResult(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/practices-result";
@@ -1921,8 +2000,9 @@ var require_StudentAgainService = __commonJS({
     var StudentAgainService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.StudentAgainService);
-        this.service = "Lms.StudentAgainService";
         this.isCache = false;
+        this.module = "studentAgainService";
+        this.service = "lms";
       }
     };
     module2.exports = StudentAgainService;
@@ -1937,8 +2017,9 @@ var require_StudentDocumentService = __commonJS({
     var StudentDocumentService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.StudentDocumentService);
-        this.service = "Lms.StudentDocumentService";
         this.isCache = false;
+        this.module = "studentDocumentService";
+        this.service = "lms";
       }
     };
     module2.exports = StudentDocumentService;
@@ -1953,8 +2034,9 @@ var require_StudentExamTimeService = __commonJS({
     var StudentExamTimeService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.StudentExamTimeService);
-        this.service = "Lms.StudentExamTimeService";
         this.isCache = false;
+        this.module = "studentExamTimeService";
+        this.service = "lms";
       }
     };
     module2.exports = StudentExamTimeService;
@@ -1969,8 +2051,9 @@ var require_StudentReviewService = __commonJS({
     var StudentReviewService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.StudentReviewService);
-        this.service = "Lms.StudentReviewService";
         this.isCache = false;
+        this.module = "studentReviewService";
+        this.service = "lms";
       }
     };
     module2.exports = StudentReviewService;
@@ -1985,8 +2068,9 @@ var require_StudentScoreService = __commonJS({
     var StudentScoreService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.StudentScoreService);
-        this.service = "Lms.StudentScoreService";
         this.isCache = false;
+        this.module = "studentScoreService";
+        this.service = "lms";
       }
     };
     module2.exports = StudentScoreService;
@@ -2001,8 +2085,9 @@ var require_StudentService = __commonJS({
     var StudentService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.StudentService);
-        this.service = "Lms.StudentService";
         this.isCache = false;
+        this.module = "studentService";
+        this.service = "lms";
       }
       async getScore(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/students-scores";
@@ -2032,8 +2117,9 @@ var require_StudentSettingReviewService = __commonJS({
     var StudentReviewService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.StudentReviewService);
-        this.service = "Lms.StudentReviewService";
         this.isCache = false;
+        this.module = "studentReviewService";
+        this.service = "lms";
       }
     };
     module2.exports = StudentReviewService;
@@ -2048,8 +2134,9 @@ var require_StudentTrackingService = __commonJS({
     var StudentTrackingService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.StudentTrackingService);
-        this.service = "Lms.StudentTrackingService";
         this.isCache = false;
+        this.module = "studentTrackingService";
+        this.service = "lms";
       }
     };
     module2.exports = StudentTrackingService;
@@ -2065,7 +2152,8 @@ var require_AppService = __commonJS({
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Notification.AppService);
         this.isCache = true;
-        this.service = "Notification.AppService";
+        this.module = "appService";
+        this.service = "notification";
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -2081,6 +2169,7 @@ var require_NotificationService = __commonJS({
     var NotificationService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Notification.NotificationService);
+        this.module = "Notification";
         this.service = "notification";
       }
       async getAllNotiContact(params) {
@@ -2134,8 +2223,9 @@ var require_BranchRequestService = __commonJS({
     var BranchRequestService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Org.BranchRequestService);
-        this.service = "BranchRequestService";
         this.isCache = true;
+        this.module = "branchRequestService";
+        this.service = "org";
       }
     };
     module2.exports = BranchRequestService;
@@ -2150,8 +2240,9 @@ var require_BranchService = __commonJS({
     var BranchService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Org.BranchService);
-        this.service = "BranchService";
         this.isCache = true;
+        this.module = "branchService";
+        this.service = "org";
       }
       async location(data) {
         let url = `${this.baseUrl}/location`;
@@ -2170,8 +2261,9 @@ var require_BranchToMacsService = __commonJS({
     var BranchToMacsService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Org.BranchToMacsService);
-        this.service = "BranchToMacsService";
         this.isCache = true;
+        this.module = "branchToMacsService";
+        this.service = "org";
       }
     };
     module2.exports = BranchToMacsService;
@@ -2186,8 +2278,9 @@ var require_BrandService = __commonJS({
     var BrandService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Org.BrandService);
-        this.service = "BrandService";
         this.isCache = true;
+        this.module = "brandService";
+        this.service = "org";
       }
     };
     module2.exports = BrandService;
@@ -2202,8 +2295,9 @@ var require_CitiesService = __commonJS({
     var CitiesService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Org.CitiesService);
-        this.service = "CitiesService";
         this.isCache = true;
+        this.service = "citiesService";
+        this.service = "org";
       }
     };
     module2.exports = CitiesService;
@@ -2218,8 +2312,9 @@ var require_LegalEntityService = __commonJS({
     var LegalEntityService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Org.LegalEntityService);
-        this.service = "LegalEntityService";
         this.isCache = true;
+        this.service = "legalEntityService";
+        this.service = "org";
       }
     };
     module2.exports = LegalEntityService;
@@ -2234,8 +2329,9 @@ var require_CategoryService4 = __commonJS({
     var CategoryService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Course.CategoryService);
-        this.service = "Course.CategoryService";
         this.isCache = true;
+        this.module = "categoryService";
+        this.service = "course";
       }
     };
     module2.exports = CategoryService;
@@ -2289,7 +2385,9 @@ var require_CourseLessonService2 = __commonJS({
     var CourseLessonService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Course.CourseLessonService);
-        this.service = "Course.CourseLessonService";
+        this.isCache = true;
+        this.module = "courseLessonService";
+        this.service = "course";
       }
       // có thể thêm method riêng cho user nếu cần
       async category(filter = {}) {
@@ -2309,7 +2407,8 @@ var require_StudentService2 = __commonJS({
     var StudentService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Course.StudentService);
-        this.service = "Course.StudentService";
+        this.module = "studentService";
+        this.service = "course";
       }
       async getStudentCourse(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/students";
@@ -2338,7 +2437,8 @@ var require_NoteService = __commonJS({
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Pm.NoteService);
         this.isCache = true;
-        this.service = "NoteService";
+        this.service = "noteService";
+        this.service = "pm";
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -2355,7 +2455,8 @@ var require_TaskService = __commonJS({
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Pm.TaskService);
         this.isCache = true;
-        this.service = "TaskService";
+        this.service = "taskService";
+        this.service = "pm";
       }
       async relates(filter = {}) {
         let url = `${this.baseUrl}/relates`;
@@ -2375,7 +2476,8 @@ var require_EduTestService = __commonJS({
     var EduTestService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Test.TestService);
-        this.service = "tests";
+        this.service = "testService";
+        this.service = "test";
       }
       async count(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/tests/test/count";