Merge branch 'add-vocabs-route'

See PR #32
DigitalCommons · Oct 28, 2024 · 02db1b9 · 02db1b9
2 parents ab1d574 + b112381
commit 02db1b9
Show file tree

Hide file tree

Showing 22 changed files with 1,965 additions and 489 deletions.
diff --git a/apps/back-end/src/routes.ts b/apps/back-end/src/routes.ts
@@ -137,6 +137,18 @@ export function MykomapRouter(
       return reply;
     },
 
+    async getConfig({ params: { datasetId }, request, reply }) {
+      // Validate the parameters some more
+
+      if (!sendJson(request, reply, filePath("datasets", datasetId, "config")))
+        throw new TsRestResponseError(contract.getDataset, {
+          status: 404,
+          body: { message: `unknown datasetId '${datasetId}'` },
+        });
+
+      return reply;
+    },
+
     async getVersion(req) {
       return {
         body: __BUILD_INFO__,

diff --git a/apps/back-end/test/data/config/dataset-A/config.json b/apps/back-end/test/data/config/dataset-A/config.json
diff --git a/apps/back-end/test/data/datasets/dataset-A/initiatives/0.json b/apps/back-end/test/data/datasets/dataset-A/initiatives/0.json
diff --git a/apps/back-end/test/data/datasets/dataset-A/initiatives/1.json b/apps/back-end/test/data/datasets/dataset-A/initiatives/1.json
diff --git a/apps/back-end/test/data/datasets/dataset-A/locations.json b/apps/back-end/test/data/datasets/dataset-A/locations.json
diff --git a/apps/back-end/test/data/datasets/dataset-A/searchable.json b/apps/back-end/test/data/datasets/dataset-A/searchable.json
diff --git a/apps/back-end/test/data/datasets/test-A.json b/apps/back-end/test/data/datasets/test-A.json
@@ -0,0 +1 @@
+[[1,2],[3,2],[5,2],["a",3]]
diff --git a/apps/back-end/test/data/datasets/test-A/config.json b/apps/back-end/test/data/datasets/test-A/config.json
@@ -0,0 +1,30 @@
+{
+  "prefixes": {
+    "https://dev.lod.coop/essglobal/2.1/standard/activities-modified/": "am"
+  },
+  "vocabs": {
+    "am": {
+      "en": {
+        "title": "Activities (Modified)",
+        "terms": {
+          "AM10": "Arts, Media, Culture & Leisure",
+          "AM20": "Campaigning, Activism & Advocacy",
+          "AM30": "Community & Collective Spaces",
+          "AM40": "Education",
+          "AM50": "Energy",
+          "AM60": "Food",
+          "AM70": "Goods & Services",
+          "AM80": "Health, Social Care & Wellbeing",
+          "AM90": "Housing",
+          "AM100": "Money & Finance",
+          "AM110": "Nature, Conservation & Environment",
+          "AM120": "Reduce, Reuse, Repair & Recycle",
+          "AM130": "Agriculture",
+          "AM140": "Industry",
+          "AM150": "Utilities",
+          "AM160": "Transport"
+        }
+      }
+    }
+  }
+}
diff --git a/apps/back-end/test/data/datasets/test-A/items/0.json b/apps/back-end/test/data/datasets/test-A/items/0.json
@@ -0,0 +1 @@
+{"id":0, "a":"a:foo", "b":"b:bar", "desc": "humbug"}
diff --git a/apps/back-end/test/data/datasets/test-A/search/a:foo/b:bar/text.json b/apps/back-end/test/data/datasets/test-A/search/a:foo/b:bar/text.json
@@ -0,0 +1 @@
+[2]
diff --git a/apps/back-end/test/data/datasets/test-A/search/a:foo/text.json b/apps/back-end/test/data/datasets/test-A/search/a:foo/text.json
@@ -0,0 +1 @@
+[1]
diff --git a/apps/back-end/test/validation.test.ts b/apps/back-end/test/validation.test.ts
diff --git a/libs/common/package.json b/libs/common/package.json
@@ -13,11 +13,12 @@
     "prebuild": "npm run generate-openapi",
     "build": "vite build",
     "generate-openapi": "npx vite-node src/api/generate-openapi.ts",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "vitest run"
   },
   "dependencies": {
     "@ts-rest/core": "^3.51.0",
     "@ts-rest/open-api": "^3.51.0",
+    "glob": "^11.0.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -26,6 +27,7 @@
     "typescript": "^5.5.4",
     "vite": "^5.4.3",
     "vite-node": "^2.0.5",
-    "vite-plugin-dts": "^4.1.0"
+    "vite-plugin-dts": "^4.1.0",
+    "vite-test": "^0.4.0"
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"id":0, "a":"a:foo", "b":"b:bar", "desc": "humbug"}