From 9f75546ee8fe2ad3ab07fee7bd9503340a5174fe Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:47:46 +0100
Subject: additional tests for time zones fix for fip ticket

---
 .../barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java')

diff --git a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java
index 48583b9..61bdba1 100644
--- a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java
+++ b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java
@@ -886,8 +886,9 @@ public class Api2OpenAsnEncoderV2 {
 			
 		asnData.setTariffs(encodeTariffCollection(document.getTariffs()));
 		
-		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
-
+		if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) {
+			asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		}
 		if (document.getClassCode() != ITravelClassType.second && document.getClassCode() != null){
 			asnData.setClassCode(TravelClassType.valueOf(document.getClassCode().name()));
 		}
@@ -1562,8 +1563,9 @@ public class Api2OpenAsnEncoderV2 {
 			}
 		}
 
-		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
-
+		if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) {
+			asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		}
 		if (document.getClassCode() != null) {
 			asnData.setClassCode(TravelClassType.valueOf(document.getClassCode().name()));
 		}
@@ -1697,8 +1699,9 @@ public class Api2OpenAsnEncoderV2 {
 		
 		asnData.setValidityDates(document.getValidFrom(), document.getValidUntil(), issuingDate);
 		
-		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
-		
+		if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) {
+			asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		}		
 		asnData.setExtension(encodeExtension(document.getExtension()));				
 		
 		return asnDocument;
-- 
cgit v1.2.3