Add expires_at, registered_at, updated_at, and expires_in_days properties to Dates model

Author: boutetnico

src/rdapapi/models.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from datetime import datetime, timezone
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
@@ -47,6 +48,38 @@ class Dates(BaseModel):
     expires: Optional[str] = None
     updated: Optional[str] = None
 
+    @staticmethod
+    def _parse(value: Optional[str]) -> Optional[datetime]:
+        if value is None:
+            return None
+        try:
+            return datetime.fromisoformat(value)
+        except (ValueError, TypeError):
+            return None
+
+    @property
+    def registered_at(self) -> Optional[datetime]:
+        """Parse ``registered`` into a timezone-aware :class:`~datetime.datetime`."""
+        return self._parse(self.registered)
+
+    @property
+    def expires_at(self) -> Optional[datetime]:
+        """Parse ``expires`` into a timezone-aware :class:`~datetime.datetime`."""
+        return self._parse(self.expires)
+
+    @property
+    def updated_at(self) -> Optional[datetime]:
+        """Parse ``updated`` into a timezone-aware :class:`~datetime.datetime`."""
+        return self._parse(self.updated)
+
+    @property
+    def expires_in_days(self) -> Optional[int]:
+        """Days until expiration, or ``None`` if no expiry date is available."""
+        dt = self.expires_at
+        if dt is None:
+            return None
+        return (dt - datetime.now(timezone.utc)).days
+
 
 class Registrar(BaseModel):
     """Domain registrar information."""

tests/test_models.py

@@ -3,6 +3,7 @@
 from rdapapi import (
     AsnResponse,
     BulkDomainResponse,
+    Dates,
     DomainResponse,
     EntityResponse,
     IpResponse,
@@ -257,6 +258,36 @@ def test_model_dump_roundtrip():
     assert restored.handle == "AS15169"
 
 
+def test_dates_parsed_properties():
+    from datetime import datetime, timezone
+
+    dates = Dates.model_validate(
+        {"registered": "2020-01-01T00:00:00Z", "expires": "2028-09-14T04:00:00Z", "updated": None}
+    )
+
+    assert dates.registered_at == datetime(2020, 1, 1, tzinfo=timezone.utc)
+    assert dates.expires_at == datetime(2028, 9, 14, 4, 0, 0, tzinfo=timezone.utc)
+    assert dates.updated_at is None
+    assert isinstance(dates.expires_in_days, int)
+    assert dates.expires_in_days > 0
+
+
+def test_dates_null_returns_none():
+    dates = Dates.model_validate({"registered": None, "expires": None, "updated": None})
+
+    assert dates.registered_at is None
+    assert dates.expires_at is None
+    assert dates.updated_at is None
+    assert dates.expires_in_days is None
+
+
+def test_dates_invalid_string_returns_none():
+    dates = Dates.model_validate({"registered": "not-a-date", "expires": "garbage", "updated": None})
+
+    assert dates.registered_at is None
+    assert dates.expires_at is None
+
+
 def test_bulk_domain_response_parses():
     data = {
         "results": [