Merge pull request #1255 from threefoldtech/development_proxy_fixTests

fix proxy tests
threefoldtech · Nov 13, 2024 · ea8357b · ea8357b
2 parents fd37a4f + 5c909e9
commit ea8357b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/grid-proxy/docs/docs.go b/grid-proxy/docs/docs.go
diff --git a/grid-proxy/docs/swagger.json b/grid-proxy/docs/swagger.json
@@ -1571,6 +1571,14 @@
                     "TwinConsumption"
                 ],
                 "summary": "Show a report for user consumption",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "twin id",
+                        "name": "twin_id",
+                        "in": "path"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",

diff --git a/grid-proxy/docs/swagger.yaml b/grid-proxy/docs/swagger.yaml
@@ -1512,6 +1512,11 @@ paths:
       consumes:
       - application/json
       description: Get a report of user spent for last hour and for lifetime
+      parameters:
+      - description: twin id
+        in: path
+        name: twin_id
+        type: integer
       produces:
       - application/json
       responses:

diff --git a/grid-proxy/internal/explorer/server.go b/grid-proxy/internal/explorer/server.go
@@ -344,6 +344,7 @@ func (a *App) listTwins(r *http.Request) (interface{}, mw.Response) {
 // @Summary Show a report for user consumption
 // @Description Get a report of user spent for last hour and for lifetime
 // @Tags TwinConsumption
+// @Param twin_id path int yes "twin id"
 // @Accept  json
 // @Produce  json
 // @Success 200 {object} []types.TwinConsumption

diff --git a/grid-proxy/tests/queries/mock_client/contracts.go b/grid-proxy/tests/queries/mock_client/contracts.go
@@ -273,8 +273,8 @@ func (g *GridProxyMockClient) Contract(ctx context.Context, contractID uint32) (
 			Type:       "rent",
 			Details: types.RentContractDetails{
 				NodeID:   uint(rentContract.NodeID),
-				FarmId:   g.data.Nodes[nodeContract.NodeID].FarmID,
-				FarmName: g.data.Farms[g.data.Nodes[nodeContract.NodeID].FarmID].Name,
+				FarmId:   g.data.Nodes[rentContract.NodeID].FarmID,
+				FarmName: g.data.Farms[g.data.Nodes[rentContract.NodeID].FarmID].Name,
 			},
 		}, err
 	}

diff --git a/grid-proxy/tests/queries/mock_client/nodes.go b/grid-proxy/tests/queries/mock_client/nodes.go
@@ -197,9 +197,8 @@ func (g *GridProxyMockClient) Nodes(ctx context.Context, filter types.NodeFilter
 		return res[i].NodeID < res[j].NodeID
 	})
 
-	if filter.AvailableFor != nil {
+	if filter.AvailableFor != nil || filter.RentableOrRentedBy != nil {
 		sort.Slice(res, func(i, j int) bool {
-
 			return g.data.NodeRentContractID[uint64(res[i].NodeID)] != 0
 		})
 	}