1
-
2
1
// This file is part of the eliona project.
3
2
// Copyright © 2022 LEICOM iTEC AG. All Rights Reserved.
4
3
// ______ _ _
@@ -18,15 +17,16 @@ package conf
18
17
19
18
import (
20
19
"context"
20
+ "hailo/apiserver"
21
+ dbhailo "hailo/db/hailo"
22
+
21
23
"github.com/eliona-smart-building-assistant/go-eliona/app"
22
24
"github.com/eliona-smart-building-assistant/go-utils/common"
23
25
"github.com/eliona-smart-building-assistant/go-utils/db"
24
26
"github.com/volatiletech/null/v8"
25
27
"github.com/volatiletech/sqlboiler/v4/boil"
26
28
"github.com/volatiletech/sqlboiler/v4/queries/qm"
27
29
"github.com/volatiletech/sqlboiler/v4/types"
28
- "hailo/apiserver"
29
- dbhailo "hailo/db/hailo"
30
30
)
31
31
32
32
const DefaultInactiveTimeout = 60 * 60 * 24 // time until set a container to inactive (sec)
@@ -105,6 +105,7 @@ func apiConfigFromDbConfig(dbConfig *dbhailo.Config) *apiserver.Configuration {
105
105
apiConfig .Id = & dbConfig .AppID
106
106
apiConfig .AssetId = dbConfig .AssetID .Ptr ()
107
107
apiConfig .Enable = dbConfig .Enable .Ptr ()
108
+ apiConfig .Active = dbConfig .Active .Ptr ()
108
109
apiConfig .Description = dbConfig .Description .Ptr ()
109
110
apiConfig .InactiveTimeout = getInactiveTimeout (dbConfig )
110
111
var fdsConfig FdsConfig
@@ -125,6 +126,7 @@ func dbConfigFromApiConfig(apiConfig *apiserver.Configuration) *dbhailo.Config {
125
126
dbConfig .AppID = null .Int64FromPtr (apiConfig .Id ).Int64
126
127
dbConfig .AssetID = null .Int32FromPtr (apiConfig .AssetId )
127
128
dbConfig .Enable = null .BoolFromPtr (apiConfig .Enable )
129
+ dbConfig .Active = null .BoolFromPtr (apiConfig .Active )
128
130
dbConfig .Description = null .StringFromPtr (apiConfig .Description )
129
131
dbConfig .InactiveTimeout = null .Int32From (apiConfig .InactiveTimeout )
130
132
dbConfig .AuthTimeout = apiConfig .AuthTimeout
0 commit comments