error sections (#91)

Co-authored-by: Alexandr Chernyy <[email protected]>
eu-digital-green-certificates · Jul 26, 2021 · 3125cb4 · 3125cb4
1 parent 5463a6c
commit 3125cb4
Showing 1 changed file with 35 additions and 23 deletions.
diff --git a/Sources/Models/HCert.swift b/Sources/Models/HCert.swift
@@ -231,15 +231,19 @@ public struct HCert {
   //
   public mutating func makeSectionForRuleError(infoSections: InfoSection, for appType: AppType) {
     info.removeAll()
-    info = isValid ? [] : [
-      InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-    ]
+    info = []
     info += [
       InfoSection(
         header: l10n("header.cert-type"),
         content: certTypeString
       )
     ] + personIdentifiers
+    if !isValid {
+      info += [
+        InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
+      ]
+    }
+    if !isValid { return }
     info += [infoSections]
     switch appType {
     case .verifier:
@@ -289,17 +293,19 @@ public struct HCert {
 
   mutating func makeSectionsForVerifier(includeInvalidSection: Bool = true) {
     if includeInvalidSection {
-      info = isValid ? [] : [
-        InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-      ]
-    }
-    if includeInvalidSection {
+      info = []
       info += [
         InfoSection(
           header: l10n("header.cert-type"),
           content: certTypeString
         )
       ] + personIdentifiers
+      if !isValid {
+        info += [
+          InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
+        ]
+      }
+      if !isValid { return }
     }
     if let last = get(.lastNameStandardized).string {
       info += [
@@ -352,17 +358,19 @@ public struct HCert {
 
   mutating func makeSectionsForVaccine(includeInvalidSection: Bool = true) {
     if includeInvalidSection {
-      info = isValid ? [] : [
-        InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-      ]
-    }
-    if includeInvalidSection {
+      info = []
       info += [
         InfoSection(
           header: l10n("header.cert-type"),
           content: certTypeString
         )
       ] + personIdentifiers
+      if !isValid {
+        info += [
+          InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
+        ]
+      }
+      if !isValid { return }
     }
     if let last = get(.lastNameStandardized).string {
       info += [
@@ -399,17 +407,19 @@ public struct HCert {
 
   mutating func makeSectionsForTest(includeInvalidSection: Bool = true) {
     if includeInvalidSection {
-      info = isValid ? [] : [
-        InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-      ]
-    }
-    if includeInvalidSection {
+      info = []
       info += [
         InfoSection(
           header: l10n("header.cert-type"),
           content: certTypeString
         )
       ] + personIdentifiers
+      if !isValid {
+        info += [
+          InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
+        ]
+      }
+      if !isValid { return }
     }
     if let last = get(.lastNameStandardized).string {
       info += [
@@ -446,17 +456,19 @@ public struct HCert {
 
   mutating func makeSectionsForRecovery(includeInvalidSection: Bool = true) {
     if includeInvalidSection {
-      info = isValid ? [] : [
-      InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
-      ]
-    }
-    if includeInvalidSection {
+      info = []
       info += [
         InfoSection(
           header: l10n("header.cert-type"),
           content: certTypeString
         )
       ] + personIdentifiers
+      if !isValid {
+        info += [
+          InfoSection(header: l10n("header.validity-errors"), content: validityFailures.joined(separator: " "))
+        ]
+      }
+      if !isValid { return }
     }
     if let last = get(.lastNameStandardized).string {
       info += [