set include url param

gaetancollaud · Dec 19, 2023 · f6cd854 · f6cd854
1 parent a4f8a9a
commit f6cd854
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/docs/api/apartment.http b/docs/api/apartment.http
@@ -1,5 +1,5 @@
 // @no-cookie-jar
-GET {{host}}/api/v1/apartment
+GET {{host}}/api/v1/apartment?include=installation,dsDevices,submodules,functionBlocks,zones,clusters,applications,dsServer,controllers,apiRevision,meterings
 Authorization: Bearer {{api-key}}
 
 ###

diff --git a/pkg/digitalstrom/api.go b/pkg/digitalstrom/api.go
@@ -15,20 +15,14 @@ type ApartmentAttributes struct {
 }
 
 type ApartmentIncluded struct {
+	// Before mapping this, you need to add the "include" in the query
 	Installation   Installation    `mapstructure:"installation"`
 	Devices        []Device        `mapstructure:"dsDevices"`
 	Submodules     []Submodule     `mapstructure:"submodules"`
 	FunctionBlocks []FunctionBlock `mapstructure:"functionBlocks"`
 	Zones          []Zone          `mapstructure:"zones"`
-	//Scenarios      []Scenarios     `mapstructure:"scenarios"`
-	// floors
-	// clusters
-	// dsServer
-	Controllers []Controller `mapstructure:"controllers"`
-	// apiRevision
-	Meterings []Metering `mapstructure:"meterings"`
-	// userDefinedStates
-	// applications
+	Controllers    []Controller    `mapstructure:"controllers"`
+	Meterings      []Metering      `mapstructure:"meterings"`
 }
 
 type Installation struct {

diff --git a/pkg/digitalstrom/client.go b/pkg/digitalstrom/client.go
@@ -123,12 +123,16 @@ func (c *client) Disconnect() error {
 }
 
 func (c *client) GetApartment() (*Apartment, error) {
-	response, err := c.getRequest("api/v1/apartment", nil)
+	params := url.Values{}
+	params.Set("include", "installation,dsDevices,submodules,functionBlocks,zones,controllers,meterings")
+	response, err := c.getRequest("api/v1/apartment", params)
 	return wrapApiResponse[Apartment](response, err)
 }
 
 func (c *client) GetApartmentStatus() (*ApartmentStatus, error) {
-	response, err := c.getRequest("api/v1/apartment/status", nil)
+	params := url.Values{}
+	params.Set("include", "dsDevices,zones")
+	response, err := c.getRequest("api/v1/apartment/status", params)
 	return wrapApiResponse[ApartmentStatus](response, err)
 }