diff --git a/src/PremiumUser/PremiumUser.java b/src/PremiumUser/PremiumUser.java index 45da187f4fcc1dc914771aa2a1909141fca0d592..ed89709a3ed5d64a58bcd461d8dbd6f9fb3d2dbf 100644 --- a/src/PremiumUser/PremiumUser.java +++ b/src/PremiumUser/PremiumUser.java @@ -10,8 +10,6 @@ import javax.persistence.*; public class PremiumUser { // Model class for premium accounts @Id - @GenericGenerator(name="gen",strategy="increment") - @GeneratedValue(generator="gen") @Column(name="user_id") private int user_id; @Column(name="start_date") @@ -27,11 +25,6 @@ public class PremiumUser { this.endDate = endDate; } - public PremiumUser(Date startDate, Date endDate) { - this.startDate = startDate; - this.endDate = endDate; - } - // Getter public int getUserID() { return this.user_id; diff --git a/src/PremiumUser/PremiumUserDatabase.java b/src/PremiumUser/PremiumUserDatabase.java index c14677d53d8348338ac4a7a9124383ccb015be17..a48950093b05dd623350b07f204ffde74e32f6e0 100644 --- a/src/PremiumUser/PremiumUserDatabase.java +++ b/src/PremiumUser/PremiumUserDatabase.java @@ -48,10 +48,10 @@ public class PremiumUserDatabase { } } - public PremiumUser addPremiumUser(String startDate, String endDate) { + public PremiumUser addPremiumUser(int id, String startDate, String endDate) { try { session.beginTransaction(); - PremiumUser newUser = new PremiumUser(Date.valueOf(startDate), Date.valueOf(endDate)); + PremiumUser newUser = new PremiumUser(id, Date.valueOf(startDate), Date.valueOf(endDate)); session.persist(newUser); session.getTransaction().commit(); return newUser; diff --git a/src/PremiumUser/PremiumUserService.java b/src/PremiumUser/PremiumUserService.java index bfca07eab1eecbc11b7bfe055fa2c526440c9e64..21d5acead1ed90a562e86edafb3c048bc250b330 100644 --- a/src/PremiumUser/PremiumUserService.java +++ b/src/PremiumUser/PremiumUserService.java @@ -18,5 +18,5 @@ public interface PremiumUserService { boolean deletePremiumUser(int id); @WebMethod - String addPremiumUser(String startDate, String endDate); + String addPremiumUser(int id, String startDate, String endDate); } diff --git a/src/PremiumUser/PremiumUserServiceImpl.java b/src/PremiumUser/PremiumUserServiceImpl.java index 1fbdb9ce3a193921b7df02a458f603fce717a2fe..53b16df56237d0ebae94edb12c5804ae91fd1e92 100644 --- a/src/PremiumUser/PremiumUserServiceImpl.java +++ b/src/PremiumUser/PremiumUserServiceImpl.java @@ -62,8 +62,8 @@ public class PremiumUserServiceImpl implements PremiumUserService { } @WebMethod - public String addPremiumUser(String startDate, String endDate) { - PremiumUser pu = premiumUserDatabaseImpl.addPremiumUser(startDate, endDate); + public String addPremiumUser(int id, String startDate, String endDate) { + PremiumUser pu = premiumUserDatabaseImpl.addPremiumUser(id, startDate, endDate); Integer userID = pu.getUserID(); String start = pu.getStartDate().toString(); String end = pu.getEndDate().toString();