@golemio/municipal-libraries 1.3.8 → 1.4.0

package/dist/schema-definitions/models/OpeningHoursModel.js

@@ -11,7 +11,7 @@ OpeningHoursModel.attributeModel = {
         primaryKey: true,
         autoIncrement: true,
     },
-    library_id: sequelize_1.DataTypes.INTEGER,
+    library_id: sequelize_1.DataTypes.STRING(255),
     day_of_week: sequelize_1.DataTypes.STRING(255),
     opens: sequelize_1.DataTypes.STRING(255),
     closes: sequelize_1.DataTypes.STRING(255),
@@ -19,6 +19,7 @@ OpeningHoursModel.attributeModel = {
     is_default: sequelize_1.DataTypes.BOOLEAN,
     valid_from: sequelize_1.DataTypes.DATE,
     valid_through: sequelize_1.DataTypes.DATE,
+    type: sequelize_1.DataTypes.STRING(255),
 };
 OpeningHoursModel.updateAttributes = Object.keys(OpeningHoursModel.attributeModel)
     .filter((att) => att !== "id")
@@ -29,7 +30,7 @@ OpeningHoursModel.jsonSchema = {
         type: "object",
         properties: {
             id: { type: "integer" },
-            library_id: { type: "integer" },
+            library_id: { type: "string" },
             day_of_week: { type: "string" },
             opens: { type: "string" },
             closes: { type: "string" },
@@ -37,8 +38,9 @@ OpeningHoursModel.jsonSchema = {
             is_default: { type: "boolean" },
             valid_from: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
             valid_through: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
+            type: { type: "string" },
         },
-        required: ["library_id", "day_of_week", "opens", "closes", "description", "is_default"],
+        required: ["library_id", "day_of_week", "opens", "closes", "description", "is_default", "type"],
     },
 };
 //# sourceMappingURL=OpeningHoursModel.js.map

package/dist/schema-definitions/models/OpeningHoursModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpeningHoursModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/OpeningHoursModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,MAAa,iBAAkB,SAAQ,iBAAoB;;AAA3D,8CAiDC;AAtCiB,gCAAc,GAAsD;IAC9E,EAAE,EAAE;QACA,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE,IAAI;KACtB;IACD,UAAU,EAAE,qBAAS,CAAC,OAAO;IAC7B,WAAW,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAClC,KAAK,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC5B,MAAM,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC7B,WAAW,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAClC,UAAU,EAAE,qBAAS,CAAC,OAAO;IAC7B,UAAU,EAAE,qBAAS,CAAC,IAAI;IAC1B,aAAa,EAAE,qBAAS,CAAC,IAAI;CAChC,CAAC;AAEY,kCAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;KACzE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC;KAC7B,MAAM,CAAC,YAAY,CAA+B,CAAC;AAE1C,4BAAU,GAAoC;IACxD,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACvB,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YAC7E,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;SACnF;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,CAAC;KAC1F;CACJ,CAAC"}
+{"version":3,"file":"OpeningHoursModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/OpeningHoursModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,MAAa,iBAAkB,SAAQ,iBAAoB;;AAA3D,8CAoDC;AAxCiB,gCAAc,GAAsD;IAC9E,EAAE,EAAE;QACA,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE,IAAI;KACtB;IACD,UAAU,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IACjC,WAAW,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAClC,KAAK,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC5B,MAAM,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC7B,WAAW,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAClC,UAAU,EAAE,qBAAS,CAAC,OAAO;IAC7B,UAAU,EAAE,qBAAS,CAAC,IAAI;IAC1B,aAAa,EAAE,qBAAS,CAAC,IAAI;IAC7B,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;CAC9B,CAAC;AAEY,kCAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;KACzE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC;KAC7B,MAAM,CAAC,YAAY,CAA+B,CAAC;AAE1C,4BAAU,GAAoC;IACxD,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACvB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YAC7E,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YAChF,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,CAAC;KAClG;CACJ,CAAC"}

package/docs/implementation_documentation.md

@@ -15,12 +15,11 @@ Modul slouží k ukládání a poskytování informací o městských knihovnác
 #### _open data MLP_
 
 -   zdroj dat
-    -   url: [config.datasources.MunicipalLibraries](https://www.mlp.cz/cz/pobocky/?export=xml)
-    -   pozor při načtení url proběhne několik přesměrování na doplnění cookies
+    -   url: [config.datasources.MunicipalLibraries](https://www.mlp.cz/api/v1/branches)
 -   formát dat
     -   protokol: http
     -   datový typ: json
-    -   validační schéma: [municipalLibrariesJsonSchema](https://gitlab.com/operator-ict/golemio/code/modules/municipal-libraries/-/blob/development/src/integration-engine/datasources/MunicipalLibrariesDataSource.ts)
+    -   validační schéma: [municipalLibrariesJsonSchema](https://gitlab.com/operator-ict/golemio/code/modules/municipal-libraries/-/blob/development/src/schema-definitions/datasources/MunicipalLibrariesJsonSchema.ts)
     -   příklad [vstupních dat](https://gitlab.com/operator-ict/golemio/code/modules/municipal-libraries/-/blob/development/test/integration-engine/data/municipallibraries-datasource.json)
 -   frekvence stahování
     -   cron definice:
@@ -34,6 +33,12 @@ Modul slouží k ukládání a poskytování informací o městských knihovnác
 
 Při transformaci data obohacujeme o atribut `district`, která vychází z polohy dané knihovny a získává se metodou `cityDistrictsModel.getDistrict` v modulu city-district.
 
+Primární klíč `libraries.id` je odvozován z URL slug dané pobočky (cesta za TLD z `website_url` bez parametrů/kotev).
+
+Pobočky jsou filtrovány: zpracovávají se pouze záznamy s `show_in_list: true`, platnou `website_url` a nenulovými GPS souřadnicemi.
+
+Služby (tabulka `services`) jsou odvozovány výhradně z pole `barrier_free` — pokud je `true`, je přiřazena jedna hardcodovaná služba "Bezbariérový přístup" (id = 3).
+
 ### _MunicipalLibrariesWorker_
 
 #### _task: RefreshDataInDBTask_

package/docs/openapi.yaml

@@ -134,9 +134,9 @@ paths:
                   in: path
                   description: Identifier of the Municipal Library.
                   required: true
-                  example: 5
+                  example: ustredni-knihovna-suteren
                   schema:
-                      type: number
+                      type: string
             responses:
                 "200":
                     description: OK
@@ -246,8 +246,8 @@ components:
                             type: string
                             example: knihovna@mlp.cz
                         id:
-                            type: number
-                            example: 68
+                            type: string
+                            example: ustredni-knihovna-suteren
                         name:
                             type: string
                             example: Sběrný dvůr hlavního města Prahy Proboštská
@@ -279,6 +279,10 @@ components:
                                         type: string
                                         nullable: true
                                         example: 2022-01-01T23:00:00.000Z
+                                    type:
+                                        type: string
+                                        enum: [standard, self_service]
+                                        example: standard
                         services:
                             type: array
                             items:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/municipal-libraries",
-    "version": "1.3.8",
+    "version": "1.4.0",
     "description": "Golemio Municipal Libraries Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -8,10 +8,12 @@
         "build": "rimraf ./dist && tspc -p ./tsconfig.build.json",
         "build-minimal": "run-s 'build -- --sourceMap false --declaration false'",
         "build-watch": "run-s 'build -- --watch --preserveWatchOutput'",
-        "pretest": "golemio import-db-data --postgres",
-        "test": "cross-env NODE_ENV=test mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r tsconfig-paths/register -r dotenv/config --file 'test/setup.ts' 'test/**/*.test.ts'",
+        "prepare-db": "golemio import-db-data --postgres",
+        "test:only": "cross-env NODE_ENV=test mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r tsconfig-paths/register -r dotenv/config --file 'test/setup.ts' 'test/**/*.test.ts'",
+        "test": "run-s prepare-db test:only",
         "test-debug": "run-s 'test -- --inspect-brk=9230'",
-        "code-coverage": "nyc run-s 'test -- -r source-map-support/register'",
+        "coverage:only": "nyc --reporter=text --reporter=lcov npm run test:only -- -r source-map-support/register",
+        "code-coverage": "run-s prepare-db coverage:only",
         "migrate-db": "golemio migrate-db up --postgres",
         "generate-docs": "typedoc --out docs/typedoc src",
         "lint": "eslint \"{src,test}/**/*.ts\""
@@ -26,37 +28,37 @@
         "url": "https://gitlab.com/operator-ict/golemio/code/modules/municipal-libraries"
     },
     "engines": {
-        "node": ">=20.0.0",
-        "npm": ">=8.0.0"
+        "node": ">=24.0.0",
+        "npm": ">=11.0.0"
     },
     "devDependencies": {
         "@commitlint/cli": "^11.0.0",
         "@commitlint/config-conventional": "^11.0.0",
-        "@golemio/city-districts": "1.4.0",
-        "@golemio/cli": "1.11.0",
-        "@golemio/core": "1.22.1",
-        "@golemio/db-common": "1.2.0",
-        "@golemio/eslint-config": "1.1.2",
-        "@types/chai": "4.2.3",
-        "@types/chai-as-promised": "7.1.2",
-        "@types/mocha": "^9.1.0",
-        "@types/node": "^20.12.7",
-        "@types/sinon": "^9.0.10",
-        "@types/supertest": "^2.0.12",
-        "chai": "4.2.0",
-        "chai-as-promised": "7.1.1",
+        "@golemio/city-districts": "1.4.5",
+        "@golemio/cli": "1.11.2",
+        "@golemio/core": "3.1.1",
+        "@golemio/db-common": "1.2.2",
+        "@golemio/eslint-config": "1.1.4",
+        "@types/chai": "^5.2.3",
+        "@types/chai-as-promised": "^8.0.2",
+        "@types/mocha": "^10.0.10",
+        "@types/node": "^24.12.4",
+        "@types/sinon": "^21.0.0",
+        "@types/supertest": "^6.0.3",
+        "chai": "^6.2.2",
+        "chai-as-promised": "^8.0.2",
         "cross-env": "^7.0.3",
         "eslint": "^8.1.1",
         "husky": "^4.3.7",
-        "mocha": "^9.1.2",
+        "mocha": "^11.7.5",
         "npm-run-all": "^4.1.5",
         "nyc": "^15.1.0",
         "prettier": "^2.5.1",
         "pretty-quick": "^3.1.0",
         "rimraf": "^3.0.2",
-        "sinon": "^9.2.3",
+        "sinon": "^21.0.1",
         "source-map-support": "0.5.21",
-        "supertest": "^6.2.4",
+        "supertest": "^7.1.4",
         "ts-node": "^10.9.1",
         "ts-patch": "3.0.0-beta3",
         "tsconfig-paths": "^4.2.0",