Commit e64280ee authored by Varun Patil's avatar Varun Patil

Change all primary keys to id

parent 0ac0be33
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -10,9 +11,8 @@ import java.util.List; ...@@ -10,9 +11,8 @@ import java.util.List;
@Entity(tableName = "bodies") @Entity(tableName = "bodies")
public class Body { public class Body {
@PrimaryKey(autoGenerate = true) @NonNull()
int db_id; @PrimaryKey()
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String bodyID; String bodyID;
......
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -12,9 +13,8 @@ import java.util.List; ...@@ -12,9 +13,8 @@ import java.util.List;
@Entity(tableName = "events") @Entity(tableName = "events")
public class Event { public class Event {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String eventID; String eventID;
......
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -10,9 +11,8 @@ import java.util.List; ...@@ -10,9 +11,8 @@ import java.util.List;
@Entity(tableName = "hostelMessMenus") @Entity(tableName = "hostelMessMenus")
public class HostelMessMenu { public class HostelMessMenu {
@PrimaryKey(autoGenerate = true) @NonNull()
int db_id; @PrimaryKey()
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
private String menuID; private String menuID;
......
package in.ac.iitb.gymkhana.iitbapp.data; package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
public class MessMenu { public class MessMenu {
@NonNull()
@PrimaryKey()
@SerializedName("id") @SerializedName("id")
private String mealID; private String mealID;
......
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -11,10 +12,8 @@ import java.sql.Timestamp; ...@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity(tableName = "news") @Entity(tableName = "news")
public class NewsArticle { public class NewsArticle {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
private String articleID; private String articleID;
......
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -11,10 +12,8 @@ import java.sql.Timestamp; ...@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity(tableName = "placementBlogPosts") @Entity(tableName = "placementBlogPosts")
public class PlacementBlogPost { public class PlacementBlogPost {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
private String postID; private String postID;
......
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -12,10 +13,8 @@ import java.util.List; ...@@ -12,10 +13,8 @@ import java.util.List;
public class Role { public class Role {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String roleID; String roleID;
......
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -11,10 +12,8 @@ import java.sql.Timestamp; ...@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity(tableName = "trainingBlogPosts") @Entity(tableName = "trainingBlogPosts")
public class TrainingBlogPost { public class TrainingBlogPost {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
private String postID; private String postID;
......
...@@ -4,6 +4,7 @@ import android.arch.persistence.room.ColumnInfo; ...@@ -4,6 +4,7 @@ import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.Ignore; import android.arch.persistence.room.Ignore;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -12,9 +13,8 @@ import java.util.List; ...@@ -12,9 +13,8 @@ import java.util.List;
@Entity(tableName = "users") @Entity(tableName = "users")
public class User { public class User {
@PrimaryKey(autoGenerate = true) @NonNull()
int db_id; @PrimaryKey()
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String userID; String userID;
...@@ -70,8 +70,7 @@ public class User { ...@@ -70,8 +70,7 @@ public class User {
@Ignore @Ignore
String currentRole; String currentRole;
public User(int db_id, 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, List<Role> userRoles, List<Role> userInstituteRoles, String userWebsiteURL, String userLDAPId, String hostel) { public User(@NonNull 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, List<Role> userRoles, List<Role> userInstituteRoles, String userWebsiteURL, String userLDAPId, String hostel) {
this.db_id = db_id;
this.userID = userID; this.userID = userID;
this.userName = userName; this.userName = userName;
this.userProfilePictureUrl = userProfilePictureUrl; this.userProfilePictureUrl = userProfilePictureUrl;
......
...@@ -3,13 +3,14 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,13 +3,14 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
@Entity(tableName = "venues") @Entity(tableName = "venues")
public class Venue { public class Venue {
@PrimaryKey(autoGenerate = true) @NonNull()
int db_id; @PrimaryKey()
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String venueID; String venueID;
......
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