From c990fb746ea676b653a477cc36db83a615cd89b6 Mon Sep 17 00:00:00 2001
From: tgs266 <siegel.tucker@gmail.com>
Date: Mon, 27 Sep 2021 14:45:51 -0400
Subject: [PATCH] temp change
---
README.md | 2 +-
config/error_codes.go | 2 +-
controllers/data_download_controller.go | 6 +++---
controllers/freezing_dates_controller.go | 4 ++--
controllers/gdd_controller.go | 6 +++---
controllers/misc_controller.go | 11 ++++++-----
controllers/nomads_controller.go | 4 ++--
controllers/seed_controllers.go | 6 +++---
go.mod | 2 +-
main.go | 11 ++++++-----
models/confidence_interval.go | 7 ++++---
models/csv.go | 3 ++-
models/enums/product_type.go | 3 ++-
models/freezing_dates.go | 5 +++--
models/gdd.go | 5 +++--
models/seeds.go | 3 ++-
persistence/mongodb.go | 9 +++++----
services/confidence_interval_service.go | 9 +++++----
services/data_download_service.go | 13 +++++++------
services/freezing_date_service.go | 9 +++++----
services/gdd_service.go | 13 +++++++------
services/nomads_service.go | 9 +++++----
services/seed_service.go | 13 +++++++------
utils/gdd_calculations.go | 2 +-
utils/gdd_calculations_test.go | 3 ++-
25 files changed, 88 insertions(+), 72 deletions(-)
diff --git a/README.md b/README.md
index 7093a9f..dea6a34 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,4 @@ Swagger [Here](http://localhost:8080/api/weather/gdd-swagger/index.html#/)
## Docker
-To build the image: `docker build -t dawn/dawn-weather .`
\ No newline at end of file
+To build the image: `docker build -t dawn/gitlab.cs.umd.edu/dawn/dawn-weather .`
\ No newline at end of file
diff --git a/config/error_codes.go b/config/error_codes.go
index 2bc0867..174ce28 100644
--- a/config/error_codes.go
+++ b/config/error_codes.go
@@ -1,6 +1,6 @@
package config
-import "dawn-gdd/common"
+import "gitlab.cs.umd.edu/dawn/dawn-weather/common"
func INVALID_PRODUCT(passedProduct string) *common.DawnError {
return &common.DawnError{
diff --git a/controllers/data_download_controller.go b/controllers/data_download_controller.go
index c1341e2..a85b959 100644
--- a/controllers/data_download_controller.go
+++ b/controllers/data_download_controller.go
@@ -1,9 +1,9 @@
package controllers
import (
- "dawn-gdd/common"
- "dawn-gdd/models"
- "dawn-gdd/services"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/common"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/services"
"github.com/gofiber/fiber/v2"
)
diff --git a/controllers/freezing_dates_controller.go b/controllers/freezing_dates_controller.go
index 0ff1eed..79a2132 100644
--- a/controllers/freezing_dates_controller.go
+++ b/controllers/freezing_dates_controller.go
@@ -1,8 +1,8 @@
package controllers
import (
- "dawn-gdd/models"
- "dawn-gdd/services"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/services"
"github.com/gofiber/fiber/v2"
)
diff --git a/controllers/gdd_controller.go b/controllers/gdd_controller.go
index f873b43..47ddf3f 100644
--- a/controllers/gdd_controller.go
+++ b/controllers/gdd_controller.go
@@ -1,9 +1,9 @@
package controllers
import (
- "dawn-gdd/common"
- "dawn-gdd/models"
- "dawn-gdd/services"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/common"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/services"
"github.com/gofiber/fiber/v2"
)
diff --git a/controllers/misc_controller.go b/controllers/misc_controller.go
index 75eac3b..05b8aab 100644
--- a/controllers/misc_controller.go
+++ b/controllers/misc_controller.go
@@ -1,13 +1,14 @@
package controllers
import (
- "dawn-gdd/config"
- "dawn-gdd/models"
- "dawn-gdd/persistence"
- "dawn-gdd/persistence/entities"
- "dawn-gdd/services"
"strconv"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence/entities"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/services"
+
"github.com/gofiber/fiber/v2"
)
diff --git a/controllers/nomads_controller.go b/controllers/nomads_controller.go
index ca48f8d..71ee93a 100644
--- a/controllers/nomads_controller.go
+++ b/controllers/nomads_controller.go
@@ -1,8 +1,8 @@
package controllers
import (
- "dawn-gdd/models"
- "dawn-gdd/services"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/services"
"github.com/gofiber/fiber/v2"
)
diff --git a/controllers/seed_controllers.go b/controllers/seed_controllers.go
index e1789c9..4576836 100644
--- a/controllers/seed_controllers.go
+++ b/controllers/seed_controllers.go
@@ -1,9 +1,9 @@
package controllers
import (
- "dawn-gdd/common"
- "dawn-gdd/models"
- "dawn-gdd/services"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/common"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/services"
"github.com/gofiber/fiber/v2"
)
diff --git a/go.mod b/go.mod
index 4930e71..96b4218 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module dawn-weather
+module gitlab.cs.umd.edu/dawn/dawn-weather
go 1.16
diff --git a/main.go b/main.go
index b019270..9e79e74 100644
--- a/main.go
+++ b/main.go
@@ -1,13 +1,14 @@
package main
import (
- "dawn-gdd/common"
- "dawn-gdd/config"
- "dawn-gdd/controllers"
- "dawn-gdd/persistence"
"flag"
"strconv"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/common"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/controllers"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence"
+
"github.com/ansrivas/fiberprometheus/v2"
swagger "github.com/arsmn/fiber-swagger/v2"
"github.com/gofiber/fiber/v2"
@@ -16,7 +17,7 @@ import (
"github.com/gofiber/fiber/v2/utils"
"github.com/spf13/viper"
- _ "dawn-gdd/docs"
+ _ "gitlab.cs.umd.edu/dawn/dawn-weather/docs"
)
func registerRoutes(app *fiber.App) {
diff --git a/models/confidence_interval.go b/models/confidence_interval.go
index d886323..379ec7e 100644
--- a/models/confidence_interval.go
+++ b/models/confidence_interval.go
@@ -1,12 +1,13 @@
package models
import (
- "dawn-gdd/config"
- "dawn-gdd/models/enums"
- "dawn-gdd/persistence/entities"
"errors"
"strconv"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models/enums"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence/entities"
+
validation "github.com/go-ozzo/ozzo-validation"
"github.com/gofiber/fiber/v2"
)
diff --git a/models/csv.go b/models/csv.go
index 95e31d3..b1cb1b1 100644
--- a/models/csv.go
+++ b/models/csv.go
@@ -1,10 +1,11 @@
package models
import (
- "dawn-gdd/config"
"strconv"
"time"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+
validation "github.com/go-ozzo/ozzo-validation"
"github.com/gofiber/fiber/v2"
)
diff --git a/models/enums/product_type.go b/models/enums/product_type.go
index e4fc270..d7b492c 100644
--- a/models/enums/product_type.go
+++ b/models/enums/product_type.go
@@ -1,8 +1,9 @@
package enums
import (
- "dawn-gdd/config"
"strings"
+
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
)
type Product struct {
diff --git a/models/freezing_dates.go b/models/freezing_dates.go
index 58a0505..f8d3991 100644
--- a/models/freezing_dates.go
+++ b/models/freezing_dates.go
@@ -1,11 +1,12 @@
package models
import (
- "dawn-gdd/config"
- "dawn-gdd/persistence/entities"
"strconv"
"time"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence/entities"
+
validation "github.com/go-ozzo/ozzo-validation"
"github.com/gofiber/fiber/v2"
)
diff --git a/models/gdd.go b/models/gdd.go
index 0bf9ff3..53031bf 100644
--- a/models/gdd.go
+++ b/models/gdd.go
@@ -1,11 +1,12 @@
package models
import (
- "dawn-gdd/config"
- "dawn-gdd/persistence/entities"
"strconv"
"time"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence/entities"
+
validation "github.com/go-ozzo/ozzo-validation"
"github.com/gofiber/fiber/v2"
)
diff --git a/models/seeds.go b/models/seeds.go
index 30ea64c..fe51e7c 100644
--- a/models/seeds.go
+++ b/models/seeds.go
@@ -1,10 +1,11 @@
package models
import (
- "dawn-gdd/config"
"strconv"
"time"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+
validation "github.com/go-ozzo/ozzo-validation"
"github.com/gofiber/fiber/v2"
)
diff --git a/persistence/mongodb.go b/persistence/mongodb.go
index 1eeac44..d5d39c2 100644
--- a/persistence/mongodb.go
+++ b/persistence/mongodb.go
@@ -2,12 +2,13 @@ package persistence
import (
"context"
- "dawn-gdd/common"
- "dawn-gdd/config"
- "dawn-gdd/models"
- "dawn-gdd/persistence/entities"
"strings"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/common"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence/entities"
+
"github.com/bradfitz/slice"
"github.com/spf13/viper"
"go.mongodb.org/mongo-driver/bson"
diff --git a/services/confidence_interval_service.go b/services/confidence_interval_service.go
index c58e203..8e41b76 100644
--- a/services/confidence_interval_service.go
+++ b/services/confidence_interval_service.go
@@ -1,12 +1,13 @@
package services
import (
- "dawn-gdd/models"
- "dawn-gdd/models/enums"
- "dawn-gdd/persistence"
- "dawn-gdd/utils"
"math"
"time"
+
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models/enums"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/utils"
)
func GetConfidenceInterval(request models.ConfidenceIntervalRequest) models.ConfidenceIntervalResposne {
diff --git a/services/data_download_service.go b/services/data_download_service.go
index 1f5272b..8adc8aa 100644
--- a/services/data_download_service.go
+++ b/services/data_download_service.go
@@ -1,12 +1,6 @@
package services
import (
- "dawn-gdd/common"
- "dawn-gdd/config"
- "dawn-gdd/models"
- "dawn-gdd/models/enums"
- "dawn-gdd/persistence"
- "dawn-gdd/persistence/entities"
"encoding/csv"
"fmt"
"io/ioutil"
@@ -17,6 +11,13 @@ import (
"strings"
"time"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/common"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models/enums"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence/entities"
+
"github.com/gofiber/fiber/v2"
"github.com/google/uuid"
)
diff --git a/services/freezing_date_service.go b/services/freezing_date_service.go
index abb7a39..2790df6 100644
--- a/services/freezing_date_service.go
+++ b/services/freezing_date_service.go
@@ -1,12 +1,13 @@
package services
import (
- "dawn-gdd/config"
- "dawn-gdd/models"
- "dawn-gdd/persistence"
- "dawn-gdd/persistence/entities"
"fmt"
"time"
+
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence/entities"
)
var may31st = 150
diff --git a/services/gdd_service.go b/services/gdd_service.go
index c53db8b..e640374 100644
--- a/services/gdd_service.go
+++ b/services/gdd_service.go
@@ -1,13 +1,14 @@
package services
import (
- "dawn-gdd/common"
- "dawn-gdd/models"
- "dawn-gdd/models/enums"
- "dawn-gdd/persistence"
- "dawn-gdd/persistence/entities"
- "dawn-gdd/utils"
"time"
+
+ "gitlab.cs.umd.edu/dawn/dawn-weather/common"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models/enums"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence/entities"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/utils"
)
func GetFullYearGddValues(ctx common.DawnCtx, request models.GddRequest) models.GddResponse {
diff --git a/services/nomads_service.go b/services/nomads_service.go
index 5c3a910..00ad5b3 100644
--- a/services/nomads_service.go
+++ b/services/nomads_service.go
@@ -1,11 +1,12 @@
package services
import (
- "dawn-gdd/models"
- "dawn-gdd/models/enums"
- "dawn-gdd/persistence"
- "dawn-gdd/utils"
"math"
+
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models/enums"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/utils"
)
func GetGefsGddValues(request models.GddRequest) models.GefsGddResponse {
diff --git a/services/seed_service.go b/services/seed_service.go
index 52cebba..2f99d18 100644
--- a/services/seed_service.go
+++ b/services/seed_service.go
@@ -1,15 +1,16 @@
package services
import (
- "dawn-gdd/common"
- "dawn-gdd/config"
- "dawn-gdd/models"
- "dawn-gdd/models/enums"
- "dawn-gdd/persistence"
- "dawn-gdd/utils"
"math"
"time"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/common"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/config"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models/enums"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/persistence"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/utils"
+
"github.com/gofiber/fiber/v2"
)
diff --git a/utils/gdd_calculations.go b/utils/gdd_calculations.go
index 2f83460..a38251b 100644
--- a/utils/gdd_calculations.go
+++ b/utils/gdd_calculations.go
@@ -1,7 +1,7 @@
package utils
import (
- "dawn-gdd/models/enums"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models/enums"
)
func CalculateSingleGdd(minTemp float64, maxTemp float64, product enums.Product) float64 {
diff --git a/utils/gdd_calculations_test.go b/utils/gdd_calculations_test.go
index 01f0597..63af834 100644
--- a/utils/gdd_calculations_test.go
+++ b/utils/gdd_calculations_test.go
@@ -1,9 +1,10 @@
package utils
import (
- "dawn-gdd/models/enums"
"testing"
+ "gitlab.cs.umd.edu/dawn/dawn-weather/models/enums"
+
"github.com/stretchr/testify/assert"
)
--
GitLab