Planner: don't touch plan when disabling due to soc/energy limits reached (#11030)

server/http_loadpoint_handler.go

@@ -1,6 +1,8 @@
 package server
 
 import (
+	"errors"
+	"fmt"
 	"net/http"
 	"strconv"
 	"time"
@@ -83,25 +85,87 @@ func remoteDemandHandler(lp loadpoint.API) http.HandlerFunc {
 	}
 }
 
-// planHandler returns the current effective plan
+// planHandler returns the current plan
 func planHandler(lp loadpoint.API) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		maxPower := lp.EffectiveMaxPower()
 		planTime := lp.EffectivePlanTime()
-		power := lp.EffectiveMaxPower()
-		requiredDuration, plan, err := lp.GetPlan(planTime, power)
+
+		goal, _ := lp.GetPlanGoal()
+		requiredDuration := lp.GetPlanRequiredDuration(goal, maxPower)
+		plan, err := lp.GetPlan(planTime, requiredDuration)
 		if err != nil {
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 
 		res := struct {
+			PlanTime time.Time `json:"planTime"`
 			Duration int64     `json:"duration"`
 			Plan     api.Rates `json:"plan"`
 			Power    float64   `json:"power"`
 		}{
+			PlanTime: planTime,
 			Duration: int64(requiredDuration.Seconds()),
 			Plan:     plan,
-			Power:    power,
+			Power:    maxPower,
+		}
+
+		jsonResult(w, res)
+	}
+}
+
+// planPreviewHandler returns a plan preview for given parameters
+func planPreviewHandler(lp loadpoint.API) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		vars := mux.Vars(r)
+
+		planTime, err := time.Parse(time.RFC3339, vars["time"])
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		goal, err := strconv.ParseFloat(vars["value"], 64)
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		switch typ := vars["type"]; typ {
+		case "soc":
+			if !lp.SocBasedPlanning() {
+				jsonError(w, http.StatusBadRequest, errors.New("soc planning only available for vehicles with known soc and capacity"))
+				return
+			}
+		case "energy":
+			if lp.SocBasedPlanning() {
+				jsonError(w, http.StatusBadRequest, errors.New("energy planning not available for vehicles with known soc and capacity"))
+				return
+			}
+		default:
+			jsonError(w, http.StatusBadRequest, fmt.Errorf("invalid plan type: %s", typ))
+			return
+		}
+
+		maxPower := lp.EffectiveMaxPower()
+		requiredDuration := lp.GetPlanRequiredDuration(goal, maxPower)
+		plan, err := lp.GetPlan(planTime, requiredDuration)
+		if err != nil {
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		res := struct {
+			PlanTime time.Time `json:"planTime"`
+			Duration int64     `json:"duration"`
+			Plan     api.Rates `json:"plan"`
+			Power    float64   `json:"power"`
+		}{
+			PlanTime: planTime,
+			Duration: int64(requiredDuration.Seconds()),
+			Plan:     plan,
+			Power:    maxPower,
 		}
 
 		jsonResult(w, res)