@golemio/pid 5.8.4-dev.2437940308 → 5.8.4-dev.2443455020

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.
@@ -10,5 +10,6 @@ export declare class PresetLogRepository extends PostgresModel implements IPrese
10
10
  findUnprocessed: () => Promise<PresetLogModel[]>;
11
11
  saveData: (data: IPresetLogOutputDto[]) => Promise<void>;
12
12
  markAsProcessed: (logIds: string[]) => Promise<void>;
13
+ markAsBounced(logIds: string[]): Promise<void>;
13
14
  deleteNHoursOldData: (hours: number) => Promise<number>;
14
15
  }
@@ -81,6 +81,9 @@ let PresetLogRepository = class PresetLogRepository extends models_2.PostgresMod
81
81
  [sequelize_1.Op.gte]: sequelize_1.default.literal(`NOW() - INTERVAL '10 MIN'`),
82
82
  },
83
83
  },
84
+ order: [
85
+ ["id", "DESC"], // best effort to find newest log lines
86
+ ],
84
87
  });
85
88
  }
86
89
  catch (err) {
@@ -134,6 +137,21 @@ let PresetLogRepository = class PresetLogRepository extends models_2.PostgresMod
134
137
  },
135
138
  });
136
139
  }
140
+ async markAsBounced(logIds) {
141
+ try {
142
+ await this.sequelizeModel.update({
143
+ updated_at: new Date(),
144
+ update_batch_id: sequelize_1.default.literal("COALESCE(update_batch_id, 0) + 1"),
145
+ }, {
146
+ where: sequelize_1.default.where(sequelize_1.default.col("id"), {
147
+ [sequelize_1.Op.in]: logIds,
148
+ }),
149
+ });
150
+ }
151
+ catch (err) {
152
+ throw new golemio_errors_1.GeneralError("Error while marking preset logs as bounced", this.constructor.name, err);
153
+ }
154
+ }
137
155
  };
138
156
  exports.PresetLogRepository = PresetLogRepository;
139
157
  exports.PresetLogRepository = PresetLogRepository = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"PresetLogRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/data-access/PresetLogRepository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PresetLogRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/data-access/PresetLogRepository.ts"],"names":[],"mappings":"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"}
@@ -7,5 +7,6 @@ export interface IPresetLogRepository extends IModel {
7
7
  findUnprocessed: () => Promise<PresetLogModel[]>;
8
8
  saveData: (data: IPresetLogOutputDto[]) => Promise<void>;
9
9
  markAsProcessed: (logIds: string[]) => Promise<void>;
10
+ markAsBounced: (logIds: string[]) => Promise<void>;
10
11
  deleteNHoursOldData: (hours: number) => Promise<number>;
11
12
  }
@@ -16,6 +16,8 @@ exports.RopidMonitoringService = void 0;
16
16
  const ContainerToken_1 = require("@golemio/core/dist/integration-engine/ioc/ContainerToken");
17
17
  const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
18
18
  const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
19
+ const FETCH_TIMEOUT_MS = 20_000;
20
+ const ERROR_MESSAGE = "Error while sending logs to the ROPID monitoring system.";
19
21
  let RopidMonitoringService = class RopidMonitoringService {
20
22
  constructor(config) {
21
23
  this.config = config;
@@ -24,15 +26,15 @@ let RopidMonitoringService = class RopidMonitoringService {
24
26
  const requestConfig = this.getRequestConfig(logEntries);
25
27
  try {
26
28
  const response = await fetch(this.config.datasources.RopidMonitoringPushUrl, requestConfig);
27
- if (response.status < 200 || response.status >= 300) {
28
- throw new golemio_errors_1.GeneralError(`Error while sending logs to the ROPID monitoring system. Status code: ${response.status}`, this.constructor.name);
29
+ if (!response.ok) {
30
+ throw new golemio_errors_1.GeneralError(`${ERROR_MESSAGE} Response Status code: ${response.status}, Status text: ${response.statusText}`, this.constructor.name);
29
31
  }
30
32
  }
31
33
  catch (err) {
32
34
  if (err instanceof golemio_errors_1.GeneralError) {
33
35
  throw err;
34
36
  }
35
- throw new golemio_errors_1.GeneralError("Error while sending logs to the ROPID monitoring system", this.constructor.name, err);
37
+ throw new golemio_errors_1.GeneralError(ERROR_MESSAGE, this.constructor.name, err);
36
38
  }
37
39
  }
38
40
  getRequestConfig(logEntries) {
@@ -40,7 +42,7 @@ let RopidMonitoringService = class RopidMonitoringService {
40
42
  method: "POST",
41
43
  headers: this.config.datasources.RopidMonitoringPushHeaders,
42
44
  body: JSON.stringify(logEntries),
43
- signal: AbortSignal.timeout(20 * 1000),
45
+ signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
44
46
  };
45
47
  }
46
48
  };
@@ -1 +1 @@
1
- {"version":3,"file":"RopidMonitoringService.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/helpers/RopidMonitoringService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,6FAA0F;AAC1F,6EAAwE;AACxE,iEAAwE;AAIjE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAC/B,YAAmD,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAG,CAAC;IAEtE,KAAK,CAAC,0BAA0B,CAAC,UAAoC;QACxE,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;YAC5F,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;gBAClD,MAAM,IAAI,6BAAY,CAClB,yEAAyE,QAAQ,CAAC,MAAM,EAAE,EAC1F,IAAI,CAAC,WAAW,CAAC,IAAI,CACxB,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,GAAG,YAAY,6BAAY,EAAE,CAAC;gBAC9B,MAAM,GAAG,CAAC;YACd,CAAC;YAED,MAAM,IAAI,6BAAY,CAAC,yDAAyD,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAClH,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,UAAoC;QACzD,OAAO;YACH,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,0BAA0B;YAC3D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YAChC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;SACzC,CAAC;IACN,CAAC;CACJ,CAAA;AA/BY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,+BAAc,CAAC,MAAM,CAAC,CAAA;;GADjC,sBAAsB,CA+BlC"}
1
+ {"version":3,"file":"RopidMonitoringService.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/helpers/RopidMonitoringService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,6FAA0F;AAC1F,6EAAwE;AACxE,iEAAwE;AAGxE,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,aAAa,GAAG,0DAA0D,CAAC;AAG1E,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAC/B,YAAmD,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAG,CAAC;IAEtE,KAAK,CAAC,0BAA0B,CAAC,UAAoC;QACxE,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;YAC5F,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,IAAI,6BAAY,CAClB,GAAG,aAAa,0BAA0B,QAAQ,CAAC,MAAM,kBAAkB,QAAQ,CAAC,UAAU,EAAE,EAChG,IAAI,CAAC,WAAW,CAAC,IAAI,CACxB,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,GAAG,YAAY,6BAAY,EAAE,CAAC;gBAC9B,MAAM,GAAG,CAAC;YACd,CAAC;YACD,MAAM,IAAI,6BAAY,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,UAAoC;QACzD,OAAO;YACH,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,0BAA0B;YAC3D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YAChC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC;SAChD,CAAC;IACN,CAAC;CACJ,CAAA;AA9BY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,+BAAc,CAAC,MAAM,CAAC,CAAA;;GADjC,sBAAsB,CA8BlC"}
@@ -54,11 +54,12 @@ let ProcessAndSendLogsTask = class ProcessAndSendLogsTask extends workers_1.Abst
54
54
  this.logger.warn(`${this.constructor.name}: no logs found to send to the ROPID monitoring system`);
55
55
  return;
56
56
  }
57
+ const batchCount = Math.ceil(logEntries.length / this.batchSize);
57
58
  // Process logs in batches to avoid exceeding the maximum allowed size of the request
58
59
  for (let i = 0; i < logEntries.length; i += this.batchSize) {
59
60
  try {
60
61
  const batchedLogs = logEntries.slice(i, i + this.batchSize);
61
- await this.processBatch(batchedLogs);
62
+ await this.processBatch(batchedLogs, 1 + Math.ceil(i / this.batchSize), batchCount);
62
63
  }
63
64
  catch (err) {
64
65
  this.logger.warn(err, `${this.constructor.name}: error while processing DCIP system logs`);
@@ -69,7 +70,7 @@ let ProcessAndSendLogsTask = class ProcessAndSendLogsTask extends workers_1.Abst
69
70
  await mutex.release();
70
71
  }
71
72
  }
72
- async processBatch(logEntries) {
73
+ async processBatch(logEntries, batchIndex, batchCount) {
73
74
  let logIds = [];
74
75
  let logData = [];
75
76
  for (const logEntry of logEntries) {
@@ -80,8 +81,14 @@ let ProcessAndSendLogsTask = class ProcessAndSendLogsTask extends workers_1.Abst
80
81
  receivedAt: LogDateTimeUtils_1.LogDateTimeUtils.parseISONoFractionalFromDate(received_at),
81
82
  });
82
83
  }
83
- await this.monitoringService.sendLogsToMonitoringSystem(logData);
84
- this.logger.info(`${this.constructor.name}: ${logData.length} logs sent to the ROPID monitoring system`);
84
+ try {
85
+ await this.monitoringService.sendLogsToMonitoringSystem(logData);
86
+ }
87
+ catch (err) {
88
+ await this.logRepository.markAsBounced(logIds);
89
+ throw err;
90
+ }
91
+ this.logger.info({ batchIndex, batchCount }, `${this.constructor.name}: ${logData.length} logs sent to the ROPID monitoring system`);
85
92
  await this.logRepository.markAsProcessed(logIds);
86
93
  }
87
94
  createMutex() {
@@ -1 +1 @@
1
- {"version":3,"file":"ProcessAndSendLogsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/ProcessAndSendLogsTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProcessAndSendLogsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/ProcessAndSendLogsTask.ts"],"names":[],"mappings":"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"}
@@ -28,6 +28,9 @@ let PresetLogTransformation = class PresetLogTransformation extends AbstractTran
28
28
  request_user_agent: dataItem.stream.req_userAgent ?? "",
29
29
  response_status: Number.parseInt(dataItem.stream.res_status),
30
30
  response_time_ms: Number.parseInt(dataItem.stream.responseTime),
31
+ updated_at: null,
32
+ updated_by: null,
33
+ update_batch_id: null,
31
34
  };
32
35
  };
33
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PresetLogTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/transformations/PresetLogTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,+CAAoE;IAA1G;;QACI,SAAI,GAAG,yBAAyB,CAAC;QAE9B,sBAAiB,GAAG,CAAC,QAAiC,EAAuB,EAAE;YACrF,4CAA4C;YAC5C,uGAAuG;YACvG,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC/D,MAAM,yBAAyB,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,MAAM,oBAAoB,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAE3F,OAAO;gBACH,WAAW,EAAE,oBAAoB;gBACjC,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;gBAClE,YAAY,EAAE,KAAK;gBACnB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO;gBACpC,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU;gBAC1C,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE;gBACvD,eAAe,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC5D,gBAAgB,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC;aAClE,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AArBY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAU,GAAE;GACA,uBAAuB,CAqBnC"}
1
+ {"version":3,"file":"PresetLogTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/transformations/PresetLogTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,+CAAoE;IAA1G;;QACI,SAAI,GAAG,yBAAyB,CAAC;QAE9B,sBAAiB,GAAG,CAAC,QAAiC,EAAuB,EAAE;YACrF,4CAA4C;YAC5C,uGAAuG;YACvG,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC/D,MAAM,yBAAyB,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,MAAM,oBAAoB,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAE3F,OAAO;gBACH,WAAW,EAAE,oBAAoB;gBACjC,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;gBAClE,YAAY,EAAE,KAAK;gBACnB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO;gBACpC,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU;gBAC1C,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE;gBACvD,eAAe,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC5D,gBAAgB,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC;gBAC/D,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,IAAI;aACxB,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AAxBY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAU,GAAE;GACA,uBAAuB,CAwBnC"}
@@ -1,5 +1,5 @@
1
1
  import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
2
- import { Model, ModelAttributes, ModelIndexesOptions } from "@golemio/core/dist/shared/sequelize";
2
+ import { CreationOptional, Model, ModelAttributes, ModelIndexesOptions } from "@golemio/core/dist/shared/sequelize";
3
3
  import { IPresetLogOutputDto, IPresetLogGenerated } from "./interfaces/IPresetLogOutputDto";
4
4
  export declare class PresetLogModel extends Model<IPresetLogOutputDto> implements IPresetLogOutputDto {
5
5
  static tableName: string;
@@ -11,6 +11,9 @@ export declare class PresetLogModel extends Model<IPresetLogOutputDto> implement
11
11
  request_user_agent: string;
12
12
  response_status: number;
13
13
  response_time_ms: number;
14
+ updated_at: CreationOptional<Date>;
15
+ updated_by: CreationOptional<string>;
16
+ update_batch_id: CreationOptional<string>;
14
17
  static attributeModel: ModelAttributes<PresetLogModel, IPresetLogOutputDto & IPresetLogGenerated>;
15
18
  static indexes: ModelIndexesOptions[];
16
19
  static arrayJsonSchema: JSONSchemaType<IPresetLogOutputDto[]>;
@@ -16,6 +16,13 @@ PresetLogModel.attributeModel = {
16
16
  request_user_agent: { type: sequelize_1.DataTypes.STRING, allowNull: false },
17
17
  response_status: { type: sequelize_1.DataTypes.SMALLINT, allowNull: false },
18
18
  response_time_ms: { type: sequelize_1.DataTypes.INTEGER, allowNull: false },
19
+ updated_at: { type: sequelize_1.DataTypes.DATE, allowNull: true },
20
+ updated_by: { type: sequelize_1.DataTypes.STRING, allowNull: true },
21
+ update_batch_id: {
22
+ type: sequelize_1.DataTypes.BIGINT,
23
+ allowNull: true,
24
+ comment: "Used for counting failed attempts to send logs to Ropid monitoring system",
25
+ },
19
26
  };
20
27
  PresetLogModel.indexes = [
21
28
  {
@@ -44,6 +51,18 @@ PresetLogModel.arrayJsonSchema = {
44
51
  request_user_agent: { type: "string" },
45
52
  response_status: { type: "number" },
46
53
  response_time_ms: { type: "number" },
54
+ updated_at: {
55
+ oneOf: [
56
+ { type: "object", required: ["toISOString"] },
57
+ { type: "null", nullable: true },
58
+ ],
59
+ },
60
+ updated_by: {
61
+ oneOf: [{ type: "null", nullable: true }, { type: "string" }],
62
+ },
63
+ update_batch_id: {
64
+ oneOf: [{ type: "null", nullable: true }, { type: "string" }],
65
+ },
47
66
  },
48
67
  required: [
49
68
  "device_alias",
@@ -1 +1 @@
1
- {"version":3,"file":"PresetLogModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-departures-preset-logs/models/PresetLogModel.ts"],"names":[],"mappings":";;;AACA,mEAA6G;AAG7G,MAAa,cAAe,SAAQ,iBAA0B;;AAA9D,wCAiEC;AAhEiB,wBAAS,GAAG,8BAA8B,CAAC;AAW3C,6BAAc,GAA+E;IACvG,EAAE,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;IACrE,YAAY,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE;IACxC,WAAW,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE;IACrC,YAAY,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE;IAC3D,WAAW,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IACzD,cAAc,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IAC5D,kBAAkB,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE;IAChE,eAAe,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE;IAC/D,gBAAgB,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE;CAClE,CAAC;AAEY,sBAAO,GAA0B;IAC3C;QACI,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,yCAAyC;QAC/C,MAAM,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;KAC1C;IACD;QACI,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,+CAA+C;QACrD,MAAM,EAAE,CAAC,cAAc,CAAC;KAC3B;CACJ,CAAC;AAEY,8BAAe,GAA0C;IACnE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,aAAa,CAAC,EAAE;YAC1D,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACjC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,kBAAkB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACnC,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACvC;QACD,QAAQ,EAAE;YACN,cAAc;YACd,aAAa;YACb,cAAc;YACd,aAAa;YACb,gBAAgB;YAChB,oBAAoB;YACpB,iBAAiB;YACjB,kBAAkB;SACrB;KACJ;CACJ,CAAC"}
1
+ {"version":3,"file":"PresetLogModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-departures-preset-logs/models/PresetLogModel.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,9 @@ export interface IPresetLogOutputDto {
7
7
  request_user_agent: string;
8
8
  response_status: number;
9
9
  response_time_ms: number;
10
+ updated_at: Date | null;
11
+ updated_by: string | null;
12
+ update_batch_id: string | null;
10
13
  }
11
14
  export interface IPresetLogGenerated {
12
15
  id: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/pid",
3
- "version": "5.8.4-dev.2437940308",
3
+ "version": "5.8.4-dev.2443455020",
4
4
  "description": "Golemio PID Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
16
16
  "apidocs-test": "npm run apidocs-test-output",
17
17
  "apidocs-test-input": "cross-env NODE_ENV=test golemio swagger api-test --oas docs/openapi-input.yaml --script test/api-docs/input-gateway/server.js --filter test/api-docs/input-gateway/portman-filter.json",
18
18
  "apidocs-test-output": "cross-env NODE_ENV=test golemio swagger api-test --oas docs/openapi-output.yaml --script test/api-docs/output-gateway/server.js --config test/api-docs/output-gateway/portman-config.json",
19
- "coverage:only": "nyc --reporter=text --reporter=lcov run-s 'test:only -- -r source-map-support/register'",
19
+ "coverage:only": "nyc --reporter=text --reporter=lcov run-s 'test:only -- --reporter min -r source-map-support/register'",
20
20
  "code-coverage": "run-s prepare-db coverage:only",
21
21
  "format:check-staged": "pretty-quick --staged --pattern '**/*.ts'",
22
22
  "generate-docs": "typedoc --out docs/typedoc src",