Account for creation/redemption in performance page PnL (#371)

Author: crthpl

backend/.sqlx/query-8db1e238b93524513e50bf05387d31905399337aa22c733ac95a162dc8128914.json

@@ -369,12 +369,17 @@ impl From<db::Trades> for websocket_api::Trades {
             market_id,
             trades,
             has_full_history,
+            redemptions,
         }: db::Trades,
     ) -> Self {
         Self {
             market_id,
             trades: trades.into_iter().map(websocket_api::Trade::from).collect(),
             has_full_history,
+            redemptions: redemptions
+                .into_iter()
+                .map(websocket_api::Redeemed::from)
+                .collect(),
         }
     }
 }

backend/src/convert.rs

@@ -1283,13 +1283,55 @@ impl DB {
         )
         .fetch_all(&self.pool)
         .await?;
+        let redemptions = self.get_market_redemptions(market_id).await?;
         Ok(Ok(Trades {
             market_id,
             trades,
             has_full_history: true,
+            redemptions,
         }))
     }
 
+    #[instrument(err, skip(self))]
+    pub async fn get_market_redemptions(&self, fund_id: i64) -> SqlxResult<Vec<Redeemed>> {
+        struct Row {
+            redeemer_id: i64,
+            fund_id: i64,
+            amount: Text<Decimal>,
+            transaction_id: i64,
+            transaction_timestamp: OffsetDateTime,
+        }
+        let rows = sqlx::query_as!(
+            Row,
+            r#"
+                SELECT
+                    r.redeemer_id,
+                    r.fund_id as "fund_id!",
+                    r.amount as "amount: _",
+                    r.transaction_id,
+                    tr.timestamp as "transaction_timestamp"
+                FROM redemption r
+                JOIN "transaction" tr ON r.transaction_id = tr.id
+                WHERE r.fund_id = ?
+            "#,
+            fund_id
+        )
+        .fetch_all(&self.pool)
+        .await?;
+        Ok(rows
+            .into_iter()
+            .map(|row| Redeemed {
+                account_id: row.redeemer_id,
+                fund_id: row.fund_id,
+                amount: row.amount,
+                transaction_info: TransactionInfo {
+                    id: row.transaction_id,
+                    timestamp: row.transaction_timestamp,
+                },
+            })
+            .collect())
+    }
+
     /// Gets the last trade for each market that has trades.
     /// Returns a `HashMap` where keys are `market_id`s and values are the most recent Trade.
     #[instrument(err, skip(self))]
@@ -4044,6 +4086,7 @@ pub struct Trades {
     pub market_id: i64,
     pub trades: Vec<Trade>,
     pub has_full_history: bool,
+    pub redemptions: Vec<Redeemed>,
 }
 
 #[derive(FromRow, Debug, Clone)]

backend/src/db.rs

@@ -432,6 +432,7 @@ async fn send_initial_public_data(
                 market_id,
                 trades,
                 has_full_history: false,
+                redemptions: vec![],
             }),
         );
         if !is_admin {
@@ -500,6 +501,9 @@ async fn conditionally_hide_user_ids(
                 hide_id(owned_accounts, &mut trade.buyer_id);
                 hide_id(owned_accounts, &mut trade.seller_id);
             }
+            for redemption in &mut trades.redemptions {
+                hide_id(owned_accounts, &mut redemption.account_id);
+            }
         }
         _ => {}
     }

backend/src/handle_socket.rs

@@ -20,8 +20,8 @@ use crate::{
     subscriptions::Subscriptions,
     websocket_api::{
         client_message::Message as CM, server_message::Message as SM, ActAs, Authenticate,
-        ClientMessage, CreateMarket, CreateOrder, EditMarket, GetFullTradeHistory,
-        RevokeOwnership, ServerMessage, SettleMarket, SetSudo, Side,
+        ClientMessage, CreateMarket, CreateOrder, EditMarket, GetFullTradeHistory, MakeTransfer,
+        Redeem, Redeemable, RevokeOwnership, ServerMessage, SettleMarket, SetSudo, Side,
     },
     AppState,
 };
@@ -373,6 +373,78 @@ impl TestClient {
         self.recv_message().await
     }
 
+    /// Send a `CreateMarket` message with full options (including redeemable).
+    ///
+    /// # Errors
+    /// Returns an error if sending fails.
+    pub async fn create_market_full(
+        &mut self,
+        name: &str,
+        min_settlement: f64,
+        max_settlement: f64,
+        hide_account_ids: bool,
+        redeemable_for: Vec<Redeemable>,
+        redeem_fee: f64,
+    ) -> anyhow::Result<ServerMessage> {
+        let request_id = self.next_request_id();
+        let msg = ClientMessage {
+            request_id,
+            message: Some(CM::CreateMarket(CreateMarket {
+                name: name.to_string(),
+                description: String::new(),
+                min_settlement,
+                max_settlement,
+                redeemable_for,
+                redeem_fee,
+                hide_account_ids,
+                visible_to: vec![],
+                type_id: 0,
+                group_id: 0,
+            })),
+        };
+        self.send_message(msg).await?;
+        self.recv_message().await
+    }
+
+    /// Send a `Redeem` message.
+    ///
+    /// # Errors
+    /// Returns an error if sending fails.
+    pub async fn redeem(&mut self, fund_id: i64, amount: f64) -> anyhow::Result<ServerMessage> {
+        let request_id = self.next_request_id();
+        let msg = ClientMessage {
+            request_id,
+            message: Some(CM::Redeem(Redeem { fund_id, amount })),
+        };
+        self.send_message(msg).await?;
+        self.recv_message().await
+    }
+
+    /// Send a `MakeTransfer` message.
+    ///
+    /// # Errors
+    /// Returns an error if sending fails.
+    pub async fn make_transfer(
+        &mut self,
+        from_account_id: i64,
+        to_account_id: i64,
+        amount: f64,
+        note: &str,
+    ) -> anyhow::Result<ServerMessage> {
+        let request_id = self.next_request_id();
+        let msg = ClientMessage {
+            request_id,
+            message: Some(CM::MakeTransfer(MakeTransfer {
+                from_account_id,
+                to_account_id,
+                amount,
+                note: note.to_string(),
+            })),
+        };
+        self.send_message(msg).await?;
+        self.recv_message().await
+    }
+
     /// Send a raw `ClientMessage`.
     ///
     /// # Errors