Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
e64280ee
Commit
e64280ee
authored
Jul 02, 2018
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change all primary keys to id
parent
0ac0be33
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
33 additions
and
32 deletions
+33
-32
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Body.java
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Body.java
+3
-3
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java
...src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java
+3
-3
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/HostelMessMenu.java
...java/in/ac/iitb/gymkhana/iitbapp/data/HostelMessMenu.java
+3
-3
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/MessMenu.java
.../main/java/in/ac/iitb/gymkhana/iitbapp/data/MessMenu.java
+5
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/NewsArticle.java
...in/java/in/ac/iitb/gymkhana/iitbapp/data/NewsArticle.java
+3
-4
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/PlacementBlogPost.java
...a/in/ac/iitb/gymkhana/iitbapp/data/PlacementBlogPost.java
+3
-4
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Role.java
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Role.java
+3
-4
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/TrainingBlogPost.java
...va/in/ac/iitb/gymkhana/iitbapp/data/TrainingBlogPost.java
+3
-4
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java
+4
-5
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Venue.java
...src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Venue.java
+3
-2
No files found.
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Body.java
View file @
e64280ee
...
...
@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import
android.arch.persistence.room.ColumnInfo
;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
...
...
@@ -10,9 +11,8 @@ import java.util.List;
@Entity
(
tableName
=
"bodies"
)
public
class
Body
{
@PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@NonNull
()
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
String
bodyID
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java
View file @
e64280ee
...
...
@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import
android.arch.persistence.room.ColumnInfo
;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
...
...
@@ -12,9 +13,8 @@ import java.util.List;
@Entity
(
tableName
=
"events"
)
public
class
Event
{
@PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@NonNull
()
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
String
eventID
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/HostelMessMenu.java
View file @
e64280ee
...
...
@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import
android.arch.persistence.room.ColumnInfo
;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
...
...
@@ -10,9 +11,8 @@ import java.util.List;
@Entity
(
tableName
=
"hostelMessMenus"
)
public
class
HostelMessMenu
{
@PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@NonNull
()
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
private
String
menuID
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/MessMenu.java
View file @
e64280ee
package
in.ac.iitb.gymkhana.iitbapp.data
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
public
class
MessMenu
{
@NonNull
()
@PrimaryKey
()
@SerializedName
(
"id"
)
private
String
mealID
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/NewsArticle.java
View file @
e64280ee
...
...
@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import
android.arch.persistence.room.ColumnInfo
;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
...
...
@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity
(
tableName
=
"news"
)
public
class
NewsArticle
{
@PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@NonNull
()
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
private
String
articleID
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/PlacementBlogPost.java
View file @
e64280ee
...
...
@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import
android.arch.persistence.room.ColumnInfo
;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
...
...
@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity
(
tableName
=
"placementBlogPosts"
)
public
class
PlacementBlogPost
{
@PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@NonNull
()
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
private
String
postID
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Role.java
View file @
e64280ee
...
...
@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import
android.arch.persistence.room.ColumnInfo
;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
...
...
@@ -12,10 +13,8 @@ import java.util.List;
public
class
Role
{
@PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@NonNull
()
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
String
roleID
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/TrainingBlogPost.java
View file @
e64280ee
...
...
@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import
android.arch.persistence.room.ColumnInfo
;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
...
...
@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity
(
tableName
=
"trainingBlogPosts"
)
public
class
TrainingBlogPost
{
@PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@NonNull
()
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
private
String
postID
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java
View file @
e64280ee
...
...
@@ -4,6 +4,7 @@ import android.arch.persistence.room.ColumnInfo;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.Ignore
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.Gson
;
import
com.google.gson.annotations.SerializedName
;
...
...
@@ -12,9 +13,8 @@ import java.util.List;
@Entity
(
tableName
=
"users"
)
public
class
User
{
@PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@NonNull
()
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
String
userID
;
...
...
@@ -70,8 +70,7 @@ public class User {
@Ignore
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
)
{
this
.
db_id
=
db_id
;
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
.
userID
=
userID
;
this
.
userName
=
userName
;
this
.
userProfilePictureUrl
=
userProfilePictureUrl
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Venue.java
View file @
e64280ee
...
...
@@ -3,13 +3,14 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import
android.arch.persistence.room.ColumnInfo
;
import
android.arch.persistence.room.Entity
;
import
android.arch.persistence.room.PrimaryKey
;
import
android.support.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
@Entity
(
tableName
=
"venues"
)
public
class
Venue
{
@
PrimaryKey
(
autoGenerate
=
true
)
int
db_id
;
@
NonNull
(
)
@PrimaryKey
()
@ColumnInfo
(
name
=
"id"
)
@SerializedName
(
"id"
)
String
venueID
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment