Fixed mapping problem where UK and FK share columns they are inserted

.docker/docker-compose.yml

@@ -109,7 +109,7 @@ services:
     restart: "no"
     container_name: dbrepo-metadata-service
     hostname: metadata-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.5
     volumes:
       - "${SHARED_VOLUME:-/tmp}:/tmp"
     environment:
@@ -172,7 +172,7 @@ services:
     restart: "no"
     container_name: dbrepo-analyse-service
     hostname: analyse-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.5
     environment:
       AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
       AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -225,7 +225,7 @@ services:
     restart: "no"
     container_name: dbrepo-search-db
     hostname: search-db
-    image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.5
     healthcheck:
       test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
       interval: 10s
@@ -249,7 +249,7 @@ services:
     restart: "no"
     container_name: dbrepo-search-service
     hostname: search-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.5
     environment:
       AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
       AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -271,7 +271,7 @@ services:
     restart: "no"
     container_name: dbrepo-data-db-sidecar
     hostname: data-db-sidecar
-    image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.5
     environment:
       S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
       S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -292,7 +292,7 @@ services:
     restart: "no"
     container_name: dbrepo-ui
     hostname: ui
-    image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.5
     environment:
       NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
       NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}"
@@ -360,7 +360,7 @@ services:
     init: true
     container_name: dbrepo-search-service-init
     hostname: search-service-init
-    image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5
     environment:
       METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
       OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
@@ -414,7 +414,7 @@ services:
     restart: "no"
     container_name: dbrepo-dashboard-service
     hostname: dashboard-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.5
     environment:
       LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
       LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
@@ -435,7 +435,7 @@ services:
     init: true
     container_name: dbrepo-storage-service-init
     hostname: storage-service-init
-    image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5
     environment:
       WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
       S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -475,7 +475,7 @@ services:
     restart: "no"
     container_name: dbrepo-data-service
     hostname: data-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.7
+    image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.5
     volumes:
       - "${SHARED_VOLUME:-/tmp}:/tmp"
     environment:

.docs/changelog.md

@@ -2,9 +2,9 @@
 author: Martin Weise
 ---
 
-## v1.4.7 (2024-11-06)
+## v1.5.0 (2024-11-06)
 
-[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.4.7)
+[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.5.0)
 
 !!! warning "Contains Breaking Changes"
 

.docs/index.md

@@ -2,6 +2,8 @@
 author: Martin Weise
 ---
 
+# DBRepo
+
 [![CI/CD Status](./images/pipeline.svg)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
 [![CI/CD Coverage](./images/coverage.svg)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
 [![Latest Release](https://img.shields.io/gitlab/v/release/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org&display_name=release&style=flat)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
@@ -10,7 +12,7 @@ author: Martin Weise
 [![Helm Chart version](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/dbrepo)](https://artifacthub.io/packages/helm/dbrepo/dbrepo){ tabindex=-1 }
 [![GitLab License](https://img.shields.io/gitlab/license/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org%2F&style=flat&cacheSeconds=3600)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
 
-Documentation for version: [v1.4.7](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
+Documentation for version: [v1.5.0](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
 
 DBRepo is a repository for data in databases that are used from the beginning until the end of a research 
 project supporting data evolution, -citation and -versioning. It implements the query store of the 

.docs/installation.md

@@ -11,7 +11,7 @@ author: Martin Weise
 If you have [Docker](https://docs.docker.com/engine/install/) already installed on your system, you can install DBRepo with:
 
 ```shell
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5/install.sh | bash
 ```
 
 !!! bug "Default installation security disclaimer"
@@ -38,7 +38,7 @@ SSL/TLS certificate is recommended. Follow the [secure install](#secure-install)
 Execute the install script to download only the environment and save it to `dist`.
 
 ```shell
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | DOWNLOAD_ONLY=1 bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5/install.sh | DOWNLOAD_ONLY=1 bash
 ```
 
 ### Static Configuration
@@ -80,7 +80,7 @@ the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`.
 Update the client secret of the `dbrepo-client`:
 
 ```bash
-curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/.scripts/reg-client-secret.sh" | bash
+curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5/.scripts/reg-client-secret.sh" | bash
 ```
    
 Also, update the JWT key according to the 

.docs/kubernetes.md

@@ -5,7 +5,7 @@ author: Martin Weise
 ## TL;DR
 
 To install DBRepo in your existing cluster, download the
-sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.7/helm/dbrepo/values.yaml)
+sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.5/helm/dbrepo/values.yaml)
 for your deployment and update the variables, especially `hostname`.
 
 ```shell
@@ -13,7 +13,7 @@ helm upgrade --install dbrepo \
   -n dbrepo \
   "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
   --values ./values.yaml \
-  --version "1.4.7" \
+  --version "1.5.0" \
   --create-namespace \
   --cleanup-on-fail
 ```

.docs/redirect.html

@@ -5,16 +5,16 @@
 <head>
     <meta charset="UTF-8">
     <title>Redirect Notice</title>
-    <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.4.7/'" />
+    <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.5/'" />
 </head>
 <body>
 <h1>Redirect Notice</h1>
 <p>
-    This page should automatically open the documentation for version <code>1.4.7</code>. In case this page does not load the site is
+    This page should automatically open the documentation for version <code>1.5</code>. In case this page does not load the site is
     available at:
 </p>
 <p>
-    <a href="/infrastructures/dbrepo/1.4.7/">/infrastructures/dbrepo/1.4.7/</a>
+    <a href="/infrastructures/dbrepo/1.5/">/infrastructures/dbrepo/1.5/</a>
 </p>
 </body>
 </html>
\ No newline at end of file

.docs/stylesheets/extra.css

 :root,
 [data-md-color-accent=indigo] {
+  --md-hue: 230;
+  --md-default-bg-color: hsla(230, 15%, 21%, 1);
   --md-primary-fg-color: #006699;
   --md-accent-fg-color: #005c8a;
   /* darken 10% */
@@ -28,5 +30,3 @@ img.img-border {
 
 .md-banner {
   background-color: var(--md-primary-fg-color--dark); }
-
-/*# sourceMappingURL=extra.css.map */

.docs/stylesheets/extra.scss

 :root,
 [data-md-color-accent=indigo] {
+  --md-hue: 230;
+  --md-default-bg-color: hsla(230, 15%, 21%, 1);
   --md-primary-fg-color: #006699;
   --md-accent-fg-color: #005c8a; /* darken 10% */
   --md-primary-fg-color--dark: #00537c; /* darken 10% */

.gitlab-ci.yml

@@ -3,8 +3,9 @@ variables:
   DOCKER_HOST: "unix:///var/run/dind/docker.sock"
   TESTCONTAINERS_RYUK_DISABLED: "false"
   PYTHON_VERSION: "3.11"
-  APP_VERSION: "1.4.7"
-  CHART_VERSION: "1.4.7"
+  DOC_VERSION: "1.5"
+  APP_VERSION: "1.5.0"
+  CHART_VERSION: "1.5.0"
   CACHE_FALLBACK_KEY: ${CI_DEFAULT_BRANCH}
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
@@ -416,15 +417,15 @@ release-docs:
     - "apk add --update alpine-sdk bash sed wget openssh jq curl"
     - "pip install pipenv"
     - "pip install -r ./requirements.txt"
-    - "mkdir -p ./final/${APP_VERSION}/rest"
+    - "mkdir -p ./final/${DOC_VERSION}/rest"
   script:
     - "make gen-lib-doc gen-docs-doc package-config"
-    - "cp -r ./lib/python/docs/build/html ./final/${APP_VERSION}/python" # sphinx
-    - "cp .docs/.swagger/api.yaml ./final/${APP_VERSION}/rest/api.yaml" # swagger
-    - "cp .docs/.swagger/swagger-ui.html ./final/${APP_VERSION}/rest/index.html" # swagger
-    - "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/rest/custom.css" # swagger
-    - "cp -r ./site/* ./final/${APP_VERSION}" # mkdocs
-    - "cp .docker/dist.tar.gz ./final/${APP_VERSION}/dist.tar.gz" # dist
+    - "cp -r ./lib/python/docs/build/html ./final/${DOC_VERSION}/python" # sphinx
+    - "cp .docs/.swagger/api.yaml ./final/${DOC_VERSION}/rest/api.yaml" # swagger
+    - "cp .docs/.swagger/swagger-ui.html ./final/${DOC_VERSION}/rest/index.html" # swagger
+    - "cp .docs/.swagger/custom.css ./final/${DOC_VERSION}/rest/custom.css" # swagger
+    - "cp -r ./site/* ./final/${DOC_VERSION}" # mkdocs
+    - "cp .docker/dist.tar.gz ./final/${DOC_VERSION}/dist.tar.gz" # dist
     - "bash ./.gitlab/gen-badge.sh"
     - eval $(ssh-agent -s)
     - "mkdir -p /root/.ssh"
@@ -435,7 +436,7 @@ release-docs:
     - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa final.tar.gz $CI_DOC_USER@$CI_DOC_IP:final.tar.gz"
     - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa versions.json $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/versions.json"
     - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa .docs/redirect.html $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/index.html"
-    - 'ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; rm -rf ./final"'
+    - 'ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${DOC_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo/${DOC_VERSION}; rm -rf ./final"'
 
 release-libs:
   stage: release

Makefile

 .PHONY: all
 
-APP_VERSION ?= 1.4.7
-CHART_VERSION ?= 1.4.7
+APP_VERSION ?= 1.5.0
+CHART_VERSION ?= 1.5.0
 REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo
 
 .PHONY: all

README.md

@@ -16,7 +16,7 @@ If you have [Docker](https://docs.docker.com/engine/install/) already installed
 with:
 
 ```bash
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.5.0/install.sh | bash
 ```
 
 ## Documentation

dbrepo-analyse-service/Pipfile

@@ -21,7 +21,7 @@ numpy = "*"
 pandas = "*"
 minio = "*"
 pydantic = "*"
-dbrepo = {path = "./lib/dbrepo-1.4.7.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.5.0.tar.gz"}
 opensearch-py = "*"
 
 [dev-packages]

dbrepo-analyse-service/Pipfile.lock

 {
     "_meta": {
         "hash": {
-            "sha256": "9e1fb16b1632a76b8a2fb6ac372b92556c573a7246bd37dd32813559bb27c8d9"
+            "sha256": "54251c15d82f7fdca3b1c8f28093b5f5667acc7de2caa0bc55dfaebe671234f4"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -440,9 +440,9 @@
         },
         "dbrepo": {
             "hashes": [
-                "sha256:36316d520c23dcbd249b779ad596a979fe574321882a7d4b6c6934c62a5de57b"
+                "sha256:6e3c7731b432a238de12044669db1deeca693b2086abcd7d483ddb9829b9b782"
             ],
-            "path": "./lib/dbrepo-1.4.7.tar.gz"
+            "path": "./lib/dbrepo-1.5.0.tar.gz"
         },
         "events": {
             "hashes": [
@@ -1629,7 +1629,7 @@
                 "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
                 "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
             ],
-            "markers": "python_version >= '3.8'",
+            "markers": "python_version < '3.13'",
             "version": "==4.12.2"
         },
         "tzdata": {
@@ -1650,11 +1650,11 @@
         },
         "werkzeug": {
             "hashes": [
-                "sha256:8cd39dfbdfc1e051965f156163e2974e52c210f130810e9ad36858f0fd3edad4",
-                "sha256:a71124d1ef06008baafa3d266c02f56e1836a5984afd6dd6c9230669d60d9fb5"
+                "sha256:4f7d1a5de312c810a8a2c6f0b47e9f6a7cffb7c8322def35e4d4d9841ff85597",
+                "sha256:f471a4cd167233077e9d2a8190c3471c5bc520c636a9e3c1e9300c33bced03bc"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==3.1.1"
+            "version": "==3.1.2"
         },
         "yarl": {
             "hashes": [
@@ -2274,7 +2274,7 @@
                 "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
                 "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
             ],
-            "markers": "python_version >= '3.8'",
+            "markers": "python_version < '3.13'",
             "version": "==4.12.2"
         },
         "urllib3": {

dbrepo-analyse-service/app.py

@@ -188,7 +188,7 @@ template = {
     "info": {
         "title": "Database Repository Analyse Service API",
         "description": "Service that analyses data structures",
-        "version": "1.4.7",
+        "version": "1.5",
         "contact": {
             "name": "Prof. Andreas Rauber",
             "email": "andreas.rauber@tuwien.ac.at"
@@ -200,7 +200,7 @@ template = {
     },
     "externalDocs": {
         "description": "Sourcecode Documentation",
-        "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/"
+        "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/"
     },
     "servers": [
         {