From 8536edded2697ad1a4771ce62557f5465aa57373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Annika=20Ge=C3=9Fmann?=
 <annika.gessmann@student.reutlingen-university.de>
Date: Fri, 17 Jul 2020 11:33:38 +0200
Subject: [PATCH] Schema groupmanagement cat yes, learninggroup yes

---
 .../controller/GroupManagementController.java      |  4 ++--
 .../model/{Group.java => Learninggroup.java}       | 14 +++++++-------
 .../groupManagement/repo/IGroupRepository.java     |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename groupManagement/src/main/java/thinkTogether/groupManagement/model/{Group.java => Learninggroup.java} (75%)

diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
index b568d14..b74a1f4 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 efc38e4..28937cd 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 626e414..53c8085 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();
 
 }
 
-- 
GitLab