From 43747fbe2264dfa2e37fc5da08d4de5f42638d85 Mon Sep 17 00:00:00 2001
From: Stig Norland <stig.norland@gmail.com>
Date: Tue, 14 Nov 2023 14:59:46 +0100
Subject: [PATCH] updated and synced test and prod resource mapping

---
 .../src/main/resources/resources_mapping.json | 36 +++++++++++--------
 .../resources/test_resources_mappings.json    | 20 ++++++++---
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/indexing-handlers/src/main/resources/resources_mapping.json b/indexing-handlers/src/main/resources/resources_mapping.json
index b39c71d53..8bd2e790f 100644
--- a/indexing-handlers/src/main/resources/resources_mapping.json
+++ b/indexing-handlers/src/main/resources/resources_mapping.json
@@ -8,6 +8,7 @@
           "type": "keyword"
         },
         "labels": {
+          "include_in_parent": true,
           "type": "nested"
         }
       }
@@ -29,10 +30,9 @@
                 },
                 "name": {
                   "type": "text",
-                  "include_in_parent": true,
-                  "fields" : {
-                    "keyword" : {
-                      "type" : "keyword"
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword"
                     }
                   }
                 }
@@ -42,12 +42,18 @@
               "type": "nested",
               "include_in_parent": true,
               "properties": {
-                "id": {
-                  "type": "keyword"
-                },
                 "labels": {
-                  "include_in_parent": true,
-                  "type": "nested"
+                  "type": "nested",
+                  "include_in_parent": true
+                },
+                "id": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -101,10 +107,10 @@
       }
     },
     "fundings": {
+      "type": "nested",
       "include_in_parent": true,
       "properties": {
         "id": {
-          "include_in_parent": true,
           "type": "text",
           "fields": {
             "keyword": {
@@ -113,16 +119,18 @@
             }
           }
         },
+        "identifier": {
+          "type": "keyword"
+        },
         "source": {
+          "type": "nested",
           "include_in_parent": true,
           "properties": {
             "identifier": {
-              "include_in_parent": true,
               "type": "keyword"
             },
             "id": {
               "type": "text",
-              "include_in_parent": true,
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -131,8 +139,8 @@
               }
             },
             "labels": {
-              "include_in_parent": true,
-              "type": "text"
+              "type": "nested",
+              "include_in_parent": true
             }
           }
         }
diff --git a/search-commons/src/test/resources/test_resources_mappings.json b/search-commons/src/test/resources/test_resources_mappings.json
index e46c6040f..a30997779 100644
--- a/search-commons/src/test/resources/test_resources_mappings.json
+++ b/search-commons/src/test/resources/test_resources_mappings.json
@@ -76,9 +76,6 @@
               "type": "nested",
               "include_in_parent": true,
               "properties": {
-                "id": {
-                  "type": "keyword"
-                },
                 "identifier": {
                   "type": "keyword"
                 },
@@ -111,7 +108,13 @@
       "include_in_parent": true,
       "properties": {
         "id": {
-          "type": "keyword"
+          "type": "text",
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          }
         },
         "identifier": {
           "type": "keyword"
@@ -123,6 +126,15 @@
             "identifier": {
               "type": "keyword"
             },
+            "id": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              }
+            },
             "labels": {
               "type": "nested",
               "include_in_parent": true