diff --git a/src/main/java/com/innocuoussymmetry/recipin/models/Friendship.java b/src/main/java/com/innocuoussymmetry/recipin/models/Friendship.java index 48d7e57..780d63f 100644 --- a/src/main/java/com/innocuoussymmetry/recipin/models/Friendship.java +++ b/src/main/java/com/innocuoussymmetry/recipin/models/Friendship.java @@ -1,8 +1,15 @@ package com.innocuoussymmetry.recipin.models; +import javax.persistence.Column; +import javax.persistence.Table; + +@Table(name="friendships") public class Friendship extends DBEntity { + @Column(name="senderid") private Integer senderId; + @Column(name="targetid") private Integer targetId; + @Column(name="pending") private boolean pending; diff --git a/src/main/java/com/innocuoussymmetry/recipin/models/GroceryList.java b/src/main/java/com/innocuoussymmetry/recipin/models/GroceryList.java index dd91b80..d444b44 100644 --- a/src/main/java/com/innocuoussymmetry/recipin/models/GroceryList.java +++ b/src/main/java/com/innocuoussymmetry/recipin/models/GroceryList.java @@ -1,7 +1,13 @@ package com.innocuoussymmetry.recipin.models; +import javax.persistence.Column; +import javax.persistence.Table; + +@Table(name="grocerylist") class GroceryList extends AppList { + @Column(name="name") private String name; + @Column(name="ownerid") private Integer ownerId; public String getName() { diff --git a/src/main/java/com/innocuoussymmetry/recipin/models/Ingredient.java b/src/main/java/com/innocuoussymmetry/recipin/models/Ingredient.java index 834ffee..8621c93 100644 --- a/src/main/java/com/innocuoussymmetry/recipin/models/Ingredient.java +++ b/src/main/java/com/innocuoussymmetry/recipin/models/Ingredient.java @@ -1,8 +1,15 @@ package com.innocuoussymmetry.recipin.models; +import javax.persistence.Column; +import javax.persistence.Table; + +@Table(name="ingredient") public class Ingredient extends DBEntity { + @Column(name="name") private String name; + @Column(name="description") private String description; + @Column(name="createdbyid") private Integer createdById; public String getName() { diff --git a/src/main/java/com/innocuoussymmetry/recipin/models/Recipe.java b/src/main/java/com/innocuoussymmetry/recipin/models/Recipe.java index d916ef5..c599918 100644 --- a/src/main/java/com/innocuoussymmetry/recipin/models/Recipe.java +++ b/src/main/java/com/innocuoussymmetry/recipin/models/Recipe.java @@ -1,12 +1,19 @@ package com.innocuoussymmetry.recipin.models; +import javax.persistence.Column; +import javax.persistence.Table; import java.util.List; - +@Table(name="recipe") public class Recipe extends DBEntity { + @Column(name="name") private String name; + @Column(name="preptime") private String prepTime; + @Column(name="authoruserid") private Integer authorUserId; + @Column(name="description") private String description; + @Column(name="ingredientnames") private List ingredientNames; public String getName() { diff --git a/src/main/java/com/innocuoussymmetry/recipin/models/RecipeList.java b/src/main/java/com/innocuoussymmetry/recipin/models/RecipeList.java index f55b5be..725e3bc 100644 --- a/src/main/java/com/innocuoussymmetry/recipin/models/RecipeList.java +++ b/src/main/java/com/innocuoussymmetry/recipin/models/RecipeList.java @@ -1,6 +1,11 @@ package com.innocuoussymmetry.recipin.models; +import javax.persistence.Column; +import javax.persistence.Table; + +@Table(name="recipelist") public class RecipeList extends AppList { + @Column(name="ismainlist") private boolean isMainRecipeList; public boolean getIsMainRecipeList() { diff --git a/src/main/java/com/innocuoussymmetry/recipin/models/User.java b/src/main/java/com/innocuoussymmetry/recipin/models/User.java index 5f7ce33..500fc79 100644 --- a/src/main/java/com/innocuoussymmetry/recipin/models/User.java +++ b/src/main/java/com/innocuoussymmetry/recipin/models/User.java @@ -2,13 +2,66 @@ package com.innocuoussymmetry.recipin.models; import javax.persistence.*; -@Entity +@Table(name="users") public class User extends DBEntity { @Column(name="firstname") private String firstName; + @Column(name="lastname") private String lastName; + @Column(name="handle") private String handle; + @Column(name="email") private String email; + @Column(name="isadmin") private boolean isAdmin; + @Column(name="password") private String password; + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String name) { + this.firstName = name; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String name) { + this.lastName = name; + } + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public boolean getIsAdmin() { + return isAdmin; + } + + public void setIsAdmin(boolean isAdmin) { + this.isAdmin = isAdmin; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } } \ No newline at end of file