npm_microservice 1.0.12 → 1.0.14

package/dist/config.js

@@ -42,25 +42,24 @@ var configRouteService = {
   App: {
     CategoryService: `${baseUrl}/app/category`,
     NewService: `${baseUrl}/app/news`,
+    BannerService: `${baseUrl}/app/banner`,
     AppTestService: `${baseUrl}/app/test`,
     RecommendedCourseService: `${baseUrl}/app/recommended_level`,
     SettingAppService: `${baseUrl}/app/setting`,
     TargetAppService: `${baseUrl}/app/target`
   },
+  Course: {
+    CategoryService: `${baseUrl}/course/category`,
+    CourseService: `${baseUrl}/course/course`,
+    CourseLessonService: `${baseUrl}/course/course_schedule`,
+    StudentService: `${baseUrl}/course/students`
+  },
   Asset: {
     AllocationDetailService: `${baseUrl}/asset/asset-allocation-detail`,
     BroadcastService: `${baseUrl}/asset/broadcast`,
     EntityAssetService: `${baseUrl}/asset/entity-asset`,
     SubAssetService: `${baseUrl}/asset/sub-asset`
   },
-  Course: {
-    CategoryService: `${baseUrl}/course/category`,
-    ClassesService: `${baseUrl}/course/classes`,
-    ClassesScheduleService: `${baseUrl}/course/classes_schedule`,
-    CourseService: `${baseUrl}/course/course`,
-    CourseScheduleService: `${baseUrl}/course/course_schedule`,
-    StudentsService: `${baseUrl}/course/students`
-  },
   Test: {
     TestService: `${baseUrl}/tests/tests`
   },

package/dist/service.js

@@ -49,25 +49,24 @@ var require_config = __commonJS({
       App: {
         CategoryService: `${baseUrl}/app/category`,
         NewService: `${baseUrl}/app/news`,
+        BannerService: `${baseUrl}/app/banner`,
         AppTestService: `${baseUrl}/app/test`,
         RecommendedCourseService: `${baseUrl}/app/recommended_level`,
         SettingAppService: `${baseUrl}/app/setting`,
         TargetAppService: `${baseUrl}/app/target`
       },
+      Course: {
+        CategoryService: `${baseUrl}/course/category`,
+        CourseService: `${baseUrl}/course/course`,
+        CourseLessonService: `${baseUrl}/course/course_schedule`,
+        StudentService: `${baseUrl}/course/students`
+      },
       Asset: {
         AllocationDetailService: `${baseUrl}/asset/asset-allocation-detail`,
         BroadcastService: `${baseUrl}/asset/broadcast`,
         EntityAssetService: `${baseUrl}/asset/entity-asset`,
         SubAssetService: `${baseUrl}/asset/sub-asset`
       },
-      Course: {
-        CategoryService: `${baseUrl}/course/category`,
-        ClassesService: `${baseUrl}/course/classes`,
-        ClassesScheduleService: `${baseUrl}/course/classes_schedule`,
-        CourseService: `${baseUrl}/course/course`,
-        CourseScheduleService: `${baseUrl}/course/course_schedule`,
-        StudentsService: `${baseUrl}/course/students`
-      },
       Test: {
         TestService: `${baseUrl}/tests/tests`
       },
@@ -189,23 +188,33 @@ var require_BaseService = __commonJS({
       baseUrl = "";
       headers = {};
       isCache = false;
+      // bật/tắt cache mặc định
       service = null;
-      // nhớ set ở subclass
+      // nhớ gán ở subclass
       timeCache = 300;
       // 300s = 5 phút
       constructor(baseUrl = "", defaultHeaders = {}) {
         this.baseUrl = baseUrl;
-        this.setHeader();
+        this.setHeader(defaultHeaders);
         this.http = axios.create({
           baseURL: this.baseUrl,
           headers: this.headers,
           paramsSerializer: (params) => qs.stringify(params, { arrayFormat: "brackets", encode: true })
         });
       }
-      // Nhận: object headers, hoặc trực tiếp token string ("Bearer x"), hoặc không truyền gì (auto từ ENV)
+      /**
+       * Set header cho request
+       * - headers: object { Authorization: "Bearer x" }
+       * - string: "Bearer x"
+       * - không truyền: dùng token từ ENV
+       */
       setHeader(headers = {}) {
-        var Authorization = `Bearer ${API_MICROSERVICE_TOKEN}`;
-        if (headers && headers.Authorization) Authorization = headers.Authorization;
+        let Authorization = `Bearer ${API_MICROSERVICE_TOKEN}`;
+        if (typeof headers === "string") {
+          Authorization = headers;
+        } else if (headers && headers.Authorization) {
+          Authorization = headers.Authorization;
+        }
         this.headers = {
           ...this.headers || {},
           Authorization
@@ -218,11 +227,12 @@ var require_BaseService = __commonJS({
         const service = this.service || "unknown";
         return `gateway.${service}.urls:${full}`;
       }
-      async request(method, url, options = {}, cacheKey = null) {
-        var _a, _b, _c;
+      async request(method, url, options = {}, cacheKey = null, cacheOption = {}) {
+        var _a, _b;
         const isGet = method.toLowerCase() === "get";
-        if (isGet && this.isCache) {
-          cacheKey = cacheKey ? cacheKey : this.buildCacheKey(url, options.params);
+        const enableCache = cacheOption.isCache ?? this.isCache;
+        if (isGet && enableCache) {
+          cacheKey = cacheKey || this.buildCacheKey(url, options.params);
           const cached = await CONFIG_REDIS.get(cacheKey);
           if (cached) {
             console.log(`[CACHE HIT] ${cacheKey}`);
@@ -230,93 +240,84 @@ var require_BaseService = __commonJS({
           }
         }
         try {
-          if (method.toLowerCase() === "get") {
-            console.log(
-              `[HTTP ${method.toUpperCase()}] ${this.buildGET(
-                url,
-                options.params || {}
-              )} `
-            );
+          if (isGet) {
+            console.log(`[HTTP GET] ${this.buildGET(url, options.params || {})}`);
           }
-          let startTime = Date.now();
+          const startTime = Date.now();
           const res = await this.http.request({
             method,
             url,
-            // dùng path vì đã set baseURL
             headers: this.headers,
             ...options
           });
           const data = res.data;
-          let duration = (Date.now() - startTime) / 1e3;
+          if (isGet && enableCache) {
+            cacheKey = cacheKey || this.buildCacheKey(url, options.params);
+            const ttl = cacheOption.timeCache || this.timeCache;
+            await CONFIG_REDIS.set(cacheKey, JSON.stringify(data), "EX", ttl);
+            console.log(`[CACHE SET] ${cacheKey} - TTL ${ttl}s`);
+          }
+          const duration = (Date.now() - startTime) / 1e3;
           if (duration > 5) {
-            if (method.toLowerCase() === "get") {
-              let q = qs.stringify(options.params || {}, {
-                arrayFormat: "brackets",
-                encode: true
-              });
-              console.log(
-                `[HTTP GET] ${url}${q ? "?" + q : ""} - took ${duration.toFixed(
-                  2
-                )}s`
-              );
-            } else {
-              console.log(
-                `[HTTP ${method.toUpperCase()}] ${url} - took ${duration.toFixed(
-                  2
-                )}s`
-              );
-            }
+            console.log(
+              `[SLOW ${method.toUpperCase()}] ${url} - ${duration.toFixed(2)}s`
+            );
             if (options.params) console.log("Query:", options.params);
             if (options.data) console.log("Body:", options.data);
           }
           return data;
         } catch (error) {
-          var safeError = {
-            // message: error.message || "Request failed",
+          const safeError = {
             statusCode: ((_a = error.response) == null ? void 0 : _a.status) || 500,
             ...(_b = error.response) == null ? void 0 : _b.data
           };
-          if (safeError.statusCode == 404) {
-            let q = qs.stringify(options.params || {}, {
+          if (safeError.statusCode === 404) {
+            const q = qs.stringify(options.params || {}, {
               arrayFormat: "brackets",
               encode: true
             });
             return {
               statusCode: 404,
               status: "error",
-              messag: `[HTTP  ${method.toUpperCase()}] ${url}${q ? "?" + q : ""} not found`
+              message: `[HTTP ${method.toUpperCase()}] ${url}${q ? "?" + q : ""} not found`
             };
           }
-          console.error(
-            `[${method.toUpperCase()}] ${url} failed:`,
-            safeError,
-            (_c = error.response) == null ? void 0 : _c.data
-          );
-          return {
-            error: true,
-            ...safeError
-          };
+          console.error(`[${method.toUpperCase()}] ${url} failed:`, safeError);
+          return { error: true, ...safeError };
         }
       }
       buildGET(url, params = {}) {
-        let queryString = qs.stringify(params, {
+        const queryString = qs.stringify(params, {
           arrayFormat: "brackets",
           encode: true
         });
         return `${url}${queryString ? "?" + queryString : ""}`;
       }
-      async all(query = {}) {
+      async all(query = {}, cacheOption = {}) {
         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 });
-      }
-      async detail(id) {
-        const cacheKey = this.isCache ? `gateway.${this.service}.${id}` : null;
-        return this.request("get", `${this.baseUrl}/${id}`);
+        return this.request(
+          "get",
+          this.baseUrl,
+          { params: query },
+          null,
+          cacheOption
+        );
+      }
+      async detail(id, cacheOption = {}) {
+        const enableCache = cacheOption.isCache ?? this.isCache;
+        const cacheKey = enableCache ? `gateway.${this.service}.${id}` : null;
+        return this.request(
+          "get",
+          `${this.baseUrl}/${id}`,
+          {},
+          cacheKey,
+          cacheOption
+        );
       }
       async create(data) {
         return this.request("post", this.baseUrl, { data });
@@ -386,6 +387,22 @@ var require_SettingService = __commonJS({
   }
 });
 
+// src/services/app/BannerService.js
+var require_BannerService = __commonJS({
+  "src/services/app/BannerService.js"(exports2, module2) {
+    var BaseService = require_BaseService();
+    var { CONFIG_ROUTER_SERVICE } = require_config();
+    var BannerService = class extends BaseService {
+      constructor() {
+        super(CONFIG_ROUTER_SERVICE.App.BannerService);
+        this.service = "App.BannerService";
+        this.isCache = true;
+      }
+    };
+    module2.exports = BannerService;
+  }
+});
+
 // src/services/app/CategoryService.js
 var require_CategoryService = __commonJS({
   "src/services/app/CategoryService.js"(exports2, module2) {
@@ -1931,6 +1948,21 @@ var require_StudentService = __commonJS({
         this.service = "Lms.StudentService";
         this.isCache = false;
       }
+      async getScore(filter = {}) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/students-scores";
+        this.service = "students-scores";
+        return this.request("get", url, filter);
+      }
+      async getStudentReview(filter = {}) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/students-reviews";
+        this.service = "students-reviews";
+        return this.request("get", url, filter);
+      }
+      async getStudentSettingReview(filter = {}) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/setting-reviews";
+        this.service = "setting-reviews";
+        return this.request("get", url, filter);
+      }
     };
     module2.exports = StudentService;
   }
@@ -2138,6 +2170,105 @@ var require_LegalEntityService = __commonJS({
   }
 });
 
+// src/services/course/CategoryService.js
+var require_CategoryService4 = __commonJS({
+  "src/services/course/CategoryService.js"(exports2, module2) {
+    var BaseService = require_BaseService();
+    var { CONFIG_ROUTER_SERVICE } = require_config();
+    var CategoryService = class extends BaseService {
+      constructor() {
+        super(CONFIG_ROUTER_SERVICE.Course.CategoryService);
+        this.service = "Course.CategoryService";
+        this.isCache = true;
+      }
+    };
+    module2.exports = CategoryService;
+  }
+});
+
+// src/services/course/CourseService.js
+var require_CourseService2 = __commonJS({
+  "src/services/course/CourseService.js"(exports2, module2) {
+    var BaseService = require_BaseService();
+    var { CONFIG_ROUTER_SERVICE } = require_config();
+    var CourseService = class extends BaseService {
+      constructor() {
+        super(CONFIG_ROUTER_SERVICE.Course.CourseService);
+        this.service = "Course.CourseService";
+      }
+      // có thể thêm method riêng cho user nếu cần
+      async detailSchedule(id, cacheOption = {}) {
+        const enableCache = cacheOption.isCache ?? this.isCache;
+        const cacheKey = enableCache ? `gateway.course_schedule.${id}` : null;
+        return this.request(
+          "get",
+          `${this.baseUrl}/${id}`,
+          {},
+          cacheKey,
+          cacheOption
+        );
+      }
+      async count(filter = {}) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/course/count";
+        return this.request("get", url, { params: filter });
+      }
+      async student(filter = {}) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/students";
+        return this.request("get", url, { params: filter });
+      }
+    };
+    module2.exports = CourseService;
+  }
+});
+
+// src/services/course/CourseLessonService.js
+var require_CourseLessonService2 = __commonJS({
+  "src/services/course/CourseLessonService.js"(exports2, module2) {
+    var BaseService = require_BaseService();
+    var { CONFIG_ROUTER_SERVICE } = require_config();
+    var CourseLessonService = class extends BaseService {
+      constructor() {
+        super(CONFIG_ROUTER_SERVICE.Course.CourseLessonService);
+        this.service = "Course.CourseLessonService";
+      }
+      // có thể thêm method riêng cho user nếu cần
+      async category(filter = {}) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/category";
+        return this.request("get", url, { params: filter });
+      }
+    };
+    module2.exports = CourseLessonService;
+  }
+});
+
+// src/services/course/StudentService.js
+var require_StudentService2 = __commonJS({
+  "src/services/course/StudentService.js"(exports2, module2) {
+    var BaseService = require_BaseService();
+    var { CONFIG_ROUTER_SERVICE } = require_config();
+    var StudentService = class extends BaseService {
+      constructor() {
+        super(CONFIG_ROUTER_SERVICE.Course.StudentService);
+        this.service = "Course.StudentService";
+      }
+      async getStudentCourse(filter = {}) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/students";
+        return this.request("get", url, { params: filter });
+      }
+      async register(data) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/students/register-course";
+        return this.request("post", url, { data });
+      }
+      async updateProgress(data) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/course/students/update-progress";
+        return this.request("post", url, { data });
+      }
+      // có thể thêm method riêng cho user nếu cần
+    };
+    module2.exports = StudentService;
+  }
+});
+
 // src/services/pm/NoteService.js
 var require_NoteService = __commonJS({
   "src/services/pm/NoteService.js"(exports2, module2) {
@@ -2261,6 +2392,7 @@ var require_CommentService = __commonJS({
 module.exports = {
   settingService: new (require_SettingService())(),
   // app
+  bannerService: new (require_BannerService())(),
   appCategoryService: new (require_CategoryService())(),
   appNewService: new (require_NewService())(),
   recommendedCourseService: new (require_RecommendedCourseService())(),
@@ -2358,6 +2490,11 @@ module.exports = {
   brandService: new (require_BrandService())(),
   citiesService: new (require_CitiesService())(),
   legalEntityService: new (require_LegalEntityService())(),
+  // course
+  courseCategoryService: new (require_CategoryService4())(),
+  courseCourseService: new (require_CourseService2())(),
+  courseCourseLessonService: new (require_CourseLessonService2())(),
+  courseStudentService: new (require_StudentService2())(),
   // pm
   noteService: new (require_NoteService())(),
   taskService: new (require_TaskService())(),

package/dist/services/BaseService.js

@@ -49,25 +49,24 @@ var require_config = __commonJS({
       App: {
         CategoryService: `${baseUrl}/app/category`,
         NewService: `${baseUrl}/app/news`,
+        BannerService: `${baseUrl}/app/banner`,
         AppTestService: `${baseUrl}/app/test`,
         RecommendedCourseService: `${baseUrl}/app/recommended_level`,
         SettingAppService: `${baseUrl}/app/setting`,
         TargetAppService: `${baseUrl}/app/target`
       },
+      Course: {
+        CategoryService: `${baseUrl}/course/category`,
+        CourseService: `${baseUrl}/course/course`,
+        CourseLessonService: `${baseUrl}/course/course_schedule`,
+        StudentService: `${baseUrl}/course/students`
+      },
       Asset: {
         AllocationDetailService: `${baseUrl}/asset/asset-allocation-detail`,
         BroadcastService: `${baseUrl}/asset/broadcast`,
         EntityAssetService: `${baseUrl}/asset/entity-asset`,
         SubAssetService: `${baseUrl}/asset/sub-asset`
       },
-      Course: {
-        CategoryService: `${baseUrl}/course/category`,
-        ClassesService: `${baseUrl}/course/classes`,
-        ClassesScheduleService: `${baseUrl}/course/classes_schedule`,
-        CourseService: `${baseUrl}/course/course`,
-        CourseScheduleService: `${baseUrl}/course/course_schedule`,
-        StudentsService: `${baseUrl}/course/students`
-      },
       Test: {
         TestService: `${baseUrl}/tests/tests`
       },
@@ -187,23 +186,33 @@ var BaseService = class {
   baseUrl = "";
   headers = {};
   isCache = false;
+  // bật/tắt cache mặc định
   service = null;
-  // nhớ set ở subclass
+  // nhớ gán ở subclass
   timeCache = 300;
   // 300s = 5 phút
   constructor(baseUrl = "", defaultHeaders = {}) {
     this.baseUrl = baseUrl;
-    this.setHeader();
+    this.setHeader(defaultHeaders);
     this.http = axios.create({
       baseURL: this.baseUrl,
       headers: this.headers,
       paramsSerializer: (params) => qs.stringify(params, { arrayFormat: "brackets", encode: true })
     });
   }
-  // Nhận: object headers, hoặc trực tiếp token string ("Bearer x"), hoặc không truyền gì (auto từ ENV)
+  /**
+   * Set header cho request
+   * - headers: object { Authorization: "Bearer x" }
+   * - string: "Bearer x"
+   * - không truyền: dùng token từ ENV
+   */
   setHeader(headers = {}) {
-    var Authorization = `Bearer ${API_MICROSERVICE_TOKEN}`;
-    if (headers && headers.Authorization) Authorization = headers.Authorization;
+    let Authorization = `Bearer ${API_MICROSERVICE_TOKEN}`;
+    if (typeof headers === "string") {
+      Authorization = headers;
+    } else if (headers && headers.Authorization) {
+      Authorization = headers.Authorization;
+    }
     this.headers = {
       ...this.headers || {},
       Authorization
@@ -216,11 +225,12 @@ var BaseService = class {
     const service = this.service || "unknown";
     return `gateway.${service}.urls:${full}`;
   }
-  async request(method, url, options = {}, cacheKey = null) {
-    var _a, _b, _c;
+  async request(method, url, options = {}, cacheKey = null, cacheOption = {}) {
+    var _a, _b;
     const isGet = method.toLowerCase() === "get";
-    if (isGet && this.isCache) {
-      cacheKey = cacheKey ? cacheKey : this.buildCacheKey(url, options.params);
+    const enableCache = cacheOption.isCache ?? this.isCache;
+    if (isGet && enableCache) {
+      cacheKey = cacheKey || this.buildCacheKey(url, options.params);
       const cached = await CONFIG_REDIS.get(cacheKey);
       if (cached) {
         console.log(`[CACHE HIT] ${cacheKey}`);
@@ -228,93 +238,84 @@ var BaseService = class {
       }
     }
     try {
-      if (method.toLowerCase() === "get") {
-        console.log(
-          `[HTTP ${method.toUpperCase()}] ${this.buildGET(
-            url,
-            options.params || {}
-          )} `
-        );
+      if (isGet) {
+        console.log(`[HTTP GET] ${this.buildGET(url, options.params || {})}`);
       }
-      let startTime = Date.now();
+      const startTime = Date.now();
       const res = await this.http.request({
         method,
         url,
-        // dùng path vì đã set baseURL
         headers: this.headers,
         ...options
       });
       const data = res.data;
-      let duration = (Date.now() - startTime) / 1e3;
+      if (isGet && enableCache) {
+        cacheKey = cacheKey || this.buildCacheKey(url, options.params);
+        const ttl = cacheOption.timeCache || this.timeCache;
+        await CONFIG_REDIS.set(cacheKey, JSON.stringify(data), "EX", ttl);
+        console.log(`[CACHE SET] ${cacheKey} - TTL ${ttl}s`);
+      }
+      const duration = (Date.now() - startTime) / 1e3;
       if (duration > 5) {
-        if (method.toLowerCase() === "get") {
-          let q = qs.stringify(options.params || {}, {
-            arrayFormat: "brackets",
-            encode: true
-          });
-          console.log(
-            `[HTTP GET] ${url}${q ? "?" + q : ""} - took ${duration.toFixed(
-              2
-            )}s`
-          );
-        } else {
-          console.log(
-            `[HTTP ${method.toUpperCase()}] ${url} - took ${duration.toFixed(
-              2
-            )}s`
-          );
-        }
+        console.log(
+          `[SLOW ${method.toUpperCase()}] ${url} - ${duration.toFixed(2)}s`
+        );
         if (options.params) console.log("Query:", options.params);
         if (options.data) console.log("Body:", options.data);
       }
       return data;
     } catch (error) {
-      var safeError = {
-        // message: error.message || "Request failed",
+      const safeError = {
         statusCode: ((_a = error.response) == null ? void 0 : _a.status) || 500,
         ...(_b = error.response) == null ? void 0 : _b.data
       };
-      if (safeError.statusCode == 404) {
-        let q = qs.stringify(options.params || {}, {
+      if (safeError.statusCode === 404) {
+        const q = qs.stringify(options.params || {}, {
           arrayFormat: "brackets",
           encode: true
         });
         return {
           statusCode: 404,
           status: "error",
-          messag: `[HTTP  ${method.toUpperCase()}] ${url}${q ? "?" + q : ""} not found`
+          message: `[HTTP ${method.toUpperCase()}] ${url}${q ? "?" + q : ""} not found`
         };
       }
-      console.error(
-        `[${method.toUpperCase()}] ${url} failed:`,
-        safeError,
-        (_c = error.response) == null ? void 0 : _c.data
-      );
-      return {
-        error: true,
-        ...safeError
-      };
+      console.error(`[${method.toUpperCase()}] ${url} failed:`, safeError);
+      return { error: true, ...safeError };
     }
   }
   buildGET(url, params = {}) {
-    let queryString = qs.stringify(params, {
+    const queryString = qs.stringify(params, {
       arrayFormat: "brackets",
       encode: true
     });
     return `${url}${queryString ? "?" + queryString : ""}`;
   }
-  async all(query = {}) {
+  async all(query = {}, cacheOption = {}) {
     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 });
+    return this.request(
+      "get",
+      this.baseUrl,
+      { params: query },
+      null,
+      cacheOption
+    );
   }
-  async detail(id) {
-    const cacheKey = this.isCache ? `gateway.${this.service}.${id}` : null;
-    return this.request("get", `${this.baseUrl}/${id}`);
+  async detail(id, cacheOption = {}) {
+    const enableCache = cacheOption.isCache ?? this.isCache;
+    const cacheKey = enableCache ? `gateway.${this.service}.${id}` : null;
+    return this.request(
+      "get",
+      `${this.baseUrl}/${id}`,
+      {},
+      cacheKey,
+      cacheOption
+    );
   }
   async create(data) {
     return this.request("post", this.baseUrl, { data });