Fixes #5

Author: goekay

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.rwth.idsg</groupId>
     <artifactId>steve</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <packaging>jar</packaging>
 
     <developers>

src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java

@@ -7,9 +7,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
@@ -20,7 +20,10 @@
  */
 @Controller
 @ResponseBody
-@RequestMapping(value = "/manager/ajax", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(
+        value = "/manager/ajax/{chargeBoxId}",
+        method = RequestMethod.GET,
+        produces = MediaType.APPLICATION_JSON_VALUE)
 public class AjaxCallController {
 
     @Autowired private ChargePointRepository chargePointRepository;
@@ -31,32 +34,32 @@ public class AjaxCallController {
     // Paths
     // -------------------------------------------------------------------------
 
-    private static final String CP_DETAILS_PATH = "/getCPDetails";
-    private static final String CONNECTOR_IDS_PATH = "/getConnectorIds";
-    private static final String TRANSACTION_IDS_PATH = "/getTransactionIds";
-    private static final String RESERVATION_IDS_PATH = "/getReservationIds";
+    private static final String DETAILS_PATH = "/details";
+    private static final String CONNECTOR_IDS_PATH = "/connectorIds";
+    private static final String TRANSACTION_IDS_PATH = "/transactionIds";
+    private static final String RESERVATION_IDS_PATH = "/reservationIds";
 
     // -------------------------------------------------------------------------
     // HTTP methods
     // -------------------------------------------------------------------------
 
-    @RequestMapping(value = CP_DETAILS_PATH)
-    public ChargePoint getCPDetails(@RequestParam String chargeBoxId) {
+    @RequestMapping(value = DETAILS_PATH)
+    public ChargePoint getDetails(@PathVariable("chargeBoxId") String chargeBoxId) {
         return chargePointRepository.getChargePointDetails(chargeBoxId);
     }
 
     @RequestMapping(value = CONNECTOR_IDS_PATH)
-    public List<Integer> getConnectorIds(@RequestParam String chargeBoxId) {
+    public List<Integer> getConnectorIds(@PathVariable("chargeBoxId") String chargeBoxId) {
         return chargePointRepository.getConnectorIds(chargeBoxId);
     }
 
     @RequestMapping(value = TRANSACTION_IDS_PATH)
-    public List<Integer> getTransactionIds(@RequestParam String chargeBoxId) {
+    public List<Integer> getTransactionIds(@PathVariable("chargeBoxId") String chargeBoxId) {
         return transactionRepository.getActiveTransactionIds(chargeBoxId);
     }
 
     @RequestMapping(value = RESERVATION_IDS_PATH)
-    public List<Integer> getReservationIds(@RequestParam String chargeBoxId) {
+    public List<Integer> getReservationIds(@PathVariable("chargeBoxId") String chargeBoxId) {
         return reservationRepository.getActiveReservationIds(chargeBoxId);
     }
 

src/main/resources/webapp/static/js/snippets/getCPDetails.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
     $("#gdb").click(function() {
 		var ddiv = $("#details-div");
 		ddiv.html("<br>Loading...");		
-    	$.getJSON("/steve/manager/ajax/getCPDetails?chargeBoxId=" + $("#cbi").val(), function(data) {
+    	$.getJSON("/steve/manager/ajax/" + $("#cbi").val() + "/details", function(data) {
     		ddiv.html("<table id='details' class='cpd'><thead><tr><th>Charge Point Details</th><th></th></tr></thead></table>");
     		var table = $("#details");
             $.each(data, function(key, val) {

src/main/resources/webapp/static/js/snippets/getConnectorIds.js

@@ -1,6 +1,6 @@
 $("#chargePointSelectList").change(function() {
 	var cp = $(this).find("option:selected").text();
-	$.getJSON("/steve/manager/ajax/getConnectorIds?chargeBoxId=" + cp, function(data) {
+	$.getJSON("/steve/manager/ajax/" + cp + "/connectorIds", function(data) {
 		var options = "";
 		$.each(data, function() {
 			options += "<option value='" + this + "'>" + this + "</option>";

src/main/resources/webapp/static/js/snippets/getConnectorIdsZeroAllowed.js

@@ -1,6 +1,6 @@
 $("#chargePointSelectList").change(function() {
     var cp = $(this).find("option:selected").text();
-    $.getJSON("/steve/manager/ajax/getConnectorIds?chargeBoxId=" + cp, function(data) {
+    $.getJSON("/steve/manager/ajax/" + cp + "/connectorIds", function(data) {
         var options = "<option value='0'>Not for a specific connector</option>";
         $.each(data, function() {
             options += "<option value='" + this + "'>" + this + "</option>";

src/main/resources/webapp/static/js/snippets/getReservationIds.js

@@ -1,6 +1,6 @@
 $("#chargePointSelectList").change(function() {
 	var cp = $(this).find("option:selected").text();
-	$.getJSON("/steve/manager/ajax/getReservationIds?chargeBoxId=" + cp, function(data) {
+	$.getJSON("/steve/manager/ajax/" + cp + "/reservationIds", function(data) {
 		var options = "";
 		$.each(data, function() {
 			options += "<option value='" + this + "'>" + this + "</option>";

src/main/resources/webapp/static/js/snippets/getTransactionIds.js

@@ -1,6 +1,6 @@
 $("#chargePointSelectList").change(function() {
 	var cp = $(this).find("option:selected").text();
-	$.getJSON("/steve/manager/ajax/getTransactionIds?chargeBoxId=" + cp, function(data) {
+	$.getJSON("/steve/manager/ajax/" + cp + "/transactionIds", function(data) {
 		var options = "";
 		$.each(data, function() {
 			options += "<option value='" + this + "'>" + this + "</option>";