From 2db55ac35d6f87abfbe5c05131c7d765b47a1a13 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 25 Mar 2019 21:47:46 +0100 Subject: [PATCH 1/4] stationen haben nun eine reihenfolge innerhalb eines caches --- .../entities/StationReihenfolge.java | 53 +++++++++++++++++++ .../StationReihenfolgeRepository.java | 7 +++ 2 files changed, 60 insertions(+) create mode 100644 src/main/java/hhn/labsw/bugageocaching/entities/StationReihenfolge.java create mode 100644 src/main/java/hhn/labsw/bugageocaching/repositories/StationReihenfolgeRepository.java diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/StationReihenfolge.java b/src/main/java/hhn/labsw/bugageocaching/entities/StationReihenfolge.java new file mode 100644 index 0000000..b51ef51 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/entities/StationReihenfolge.java @@ -0,0 +1,53 @@ +package hhn.labsw.bugageocaching.entities; + +import javax.persistence.*; + +@Entity +@Table +public class StationReihenfolge { + + @Id + @GeneratedValue + private int id; + + @OneToOne + private Cache cache; + + @OneToOne + private Station station; + + @OneToOne + private Station nachfolgeStation; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Cache getCache() { + return cache; + } + + public void setCache(Cache cache) { + this.cache = cache; + } + + public Station getStation() { + return station; + } + + public void setStation(Station station) { + this.station = station; + } + + public Station getNachfolgeStation() { + return nachfolgeStation; + } + + public void setNachfolgeStation(Station nachfolgeStation) { + this.nachfolgeStation = nachfolgeStation; + } +} diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/StationReihenfolgeRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/StationReihenfolgeRepository.java new file mode 100644 index 0000000..8897965 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/StationReihenfolgeRepository.java @@ -0,0 +1,7 @@ +package hhn.labsw.bugageocaching.repositories; + +import hhn.labsw.bugageocaching.entities.StationReihenfolge; +import org.springframework.data.repository.CrudRepository; + +public interface StationReihenfolgeRepository extends CrudRepository { +} From 8bcaab5bff3279625fcaae68b21d6dc2c035c037 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 25 Mar 2019 21:48:13 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Station=20hat=20nun=20ein=20Feld=20f=C3=BCr?= =?UTF-8?q?=20den=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/hhn/labsw/bugageocaching/entities/Station.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Station.java b/src/main/java/hhn/labsw/bugageocaching/entities/Station.java index 0acfaa9..bdcf98d 100644 --- a/src/main/java/hhn/labsw/bugageocaching/entities/Station.java +++ b/src/main/java/hhn/labsw/bugageocaching/entities/Station.java @@ -14,6 +14,7 @@ public class Station { private String description; private double longitude; private double lattitude; + private int code; public Station() { } @@ -50,4 +51,11 @@ public class Station { this.lattitude = lattitude; } + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } } From 161d29f248667944f30eb1d90eed9fec008767c0 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 25 Mar 2019 21:49:37 +0100 Subject: [PATCH 3/4] bearbeitet tabelle trackt nun die station, bis zu der ein user innerhalb eines caches gekommen ist --- .../hhn/labsw/bugageocaching/entities/Bearbeitet.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Bearbeitet.java b/src/main/java/hhn/labsw/bugageocaching/entities/Bearbeitet.java index c2c284d..f046d84 100644 --- a/src/main/java/hhn/labsw/bugageocaching/entities/Bearbeitet.java +++ b/src/main/java/hhn/labsw/bugageocaching/entities/Bearbeitet.java @@ -20,6 +20,9 @@ public class Bearbeitet { @OneToOne private CacheAccesDefinition cacheAccesDefinition; + @OneToOne + private Station aktuelleStation; + public int getId() { return id; } @@ -51,4 +54,12 @@ public class Bearbeitet { public void setCacheAccesDefinition(CacheAccesDefinition cacheAccesDefinition) { this.cacheAccesDefinition = cacheAccesDefinition; } + + public Station getAktuelleStation() { + return aktuelleStation; + } + + public void setAktuelleStation(Station aktuelleStation) { + this.aktuelleStation = aktuelleStation; + } } \ No newline at end of file From d5ca26bbd33b34a5811b83c484e537f06a25e3d0 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 25 Mar 2019 21:51:00 +0100 Subject: [PATCH 4/4] =?UTF-8?q?startCache=20wurde=20aufgrund=20des=20neuen?= =?UTF-8?q?=20Attributs=20station=20in=20der=20bearbeitet-Tabelle=20=C3=BC?= =?UTF-8?q?berarbeitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labsw/bugageocaching/controller/Controller.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index b0b29d6..4cdf7fc 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -69,7 +69,8 @@ public class Controller { @RequestMapping("/api/startCache") public @ResponseBody String startCache(@RequestParam(value = "userID", defaultValue = "-1") String userID, - @RequestParam String cacheID) throws IllegalParameterException { + @RequestParam String cacheID, + @RequestParam String stationID) throws IllegalParameterException { if (!userID.equals("-1")) { // ein angemeldeter user startet den cache(es werden zwei parameter übergeben) @@ -91,6 +92,14 @@ public class Controller { throw new IllegalParameterException("There is no cache with the ID " + cacheID); } + Optional stationOptional = stationRepository.findById(Integer.valueOf(stationID)); + if (stationOptional.isPresent()) { + Station station = stationOptional.get(); + bearbeitet.setAktuelleStation(station); + } else { + throw new IllegalParameterException("There is no station with the ID " + stationID); + } + Optional cacheAccesDefinitionOptional = cacheAccesDefinitionRepository.findById(1); // bearbeitet if (cacheAccesDefinitionOptional.isPresent()) {