From a78bf09447ded5a67d446e0f234d19ea2e66f5cf Mon Sep 17 00:00:00 2001
From: Steven Jeuris <steven.jeuris@gmail.com>
Date: Thu, 31 Oct 2024 18:29:24 +0100
Subject: [PATCH] Fix: JSON schema validator upgrade; remove hack

Closes #492
---
 rpc/build.gradle                                           | 2 +-
 rpc/schemas/common/devices/PrimaryDeviceConfiguration.json | 6 +-----
 rpc/schemas/studies/users/ParticipantGroupStatus.json      | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/rpc/build.gradle b/rpc/build.gradle
index 08db4dff..c181f9fb 100644
--- a/rpc/build.gradle
+++ b/rpc/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation "org.reflections:reflections:${versions.reflections}"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:${versions.serialization}"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}"
-    implementation "com.networknt:json-schema-validator:1.5.2"
+    implementation "com.networknt:json-schema-validator:1.5.3"
     implementation "commons-io:commons-io:${versions.apacheCommons}"
 
     def generateForProjects = coreModules + commonModule
diff --git a/rpc/schemas/common/devices/PrimaryDeviceConfiguration.json b/rpc/schemas/common/devices/PrimaryDeviceConfiguration.json
index df3eba89..6d7bf76d 100644
--- a/rpc/schemas/common/devices/PrimaryDeviceConfiguration.json
+++ b/rpc/schemas/common/devices/PrimaryDeviceConfiguration.json
@@ -12,15 +12,11 @@
     }
   ],
   "$defs": {
-    "HACK-SEE-ISSUE-492": true,
     "PrimaryDeviceConfiguration": {
       "$anchor": "PrimaryDeviceConfiguration",
       "allOf": [ { "$ref": "DeviceConfiguration.json#DeviceConfiguration" } ],
       "properties": {
-        "isPrimaryDevice": { "const": true },
-
-        "roleName": { "$ref": "#/$defs/HACK-SEE-ISSUE-492" },
-        "defaultSamplingConfiguration": { "$ref": "#/$defs/HACK-SEE-ISSUE-492" }
+        "isPrimaryDevice": { "const": true }
       },
       "required": [ "isPrimaryDevice" ]
     }
diff --git a/rpc/schemas/studies/users/ParticipantGroupStatus.json b/rpc/schemas/studies/users/ParticipantGroupStatus.json
index 0dc6def4..78dabafd 100644
--- a/rpc/schemas/studies/users/ParticipantGroupStatus.json
+++ b/rpc/schemas/studies/users/ParticipantGroupStatus.json
@@ -7,7 +7,6 @@
     { "$ref": "#Stopped" }
   ],
   "$defs": {
-    "HACK-SEE-ISSUE-492": true,
     "ParticipantGroupStatus": {
       "type": "object",
       "properties": {
@@ -25,10 +24,7 @@
       "allOf": [ { "$ref": "#/$defs/ParticipantGroupStatus" } ],
       "properties": {
         "invitedOn": { "type": "string", "format": "date-time" },
-        "studyDeploymentStatus": { "$ref": "../../deployments/StudyDeploymentStatus.json" },
-
-        "id": { "$ref": "#/$defs/HACK-SEE-ISSUE-492" },
-        "participants": { "$ref": "#/$defs/HACK-SEE-ISSUE-492" }
+        "studyDeploymentStatus": { "$ref": "../../deployments/StudyDeploymentStatus.json" }
       },
       "required": [ "invitedOn", "studyDeploymentStatus" ]
     },