diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java index 2548453c7830a897e888df8db143bca40dbff396..8c721b137a9f04e0179a017a76b14b6388e1707d 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java @@ -1,66 +1,73 @@ package thinkTogether.groupManagement.model; import javax.persistence.*; +import java.sql.Date; @Entity -@Table(name = "group") +@Table( + schema = "thinktogether", + name = "group" +) public class Group { private static final int serialVersion = -1230; + @Id @GeneratedValue - private int ID; + private Long ID; - @Column(name="Status") - private boolean status; + @Column(name = "Status") + private String status; - @Column(name="ErstellDatum") - private String datum; + @Column(name = "ErstellDatum") + private Date datum; - @Column(name="modul_ID") + @Column(name = "modul_ID") private int modul_id; + protected Group() { + } + public Group(String status, Date datum, int modul_id) { + this.datum = datum; + this.modul_id = modul_id; + this.status = status; - protected Group(){ } - public Group(boolean status, String datum, int modul_id ){ - this.datum=datum; - this.modul_id=modul_id; - this.status=status; - + public void setID(Long id) { + this.ID = id; } - public void setID(Integer id) { this.ID = id; } - public Integer getId() { + + public Long getId() { return ID; } - public String getDatum() { + + public Date getDatum() { return datum; } - public void setDatum(String datum) { + + public void setDatum(Date datum) { this.datum = datum; } - public Integer getModul() { return modul_id; } - public void setModul(Integer id) {this.modul_id = id; } - public boolean getStatus() { - return status; - } - public void setStatus(boolean status) { - this.status = status; + + public Integer getModul() { + return modul_id; } + public void setModul(Integer id) { + this.modul_id = id; + } + public String getStatus() { + return status; + } - public String toJSON() { - return "Group{" + - ", ID= '" + ID + '\'' + - ", Datum='" + datum + '\'' + - ", Status=" + status + '\'' + - ", ModulID=" + modul_id + '\'' + - '}'; + public void setStatus(String status) { + this.status = status; } + }