Merge pull request #1367 from threefoldtech/development_region_node

add region field in node response

Author: rawdaGastan

grid-proxy/docs/docs.go

@@ -1794,6 +1794,9 @@
                 "country": {
                     "type": "string"
                 },
+                "region": {
+                    "type": "string"
+                },
                 "latitude": {
                     "type": "number"
                 },

grid-proxy/docs/swagger.json

@@ -121,6 +121,8 @@ definitions:
         type: string
       country:
         type: string
+      region:
+        type: string
       latitude:
         type: number
       longitude:

grid-proxy/docs/swagger.yaml

@@ -43,6 +43,7 @@ func nodeFromDBNode(info db.Node) types.Node {
 			City:      info.City,
 			Longitude: info.Longitude,
 			Latitude:  info.Latitude,
+			Region:    info.Continent,
 		},
 		PublicConfig: types.PublicConfig{
 			Domain: info.Domain,
@@ -148,6 +149,7 @@ func nodeWithNestedCapacityFromDBNode(info db.Node) types.NodeWithNestedCapacity
 			City:      info.City,
 			Longitude: info.Longitude,
 			Latitude:  info.Latitude,
+			Region:    info.Continent,
 		},
 		PublicConfig: types.PublicConfig{
 			Domain: info.Domain,

grid-proxy/internal/explorer/converters.go

@@ -341,6 +341,7 @@ func (d *PostgresDatabase) nodeTableQuery(ctx context.Context, filter types.Node
 			"farm.name as farm_name",
 			"node.twin_id",
 			"node.country",
+			"node_location.continent",
 			"node.grid_version",
 			"node.city",
 			"node.uptime",

grid-proxy/internal/explorer/db/postgres.go

@@ -74,6 +74,7 @@ type Node struct {
 	Country            string
 	GridVersion        int64
 	City               string
+	Continent          string
 	Uptime             int64
 	Created            int64
 	FarmingPolicyID    int64

grid-proxy/internal/explorer/db/types.go

@@ -6,6 +6,7 @@ import "github.com/threefoldtech/zosbase/pkg/gridtypes"
 type Location struct {
 	Country   string   `json:"country"`
 	City      string   `json:"city"`
+	Region    string   `json:"region"`
 	Longitude *float64 `json:"longitude"`
 	Latitude  *float64 `json:"latitude"`
 }

grid-proxy/pkg/types/nodes.go

@@ -154,6 +154,7 @@ func (g *GridProxyMockClient) Nodes(ctx context.Context, filter types.NodeFilter
 				Location: types.Location{
 					Country:   node.Country,
 					City:      node.City,
+					Region:    g.data.Regions[node.Country],
 					Longitude: g.data.Locations[node.LocationID].Longitude,
 					Latitude:  g.data.Locations[node.LocationID].Latitude,
 				},
@@ -263,6 +264,7 @@ func (g *GridProxyMockClient) Node(ctx context.Context, nodeID uint32) (res type
 		Location: types.Location{
 			Country:   node.Country,
 			City:      node.City,
+			Region:    g.data.Regions[node.Country],
 			Longitude: g.data.Locations[node.LocationID].Longitude,
 			Latitude:  g.data.Locations[node.LocationID].Latitude,
 		},