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

---
 .../barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java')

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java
index e0465d9..4cfe708 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java
@@ -417,6 +417,11 @@ public class IncludedOpenTicketType 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);
 		
 	}
@@ -426,10 +431,11 @@ public class IncludedOpenTicketType extends Object {
 	}	
 	
 	public Date getUTCValidUntilDate(Date issuingDate){
+		this.getValidUntilDate(issuingDate);
 		if (this.validUntilUTCOffset == null) {
-			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay, this.validFromTime, this.validFromUTCOffset);
+			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime, this.validUntilUTCOffset);
 		} else {
-			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay, this.validUntilTime, this.validFromUTCOffset);
+			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime, this.validFromUTCOffset);
 		}
 	}
 
-- 
cgit v1.2.3