Print schema errors in debug, and fail in prod.

PaulBallmann · Apr 20, 2021 · 1bd19f4 · 1bd19f4
1 parent 1c2f4d3
commit 1bd19f4
Showing 1 changed file with 73 additions and 4 deletions.
diff --git a/PatientScannerDemo/Models/HCert.swift b/PatientScannerDemo/Models/HCert.swift
@@ -10,21 +10,90 @@ import SwiftyJSON
 import JSONSchema
 
 struct HCert {
-  init(from cborData: Data) {
+  init?(from cborData: Data) {
     let headerStr = CBOR.header(from: cborData)?.toString() ?? "{}"
     let bodyStr = CBOR.payload(from: cborData)?.toString() ?? "{}"
     header = JSON(parseJSON: headerStr)
-    body = JSON(parseJSON: bodyStr)
+    var body = JSON(parseJSON: bodyStr)
+    if body["-259"].exists() {
+      body = body["-259"]
+    }
+    if body["1"].exists() {
+      body = body["1"]
+    }
+//    body = JSON(parseJSON: """
+//      {
+//        "vac" : [
+//          {
+//            "seq" : 1,
+//            "lot" : "C22-862FF-001",
+//            "dis" : "840539006",
+//            "adm" : "Vaccination centre Vienna 23",
+//            "vap" : "1119305005",
+//            "mep" : "EU\\/1\\/20\\/1528",
+//            "tot" : 2,
+//            "aut" : "ORG-100030215",
+//            "dat" : "2021-02-18",
+//            "cou" : "AT"
+//          },
+//          {
+//            "seq" : 2,
+//            "lot" : "C22-H62FF-010",
+//            "dis" : "840539006",
+//            "adm" : "Vaccination centre Vienna 23",
+//            "vap" : "1119305005",
+//            "mep" : "EU\\/1\\/20\\/1528",
+//            "tot" : 2,
+//            "aut" : "ORG-100030215",
+//            "dat" : "2021-03-12",
+//            "cou" : "AT"
+//          }
+//        ],
+//        "cert" : {
+//          "id" : "01AT42196560275230427402470256520250042",
+//          "is" : "Ministry of Health, Austria",
+//          "vr" : "v1.0",
+//          "vf" : "2021-04-04",
+//          "vu" : "2021-10-04",
+//          "co" : "AT"
+//        },
+//        "sub" : {
+//          "gen" : "female",
+//          "dob" : "1998-02-26",
+//          "id" : [
+//            {
+//              "i" : "12345ABC-321",
+//              "t" : "PPN"
+//            }
+//          ],
+//          "gn" : "Gabriele",
+//          "fn" : "Musterfrau"
+//        }
+//      }
+//""")
 
     let schema = JSON(parseJSON: EU_DGC_SCHEMA).dictionaryObject!
     let bodyDict = body.dictionaryObject!
 
-    let validation = try? validate(bodyDict, schema: schema)
-    if let errors = validation?.errors {
+    guard
+      let validation = try? validate(bodyDict, schema: schema)
+    else {
+      return nil
+    }
+    #if DEBUG
+    if let errors = validation.errors {
       for err in errors {
         print(err.description)
       }
     }
+    #else
+    if !validation.valid {
+      return nil
+    }
+    #endif
+    self.body = body
+    print(header)
+    print(body)
   }
 
   var header: JSON