Fixed funds_in_flight

Author: stabacco

coverage.svg

@@ -112,7 +112,7 @@ def __init__(
         self.user: Optional[user.User] = None
 
         self.headers = Headers()
-        self.httpClient = HttpClient
+        self.http_client = HttpClient
 
         # register all the clients
         self.equities = equity.EquitiesClient(self)
@@ -137,7 +137,7 @@ async def get(self, url: str, payload: dict = None) -> dict:
         Returns:
             dict: the json response
         """
-        return await self.httpClient.get(
+        return await self.http_client.get(
             url, payload=payload, headers=self.headers.dict(by_alias=True)
         )
 
@@ -151,7 +151,7 @@ async def post(self, url: str, payload: dict) -> dict:
         Returns:
             dict: the json response
         """
-        return await self.httpClient.post(
+        return await self.http_client.post(
             url, payload=payload, headers=self.headers.dict(by_alias=True)
         )
 
@@ -165,7 +165,7 @@ async def delete(self, url: str, payload: dict = None) -> bool:
         Returns:
             bool: True if the deletion was successful.
         """
-        return await self.httpClient.delete(
+        return await self.http_client.delete(
             url, headers=self.headers.dict(by_alias=True), payload=payload
         )
 

stake/client.py

@@ -66,6 +66,19 @@ class Config:
         alias_generator = camelcase
 
 
+class FundsInFlight(BaseModel):
+    type: str
+    insert_date_time: str
+    estimated_arrival_time: str
+    estimated_arrival_time_us: str = Field(alias="estimatedArrivalTimeUS")
+    transaction_type: str
+    to_amount: float
+    from_amount: float
+
+    class Config:
+        alias_generator = camelcase
+
+
 class FundingsClient(BaseClient):
     async def list(self, request: FundingRequest) -> List[Funding]:
         payload = {
@@ -76,9 +89,13 @@ async def list(self, request: FundingRequest) -> List[Funding]:
 
         return [Funding(**d) for d in data]
 
-    async def in_flight(self) -> dict:
+    async def in_flight(self) -> List[FundsInFlight]:
         """Returns the funds currently in flight."""
-        return await self._client.get(Url.fund_details)["fundsInFlight"]
+        data = await self._client.get(Url.fund_details)
+        data = data.get("fundsInFlight")
+        if not data:
+            return []
+        return [FundsInFlight(**d) for d in data]
 
     async def cash_available(self) -> CashAvailable:
         data = await self._client.get(Url.cash_available)

stake/funding.py

@@ -176,7 +176,7 @@ async def tracing_client(request, mocker):
     else:
         async with StakeClient() as client:
             yield client
-            state = deepcopy(client.httpClient.state)
+            state = deepcopy(client.http_client.state)
             RecordingHttpClient.user_id = str(client.user.id)
             state = RecordingHttpClient.redacted(state)
             json.dump(

tests/conftest.py

@@ -0,0 +1,70 @@
+{
+    "tests.test_funding.test_funds_in_flight": [
+        {
+            "url": "{url}user",
+            "body": null,
+            "payload": {
+                "userId": "7c9bbfae-0000-47b7-0000-0e66d868c2cf",
+                "username": "rita19",
+                "emailAddress": "torresbenjamin@gmail.com",
+                "dw_id": "8bd56b19-9f9e-44d5-a10e-df7316f17d84",
+                "dw_AccountId": "8bd56b19-9f9e-44d5-a10e-df7316f17d84",
+                "dw_AccountNumber": "w4-1267174s",
+                "macAccountNumber": "H1-7641957H",
+                "status": "KYC_PENDING",
+                "macStatus": "BASIC_USER",
+                "dwStatus": "KYC_APPROVED",
+                "truliooStatus": "APPROVED",
+                "truliooStatusWithWatchlist": null,
+                "firstName": "Tammy",
+                "lastName": "Alexander",
+                "phoneNumber": "9011530005",
+                "signUpPhase": 0,
+                "ackSignedWhen": "2020-09-08",
+                "createdDate": 1574303699770,
+                "stakeApprovedDate": null,
+                "accountType": "INDIVIDUAL",
+                "masterAccountId": null,
+                "referralCode": "L7-2127933N",
+                "referredByCode": null,
+                "regionIdentifier": "AUS",
+                "assetSummary": null,
+                "fundingStatistics": null,
+                "tradingStatistics": null,
+                "w8File": [],
+                "emailVerified": true,
+                "hasFunded": true,
+                "hasTraded": true,
+                "rewardJourneyTimestamp": null,
+                "rewardJourneyStatus": null,
+                "userProfile": {
+                    "residentialAddress": null,
+                    "postalAddress": null
+                },
+                "ledgerBalance": 0,
+                "investorAccreditations": null,
+                "canTradeOnUnsettledFunds": true,
+                "mfaenabled": false
+            },
+            "method": "GET"
+        },
+        {
+            "url": "{url}fund/details",
+            "body": null,
+            "payload": {
+                "fundsInFlight": [
+                    {
+                        "type": "Funding",
+                        "insertDateTime": "17 Sep 2020 05:21AM",
+                        "estimatedArrivalTime": "19 Sep 2020 05:00AM",
+                        "estimatedArrivalTimeUS": "Fri 1:00pm NY time",
+                        "transactionType": "Poli",
+                        "toAmount": 1512.0,
+                        "fromAmount": 2100.0
+                    }
+                ]
+            },
+            "method": "GET"
+        }
+    ]
+}

tests/fixtures/tests.test_funding.test_funds_in_flight.json

@@ -14,3 +14,10 @@ async def test_cash_available(tracing_client):
     cash_available = await tracing_client.fundings.cash_available()
     assert cash_available.cash_available_for_withdrawal == 551.14
     assert cash_available.cash_settlement[0].utc_time.month == 9
+
+
+@pytest.mark.asyncio
+async def test_funds_in_flight(tracing_client):
+    funds_in_flight = await tracing_client.fundings.in_flight()
+    assert len(funds_in_flight) == 1
+    assert funds_in_flight[0].transaction_type == "Poli"