Merge branch 'fzi-forschungszentrum-informatik:main' into main

Author: antonia2702

source/esg/models/metadata.py

@@ -28,7 +28,9 @@
 from typing import Optional
 
 from pydantic import Field
+from pydantic import field_validator
 from pydantic import HttpUrl
+from pydantic import model_validator
 
 from esg.models.base import _BaseModel
 
@@ -235,6 +237,25 @@ class Coverage(_BaseModel):
         ),
     )
 
+    @field_validator("from_time")
+    def validate_from_time_has_timezone(cls, v):
+        if v.tzinfo is None:
+            raise ValueError("`from_time` must have timezone specified.")
+        return v
+
+    @field_validator("to_time")
+    def validate_to_time_has_timezone(cls, v):
+        if v.tzinfo is None:
+            raise ValueError("`to_time` must have timezone specified.")
+        return v
+
+    @model_validator(mode="after")
+    def validate_from_time_lte_to_time(cls, data):
+        error_message = "`from_time` must be larger or equal `to_time`."
+        if data.from_time > data.to_time:
+            raise ValueError(error_message)
+        return data
+
 
 class CoverageDelta(_BaseModel):
     """

source/esg/test/data.py

@@ -1544,8 +1544,8 @@
 ]
 
 coverages = [
+    # Minimal valid example of a simple 24h coverage.
     {
-        # Minimal valid example of a simple 24h coverage.
         "Python": {
             "from_time": datetime(2022, 5, 1, 0, tzinfo=timezone.utc),
             "to_time": datetime(2022, 5, 2, 0, tzinfo=timezone.utc),
@@ -1556,8 +1556,8 @@
             "available_at": None,
         },
     },
+    # With available at set.
     {
-        # With available at set..
         "Python": {
             "from_time": datetime(2022, 5, 1, 0, tzinfo=timezone.utc),
             "to_time": datetime(2022, 5, 2, 0, tzinfo=timezone.utc),
@@ -1569,6 +1569,18 @@
             "available_at": "2022-05-01T00:00:00Z",
         },
     },
+    # from_time and to_time can be identical.
+    {
+        "Python": {
+            "from_time": datetime(2022, 5, 1, 0, tzinfo=timezone.utc),
+            "to_time": datetime(2022, 5, 1, 0, tzinfo=timezone.utc),
+        },
+        "JSONable": {
+            "from_time": "2022-05-01T00:00:00Z",
+            "to_time": "2022-05-01T00:00:00Z",
+            "available_at": None,
+        },
+    },
 ]
 
 invalid_coverages = [
@@ -1596,6 +1608,27 @@
             "coverage_to": None,
         },
     },
+    # `to_time` must be larger then `from_time`.
+    {
+        "JSONable": {
+            "from_time": "2022-05-03T00:00:00Z",
+            "to_time": "2022-05-02T00:00:00Z",
+        },
+    },
+    # `from_time` must have timezone.
+    {
+        "JSONable": {
+            "from_time": "2022-05-03T00:00:00",
+            "to_time": "2022-05-02T00:00:00Z",
+        },
+    },
+    # `to_time` must have timezone.
+    {
+        "JSONable": {
+            "from_time": "2022-05-03T00:00:00Z",
+            "to_time": "2022-05-02T00:00:00",
+        },
+    },
 ]