Skip to content

I
InstiApp
Commit 3053402b authored by Varun Patil's avatar Varun Patil
Browse files
Options

Complete user model with exception of roles

parent 19facc6f
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 14 deletions
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java
View file @ 3053402b
...@@ -33,9 +33,6 @@ public class User { ...@@ -33,9 +33,6 @@ public class User {
@ColumnInfo(name = "email") @ColumnInfo(name = "email")
@SerializedName("email") @SerializedName("email")
String userEmail; String userEmail;
@ColumnInfo(name = "year")
@SerializedName("year")
int userYear;
@ColumnInfo(name = "roll_no") @ColumnInfo(name = "roll_no")
@SerializedName("roll_no") @SerializedName("roll_no")
String userRollNumber; String userRollNumber;
...@@ -51,20 +48,27 @@ public class User { ...@@ -51,20 +48,27 @@ public class User {
@ColumnInfo(name = "followed_bodies_id") @ColumnInfo(name = "followed_bodies_id")
@SerializedName("followed_bodies_id") @SerializedName("followed_bodies_id")
List<String> userFollowedBodiesID; List<String> userFollowedBodiesID;
@ColumnInfo(name = "website_url")
public User(String userID, String userName, String userProfilePictureUrl, List<Event> userInterestedEvents, List<Event> userGoingEvents, String userEmail, int userYear, String userRollNumber, String userContactNumber, String userAbout, List<Body> userFollowedBodies, List<String> userFollowedBodiesID) { @SerializedName("website_url")
String userWebsiteURL;
@ColumnInfo(name = "ldap_id")
@SerializedName("ldap_id")
String userLDAPId;
public User(String userID, String userName, String userProfilePictureUrl, List<Event> userInterestedEvents, List<Event> userGoingEvents, String userEmail, String userRollNumber, String userContactNumber, String userAbout, List<Body> userFollowedBodies, List<String> userFollowedBodiesID, String userWebsiteURL, String userLDAPID) {
this.userID = userID; this.userID = userID;
this.userName = userName; this.userName = userName;
this.userProfilePictureUrl = userProfilePictureUrl; this.userProfilePictureUrl = userProfilePictureUrl;
this.userInterestedEvents = userInterestedEvents; this.userInterestedEvents = userInterestedEvents;
this.userGoingEvents = userGoingEvents; this.userGoingEvents = userGoingEvents;
this.userEmail = userEmail; this.userEmail = userEmail;
this.userYear = userYear;
this.userRollNumber = userRollNumber; this.userRollNumber = userRollNumber;
this.userContactNumber = userContactNumber; this.userContactNumber = userContactNumber;
this.userAbout = userAbout; this.userAbout = userAbout;
this.userFollowedBodies = userFollowedBodies; this.userFollowedBodies = userFollowedBodies;
this.userFollowedBodiesID = userFollowedBodiesID; this.userFollowedBodiesID = userFollowedBodiesID;
this.userWebsiteURL = userWebsiteURL;
this.userLDAPId = userLDAPID;
} }
public static User fromString(String json) { public static User fromString(String json) {
...@@ -119,14 +123,6 @@ public class User { ...@@ -119,14 +123,6 @@ public class User {
this.userEmail = userEmail; this.userEmail = userEmail;
} }
public int getUserYear() {
return userYear;
}
public void setUserYear(int userYear) {
this.userYear = userYear;
}
public String getUserRollNumber() { public String getUserRollNumber() {
return userRollNumber; return userRollNumber;
} }
...@@ -167,6 +163,22 @@ public class User { ...@@ -167,6 +163,22 @@ public class User {
this.userFollowedBodiesID = userFollowedBodiesID; this.userFollowedBodiesID = userFollowedBodiesID;
} }
public String getUserWebsiteURL() {
return userWebsiteURL;
}
public void setUserWebsiteURL(String userWebsiteURL) {
this.userWebsiteURL = userWebsiteURL;
}
public String getUserLDAPId() {
return userLDAPId;
}
public void setUserLDAPId(String userLDAPId) {
this.userLDAPId = userLDAPId;
}
@Override @Override
public String toString() { public String toString() {
return new Gson().toJson(this); return new Gson().toJson(this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment