From a874171e2cc5115a8a81214c7cbca6573640d96b Mon Sep 17 00:00:00 2001
From: alexandercerutti <cerutti.alexander@gmail.com>
Date: Sun, 26 Aug 2018 12:16:51 +0200
Subject: [PATCH] Removed basicStructure and boardingStructure in schema for
 passDict with common fields and transitType

---
 index.js  |  2 +-
 schema.js | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/index.js b/index.js
index e283834..537d063 100644
--- a/index.js
+++ b/index.js
@@ -423,7 +423,7 @@ class Pass {
 			let type = passTypes[index];
 
 			this.type = type;
-			return schema.isValid(passFile[type], schema.constants[(type === "boardingPass" ? "boarding" : "basic") + "Structure"]);
+			return schema.isValid(passFile[type], schema.constants.passDict);
 		} catch (e) {
 			return false;
 		}
diff --git a/schema.js b/schema.js
index 7ec2412..42bb5e8 100644
--- a/schema.js
+++ b/schema.js
@@ -45,26 +45,22 @@ let locationsDict = Joi.object().keys({
 	relevantText: Joi.string()
 });
 
-let struct = {
+let passDict = Joi.object().keys({
 	auxiliaryFields: Joi.array().items(field),
 	backFields: Joi.array().items(field),
 	headerFields: Joi.array().items(field),
 	primaryFields: Joi.array().items(field),
 	secondaryFields: Joi.array().items(field)
-};
+});
 
-let basicStructure = Joi.object().keys(struct);
-let boardingStructure = Joi.object().keys(Object.assign({
-	transitType: Joi.string().regex(/(PKTransitTypeAir|PKTransitTypeBoat|PKTransitTypeBus|PKTransitTypeGeneric|PKTransitTypeTrain)/).required()
-}, struct));
+let transitType = Joi.string().regex(/(PKTransitTypeAir|PKTransitTypeBoat|PKTransitTypeBus|PKTransitTypeGeneric|PKTransitTypeTrain)/);
 
 module.exports = {
 	constants: {
 		instance,
 		barcode,
 		field,
-		basicStructure,
-		boardingStructure,
+		passDict,
 		beaconsDict,
 		locationsDict,
 		transitType