diff --git a/services/gdd_service.go b/services/gdd_service.go index 68766efcbeb3cf8c503f91d59557bf9177be5816..df421a74af407356c1a95cedeafa6d31a6bcd290 100644 --- a/services/gdd_service.go +++ b/services/gdd_service.go @@ -15,15 +15,15 @@ import ( func GetGddValues(ctx context.Context, request models.GddRequest) models.GddResponse { product := enums.GetProductFromString(request.Product) var gdds entities.Gdd - if request.PlantingDate.Year() == time.Now().Year() { - gdds = persistence.GddRepository().FindCurrentGddByLocation(ctx, request.BuildLocation()) - } else if request.PlantingDate.Year() > time.Now().Year() { + if request.PlantingDate.After(time.Now()) { return models.GddResponse{ Product: product.Name, ClosestLatitude: request.Latitude, ClosestLongitude: request.Longitude, GddValues: []float64{}, } + } else if request.PlantingDate.Before(time.Now()) || request.PlantingDate.YearDay() == time.Now().YearDay() { + gdds = persistence.GddRepository().FindCurrentGddByLocation(ctx, request.BuildLocation()) } else { gdds = persistence.GddRepository().FindGddByLocationAndYear(ctx, request.PlantingDate.Year(), request.BuildLocation()) }