@yarkivaev/scada 2.4.2 → 2.4.3

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 (2) hide show
  1. package/package.json +1 -1
  2. package/src/infrastructure/persistence/pg/intervalFoldPg.js +13 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yarkivaev/scada",
3
- "version": "2.4.2",
3
+ "version": "2.4.3",
4
4
  "description": "SCADA domain objects, state persistence, and plant monitoring",
5
5
  "repository": {
6
6
  "type": "git",
package/src/infrastructure/persistence/pg/intervalFoldPg.js CHANGED
@@ -24,13 +24,23 @@ export default function intervalFoldPg(pool) {
24
24
  const start = new Date(sample.ts).toISOString();
25
25
  await pool.query(
26
26
  `INSERT INTO segments (machine, kind, name, start_time, end_time, duration, resolved, consumed)
27
- VALUES ($1, $2, $3, $4, $4, 0, TRUE, TRUE)`,
27
+ SELECT $1, $2, $3, $4::timestamptz, $4::timestamptz, 0, TRUE, TRUE
28
+ WHERE NOT EXISTS (
29
+ SELECT 1 FROM (
30
+ SELECT start_time, end_time, duration FROM segments
31
+ WHERE machine = $1 AND kind = $2
32
+ ORDER BY start_time DESC LIMIT 1
33
+ ) previous
34
+ WHERE start_time >= $4::timestamptz OR end_time > $4::timestamptz
35
+ OR (duration = 0 AND end_time >= $4::timestamptz)
36
+ )
37
+ ON CONFLICT (machine, kind, start_time) DO NOTHING`,
28
38
  [sample.machine, sample.kind, sample.name, start]
29
39
  );
30
40
  },
31
41
  async extend(row, ts) {
32
42
  await pool.query(
33
- `UPDATE segments SET end_time = $1
43
+ `UPDATE segments SET end_time = GREATEST(end_time, $1::timestamptz)
34
44
  WHERE machine = $2 AND kind = $3 AND start_time = $4 AND duration = 0`,
35
45
  [new Date(ts).toISOString(), row.machine, row.kind, row.start_time]
36
46
  );
@@ -41,7 +51,7 @@ export default function intervalFoldPg(pool) {
41
51
  const duration = Math.max(1, Math.round((end.getTime() - start.getTime()) / 1000));
42
52
  await pool.query(
43
53
  `UPDATE segments SET end_time = $1, duration = $2
44
- WHERE machine = $3 AND kind = $4 AND start_time = $5 AND duration = 0`,
54
+ WHERE machine = $3 AND kind = $4 AND start_time = $5 AND duration = 0 AND end_time < $1::timestamptz`,
45
55
  [end.toISOString(), duration, row.machine, row.kind, row.start_time]
46
56
  );
47
57
  }