@golemio/fcd 1.2.8-dev.1288694727 → 1.2.8
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/.config.json +3 -3
- package/dist/output-gateway/FCDRouter.d.ts +5 -3
- package/dist/output-gateway/FCDRouter.js +7 -5
- package/dist/output-gateway/FCDRouter.js.map +1 -1
- package/dist/output-gateway/ioc/Di.d.ts +3 -0
- package/dist/output-gateway/ioc/Di.js +8 -0
- package/dist/output-gateway/ioc/Di.js.map +1 -0
- package/docs/openapi-output.yaml +6 -0
- package/package.json +2 -2
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
{
|
|
2
|
-
"schema": "fcd, public"
|
|
3
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"schema": "fcd, public"
|
|
3
|
+
}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
/// <reference types="express" />
|
|
2
|
-
import { NextFunction, Request, Response, Router } from "@golemio/core/dist/shared/express";
|
|
3
|
-
import { BaseRouter } from "@golemio/core/dist/output-gateway/routes/BaseRouter";
|
|
4
|
-
import { FloatingCarDataModel, FloatingCarWithOsmPathDataModel, FloatingCarExtendedDataModel, FloatingCarWithOsmPathExtendedDataModel } from "./models";
|
|
5
2
|
import { OutputFloatingCarDataTransformation } from "./transformations/OutputFloatingCarDataTransformation";
|
|
3
|
+
import { CacheHeaderMiddleware } from "@golemio/core/dist/output-gateway/CacheHeaderMiddleware";
|
|
4
|
+
import { BaseRouter } from "@golemio/core/dist/output-gateway/routes/BaseRouter";
|
|
5
|
+
import { NextFunction, Request, Response, Router } from "@golemio/core/dist/shared/express";
|
|
6
|
+
import { FloatingCarDataModel, FloatingCarExtendedDataModel, FloatingCarWithOsmPathDataModel, FloatingCarWithOsmPathExtendedDataModel } from "./models";
|
|
6
7
|
export declare class FCDRouter extends BaseRouter {
|
|
7
8
|
protected floatingCarDataModel: FloatingCarDataModel;
|
|
8
9
|
protected floatingCarWithOsmPathDataModel: FloatingCarWithOsmPathDataModel;
|
|
9
10
|
protected floatingCarExtendedDataModel: FloatingCarExtendedDataModel;
|
|
10
11
|
protected floatingCarWithOsmPathExtendedDataModel: FloatingCarWithOsmPathExtendedDataModel;
|
|
11
12
|
private outputFloatingCarDataTransformation;
|
|
13
|
+
protected cacheHeaderMiddleware: CacheHeaderMiddleware;
|
|
12
14
|
constructor(floatingCarDataModel: FloatingCarDataModel, floatingCarWithOsmPathDataModel: FloatingCarWithOsmPathDataModel, floatingCarExtendedDataModel: FloatingCarExtendedDataModel, floatingCarWithOsmPathExtendedDataModel: FloatingCarWithOsmPathExtendedDataModel, outputFloatingCarDataTransformation: OutputFloatingCarDataTransformation);
|
|
13
15
|
GetFloatingCarData: (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
14
16
|
}
|
|
@@ -10,13 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.fcdRouter = exports.FCDRouter = void 0;
|
|
13
|
+
const Di_1 = require("./ioc/Di");
|
|
14
|
+
const OutputFloatingCarDataTransformation_1 = require("./transformations/OutputFloatingCarDataTransformation");
|
|
15
|
+
const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
|
|
16
|
+
const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
|
|
17
|
+
const BaseRouter_1 = require("@golemio/core/dist/output-gateway/routes/BaseRouter");
|
|
13
18
|
const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
|
|
14
19
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
15
|
-
const redis_1 = require("@golemio/core/dist/output-gateway/redis");
|
|
16
|
-
const BaseRouter_1 = require("@golemio/core/dist/output-gateway/routes/BaseRouter");
|
|
17
|
-
const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
|
|
18
20
|
const models_1 = require("./models");
|
|
19
|
-
const OutputFloatingCarDataTransformation_1 = require("./transformations/OutputFloatingCarDataTransformation");
|
|
20
21
|
class FCDRouter extends BaseRouter_1.BaseRouter {
|
|
21
22
|
constructor(floatingCarDataModel, floatingCarWithOsmPathDataModel, floatingCarExtendedDataModel, floatingCarWithOsmPathExtendedDataModel, outputFloatingCarDataTransformation) {
|
|
22
23
|
super();
|
|
@@ -57,11 +58,12 @@ class FCDRouter extends BaseRouter_1.BaseRouter {
|
|
|
57
58
|
next(err);
|
|
58
59
|
}
|
|
59
60
|
});
|
|
61
|
+
this.cacheHeaderMiddleware = Di_1.FcdContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
|
|
60
62
|
this.router.get("/info", [
|
|
61
63
|
(0, express_validator_1.query)("osmPath").optional().not().isEmpty({ ignore_whitespace: true }).not().isArray(),
|
|
62
64
|
(0, express_validator_1.query)("locationId").optional().not().isEmpty({ ignore_whitespace: true }).not().isArray(),
|
|
63
65
|
(0, express_validator_1.query)("minutesBefore").optional().isInt({ min: 1, max: 60 }).not().isArray(),
|
|
64
|
-
], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)("FCDRouter"), (
|
|
66
|
+
], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)("FCDRouter"), this.cacheHeaderMiddleware.getMiddleware(3 * 60, 60), this.GetFloatingCarData);
|
|
65
67
|
}
|
|
66
68
|
}
|
|
67
69
|
exports.FCDRouter = FCDRouter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FCDRouter.js","sourceRoot":"","sources":["../../src/output-gateway/FCDRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"FCDRouter.js","sourceRoot":"","sources":["../../src/output-gateway/FCDRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FcdContainer = void 0;
|
|
4
|
+
const Di_1 = require("@golemio/core/dist/output-gateway/ioc/Di");
|
|
5
|
+
//#region Initialization
|
|
6
|
+
const fcdContainer = Di_1.OutputGatewayContainer.createChildContainer();
|
|
7
|
+
exports.FcdContainer = fcdContainer;
|
|
8
|
+
//# sourceMappingURL=Di.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../src/output-gateway/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,iEAAkF;AAGlF,wBAAwB;AACxB,MAAM,YAAY,GAAwB,2BAAsB,CAAC,oBAAoB,EAAE,CAAC;AAG/D,oCAAY"}
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -76,6 +76,12 @@ paths:
|
|
|
76
76
|
responses:
|
|
77
77
|
"200":
|
|
78
78
|
description: successful operation
|
|
79
|
+
headers:
|
|
80
|
+
Cache-Control:
|
|
81
|
+
description: Cache control directive for caching proxies
|
|
82
|
+
schema:
|
|
83
|
+
type: string
|
|
84
|
+
example: public, s-maxage=180, stale-while-revalidate=60
|
|
79
85
|
content:
|
|
80
86
|
application/json:
|
|
81
87
|
schema:
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/fcd",
|
|
3
|
-
"version": "1.2.8
|
|
3
|
+
"version": "1.2.8",
|
|
4
4
|
"description": "Golemio Floating Car Data Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"@commitlint/cli": "^11.0.0",
|
|
38
38
|
"@commitlint/config-conventional": "^11.0.0",
|
|
39
39
|
"@golemio/cli": "1.5.0",
|
|
40
|
-
"@golemio/core": "1.10.
|
|
40
|
+
"@golemio/core": "1.10.3",
|
|
41
41
|
"@golemio/db-common": "1.1.4",
|
|
42
42
|
"@golemio/eslint-config": "1.1.2",
|
|
43
43
|
"@golemio/traffic-common": "1.0.7",
|