Merge pull request #172 from messagebird/Issue-169_createChildAccountResponseFix

create child account response fields are updated

Author: denizkilic

api/src/main/java/com/messagebird/objects/AccessKey.java

@@ -1,9 +1,22 @@
 package com.messagebird.objects;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
 public class AccessKey {
     private String id;
-    private String key;
+    @JsonProperty("access_key")
+    private String accessKey;
     private String mod;
+    private String description;
+    @JsonProperty("core_user_id")
+    private int coreUserId;
+    @JsonProperty("user_id")
+    private int userId;
+    @JsonProperty("external_id")
+    private int externalId;
+    private List roles;
 
     public String getId() {
         return id;
@@ -13,12 +26,12 @@ public void setId(String id) {
         this.id = id;
     }
 
-    public String getKey() {
-        return key;
+    public String getAccessKey() {
+        return accessKey;
     }
 
-    public void setKey(String key) {
-        this.key = key;
+    public void setAccessKey(String accessKey) {
+        this.accessKey = accessKey;
     }
 
     public String getMod() {
@@ -29,12 +42,57 @@ public void setMod(String mod) {
         this.mod = mod;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public int getCoreUserId() {
+        return coreUserId;
+    }
+
+    public void setCoreUserId(int coreUserId) {
+        this.coreUserId = coreUserId;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public int getExternalId() {
+        return externalId;
+    }
+
+    public void setExternalId(int externalId) {
+        this.externalId = externalId;
+    }
+
+    public List getRoles() {
+        return roles;
+    }
+
+    public void setRoles(List roles) {
+        this.roles = roles;
+    }
+
     @Override
     public String toString() {
         return "AccessKey{" +
                 "id='" + id + '\'' +
-                ", key='" + key + '\'' +
+                ", access_key='" + accessKey + '\'' +
                 ", mod='" + mod + '\'' +
+                ", description='" + description + '\'' +
+                ", core_user_id=" + coreUserId +
+                ", user_id=" + userId +
+                ", external_id=" + externalId +
+                ", roles=" + roles +
                 '}';
     }
 }

api/src/main/java/com/messagebird/objects/ChildAccountCreateResponse.java

@@ -6,6 +6,7 @@ public class ChildAccountCreateResponse extends ChildAccountResponse{
     private List<AccessKey> accessKeys;
     private String signingKey;
     private String invoiceAggregation;
+    private String paymentMoment;
 
     public List<AccessKey> getAccessKeys() {
         return accessKeys;
@@ -31,14 +32,22 @@ public void setInvoiceAggregation(String invoiceAggregation) {
         this.invoiceAggregation = invoiceAggregation;
     }
 
+    public String getPaymentMoment() {
+        return paymentMoment;
+    }
+
+    public void setPaymentMoment(String paymentMoment) {
+        this.paymentMoment = paymentMoment;
+    }
+
     @Override
     public String toString() {
         return "ChildAccountCreateResponse{" +
                 "id='" + getId() + '\'' +
                 ", name='" + getName() + '\'' +
                 ", accessKeys=" + accessKeys + '\'' +
-                ", signingKey='" + signingKey + '\'' +
                 ", invoiceAggregation='" + invoiceAggregation + '\'' +
+                ", paymentMoment='" + paymentMoment + '\'' +
                 '}';
-    }
+       }
 }

api/src/test/java/com/messagebird/MessageBirdClientTest.java

@@ -1240,7 +1240,7 @@ public void testCreateChildAccounts() throws GeneralException, UnauthorizedExcep
         assertEquals(response.getInvoiceAggregation(), childAccountCreateResponse.getInvoiceAggregation());
         assertEquals(response.getSigningKey(), childAccountCreateResponse.getSigningKey());
         assertEquals(response.getAccessKeys().get(0).getId(), childAccountCreateResponse.getAccessKeys().get(0).getId());
-        assertEquals(response.getAccessKeys().get(0).getKey(), childAccountCreateResponse.getAccessKeys().get(0).getKey());
+        assertEquals(response.getAccessKeys().get(0).getAccessKey(), childAccountCreateResponse.getAccessKeys().get(0).getAccessKey());
         assertEquals(response.getAccessKeys().get(0).getMod(), childAccountCreateResponse.getAccessKeys().get(0).getMod());
     }
 

api/src/test/java/com/messagebird/TestUtil.java

@@ -353,7 +353,7 @@ public static TemplateList createWhatsAppTemplateList(final String templateName)
     public static ChildAccountCreateResponse createChildAccountCreateResponse() {
         final AccessKey accessKey = new AccessKey();
         accessKey.setId("ANY_ID");
-        accessKey.setKey("ANY_KEY");
+        accessKey.setAccessKey("ANY_KEY");
         accessKey.setMod("ANY_MOD");
 
         final ChildAccountCreateResponse childAccountCreateResponse = new ChildAccountCreateResponse();