diff --git a/.attach_pid7200 b/.attach_pid7200 deleted file mode 100644 index e69de29..0000000 diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Secretary.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Secretary.java index 6161952..cf533a0 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Secretary.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Secretary.java @@ -8,7 +8,7 @@ public class Secretary { @GeneratedValue(strategy = GenerationType.AUTO) private int id; - @JoinColumn(name = "User") + @JoinColumn(name = "Users") private int regNo; private String faculty; diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/TeacherGivenCourse.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/TeacherGivenCourse.java index f2c089a..9cb931e 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/TeacherGivenCourse.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/TeacherGivenCourse.java @@ -8,7 +8,7 @@ public class TeacherGivenCourse { @GeneratedValue(strategy = GenerationType.AUTO) private int id; - @JoinColumn(name = "User") + @JoinColumn(name = "Users") private int regNo; @JoinColumn(name = "Course") diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Token.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Token.java index 0ed6606..ec59cbf 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Token.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Token.java @@ -1,21 +1,20 @@ package ovh.herisson.Clyde.Tables; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; @Entity public class Token { @GeneratedValue(strategy = GenerationType.AUTO) @Id private int id; - private int regNo; - private String data; - public Token(int regNo, String data){ + @JoinColumn(name ="Users") + private int regNo; + private String token; + + public Token(int regNo, String token){ this.regNo = regNo; - this.data = data; + this.token = token; } public Token(){} @@ -31,11 +30,11 @@ public class Token { this.regNo = regNo; } - public String getData(){ - return data; + public String getToken(){ + return token; } - public void setData(String data) { - this.data = data; + public void setToken(String data) { + this.token = data; } } diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/User.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/User.java index 2755eff..746ac3b 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/User.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/User.java @@ -17,22 +17,20 @@ public class User { private String lastName; private String firstName; private String email; - private String adress; + private String address; private String country; private Date birthDate; private ovh.herisson.Clyde.Tables.Role role; private String password; - private String salt; - public User(String lastName, String firstName, String email, String adress, String country, Date birthDate, Role role, String password, String salt){ + public User(String lastName, String firstName, String email, String address, String country, Date birthDate, Role role, String password){ this.lastName = lastName; this.firstName = firstName; this.email = email; - this.adress = adress; + this.address = address; this.country = country; this.birthDate = birthDate; this.role = role; this.password = password; - this.salt = salt; } public User() {} @@ -64,12 +62,12 @@ public class User { this.email = email; } - public String getAdress() { - return adress; + public String getAddress() { + return address; } - public void setAdress(String adress) { - this.adress = adress; + public void setAddress(String adress) { + this.address = adress; } public String getCountry() { @@ -102,12 +100,4 @@ public class User { public void setPassword(String password) { this.password = password; } - - public String getSalt(){ - return salt; - } - - public void setSalt(String salt) { - this.salt = salt; - } } diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCursus.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCursus.java index 9460905..4de1559 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCursus.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCursus.java @@ -3,12 +3,11 @@ package ovh.herisson.Clyde.Tables; import jakarta.persistence.*; @Entity -@Table(name = "User_Cursus") public class UserCursus { @Id @GeneratedValue(strategy = GenerationType.AUTO) private int id; - @JoinColumn(name = "User") + @JoinColumn(name = "Users") private int regNo; @JoinColumn(name = "Cursus")