diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 6442548..b96905d 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -74,7 +74,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) @@ -96,6 +97,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()) { 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 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; + } } 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 { +}