diff --git a/README.md b/README.md index 7093a9f6749385bd0a1e25abace4adc53b7a684e..dea6a34407770c249fad35c2358580e3a7101d73 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 2bc08677d243060bb284a4ebb09507fe890b22f2..174ce286d3e0abe3119b75f4b0eb1450feb85792 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 c1341e2fdc7059657d7822e3f46c35356add9c5b..a85b95908e470077855682b6b6d455c89a6fc1c2 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 0ff1eedc68580c40eb829aa9e68e3632fd7f3530..79a213297e0f450f73c7f501e51b99910a61677b 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 f873b432d476041501134beacb754cfe8444d760..47ddf3f0b16b0c29746a655313aa596310083399 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 75eac3bada65731c1bd7fbcd06413aa0ab57e106..05b8aab02435aeffdf4dce16036f1037d3185321 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 ca48f8df1d68d54737b350357b6369e46a3f6886..71ee93a62e9d459dff7e36c04593f1b324e13d69 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 e1789c93bc12a1a1be697a3dfbe9638df679df8c..45768360d06c0791900f4cfe55e0c854e49af3ec 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 4930e71a3bef4aa5eb5acce5812e8859cfe1ed2b..96b4218b37899dd8a0708d9734548199d2d925e3 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 b0192703d0a062088b80c13838de3b701d32536e..9e79e742e03a9eb7e3d29cbbd4eee852478150b9 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 d886323f6a3ca62ecb10098b4d03d62a25bac64a..379ec7ea4c140bc48b1ccc51090043635200e4d5 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 95e31d3d1e631b6b1d9d4fec46b3a783d2beff54..b1cb1b172ae9ac111362fd43d90b1ee816dd9590 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 e4fc27094ef3814f558da121e819df8cb08e1f42..d7b492c2fd512e4522168844f84d2691b81cb2d1 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 58a0505cfa584c9d4db3dfe4d293f23a24064f34..f8d3991c481bd1e70a1dd28e0d1af35dc334748d 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 0bf9ff3f46dd2661115cdeb0d834e6d745f20cf1..53031bf1063640798e39ccf2d6a001ecb8bc6c33 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 30ea64c0f85b19497e7553167668627c52ed8ac1..fe51e7c7d090466e84ceb2fb60769ff19f7cfefc 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 1eeac446a25a2397bf73a0e82df1bbeb1a5e93e1..d5d39c2aa9b655bcb9cecd7fc614528d83fe78b9 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 c58e2034a23c4acd1c246e4cdcce1126e1b367d7..8e41b766763269f81e2a3c513b18e0a3be54f41a 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 1f5272bd02cf3ef745fb120129695d142e3f8b00..8adc8aa8c3453da1a9477b9245d87baf1819eb08 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 abb7a3939258eb28e852575c123fb71f538221a7..2790df6b49eb73c91e005c3e876170a006179a0d 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 c53db8b24e6439a37b41b1417cc1abcd05a04a7a..e640374d4622d73da4c00346eb3fd96474ba3ed0 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 5c3a9104a93ff3702cea0585916e0153956ab9ae..00ad5b3c7e825654e4c69749b02a26719c50add6 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 52cebba898c4c97b51aa8ee69977ffc4f12eab47..2f99d1891cc0af5e50975ec715d745e25f935a48 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 2f834609eb1a83e6b84f4085f1ea0fd7b375e67c..a38251b5d1f3c815ba8c47d9adb34321e82e5a9e 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 01f0597291c93811b8b150354f0a3587291b9557..63af8347e0edd8f8367a098552e45b459b750ee1 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" )