MODFQMMGR-548:Refactor array handling to treat arrays as JSONB

folio-org · Dec 16, 2024 · 3209921 · 3209921
1 parent 8db5399
commit 3209921
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -201,8 +201,8 @@
                 <!-- the commas at the start and end of each line are load-bearing, as otherwise openapi-generator will include the newline/indentation as part of the model name -->
                 ,errors,error,parameters,parameter,resultsetPage,
                 ,entityType,field,entityTypeColumn,entityTypeRelation,entityTypeDefaultSort,sourceColumn,entityTypeSource,entityTypeSourceJoin,
-                ,entityDataType,arrayType,dateType,objectType,enumType,booleanType,integerType,openUUIDType,stringType,numberType,rangedUUIDType,stringUUIDType,
-                ,nestedObjectProperty,valueWithLabel,valueSourceApi,columnValues,columnValueGetter,
+                ,entityDataType,arrayType,jsonbArrayType,dateType,objectType,enumType,booleanType,integerType,openUUIDType,stringType,numberType,rangedUUIDType,stringUUIDType,
+                ,nestedObjectProperty,valueWithLabel,valueSourceApi,columnValues,columnValueGetter
                 ,queryDetails,queryIdentifier,
                 ,submitQuery,contentsRequest,fqmMigrateRequest,fqmMigrateResponse,fqmMigrateWarning
               </modelsToGenerate>

diff --git a/src/main/resources/swagger.api/queryTool.yaml b/src/main/resources/swagger.api/queryTool.yaml
@@ -356,6 +356,8 @@ components:
       $ref: schemas/entityDataType.json#/NestedObjectProperty
     arrayType:
       $ref: schemas/entityDataType.json#/ArrayType
+    jsonbArrayType:
+      $ref: schemas/entityDataType.json#/JsonbArrayType
     entityTypeDefaultSort:
       $ref: schemas/entityTypeDefaultSort.json
     errors:

diff --git a/src/main/resources/swagger.api/schemas/entityDataType.json b/src/main/resources/swagger.api/schemas/entityDataType.json
@@ -152,5 +152,16 @@
         "$ref": "#/ArrayTypeContainer"
       }
     ]
+  },
+  "JsonbArrayType": {
+    "description": "Entity field type defined in https://issues.folio.org/browse/UIPQB-6",
+    "allOf": [
+      {
+        "$ref": "entityDataType.json#/EntityDataType"
+      },
+      {
+        "$ref": "#/ArrayTypeContainer"
+      }
+    ]
   }
 }
diff --git a/src/main/resources/swagger.api/schemas/field.json b/src/main/resources/swagger.api/schemas/field.json
@@ -58,11 +58,6 @@
     "ecsOnly": {
       "description": "Indicates if the field is available only in ECS environments",
       "type": "boolean"
-    },
-    "isJsonbArray": {
-      "description": "Indicates whether to treat the array field as a JSONB array or a Postgres array for query generation and processing. Defaults to false",
-      "type": "boolean",
-      "default": false
     }
   },
   "required": ["name", "dataType"]