Merge #4020 Improve netkan relationship error message

KSP-CKAN · Feb 10, 2024 · c91a46f · c91a46f
2 parents d6bf6e9 + 2035194
commit c91a46f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 
 - [Policy] Fix #3518 rewrite de-indexing policy (#3993 by: JonnyOThan; reviewed: HebaruSan)
 - [Netkan] Fix null reference exception in swinfo transformer (#3999 by: HebaruSan)
+- [Netkan] Improve netkan relationship error message (#4020 by: HebaruSan)
 
 ## v1.34.4 (Niven)
 

diff --git a/Netkan/Validators/ObeysCKANSchemaValidator.cs b/Netkan/Validators/ObeysCKANSchemaValidator.cs
@@ -11,9 +11,7 @@ public void Validate(Metadata metadata)
             var errors = CKANSchema.schema.Validate(metadata.Json());
             if (errors.Any())
             {
-                string msg = errors
-                    .Select(err => $"{err.Path}: {err.Kind}")
-                    .Aggregate((a, b) => $"{a}\r\n{b}");
+                var msg = string.Join(", ", errors.Select(err => $"{err.Path}: {err.Kind}"));
                 throw new Kraken($"Schema validation failed: {msg}");
             }
         }

diff --git a/Netkan/Validators/RelationshipsValidator.cs b/Netkan/Validators/RelationshipsValidator.cs
@@ -1,7 +1,9 @@
+using System.Linq;
+
 using Newtonsoft.Json.Linq;
+
 using CKAN.Versioning;
 using CKAN.NetKAN.Model;
-using System.Linq;
 
 namespace CKAN.NetKAN.Validators
 {
@@ -18,7 +20,7 @@ public void Validate(Metadata metadata)
                     {
                         throw new Kraken("spec_version v1.2+ required for 'supports'");
                     }
-                    foreach (JObject rel in json[relName].Cast<JObject>())
+                    foreach (var rel in json[relName].Children<JObject>())
                     {
                         if (rel.ContainsKey("any_of"))
                         {
@@ -65,7 +67,6 @@ public void Validate(Metadata metadata)
                     }
                 }
             }
-
         }
 
         private static readonly string[] relProps = new string[]