Merge pull request #50 from creatubbles/hotfix/missing-user-relations

Add missing custom style and school relations in User model

Author: jasiekluch

api/src/main/java/com/creatubbles/api/model/user/User.java

@@ -3,9 +3,12 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import com.creatubbles.api.model.school.School;
+import com.creatubbles.api.model.user.custom_style.CustomStyle;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.jasminb.jsonapi.annotations.Id;
+import com.github.jasminb.jsonapi.annotations.Relationship;
 import com.github.jasminb.jsonapi.annotations.Type;
 
 import java.util.Date;
@@ -89,6 +92,12 @@ public class User {
 
     private String interests;
 
+    @Relationship("custom_style")
+    private CustomStyle customStyle;
+
+    @Relationship("school")
+    private School school;
+
     public static User withId(String id) {
         return new User(id);
     }
@@ -268,6 +277,16 @@ public String getInterests() {
         return interests;
     }
 
+    @Nullable
+    public School getSchool() {
+        return school;
+    }
+
+    @Nullable
+    public CustomStyle getCustomStyle() {
+        return customStyle;
+    }
+
     @Override
     public String toString() {
         return "User{" +
@@ -298,6 +317,8 @@ public String toString() {
                 ", homeSchooling=" + homeSchooling +
                 ", whatDoYouTeach='" + whatDoYouTeach + '\'' +
                 ", interests='" + interests + '\'' +
+                ", customStyle=" + customStyle +
+                ", school=" + school +
                 '}';
     }
 }

api/src/main/java/com/creatubbles/api/model/user/custom_style/CustomStyle.java

@@ -15,7 +15,7 @@
 import java.util.Date;
 import java.util.List;
 
-@Type("styles")
+@Type("custom_styles")
 public class CustomStyle {
 
     @JsonCreator