diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java index b568d149705c0db81d1d9b4dc45013c31b248a4e..b74a1f452b5826da82e73c79dcfd5311cf9e0cc2 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java @@ -2,7 +2,7 @@ package thinkTogether.groupManagement.controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import thinkTogether.groupManagement.model.Group; +import thinkTogether.groupManagement.model.Learninggroup; import thinkTogether.groupManagement.repo.IGroupRepository; import java.util.List; @@ -25,7 +25,7 @@ public class GroupManagementController { } @GetMapping("/groups") - public List<Group> findAll() { + public List<Learninggroup> findAll() { return groupRepository.findAll(); } diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Learninggroup.java similarity index 75% rename from groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java rename to groupManagement/src/main/java/thinkTogether/groupManagement/model/Learninggroup.java index efc38e47c1fb55b17566b849bbc0aa15fb8539ec..28937cd384723d5fe1112d3e98b1dcde89d463ad 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Learninggroup.java @@ -4,21 +4,21 @@ import javax.persistence.*; import java.sql.Date; @Entity -public class Group { +public class Learninggroup { @Id private Long id; private String status; - private Date erstelldatum; + private Date date; private int modulid; - protected Group() { + protected Learninggroup() { } - public Group(String status, Date erstelldatum, int modulid) { - this.erstelldatum = erstelldatum; + public Learninggroup(String status, Date erstelldatum, int modulid) { + this.date = erstelldatum; this.modulid = modulid; this.status = status; @@ -33,11 +33,11 @@ public class Group { } public Date getDatum() { - return erstelldatum; + return date; } public void setDatum(Date datum) { - this.erstelldatum = datum; + this.date = datum; } public Integer getModul() { diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java b/groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java index 626e41461f0d797074e63adfdf0c6cff4c7064f8..53c8085dbfc4276a3cd2c9f86bb67d250fb07c3b 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java @@ -2,13 +2,13 @@ package thinkTogether.groupManagement.repo; import org.springframework.data.repository.CrudRepository; -import thinkTogether.groupManagement.model.Group; +import thinkTogether.groupManagement.model.Learninggroup; import java.util.List; //Erstellt Zwischenspeicher für die Datenentitäten? "DAO"??? -public interface IGroupRepository extends CrudRepository<Group, Long> { - public List<Group> findAll(); +public interface IGroupRepository extends CrudRepository<Learninggroup, Long> { + public List<Learninggroup> findAll(); }