From 754d62e10f1b91a1f6fc59de82bef95405537c4a Mon Sep 17 00:00:00 2001
From: Tucker Siegel <tgsiegel@terpmail.umd.edu>
Date: Wed, 8 Feb 2023 15:27:12 -0500
Subject: [PATCH] update
---
controllers/forecast_controller.go | 3 ++-
services/forecast_service.go | 9 +++++----
services/gdd_service.go | 1 -
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/controllers/forecast_controller.go b/controllers/forecast_controller.go
index 39d4921..7fade6a 100644
--- a/controllers/forecast_controller.go
+++ b/controllers/forecast_controller.go
@@ -28,7 +28,8 @@ import (
func ForecastStages(c *fiber.Ctx) error {
ctx := common.DawnCtx{FiberCtx: c}
request := models.BuildStageRequest(ctx)
- return c.Status(fiber.StatusOK).JSON(services.CalculateStages(ctx, request))
+ stages := services.CalculateStages(ctx, request)
+ return c.Status(fiber.StatusOK).JSON(stages)
}
// ForecastFreezingDates godoc
diff --git a/services/forecast_service.go b/services/forecast_service.go
index a5da5fc..71dd7f4 100644
--- a/services/forecast_service.go
+++ b/services/forecast_service.go
@@ -109,10 +109,11 @@ func forecast(ctx context.Context, gddReq models.GddRequest, plantdate time.Time
alpha := 1.0
binCount := 5
product := enums.GetProductFromString(gddReq.Product)
- start := plantdate.YearDay() - 1
- if plantdate.Year()%4 == 0 && plantdate.Year()%100 != 0 || plantdate.Year()%400 == 0 {
- start -= 1
- }
+ // start := plantdate.YearDay() - 1
+ // if plantdate.Year()%4 == 0 && plantdate.Year()%100 != 0 || plantdate.Year()%400 == 0 {
+ // start -= 1
+ // }
+ start := 0
out := map[string]*models.Bins{}
// need to get the match order
diff --git a/services/gdd_service.go b/services/gdd_service.go
index 89da322..2fee075 100644
--- a/services/gdd_service.go
+++ b/services/gdd_service.go
@@ -32,7 +32,6 @@ func GetGddValues(ctx context.Context, request models.GddRequest) models.GddResp
pdInt := request.PlantingDate.YearDay() - 1
gdds.MaxTemps = gdds.MaxTemps[pdInt:]
gdds.MinTemps = gdds.MinTemps[pdInt:]
- // }
returnGdds := models.GddResponse{
Product: product.Name,
--
GitLab