feat: add provider fields (#59)

GetStream · Mar 30, 2022 · e6e1d44 · e6e1d44
1 parent 6a655fc
commit e6e1d44
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 30 deletions.
diff --git a/src/main/java/io/getstream/chat/java/models/App.java b/src/main/java/io/getstream/chat/java/models/App.java
@@ -109,6 +109,19 @@ public static class HuaweiConfig {
     private Boolean enabled;
   }
 
+  public enum PushProviderType {
+    @JsonProperty("firebase")
+    Firebase,
+    @JsonProperty("apn")
+    Apn,
+    @JsonProperty("xiaomi")
+    Xiaomi,
+    @JsonProperty("huawei")
+    Huawei,
+    @JsonEnumDefaultValue
+    UNKNOWN
+  }
+
   @Data
   @NoArgsConstructor
   public static class PushNotificationFields {
@@ -377,6 +390,10 @@ public static class DeviceError {
     @JsonProperty("provider")
     private String provider;
 
+    @NotNull
+    @JsonProperty("provider_name")
+    private String providerName;
+
     @NotNull
     @JsonProperty("error_message")
     private String errorMessage;
@@ -794,6 +811,14 @@ public static class AppCheckPushRequestData {
     @JsonProperty("skip_devices")
     private Boolean skipDevices;
 
+    @Nullable
+    @JsonProperty("push_provider_name")
+    private String pushProviderName;
+
+    @Nullable
+    @JsonProperty("push_provider_type")
+    private PushProviderType pushProviderType;
+
     @Nullable
     @JsonProperty("user_id")
     private String userId;
@@ -888,19 +913,6 @@ public static class PushProvider {
     @Nullable
     @JsonProperty("updated_at")
     private Date updatedAt;
-
-    public enum PushProviderType {
-      @JsonProperty("firebase")
-      Firebase,
-      @JsonProperty("apn")
-      Apn,
-      @JsonProperty("xiaomi")
-      Xiaomi,
-      @JsonProperty("huawei")
-      Huawei,
-      @JsonEnumDefaultValue
-      UNKNOWN
-    }
   }
 
   @Builder(

diff --git a/src/main/java/io/getstream/chat/java/models/Device.java b/src/main/java/io/getstream/chat/java/models/Device.java
@@ -1,7 +1,7 @@
 package io.getstream.chat.java.models;
 
-import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.getstream.chat.java.models.App.PushProviderType;
 import io.getstream.chat.java.models.Device.DeviceCreateRequestData.DeviceCreateRequest;
 import io.getstream.chat.java.models.User.UserRequestObject;
 import io.getstream.chat.java.models.framework.RequestObjectBuilder;
@@ -21,12 +21,16 @@
 public class Device {
   @Nullable
   @JsonProperty("push_provider")
-  private PushProvider pushProvider;
+  private PushProviderType pushProvider;
 
   @NotNull
   @JsonProperty("id")
   private String id;
 
+  @Nullable
+  @JsonProperty("push_provider_name")
+  private String pushProviderName;
+
   @NotNull
   @JsonProperty("created_at")
   private Date createdAt;
@@ -43,26 +47,21 @@ public class Device {
   @JsonProperty("user_id")
   private String userId;
 
-  public enum PushProvider {
-    @JsonProperty("firebase")
-    FIREBASE,
-    @JsonProperty("apn")
-    APN,
-    @JsonEnumDefaultValue
-    UNKNOWN
-  }
-
   @Builder
   @Setter
   public static class DeviceRequestObject {
     @Nullable
     @JsonProperty("push_provider")
-    private PushProvider pushProvider;
+    private PushProviderType pushProvider;
 
     @Nullable
     @JsonProperty("id")
     private String id;
 
+    @Nullable
+    @JsonProperty("push_provider_name")
+    private String pushProviderName;
+
     @Nullable
     @JsonProperty("created_at")
     private Date createdAt;
@@ -92,12 +91,16 @@ public static DeviceRequestObject buildFrom(@Nullable Device device) {
   public static class DeviceCreateRequestData {
     @Nullable
     @JsonProperty("push_provider")
-    private PushProvider pushProvider;
+    private PushProviderType pushProvider;
 
     @Nullable
     @JsonProperty("id")
     private String id;
 
+    @Nullable
+    @JsonProperty("push_provider_name")
+    private String pushProviderName;
+
     @Nullable
     @JsonProperty("user_id")
     private String userId;

diff --git a/src/test/java/io/getstream/chat/java/DeviceTest.java b/src/test/java/io/getstream/chat/java/DeviceTest.java
@@ -1,7 +1,7 @@
 package io.getstream.chat.java;
 
+import io.getstream.chat.java.models.App.PushProviderType;
 import io.getstream.chat.java.models.Device;
-import io.getstream.chat.java.models.Device.PushProvider;
 import java.util.List;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Assertions;
@@ -18,7 +18,7 @@ void whenCreatingDevice_thenNoException() {
             Device.create()
                 .id(RandomStringUtils.randomAlphabetic(10))
                 .user(testUserRequestObject)
-                .pushProvider(PushProvider.APN)
+                .pushProvider(PushProviderType.Apn)
                 .request());
   }
 
@@ -31,7 +31,7 @@ void whenDeletingDevice_thenDeleted() {
             Device.create()
                 .id(deviceId)
                 .user(testUserRequestObject)
-                .pushProvider(PushProvider.APN)
+                .pushProvider(PushProviderType.Apn)
                 .request());
     Assertions.assertDoesNotThrow(
         () -> Device.delete(deviceId, testUserRequestObject.getId()).request());
@@ -51,7 +51,7 @@ void whenListingCommand_thenCanRetrieve() {
             Device.create()
                 .id(deviceId)
                 .user(testUserRequestObject)
-                .pushProvider(PushProvider.APN)
+                .pushProvider(PushProviderType.Apn)
                 .request());
     List<Device> devices =
         Assertions.assertDoesNotThrow(() -> Device.list(testUserRequestObject.getId()).request())