1 files changed, 23 insertions, 6 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/PermissionProperties.kt b/vid-app-common/src/main/java/org/onap/vid/roles/PermissionProperties.kt
index f62b98aef..dbdd41326 100644
--- a/vid-app-common/src/main/java/org/onap/vid/roles/PermissionProperties.kt
+++ b/vid-app-common/src/main/java/org/onap/vid/roles/PermissionProperties.kt
@@ -3,15 +3,32 @@ package org.onap.vid.roles
 import org.onap.vid.aai.ServiceSubscription
 
 
-interface WithPermissionProperties {
+interface WithPermissionProperties
+
+interface WithPermissionPropertiesSubscriberAndServiceType: WithPermissionProperties {
     val subscriberId: String?
     val serviceType: String?
 }
 
-data class PermissionProperties(
-        override val subscriberId: String,
-        override val serviceType: String
-) : WithPermissionProperties {
-    constructor(serviceSubscription: ServiceSubscription, subscriberId: String) : this(subscriberId, serviceSubscription.serviceType)
+interface WithPermissionPropertiesOwningEntity: WithPermissionProperties {
+    val owningEntityId: String?
+}
+
+
+data class AllPermissionProperties(
+        override val subscriberId: String?,
+        override val serviceType: String?,
+        override val owningEntityId: String?
+): WithPermissionPropertiesOwningEntity, WithPermissionPropertiesSubscriberAndServiceType
+
+data class PermissionPropertiesOwningEntity(
+        override val owningEntityId: String?
+): WithPermissionPropertiesOwningEntity
+
+data class PermissionPropertiesSubscriberAndServiceType(
+        override val subscriberId: String?,
+        override val serviceType: String?
+) : WithPermissionPropertiesSubscriberAndServiceType {
+    constructor(serviceSubscription: ServiceSubscription, subscriberId: String?) : this(subscriberId, serviceSubscription.serviceType)
 }