From 85b6e887a077d472a5d45c655ea8ca8b22715ca4 Mon Sep 17 00:00:00 2001
From: Cyril Pommier <cyril.pommier@inrae.fr>
Date: Tue, 20 Aug 2024 16:47:05 +0200
Subject: [PATCH] Change path 
 backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/ to
  backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/

---
 .gitlab-ci.yml                                                | 4 ++--
 Dockerfile                                                    | 4 ++--
 .../urgi/faidare/repository/es/setup/index/README.md          | 0
 .../repository/es/setup/index/datadiscovery_mapping.json      | 0
 .../repository/es/setup/index/germplasmAttribute_mapping.json | 0
 .../repository/es/setup/index/germplasmMcpd_mapping.json      | 0
 .../repository/es/setup/index/germplasmPedigree_mapping.json  | 0
 .../repository/es/setup/index/germplasmProgeny_mapping.json   | 0
 .../faidare/repository/es/setup/index/germplasm_mapping.json  | 0
 .../faidare/repository/es/setup/index/location_mapping.json   | 0
 .../repository/es/setup/index/observationUnit_mapping.json    | 0
 .../faidare/repository/es/setup/index/program_mapping.json    | 0
 .../urgi/faidare/repository/es/setup/index/settings.json      | 0
 .../urgi/faidare/repository/es/setup/index/study_mapping.json | 0
 .../urgi/faidare/repository/es/setup/index/trial_mapping.json | 0
 .../urgi/faidare/repository/es/setup/index/xref_mapping.json  | 0
 scripts/harvest.sh                                            | 4 ++--
 17 files changed, 6 insertions(+), 6 deletions(-)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/README.md (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/datadiscovery_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/germplasmAttribute_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/germplasmMcpd_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/germplasmPedigree_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/germplasmProgeny_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/germplasm_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/location_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/observationUnit_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/program_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/settings.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/study_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/trial_mapping.json (100%)
 rename backend/src/test/resources/fr/{inra => inrae}/urgi/faidare/repository/es/setup/index/xref_mapping.json (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7f52743..5a1674de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,8 @@ build-loader-docker-image:
     - changes:
       - Dockerfile
       - scripts/*
-      - backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/*_mapping.json
-      - backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/settings.json
+      - backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/*_mapping.json
+      - backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/settings.json
       - .gitlab-ci.yml
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   allow_failure: true
diff --git a/Dockerfile b/Dockerfile
index 75b15021..5ecb550f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ COPY scripts/harvest.sh /opt/scripts/
 COPY scripts/to_bulk.jq /opt/scripts/
 
 # COPY dao settings
-COPY backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/settings.json /opt/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/settings.json
+COPY backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/settings.json /opt/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/settings.json
 
 # COPY dao mappings
-COPY backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/*_mapping.json /opt/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/
+COPY backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/*_mapping.json /opt/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/
 
 RUN apk add --update --no-cache bash curl jq parallel wget grep gzip sed date coreutils
 
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/README.md b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/README.md
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/README.md
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/README.md
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/datadiscovery_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/datadiscovery_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/datadiscovery_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/datadiscovery_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmAttribute_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasmAttribute_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmAttribute_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasmAttribute_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmMcpd_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasmMcpd_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmMcpd_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasmMcpd_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmPedigree_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasmPedigree_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmPedigree_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasmPedigree_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmProgeny_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasmProgeny_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmProgeny_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasmProgeny_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasm_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasm_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasm_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/germplasm_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/location_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/location_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/location_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/location_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/observationUnit_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/observationUnit_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/observationUnit_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/observationUnit_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/program_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/program_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/program_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/program_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/settings.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/settings.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/settings.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/settings.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/study_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/study_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/study_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/study_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/trial_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/trial_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/trial_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/trial_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/xref_mapping.json b/backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/xref_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/xref_mapping.json
rename to backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/xref_mapping.json
diff --git a/scripts/harvest.sh b/scripts/harvest.sh
index 0bd5f7f5..5dd121ae 100755
--- a/scripts/harvest.sh
+++ b/scripts/harvest.sh
@@ -153,8 +153,8 @@ for DOCUMENT_TYPE in ${DOCUMENT_TYPES}; do
 	\"index_patterns\": [\"${INDEX_PATTERN}-*\"],
 	\"order\": 101,
 	\"mappings\":
-		$(cat "${BASEDIR}"/../backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/${DOCUMENT_TYPE}_mapping.json),
-	\"settings\": $(cat "${BASEDIR}"/../backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/settings.json)
+		$(cat "${BASEDIR}"/../backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/${DOCUMENT_TYPE}_mapping.json),
+	\"settings\": $(cat "${BASEDIR}"/../backend/src/test/resources/fr/inrae/urgi/faidare/repository/es/setup/index/settings.json)
 }")
 	check_acknowledgment "${LOG}" "create template"
 
-- 
GitLab