Skip to content
Snippets Groups Projects
Commit f09f2469 authored by Tucker Gary Siegel's avatar Tucker Gary Siegel
Browse files

update year rules

parent 8c550fbe
No related branches found
No related tags found
No related merge requests found
......@@ -46,6 +46,6 @@ func GetDailyGdd(c *fiber.Ctx) error {
// @Param accumulate query boolean true "Accumulate gdd values"
// @Router /gdd/normals [get]
func GetNormalGdd(c *fiber.Ctx) error {
request := models.BuildGddRequest(c)
request := models.BuildYearlessGddRequest(c)
return c.Status(fiber.StatusOK).JSON(services.GetNormalValues(request))
}
......@@ -23,7 +23,7 @@ import (
// @Param accumulate query boolean true "Accumulate gdd values"
// @Router /gdd/gefs [get]
func GetGefsGDD(c *fiber.Ctx) error {
request := models.BuildGddRequest(c)
request := models.BuildYearlessGddRequest(c)
return c.Status(fiber.StatusOK).JSON(services.GetGefsGddValues(request))
}
......@@ -41,7 +41,7 @@ func GetGefsGDD(c *fiber.Ctx) error {
// @Param accumulate query boolean true "Accumulate gdd values"
// @Router /gdd/cfs [get]
func GetCfsGDD(c *fiber.Ctx) error {
request := models.BuildGddRequest(c)
request := models.BuildYearlessGddRequest(c)
return c.Status(fiber.StatusOK).JSON(services.GetCfsGddValues(request))
}
......
......@@ -9,6 +9,7 @@ import (
validation "github.com/go-ozzo/ozzo-validation"
"github.com/gofiber/fiber/v2"
"github.com/tgs266/dawn-go-common/errors"
)
type GddResponse struct {
......@@ -54,6 +55,23 @@ var BuildGddRequest = func(c *fiber.Ctx) GddRequest {
accumulate, errBool := strconv.ParseBool(c.Query("accumulate", "false"))
plantingDate, errDate := time.Parse(time.RFC3339, pd)
if errLat != nil || errLon != nil || errBool != nil {
panic(config.BAD_REQUEST)
}
if errYear != nil && errDate != nil {
panic(errors.NewBadRequest(nil).PutDetail("reason", "no date or year provided"))
}
// date is provided but year isnt
if errYear != nil && errDate == nil {
year = plantingDate.Year()
}
if errDate != nil && pd != "" {
panic(errors.NewBadRequest(nil).PutDetail("reason", "date must be ISO8601 or RFC3339 format"))
}
rNew := GddRequest{
Year: year,
Product: product,
......@@ -63,22 +81,31 @@ var BuildGddRequest = func(c *fiber.Ctx) GddRequest {
PlantingDate: plantingDate,
}
if errYear != nil || errLat != nil || errLon != nil || errBool != nil {
if e := rNew.Validate(); e != nil {
panic(errors.NewBadRequest(e).AddLogDetails(e.Error()))
}
return rNew
}
var BuildYearlessGddRequest = func(c *fiber.Ctx) GddRequest {
product := c.Query("product")
latitude, errLat := strconv.ParseFloat(c.Query("latitude"), 64)
longitude, errLon := strconv.ParseFloat(c.Query("longitude"), 64)
accumulate, errBool := strconv.ParseBool(c.Query("accumulate", "false"))
if errLat != nil || errLon != nil || errBool != nil {
panic(config.BAD_REQUEST)
}
if errDate != nil && pd != "" {
panic(config.BAD_REQUEST.PutDetail("reason", "date must be ISO8601 or RFC3339 format"))
rNew := GddRequest{
Product: product,
Latitude: latitude,
Longitude: longitude,
Accumulate: accumulate,
}
if rNew.Year != 0 {
if e := rNew.Validate(); e != nil {
panic(config.BAD_REQUEST.AddLogDetails(e.Error()))
}
} else {
if e := rNew.ValidateNoYear(); e != nil {
panic(config.BAD_REQUEST.AddLogDetails(e.Error()))
}
if e := rNew.ValidateNoYear(); e != nil {
panic(errors.NewBadRequest(e).AddLogDetails(e.Error()))
}
return rNew
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment