From 66367a853fa6b1d5d75b03c8c9e4b4106473e38d Mon Sep 17 00:00:00 2001
From: Bobby Sharp <bsharp@ebsco.com>
Date: Thu, 7 Dec 2023 12:35:32 -0500
Subject: [PATCH 1/2] Change valueGetter type to string

---
 src/main/resources/swagger.api/schemas/entityTypeColumn.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/swagger.api/schemas/entityTypeColumn.json b/src/main/resources/swagger.api/schemas/entityTypeColumn.json
index 08e891c..798a1ce 100644
--- a/src/main/resources/swagger.api/schemas/entityTypeColumn.json
+++ b/src/main/resources/swagger.api/schemas/entityTypeColumn.json
@@ -37,7 +37,7 @@
     },
     "valueGetter": {
       "description": "Configuration defining how to fetch values of this column from the underlying datasource.",
-      "$ref": "columnValueGetter.json"
+      "type": "string"
     },
     "filterValueGetter": {
       "description": "Configuration defining how to filter values of this column from the underlying datasource when indexed values aren't very user-friendly.",

From b4b06a9ffdc206713f3a14d5c32ceb858ac1f7df Mon Sep 17 00:00:00 2001
From: Bobby Sharp <bsharp@ebsco.com>
Date: Thu, 14 Dec 2023 11:40:07 -0500
Subject: [PATCH 2/2] Add fromClause and idView fields to entity type
 definition

---
 .../schemas/columnValueGetter.json            | 20 -------------------
 .../swagger.api/schemas/entityType.json       |  8 ++++++++
 2 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 src/main/resources/swagger.api/schemas/columnValueGetter.json

diff --git a/src/main/resources/swagger.api/schemas/columnValueGetter.json b/src/main/resources/swagger.api/schemas/columnValueGetter.json
deleted file mode 100644
index 943b005..0000000
--- a/src/main/resources/swagger.api/schemas/columnValueGetter.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "title": "Configuration for fetching data of a column from the underlying datasource",
-  "description": "Configuration for fetching data of a column from the underlying datasource",
-  "type": "object",
-  "properties": {
-    "type": {
-      "description": "Type of the data extraction strategy to be applied",
-      "type": "string",
-      "enum": ["rmb_jsonb"]
-    },
-    "param": {
-      "description": "Parameter of the data extraction strategy. Value of this field is specific to the extraction strategy used.",
-      "type": "string"
-    }
-  },
-  "required": [
-    "content"
-  ]
-}
diff --git a/src/main/resources/swagger.api/schemas/entityType.json b/src/main/resources/swagger.api/schemas/entityType.json
index 701b6a6..e52166a 100644
--- a/src/main/resources/swagger.api/schemas/entityType.json
+++ b/src/main/resources/swagger.api/schemas/entityType.json
@@ -43,6 +43,14 @@
         "items": {
           "$ref": "entityTypeDefaultSort.json"
         }
+      },
+      "fromClause": {
+        "description": "FROM clause containing all src views that need to be joined to query this entity type",
+        "type": "string"
+      },
+      "idView": {
+        "description": "View from which the content IDs for this entity type are extracted",
+        "type": "string"
       }
     },
     "required": [