From 033682ada19e93f997959729cc9ef328fd25f724 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Sat, 23 Mar 2019 19:23:39 +0100
Subject: [PATCH] bearbeitet uses objects foreign keys now

---
 .../bugageocaching/controller/Controller.java | 17 +++++++--
 .../bugageocaching/entities/Bearbeitet.java   | 35 +++++++++++--------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index dc67d41..c524e99 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -43,10 +43,21 @@ public class Controller {
   Bearbeitet startCache(@RequestParam String userID,
                         @RequestParam String cacheID,
                         @RequestParam String cacheAccesDefinitionID) {
+
+    Optional<User> userOptional = userRepository.findById(Integer.valueOf(userID));
+    User user = userOptional.get();
+
+    Optional<Cache> cacheOptional = cacheRepository.findById(Integer.valueOf(cacheID));
+    Cache cache = cacheOptional.get();
+
+    Optional<CacheAccesDefinition> cacheAccesDefinitionOptional =
+        cacheAccesDefinitionRepository.findById(Integer.valueOf(cacheAccesDefinitionID));
+    CacheAccesDefinition cacheAccesDefinition = cacheAccesDefinitionOptional.get();
+
     Bearbeitet bearbeitet = new Bearbeitet();
-    bearbeitet.setUserID(Integer.valueOf(userID));
-    bearbeitet.setCacheID(Integer.valueOf(cacheID));
-    bearbeitet.setCacheAccesDefinitionID(Integer.valueOf(cacheAccesDefinitionID));
+    bearbeitet.setUser(user);
+    bearbeitet.setCache(cache);
+    bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
 
     bearbeitetRepository.save(bearbeitet);
 
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Bearbeitet.java b/src/main/java/hhn/labsw/bugageocaching/entities/Bearbeitet.java
index 50e5117..c2c284d 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/Bearbeitet.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/Bearbeitet.java
@@ -11,9 +11,14 @@ public class Bearbeitet {
   @GeneratedValue
   private int id;
 
-  private int userID;
-  private int cacheID;
-  private int cacheAccesDefinitionID;
+  @OneToOne
+  private User user;
+
+  @OneToOne
+  private Cache cache;
+
+  @OneToOne
+  private CacheAccesDefinition cacheAccesDefinition;
 
   public int getId() {
     return id;
@@ -23,27 +28,27 @@ public class Bearbeitet {
     this.id = id;
   }
 
-  public int getUserID() {
-    return userID;
+  public User getUser() {
+    return user;
   }
 
-  public void setUserID(int userID) {
-    this.userID = userID;
+  public void setUser(User user) {
+    this.user = user;
   }
 
-  public int getCacheID() {
-    return cacheID;
+  public Cache getCache() {
+    return cache;
   }
 
-  public void setCacheID(int cacheID) {
-    this.cacheID = cacheID;
+  public void setCache(Cache cache) {
+    this.cache = cache;
   }
 
-  public int getCacheAccesDefinitionID() {
-    return cacheAccesDefinitionID;
+  public CacheAccesDefinition getCacheAccesDefinition() {
+    return cacheAccesDefinition;
   }
 
-  public void setCacheAccesDefinitionID(int cacheAccesDefinitionID) {
-    this.cacheAccesDefinitionID = cacheAccesDefinitionID;
+  public void setCacheAccesDefinition(CacheAccesDefinition cacheAccesDefinition) {
+    this.cacheAccesDefinition = cacheAccesDefinition;
   }
 }
\ No newline at end of file