Merge pull request #28 from priyanka-amarnani/add-zoned-date-time-generic-impl

Add zoned date time generic impl

Author: dschwartz-ftadvisory

src/main/java/com/regnosys/rosetta/generator/python/expressions/PythonExpressionGenerator.xtend

@@ -96,7 +96,7 @@ class PythonExpressionGenerator {
             ToDateTimeOperation: '''datetime.datetime.strptime(«generateExpression(expr.argument, ifLevel, isLambda)», "%Y-%m-%d %H:%M:%S")'''
             ToIntOperation: '''int(«generateExpression(expr.argument, ifLevel, isLambda)»)'''
             ToTimeOperation: '''datetime.datetime.strptime(«generateExpression(expr.argument, ifLevel, isLambda)», "%H:%M:%S").time()'''
-            ToZonedDateTimeOperation:'''datetime.datetime.strptime(«generateExpression(expr.argument, ifLevel, isLambda)», "%Y-%m-%d %H:%M:%S %z %Z")'''
+            ToZonedDateTimeOperation:'''rune_zoned_date_time(«generateExpression(expr.argument, ifLevel, isLambda)»)'''
             // Rune Operations
             RosettaAbsentExpression: '''(not rune_attr_exists(«generateExpression(expr.argument, ifLevel, isLambda)»))'''
             RosettaBinaryOperation: generateBinaryExpression(expr, ifLevel, isLambda)

test/python_setup/requirements.txt

@@ -1,2 +1,3 @@
 setuptools>=62.0
+tzdata>=2023.3
 pytest

test/python_unit_tests/semantics/test_to_zoned_date_time.py

@@ -1,22 +1,42 @@
 '''to-zoned-date-time unit tests'''
-
 import datetime
+from zoneinfo import ZoneInfo
 
 import pytest
 
 from rosetta_dsl.test.semantic.zoned_date_time_operator.ZonedDateTimeOperatorTest import ZonedDateTimeOperatorTest
 
-def test_to_zoned_date_time_passes(): 
-    '''no doc'''
-    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-05-26 14:30:00 +0900 UTC",b=datetime.datetime(2025, 5, 26, 14, 30, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9), 'UTC')))
+
+def test_to_zoned_date_time_offset_and_time_zone():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-07-07 15:30:00 +0100 Europe/Lisbon",b=datetime.datetime(2025,7, 7, 15, 30, 0, tzinfo=ZoneInfo("Europe/Lisbon")))
+    to_zoned_date_time_test.validate_model()
+    
+def test_to_zoned_date_time_only_time_zone():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-07-07 15:30:00 Europe/Lisbon",b=datetime.datetime(2025,7, 7, 15, 30, 0, tzinfo=ZoneInfo("Europe/Lisbon")))
+    to_zoned_date_time_test.validate_model()
+
+def test_to_zoned_date_time_only_time_zone2():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-03-15 12:00:00 Zulu",b=datetime.datetime(2025,3, 15, 12, 0, 0, tzinfo=ZoneInfo("Zulu")))
     to_zoned_date_time_test.validate_model()
 
+def test_to_zoned_date_time_only_offset():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-05-26 14:30:00 +0900",b=datetime.datetime(2025,5, 26, 14, 30, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9))))
+    to_zoned_date_time_test.validate_model()
+    
 def test_to_zoned_date_time_fails():
-    '''no doc'''
-    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-05-26 14:30:00 +09x0 UTC",b=datetime.datetime(2025, 5, 26, 14, 30, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9), 'UTC')))
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-12-15 15:30:00 +0100 Europe/Lisbon",b=datetime.datetime(2025, 5, 26, 14, 30, 0, tzinfo=ZoneInfo("Europe/Lisbon")))
+    with pytest.raises(Exception):
+        to_zoned_date_time_test.validate_model()
+
+def test_to_zoned_date_time_fails_format():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-05-26 14:30:00 +09x0",b=datetime.datetime(2025, 5, 26, 14, 30, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9))))
     with pytest.raises(Exception):
         to_zoned_date_time_test.validate_model()
 
 if __name__ == "__main__":
-    test_to_zoned_date_time_passes()
-    test_to_zoned_date_time_fails()
+    test_to_zoned_date_time_offset_and_time_zone()
+    test_to_zoned_date_time_only_time_zone()
+    test_to_zoned_date_time_only_time_zone2()
+    test_to_zoned_date_time_only_offset()
+    test_to_zoned_date_time_fails()
+    test_to_zoned_date_time_fails_format()