phx-node 1.0.31 → 1.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/graphql/graphql-v2.service.js +5 -4
  2. package/dist/graphql/graphql-v2.service.js.map +1 -1
  3. package/dist/index.d.ts +2 -2
  4. package/dist/index.js +3 -3
  5. package/dist/index.js.map +1 -1
  6. package/dist/module/cronjob-manager/clone-cronjob.service.d.ts +4 -4
  7. package/dist/module/cronjob-manager/clone-cronjob.service.js +38 -13
  8. package/dist/module/cronjob-manager/clone-cronjob.service.js.map +1 -1
  9. package/dist/module/cronjob-manager/cronjob-manager.service.d.ts +1 -1
  10. package/dist/module/cronjob-manager/cronjob-manager.service.js +1 -1
  11. package/dist/module/cronjob-manager/cronjob-manager.service.js.map +1 -1
  12. package/dist/module/school-year-v3/activeSchoolYearAndNextYearV3.service.d.ts +4 -2
  13. package/dist/module/school-year-v3/activeSchoolYearAndNextYearV3.service.js +30 -13
  14. package/dist/module/school-year-v3/activeSchoolYearAndNextYearV3.service.js.map +1 -1
  15. package/dist/module/school-year-v3/listActiveSchoolYearAndNextYearV3.service.d.ts +4 -2
  16. package/dist/module/school-year-v3/listActiveSchoolYearAndNextYearV3.service.js +28 -12
  17. package/dist/module/school-year-v3/listActiveSchoolYearAndNextYearV3.service.js.map +1 -1
  18. package/dist/module/school-year-v3/listActiveShoolYearV3.service.d.ts +4 -2
  19. package/dist/module/school-year-v3/listActiveShoolYearV3.service.js +20 -6
  20. package/dist/module/school-year-v3/listActiveShoolYearV3.service.js.map +1 -1
  21. package/dist/module/school-year-v3/listNextSchoolYearV3.service.d.ts +4 -2
  22. package/dist/module/school-year-v3/listNextSchoolYearV3.service.js +26 -11
  23. package/dist/module/school-year-v3/listNextSchoolYearV3.service.js.map +1 -1
  24. package/dist/module/school-year-v3/schoolYearV3.service.d.ts +4 -2
  25. package/dist/module/school-year-v3/schoolYearV3.service.js +38 -18
  26. package/dist/module/school-year-v3/schoolYearV3.service.js.map +1 -1
  27. package/dist/module/student_info/student-info-v3.service.d.ts +4 -2
  28. package/dist/module/student_info/student-info-v3.service.js +34 -14
  29. package/dist/module/student_info/student-info-v3.service.js.map +1 -1
  30. package/dist/phx.module.d.ts +3 -4
  31. package/dist/phx.module.js +29 -15
  32. package/dist/phx.module.js.map +1 -1
  33. package/dist/sentry-config/sentry-monitor.d.ts +1 -0
  34. package/dist/sentry-config/sentry-monitor.js +58 -0
  35. package/dist/sentry-config/sentry-monitor.js.map +1 -0
  36. package/dist/tsconfig.tsbuildinfo +1 -1
  37. package/package.json +3 -2
  38. package/dist/module/sentry/sentry.service.d.ts +0 -6
  39. package/dist/module/sentry/sentry.service.js +0 -88
  40. package/dist/module/sentry/sentry.service.js.map +0 -1
@@ -27,15 +27,16 @@ const graphql_request_1 = require("graphql-request");
27
27
  const constant_1 = require("../lib/constant");
28
28
  let PHXGraphqlV2Service = class PHXGraphqlV2Service {
29
29
  constructor(envConfig) {
30
+ var _a, _b, _c, _d;
30
31
  this.envConfig = envConfig;
31
- this.graphQLQuery = new graphql_request_1.GraphQLClient(this.envConfig.graphQlApi, {
32
+ this.graphQLQuery = new graphql_request_1.GraphQLClient((_a = this.envConfig) === null || _a === void 0 ? void 0 : _a.graphQlApi, {
32
33
  headers: {
33
- "x-hasura-admin-secret": this.envConfig.secretKey,
34
+ "x-hasura-admin-secret": (_b = this.envConfig) === null || _b === void 0 ? void 0 : _b.secretKey,
34
35
  },
35
36
  });
36
- this.graphQLMutation = new graphql_request_1.GraphQLClient(this.envConfig.graphQlApi, {
37
+ this.graphQLMutation = new graphql_request_1.GraphQLClient((_c = this.envConfig) === null || _c === void 0 ? void 0 : _c.graphQlApi, {
37
38
  headers: {
38
- "x-hasura-admin-secret": this.envConfig.secretKey,
39
+ "x-hasura-admin-secret": (_d = this.envConfig) === null || _d === void 0 ? void 0 : _d.secretKey,
39
40
  },
40
41
  });
41
42
  }
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-v2.service.js","sourceRoot":"","sources":["../../src/graphql/graphql-v2.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA8D;AAC9D,qDAAgD;AAChD,8CAAkD;AAI3C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAI9B,YAGU,SAAuB;QAAvB,cAAS,GAAT,SAAS,CAAc;QAE/B,IAAI,CAAC,YAAY,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE;YAC/D,OAAO,EAAE;gBACP,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS;aAClD;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE;YAClE,OAAO,EAAE;gBACP,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS;aAClD;SACF,CAAC,CAAC;IACL,CAAC;IAEY,KAAK,CAAC,KAAa,EAAE,SAAe;;YAC/C,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3D,CAAC;KAAA;IAEY,QAAQ,CAAC,KAAa,EAAE,SAAe;;YAClD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC9D,CAAC;KAAA;CACF,CAAA;AA7BY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,yBAAc,CAAC,CAAA;IACtB,WAAA,IAAA,iBAAQ,GAAE,CAAA;;GANF,mBAAmB,CA6B/B"}
1
+ {"version":3,"file":"graphql-v2.service.js","sourceRoot":"","sources":["../../src/graphql/graphql-v2.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA8D;AAC9D,qDAAgD;AAChD,8CAAkD;AAI3C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAI9B,YAGU,SAAuB;;QAAvB,cAAS,GAAT,SAAS,CAAc;QAE/B,IAAI,CAAC,YAAY,GAAG,IAAI,+BAAa,CAAC,MAAA,IAAI,CAAC,SAAS,0CAAE,UAAU,EAAE;YAChE,OAAO,EAAE;gBACP,uBAAuB,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS;aACnD;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,IAAI,+BAAa,CAAC,MAAA,IAAI,CAAC,SAAS,0CAAE,UAAU,EAAE;YACnE,OAAO,EAAE;gBACP,uBAAuB,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,SAAS;aACnD;SACF,CAAC,CAAC;IACL,CAAC;IAEY,KAAK,CAAC,KAAa,EAAE,SAAe;;YAC/C,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3D,CAAC;KAAA;IAEY,QAAQ,CAAC,KAAa,EAAE,SAAe;;YAClD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC9D,CAAC;KAAA;CACF,CAAA;AA7BY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,yBAAc,CAAC,CAAA;IACtB,WAAA,IAAA,iBAAQ,GAAE,CAAA;;GANF,mBAAmB,CA6B/B"}
package/dist/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
+ import { runWithSentryCheckIn } from "src/sentry-config/sentry-monitor";
1
2
  import { PHXGraphqlV2Service } from "src/graphql/graphql-v2.service";
2
- import { PHXSentryMonitorService } from "./module/sentry/sentry.service";
3
3
  import { PHXCloneCronjob } from "./module/cronjob-manager/clone-cronjob.service";
4
4
  import { PHXCronjobManagerService } from "./module/cronjob-manager/cronjob-manager.service";
5
5
  import { PHXDevToolDataService } from "./module/dev-tool-data/dev-tool-data.service";
@@ -21,4 +21,4 @@ import { GetListActiveSchoolYearAndNextYearServiceV3 } from "./module/school-yea
21
21
  import { GetListActiveSchoolYearServiceV3 } from "./module/school-year-v3/listActiveShoolYearV3.service";
22
22
  import { GetListNextSchoolYearServiceV3 } from "./module/school-year-v3/listNextSchoolYearV3.service";
23
23
  import { GetSchoolYearServiceV3 } from "./module/school-year-v3/schoolYearV3.service";
24
- export { PHXNestModule, GetSchoolYearService, GetListActiveSchoolYearService, GetActiveSchoolYearAndNextYearService, GetListActiveSchoolYearAndNextYearService, GetListNextSchoolYearService, PHXGraphqlService, PHXGraphqlV2Service, ApiService, PHXStudentInfoService, PHXDateHelpers, PHXGrpcClientService, PHXGrpcClientSystemService, PHXStudentInfoServiceV3, GetActiveSchoolYearAndNextYearServiceV3, GetListActiveSchoolYearAndNextYearServiceV3, GetListActiveSchoolYearServiceV3, GetListNextSchoolYearServiceV3, GetSchoolYearServiceV3, PHXDevToolDataService, PHXCronjobManagerService, PHXCloneCronjob, PHXSentryMonitorService, };
24
+ export { PHXNestModule, GetSchoolYearService, GetListActiveSchoolYearService, GetActiveSchoolYearAndNextYearService, GetListActiveSchoolYearAndNextYearService, GetListNextSchoolYearService, PHXGraphqlService, PHXGraphqlV2Service, ApiService, PHXStudentInfoService, PHXDateHelpers, PHXGrpcClientService, PHXGrpcClientSystemService, PHXStudentInfoServiceV3, GetActiveSchoolYearAndNextYearServiceV3, GetListActiveSchoolYearAndNextYearServiceV3, GetListActiveSchoolYearServiceV3, GetListNextSchoolYearServiceV3, GetSchoolYearServiceV3, PHXDevToolDataService, PHXCronjobManagerService, PHXCloneCronjob, runWithSentryCheckIn, };
package/dist/index.js CHANGED
@@ -1,10 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.PHXSentryMonitorService = exports.PHXCloneCronjob = exports.PHXCronjobManagerService = exports.PHXDevToolDataService = exports.GetSchoolYearServiceV3 = exports.GetListNextSchoolYearServiceV3 = exports.GetListActiveSchoolYearServiceV3 = exports.GetListActiveSchoolYearAndNextYearServiceV3 = exports.GetActiveSchoolYearAndNextYearServiceV3 = exports.PHXStudentInfoServiceV3 = exports.PHXGrpcClientSystemService = exports.PHXGrpcClientService = exports.PHXDateHelpers = exports.PHXStudentInfoService = exports.ApiService = exports.PHXGraphqlV2Service = exports.PHXGraphqlService = exports.GetListNextSchoolYearService = exports.GetListActiveSchoolYearAndNextYearService = exports.GetActiveSchoolYearAndNextYearService = exports.GetListActiveSchoolYearService = exports.GetSchoolYearService = exports.PHXNestModule = void 0;
3
+ exports.runWithSentryCheckIn = exports.PHXCloneCronjob = exports.PHXCronjobManagerService = exports.PHXDevToolDataService = exports.GetSchoolYearServiceV3 = exports.GetListNextSchoolYearServiceV3 = exports.GetListActiveSchoolYearServiceV3 = exports.GetListActiveSchoolYearAndNextYearServiceV3 = exports.GetActiveSchoolYearAndNextYearServiceV3 = exports.PHXStudentInfoServiceV3 = exports.PHXGrpcClientSystemService = exports.PHXGrpcClientService = exports.PHXDateHelpers = exports.PHXStudentInfoService = exports.ApiService = exports.PHXGraphqlV2Service = exports.PHXGraphqlService = exports.GetListNextSchoolYearService = exports.GetListActiveSchoolYearAndNextYearService = exports.GetActiveSchoolYearAndNextYearService = exports.GetListActiveSchoolYearService = exports.GetSchoolYearService = exports.PHXNestModule = void 0;
4
+ const sentry_monitor_1 = require("./sentry-config/sentry-monitor");
5
+ Object.defineProperty(exports, "runWithSentryCheckIn", { enumerable: true, get: function () { return sentry_monitor_1.runWithSentryCheckIn; } });
4
6
  const graphql_v2_service_1 = require("./graphql/graphql-v2.service");
5
7
  Object.defineProperty(exports, "PHXGraphqlV2Service", { enumerable: true, get: function () { return graphql_v2_service_1.PHXGraphqlV2Service; } });
6
- const sentry_service_1 = require("./module/sentry/sentry.service");
7
- Object.defineProperty(exports, "PHXSentryMonitorService", { enumerable: true, get: function () { return sentry_service_1.PHXSentryMonitorService; } });
8
8
  const clone_cronjob_service_1 = require("./module/cronjob-manager/clone-cronjob.service");
9
9
  Object.defineProperty(exports, "PHXCloneCronjob", { enumerable: true, get: function () { return clone_cronjob_service_1.PHXCloneCronjob; } });
10
10
  const cronjob_manager_service_1 = require("./module/cronjob-manager/cronjob-manager.service");
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qEAAqE;AAgCnE,oGAhCO,wCAAmB,OAgCP;AA/BrB,mEAAyE;AA8CvE,wGA9CO,wCAAuB,OA8CP;AA7CzB,0FAAiF;AA4C/E,gGA5CO,uCAAe,OA4CP;AA3CjB,8FAA4F;AA0C1F,yGA1CO,kDAAwB,OA0CP;AAzC1B,wFAAqF;AAwCnF,sGAxCO,6CAAqB,OAwCP;AAvCvB,gGAA6F;AAgC3F,2GAhCO,uDAA0B,OAgCP;AA/B5B,8EAA0E;AA6BxE,+FA7BO,gCAAc,OA6BP;AA5BhB,qFAAmF;AA2BjF,sGA3BO,4CAAqB,OA2BP;AA1BvB,0DAAsD;AAyBpD,2FAzBO,wBAAU,OAyBP;AAxBZ,6CAA6C;AAgB3C,8FAhBO,0BAAa,OAgBP;AAff,+DAA8D;AAqB5D,kGArBO,mCAAiB,OAqBP;AApBnB,gGAA+F;AAmB7F,6GAnBO,yDAA4B,OAmBP;AAlB9B,gFAA+E;AAc7E,qGAdO,yCAAoB,OAcP;AAbtB,kGAAkG;AAchG,+GAdO,4DAA8B,OAcP;AAbhC,kHAAiH;AAc/G,sHAdO,2EAAqC,OAcP;AAbvC,0HAAyH;AAcvH,0HAdO,mFAAyC,OAcP;AAb3C,kFAAgF;AAoB9E,qGApBO,0CAAoB,OAoBP;AAnBtB,2FAAwF;AAqBtF,wGArBO,iDAAuB,OAqBP;AApBzB,yHAAwH;AAqBtH,wHArBO,+EAAuC,OAqBP;AApBzC,iIAAgI;AAqB9H,4HArBO,uFAA2C,OAqBP;AApB7C,yGAAyG;AAqBvG,iHArBO,gEAAgC,OAqBP;AApBlC,uGAAsG;AAqBpG,+GArBO,6DAA8B,OAqBP;AApBhC,uFAAsF;AAqBpF,uGArBO,6CAAsB,OAqBP"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mEAAwE;AA+CtE,qGA/CO,qCAAoB,OA+CP;AA9CtB,qEAAqE;AA+BnE,oGA/BO,wCAAmB,OA+BP;AA9BrB,0FAAiF;AA4C/E,gGA5CO,uCAAe,OA4CP;AA3CjB,8FAA4F;AA0C1F,yGA1CO,kDAAwB,OA0CP;AAzC1B,wFAAqF;AAwCnF,sGAxCO,6CAAqB,OAwCP;AAvCvB,gGAA6F;AAgC3F,2GAhCO,uDAA0B,OAgCP;AA/B5B,8EAA0E;AA6BxE,+FA7BO,gCAAc,OA6BP;AA5BhB,qFAAmF;AA2BjF,sGA3BO,4CAAqB,OA2BP;AA1BvB,0DAAsD;AAyBpD,2FAzBO,wBAAU,OAyBP;AAxBZ,6CAA6C;AAgB3C,8FAhBO,0BAAa,OAgBP;AAff,+DAA8D;AAqB5D,kGArBO,mCAAiB,OAqBP;AApBnB,gGAA+F;AAmB7F,6GAnBO,yDAA4B,OAmBP;AAlB9B,gFAA+E;AAc7E,qGAdO,yCAAoB,OAcP;AAbtB,kGAAkG;AAchG,+GAdO,4DAA8B,OAcP;AAbhC,kHAAiH;AAc/G,sHAdO,2EAAqC,OAcP;AAbvC,0HAAyH;AAcvH,0HAdO,mFAAyC,OAcP;AAb3C,kFAAgF;AAoB9E,qGApBO,0CAAoB,OAoBP;AAnBtB,2FAAwF;AAqBtF,wGArBO,iDAAuB,OAqBP;AApBzB,yHAAwH;AAqBtH,wHArBO,+EAAuC,OAqBP;AApBzC,iIAAgI;AAqB9H,4HArBO,uFAA2C,OAqBP;AApB7C,yGAAyG;AAqBvG,iHArBO,gEAAgC,OAqBP;AApBlC,uGAAsG;AAqBpG,+GArBO,6DAA8B,OAqBP;AApBhC,uFAAsF;AAqBpF,uGArBO,6CAAsB,OAqBP"}
@@ -1,9 +1,9 @@
1
1
  import { SchedulerRegistry } from "@nestjs/schedule";
2
- import { PHXSentryMonitorService } from "../sentry/sentry.service";
3
2
  import { CreateCronjobSettings } from "src/lib/types/cronjob-manager";
4
3
  export declare class PHXCloneCronjob {
5
4
  private readonly schedulerRegistry;
6
- private readonly sentryService;
7
- constructor(schedulerRegistry: SchedulerRegistry, sentryService: PHXSentryMonitorService);
8
- init(cronjobSettings: CreateCronjobSettings): void;
5
+ private readonly logger;
6
+ constructor(schedulerRegistry: SchedulerRegistry);
7
+ init(cronjobSettings: CreateCronjobSettings): Promise<void>;
8
+ private checkInSentry;
9
9
  }
@@ -8,31 +8,56 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
12
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
13
+ return new (P || (P = Promise))(function (resolve, reject) {
14
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
15
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
16
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
17
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
18
+ });
19
+ };
20
+ var PHXCloneCronjob_1;
11
21
  Object.defineProperty(exports, "__esModule", { value: true });
12
22
  exports.PHXCloneCronjob = void 0;
13
23
  const common_1 = require("@nestjs/common");
14
24
  const schedule_1 = require("@nestjs/schedule");
15
25
  const cron_1 = require("cron");
16
- const sentry_service_1 = require("../sentry/sentry.service");
17
- let PHXCloneCronjob = class PHXCloneCronjob {
18
- constructor(schedulerRegistry, sentryService) {
26
+ const sentry_monitor_1 = require("../../sentry-config/sentry-monitor");
27
+ let PHXCloneCronjob = PHXCloneCronjob_1 = class PHXCloneCronjob {
28
+ constructor(schedulerRegistry) {
19
29
  this.schedulerRegistry = schedulerRegistry;
20
- this.sentryService = sentryService;
30
+ this.logger = new common_1.Logger(PHXCloneCronjob_1.name);
21
31
  }
22
32
  init(cronjobSettings) {
23
- const { cronTime, cronName, schoolCode, hostName, taskService, monitorConfig, } = cronjobSettings;
24
- const job = new cron_1.CronJob(`${cronTime}`, () => {
25
- const monitorSlug = `${schoolCode.toLowerCase()}-${cronName}`;
26
- this.sentryService.checkInSentry(cronTime, taskService, monitorConfig, monitorSlug, hostName);
33
+ return __awaiter(this, void 0, void 0, function* () {
34
+ const { cronTime, cronName, schoolCode, hostName, taskService, monitorConfig, } = cronjobSettings;
35
+ const job = new cron_1.CronJob(`${cronTime}`, () => {
36
+ const monitorSlug = `${schoolCode.toLowerCase()}-${cronName}`;
37
+ this.checkInSentry(cronTime, taskService, monitorConfig, monitorSlug, hostName, this.logger);
38
+ });
39
+ this.schedulerRegistry.addCronJob(`${schoolCode}_${cronName}`, job);
40
+ job.start();
41
+ });
42
+ }
43
+ checkInSentry(cronTime, taskService, monitorConfig, monitorSlug, hostName, logger) {
44
+ return __awaiter(this, void 0, void 0, function* () {
45
+ try {
46
+ const cronTask = () => __awaiter(this, void 0, void 0, function* () {
47
+ logger.log(`[${monitorSlug}] cron job is running...`);
48
+ yield taskService.init(hostName);
49
+ });
50
+ yield (0, sentry_monitor_1.runWithSentryCheckIn)(monitorSlug, cronTime, cronTask, monitorConfig);
51
+ }
52
+ catch (err) {
53
+ logger.error(err);
54
+ }
27
55
  });
28
- this.schedulerRegistry.addCronJob(`${schoolCode}_${cronName}`, job);
29
- job.start();
30
56
  }
31
57
  };
32
58
  exports.PHXCloneCronjob = PHXCloneCronjob;
33
- exports.PHXCloneCronjob = PHXCloneCronjob = __decorate([
59
+ exports.PHXCloneCronjob = PHXCloneCronjob = PHXCloneCronjob_1 = __decorate([
34
60
  (0, common_1.Injectable)(),
35
- __metadata("design:paramtypes", [schedule_1.SchedulerRegistry,
36
- sentry_service_1.PHXSentryMonitorService])
61
+ __metadata("design:paramtypes", [schedule_1.SchedulerRegistry])
37
62
  ], PHXCloneCronjob);
38
63
  //# sourceMappingURL=clone-cronjob.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"clone-cronjob.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/clone-cronjob.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAAqD;AACrD,+BAA+B;AAC/B,6DAAmE;AAG5D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACmB,iBAAoC,EACpC,aAAsC;QADtC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,kBAAa,GAAb,aAAa,CAAyB;IACtD,CAAC;IAaJ,IAAI,CAAC,eAAsC;QACzC,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,WAAW,EACX,aAAa,GACd,GAAG,eAAe,CAAC;QAEpB,MAAM,GAAG,GAAG,IAAI,cAAO,CAAC,GAAG,QAAQ,EAAE,EAAE,GAAG,EAAE;YAC1C,MAAM,WAAW,GAAW,GAAG,UAAU,CAAC,WAAW,EAAE,IAAI,QAAQ,EAAE,CAAC;YAGtE,IAAI,CAAC,aAAa,CAAC,aAAa,CAC9B,QAAQ,EACR,WAAW,EACX,aAAa,EACb,WAAW,EACX,QAAQ,CACT,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,UAAU,IAAI,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;QACpE,GAAG,CAAC,KAAK,EAAE,CAAC;IACd,CAAC;CACF,CAAA;AA3CY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAG2B,4BAAiB;QACrB,wCAAuB;GAH9C,eAAe,CA2C3B"}
1
+ {"version":3,"file":"clone-cronjob.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/clone-cronjob.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+CAAqD;AACrD,+BAA+B;AAG/B,uEAAwE;AAEjE,IAAM,eAAe,uBAArB,MAAM,eAAe;IAE1B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QADhD,WAAM,GAAG,IAAI,eAAM,CAAC,iBAAe,CAAC,IAAI,CAAC,CAAC;IACS,CAAC;IAa/D,IAAI,CAAC,eAAsC;;YAC/C,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,WAAW,EACX,aAAa,GACd,GAAG,eAAe,CAAC;YAEpB,MAAM,GAAG,GAAG,IAAI,cAAO,CAAC,GAAG,QAAQ,EAAE,EAAE,GAAG,EAAE;gBAC1C,MAAM,WAAW,GAAW,GAAG,UAAU,CAAC,WAAW,EAAE,IAAI,QAAQ,EAAE,CAAC;gBAGtE,IAAI,CAAC,aAAa,CAChB,QAAQ,EACR,WAAW,EACX,aAAa,EACb,WAAW,EACX,QAAQ,EACR,IAAI,CAAC,MAAM,CACZ,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,UAAU,IAAI,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;YACpE,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC;KAAA;IAEa,aAAa,CACzB,QAAgB,EAChB,WAAgB,EAChB,aAAkC,EAClC,WAAmB,EACnB,QAAgB,EAChB,MAAW;;YAEX,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,GAAS,EAAE;oBAC1B,MAAM,CAAC,GAAG,CAAC,IAAI,WAAW,0BAA0B,CAAC,CAAC;oBACtD,MAAM,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnC,CAAC,CAAA,CAAC;gBAEF,MAAM,IAAA,qCAAoB,EACxB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,aAAa,CACd,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AAnEY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAGqC,4BAAiB;GAFtD,eAAe,CAmE3B"}
@@ -5,5 +5,5 @@ export declare class PHXCronjobManagerService {
5
5
  private readonly cloneCronjob;
6
6
  private readonly devToolDataService;
7
7
  constructor(cloneCronjob: PHXCloneCronjob, devToolDataService: PHXDevToolDataService);
8
- startCronJobsForAllSchools(listService: Array<ServiceItem>): Promise<void>;
8
+ init(listService: Array<ServiceItem>): Promise<void>;
9
9
  }
@@ -27,7 +27,7 @@ let PHXCronjobManagerService = class PHXCronjobManagerService {
27
27
  this.cloneCronjob = cloneCronjob;
28
28
  this.devToolDataService = devToolDataService;
29
29
  }
30
- startCronJobsForAllSchools(listService) {
30
+ init(listService) {
31
31
  return __awaiter(this, void 0, void 0, function* () {
32
32
  const listHostName = yield this.devToolDataService.getListHostName();
33
33
  const hostNameLength = listHostName.length;
@@ -1 +1 @@
1
- {"version":3,"file":"cronjob-manager.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/cronjob-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mEAA0D;AAC1D,kFAA+E;AAIxE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACnC,YACmB,YAA6B,EAC7B,kBAAyC;QADzC,iBAAY,GAAZ,YAAY,CAAiB;QAC7B,uBAAkB,GAAlB,kBAAkB,CAAuB;IACzD,CAAC;IAEE,0BAA0B,CAAC,WAA+B;;YAC9D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,CAAC;YACrE,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CAAC;YAC3C,IAAI,cAAc,KAAK,CAAC;gBAAE,OAAO;YAGjC,KAAK,MAAM,YAAY,IAAI,YAAY,EAAE,CAAC;gBACxC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;gBAE/C,WAAW,CAAC,OAAO,CACjB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;oBACrD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;wBACrB,QAAQ;wBACR,UAAU,EAAE,WAAW;wBACvB,QAAQ,EAAE,QAAQ;wBAClB,QAAQ;wBACR,WAAW;wBACX,aAAa;qBACd,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AA7BY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAGsB,uCAAe;QACT,6CAAqB;GAHjD,wBAAwB,CA6BpC"}
1
+ {"version":3,"file":"cronjob-manager.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/cronjob-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mEAA0D;AAC1D,kFAA+E;AAIxE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACnC,YACmB,YAA6B,EAC7B,kBAAyC;QADzC,iBAAY,GAAZ,YAAY,CAAiB;QAC7B,uBAAkB,GAAlB,kBAAkB,CAAuB;IACzD,CAAC;IAEE,IAAI,CAAC,WAA+B;;YACxC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,CAAC;YACrE,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CAAC;YAC3C,IAAI,cAAc,KAAK,CAAC;gBAAE,OAAO;YAGjC,KAAK,MAAM,YAAY,IAAI,YAAY,EAAE,CAAC;gBACxC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;gBAE/C,WAAW,CAAC,OAAO,CACjB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;oBACrD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;wBACrB,QAAQ;wBACR,UAAU,EAAE,WAAW;wBACvB,QAAQ,EAAE,QAAQ;wBAClB,QAAQ;wBACR,WAAW;wBACX,aAAa;qBACd,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AA7BY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAGsB,uCAAe;QACT,6CAAqB;GAHjD,wBAAwB,CA6BpC"}
@@ -1,7 +1,9 @@
1
1
  import { PHXGrpcClientService } from "../grpc-client/grpc-client.service";
2
+ import { PHXGrpcClientSystemService } from "../grpc-client/grpc-client-system.service";
2
3
  export declare class GetActiveSchoolYearAndNextYearServiceV3 {
3
4
  private readonly grpcService;
4
- constructor(grpcService: PHXGrpcClientService);
5
+ private readonly grpcSystemService;
6
+ constructor(grpcService: PHXGrpcClientService, grpcSystemService: PHXGrpcClientSystemService);
5
7
  private getSchoolYear;
6
- get(school_id: number): Promise<any>;
8
+ get(school_id: number, hostname?: string): Promise<any>;
7
9
  }
@@ -23,30 +23,46 @@ const common_1 = require("@nestjs/common");
23
23
  const helper_1 = require("../../lib/helper");
24
24
  const query_1 = require("../../query/query");
25
25
  const grpc_client_service_1 = require("../grpc-client/grpc-client.service");
26
+ const grpc_client_system_service_1 = require("../grpc-client/grpc-client-system.service");
26
27
  let GetActiveSchoolYearAndNextYearServiceV3 = class GetActiveSchoolYearAndNextYearServiceV3 {
27
- constructor(grpcService) {
28
+ constructor(grpcService, grpcSystemService) {
28
29
  this.grpcService = grpcService;
30
+ this.grpcSystemService = grpcSystemService;
29
31
  }
30
- getSchoolYear(school_id) {
32
+ getSchoolYear(school_id, hostname) {
31
33
  return __awaiter(this, void 0, void 0, function* () {
32
- const res = yield this.grpcService.query({
33
- query: query_1.ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY,
34
- variables: {
35
- startAt: helper_1.nextYearDate,
36
- endAt: helper_1.timeYearActive,
37
- school_id,
38
- }
39
- });
34
+ let res;
35
+ if (hostname) {
36
+ res = yield this.grpcSystemService.query({
37
+ query: query_1.ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY,
38
+ variables: {
39
+ startAt: helper_1.nextYearDate,
40
+ endAt: helper_1.timeYearActive,
41
+ school_id,
42
+ },
43
+ hostname,
44
+ });
45
+ }
46
+ else {
47
+ res = yield this.grpcService.query({
48
+ query: query_1.ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY,
49
+ variables: {
50
+ startAt: helper_1.nextYearDate,
51
+ endAt: helper_1.timeYearActive,
52
+ school_id,
53
+ },
54
+ });
55
+ }
40
56
  if (res)
41
57
  return res;
42
58
  else
43
59
  return {};
44
60
  });
45
61
  }
46
- get(school_id) {
62
+ get(school_id, hostname) {
47
63
  return __awaiter(this, void 0, void 0, function* () {
48
64
  try {
49
- return yield this.getSchoolYear(school_id);
65
+ return yield this.getSchoolYear(school_id, hostname);
50
66
  }
51
67
  catch (error) {
52
68
  console.log(`error query get active school_year and next school_year: ${new Date()}-${error}`);
@@ -58,6 +74,7 @@ let GetActiveSchoolYearAndNextYearServiceV3 = class GetActiveSchoolYearAndNextYe
58
74
  exports.GetActiveSchoolYearAndNextYearServiceV3 = GetActiveSchoolYearAndNextYearServiceV3;
59
75
  exports.GetActiveSchoolYearAndNextYearServiceV3 = GetActiveSchoolYearAndNextYearServiceV3 = __decorate([
60
76
  (0, common_1.Injectable)(),
61
- __metadata("design:paramtypes", [grpc_client_service_1.PHXGrpcClientService])
77
+ __metadata("design:paramtypes", [grpc_client_service_1.PHXGrpcClientService,
78
+ grpc_client_system_service_1.PHXGrpcClientSystemService])
62
79
  ], GetActiveSchoolYearAndNextYearServiceV3);
63
80
  //# sourceMappingURL=activeSchoolYearAndNextYearV3.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"activeSchoolYearAndNextYearV3.service.js","sourceRoot":"","sources":["../../../src/module/school-year-v3/activeSchoolYearAndNextYearV3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,6CAA4D;AAC5D,6CAA8E;AAC9E,4EAA0E;AAInE,IAAM,uCAAuC,GAA7C,MAAM,uCAAuC;IAClD,YAA6B,WAAiC;QAAjC,gBAAW,GAAX,WAAW,CAAsB;IAAG,CAAC;IAEpD,aAAa,CAAC,SAAiB;;YAC3C,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBAC5C,KAAK,EAAE,qDAA6C;gBACpD,SAAS,EAAE;oBACT,OAAO,EAAE,qBAAY;oBACrB,KAAK,EAAE,uBAAc;oBACrB,SAAS;iBACV;aAAC,CACH,CAAC;YACF,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;;gBACf,OAAO,EAAE,CAAC;QACjB,CAAC;KAAA;IAEY,GAAG,CAAC,SAAiB;;YAChC,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CACT,4DAA4D,IAAI,IAAI,EAAE,IAAI,KAAK,EAAE,CAClF,CAAC;gBACF,OAAO;YACT,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AA1BY,0FAAuC;kDAAvC,uCAAuC;IAFnD,IAAA,mBAAU,GAAE;qCAG+B,0CAAoB;GADnD,uCAAuC,CA0BnD"}
1
+ {"version":3,"file":"activeSchoolYearAndNextYearV3.service.js","sourceRoot":"","sources":["../../../src/module/school-year-v3/activeSchoolYearAndNextYearV3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAA8D;AAC9D,6CAAgF;AAChF,4EAA0E;AAC1E,0FAAuF;AAIhF,IAAM,uCAAuC,GAA7C,MAAM,uCAAuC;IAClD,YACmB,WAAiC,EACjC,iBAA6C;QAD7C,gBAAW,GAAX,WAAW,CAAsB;QACjC,sBAAiB,GAAjB,iBAAiB,CAA4B;IAC7D,CAAC;IAEU,aAAa,CAAC,SAAiB,EAAE,QAAiB;;YAC9D,IAAI,GAAQ,CAAC;YACb,IAAI,QAAQ,EAAE,CAAC;gBACb,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;oBACvC,KAAK,EAAE,qDAA6C;oBACpD,SAAS,EAAE;wBACT,OAAO,EAAE,qBAAY;wBACrB,KAAK,EAAE,uBAAc;wBACrB,SAAS;qBACV;oBACD,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;oBACjC,KAAK,EAAE,qDAA6C;oBACpD,SAAS,EAAE;wBACT,OAAO,EAAE,qBAAY;wBACrB,KAAK,EAAE,uBAAc;wBACrB,SAAS;qBACV;iBACF,CAAC,CAAC;YACL,CAAC;YACD,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;;gBACf,OAAO,EAAE,CAAC;QACjB,CAAC;KAAA;IAEY,GAAG,CAAC,SAAiB,EAAE,QAAiB;;YACnD,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YACvD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CACT,4DAA4D,IAAI,IAAI,EAAE,IAAI,KAAK,EAAE,CAClF,CAAC;gBACF,OAAO;YACT,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AA1CY,0FAAuC;kDAAvC,uCAAuC;IAFnD,IAAA,mBAAU,GAAE;qCAIqB,0CAAoB;QACd,uDAA0B;GAHrD,uCAAuC,CA0CnD"}
@@ -1,7 +1,9 @@
1
1
  import { PHXGrpcClientService } from "../grpc-client/grpc-client.service";
2
+ import { PHXGrpcClientSystemService } from "../grpc-client/grpc-client-system.service";
2
3
  export declare class GetListActiveSchoolYearAndNextYearServiceV3 {
3
4
  private readonly grpcService;
4
- constructor(grpcService: PHXGrpcClientService);
5
+ private readonly grpcSystemService;
6
+ constructor(grpcService: PHXGrpcClientService, grpcSystemService: PHXGrpcClientSystemService);
5
7
  private getSchoolYear;
6
- get(): Promise<any>;
8
+ get(hostname?: string): Promise<any>;
7
9
  }
@@ -23,29 +23,44 @@ const common_1 = require("@nestjs/common");
23
23
  const helper_1 = require("../../lib/helper");
24
24
  const query_1 = require("../../query/query");
25
25
  const grpc_client_service_1 = require("../grpc-client/grpc-client.service");
26
+ const grpc_client_system_service_1 = require("../grpc-client/grpc-client-system.service");
26
27
  let GetListActiveSchoolYearAndNextYearServiceV3 = class GetListActiveSchoolYearAndNextYearServiceV3 {
27
- constructor(grpcService) {
28
+ constructor(grpcService, grpcSystemService) {
28
29
  this.grpcService = grpcService;
30
+ this.grpcSystemService = grpcSystemService;
29
31
  }
30
- getSchoolYear() {
32
+ getSchoolYear(hostname) {
31
33
  return __awaiter(this, void 0, void 0, function* () {
32
- const res = yield this.grpcService.query({
33
- query: query_1.LIST_ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY,
34
- variables: {
35
- startAt: helper_1.nextYearDate,
36
- endAt: helper_1.timeYearActive,
37
- }
38
- });
34
+ let res;
35
+ if (hostname) {
36
+ res = yield this.grpcSystemService.query({
37
+ query: query_1.LIST_ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY,
38
+ variables: {
39
+ startAt: helper_1.nextYearDate,
40
+ endAt: helper_1.timeYearActive,
41
+ },
42
+ hostname,
43
+ });
44
+ }
45
+ else {
46
+ res = yield this.grpcService.query({
47
+ query: query_1.LIST_ACTIVE_SCHOOL_YEAR_AND_NEXT_SCHOOL_YEAR_QUERY,
48
+ variables: {
49
+ startAt: helper_1.nextYearDate,
50
+ endAt: helper_1.timeYearActive,
51
+ },
52
+ });
53
+ }
39
54
  if (res)
40
55
  return res;
41
56
  else
42
57
  return {};
43
58
  });
44
59
  }
45
- get() {
60
+ get(hostname) {
46
61
  return __awaiter(this, void 0, void 0, function* () {
47
62
  try {
48
- return yield this.getSchoolYear();
63
+ return yield this.getSchoolYear(hostname);
49
64
  }
50
65
  catch (error) {
51
66
  console.log(`error query get list active school_year and next school_year: ${new Date()}-${error}`);
@@ -57,6 +72,7 @@ let GetListActiveSchoolYearAndNextYearServiceV3 = class GetListActiveSchoolYearA
57
72
  exports.GetListActiveSchoolYearAndNextYearServiceV3 = GetListActiveSchoolYearAndNextYearServiceV3;
58
73
  exports.GetListActiveSchoolYearAndNextYearServiceV3 = GetListActiveSchoolYearAndNextYearServiceV3 = __decorate([
59
74
  (0, common_1.Injectable)(),
60
- __metadata("design:paramtypes", [grpc_client_service_1.PHXGrpcClientService])
75
+ __metadata("design:paramtypes", [grpc_client_service_1.PHXGrpcClientService,
76
+ grpc_client_system_service_1.PHXGrpcClientSystemService])
61
77
  ], GetListActiveSchoolYearAndNextYearServiceV3);
62
78
  //# sourceMappingURL=listActiveSchoolYearAndNextYearV3.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"listActiveSchoolYearAndNextYearV3.service.js","sourceRoot":"","sources":["../../../src/module/school-year-v3/listActiveSchoolYearAndNextYearV3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,6CAA4D;AAC5D,6CAAmF;AACnF,4EAAwE;AAIjE,IAAM,2CAA2C,GAAjD,MAAM,2CAA2C;IACtD,YAA6B,WAAiC;QAAjC,gBAAW,GAAX,WAAW,CAAsB;IAAG,CAAC;IAEpD,aAAa;;YACzB,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBAC5C,KAAK,EAAE,0DAAkD;gBACzD,SAAS,EAAE;oBACT,OAAO,EAAE,qBAAY;oBACrB,KAAK,EAAE,uBAAc;iBACtB;aAAC,CACH,CAAC;YACF,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;;gBACf,OAAO,EAAE,CAAC;QACjB,CAAC;KAAA;IAEY,GAAG;;YACd,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YACpC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CACT,iEAAiE,IAAI,IAAI,EAAE,IAAI,KAAK,EAAE,CACvF,CAAC;gBACF,OAAO;YACT,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AAzBY,kGAA2C;sDAA3C,2CAA2C;IAFvD,IAAA,mBAAU,GAAE;qCAG+B,0CAAoB;GADnD,2CAA2C,CAyBvD"}
1
+ {"version":3,"file":"listActiveSchoolYearAndNextYearV3.service.js","sourceRoot":"","sources":["../../../src/module/school-year-v3/listActiveSchoolYearAndNextYearV3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAA8D;AAC9D,6CAAqF;AACrF,4EAA0E;AAC1E,0FAAuF;AAIhF,IAAM,2CAA2C,GAAjD,MAAM,2CAA2C;IACtD,YACmB,WAAiC,EACjC,iBAA6C;QAD7C,gBAAW,GAAX,WAAW,CAAsB;QACjC,sBAAiB,GAAjB,iBAAiB,CAA4B;IAC7D,CAAC;IAEU,aAAa,CAAC,QAAiB;;YAC3C,IAAI,GAAQ,CAAC;YACb,IAAI,QAAQ,EAAE,CAAC;gBACb,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;oBACvC,KAAK,EAAE,0DAAkD;oBACzD,SAAS,EAAE;wBACT,OAAO,EAAE,qBAAY;wBACrB,KAAK,EAAE,uBAAc;qBACtB;oBACD,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;oBACjC,KAAK,EAAE,0DAAkD;oBACzD,SAAS,EAAE;wBACT,OAAO,EAAE,qBAAY;wBACrB,KAAK,EAAE,uBAAc;qBACtB;iBACF,CAAC,CAAC;YACL,CAAC;YACD,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;;gBACf,OAAO,EAAE,CAAC;QACjB,CAAC;KAAA;IAEY,GAAG,CAAC,QAAiB;;YAChC,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CACT,iEAAiE,IAAI,IAAI,EAAE,IAAI,KAAK,EAAE,CACvF,CAAC;gBACF,OAAO;YACT,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AAxCY,kGAA2C;sDAA3C,2CAA2C;IAFvD,IAAA,mBAAU,GAAE;qCAIqB,0CAAoB;QACd,uDAA0B;GAHrD,2CAA2C,CAwCvD"}
@@ -1,7 +1,9 @@
1
1
  import { PHXGrpcClientService } from "../grpc-client/grpc-client.service";
2
+ import { PHXGrpcClientSystemService } from "../grpc-client/grpc-client-system.service";
2
3
  export declare class GetListActiveSchoolYearServiceV3 {
3
4
  private readonly grpcService;
4
- constructor(grpcService: PHXGrpcClientService);
5
+ private readonly grpcSystemService;
6
+ constructor(grpcService: PHXGrpcClientService, grpcSystemService: PHXGrpcClientSystemService);
5
7
  private getSchoolYear;
6
- get(): Promise<any>;
8
+ get(hostname?: string): Promise<any>;
7
9
  }
@@ -22,23 +22,36 @@ exports.GetListActiveSchoolYearServiceV3 = void 0;
22
22
  const common_1 = require("@nestjs/common");
23
23
  const query_1 = require("../../query/query");
24
24
  const grpc_client_service_1 = require("../grpc-client/grpc-client.service");
25
+ const grpc_client_system_service_1 = require("../grpc-client/grpc-client-system.service");
25
26
  let GetListActiveSchoolYearServiceV3 = class GetListActiveSchoolYearServiceV3 {
26
- constructor(grpcService) {
27
+ constructor(grpcService, grpcSystemService) {
27
28
  this.grpcService = grpcService;
29
+ this.grpcSystemService = grpcSystemService;
28
30
  }
29
- getSchoolYear() {
31
+ getSchoolYear(hostname) {
30
32
  return __awaiter(this, void 0, void 0, function* () {
31
- const res = yield this.grpcService.query({ query: query_1.LIST_ACTIVE_SCHOOL_YEAR_QUERY });
33
+ let res;
34
+ if (hostname) {
35
+ res = yield this.grpcSystemService.query({
36
+ query: query_1.LIST_ACTIVE_SCHOOL_YEAR_QUERY,
37
+ hostname,
38
+ });
39
+ }
40
+ else {
41
+ res = yield this.grpcService.query({
42
+ query: query_1.LIST_ACTIVE_SCHOOL_YEAR_QUERY,
43
+ });
44
+ }
32
45
  if (res)
33
46
  return res;
34
47
  else
35
48
  return {};
36
49
  });
37
50
  }
38
- get() {
51
+ get(hostname) {
39
52
  return __awaiter(this, void 0, void 0, function* () {
40
53
  try {
41
- return yield this.getSchoolYear();
54
+ return yield this.getSchoolYear(hostname);
42
55
  }
43
56
  catch (error) {
44
57
  console.log(`error query get list current year: ${new Date()}-${error}`);
@@ -50,6 +63,7 @@ let GetListActiveSchoolYearServiceV3 = class GetListActiveSchoolYearServiceV3 {
50
63
  exports.GetListActiveSchoolYearServiceV3 = GetListActiveSchoolYearServiceV3;
51
64
  exports.GetListActiveSchoolYearServiceV3 = GetListActiveSchoolYearServiceV3 = __decorate([
52
65
  (0, common_1.Injectable)(),
53
- __metadata("design:paramtypes", [grpc_client_service_1.PHXGrpcClientService])
66
+ __metadata("design:paramtypes", [grpc_client_service_1.PHXGrpcClientService,
67
+ grpc_client_system_service_1.PHXGrpcClientSystemService])
54
68
  ], GetListActiveSchoolYearServiceV3);
55
69
  //# sourceMappingURL=listActiveShoolYearV3.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"listActiveShoolYearV3.service.js","sourceRoot":"","sources":["../../../src/module/school-year-v3/listActiveShoolYearV3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,6CAA8D;AAC9D,4EAAwE;AAIjE,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAC3C,YAA6B,WAAiC;QAAjC,gBAAW,GAAX,WAAW,CAAsB;IAAG,CAAC;IAEpD,aAAa;;YACzB,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAC,KAAK,EAAE,qCAA6B,EAAC,CAAC,CAAC;YACtF,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;;gBACf,OAAO,EAAE,CAAC;QACjB,CAAC;KAAA;IAEY,GAAG;;YACd,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YACpC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,sCAAsC,IAAI,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;gBACzE,OAAO;YACT,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AAjBY,4EAAgC;2CAAhC,gCAAgC;IAF5C,IAAA,mBAAU,GAAE;qCAG+B,0CAAoB;GADnD,gCAAgC,CAiB5C"}
1
+ {"version":3,"file":"listActiveShoolYearV3.service.js","sourceRoot":"","sources":["../../../src/module/school-year-v3/listActiveShoolYearV3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAgE;AAChE,4EAA0E;AAC1E,0FAAuF;AAIhF,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAC3C,YACmB,WAAiC,EACjC,iBAA6C;QAD7C,gBAAW,GAAX,WAAW,CAAsB;QACjC,sBAAiB,GAAjB,iBAAiB,CAA4B;IAC7D,CAAC;IAEU,aAAa,CAAC,QAAiB;;YAC3C,IAAI,GAAQ,CAAC;YACb,IAAI,QAAQ,EAAE,CAAC;gBACb,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;oBACvC,KAAK,EAAE,qCAA6B;oBACpC,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;oBACjC,KAAK,EAAE,qCAA6B;iBACrC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;;gBACf,OAAO,EAAE,CAAC;QACjB,CAAC;KAAA;IAEY,GAAG,CAAC,QAAiB;;YAChC,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,sCAAsC,IAAI,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;gBACzE,OAAO;YACT,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AA/BY,4EAAgC;2CAAhC,gCAAgC;IAF5C,IAAA,mBAAU,GAAE;qCAIqB,0CAAoB;QACd,uDAA0B;GAHrD,gCAAgC,CA+B5C"}
@@ -1,7 +1,9 @@
1
1
  import { PHXGrpcClientService } from "../grpc-client/grpc-client.service";
2
+ import { PHXGrpcClientSystemService } from "../grpc-client/grpc-client-system.service";
2
3
  export declare class GetListNextSchoolYearServiceV3 {
3
4
  private readonly grpcService;
4
- constructor(grpcService: PHXGrpcClientService);
5
+ private readonly grpcSystemService;
6
+ constructor(grpcService: PHXGrpcClientService, grpcSystemService: PHXGrpcClientSystemService);
5
7
  private getListNextSchoolYear;
6
- get(): Promise<any>;
8
+ get(hostname?: string): Promise<void>;
7
9
  }
@@ -23,24 +23,38 @@ const common_1 = require("@nestjs/common");
23
23
  const helper_1 = require("../../lib/helper");
24
24
  const query_1 = require("../../query/query");
25
25
  const grpc_client_service_1 = require("../grpc-client/grpc-client.service");
26
+ const grpc_client_system_service_1 = require("../grpc-client/grpc-client-system.service");
26
27
  let GetListNextSchoolYearServiceV3 = class GetListNextSchoolYearServiceV3 {
27
- constructor(grpcService) {
28
+ constructor(grpcService, grpcSystemService) {
28
29
  this.grpcService = grpcService;
30
+ this.grpcSystemService = grpcSystemService;
29
31
  }
30
- getListNextSchoolYear() {
32
+ getListNextSchoolYear(hostname) {
31
33
  return __awaiter(this, void 0, void 0, function* () {
32
- return yield this.grpcService.query({
33
- query: query_1.LIST_NEXT_SCHOOL_YEAR_QUERY,
34
- variables: {
35
- nextYearDate: helper_1.nextYearDate,
36
- }
37
- });
34
+ let res;
35
+ if (hostname) {
36
+ res = yield this.grpcSystemService.query({
37
+ query: query_1.LIST_NEXT_SCHOOL_YEAR_QUERY,
38
+ variables: {
39
+ nextYearDate: helper_1.nextYearDate,
40
+ },
41
+ hostname,
42
+ });
43
+ }
44
+ else {
45
+ res = yield this.grpcService.query({
46
+ query: query_1.LIST_NEXT_SCHOOL_YEAR_QUERY,
47
+ variables: {
48
+ nextYearDate: helper_1.nextYearDate,
49
+ },
50
+ });
51
+ }
38
52
  });
39
53
  }
40
- get() {
54
+ get(hostname) {
41
55
  return __awaiter(this, void 0, void 0, function* () {
42
56
  try {
43
- return yield this.getListNextSchoolYear();
57
+ return yield this.getListNextSchoolYear(hostname);
44
58
  }
45
59
  catch (err) {
46
60
  console.log(err);
@@ -51,6 +65,7 @@ let GetListNextSchoolYearServiceV3 = class GetListNextSchoolYearServiceV3 {
51
65
  exports.GetListNextSchoolYearServiceV3 = GetListNextSchoolYearServiceV3;
52
66
  exports.GetListNextSchoolYearServiceV3 = GetListNextSchoolYearServiceV3 = __decorate([
53
67
  (0, common_1.Injectable)(),
54
- __metadata("design:paramtypes", [grpc_client_service_1.PHXGrpcClientService])
68
+ __metadata("design:paramtypes", [grpc_client_service_1.PHXGrpcClientService,
69
+ grpc_client_system_service_1.PHXGrpcClientSystemService])
55
70
  ], GetListNextSchoolYearServiceV3);
56
71
  //# sourceMappingURL=listNextSchoolYearV3.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"listNextSchoolYearV3.service.js","sourceRoot":"","sources":["../../../src/module/school-year-v3/listNextSchoolYearV3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,6CAA4C;AAC5C,6CAA4D;AAC5D,4EAAwE;AAGjE,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IACzC,YAA6B,WAAiC;QAAjC,gBAAW,GAAX,WAAW,CAAsB;IAAG,CAAC;IAEpD,qBAAqB;;YACjC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBAC9B,KAAK,EAAE,mCAA2B;gBAClC,SAAS,EAAE;oBACT,YAAY,EAAZ,qBAAY;iBACb;aACF,CACJ,CAAC;QACJ,CAAC;KAAA;IAEY,GAAG;;YACd,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC5C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AApBY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;qCAE+B,0CAAoB;GADnD,8BAA8B,CAoB1C"}
1
+ {"version":3,"file":"listNextSchoolYearV3.service.js","sourceRoot":"","sources":["../../../src/module/school-year-v3/listNextSchoolYearV3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAA8C;AAC9C,6CAA8D;AAC9D,4EAA0E;AAC1E,0FAAuF;AAGhF,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IACzC,YACmB,WAAiC,EACjC,iBAA6C;QAD7C,gBAAW,GAAX,WAAW,CAAsB;QACjC,sBAAiB,GAAjB,iBAAiB,CAA4B;IAC7D,CAAC;IAEU,qBAAqB,CAAC,QAAiB;;YACnD,IAAI,GAAQ,CAAC;YACb,IAAI,QAAQ,EAAE,CAAC;gBACb,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;oBACvC,KAAK,EAAE,mCAA2B;oBAClC,SAAS,EAAE;wBACT,YAAY,EAAZ,qBAAY;qBACb;oBACD,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;oBACjC,KAAK,EAAE,mCAA2B;oBAClC,SAAS,EAAE;wBACT,YAAY,EAAZ,qBAAY;qBACb;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KAAA;IAEY,GAAG,CAAC,QAAiB;;YAChC,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AAjCY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;qCAGqB,0CAAoB;QACd,uDAA0B;GAHrD,8BAA8B,CAiC1C"}
@@ -1,9 +1,11 @@
1
1
  import { PHXGrpcClientService } from "../grpc-client/grpc-client.service";
2
+ import { PHXGrpcClientSystemService } from "../grpc-client/grpc-client-system.service";
2
3
  export declare class GetSchoolYearServiceV3 {
3
4
  private readonly grpcService;
4
- constructor(grpcService: PHXGrpcClientService);
5
+ private readonly grpcSystemService;
6
+ constructor(grpcService: PHXGrpcClientService, grpcSystemService: PHXGrpcClientSystemService);
5
7
  private getSchoolYear;
6
- get(school_id: any, isAllTerm?: boolean): Promise<{
8
+ get(school_id: any, isAllTerm?: boolean, hostname?: string): Promise<{
7
9
  current_school_year: any;
8
10
  current_school_term: any;
9
11
  }>;