UserAccess property of Organization model is now moved into a separate extended class: UserOrganization.

Author: christophermark

src/main/java/com/robinpowered/sdk/model/Organization.java

@@ -3,7 +3,7 @@
 import org.joda.time.DateTime;
 
 /**
- * A company or team. Made up of users, locations and spaces.'
+ * A company or team. Made up of users, locations and spaces.
  *
  * @todo should isOrganization be exposed in this model?
  */
@@ -16,22 +16,12 @@ public class Organization extends Account implements IdentifiableApiResponseMode
     public static final String MIME_TYPE = "vnd.robinpowered.organization.v1";
 
 
-    /**
-     * Properties
-     */
-
-    private UserAccess userAccess;
-
-
     /**
      * Methods
      */
 
-    public Organization(int id, String slug, boolean isOrganization, DateTime createdAt, DateTime updatedAt,
-                        UserAccess userAccess) {
+    public Organization(int id, String slug, boolean isOrganization, DateTime createdAt, DateTime updatedAt) {
         super(id, slug, isOrganization, createdAt, updatedAt);
-
-        this.userAccess = userAccess;
     }
 
     @Override
@@ -44,10 +34,6 @@ public String toString() {
         return "Organization{} " + super.toString();
     }
 
-    public UserAccess getUserAccess() {
-        return userAccess;
-    }
-
     public static final class Reference extends Account.Reference {
         public Reference(String slug) {
             super(slug);

src/main/java/com/robinpowered/sdk/model/UserAccess.java

@@ -17,4 +17,12 @@ public int getManagementLevel() {
     public Boolean getOwner() {
         return isOwner;
     }
+
+    @Override
+    public String toString() {
+        return "UserAccess{" +
+                "managementLevel=" + managementLevel +
+                ", isOwner=" + isOwner +
+                "}";
+    }
 }

src/main/java/com/robinpowered/sdk/model/UserOrganization.java

@@ -0,0 +1,49 @@
+package com.robinpowered.sdk.model;
+
+import org.joda.time.DateTime;
+
+/**
+ * An {@link Organization} containing {@link UserAccess} data.
+ */
+public class UserOrganization extends Organization {
+
+    /**
+     * Constants
+     */
+
+    public static final String MIME_TYPE = "vnd.robinpowered.user-organization.v1";
+
+
+    /**
+     * Properties
+     */
+
+    private UserAccess userAccess;
+
+
+    /**
+     * Methods
+     */
+
+
+    public UserOrganization(int id, String slug, boolean isOrganization, DateTime createdAt, DateTime updatedAt,
+                            UserAccess userAccess) {
+        super(id, slug, isOrganization, createdAt, updatedAt);
+
+        this.userAccess = userAccess;
+    }
+
+    @Override
+    public String getMimeType() {
+        return MIME_TYPE;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + " " + userAccess.toString();
+    }
+
+    public UserAccess getUserAccess() {
+        return userAccess;
+    }
+}

src/main/java/com/robinpowered/sdk/service/AccountService.java

@@ -1,10 +1,6 @@
 package com.robinpowered.sdk.service;
 
-import com.robinpowered.sdk.model.Amenity;
-import com.robinpowered.sdk.model.ApiResponse;
-import com.robinpowered.sdk.model.Organization;
-import com.robinpowered.sdk.model.Presence;
-import com.robinpowered.sdk.model.User;
+import com.robinpowered.sdk.model.*;
 import retrofit.Callback;
 import retrofit.http.GET;
 import retrofit.http.Path;
@@ -58,6 +54,14 @@ public interface AccountService {
     @GET("/me/organizations")
     void getMyOrganizations(@QueryMap Map<String, Object> options, Callback<ApiResponse<List<Organization>>> callback);
 
+    // Sync
+    @GET("/me/organizations")
+    ApiResponse<List<UserOrganization>> getMyUserOrganizations(@QueryMap Map<String, Object> options) throws IOException;
+
+    // Async
+    @GET("/me/organizations")
+    void getMyUserOrganizations(@QueryMap Map<String, Object> options, Callback<ApiResponse<List<UserOrganization>>> callback);
+
 
     /**
      * Organizations