KOGITO-9721 - Use JSON scalar for process instance variables in Data …

…Index GraphQL schema (#1830)
apache · Aug 28, 2023 · 5aad510 · 5aad510
1 parent a9afd0a
commit 5aad510
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/...a-index-service-common/src/main/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java b/...a-index-service-common/src/main/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java
@@ -339,19 +339,19 @@ public void testProcessGatewayAPI() throws IOException {
         testProcessGatewayAPIComments(taskId, pId2);
         testProcessGatewayAPIAttachments(taskId, pId2);
 
-        String vars = given().spec(dataIndexSpec()).contentType(ContentType.JSON)
+        Map<String, Object> vars = given().spec(dataIndexSpec()).contentType(ContentType.JSON)
                 .body("{ \"query\" : \"{ ProcessInstances (where: { id: {equal: \\\"" + pId2 + "\\\"}}) { variables} }\"}")
                 .when().post("/graphql")
                 .then()
                 .statusCode(200).extract().path("data.ProcessInstances[0].variables");
 
         if (vars != null) {
+            ((Map<String, String>) vars.get("traveller")).put("firstName", "Anakin");
             await()
                     .atMost(TIMEOUT)
                     .untilAsserted(() -> given().spec(dataIndexSpec()).contentType(ContentType.JSON)
                             .body("{ \"query\" : \"mutation{ ProcessInstanceUpdateVariables(id:\\\"" + pId2 + "\\\", variables:\\\"" +
-                                    vars.replace("Darth", "Anakin")
-                                            .replace("\"", "\\\\\\\"")
+                                    mapper.writeValueAsString(vars).replace("\"", "\\\\\\\"")
                                     + "\\\")}\"}")
                             .when().post("/graphql")
                             .then()
@@ -364,7 +364,7 @@ public void testProcessGatewayAPI() throws IOException {
                             .when().post("/graphql")
                             .then()
                             .statusCode(200)
-                            .body("data.ProcessInstances[0].variables", containsString("Anakin")));
+                            .body("data.ProcessInstances[0].variables.traveller.firstName", containsString("Anakin")));
         }
         given().spec(dataIndexSpec()).contentType(ContentType.JSON)
                 .body("{ \"query\" : \"mutation{ NodeInstanceTrigger(id:\\\"" + pId2 + "\\\", nodeId:\\\"_8B62D3CA-5D03-4B2B-832B-126469288BB4\\\")}\"}")

diff --git a/data-index/data-index-common/src/main/resources/basic.schema.graphqls b/data-index/data-index-common/src/main/resources/basic.schema.graphqls
@@ -1,6 +1,7 @@
 scalar DateTime
 scalar BigDecimal
 scalar Long
+scalar JSON
 
 schema {
     query: Query
@@ -25,7 +26,7 @@ type ProcessInstance {
     serviceUrl: String
     nodes: [NodeInstance!]!
     milestones: [Milestone!]
-    variables: String
+    variables: JSON
     start: DateTime!
     end: DateTime
     parentProcessInstance: ProcessInstance

diff --git a/...e-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java b/...e-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
@@ -144,6 +144,7 @@ public GraphQLSchema createSchema() {
                 .scalar(getDateTimeScalarType())
                 .scalar(ExtendedScalars.GraphQLBigDecimal)
                 .scalar(ExtendedScalars.GraphQLLong)
+                .scalar(ExtendedScalars.Json)
                 .build();
 
         SchemaGenerator schemaGenerator = new SchemaGenerator();

diff --git a/...ntime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java b/...ntime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
@@ -56,6 +56,7 @@ public GraphQLSchema createSchema() {
                 .scalar(getDateTimeScalarType())
                 .scalar(ExtendedScalars.GraphQLBigDecimal)
                 .scalar(ExtendedScalars.GraphQLLong)
+                .scalar(ExtendedScalars.Json)
                 .build();
 
         SchemaGenerator schemaGenerator = new SchemaGenerator();