cleanup types

huskly · Feb 25, 2025 · ba809dd · ba809dd
1 parent 2329204
commit ba809dd
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 56 deletions.
diff --git a/src/client/services/orderEventsMessageHandler.ts b/src/client/services/orderEventsMessageHandler.ts
@@ -2,12 +2,6 @@ import { RawPayloadRequest } from "../tdaWsJsonTypes.js";
 import { ApiService } from "./apiService.js";
 import WebSocketApiMessageHandler from "./webSocketApiMessageHandler.js";
 
-export type OrderPatch = {
-  op: string;
-  path: string;
-  value?: OrderEvent | OrderEvent[] | string | number;
-};
-
 export type OrderEvent = {
   id: number;
   symbol: string;
@@ -70,29 +64,11 @@ export type RawOrderEvent = {
   legsDescriptionDisplay: string;
 };
 
-export type RawOrderEventsResponse = {
-  patches?: {
-    op: string;
-    path: string;
-    value?: Partial<RawOrderEvent> | { orders: RawOrderEvent[] };
-  }[];
-  orders?: RawOrderEvent[];
-};
-
 export type OrderEventsSnapshotResponse = {
   orders: OrderEvent[];
   service: "order_events";
 };
 
-export type OrderEventsPatchResponse = {
-  patches: OrderPatch[];
-  service: "order_events";
-};
-
-export type OrderEventsResponse =
-  | OrderEventsSnapshotResponse
-  | OrderEventsPatchResponse;
-
 export default class OrderEventsMessageHandler
   implements WebSocketApiMessageHandler<never>
 {

diff --git a/src/client/services/positionsMessageHandler.ts b/src/client/services/positionsMessageHandler.ts
@@ -4,41 +4,46 @@ import WebSocketApiMessageHandler, {
   newPayload,
 } from "./webSocketApiMessageHandler.js";
 
-export type RawPositionsResponse = {
-  items: {
-    account: string;
-    instrument: {
-      symbol: string;
-      rootSymbol: string;
-      description: string;
-      instrumentType: "STOCK" | "OPTION" | "ETF" | "FUTURE" | "PRODUCT";
-    };
+export type RawPositionsItem = {
+  account: string;
+  instrument: {
     symbol: string;
     rootSymbol: string;
-    values: {
-      OPEN_PRICE?: number;
-      BP_EFFECT?: number;
-      DELTA?: number;
-      GAMMA?: number;
-      MARGIN?: number;
-      MARK?: number;
-      MARK_CHANGE?: number;
-      NET_LIQ?: number;
-      OPEN_COST?: number;
-      PL_DAY?: number;
-      PL_OPEN?: number;
-      PL_YTD?: number;
-      RHO?: number;
-      THETA?: number;
-      VEGA?: number;
-      QUANTITY?: number;
-    };
-    betaWeightings: [{ symbol: string; deltaBetaWeighting: number }];
-    aggregated: true;
-    closable: false;
-    exercisable: false;
-    rollable: false;
+    description: string;
+    instrumentType: "STOCK" | "OPTION" | "ETF" | "FUTURE" | "PRODUCT";
+  };
+  symbol: string;
+  rootSymbol: string;
+  values: {
+    OPEN_PRICE?: number;
+    BP_EFFECT?: number;
+    DELTA?: number;
+    GAMMA?: number;
+    MARGIN?: number;
+    MARK?: number;
+    MARK_CHANGE?: number;
+    NET_LIQ?: number;
+    OPEN_COST?: number;
+    PL_DAY?: number;
+    PL_OPEN?: number;
+    PL_YTD?: number;
+    RHO?: number;
+    THETA?: number;
+    VEGA?: number;
+    QUANTITY?: number;
+  };
+  betaWeightings: {
+    symbol: string;
+    deltaBetaWeighting: number;
   }[];
+  aggregated: true;
+  closable: false;
+  exercisable: false;
+  rollable: false;
+};
+
+export type RawPositionsResponse = {
+  items: RawPositionsItem[];
 };
 
 export interface Instrument {