phx-node 1.0.125 → 1.0.127

package/dist/module/cronjob-manager/cronjob-manager.service.d.ts

@@ -1,12 +1,12 @@
 import { PHXCloneCronjob } from "./clone-cronjob.service";
 import { ServiceItem } from "src/lib/types/cronjob-manager";
-import { PHXHostnameService } from "../hostname/hostname.service";
 import { PHXConfigByHostNameService } from "src/module/cronjob-manager/config-by-hostname.service";
+import { SchoolListService } from "./schoollist.service";
 export declare class PHXCronjobManagerService {
     private readonly cloneCronjob;
-    private readonly hostnameService;
     private readonly configByHostNameService;
+    private readonly schoolListService;
     private readonly logger;
-    constructor(cloneCronjob: PHXCloneCronjob, hostnameService: PHXHostnameService, configByHostNameService: PHXConfigByHostNameService);
+    constructor(cloneCronjob: PHXCloneCronjob, configByHostNameService: PHXConfigByHostNameService, schoolListService: SchoolListService);
     init(listService: Array<ServiceItem>): Promise<void>;
 }

package/dist/module/cronjob-manager/cronjob-manager.service.js

@@ -22,13 +22,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PHXCronjobManagerService = void 0;
 const common_1 = require("@nestjs/common");
 const clone_cronjob_service_1 = require("./clone-cronjob.service");
-const hostname_service_1 = require("../hostname/hostname.service");
 const config_by_hostname_service_1 = require("./config-by-hostname.service");
+const schoollist_service_1 = require("./schoollist.service");
+const query_1 = require("./query");
 let PHXCronjobManagerService = PHXCronjobManagerService_1 = class PHXCronjobManagerService {
-    constructor(cloneCronjob, hostnameService, configByHostNameService) {
+    constructor(cloneCronjob, configByHostNameService, schoolListService) {
         this.cloneCronjob = cloneCronjob;
-        this.hostnameService = hostnameService;
         this.configByHostNameService = configByHostNameService;
+        this.schoolListService = schoolListService;
         this.logger = new common_1.Logger(PHXCronjobManagerService_1.name);
     }
     init(listService) {
@@ -40,14 +41,14 @@ let PHXCronjobManagerService = PHXCronjobManagerService_1 = class PHXCronjobMana
                     task: () => __awaiter(this, void 0, void 0, function* () {
                         var _a, _b;
                         const [listHostName, listConfigCronjobByHostname] = yield Promise.all([
-                            this.hostnameService.getListHostname(),
+                            this.schoolListService.getAllSchool(),
                             this.configByHostNameService.getCronConfig(),
                         ]);
                         if (listHostName.length === 0 ||
                             listConfigCronjobByHostname.length === 0) {
                             return;
                         }
-                        for (const { school_code, hostname } of listHostName) {
+                        for (const { hostname, school_id, isTenantMode } of listHostName) {
                             const configItem = listConfigCronjobByHostname.find((item) => (item === null || item === void 0 ? void 0 : item.school.hostname) === hostname);
                             if (!configItem) {
                                 this.logger.error(`Chưa cấu hình cronjob cho hostname: ${hostname}`);
@@ -63,12 +64,13 @@ let PHXCronjobManagerService = PHXCronjobManagerService_1 = class PHXCronjobMana
                             if (!isCronJobEnable)
                                 continue;
                             try {
-                                this.logger.log(`[${hostname}, ${school_code}, ${cronName}] start processing`);
-                                yield taskService.init(hostname);
-                                this.logger.log(`[${hostname}, ${school_code}, ${cronName}] completed`);
+                                this.logger.log(`[${hostname}, ${cronName}] start processing`);
+                                const hostnameRun = isTenantMode ? `${query_1.HOSTNAME_MULTI_TESTING}?tenant_id=${school_id}` : hostname;
+                                yield taskService.init(hostnameRun);
+                                this.logger.log(`[${hostname}, ${cronName}] completed`);
                             }
                             catch (error) {
-                                this.logger.error(`[${hostname}, ${school_code}, ${cronName}] failed`, (error === null || error === void 0 ? void 0 : error.stack) || error);
+                                this.logger.error(`[${hostname}, ${cronName}] failed`, (error === null || error === void 0 ? void 0 : error.stack) || error);
                             }
                         }
                     }),
@@ -81,7 +83,7 @@ exports.PHXCronjobManagerService = PHXCronjobManagerService;
 exports.PHXCronjobManagerService = PHXCronjobManagerService = PHXCronjobManagerService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [clone_cronjob_service_1.PHXCloneCronjob,
-        hostname_service_1.PHXHostnameService,
-        config_by_hostname_service_1.PHXConfigByHostNameService])
+        config_by_hostname_service_1.PHXConfigByHostNameService,
+        schoollist_service_1.SchoolListService])
 ], PHXCronjobManagerService);
 //# sourceMappingURL=cronjob-manager.service.js.map

package/dist/module/cronjob-manager/cronjob-manager.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"cronjob-manager.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/cronjob-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,mEAA0D;AAM1D,mEAAkE;AAClE,6EAAmG;AAG5F,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAGnC,YACmB,YAA6B,EAC7B,eAAmC,EACnC,uBAAmD;QAFnD,iBAAY,GAAZ,YAAY,CAAiB;QAC7B,oBAAe,GAAf,eAAe,CAAoB;QACnC,4BAAuB,GAAvB,uBAAuB,CAA4B;QALrD,WAAM,GAAG,IAAI,eAAM,CAAC,0BAAwB,CAAC,IAAI,CAAC,CAAC;IAMjE,CAAC;IAEE,IAAI,CAAC,WAA+B;;YACxC,KAAK,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,WAAW,EAAE,CAAC;gBAC9D,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;oBAC3B,QAAQ;oBACR,QAAQ;oBACR,IAAI,EAAE,GAAS,EAAE;;wBACf,MAAM,CAAC,YAAY,EAAE,2BAA2B,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CACnE;4BACE,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE;4BACtC,IAAI,CAAC,uBAAuB,CAAC,aAAa,EAAE;yBAC7C,CACF,CAAC;wBAEF,IACE,YAAY,CAAC,MAAM,KAAK,CAAC;4BACzB,2BAA2B,CAAC,MAAM,KAAK,CAAC,EACxC,CAAC;4BACD,OAAO;wBACT,CAAC;wBAED,KAAK,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,YAAY,EAAE,CAAC;4BACrD,MAAM,UAAU,GAAG,2BAA2B,CAAC,IAAI,CACjD,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,QAAQ,MAAK,QAAQ,CAC7C,CAAC;4BAEF,IAAI,CAAC,UAAU,EAAE,CAAC;gCAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,uCAAuC,QAAQ,EAAE,CAClD,CAAC;gCACF,SAAS;4BACX,CAAC;4BAED,MAAM,OAAO,GAAa,UAAU,CAAC,uBAAuB,CAAC,IAAI,CAAC;4BAClE,MAAM,YAAY,GAAG,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,cAAc,mCAAI,EAAE,CAAC;4BAE/D,MAAM,eAAe,GACnB,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC;gCAC9C,OAAO;gCACP,QAAQ;gCACR,YAAY;6BACb,CAAC,CAAC;4BAEL,IAAI,CAAC,eAAe;gCAAE,SAAS;4BAE/B,IAAI,CAAC;gCACH,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,IAAI,QAAQ,KAAK,WAAW,KAAK,QAAQ,oBAAoB,CAC9D,CAAC;gCAEF,MAAM,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gCAEjC,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,IAAI,QAAQ,KAAK,WAAW,KAAK,QAAQ,aAAa,CACvD,CAAC;4BACJ,CAAC;4BAAC,OAAO,KAAK,EAAE,CAAC;gCACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,QAAQ,KAAK,WAAW,KAAK,QAAQ,UAAU,EACnD,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,KAAI,KAAK,CACtB,CAAC;4BACJ,CAAC;wBACH,CAAC;oBACH,CAAC,CAAA;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AA1EY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAKsB,uCAAe;QACZ,qCAAkB;QACV,uDAA0B;GAN3D,wBAAwB,CA0EpC"}
+{"version":3,"file":"cronjob-manager.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/cronjob-manager.service.ts"],"names":[],"mappings":"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"}

package/dist/module/cronjob-manager/query.d.ts

@@ -0,0 +1,2 @@
+export declare const HOSTNAME_MULTI_TESTING = "https://fly.phx-smartschool.com";
+export declare const QUERY_GET_LIST_SCHOOL_MULTI = "\nquery GetListSchoolMainWrapV4 {\n  school(where: {deleted_at: {_is_null: true}}) {\n    id\n    name\n    hostname\n  }\n}";

package/dist/module/cronjob-manager/query.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QUERY_GET_LIST_SCHOOL_MULTI = exports.HOSTNAME_MULTI_TESTING = void 0;
+exports.HOSTNAME_MULTI_TESTING = 'https://fly.phx-smartschool.com';
+exports.QUERY_GET_LIST_SCHOOL_MULTI = `
+query GetListSchoolMainWrapV4 {
+  school(where: {deleted_at: {_is_null: true}}) {
+    id
+    name
+    hostname
+  }
+}`;
+//# sourceMappingURL=query.js.map

package/dist/module/cronjob-manager/query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/query.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,iCAAiC,CAAA;AAC1D,QAAA,2BAA2B,GAAE;;;;;;;EAOxC,CAAA"}

package/dist/module/cronjob-manager/schoollist.service.d.ts

@@ -0,0 +1,16 @@
+import { HttpService } from "@nestjs/axios";
+import { ConfigService } from "@nestjs/config";
+import { PHXGrpcClientSystemService } from "../grpc-client/grpc-client-system.service";
+export declare class SchoolListService {
+    private readonly configService;
+    private readonly httpService;
+    private readonly grpc;
+    private readonly logger;
+    constructor(configService: ConfigService, httpService: HttpService, grpc: PHXGrpcClientSystemService);
+    getAllSchool(): Promise<Array<{
+        hostname: string;
+        school_id: number;
+        isTenantMode?: boolean;
+    }>>;
+    private getListSchoolMultiDB;
+}

package/dist/module/cronjob-manager/schoollist.service.js

@@ -0,0 +1,76 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var SchoolListService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchoolListService = void 0;
+const axios_1 = require("@nestjs/axios");
+const common_1 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
+const query_1 = require("./query");
+const grpc_client_system_service_1 = require("../grpc-client/grpc-client-system.service");
+let SchoolListService = SchoolListService_1 = class SchoolListService {
+    constructor(configService, httpService, grpc) {
+        this.configService = configService;
+        this.httpService = httpService;
+        this.grpc = grpc;
+        this.logger = new common_1.Logger(SchoolListService_1.name);
+    }
+    getAllSchool() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const internalGrpcGateway = this.configService.get("INTERNAL_GRPC_GATEWAY");
+                if (!internalGrpcGateway) {
+                    this.logger.error("INTERNAL_GRPC_GATEWAY is not configured");
+                    return [];
+                }
+                const response = yield this.httpService
+                    .get(`${internalGrpcGateway}/list-school`)
+                    .toPromise();
+                const listSchoolDataCenter = response.data.data || [];
+                const listSchoolMulti = yield this.getListSchoolMultiDB();
+                return [...listSchoolMulti, listSchoolDataCenter];
+            }
+            catch (error) {
+                this.logger.error(`Error occurred while sending request: ${error.message}`, error.stack);
+                return [];
+            }
+        });
+    }
+    getListSchoolMultiDB() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const response = yield this.grpc.query({ query: query_1.QUERY_GET_LIST_SCHOOL_MULTI, hostname: query_1.HOSTNAME_MULTI_TESTING });
+                const school = (response === null || response === void 0 ? void 0 : response.school) || [];
+                return school.map((item) => (Object.assign(Object.assign({}, item), { isTenantMode: true })));
+            }
+            catch (e) {
+                this.logger.error(`Error get list school multi: ${e.message}`, e.stack);
+            }
+        });
+    }
+};
+exports.SchoolListService = SchoolListService;
+exports.SchoolListService = SchoolListService = SchoolListService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [config_1.ConfigService,
+        axios_1.HttpService,
+        grpc_client_system_service_1.PHXGrpcClientSystemService])
+], SchoolListService);
+//# sourceMappingURL=schoollist.service.js.map

package/dist/module/cronjob-manager/schoollist.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schoollist.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/schoollist.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4C;AAC5C,2CAAoD;AACpD,2CAA+C;AAC/C,mCAA4E;AAC5E,0FAAqF;AAG9E,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAE5B,YACmB,aAA4B,EAC5B,WAAwB,EACxB,IAAgC;QAFhC,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,SAAI,GAAJ,IAAI,CAA4B;QAJlC,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;IAK1D,CAAC;IAES,YAAY;;YACvB,IAAI,CAAC;gBACH,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,uBAAuB,CAAC,CAAC;gBACpF,IAAI,CAAC,mBAAmB,EAAE,CAAC;oBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;oBAC7D,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW;qBACpC,GAAG,CAAC,GAAG,mBAAmB,cAAc,CAAC;qBACzC,SAAS,EAAE,CAAC;gBACf,MAAM,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;gBAGtD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;gBAEzD,OAAO,CAAC,GAAG,eAAe,EAAE,oBAAoB,CAAC,CAAC;YACpD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,yCAAyC,KAAK,CAAC,OAAO,EAAE,EACxD,KAAK,CAAC,KAAK,CACZ,CAAC;gBACF,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;KAAA;IAEa,oBAAoB;;YAChC,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,KAAK,EAAE,mCAA2B,EAAE,QAAQ,EAAE,8BAAsB,EAAC,CAAC,CAAA;gBAC9G,MAAM,MAAM,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,EAAE,CAAA;gBACrC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iCAAK,IAAI,KAAE,YAAY,EAAE,IAAI,IAAE,CAAC,CAAA;YAC9D,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,gCAAgC,CAAC,CAAC,OAAO,EAAE,EAC3C,CAAC,CAAC,KAAK,CACV,CAAC;YACJ,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AA9CY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAIuB,sBAAa;QACf,mBAAW;QAClB,uDAA0B;GALxC,iBAAiB,CA8C7B"}

package/dist/query/query.d.ts

@@ -1,5 +1,5 @@
 export declare const querySchoolYear: (isAllTerm: boolean) => string;
 export declare const LIST_ACTIVE_SCHOOL_YEAR_QUERY = "\n  query ListActiveSchoolYear {\n    school_year(\n      where: {\n        start_at: { _lte: \"now\" }\n        end_at: { _gte: \"now\" }\n        deleted_at: { _is_null: true }\n      }\n    ) {\n      id\n      start_at\n      end_at\n      code\n      name\n      school_course {\n        school {\n          id\n          programs(where: { deleted_at: { _is_null: true } }) {\n            id\n            code\n          }\n          educational_levels(where: { deleted_at: { _is_null: true } }) {\n            id\n            code\n          }\n        }\n      }\n      school_terms(\n        where: { deleted_at: { _is_null: true } }\n        order_by: { start_at: asc }\n      ) {\n        id\n        start_at\n        end_at\n        coefficient\n        code\n        name\n      }\n      school_terms_aggregate(where: { deleted_at: { _is_null: true } }) {\n        aggregate {\n          count\n        }\n      }\n    }\n  }\n";
 export declare const ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY = "\n  query ActiveAndNextSchoolYear(\n    $startAt: timestamptz!\n    $endAt: timestamptz!\n    $school_id: Int!\n  ) {\n    school_year(\n      where: {\n        deleted_at: { _is_null: true }\n        start_at: { _lte: $startAt }\n        end_at: { _gte: $endAt }\n        school_course: { school_id: { _eq: $school_id } }\n      }\n      order_by: { id: asc }\n    ) {\n      code\n      end_at\n      id\n      name\n      start_at\n      school_course {\n        course_name\n        id\n        code\n      }\n    }\n  }\n";
-export declare const LIST_ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY = "\nquery GetActiveAndNextSchoolYear($startAt: timestamptz, $endAt: timestamptz) {\n  school_year(where: {deleted_at: {_is_null: true}, start_at: {_lte: $startAt}, end_at: {_gte: $endAt}}, order_by: {id: asc}) {\n    id\n    start_at\n    end_at\n    school_course {\n      school {\n        id\n        programs(where: {deleted_at: {_is_null: true}}) {\n          id\n          code\n        }\n        educational_levels(where: {deleted_at: {_is_null: true}}) {\n          id\n          code\n        }\n      }\n    }\n    school_terms(where: {deleted_at: {_is_null: true}}, order_by: {start_at: asc}) {\n      id\n      start_at\n      end_at\n      coefficient\n    }\n    school_terms_aggregate(where: {deleted_at: {_is_null: true}}) {\n      aggregate {\n        count\n      }\n    }\n  }\n}\n";
+export declare const LIST_ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY = "\nquery GetActiveAndNextSchoolYear($startAt: timestamptz, $endAt: timestamptz) {\n  school_year(where: {deleted_at: {_is_null: true}, start_at: {_lte: $startAt}, end_at: {_gte: $endAt}}, order_by: {id: asc}) {\n    id\n    start_at\n    end_at\n    name\n    school_course {\n      school {\n        id\n        programs(where: {deleted_at: {_is_null: true}}) {\n          id\n          code\n        }\n        educational_levels(where: {deleted_at: {_is_null: true}}) {\n          id\n          code\n        }\n      }\n    }\n    school_terms(where: {deleted_at: {_is_null: true}}, order_by: {start_at: asc}) {\n      id\n      start_at\n      end_at\n      coefficient\n    }\n    school_terms_aggregate(where: {deleted_at: {_is_null: true}}) {\n      aggregate {\n        count\n      }\n    }\n  }\n}\n";
 export declare const LIST_NEXT_SCHOOL_YEAR_QUERY = "\n  query ListNextSchoolYear($nextYearDate: timestamptz!) {\n    school_year(\n      where: {\n        start_at: { _lte: $nextYearDate }\n        end_at: { _gte: $nextYearDate }\n        deleted_at: { _is_null: true }\n      }\n    ) {\n      id\n      start_at\n      end_at\n      school_course {\n        school {\n          id\n          programs(where: { deleted_at: { _is_null: true } }) {\n            id\n            code\n          }\n          educational_levels(where: { deleted_at: { _is_null: true } }) {\n            id\n            code\n          }\n        }\n      }\n      school_terms(\n        where: { deleted_at: { _is_null: true } }\n        order_by: { start_at: asc }\n      ) {\n        id\n        start_at\n        end_at\n        coefficient\n      }\n      school_terms_aggregate(where: { deleted_at: { _is_null: true } }) {\n        aggregate {\n          count\n        }\n      }\n    }\n  }\n";

package/dist/query/query.js

@@ -108,6 +108,7 @@ query GetActiveAndNextSchoolYear($startAt: timestamptz, $endAt: timestamptz) {
     id
     start_at
     end_at
+    name
     school_course {
       school {
         id

package/dist/query/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query/query.ts"],"names":[],"mappings":";;;AAAO,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;8DAgB/C,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oDACnB;;;;;;;;;;CAUL,CAAC;AA3BW,QAAA,eAAe,mBA2B1B;AAGW,QAAA,6BAA6B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6C5C,CAAC;AAGW,QAAA,6CAA6C,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2B5D,CAAC;AAEW,QAAA,kDAAkD,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCjE,CAAC;AAGW,QAAA,2BAA2B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyC1C,CAAC"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query/query.ts"],"names":[],"mappings":";;;AAAO,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;8DAgB/C,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oDACnB;;;;;;;;;;CAUL,CAAC;AA3BW,QAAA,eAAe,mBA2B1B;AAGW,QAAA,6BAA6B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6C5C,CAAC;AAGW,QAAA,6CAA6C,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2B5D,CAAC;AAEW,QAAA,kDAAkD,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiCjE,CAAC;AAGW,QAAA,2BAA2B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyC1C,CAAC"}