Merge pull request #565 from vimeo/team_permission_display_description

Update PermissionPolicy with missing fields

Author: elhicks

CHANGELOG.md

@@ -1,5 +1,10 @@
 Change Log
 ==========
+Version 3.7.0 *(2022-06-08)*
+----------------------------
+- Added `displayName`, `displayDescription` to `PermissionPolicy`
+- Made `PermissionPolicy` implement `Entity`
+
 Version 3.6.0 *(2022-06-07)*
 ----------------------------
 - Added `unit` to `StorageQuota`.

api-core/src/main/java/com/vimeo/networking2/ApiConstants.kt

@@ -33,7 +33,7 @@ object ApiConstants {
 
     const val SSL_URL_PATTERN = "*.vimeo.com"
 
-    const val SDK_VERSION = "3.6.0"
+    const val SDK_VERSION = "3.7.0"
 
     const val NONE = -1
 

gradle.properties

@@ -19,7 +19,7 @@
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx4096M
-version=3.6.0
+version=3.7.0
 
 android.useAndroidX=true
 android.enableJetifier=true

models/src/main/java/com/vimeo/networking2/PermissionPolicy.kt

@@ -2,15 +2,18 @@ package com.vimeo.networking2
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import com.vimeo.networking2.common.Entity
 import java.util.Date
 
 /**
  * A permission policy which represents a collection or permutation of certain [PermissionActions].
  *
- * @property uri The uri for the permission policy
- * @property name The displayable name for the permission policy
- * @property createdOn The date the policy was created
- * @property modifiedOn The date the policy was last modified on
+ * @property uri The uri for the permission policy.
+ * @property name The displayable name for the permission policy.
+ * @param displayName The name of the permission level, translated and ready for client display.
+ * @param displayDescription The description of the permission level, for client display.
+ * @property createdOn The date the policy was created.
+ * @property modifiedOn The date the policy was last modified on.
  * @property permissionActions The actions the user can take.
  */
 @JsonClass(generateAdapter = true)
@@ -22,6 +25,12 @@ data class PermissionPolicy(
     @Json(name = "name")
     val name: String? = null,
 
+    @Json(name = "display_name")
+    val displayName: String? = null,
+
+    @Json(name = "display_description")
+    val displayDescription: String? = null,
+
     @Json(name = "created_on")
     val createdOn: Date? = null,
 
@@ -30,4 +39,6 @@ data class PermissionPolicy(
 
     @Json(name = "permission_actions")
     val permissionActions: PermissionActions? = null
-)
+) : Entity {
+    override val identifier: String? = uri
+}