From fdfa02dcf13969ebfd0efd26ae2d75a001f614a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20G=C3=B6bel?= Date: Tue, 18 Jul 2023 16:06:54 +0200 Subject: [PATCH] format the code --- apiservices/api_configuration_service.go | 1 - apiservices/api_spaces_service.go | 2 +- apiservices/api_version_service.go | 2 +- conf/conf.go | 8 ++++---- eliona/dashboards.go | 1 - main.go | 8 +++----- thingdust/types.go | 12 ++++-------- 7 files changed, 13 insertions(+), 21 deletions(-) diff --git a/apiservices/api_configuration_service.go b/apiservices/api_configuration_service.go index ef9fe35..d51dd1a 100644 --- a/apiservices/api_configuration_service.go +++ b/apiservices/api_configuration_service.go @@ -65,7 +65,6 @@ func (s *ConfigurationApiService) GetConfigurations(ctx context.Context) (apiser } return apiserver.Response(http.StatusOK, configs), nil - } // PostConfiguration - Creates an example configuration diff --git a/apiservices/api_spaces_service.go b/apiservices/api_spaces_service.go index e413b7f..20b3511 100644 --- a/apiservices/api_spaces_service.go +++ b/apiservices/api_spaces_service.go @@ -13,8 +13,8 @@ import ( "context" //"errors" "net/http" - "thingdust/conf" "thingdust/apiserver" + "thingdust/conf" ) // SpacesApiService is a service that implements the logic for the SpacesApiServicer diff --git a/apiservices/api_version_service.go b/apiservices/api_version_service.go index 634dd2b..9331d87 100644 --- a/apiservices/api_version_service.go +++ b/apiservices/api_version_service.go @@ -13,10 +13,10 @@ import ( "context" "github.com/eliona-smart-building-assistant/go-utils/common" "github.com/eliona-smart-building-assistant/go-utils/log" + "gopkg.in/yaml.v3" "net/http" "os" "thingdust/apiserver" - "gopkg.in/yaml.v3" ) // VersionApiService is a service that implements the logic for the VersionApiServicer diff --git a/conf/conf.go b/conf/conf.go index 341ecde..d21c261 100644 --- a/conf/conf.go +++ b/conf/conf.go @@ -17,13 +17,13 @@ package conf import ( "context" - "thingdust/apiserver" - dbthingdust "thingdust/db/thingdust" "github.com/eliona-smart-building-assistant/go-utils/common" "github.com/eliona-smart-building-assistant/go-utils/db" + "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" - "github.com/volatiletech/null/v8" + "thingdust/apiserver" + dbthingdust "thingdust/db/thingdust" ) func GetSpaces(ctx context.Context, configId int64) ([]apiserver.Space, error) { @@ -56,7 +56,7 @@ func GetSpace(ctx context.Context, configId int64, projectId string, spaceName s if err != nil { return nil, err } - if len(dbSpaces)!= 1 { + if len(dbSpaces) != 1 { return nil, nil } return apiSpacesFromDbSpaces(dbSpaces[0]), nil diff --git a/eliona/dashboards.go b/eliona/dashboards.go index cb14ada..2df2534 100644 --- a/eliona/dashboards.go +++ b/eliona/dashboards.go @@ -25,7 +25,6 @@ func ThingdustDashboard(projectId string) (api.Dashboard, error) { dashboard := api.Dashboard{} dashboard.Name = "Thingdust Spaces" dashboard.ProjectId = projectId - dashboard.Widgets = []api.Widget{} diff --git a/main.go b/main.go index 106db50..115d82e 100644 --- a/main.go +++ b/main.go @@ -33,7 +33,7 @@ import ( // until all services are finished. func main() { log.Info("main", "Starting the app.") - + database := db.Database(app.AppName()) defer database.Close() boil.SetDB(database) @@ -51,15 +51,13 @@ func main() { common.Loop(CheckConfigsandSetActiveState, time.Second), listenApiRequests, ) - + // At the end set all configuration inactive _, err := conf.SetAllConfigsInactive(context.Background()) if err != nil { log.Error("conf", "setting all configs inactive: %v", err) } - + log.Info("main", "Terminate the app.") } - - diff --git a/thingdust/types.go b/thingdust/types.go index 83ed00f..48b47fb 100644 --- a/thingdust/types.go +++ b/thingdust/types.go @@ -1,15 +1,11 @@ package thingdust -import ( - -) - +import () type Spaces map[string]Space - type Space struct { - Humidity float64 `json:"humidity"` - Occupancy string `json:"occupancy"` + Humidity float64 `json:"humidity"` + Occupancy string `json:"occupancy"` Temperature float64 `json:"temperature"` -} \ No newline at end of file +}