Merge pull request #23 from rarimo/fix/countries-config

Replace country map to country array

docs/spec/components/schemas/CountriesConfig.yaml

@@ -10,9 +10,9 @@ allOf:
           - countries
         properties:
           countries:
-            type: object
+            type: array
             description: |
-              Map from country codes to their properties.
+              Array of codes and their properties.
               Each code is ISO 3166-1 alpha-3 code (3-letter uppercase).
-            additionalProperties:
+            items:
               $ref: '#/components/schemas/CountryProperties'

docs/spec/components/schemas/CountryProperties.yaml

@@ -1,8 +1,12 @@
 type: object
 required:
+  - code
   - reserve_allowed
   - withdrawal_allowed
 properties:
+  code:
+    type: string
+    description: ISO 3166-1 alpha-3 country code
   reserve_allowed:
     type: boolean
     description: Whether the users of country are allowed to reserve (claim) tokens

internal/service/handlers/countries_config.go

@@ -16,17 +16,18 @@ func GetCountriesConfig(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	cMap := make(map[string]resources.CountryProperties)
+	properties := make([]resources.CountryProperties, 0, len(countries))
 	for _, c := range countries {
 		prop := resources.CountryProperties{
+			Code:              c.Code,
 			ReserveAllowed:    c.ReserveAllowed,
 			WithdrawalAllowed: c.WithdrawalAllowed,
 		}
 		// when the limit is reached, reserve is not allowed despite the config
 		if c.Reserved >= c.ReserveLimit {
 			prop.ReserveAllowed = false
 		}
-		cMap[c.Code] = prop
+		properties = append(properties, prop)
 	}
 
 	ape.Render(w, resources.CountriesConfigResponse{
@@ -35,7 +36,7 @@ func GetCountriesConfig(w http.ResponseWriter, r *http.Request) {
 				Type: resources.COUNTRIES_CONFIG,
 			},
 			Attributes: resources.CountriesConfigAttributes{
-				Countries: cMap,
+				Countries: properties,
 			},
 		},
 	})

resources/model_countries_config_attributes.go

@@ -6,5 +6,5 @@ package resources
 
 type CountriesConfigAttributes struct {
 	// Map from country codes to their properties. Each code is ISO 3166-1 alpha-3 code (3-letter uppercase).
-	Countries map[string]CountryProperties `json:"countries"`
+	Countries []CountryProperties `json:"countries"`
 }

resources/model_country_properties.go

@@ -5,6 +5,8 @@
 package resources
 
 type CountryProperties struct {
+	// ISO 3166-1 alpha-3 country code
+	Code string `json:"code"`
 	// Whether the users of country are allowed to reserve (claim) tokens
 	ReserveAllowed bool `json:"reserve_allowed"`
 	// Whether the users of country are allowed to withdraw tokens