TS declaration to get all master devices in StudyProtocolSnapshot.

cph-cachet · Nov 19, 2021 · ca0a462 · ca0a462
1 parent 1333192
commit ca0a462
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/typescript-declarations/@types/carp.core-kotlin-carp.protocols.core/index.d.ts b/typescript-declarations/@types/carp.core-kotlin-carp.protocols.core/index.d.ts
@@ -16,6 +16,9 @@ declare module 'carp.core-kotlin-carp.protocols.core'
 
     namespace dk.cachet.carp.protocols.domain
     {
+        import DeviceDescriptor = dk.cachet.carp.protocols.domain.devices.DeviceDescriptor
+
+
         namespace StudyProtocol
         {
             class Id
@@ -62,13 +65,19 @@ declare module 'carp.core-kotlin-carp.protocols.core'
             readonly name: string
             readonly description: string
             readonly creationDate: DateTime
+            readonly masterDevices: HashSet<DeviceDescriptor>
             readonly expectedParticipantData: ArrayList<ParticipantAttribute>
         }
         interface StudyProtocolSnapshot$Companion { serializer(): any }
     }
 
     namespace dk.cachet.carp.protocols.domain.devices
     {
+        abstract class DeviceDescriptor
+        {
+            readonly roleName: String
+        }
+
         abstract class DeviceRegistration
         {
             static get Companion(): DeviceRegistration$Companion  

diff --git a/typescript-declarations/tests/carp.protocols.core.ts b/typescript-declarations/tests/carp.protocols.core.ts
@@ -1,12 +1,15 @@
 import { expect } from 'chai'
 import VerifyModule from './VerifyModule'
 
+import { kotlin } from 'kotlin'
+import toSet = kotlin.collections.toSet_us0mfu$
 import { kotlinx } from 'kotlinx-serialization-kotlinx-serialization-json-jsLegacy'
 import Json = kotlinx.serialization.json.Json
 import { dk as dkc } from 'carp.core-kotlin-carp.common'
 import UUID = dkc.cachet.carp.common.UUID
 import { dk } from 'carp.core-kotlin-carp.protocols.core'
 import DeviceRegistration = dk.cachet.carp.protocols.domain.devices.DeviceRegistration
+import Smartphone = dk.cachet.carp.protocols.domain.devices.Smartphone
 import DefaultDeviceRegistration = dk.cachet.carp.protocols.domain.devices.DefaultDeviceRegistration
 import ProtocolId = dk.cachet.carp.protocols.domain.StudyProtocol.Id
 import ProtocolOwner = dk.cachet.carp.protocols.domain.ProtocolOwner
@@ -32,6 +35,7 @@ describe( "carp.protocols.core", () => {
             studyProtocolSnapshot,
             StudyProtocolSnapshot.Companion,
             [ "DeviceRegistration", new DefaultDeviceRegistration( "some device id" ) ],
+            [ "DeviceDescriptor", new Smartphone( "Role", toSet( [] ) ) ],
             DeviceRegistration.Companion,
             new ProtocolVersion( "Version" ),
             ProtocolVersion.Companion,