diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java index a1431c813c4a9b592382f6318b6d6880413c4715..3587ddddfd403b92ece161edb7e33a0460662982 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java @@ -32,18 +32,18 @@ public class GroupManagementController { - /** - * e.g. http://localhost:8080/groups/2/ - * - * @param id - * @return - */ - @GetMapping(value = "/groups/{id}/") - public Group findByID( - @PathVariable(value = "id") long id - ) { - final Group group = groupRepository.findByID(id); - - return group; - } +// /** +// * e.g. http://localhost:8080/groups/2/ +// * +// * @param id +// * @return +// */ +// @GetMapping(value = "/groups/{id}/") +// public Group findByID( +// @PathVariable(value = "id") long id +// ) { +// final Group group = groupRepository.findByID(id); +// +// return group; +// } } diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Cat.java b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Cat.java index 55d8ed6dbdf4e24f42a9c4ac0c7dd86d1ba8f8ba..afabadf86793b244931f1dfd82367bbf7dac1b4f 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Cat.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Cat.java @@ -1,6 +1,7 @@ package thinkTogether.groupManagement.model; import javax.persistence.*; +import java.sql.Date; @Entity public class Cat { @@ -11,11 +12,15 @@ public class Cat { private String name; + private Date date; + public Cat() { } - public Cat(String name) { + public Cat(String name, Date date) { + this.name = name; + this.date = date; } public Long getId() { @@ -33,4 +38,12 @@ public class Cat { public void setName(String name) { this.name = name; } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } } diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java index 8c721b137a9f04e0179a017a76b14b6388e1707d..f7fd5c26f1a67219589ccaddad52f4a438fc060b 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java @@ -4,26 +4,24 @@ import javax.persistence.*; import java.sql.Date; @Entity -@Table( - schema = "thinktogether", - name = "group" -) +@Table(name = "group") public class Group { private static final int serialVersion = -1230; @Id @GeneratedValue - private Long ID; + @Column(name = "group_id") + private Long id; - @Column(name = "Status") + @Column(name = "status") private String status; - @Column(name = "ErstellDatum") + @Column(name = "erstellDatum") private Date datum; - @Column(name = "modul_ID") + @Column(name = "modul_id") private int modul_id; protected Group() { @@ -36,12 +34,12 @@ public class Group { } - public void setID(Long id) { - this.ID = id; + public void setId(Long id) { + this.id = id; } public Long getId() { - return ID; + return id; } public Date getDatum() { diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java b/groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java index 4cd65457222e0cb4900654f0104d1dbd37bd94fb..626e41461f0d797074e63adfdf0c6cff4c7064f8 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java @@ -10,7 +10,5 @@ import java.util.List; public interface IGroupRepository extends CrudRepository<Group, Long> { public List<Group> findAll(); - public Group findByID(Long ID); - } diff --git a/groupManagement/src/main/resources/application.properties b/groupManagement/src/main/resources/application.properties index f29f0ae83cacc4315911e28ab7aa64e0ed4c2319..637d84cc948e4f43177d083d53e7763980dcc09d 100644 --- a/groupManagement/src/main/resources/application.properties +++ b/groupManagement/src/main/resources/application.properties @@ -1,12 +1,12 @@ spring.datasource.url=jdbc:mariadb://thinktogether.mariadb.database.azure.com:3306/playground spring.datasource.username=Nachtkind spring.datasource.password=!13072020VerteilteSysteme +spring.jpa.show-sql=true #spring.datasource.driver-class-name=org.mariadb.jdbc.Driver ## Keep the connection alive if idle for a long time (needed in production) #spring.datasource.testWhileIdle=true ##Hibernate Configuration ## Show or not log for each sql query -#spring.jpa.show-sql=true ## Hibernate ddl auto (create, create-drop, update): with "update" the database ## schema will be automatically updated accordingly to java entities found in ## the project