@golemio/parkings 1.18.1-dev.1740219513 → 1.18.1-dev.1746501849
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.
- package/db/migrations/postgresql/20250327141308-active-parking-machines.js +53 -0
- package/db/migrations/postgresql/sqls/20250327141308-active-parking-machines-down.sql +16 -0
- package/db/migrations/postgresql/sqls/20250327141308-active-parking-machines-up.sql +17 -0
- package/dist/integration-engine/repositories/ParkingMachinesRepository.d.ts +4 -0
- package/dist/integration-engine/repositories/ParkingMachinesRepository.js +29 -2
- package/dist/integration-engine/repositories/ParkingMachinesRepository.js.map +1 -1
- package/dist/integration-engine/transformations/TskParkingMachinesTransformation.js +1 -0
- package/dist/integration-engine/transformations/TskParkingMachinesTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/iptoict/IptOictParkingMachinesTransformation.js +1 -0
- package/dist/integration-engine/transformations/iptoict/IptOictParkingMachinesTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/osm/OsmParkingMachinesTransformation.js +1 -0
- package/dist/integration-engine/transformations/osm/OsmParkingMachinesTransformation.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictParkingMachinesTask.js +2 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictParkingMachinesTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveOsmParkingMachinesTask.js +2 -1
- package/dist/integration-engine/workers/tasks/SaveOsmParkingMachinesTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveTskParkingMachinesTask.d.ts +3 -3
- package/dist/integration-engine/workers/tasks/SaveTskParkingMachinesTask.js +3 -1
- package/dist/integration-engine/workers/tasks/SaveTskParkingMachinesTask.js.map +1 -1
- package/dist/output-gateway/controllers/v3/V3ParkingMachinesController.js +1 -0
- package/dist/output-gateway/controllers/v3/V3ParkingMachinesController.js.map +1 -1
- package/dist/output-gateway/data-access/ParkingMachinesRepository.js +3 -0
- package/dist/output-gateway/data-access/ParkingMachinesRepository.js.map +1 -1
- package/dist/output-gateway/helpers/params/IParkingMachinesParams.d.ts +1 -0
- package/dist/output-gateway/routers/v3/V3ParkingMachinesRouter.js +1 -0
- package/dist/output-gateway/routers/v3/V3ParkingMachinesRouter.js.map +1 -1
- package/dist/schema-definitions/models/ParkingMachinesModel.d.ts +1 -0
- package/dist/schema-definitions/models/ParkingMachinesModel.js +2 -0
- package/dist/schema-definitions/models/ParkingMachinesModel.js.map +1 -1
- package/dist/schema-definitions/models/interfaces/IParkingMachine.d.ts +1 -0
- package/docs/openapi-output.yaml +7 -0
- package/package.json +1 -1
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var dbm;
|
|
4
|
+
var type;
|
|
5
|
+
var seed;
|
|
6
|
+
var fs = require('fs');
|
|
7
|
+
var path = require('path');
|
|
8
|
+
var Promise;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* We receive the dbmigrate dependency from dbmigrate initially.
|
|
12
|
+
* This enables us to not have to rely on NODE_PATH.
|
|
13
|
+
*/
|
|
14
|
+
exports.setup = function(options, seedLink) {
|
|
15
|
+
dbm = options.dbmigrate;
|
|
16
|
+
type = dbm.dataType;
|
|
17
|
+
seed = seedLink;
|
|
18
|
+
Promise = options.Promise;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
exports.up = function(db) {
|
|
22
|
+
var filePath = path.join(__dirname, 'sqls', '20250327141308-active-parking-machines-up.sql');
|
|
23
|
+
return new Promise( function( resolve, reject ) {
|
|
24
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
25
|
+
if (err) return reject(err);
|
|
26
|
+
console.log('received data: ' + data);
|
|
27
|
+
|
|
28
|
+
resolve(data);
|
|
29
|
+
});
|
|
30
|
+
})
|
|
31
|
+
.then(function(data) {
|
|
32
|
+
return db.runSql(data);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
exports.down = function(db) {
|
|
37
|
+
var filePath = path.join(__dirname, 'sqls', '20250327141308-active-parking-machines-down.sql');
|
|
38
|
+
return new Promise( function( resolve, reject ) {
|
|
39
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
40
|
+
if (err) return reject(err);
|
|
41
|
+
console.log('received data: ' + data);
|
|
42
|
+
|
|
43
|
+
resolve(data);
|
|
44
|
+
});
|
|
45
|
+
})
|
|
46
|
+
.then(function(data) {
|
|
47
|
+
return db.runSql(data);
|
|
48
|
+
});
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
exports._meta = {
|
|
52
|
+
"version": 1
|
|
53
|
+
};
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
drop view v_parking_machines_filtered;
|
|
2
|
+
ALTER TABLE parking_machines DROP COLUMN active;
|
|
3
|
+
create view v_parking_machines_filtered as
|
|
4
|
+
with parking_machines_primary as (
|
|
5
|
+
select * from parking_machines where source != 'osm'
|
|
6
|
+
), parking_machines_secondary as (
|
|
7
|
+
select * from parking_machines where source = 'osm'
|
|
8
|
+
)
|
|
9
|
+
select * from parking_machines_primary p1
|
|
10
|
+
union all
|
|
11
|
+
select * from parking_machines_secondary p2
|
|
12
|
+
where p2.id not in (
|
|
13
|
+
select distinct p2.id
|
|
14
|
+
from parking_machines_primary p1
|
|
15
|
+
inner join parking_machines_secondary p2 ON ST_Distance(p1.location::geography, p2.location::geography) < 15
|
|
16
|
+
);
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
ALTER TABLE parking_machines ADD active boolean DEFAULT true NOT NULL;
|
|
2
|
+
|
|
3
|
+
drop view v_parking_machines_filtered;
|
|
4
|
+
create view v_parking_machines_filtered as
|
|
5
|
+
with parking_machines_primary as (
|
|
6
|
+
select * from parking_machines where source != 'osm'
|
|
7
|
+
), parking_machines_secondary as (
|
|
8
|
+
select * from parking_machines where source = 'osm'
|
|
9
|
+
)
|
|
10
|
+
select * from parking_machines_primary p1
|
|
11
|
+
union all
|
|
12
|
+
select * from parking_machines_secondary p2
|
|
13
|
+
where p2.id not in (
|
|
14
|
+
select distinct p2.id
|
|
15
|
+
from parking_machines_primary p1
|
|
16
|
+
inner join parking_machines_secondary p2 ON ST_Distance(p1.location::geography, p2.location::geography) < 15
|
|
17
|
+
);
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
+
import { IParkingMachine } from "../../schema-definitions/models/interfaces/IParkingMachine";
|
|
1
2
|
import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
|
|
3
|
+
import { Transaction } from "@golemio/core/dist/shared/sequelize";
|
|
2
4
|
export declare class ParkingMachinesRepository extends PostgresModel implements IModel {
|
|
3
5
|
constructor();
|
|
6
|
+
bulkSaveMarkInactive(source: string, data: IParkingMachine[], attributeList: string[] | undefined, updatedAt: Date): Promise<void>;
|
|
7
|
+
updateInactive(source: string, updatedAt: Date, transaction?: Transaction): Promise<void>;
|
|
4
8
|
}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ParkingMachinesRepository = void 0;
|
|
4
|
-
const models_1 = require("@golemio/core/dist/integration-engine/models");
|
|
5
4
|
const _sch_1 = require("../../schema-definitions");
|
|
6
|
-
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
7
5
|
const ParkingMachinesModel_1 = require("../../schema-definitions/models/ParkingMachinesModel");
|
|
6
|
+
const models_1 = require("@golemio/core/dist/integration-engine/models");
|
|
7
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
8
|
+
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
9
|
+
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
8
10
|
class ParkingMachinesRepository extends models_1.PostgresModel {
|
|
9
11
|
constructor() {
|
|
10
12
|
super("ParkingMachinesRepository", {
|
|
@@ -14,6 +16,31 @@ class ParkingMachinesRepository extends models_1.PostgresModel {
|
|
|
14
16
|
savingType: "insertOrUpdate",
|
|
15
17
|
}, new golemio_validator_1.JSONSchemaValidator("ParkingMachinesRepositoryValidator", ParkingMachinesModel_1.ParkingMachinesModel.jsonSchema));
|
|
16
18
|
}
|
|
19
|
+
async bulkSaveMarkInactive(source, data, attributeList, updatedAt) {
|
|
20
|
+
if (!this.sequelizeModel.sequelize) {
|
|
21
|
+
throw new golemio_errors_1.FatalError("Sequelize is not initialized", this.constructor.name);
|
|
22
|
+
}
|
|
23
|
+
const transaction = await this.sequelizeModel.sequelize.transaction();
|
|
24
|
+
try {
|
|
25
|
+
await this.bulkSave(data, attributeList, undefined, undefined, transaction);
|
|
26
|
+
await this.updateInactive(source, updatedAt, transaction);
|
|
27
|
+
await transaction.commit();
|
|
28
|
+
}
|
|
29
|
+
catch (err) {
|
|
30
|
+
await transaction.rollback();
|
|
31
|
+
throw new golemio_errors_1.GeneralError("Error while saving parking machines data", this.constructor.name, err);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
async updateInactive(source, updatedAt, transaction) {
|
|
35
|
+
await this.sequelizeModel.update({ active: false }, {
|
|
36
|
+
where: {
|
|
37
|
+
source,
|
|
38
|
+
updated_at: { [sequelize_1.Op.lt]: updatedAt },
|
|
39
|
+
active: true,
|
|
40
|
+
},
|
|
41
|
+
transaction,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
17
44
|
}
|
|
18
45
|
exports.ParkingMachinesRepository = ParkingMachinesRepository;
|
|
19
46
|
//# sourceMappingURL=ParkingMachinesRepository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/integration-engine/repositories/ParkingMachinesRepository.ts"],"names":[],"mappings":";;;AAAA,yEAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/integration-engine/repositories/ParkingMachinesRepository.ts"],"names":[],"mappings":";;;AAAA,mDAAgC;AAEhC,+FAAwE;AACxE,yEAAqF;AACrF,6EAAoF;AACpF,mFAAkF;AAClF,mEAAsE;AAEtE,MAAa,yBAA0B,SAAQ,sBAAa;IACxD;QACI,KAAK,CACD,2BAA2B,EAC3B;YACI,yBAAyB,EAAE,2CAAoB,CAAC,cAAc;YAC9D,QAAQ,EAAE,eAAQ,CAAC,QAAQ;YAC3B,WAAW,EAAE,kBAAkB;YAC/B,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CAAC,oCAAoC,EAAE,2CAAoB,CAAC,UAAU,CAAC,CACjG,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAC7B,MAAc,EACd,IAAuB,EACvB,aAAmC,EACnC,SAAe;QAEf,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;YAChC,MAAM,IAAI,2BAAU,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC/E;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAEtE,IAAI;YACA,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;YAC5E,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;YAC1D,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,6BAAY,CAAC,0CAA0C,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SAClG;IACL,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,SAAe,EAAE,WAAyB;QAClF,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAC5B,EAAE,MAAM,EAAE,KAAK,EAAE,EACjB;YACI,KAAK,EAAE;gBACH,MAAM;gBACN,UAAU,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE;gBAClC,MAAM,EAAE,IAAI;aACf;YACD,WAAW;SACd,CACJ,CAAC;IACN,CAAC;CACJ;AAjDD,8DAiDC"}
|
|
@@ -18,6 +18,7 @@ class TskParkingMachinesTransformation extends AbstractTransformation_1.Abstract
|
|
|
18
18
|
location: (0, wkt_1.wktToGeoJSON)(tskParkingMachine.positionWKT),
|
|
19
19
|
validFrom: new Date(tskParkingMachine.activeFrom),
|
|
20
20
|
tariffId: tskParkingMachine.idTariff,
|
|
21
|
+
active: true,
|
|
21
22
|
};
|
|
22
23
|
};
|
|
23
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TskParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/TskParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAAA,6GAA0G;AAI1G,0CAAgD;AAChD,mEAA2D;AAE3D,MAAa,gCAAiC,SAAQ,+CAA2D;IAAjH;;QACW,SAAI,GAAW,kCAAkC,CAAC;QAEzD,sBAAiB,GAAG,CAAC,iBAAqC,EAAmB,EAAE;YAC3E,OAAO;gBACH,EAAE,EAAE,GAAG,uBAAU,CAAC,MAAM,IAAI,iBAAiB,CAAC,aAAa,EAAE;gBAC7D,MAAM,EAAE,uBAAU,CAAC,MAAM;gBACzB,QAAQ,EAAE,iBAAiB,CAAC,aAAa;gBACzC,IAAI,EAAE,iBAAiB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,QAAQ,IAAI,CAAC,IAAI,iBAAiB,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB;gBACzG,QAAQ,EAAE,IAAA,kBAAY,EAAC,iBAAiB,CAAC,WAAW,CAAa;gBACjE,SAAS,EAAE,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;gBACjD,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"TskParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/TskParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAAA,6GAA0G;AAI1G,0CAAgD;AAChD,mEAA2D;AAE3D,MAAa,gCAAiC,SAAQ,+CAA2D;IAAjH;;QACW,SAAI,GAAW,kCAAkC,CAAC;QAEzD,sBAAiB,GAAG,CAAC,iBAAqC,EAAmB,EAAE;YAC3E,OAAO;gBACH,EAAE,EAAE,GAAG,uBAAU,CAAC,MAAM,IAAI,iBAAiB,CAAC,aAAa,EAAE;gBAC7D,MAAM,EAAE,uBAAU,CAAC,MAAM;gBACzB,QAAQ,EAAE,iBAAiB,CAAC,aAAa;gBACzC,IAAI,EAAE,iBAAiB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,QAAQ,IAAI,CAAC,IAAI,iBAAiB,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB;gBACzG,QAAQ,EAAE,IAAA,kBAAY,EAAC,iBAAiB,CAAC,WAAW,CAAa;gBACjE,SAAS,EAAE,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;gBACjD,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;gBACpC,MAAM,EAAE,IAAI;aACf,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA;AAhBD,4EAgBC"}
|
package/dist/integration-engine/transformations/iptoict/IptOictParkingMachinesTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IptOictParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/transformations/iptoict/IptOictParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAEA,6GAA0G;AAG1G,MAAa,oCAAqC,SAAQ,+CAGzD;IAGG,YAAoB,MAAc;QAC9B,KAAK,EAAE,CAAC;QADQ,WAAM,GAAN,MAAM,CAAQ;QAF3B,SAAI,GAAW,sCAAsC,CAAC;QAMnD,sBAAiB,GAAG,CAAC,OAAuC,EAAmB,EAAE;YACvF,OAAO;gBACH,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE;gBACpD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS;gBACtC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;gBAC7B,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY;gBACrC,QAAQ,EAAE,OAAO,CAAC,QAAoB;gBACtC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI;gBACzF,QAAQ,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"IptOictParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/transformations/iptoict/IptOictParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAEA,6GAA0G;AAG1G,MAAa,oCAAqC,SAAQ,+CAGzD;IAGG,YAAoB,MAAc;QAC9B,KAAK,EAAE,CAAC;QADQ,WAAM,GAAN,MAAM,CAAQ;QAF3B,SAAI,GAAW,sCAAsC,CAAC;QAMnD,sBAAiB,GAAG,CAAC,OAAuC,EAAmB,EAAE;YACvF,OAAO;gBACH,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE;gBACpD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS;gBACtC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;gBAC7B,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY;gBACrC,QAAQ,EAAE,OAAO,CAAC,QAAoB;gBACtC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI;gBACzF,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,IAAI;aACf,CAAC;QACN,CAAC,CAAC;IAdF,CAAC;CAeJ;AAvBD,oFAuBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OsmParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/transformations/osm/OsmParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAAA,6GAA0G;AAE1G,sEAA2D;AAI3D,MAAa,gCAAiC,SAAQ,+CAGrD;IAGG,YAAoB,kBAAwB;QACxC,KAAK,EAAE,CAAC;QADQ,uBAAkB,GAAlB,kBAAkB,CAAM;QAFrC,SAAI,GAAW,kCAAkC,CAAC;QAMzD,sBAAiB,GAAG,CAAC,cAA8D,EAAmB,EAAE;YACpG,OAAO;gBACH,EAAE,EAAE,GAAG,uBAAU,CAAC,GAAG,IAAI,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3D,MAAM,EAAE,uBAAU,CAAC,GAAG;gBACtB,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,MAAM;gBAC1C,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,iBAAiB;gBACvB,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,SAAS,EAAE,IAAI,CAAC,kBAAkB;gBAClC,QAAQ,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"OsmParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/transformations/osm/OsmParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAAA,6GAA0G;AAE1G,sEAA2D;AAI3D,MAAa,gCAAiC,SAAQ,+CAGrD;IAGG,YAAoB,kBAAwB;QACxC,KAAK,EAAE,CAAC;QADQ,uBAAkB,GAAlB,kBAAkB,CAAM;QAFrC,SAAI,GAAW,kCAAkC,CAAC;QAMzD,sBAAiB,GAAG,CAAC,cAA8D,EAAmB,EAAE;YACpG,OAAO;gBACH,EAAE,EAAE,GAAG,uBAAU,CAAC,GAAG,IAAI,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3D,MAAM,EAAE,uBAAU,CAAC,GAAG;gBACtB,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,MAAM;gBAC1C,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,iBAAiB;gBACvB,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,SAAS,EAAE,IAAI,CAAC,kBAAkB;gBAClC,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,IAAI;aACf,CAAC;QACN,CAAC,CAAC;IAdF,CAAC;CAeJ;AAvBD,4EAuBC"}
|
|
@@ -48,9 +48,10 @@ let SaveIptOictParkingMachinesTask = exports.SaveIptOictParkingMachinesTask = cl
|
|
|
48
48
|
if (!sourceUrl) {
|
|
49
49
|
throw new golemio_errors_1.GeneralError(`Missing source url for source: ${source}`, this.constructor.name);
|
|
50
50
|
}
|
|
51
|
+
const currentDate = new Date();
|
|
51
52
|
const data = await IptOictParkingMachinesDataSource_1.IptOictParkingMachinesDatasource.getData(sourceUrl);
|
|
52
53
|
const transformed = new IptOictParkingMachinesTransformation_1.IptOictParkingMachinesTransformation(source).transformArray(data.features);
|
|
53
|
-
await this.repository.
|
|
54
|
+
await this.repository.bulkSaveMarkInactive(source, transformed, undefined, currentDate);
|
|
54
55
|
}
|
|
55
56
|
async getSourceConfig(source) {
|
|
56
57
|
const sources = await this.cachedParkingSourcesRepository.getAll();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveIptOictParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveIptOictParkingMachinesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gHAAqG;AACrG,iHAA4G;AAC5G,yEAAoE;AACpE,4FAAuF;AACvF,6HAAwH;AACxH,4EAAmH;AACnH,8EAAqE;AACrE,6EAA+G;AAC/G,iEAAwE;AACxE,4CAAwD;AAGjD,IAAM,8BAA8B,4CAApC,MAAM,8BAA+B,SAAQ,iCAAmC;IAKnF,YAEI,8BAAsE,EACd,UAA6C;QAErG,KAAK,CAAC,oCAAwB,CAAC,CAAC;QAHxB,mCAA8B,GAA9B,8BAA8B,CAAgC;QACN,eAAU,GAAV,UAAU,CAA2B;QAPzF,cAAS,GAAG,4BAA4B,CAAC;QACzC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,SAAS;QACpC,WAAM,GAAG,uDAA+B,CAAC;IAQzD,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAA2B;QAC5C,IAAI;YACA,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1D,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,2BAA2B,CAAC,CAAC;SACjG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;gBACrC,MAAM,GAAG,CAAC;aACb;YAED,MAAM,IAAI,6BAAY,CAAC,8CAA8C,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACtG;IACL,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,MAAc,EAAE,SAAwB;QAC5E,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,6BAAY,CAAC,kCAAkC,MAAM,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC7F;
|
|
1
|
+
{"version":3,"file":"SaveIptOictParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveIptOictParkingMachinesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gHAAqG;AACrG,iHAA4G;AAC5G,yEAAoE;AACpE,4FAAuF;AACvF,6HAAwH;AACxH,4EAAmH;AACnH,8EAAqE;AACrE,6EAA+G;AAC/G,iEAAwE;AACxE,4CAAwD;AAGjD,IAAM,8BAA8B,4CAApC,MAAM,8BAA+B,SAAQ,iCAAmC;IAKnF,YAEI,8BAAsE,EACd,UAA6C;QAErG,KAAK,CAAC,oCAAwB,CAAC,CAAC;QAHxB,mCAA8B,GAA9B,8BAA8B,CAAgC;QACN,eAAU,GAAV,UAAU,CAA2B;QAPzF,cAAS,GAAG,4BAA4B,CAAC;QACzC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,SAAS;QACpC,WAAM,GAAG,uDAA+B,CAAC;IAQzD,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAA2B;QAC5C,IAAI;YACA,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1D,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,2BAA2B,CAAC,CAAC;SACjG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;gBACrC,MAAM,GAAG,CAAC;aACb;YAED,MAAM,IAAI,6BAAY,CAAC,8CAA8C,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACtG;IACL,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,MAAc,EAAE,SAAwB;QAC5E,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,6BAAY,CAAC,kCAAkC,MAAM,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC7F;QACD,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,mEAAgC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,IAAI,2EAAoC,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnG,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5F,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAc;QACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,CAAC;QACnE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QAE1D,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,gCAAe,CACrB,yBAAyB,MAAM,uBAAuB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAC3E,IAAI,CAAC,WAAW,CAAC,IAAI,CACxB,CAAC;SACL;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;yCAjDY,8BAA8B;IAD1C,IAAA,qBAAU,GAAE;IAOJ,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,8BAA8B,CAAC,CAAA;IAE3D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,yBAAyB,CAAC,CAAA;qCADf,+DAA8B;QACM,qDAAyB;GARhG,8BAA8B,CAiD1C"}
|
|
@@ -21,6 +21,7 @@ const constants_1 = require("../constants");
|
|
|
21
21
|
const OsmParkingMachinesDataSource_1 = require("../../datasources/osm/OsmParkingMachinesDataSource");
|
|
22
22
|
const ParkingMachinesRepository_1 = require("../../repositories/ParkingMachinesRepository");
|
|
23
23
|
const OsmParkingMachinesTransformation_1 = require("../../transformations/osm/OsmParkingMachinesTransformation");
|
|
24
|
+
const SourceEnum_1 = require("../../../helpers/constants/SourceEnum");
|
|
24
25
|
let SaveOsmParkingMachinesTask = exports.SaveOsmParkingMachinesTask = class SaveOsmParkingMachinesTask extends AbstractEmptyTask_1.AbstractEmptyTask {
|
|
25
26
|
constructor(dataSource, repository) {
|
|
26
27
|
super(constants_1.NEW_PARKINGS_WORKER_NAME);
|
|
@@ -34,7 +35,7 @@ let SaveOsmParkingMachinesTask = exports.SaveOsmParkingMachinesTask = class Save
|
|
|
34
35
|
const parkingMachines = await this.dataSource.getOsmParkingMachines();
|
|
35
36
|
const transformation = new OsmParkingMachinesTransformation_1.OsmParkingMachinesTransformation(transformationDate);
|
|
36
37
|
const transformedData = transformation.transformArray(parkingMachines);
|
|
37
|
-
await this.repository.
|
|
38
|
+
await this.repository.bulkSaveMarkInactive(SourceEnum_1.SourceEnum.OSM, transformedData, this.getAttributesToUpdate(), transformationDate);
|
|
38
39
|
}
|
|
39
40
|
getAttributesToUpdate() {
|
|
40
41
|
return ParkingMachinesModel_1.ParkingMachinesModel.attributeList.filter((key) => key !== "validFrom").concat("updated_at");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveOsmParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveOsmParkingMachinesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAoE;AACpE,kGAAwE;AACxE,uGAAoG;AACpG,iEAAwE;AACxE,4CAAwD;AACxD,qGAAgG;AAChG,4FAAuF;AACvF,iHAA4G;
|
|
1
|
+
{"version":3,"file":"SaveOsmParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveOsmParkingMachinesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAoE;AACpE,kGAAwE;AACxE,uGAAoG;AACpG,iEAAwE;AACxE,4CAAwD;AACxD,qGAAgG;AAChG,4FAAuF;AACvF,iHAA4G;AAC5G,sEAA2D;AAGpD,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,qCAAiB;IAI7D,YAEI,UAAgD,EACQ,UAA6C;QAErG,KAAK,CAAC,oCAAwB,CAAC,CAAC;QAHxB,eAAU,GAAV,UAAU,CAA8B;QACgB,eAAU,GAAV,UAAU,CAA2B;QANzF,cAAS,GAAG,4BAA4B,CAAC;QACzC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ;IAQnD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,kBAAkB,GAAG,IAAI,IAAI,EAAE,CAAC;QAEtC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC;QACtE,MAAM,cAAc,GAAG,IAAI,mEAAgC,CAAC,kBAAkB,CAAC,CAAC;QAChF,MAAM,eAAe,GAAG,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QACvE,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CACtC,uBAAU,CAAC,GAAG,EACd,eAAe,EACf,IAAI,CAAC,qBAAqB,EAAE,EAC5B,kBAAkB,CACrB,CAAC;IACN,CAAC;IAEO,qBAAqB;QACzB,OAAO,2CAAoB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACxG,CAAC;CACJ,CAAA;qCA7BY,0BAA0B;IADtC,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,4BAA4B,CAAC,CAAA;IAEzD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,yBAAyB,CAAC,CAAA;qCADnC,2DAA4B;QAC4B,qDAAyB;GAPhG,0BAA0B,CA6BtC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine/workers/AbstractEmptyTask";
|
|
2
|
-
import { DataSource } from "@golemio/core/dist/integration-engine/datasources";
|
|
3
|
-
import { TskParkingMachinesTransformation } from "../../transformations/TskParkingMachinesTransformation";
|
|
4
1
|
import { ParkingMachinesRepository } from "../../repositories/ParkingMachinesRepository";
|
|
2
|
+
import { TskParkingMachinesTransformation } from "../../transformations/TskParkingMachinesTransformation";
|
|
5
3
|
import { ITskParkingMachine } from "../../../schema-definitions/datasources/interfaces/ITskParkingMachine";
|
|
4
|
+
import { DataSource } from "@golemio/core/dist/integration-engine/datasources";
|
|
5
|
+
import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine/workers/AbstractEmptyTask";
|
|
6
6
|
export declare class SaveTskParkingMachinesTask extends AbstractEmptyTask {
|
|
7
7
|
private dataSource;
|
|
8
8
|
private transformation;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SaveTskParkingMachinesTask = void 0;
|
|
4
|
+
const SourceEnum_1 = require("../../../helpers/constants/SourceEnum");
|
|
4
5
|
const AbstractEmptyTask_1 = require("@golemio/core/dist/integration-engine/workers/AbstractEmptyTask");
|
|
5
6
|
class SaveTskParkingMachinesTask extends AbstractEmptyTask_1.AbstractEmptyTask {
|
|
6
7
|
constructor(queuePrefix, dataSource, transformation, repository) {
|
|
@@ -11,9 +12,10 @@ class SaveTskParkingMachinesTask extends AbstractEmptyTask_1.AbstractEmptyTask {
|
|
|
11
12
|
this.queueName = "saveTskParkingMachines";
|
|
12
13
|
}
|
|
13
14
|
async execute() {
|
|
15
|
+
const currnetDate = new Date();
|
|
14
16
|
const data = await this.dataSource.getAll();
|
|
15
17
|
const transformedData = this.transformation.transformArray(data);
|
|
16
|
-
await this.repository.
|
|
18
|
+
await this.repository.bulkSaveMarkInactive(SourceEnum_1.SourceEnum.TSK_V2, transformedData, undefined, currnetDate);
|
|
17
19
|
}
|
|
18
20
|
}
|
|
19
21
|
exports.SaveTskParkingMachinesTask = SaveTskParkingMachinesTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveTskParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveTskParkingMachinesTask.ts"],"names":[],"mappings":";;;AAAA,uGAAoG;
|
|
1
|
+
{"version":3,"file":"SaveTskParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveTskParkingMachinesTask.ts"],"names":[],"mappings":";;;AAAA,sEAA2D;AAM3D,uGAAoG;AAEpG,MAAa,0BAA2B,SAAQ,qCAAiB;IAG7D,YACI,WAAmB,EACX,UAA4C,EAC5C,cAAgD,EAChD,UAAqC;QAE7C,KAAK,CAAC,WAAW,CAAC,CAAC;QAJX,eAAU,GAAV,UAAU,CAAkC;QAC5C,mBAAc,GAAd,cAAc,CAAkC;QAChD,eAAU,GAAV,UAAU,CAA2B;QAN1C,cAAS,GAAW,wBAAwB,CAAC;IASpD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAyB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAClE,MAAM,eAAe,GAAsB,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,uBAAU,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC3G,CAAC;CACJ;AAlBD,gEAkBC"}
|
|
@@ -74,6 +74,7 @@ let V3ParkingMachinesController = exports.V3ParkingMachinesController = class V3
|
|
|
74
74
|
codeMask: req.query.codeMask ? req.query.codeMask : undefined,
|
|
75
75
|
limit: req.query.limit ? parseInt(req.query.limit) : 1000,
|
|
76
76
|
offset: req.query.offset ? parseInt(req.query.offset) : undefined,
|
|
77
|
+
activeOnly: req.query.activeOnly ? req.query.activeOnly.toLowerCase() === "true" : true,
|
|
77
78
|
};
|
|
78
79
|
}
|
|
79
80
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V3ParkingMachinesController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v3/V3ParkingMachinesController.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"V3ParkingMachinesController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v3/V3ParkingMachinesController.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,6 +49,9 @@ let ParkingMachinesRepository = exports.ParkingMachinesRepository = class Parkin
|
|
|
49
49
|
if (params.codeMask) {
|
|
50
50
|
where.code = { [sequelize_1.Op.like]: params.codeMask };
|
|
51
51
|
}
|
|
52
|
+
if (params.activeOnly) {
|
|
53
|
+
where.active = true;
|
|
54
|
+
}
|
|
52
55
|
if (params.boundingBox) {
|
|
53
56
|
where = {
|
|
54
57
|
...where,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingMachinesRepository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingMachinesRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ class V3ParkingMachinesRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
33
33
|
.matches(/^[\w%]*$/) // e.g. %middle% it is used for sql like
|
|
34
34
|
.not()
|
|
35
35
|
.isArray(),
|
|
36
|
+
(0, express_validator_1.query)("activeOnly").optional().isBoolean().not().isArray(),
|
|
36
37
|
], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(12 * 60 * 60, 60), this.controller.getAll);
|
|
37
38
|
this.router.get("/:id", (0, express_validator_1.param)("id").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(), (0, express_validator_1.query)("isRestrictedToOpenData").optional().isBoolean().not().isArray(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(12 * 60 * 60, 60), this.controller.getOne);
|
|
38
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V3ParkingMachinesRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v3/V3ParkingMachinesRouter.ts"],"names":[],"mappings":";;;AACA,qCAA+C;AAC/C,yEAAoE;AACpE,sFAAmF;AAEnF,+DAAuE;AACvE,6EAAkH;AAClH,mFAA2E;AAC3E,4CAA4C;AAG5C,MAAM,uBAAwB,SAAQ,+BAAc;IAMhD;QACI,KAAK,CAAC,wBAAY,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAHvC,mBAAc,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC,yBAAyB;QAK/E,IAAI,CAAC,UAAU,GAAG,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,2BAA2B,CAAC,CAAC;QAC9F,IAAI,CAAC,sBAAsB,GAAG,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,sBAAsB,CAAC,CAAC;QACrG,IAAI,CAAC,qBAAqB,GAAG,sBAAiB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACpH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH;YACI,IAAA,yBAAK,EAAC,wBAAwB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACtE,IAAA,yBAAK,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC;YAC9E,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACzD,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;YAClD,IAAA,yBAAK,EAAC,aAAa,CAAC;iBACf,QAAQ,EAAE;iBACV,OAAO,CAAC,4BAA4B,CAAC,CAAC,8BAA8B;iBACpE,GAAG,EAAE;iBACL,OAAO,EAAE;YACd,IAAA,yBAAK,EAAC,UAAU,CAAC;iBACZ,QAAQ,EAAE;iBACV,OAAO,CAAC,UAAU,CAAC,CAAC,wCAAwC;iBAC5D,GAAG,EAAE;iBACL,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"V3ParkingMachinesRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v3/V3ParkingMachinesRouter.ts"],"names":[],"mappings":";;;AACA,qCAA+C;AAC/C,yEAAoE;AACpE,sFAAmF;AAEnF,+DAAuE;AACvE,6EAAkH;AAClH,mFAA2E;AAC3E,4CAA4C;AAG5C,MAAM,uBAAwB,SAAQ,+BAAc;IAMhD;QACI,KAAK,CAAC,wBAAY,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAHvC,mBAAc,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC,yBAAyB;QAK/E,IAAI,CAAC,UAAU,GAAG,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,2BAA2B,CAAC,CAAC;QAC9F,IAAI,CAAC,sBAAsB,GAAG,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,sBAAsB,CAAC,CAAC;QACrG,IAAI,CAAC,qBAAqB,GAAG,sBAAiB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACpH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH;YACI,IAAA,yBAAK,EAAC,wBAAwB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACtE,IAAA,yBAAK,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC;YAC9E,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACzD,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;YAClD,IAAA,yBAAK,EAAC,aAAa,CAAC;iBACf,QAAQ,EAAE;iBACV,OAAO,CAAC,4BAA4B,CAAC,CAAC,8BAA8B;iBACpE,GAAG,EAAE;iBACL,OAAO,EAAE;YACd,IAAA,yBAAK,EAAC,UAAU,CAAC;iBACZ,QAAQ,EAAE;iBACV,OAAO,CAAC,UAAU,CAAC,CAAC,wCAAwC;iBAC5D,GAAG,EAAE;iBACL,OAAO,EAAE;YACd,IAAA,yBAAK,EAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;SAC7D,EACD,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAC1D,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,wBAAwB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EACtE,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAC1D,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ;AAED,MAAM,uBAAuB,GAAmB,IAAI,uBAAuB,EAAE,CAAC;AAErE,0DAAuB"}
|
|
@@ -12,6 +12,7 @@ export declare class ParkingMachinesModel extends Model<IParkingMachine> impleme
|
|
|
12
12
|
location: Point;
|
|
13
13
|
validFrom: Date;
|
|
14
14
|
tariffId: string;
|
|
15
|
+
active: boolean;
|
|
15
16
|
static attributeModel: ModelAttributes<ParkingMachinesModel>;
|
|
16
17
|
static attributeList: string[];
|
|
17
18
|
static jsonSchema: JSONSchemaType<IParkingMachine[]>;
|
|
@@ -19,6 +19,7 @@ ParkingMachinesModel.attributeModel = {
|
|
|
19
19
|
location: sequelize_1.DataTypes.GEOMETRY,
|
|
20
20
|
validFrom: sequelize_1.DataTypes.DATE,
|
|
21
21
|
tariffId: sequelize_1.DataTypes.STRING,
|
|
22
|
+
active: sequelize_1.DataTypes.BOOLEAN,
|
|
22
23
|
};
|
|
23
24
|
ParkingMachinesModel.attributeList = Object.keys(ParkingMachinesModel.attributeModel);
|
|
24
25
|
ParkingMachinesModel.jsonSchema = {
|
|
@@ -33,6 +34,7 @@ ParkingMachinesModel.jsonSchema = {
|
|
|
33
34
|
type: { type: "string" },
|
|
34
35
|
location: { $ref: "#/definitions/geometry" },
|
|
35
36
|
validFrom: { oneOf: [{ type: "object" }, { type: "null", nullable: true }] },
|
|
37
|
+
active: { type: "boolean" },
|
|
36
38
|
},
|
|
37
39
|
required: ["id", "source", "sourceId", "type", "location"],
|
|
38
40
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingMachinesModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/ParkingMachinesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,8EAA6E;AAE7E,MAAa,oBAAqB,SAAQ,iBAAsB;;AAAhE,
|
|
1
|
+
{"version":3,"file":"ParkingMachinesModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/ParkingMachinesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,8EAA6E;AAE7E,MAAa,oBAAqB,SAAQ,iBAAsB;;AAAhE,oDAmDC;AAlDiB,8BAAS,GAAG,kBAAkB,CAAC;AAY/B,mCAAc,GAA0C;IAClE,EAAE,EAAE;QACA,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM;KACzB;IACD,MAAM,EAAE,qBAAS,CAAC,MAAM;IACxB,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,IAAI,EAAE,qBAAS,CAAC,MAAM;IACtB,IAAI,EAAE,qBAAS,CAAC,MAAM;IACtB,QAAQ,EAAE,qBAAS,CAAC,QAAQ;IAC5B,SAAS,EAAE,qBAAS,CAAC,IAAI;IACzB,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,MAAM,EAAE,qBAAS,CAAC,OAAO;CAC5B,CAAC;AAEY,kCAAa,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;AAEjE,+BAAU,GAAsC;IAC1D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACvE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE;YAC5C,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YAC5E,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;SAC9B;QACD,QAAQ,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC;KAC7D;IACD,WAAW,EAAE;QACT,mBAAmB;QACnB,QAAQ,EAAE,yCAAoB,CAAC,QAAQ;KAC1C;CACJ,CAAC"}
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -1014,6 +1014,13 @@ paths:
|
|
|
1014
1014
|
format: date-time
|
|
1015
1015
|
example: '2023-08-01T00:00:00Z'
|
|
1016
1016
|
description: 'Filter by valid from date'
|
|
1017
|
+
- name: activeOnly
|
|
1018
|
+
in: query
|
|
1019
|
+
schema:
|
|
1020
|
+
type: boolean
|
|
1021
|
+
default: true
|
|
1022
|
+
example: true
|
|
1023
|
+
description: 'If true, filter out parking machines that did not appear in latest source data.'
|
|
1017
1024
|
- name: limit
|
|
1018
1025
|
in: query
|
|
1019
1026
|
schema:
|