Fix validation with multiple versions with some invalid

Author: gidsi

spaceapi_validator.go

@@ -41,7 +41,7 @@ type ValidationResult struct {
 
 // Validate a string to match jsonschema of SpaceApi
 func Validate(document string) (ValidationResult, error) {
-	myResult := ValidationResult{}
+	myResult := ValidationResult{ Valid: true }
 	if document == "" {
 		return myResult, errors.New("document is empty")
 	}
@@ -60,6 +60,7 @@ func Validate(document string) (ValidationResult, error) {
 		var schema = gojsonschema.NewStringLoader(schemaString)
 		result, err := gojsonschema.Validate(schema, documentLoader)
 		if err != nil {
+			myResult.Valid = false
 			return myResult, err
 		}
 
@@ -80,8 +81,8 @@ func Validate(document string) (ValidationResult, error) {
 
 		myResult.Errors = append(myResult.Errors, myErrors...)
 
-		if result.Valid() {
-			myResult.Valid = true
+		if !result.Valid() {
+			myResult.Valid = false
 		}
 	}
 

spaceapi_validator_test.go

@@ -12,6 +12,70 @@ var invalid14 = `{ "api_compatibility": [ "14" ], "space_invalid": "example", "u
 var valid15 = `{ "api_compatibility": [ "15" ], "space": "example", "url": "https://example.com", "logo": "https://example.com/logo.png", "location": { "lon": 42, "lat": 23 }, "state": { "open": true }, "contact": {} }`
 var invalid15 = `{ "api_compatibility": [ "15" ], "space_invalid": "example", "url": "https://example.com", "logo": "https://example.com/logo.png", "location": { "lon": 42, "lat": 23 }, "state": { "open": true }, "contact": {} }`
 var wrongVersionNumeric = `{ "api": 0.13, "open": true, "space": "example", "url": "https://example.com", "logo": "https://example.com/logo.png", "location": { "lon": 42, "lat": 23 }, "state": { "open": true }, "contact": {}, "issue_report_channels": [ "email" ] }`
+var missingIssueReportChannel13 = `{
+  "api": "0.13",
+  "api_compatibility": ["14"],
+  "space": "NYCResistor",
+  "logo": "https://www.nycresistor.com/wp-content/uploads/2017/09/NYCR-logo-wide.png",
+  "url": "https://www.nycresistor.com/",
+  "location": {
+    "address": "87 3rd Avenue, 4th floor, Brooklyn, NY 11217, USA",
+    "lon": 40.683653,
+    "lat": -73.981542,
+    "timezone": "America/New_York"
+  },
+  "contact": {
+    "email": "contact@nycresistor.com",
+    "matrix": "#public:nycr.chat",
+    "facebook": "https://www.facebook.com/groups/23644223800/",
+    "ml": "nycresistormicrocontrollers@googlegroups.com"
+  },
+  "state": {
+    "open": false
+  },
+  "links": [
+   {
+     "name": "eventbrite",
+     "url": "http://nycresistor.eventbrite.com/"
+   },
+   {
+     "name": "code of conduct",
+     "url": "https://www.nycresistor.com/participate/"
+   },
+   {
+     "name": "withfriends",
+     "url": "https://withfriends.co/nyc_resistor/join"
+   }
+  ],
+  "membership_plans": [
+    {
+      "name": "standard",
+      "value": 115,
+      "currency": "USD",
+      "billing_interval": "monthly"
+    },
+    {
+      "name": "teaching",
+      "value": 75,
+      "currency": "USD",
+      "billing_interval": "monthly"   
+    }
+  ],
+  "feeds": {
+    "blog": {
+      "type": "rss",
+      "url": "https://www.nycresistor.com/feed/"
+    },
+    "wiki": {
+      "type": "atom",
+      "url": "https://wiki.nycresistor.com/w/api.php?hidebots=1&urlversion=1&days=30&limit=50&action=feedrecentchanges&feedformat=atom"
+    },
+    "calendar": {
+      "type": "ical",
+      "url": "https://calendar.google.com/calendar/ical/p2m2av9dhrh4n1ub7jlsc68s7o%40group.calendar.google.com/public/basic.ics"
+    }
+  }
+}`
 var noVersion = `{ "data": "asd" }`
 
 func TestValidate(t *testing.T) {
@@ -70,6 +134,15 @@ func TestValidate(t *testing.T) {
 		t.Error("Schema should have got 1 errors, got", len(invalidErrors))
 	}
 
+	invalidResult, _ = Validate(missingIssueReportChannel13)
+	if invalidResult.Valid == true {
+		t.Error("Expected validation to be false, got", invalidResult.Valid)
+	}
+	invalidErrors = invalidResult.Errors
+	if len(invalidErrors) != 1 {
+		t.Error("Schema should have got 1 errors, got", len(invalidErrors))
+	}
+
 	invalidResult, _ = Validate(noVersion)
 	if invalidResult.Valid == true {
 		t.Error("Expected validation to be false, got", invalidResult.Valid)