From dd54fb10787e7d776c89839a417bc01af10e183f Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Fri, 11 Aug 2023 10:00:26 +0200
Subject: default value 23:59 in case of missing valid until time added in all
 versions

---
 .../java/org/uic/barcode/ticket/api/asn/omv1/CountermarkData.java   | 4 ++++
 .../java/org/uic/barcode/ticket/api/asn/omv1/OpenTicketData.java    | 6 ++++++
 src/main/java/org/uic/barcode/ticket/api/asn/omv1/PassData.java     | 6 +++++-
 .../org/uic/barcode/ticket/api/asn/omv1/StationPassageData.java     | 4 ++++
 .../org/uic/barcode/ticket/api/asn/omv1/ValidityPeriodType.java     | 4 ++++
 5 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/uic/barcode/ticket/api/asn/omv1')

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/CountermarkData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/CountermarkData.java
index a31f56d..4258b2e 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/CountermarkData.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/CountermarkData.java
@@ -550,6 +550,10 @@ public class CountermarkData extends Object {
 			return null;
 		}		
 		
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}		
 		
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 		
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/OpenTicketData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/OpenTicketData.java
index 6f90f6f..0988675 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/OpenTicketData.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/OpenTicketData.java
@@ -599,6 +599,12 @@ public class OpenTicketData extends Object {
 		if (this.validUntilDay == null) {
 			return null;
 		}		
+		
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
+		
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 		
 	}
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/PassData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/PassData.java
index 74e8e4d..55db30f 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/PassData.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/PassData.java
@@ -889,7 +889,11 @@ public class PassData extends Object {
 			return null;
 		}		
 		
-		
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
+				
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 		
 	}
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/StationPassageData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/StationPassageData.java
index f04a835..34eadf1 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/StationPassageData.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/StationPassageData.java
@@ -359,6 +359,10 @@ public class StationPassageData extends Object {
 			return null;
 		}		
 		
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 		
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 		
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ValidityPeriodType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ValidityPeriodType.java
index 5667ad9..a72d55b 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ValidityPeriodType.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ValidityPeriodType.java
@@ -139,6 +139,10 @@ public class ValidityPeriodType extends Object {
 			return null;
 		}		
 		
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 		
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 		
-- 
cgit v1.2.3