@golemio/pid 2.8.6 → 2.8.7-dev.963032002

package/dist/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.js

@@ -26,29 +26,31 @@ const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
 const RopidMetadataModel_1 = require("../../shared/RopidMetadataModel");
 const ContainerToken_1 = require("@golemio/core/dist/integration-engine/ioc/ContainerToken");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
-const RopidGTFSMetadataModel_1 = require("../RopidGTFSMetadataModel");
+const RopidGtfsFacade_1 = require("../RopidGtfsFacade");
+const RopidGtfsMetadataRepository_1 = require("../RopidGtfsMetadataRepository");
 const DeparturePresetsRepository_1 = require("../data-access/DeparturePresetsRepository");
+const RopidGtfsContainerToken_1 = require("../ioc/RopidGtfsContainerToken");
 const RopidDeparturesPresetsTransformation_1 = require("../transformations/RopidDeparturesPresetsTransformation");
 let DeparturePresetsFacade = exports.DeparturePresetsFacade = class DeparturePresetsFacade {
-    constructor(metaModel, departurePresetsRepository, transformationDeparturesPresets, logger) {
-        this.metaModel = metaModel;
+    constructor(metadataRepository, departurePresetsRepository, transformationDeparturesPresets, logger) {
+        this.metadataRepository = metadataRepository;
         this.departurePresetsRepository = departurePresetsRepository;
         this.transformationDeparturesPresets = transformationDeparturesPresets;
         this.logger = logger;
     }
     handleNewDeparturePresets(data, lastModified) {
         return __awaiter(this, void 0, void 0, function* () {
-            const dbLastModified = yield this.metaModel.getLastModified(RopidGTFSMetadataModel_1.DatasetEnum.DEPARTURES_PRESETS);
-            yield this.metaModel.save({
-                dataset: RopidGTFSMetadataModel_1.DatasetEnum.DEPARTURES_PRESETS,
+            const dbLastModified = yield this.metadataRepository.getLastModified(RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS);
+            yield this.metadataRepository.save({
+                dataset: RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS,
                 key: RopidMetadataModel_1.MetaDatasetInfoKeyEnum.LAST_MODIFIED,
                 type: RopidMetadataModel_1.MetaTypeEnum.DATASET_INFO,
                 value: lastModified,
                 version: dbLastModified.version + 1,
             });
             const transformedData = yield this.transformationDeparturesPresets.transform(data);
-            yield this.metaModel.save({
-                dataset: RopidGTFSMetadataModel_1.DatasetEnum.DEPARTURES_PRESETS,
+            yield this.metadataRepository.save({
+                dataset: RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS,
                 key: "departuresPresets",
                 type: RopidMetadataModel_1.MetaTypeEnum.TABLE_TOTAL_COUNT,
                 value: transformedData.length,
@@ -57,30 +59,30 @@ let DeparturePresetsFacade = exports.DeparturePresetsFacade = class DeparturePre
             try {
                 yield this.departurePresetsRepository.truncate(true);
                 yield this.departurePresetsRepository.save(transformedData, true);
-                yield this.metaModel.save({
-                    dataset: RopidGTFSMetadataModel_1.DatasetEnum.DEPARTURES_PRESETS,
+                yield this.metadataRepository.save({
+                    dataset: RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS,
                     key: "departuresPresets",
                     type: RopidMetadataModel_1.MetaTypeEnum.STATE,
                     value: RopidMetadataModel_1.MetaStateEnum.SAVED,
                     version: dbLastModified.version + 1,
                 });
-                yield this.metaModel.checkSavedRows(RopidGTFSMetadataModel_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
-                yield this.metaModel.replaceTmpTables(RopidGTFSMetadataModel_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
+                yield this.metadataRepository.checkSavedRows(RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
+                yield this.metadataRepository.replaceTmpTables(RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
             }
             catch (err) {
                 this.logger.error(err);
-                yield this.metaModel.rollbackFailedSaving(RopidGTFSMetadataModel_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
+                yield this.metadataRepository.rollbackFailedSaving(RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
             }
         });
     }
 };
 exports.DeparturePresetsFacade = DeparturePresetsFacade = __decorate([
     (0, tsyringe_1.injectable)(),
-    __param(0, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.RopidGTFSMetadataModel)),
+    __param(0, (0, tsyringe_1.inject)(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsMetadataRepository)),
     __param(1, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.DeparturePresetsRepository)),
     __param(2, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.RopidDeparturesPresetsTransformation)),
     __param(3, (0, tsyringe_1.inject)(ContainerToken_1.ContainerToken.Logger)),
-    __metadata("design:paramtypes", [RopidGTFSMetadataModel_1.RopidGTFSMetadataModel,
+    __metadata("design:paramtypes", [RopidGtfsMetadataRepository_1.RopidGtfsMetadataRepository,
         DeparturePresetsRepository_1.DeparturePresetsRepository,
         RopidDeparturesPresetsTransformation_1.RopidDeparturesPresetsTransformation, Object])
 ], DeparturePresetsFacade);

package/dist/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeparturePresetsFacade.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DeparturePresetsFacade.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/ropid-gtfs/index.d.ts

@@ -2,7 +2,7 @@ export * from "./transformations/RopidDeparturesPresetsTransformation";
 export * from "./transformations/RopidGTFSCisStopsTransformation";
 export * from "./transformations/RopidGTFSTransformation";
 export * from "./RopidGTFSTripsModel";
-export * from "./RopidGTFSMetadataModel";
+export * from "./RopidGtfsFacade";
 export * from "./LegacyRopidGTFSWorker";
 export * from "./RopidGTFSStopTimesModel";
 export * from "./RopidGTFSStopsModel";

package/dist/integration-engine/ropid-gtfs/index.js

@@ -18,7 +18,7 @@ __exportStar(require("./transformations/RopidDeparturesPresetsTransformation"),
 __exportStar(require("./transformations/RopidGTFSCisStopsTransformation"), exports);
 __exportStar(require("./transformations/RopidGTFSTransformation"), exports);
 __exportStar(require("./RopidGTFSTripsModel"), exports);
-__exportStar(require("./RopidGTFSMetadataModel"), exports);
+__exportStar(require("./RopidGtfsFacade"), exports);
 __exportStar(require("./LegacyRopidGTFSWorker"), exports);
 __exportStar(require("./RopidGTFSStopTimesModel"), exports);
 __exportStar(require("./RopidGTFSStopsModel"), exports);

package/dist/integration-engine/ropid-gtfs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yFAAuE;AACvE,oFAAkE;AAClE,4EAA0D;AAC1D,wDAAsC;AACtC,2DAAyC;AACzC,0DAAwC;AACxC,4DAA0C;AAC1C,wDAAsC;AACtC,yDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yFAAuE;AACvE,oFAAkE;AAClE,4EAA0D;AAC1D,wDAAsC;AACtC,oDAAkC;AAClC,0DAAwC;AACxC,4DAA0C;AAC1C,wDAAsC;AACtC,yDAAuC"}

package/dist/integration-engine/ropid-gtfs/ioc/Di.js

@@ -5,7 +5,11 @@ const Di_1 = require("../../ioc/Di");
 const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
 const pubsub_1 = require("@golemio/core/dist/integration-engine/data-access/pubsub");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+const RopidGtfsFacade_1 = require("../RopidGtfsFacade");
+const RopidGtfsMetadataRepository_1 = require("../RopidGtfsMetadataRepository");
+const RopidGtfsRepository_1 = require("../data-access/RopidGtfsRepository");
 const StaticFileRedisRepository_1 = require("../data-access/cache/StaticFileRedisRepository");
+const DeparturePresetsFacade_1 = require("../facade/DeparturePresetsFacade");
 const RopidGTFSTransformation_1 = require("../transformations/RopidGTFSTransformation");
 const PrecomputedTablesFacade_1 = require("../workers/timetables/tasks/helpers/PrecomputedTablesFacade");
 const RopidGtfsFactory_1 = require("../workers/timetables/tasks/helpers/RopidGtfsFactory");
@@ -17,13 +21,16 @@ exports.RopidGtfsContainer = RopidGtfsContainer;
 //#region Datasources
 //#endregion
 //#region Repositories
-RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.StaticFileRedisRepository, StaticFileRedisRepository_1.StaticFileRedisRepository);
+RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.StaticFileRedisRepository, StaticFileRedisRepository_1.StaticFileRedisRepository).registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsRepository, RopidGtfsRepository_1.RopidGtfsRepository);
+RopidGtfsContainer.register(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsMetadataRepository, RopidGtfsMetadataRepository_1.RopidGtfsMetadataRepository);
 //#endregion
 //#region Transformations
 RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGTFSTransformation, RopidGTFSTransformation_1.RopidGTFSTransformation);
 //#endregion
 //#region Facade
+RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsFacade, RopidGtfsFacade_1.RopidGtfsFacade);
 RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.PrecomputedTablesFacade, PrecomputedTablesFacade_1.PrecomputedTablesFacade)
     .register(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsFactory, RopidGtfsFactory_1.RopidGtfsFactory, { lifecycle: tsyringe_1.Lifecycle.Transient })
     .registerInstance(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RedisPubSubChannel, new pubsub_1.RedisPubSubChannel(ropid_gtfs_1.RopidGTFS.name));
+RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.DeparturePresetsFacade, DeparturePresetsFacade_1.DeparturePresetsFacade);
 //# sourceMappingURL=Di.js.map

package/dist/integration-engine/ropid-gtfs/ioc/Di.js.map

@@ -1 +1 @@
-{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,uEAA4C;AAC5C,qFAA8F;AAC9F,iEAAoF;AACpF,8FAA2F;AAC3F,wFAAqF;AACrF,yGAAsG;AACtG,2FAAwF;AACxF,uEAAoE;AAEpE,wBAAwB;AACxB,MAAM,kBAAkB,GAAwB,iBAAY,CAAC,oBAAoB,EAAE,CAAC;AAqB3E,gDAAkB;AApB3B,YAAY;AAEZ,qBAAqB;AAErB,YAAY;AAEZ,sBAAsB;AACtB,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC,CAAC;AACnH,YAAY;AAEZ,yBAAyB;AACzB,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AAC/G,YAAY;AAEZ,gBAAgB;AAChB,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC;KACzG,QAAQ,CAAC,iDAAuB,CAAC,gBAAgB,EAAE,mCAAgB,EAAE,EAAE,SAAS,EAAE,oBAAS,CAAC,SAAS,EAAE,CAAC;KACxG,gBAAgB,CAAC,iDAAuB,CAAC,kBAAkB,EAAE,IAAI,2BAAkB,CAAC,sBAAS,CAAC,IAAI,CAAC,CAAC,CAAC"}
+{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,uEAA4C;AAC5C,qFAA8F;AAC9F,iEAAoF;AACpF,wDAAqD;AACrD,gFAA6E;AAC7E,4EAAyE;AACzE,8FAA2F;AAC3F,6EAA0E;AAC1E,wFAAqF;AACrF,yGAAsG;AACtG,2FAAwF;AACxF,uEAAoE;AAEpE,wBAAwB;AACxB,MAAM,kBAAkB,GAAwB,iBAAY,CAAC,oBAAoB,EAAE,CAAC;AA4B3E,gDAAkB;AA3B3B,YAAY;AAEZ,qBAAqB;AAErB,YAAY;AAEZ,sBAAsB;AACtB,kBAAkB,CAAC,iBAAiB,CAChC,iDAAuB,CAAC,yBAAyB,EACjD,qDAAyB,CAC5B,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AACtF,kBAAkB,CAAC,QAAQ,CAAC,iDAAuB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC9G,YAAY;AAEZ,yBAAyB;AACzB,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AAC/G,YAAY;AAEZ,gBAAgB;AAChB,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,eAAe,EAAE,iCAAe,CAAC,CAAC;AAC/F,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC;KACzG,QAAQ,CAAC,iDAAuB,CAAC,gBAAgB,EAAE,mCAAgB,EAAE,EAAE,SAAS,EAAE,oBAAS,CAAC,SAAS,EAAE,CAAC;KACxG,gBAAgB,CAAC,iDAAuB,CAAC,kBAAkB,EAAE,IAAI,2BAAkB,CAAC,sBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAE1G,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC"}

package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.d.ts

@@ -1,8 +1,12 @@
 declare const RopidGtfsContainerToken: {
+    RopidGtfsMetadataRepository: symbol;
     PrecomputedTablesFacade: symbol;
     StaticFileRedisRepository: symbol;
     RopidGTFSTransformation: symbol;
     RopidGtfsFactory: symbol;
     RedisPubSubChannel: symbol;
+    RopidGtfsRepository: symbol;
+    DeparturePresetsFacade: symbol;
+    RopidGtfsFacade: symbol;
 };
 export { RopidGtfsContainerToken };

package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js

@@ -2,11 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RopidGtfsContainerToken = void 0;
 const RopidGtfsContainerToken = {
+    RopidGtfsMetadataRepository: Symbol(),
     PrecomputedTablesFacade: Symbol(),
     StaticFileRedisRepository: Symbol(),
     RopidGTFSTransformation: Symbol(),
     RopidGtfsFactory: Symbol(),
     RedisPubSubChannel: Symbol(),
+    RopidGtfsRepository: Symbol(),
+    DeparturePresetsFacade: Symbol(),
+    RopidGtfsFacade: Symbol(),
 };
 exports.RopidGtfsContainerToken = RopidGtfsContainerToken;
 //# sourceMappingURL=RopidGtfsContainerToken.js.map

package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"RopidGtfsContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,uBAAuB,GAAG;IAC5B,uBAAuB,EAAE,MAAM,EAAE;IACjC,yBAAyB,EAAE,MAAM,EAAE;IACnC,uBAAuB,EAAE,MAAM,EAAE;IACjC,gBAAgB,EAAE,MAAM,EAAE;IAC1B,kBAAkB,EAAE,MAAM,EAAE;CAC/B,CAAC;AAEO,0DAAuB"}
+{"version":3,"file":"RopidGtfsContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,uBAAuB,GAAG;IAC5B,2BAA2B,EAAE,MAAM,EAAE;IACrC,uBAAuB,EAAE,MAAM,EAAE;IACjC,yBAAyB,EAAE,MAAM,EAAE;IACnC,uBAAuB,EAAE,MAAM,EAAE;IACjC,gBAAgB,EAAE,MAAM,EAAE;IAC1B,kBAAkB,EAAE,MAAM,EAAE;IAC5B,mBAAmB,EAAE,MAAM,EAAE;IAC7B,sBAAsB,EAAE,MAAM,EAAE;IAChC,eAAe,EAAE,MAAM,EAAE;CAC5B,CAAC;AAEO,0DAAuB"}

package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/SavePresetsDataTask.js

@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SavePresetsDataTask = void 0;
-const Di_1 = require("../../../../ioc/Di");
-const ModuleContainerToken_1 = require("../../../../ioc/ModuleContainerToken");
+const Di_1 = require("../../../ioc/Di");
+const RopidGtfsContainerToken_1 = require("../../../ioc/RopidGtfsContainerToken");
 const ropid_departures_presets_1 = require("../../../../../schema-definitions/ropid-departures-presets");
 const AbstractTaskJsonSchema_1 = require("@golemio/core/dist/integration-engine/workers/AbstractTaskJsonSchema");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
@@ -24,7 +24,7 @@ class SavePresetsDataTask extends AbstractTaskJsonSchema_1.AbstractTaskJsonSchem
     }
     execute(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            const facade = Di_1.PidContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.DeparturePresetsFacade);
+            const facade = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.DeparturePresetsFacade);
             yield facade.handleNewDeparturePresets(data, new Date().toISOString());
         });
     }

package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/SavePresetsDataTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"SavePresetsDataTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/SavePresetsDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0C;AAC1C,+EAAoE;AAEpE,yGAA+F;AAC/F,iHAA8G;AAC9G,mFAAkF;AAElF,MAAa,mBAAoB,SAAQ,+CAAgD;IAQrF,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,aAAa,CAAC;QAC1B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QAC5C,WAAM,GAAG,IAAI,uCAAmB,CACtC,iDAAsB,CAAC,IAAI,GAAG,YAAY,EAC1C,iDAAsB,CAAC,oBAAoB,CAC9C,CAAC;IAIF,CAAC;IAEe,OAAO,CAAC,IAA8B;;YAClD,MAAM,MAAM,GAAG,iBAAY,CAAC,OAAO,CAAyB,2CAAoB,CAAC,sBAAsB,CAAC,CAAC;YACzG,MAAM,MAAM,CAAC,yBAAyB,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3E,CAAC;KAAA;CACJ;AAhBD,kDAgBC"}
+{"version":3,"file":"SavePresetsDataTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/SavePresetsDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wCAA2D;AAC3D,kFAAqF;AACrF,yGAA+F;AAC/F,iHAA8G;AAC9G,mFAAkF;AAElF,MAAa,mBAAoB,SAAQ,+CAAgD;IAQrF,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,aAAa,CAAC;QAC1B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QAC5C,WAAM,GAAG,IAAI,uCAAmB,CACtC,iDAAsB,CAAC,IAAI,GAAG,YAAY,EAC1C,iDAAsB,CAAC,oBAAoB,CAC9C,CAAC;IAIF,CAAC;IAEe,OAAO,CAAC,IAA8B;;YAClD,MAAM,MAAM,GAAG,uBAAkB,CAAC,OAAO,CAAyB,iDAAuB,CAAC,sBAAsB,CAAC,CAAC;YAClH,MAAM,MAAM,CAAC,yBAAyB,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3E,CAAC;KAAA;CACJ;AAhBD,kDAgBC"}

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckForNewDataTask.d.ts

@@ -6,7 +6,7 @@ export declare class CheckForNewDataTask extends AbstractTask<ICheckForNewDataIn
     readonly queueTtl: number;
     readonly schema: typeof CheckForNewDataMessageValidation;
     private logger;
-    private metaModel;
+    private metadataRepository;
     constructor(queuePrefix: string);
     protected execute(data: ICheckForNewDataInput): Promise<void>;
 }

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckForNewDataTask.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckForNewDataTask = void 0;
-const ModuleContainerToken_1 = require("../../../../ioc/ModuleContainerToken");
 const Di_1 = require("../../../ioc/Di");
 const RopidGtfsContainerToken_1 = require("../../../ioc/RopidGtfsContainerToken");
 const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
@@ -24,8 +23,7 @@ class CheckForNewDataTask extends workers_1.AbstractTask {
         this.queueTtl = 19 * 60 * 1000; // 19 minutes
         this.schema = CheckForNewDataMessageValidation_1.CheckForNewDataMessageValidation;
         this.logger = Di_1.RopidGtfsContainer.resolve(CoreToken_1.CoreToken.Logger);
-        // MetaData Model
-        this.metaModel = Di_1.RopidGtfsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.RopidGTFSMetadataModel);
+        this.metadataRepository = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsMetadataRepository);
     }
     execute(data) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -35,8 +33,8 @@ class CheckForNewDataTask extends workers_1.AbstractTask {
             const datasetMap = ropidGtfsFactory.getDatasetMap();
             for (const dataset of Object.keys(datasetMap)) {
                 const serverLastModified = yield datasetMap[dataset].datasource.getLastModified();
-                const dbLastModified = yield this.metaModel.getLastModified(dataset);
-                const isDeployed = yield this.metaModel.isDeployed(dataset);
+                const dbLastModified = yield this.metadataRepository.getLastModified(dataset);
+                const isDeployed = yield this.metadataRepository.isDeployed(dataset);
                 if (serverLastModified !== dbLastModified.lastModified || !isDeployed) {
                     datasets.push(dataset);
                 }

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckForNewDataTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"CheckForNewDataTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckForNewDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAAoE;AAEpE,wCAA2D;AAC3D,kFAAqF;AAErF,wEAAqE;AAErE,8EAAqE;AACrE,2EAA6E;AAI7E,gGAA6F;AAE7F,MAAa,mBAAoB,SAAQ,sBAAmC;IAQxE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,iBAAiB,CAAC;QAC9B,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QACxC,WAAM,GAAG,mEAAgC,CAAC;QAOtD,IAAI,CAAC,MAAM,GAAG,uBAAkB,CAAC,OAAO,CAAU,qBAAS,CAAC,MAAM,CAAC,CAAC;QACpE,iBAAiB;QACjB,IAAI,CAAC,SAAS,GAAG,uBAAkB,CAAC,OAAO,CAAyB,2CAAoB,CAAC,sBAAsB,CAAC,CAAC;IACrH,CAAC;IAEe,OAAO,CAAC,IAA2B;;YAC/C,IAAI,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;YACvC,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,MAAM,gBAAgB,GAAG,uBAAkB,CAAC,OAAO,CAAmB,iDAAuB,CAAC,gBAAgB,CAAC,CAAC;YAChH,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,EAAE,CAAC;YAEpD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAmB,EAAE;gBAC7D,MAAM,kBAAkB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;gBAClF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBACrE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAE5D,IAAI,kBAAkB,KAAK,cAAc,CAAC,YAAY,IAAI,CAAC,UAAU,EAAE;oBACnE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC1B;aACJ;YAED,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;gBACvE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;aAC3D;YAED,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACjB,MAAM,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,EAAE;oBAC3E,QAAQ,EAAE,QAAQ;iBACH,CAAC,CAAC;gBACrB,OAAO;aACV;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACtD,IAAI,YAAY,EAAE;gBACd,MAAM,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAC;aAC9F;QACL,CAAC;KAAA;CACJ;AA/CD,kDA+CC"}
+{"version":3,"file":"CheckForNewDataTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckForNewDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wCAA2D;AAC3D,kFAAqF;AAErF,wEAAqE;AAErE,8EAAqE;AACrE,2EAA6E;AAI7E,gGAA6F;AAE7F,MAAa,mBAAoB,SAAQ,sBAAmC;IAQxE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,iBAAiB,CAAC;QAC9B,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QACxC,WAAM,GAAG,mEAAgC,CAAC;QAOtD,IAAI,CAAC,MAAM,GAAG,uBAAkB,CAAC,OAAO,CAAU,qBAAS,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,CAAC,kBAAkB,GAAG,uBAAkB,CAAC,OAAO,CAChD,iDAAuB,CAAC,2BAA2B,CACtD,CAAC;IACN,CAAC;IAEe,OAAO,CAAC,IAA2B;;YAC/C,IAAI,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;YACvC,MAAM,QAAQ,GAAmB,EAAE,CAAC;YACpC,MAAM,gBAAgB,GAAG,uBAAkB,CAAC,OAAO,CAAmB,iDAAuB,CAAC,gBAAgB,CAAC,CAAC;YAChH,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,EAAE,CAAC;YAEpD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAmB,EAAE;gBAC7D,MAAM,kBAAkB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;gBAClF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBAC9E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAErE,IAAI,kBAAkB,KAAK,cAAc,CAAC,YAAY,IAAI,CAAC,UAAU,EAAE;oBACnE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC1B;aACJ;YAED,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;gBACvE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;aAC3D;YAED,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACjB,MAAM,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,EAAE;oBAC3E,QAAQ,EAAE,QAAQ;iBACH,CAAC,CAAC;gBACrB,OAAO;aACV;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACtD,IAAI,YAAY,EAAE;gBACd,MAAM,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAC;aAC9F;QACL,CAAC;KAAA;CACJ;AAhDD,kDAgDC"}

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.d.ts

@@ -6,9 +6,14 @@ export declare class CheckSavedRowsAndReplaceTablesTask extends AbstractTask<IDa
     readonly queueTtl: number;
     readonly schema: typeof DatasetsInputSchema;
     private logger;
-    private metaModel;
+    private metadataRepository;
+    private ropidGtfsRepository;
     private dataCacheManager;
     private precomputeTablesFacade;
+    private ropidGtfsFacade;
     constructor(queuePrefix: string);
     protected execute(data: IDatasetsInput): Promise<void>;
+    private retryOrThrow;
+    private checkSavedRows;
+    private getDatasetsToDeploy;
 }

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckSavedRowsAndReplaceTablesTask = void 0;
-const ModuleContainerToken_1 = require("../../../../ioc/ModuleContainerToken");
 const DataCacheManager_1 = require("../../../helpers/DataCacheManager");
 const SourceTableSuffixEnum_1 = require("../../../helpers/SourceTableSuffixEnum");
 const Di_1 = require("../../../ioc/Di");
@@ -28,20 +27,15 @@ class CheckSavedRowsAndReplaceTablesTask extends workers_1.AbstractTask {
         this.queueTtl = 23 * 60 * 60 * 1000; // 23 hours
         this.schema = DownloadDataInputSchema_1.DatasetsInputSchema;
         this.logger = Di_1.RopidGtfsContainer.resolve(CoreToken_1.CoreToken.Logger);
-        // MetaData Model
-        this.metaModel = Di_1.RopidGtfsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.RopidGTFSMetadataModel);
+        this.metadataRepository = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsMetadataRepository);
         this.dataCacheManager = DataCacheManager_1.DataCacheManager.getInstance();
         this.precomputeTablesFacade = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.PrecomputedTablesFacade);
+        this.ropidGtfsRepository = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsRepository);
+        this.ropidGtfsFacade = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsFacade);
     }
     execute(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            const datasetDeployInfo = yield Promise.all(data.datasets.map((dataset) => __awaiter(this, void 0, void 0, function* () {
-                const lastModified = yield this.metaModel.getLastModified(dataset);
-                const isDeployed = yield this.metaModel.checkIfNewVersionIsAlreadyDeployed(dataset, lastModified.version);
-                return { dataset, lastModified, isDeployed };
-            })));
-            this.logger.debug(`Datasets status: ${JSON.stringify(datasetDeployInfo)}`);
-            const notDeployed = datasetDeployInfo.filter((info) => !info.isDeployed);
+            const { notDeployed, datasetDeployInfo } = yield this.getDatasetsToDeploy(data);
             if (data.datasets.length !== notDeployed.length) {
                 const names = notDeployed.map((el) => el.dataset);
                 this.logger.error(`Error while synchronized download of datasets: [${names}] of [${data.datasets}] deployed already`);
@@ -51,43 +45,65 @@ class CheckSavedRowsAndReplaceTablesTask extends workers_1.AbstractTask {
                 return;
             }
             const notDeployedVersions = notDeployed.map((el) => ({ dataset: el.dataset, version: el.lastModified.version }));
-            const allSaved = yield this.metaModel.checkAllTablesHasSavedState(notDeployedVersions);
+            const allSaved = yield this.metadataRepository.checkAllTablesHasSavedState(notDeployedVersions);
             try {
-                if (!allSaved) {
-                    throw new golemio_errors_1.GeneralError("Some GTFS datasets did not properly save", this.constructor.name);
-                }
-                yield Promise.all(datasetDeployInfo.map((el) => __awaiter(this, void 0, void 0, function* () {
-                    yield this.metaModel.checkSavedTmpTables(el.dataset, el.lastModified.version);
-                })));
+                yield this.checkSavedRows(allSaved, datasetDeployInfo);
                 yield this.precomputeTablesFacade.createAndPopulatePrecomputedTmpTables(SourceTableSuffixEnum_1.SourceTableSuffixEnum.Tmp);
-                yield this.metaModel.replaceTables(notDeployedVersions);
+                yield this.ropidGtfsFacade.replaceTables(notDeployedVersions);
                 yield this.dataCacheManager.cleanCache();
+                yield this.ropidGtfsRepository.cleanTmpAndOldTables();
                 yield integration_engine_1.QueueManager.sendMessageToExchange(constants_1.WORKER_NAME.toLowerCase(), "refreshGTFSTripData", {});
-                return;
             }
             catch (err) {
-                // log failed saving process
-                yield Promise.all(notDeployedVersions.map((el) => __awaiter(this, void 0, void 0, function* () {
-                    yield this.metaModel.rollbackFailedSaving(el.dataset, el.version);
-                })));
-                // check number of tries
-                const retries = yield Promise.all(notDeployedVersions.map((el) => __awaiter(this, void 0, void 0, function* () {
-                    return yield this.metaModel.getNumberOfDownloadRetries(el.dataset, el.version);
-                })));
-                if (Math.max(...retries) <= 5) {
-                    // send new downloadFiles, log it and finish
-                    integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "downloadDatasets", data);
-                    integration_engine_1.IntegrationErrorHandler.handle(new golemio_errors_1.GeneralError(`Error while checking RopidGTFS saved rows. Attempt number ${Math.min(...retries)} was resent.`, this.constructor.name, err));
-                    return;
-                }
-                else {
-                    // at least refresh precomputed tables and finish with error
-                    integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshPrecomputedTables", {});
-                    throw new golemio_errors_1.GeneralError("Error while checking RopidGTFS saved rows.", this.constructor.name, err);
-                }
+                yield this.retryOrThrow(notDeployedVersions, data, err);
+            }
+        });
+    }
+    retryOrThrow(notDeployedVersions, data, err) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // log failed saving process
+            yield Promise.all(notDeployedVersions.map((el) => __awaiter(this, void 0, void 0, function* () {
+                yield this.metadataRepository.rollbackFailedSaving(el.dataset, el.version);
+            })));
+            // check number of tries
+            const retries = yield Promise.all(notDeployedVersions.map((el) => __awaiter(this, void 0, void 0, function* () {
+                return yield this.metadataRepository.getNumberOfDownloadRetries(el.dataset, el.version);
+            })));
+            yield this.ropidGtfsRepository.cleanTmpAndOldTables();
+            if (Math.max(...retries) <= 5) {
+                // send new downloadFiles, log it and finish
+                integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "downloadDatasets", data);
+                integration_engine_1.IntegrationErrorHandler.handle(new golemio_errors_1.GeneralError(`Error while checking RopidGTFS saved rows. Attempt number ${Math.min(...retries)} was resent.`, this.constructor.name, err));
+            }
+            else {
+                // at least refresh precomputed tables and finish with error
+                integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshPrecomputedTables", {});
+                throw new golemio_errors_1.GeneralError("Error while checking RopidGTFS saved rows.", this.constructor.name, err);
             }
         });
     }
+    checkSavedRows(allSaved, datasetDeployInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!allSaved) {
+                throw new golemio_errors_1.GeneralError("Some GTFS datasets did not properly save", this.constructor.name);
+            }
+            yield Promise.all(datasetDeployInfo.map((el) => __awaiter(this, void 0, void 0, function* () {
+                yield this.ropidGtfsFacade.checkSavedTmpTables(el.dataset, el.lastModified.version);
+            })));
+        });
+    }
+    getDatasetsToDeploy(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const datasetDeployInfo = yield Promise.all(data.datasets.map((dataset) => __awaiter(this, void 0, void 0, function* () {
+                const lastModified = yield this.metadataRepository.getLastModified(dataset);
+                const isDeployed = yield this.metadataRepository.checkIfNewVersionIsAlreadyDeployed(dataset, lastModified.version);
+                return { dataset, lastModified, isDeployed };
+            })));
+            this.logger.debug(`Datasets status: ${JSON.stringify(datasetDeployInfo)}`);
+            const notDeployed = datasetDeployInfo.filter((info) => !info.isDeployed);
+            return { notDeployed, datasetDeployInfo };
+        });
+    }
 }
 exports.CheckSavedRowsAndReplaceTablesTask = CheckSavedRowsAndReplaceTablesTask;
 //# sourceMappingURL=CheckSavedRowsAndReplaceTablesTask.js.map

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"CheckSavedRowsAndReplaceTablesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CheckSavedRowsAndReplaceTablesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/DownloadDatasetsTask.d.ts

@@ -6,10 +6,11 @@ export declare class DownloadDatasetsTask extends AbstractTask<IDatasetsInput> {
     readonly queueTtl: number;
     readonly schema: typeof DatasetsInputSchema;
     private logger;
-    private metaModel;
+    private metadataRepository;
+    private staticFileRedisRepository;
+    private ropidGtfsRepository;
     private ropidGtfsFactory?;
     private gtfsRedisChannel;
-    private staticFileRedisRepository;
     constructor(queuePrefix: string);
     protected execute(data: IDatasetsInput): Promise<void>;
     /**

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/DownloadDatasetsTask.js

@@ -25,8 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DownloadDatasetsTask = void 0;
 const Di_1 = require("../../../../ioc/Di");
-const ModuleContainerToken_1 = require("../../../../ioc/ModuleContainerToken");
-const RopidGTFSMetadataModel_1 = require("../../../RopidGTFSMetadataModel");
+const RopidGtfsFacade_1 = require("../../../RopidGtfsFacade");
 const Di_2 = require("../../../ioc/Di");
 const RopidGtfsContainerToken_1 = require("../../../ioc/RopidGtfsContainerToken");
 const RopidMetadataModel_1 = require("../../../../shared/RopidMetadataModel");
@@ -51,12 +50,12 @@ class DownloadDatasetsTask extends workers_1.AbstractTask {
             let files = yield this.ropidGtfsFactory.getDatasetMap()[dataset].datasource.getAll();
             if (!Array.isArray(files))
                 files = [files];
-            const dbLastModified = yield this.metaModel.getLastModified(dataset);
+            const dbLastModified = yield this.metadataRepository.getLastModified(dataset);
             const cachedDataset = [];
             for (const file of files) {
                 this.logger.info(`Datasets: processing file '${file.name}'`);
                 const { data } = file, meta = __rest(file, ["data"]);
-                if (dataset === RopidGTFSMetadataModel_1.DatasetEnum.PID_GTFS || dataset === RopidGTFSMetadataModel_1.DatasetEnum.RUN_NUMBERS) {
+                if (dataset === RopidGtfsFacade_1.DatasetEnum.PID_GTFS || dataset === RopidGtfsFacade_1.DatasetEnum.RUN_NUMBERS) {
                     yield this.staticFileRedisRepository.pipeStream(file.filepath, data);
                 }
                 else {
@@ -73,12 +72,12 @@ class DownloadDatasetsTask extends workers_1.AbstractTask {
                     };
                 });
                 for (const metaState of metaStates) {
-                    yield this.metaModel.save(metaState);
+                    yield this.metadataRepository.save(metaState);
                 }
                 cachedDataset.push(Object.assign(Object.assign({}, meta), { dataset }));
             }
             const lastModified = yield this.ropidGtfsFactory.getDatasetMap()[dataset].datasource.getLastModified();
-            yield this.metaModel.save({
+            yield this.metadataRepository.save({
                 dataset,
                 key: RopidMetadataModel_1.MetaDatasetInfoKeyEnum.LAST_MODIFIED,
                 type: RopidMetadataModel_1.MetaTypeEnum.DATASET_INFO,
@@ -92,7 +91,8 @@ class DownloadDatasetsTask extends workers_1.AbstractTask {
         this.gtfsRedisChannel = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RedisPubSubChannel);
         this.staticFileRedisRepository = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.StaticFileRedisRepository);
         // MetaData Model
-        this.metaModel = Di_2.RopidGtfsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.RopidGTFSMetadataModel);
+        this.metadataRepository = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsMetadataRepository);
+        this.ropidGtfsRepository = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsRepository);
     }
     execute(data) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -112,6 +112,7 @@ class DownloadDatasetsTask extends workers_1.AbstractTask {
                     throw new golemio_errors_1.GeneralError("Error while downloading GTFS datasets", this.constructor.name, err);
                 }
             }
+            yield this.ropidGtfsRepository.createTmpTables();
             const subscriber = this.gtfsRedisChannel.createSubscriber({
                 channelSuffix: os_1.default.hostname(),
                 maxMessageCount: cachedDatasets.length,

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/DownloadDatasetsTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"DownloadDatasetsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/DownloadDatasetsTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DownloadDatasetsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/DownloadDatasetsTask.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshPrecomputedTablesTask.d.ts

@@ -3,9 +3,10 @@ export declare class RefreshPrecomputedTablesTask extends AbstractEmptyTask {
     readonly queueName = "refreshPrecomputedTables";
     readonly queueTtl: number;
     private logger;
-    private metaModel;
+    private ropidGtfsRepository;
     private dataCacheManager;
     private precomputeTablesFacade;
+    private ropidGtfsFacade;
     constructor(queuePrefix: string);
     protected execute(): Promise<void>;
 }

package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshPrecomputedTablesTask.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshPrecomputedTablesTask = void 0;
 const Di_1 = require("../../../../ioc/Di");
-const ModuleContainerToken_1 = require("../../../../ioc/ModuleContainerToken");
 const DataCacheManager_1 = require("../../../helpers/DataCacheManager");
 const SourceTableSuffixEnum_1 = require("../../../helpers/SourceTableSuffixEnum");
 const Di_2 = require("../../../ioc/Di");
@@ -25,9 +24,10 @@ class RefreshPrecomputedTablesTask extends workers_1.AbstractEmptyTask {
         this.queueName = "refreshPrecomputedTables";
         this.queueTtl = 59 * 60 * 1000; // 59 minutes
         this.logger = Di_2.RopidGtfsContainer.resolve(CoreToken_1.CoreToken.Logger);
-        this.metaModel = Di_2.RopidGtfsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.RopidGTFSMetadataModel);
         this.dataCacheManager = DataCacheManager_1.DataCacheManager.getInstance();
         this.precomputeTablesFacade = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.PrecomputedTablesFacade);
+        this.ropidGtfsRepository = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsRepository);
+        this.ropidGtfsFacade = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsFacade);
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -41,7 +41,7 @@ class RefreshPrecomputedTablesTask extends workers_1.AbstractEmptyTask {
             const connection = Di_1.PidContainer.resolve(CoreToken_1.CoreToken.PostgresConnector).getConnection();
             const transaction = yield connection.transaction();
             try {
-                yield this.metaModel.replacePrecomputedTables(transaction);
+                yield this.ropidGtfsFacade.replacePrecomputedTables(transaction);
                 yield transaction.commit();
             }
             catch (err) {
@@ -49,6 +49,9 @@ class RefreshPrecomputedTablesTask extends workers_1.AbstractEmptyTask {
                 this.logger.error(err);
                 throw new golemio_errors_1.GeneralError("Error while replacing RopidGTFS precomputed tables", this.constructor.name);
             }
+            finally {
+                yield this.ropidGtfsRepository.cleanOldTables();
+            }
             yield this.dataCacheManager.cleanCache();
         });
     }