Merge pull request #5 from lightsparkdev/fix-datetime-deser

Fix datetime deserialization

Author: vdurmont

lightspark/objects/Account.py

@@ -1617,7 +1617,7 @@ def from_json(requester: Requester, obj: Mapping[str, Any]) -> Account:
         requester=requester,
         typename="Account",
         id=obj["account_id"],
-        created_at=obj["account_created_at"],
-        updated_at=obj["account_updated_at"],
+        created_at=datetime.fromisoformat(obj["account_created_at"]),
+        updated_at=datetime.fromisoformat(obj["account_updated_at"]),
         name=obj["account_name"],
     )

lightspark/objects/ApiToken.py

@@ -55,8 +55,8 @@ def from_json(requester: Requester, obj: Mapping[str, Any]) -> ApiToken:
         requester=requester,
         typename="ApiToken",
         id=obj["api_token_id"],
-        created_at=obj["api_token_created_at"],
-        updated_at=obj["api_token_updated_at"],
+        created_at=datetime.fromisoformat(obj["api_token_created_at"]),
+        updated_at=datetime.fromisoformat(obj["api_token_updated_at"]),
         client_id=obj["api_token_client_id"],
         name=obj["api_token_name"],
         permissions=parse_enum_list(Permission, obj["api_token_permissions"]),

lightspark/objects/Channel.py

@@ -263,8 +263,8 @@ def from_json(requester: Requester, obj: Mapping[str, Any]) -> Channel:
         requester=requester,
         typename="Channel",
         id=obj["channel_id"],
-        created_at=obj["channel_created_at"],
-        updated_at=obj["channel_updated_at"],
+        created_at=datetime.fromisoformat(obj["channel_created_at"]),
+        updated_at=datetime.fromisoformat(obj["channel_updated_at"]),
         funding_transaction_id=obj["channel_funding_transaction"]["id"]
         if obj["channel_funding_transaction"]
         else None,

lightspark/objects/ChannelClosingTransaction.py

@@ -106,10 +106,18 @@ def from_json(
         requester=requester,
         typename="ChannelClosingTransaction",
         id=obj["channel_closing_transaction_id"],
-        created_at=obj["channel_closing_transaction_created_at"],
-        updated_at=obj["channel_closing_transaction_updated_at"],
+        created_at=datetime.fromisoformat(
+            obj["channel_closing_transaction_created_at"]
+        ),
+        updated_at=datetime.fromisoformat(
+            obj["channel_closing_transaction_updated_at"]
+        ),
         status=parse_enum(TransactionStatus, obj["channel_closing_transaction_status"]),
-        resolved_at=obj["channel_closing_transaction_resolved_at"],
+        resolved_at=datetime.fromisoformat(
+            obj["channel_closing_transaction_resolved_at"]
+        )
+        if obj["channel_closing_transaction_resolved_at"]
+        else None,
         amount=CurrencyAmount_from_json(
             requester, obj["channel_closing_transaction_amount"]
         ),

lightspark/objects/ChannelOpeningTransaction.py

@@ -106,10 +106,18 @@ def from_json(
         requester=requester,
         typename="ChannelOpeningTransaction",
         id=obj["channel_opening_transaction_id"],
-        created_at=obj["channel_opening_transaction_created_at"],
-        updated_at=obj["channel_opening_transaction_updated_at"],
+        created_at=datetime.fromisoformat(
+            obj["channel_opening_transaction_created_at"]
+        ),
+        updated_at=datetime.fromisoformat(
+            obj["channel_opening_transaction_updated_at"]
+        ),
         status=parse_enum(TransactionStatus, obj["channel_opening_transaction_status"]),
-        resolved_at=obj["channel_opening_transaction_resolved_at"],
+        resolved_at=datetime.fromisoformat(
+            obj["channel_opening_transaction_resolved_at"]
+        )
+        if obj["channel_opening_transaction_resolved_at"]
+        else None,
         amount=CurrencyAmount_from_json(
             requester, obj["channel_opening_transaction_amount"]
         ),

lightspark/objects/Deposit.py

@@ -104,10 +104,12 @@ def from_json(requester: Requester, obj: Mapping[str, Any]) -> Deposit:
         requester=requester,
         typename="Deposit",
         id=obj["deposit_id"],
-        created_at=obj["deposit_created_at"],
-        updated_at=obj["deposit_updated_at"],
+        created_at=datetime.fromisoformat(obj["deposit_created_at"]),
+        updated_at=datetime.fromisoformat(obj["deposit_updated_at"]),
         status=parse_enum(TransactionStatus, obj["deposit_status"]),
-        resolved_at=obj["deposit_resolved_at"],
+        resolved_at=datetime.fromisoformat(obj["deposit_resolved_at"])
+        if obj["deposit_resolved_at"]
+        else None,
         amount=CurrencyAmount_from_json(requester, obj["deposit_amount"]),
         transaction_hash=obj["deposit_transaction_hash"],
         fees=CurrencyAmount_from_json(requester, obj["deposit_fees"])

lightspark/objects/GraphNode.py

@@ -98,8 +98,8 @@ def from_json(requester: Requester, obj: Mapping[str, Any]) -> GraphNode:
         requester=requester,
         typename="GraphNode",
         id=obj["graph_node_id"],
-        created_at=obj["graph_node_created_at"],
-        updated_at=obj["graph_node_updated_at"],
+        created_at=datetime.fromisoformat(obj["graph_node_created_at"]),
+        updated_at=datetime.fromisoformat(obj["graph_node_updated_at"]),
         alias=obj["graph_node_alias"],
         bitcoin_network=parse_enum(BitcoinNetwork, obj["graph_node_bitcoin_network"]),
         color=obj["graph_node_color"],

lightspark/objects/Hop.py

@@ -83,8 +83,8 @@ def from_json(requester: Requester, obj: Mapping[str, Any]) -> Hop:
         requester=requester,
         typename="Hop",
         id=obj["hop_id"],
-        created_at=obj["hop_created_at"],
-        updated_at=obj["hop_updated_at"],
+        created_at=datetime.fromisoformat(obj["hop_created_at"]),
+        updated_at=datetime.fromisoformat(obj["hop_updated_at"]),
         destination_id=obj["hop_destination"]["id"] if obj["hop_destination"] else None,
         index=obj["hop_index"],
         public_key=obj["hop_public_key"],

lightspark/objects/IncomingPayment.py

@@ -160,10 +160,12 @@ def from_json(requester: Requester, obj: Mapping[str, Any]) -> IncomingPayment:
         requester=requester,
         typename="IncomingPayment",
         id=obj["incoming_payment_id"],
-        created_at=obj["incoming_payment_created_at"],
-        updated_at=obj["incoming_payment_updated_at"],
+        created_at=datetime.fromisoformat(obj["incoming_payment_created_at"]),
+        updated_at=datetime.fromisoformat(obj["incoming_payment_updated_at"]),
         status=parse_enum(TransactionStatus, obj["incoming_payment_status"]),
-        resolved_at=obj["incoming_payment_resolved_at"],
+        resolved_at=datetime.fromisoformat(obj["incoming_payment_resolved_at"])
+        if obj["incoming_payment_resolved_at"]
+        else None,
         amount=CurrencyAmount_from_json(requester, obj["incoming_payment_amount"]),
         transaction_hash=obj["incoming_payment_transaction_hash"],
         destination_id=obj["incoming_payment_destination"]["id"],

lightspark/objects/IncomingPaymentAttempt.py

@@ -71,12 +71,14 @@ def from_json(requester: Requester, obj: Mapping[str, Any]) -> IncomingPaymentAt
         requester=requester,
         typename="IncomingPaymentAttempt",
         id=obj["incoming_payment_attempt_id"],
-        created_at=obj["incoming_payment_attempt_created_at"],
-        updated_at=obj["incoming_payment_attempt_updated_at"],
+        created_at=datetime.fromisoformat(obj["incoming_payment_attempt_created_at"]),
+        updated_at=datetime.fromisoformat(obj["incoming_payment_attempt_updated_at"]),
         status=parse_enum(
             IncomingPaymentAttemptStatus, obj["incoming_payment_attempt_status"]
         ),
-        resolved_at=obj["incoming_payment_attempt_resolved_at"],
+        resolved_at=datetime.fromisoformat(obj["incoming_payment_attempt_resolved_at"])
+        if obj["incoming_payment_attempt_resolved_at"]
+        else None,
         amount=CurrencyAmount_from_json(
             requester, obj["incoming_payment_attempt_amount"]
         ),