Merge pull request #22 from bugout-dev/fix-holder-id-both

Support both cases for resource holder id

Author: kompotkot

pkg/brood/data.go

@@ -1,5 +1,9 @@
 package brood
 
+import (
+	"encoding/json"
+)
+
 type User struct {
 	Id              string `json:"id"`
 	Username        string `json:"username"`
@@ -83,11 +87,37 @@ type resourceUpdateRequest struct {
 }
 
 type ResourceHolder struct {
-	Id          string   `json:"id"`
+	Id          string   `json:"holder_id"`
 	HolderType  string   `json:"holder_type"`
 	Permissions []string `json:"permissions"`
 }
 
+func (r *ResourceHolder) UnmarshalJSON(data []byte) error {
+	// Define an alias to avoid recursion in custom unmarshaling
+	type Alias ResourceHolder
+	aux := &struct {
+		Id       string `json:"id"`
+		HolderId string `json:"holder_id"`
+		*Alias
+	}{
+		Alias: (*Alias)(r),
+	}
+
+	// Unmarshal into the auxiliary struct
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+
+	// Populate the Id field based on available data
+	if aux.Id != "" {
+		r.Id = aux.Id
+	} else {
+		r.Id = aux.HolderId
+	}
+
+	return nil
+}
+
 type ResourceHolders struct {
 	ResourceId string           `json:"resource_id"`
 	Holders    []ResourceHolder `json:"holders"`

pkg/version.go

@@ -1,3 +1,3 @@
 package bugout
 
-const Version string = "0.4.5"
+const Version string = "0.4.6"