npm_microservice 1.0.19 → 1.0.21

package/dist/services/course/CourseLessonService.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 BaseService2 = 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 = BaseService2;
@@ -392,7 +430,9 @@ var { CONFIG_ROUTER_SERVICE } = require_config();
 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 = {}) {

package/dist/services/course/StudentService.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 BaseService2 = 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 = BaseService2;
@@ -392,7 +430,8 @@ var { CONFIG_ROUTER_SERVICE } = require_config();
 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";
@@ -406,6 +445,10 @@ var StudentService = class extends BaseService {
     let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/students/update-progress";
     return this.request("post", url, { data });
   }
+  async count(filter = {}) {
+    let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/student/count";
+    return this.request("get", url, { params: filter });
+  }
   // có thể thêm method riêng cho user nếu cần
 };
 module.exports = StudentService;

package/dist/services/crm/ContactsService.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 BaseService2 = 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 = BaseService2;
@@ -398,7 +436,8 @@ var ContactsService = class extends BaseService {
       Authorization: `Bearer ${API_MICROSERVICE_TOKEN}`
     });
     this.isCache = true;
-    this.service = "contacts";
+    this.module = "contactsService";
+    this.service = "crm";
   }
   async findEmailOrPhone(input) {
     let filter = {};