From b692e57ed4cee2710c2a10ec9b8e75b43047080c Mon Sep 17 00:00:00 2001
From: Ben Pearce <ben.pearce@octopus.com>
Date: Wed, 27 Nov 2024 16:36:45 +1000
Subject: [PATCH] fix: fix get all deployment freeze call (#287)

---
 pkg/deploymentfreezes/deploymentfreeze.go          |  5 ++++-
 pkg/deploymentfreezes/deploymentfreeze_query.go    | 12 ++++++------
 pkg/deploymentfreezes/deploymentfreezes_service.go | 10 ++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkg/deploymentfreezes/deploymentfreeze.go b/pkg/deploymentfreezes/deploymentfreeze.go
index d84ab00e..5a08b976 100644
--- a/pkg/deploymentfreezes/deploymentfreeze.go
+++ b/pkg/deploymentfreezes/deploymentfreeze.go
@@ -5,7 +5,10 @@ import (
 	"time"
 )
 
-type DeploymentFreezes resources.Resources[DeploymentFreeze]
+type DeploymentFreezes struct {
+	DeploymentFreezes []DeploymentFreeze `json:"DeploymentFreezes"`
+	Count             int                `json:"Count"`
+}
 
 type DeploymentFreeze struct {
 	Name                    string              `json:"Name" validate:"required"`
diff --git a/pkg/deploymentfreezes/deploymentfreeze_query.go b/pkg/deploymentfreezes/deploymentfreeze_query.go
index fbea045c..a2fa95bb 100644
--- a/pkg/deploymentfreezes/deploymentfreeze_query.go
+++ b/pkg/deploymentfreezes/deploymentfreeze_query.go
@@ -1,10 +1,10 @@
 package deploymentfreezes
 
 type DeploymentFreezeQuery struct {
-	IncludeComplete bool     `uri:"includeComplete,omitempty"`
-	ProjectIds      []string `uri:"projectIds,omitempty"`
-	EnvironmentIds  []string `uri:"environmentIds,omitempty"`
-	IDs             []string `uri:"ids,omitempty"`
-	Skip            int      `uri:"skip,omitempty"`
-	Take            int      `uri:"take,omitempty"`
+	IncludeComplete bool     `uri:"includeComplete,omitempty" url:"includeComplete,omitempty"`
+	ProjectIds      []string `uri:"projectIds,omitempty" url:"projectIds,omitempty"`
+	EnvironmentIds  []string `uri:"environmentIds,omitempty" url:"environmentIds,omitempty"`
+	IDs             []string `uri:"ids,omitempty" url:"ids,omitempty"`
+	Skip            int      `uri:"skip" url:"skip"`
+	Take            int      `uri:"take,omitempty" url:"take,omitempty"`
 }
diff --git a/pkg/deploymentfreezes/deploymentfreezes_service.go b/pkg/deploymentfreezes/deploymentfreezes_service.go
index ff826b5c..1b1254f0 100644
--- a/pkg/deploymentfreezes/deploymentfreezes_service.go
+++ b/pkg/deploymentfreezes/deploymentfreezes_service.go
@@ -43,20 +43,18 @@ func GetById(client newclient.Client, id string) (*DeploymentFreeze, error) {
 
 }
 
-func GetAll(client newclient.Client) ([]*DeploymentFreeze, error) {
+func GetAll(client newclient.Client) (*DeploymentFreezes, error) {
 	path, err := client.URITemplateCache().Expand(template, &DeploymentFreezeQuery{Skip: 0, Take: math.MaxInt32})
 	if err != nil {
 		return nil, err
 	}
 
 	res, err := newclient.Get[DeploymentFreezes](client.HttpSession(), path)
-
-	freezes := make([]*DeploymentFreeze, 0)
-	for _, freeze := range res.Items {
-		freezes = append(freezes, &freeze)
+	if err != nil {
+		return &DeploymentFreezes{}, err
 	}
 
-	return freezes, nil
+	return res, nil
 }
 
 func Add(client newclient.Client, deploymentFreeze *DeploymentFreeze) (*DeploymentFreeze, error) {