From 86bdff4391d902afb04cef22eb2a013db5619c71 Mon Sep 17 00:00:00 2001
From: Ann Catton <ann.catton@oicr.on.ca>
Date: Tue, 5 May 2020 12:24:38 -0400
Subject: [PATCH 1/3] Update file centric id fields

---
 mappings/maestro_file_centric.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mappings/maestro_file_centric.json b/mappings/maestro_file_centric.json
index 913808d..5ff95be 100644
--- a/mappings/maestro_file_centric.json
+++ b/mappings/maestro_file_centric.json
@@ -108,7 +108,7 @@
       },
       "file": {
         "properties": {
-          "id": {
+          "file_id": {
             "type": "keyword"
           },
           "size": {
@@ -145,7 +145,7 @@
       "donors": {
         "type": "nested",
         "properties": {
-          "id": {
+          "donor_id": {
             "type": "keyword",
             "copy_to": ["file_autocomplete"]
           },
@@ -159,7 +159,7 @@
           "specimens": {
             "type": "nested",
             "properties": {
-              "id": {
+              "specimen_id": {
                 "type": "keyword",
                 "copy_to": ["file_autocomplete"]
               },
@@ -179,7 +179,7 @@
               "samples": {
                 "type": "nested",
                 "properties": {
-                  "id": {
+                  "sample_id": {
                     "type": "keyword",
                     "copy_to": ["file_autocomplete"]
                   },

From aa286adde5b4508ba7319cf9f4c406cf59a7bde0 Mon Sep 17 00:00:00 2001
From: Ann Catton <ann.catton@oicr.on.ca>
Date: Tue, 5 May 2020 15:12:03 -0400
Subject: [PATCH 2/3] update analysis mappings

---
 mappings/maestro_analysis_centric.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mappings/maestro_analysis_centric.json b/mappings/maestro_analysis_centric.json
index 59096eb..9041ed7 100644
--- a/mappings/maestro_analysis_centric.json
+++ b/mappings/maestro_analysis_centric.json
@@ -94,7 +94,7 @@
       "files": {
         "type": "nested",
         "properties": {
-          "id": {
+          "file_id": {
             "type": "keyword",
             "copy_to": ["analysis_autocomplete"]
           },
@@ -126,7 +126,7 @@
       "donors": {
         "type": "nested",
         "properties": {
-          "id": {
+          "donor_id": {
             "type": "keyword",
             "copy_to": ["analysis_autocomplete"]
           },
@@ -140,7 +140,7 @@
           "specimens": {
             "type": "nested",
             "properties": {
-              "id": {
+              "specimen_id": {
                 "type": "keyword",
                 "copy_to": ["analysis_autocomplete"]
               },
@@ -160,7 +160,7 @@
               "samples": {
                 "type": "nested",
                 "properties": {
-                  "id": {
+                  "sample_id": {
                     "type": "keyword",
                     "copy_to": ["analysis_autocomplete"]
                   },

From 04f785a609cc68ef782ba26e0212cb8c9b3097a0 Mon Sep 17 00:00:00 2001
From: Ann Catton <ann.catton@oicr.on.ca>
Date: Tue, 5 May 2020 15:17:49 -0400
Subject: [PATCH 3/3] update platform mapping

---
 mappings/platform_file_centric.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mappings/platform_file_centric.json b/mappings/platform_file_centric.json
index daafbaf..ea473c6 100644
--- a/mappings/platform_file_centric.json
+++ b/mappings/platform_file_centric.json
@@ -111,7 +111,7 @@
       },
       "file": {
         "properties": {
-          "id": {
+          "file_id": {
             "type": "keyword"
           },
           "size": {
@@ -148,7 +148,7 @@
       "donors": {
         "type": "nested",
         "properties": {
-          "id": {
+          "donor_id": {
             "type": "keyword",
             "copy_to": ["file_autocomplete"]
           },
@@ -193,7 +193,7 @@
           "follow_ups": {
             "type": "nested",
             "properties": {
-              "id": {
+              "follow_up_id": {
                 "type": "keyword"
               },
               "submitter_follow_up_id": {
@@ -210,7 +210,7 @@
           "treatments": {
             "type": "nested",
             "properties": {
-              "id": {
+              "treatment_id": {
                 "type": "keyword"
               },
               "submitter_treatment_id": {
@@ -227,7 +227,7 @@
           "specimens": {
             "type": "nested",
             "properties": {
-              "id": {
+              "specimen_id": {
                 "type": "keyword",
                 "copy_to": ["file_autocomplete"]
               },
@@ -274,7 +274,7 @@
               "samples": {
                 "type": "nested",
                 "properties": {
-                  "id": {
+                  "sample_id": {
                     "type": "keyword",
                     "copy_to": ["file_autocomplete"]
                   },