adaptic-backend 1.0.65 → 1.0.67

package/server/Order.mjs

@@ -19,13 +19,15 @@ export const Order = {
           id
           alpacaAccountId
           assetId
+          actionId
           type
-          action
+          side
           qty
           price
           status
           createdAt
           updatedAt
+          executionTime
           alpacaAccount {
             id
             type
@@ -184,6 +186,8 @@ export const Order = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -202,25 +206,19 @@ export const Order = {
               optionContractType
               actions {
                 id
-                tradeId
                 sequence
-                action
-                hedgeType
-                hedgePrice
-                buyPrice
-                sellPrice
-                qty
-                side
+                tradeId
                 type
-                stopLoss
-                targetPrice
+                orderId
                 note
-                executionTime
                 status
                 fee
                 trade {
                   id
                 }
+                order {
+                  id
+                }
               }
             }
             orders {
@@ -263,6 +261,9 @@ export const Order = {
               }
             }
           }
+          action {
+            id
+          }
           asset {
             id
           }
@@ -272,10 +273,11 @@ export const Order = {
         const variables = {
             data: {
                 type: props.type !== undefined ? props.type : undefined,
-                action: props.action !== undefined ? props.action : undefined,
+                side: props.side !== undefined ? props.side : undefined,
                 qty: props.qty !== undefined ? props.qty : undefined,
                 price: props.price !== undefined ? props.price : undefined,
                 status: props.status !== undefined ? props.status : undefined,
+                executionTime: props.executionTime !== undefined ? props.executionTime : undefined,
                 alpacaAccount: props.alpacaAccount ? {
                     connectOrCreate: {
                         where: {
@@ -365,6 +367,40 @@ export const Order = {
                         },
                     }
                 } : undefined,
+                action: props.action ? {
+                    connectOrCreate: {
+                        where: {
+                            id: props.action.id !== undefined ? props.action.id : undefined,
+                        },
+                        create: {
+                            sequence: props.action.sequence !== undefined ? props.action.sequence : undefined,
+                            type: props.action.type !== undefined ? props.action.type : undefined,
+                            orderId: props.action.orderId !== undefined ? props.action.orderId : undefined,
+                            note: props.action.note !== undefined ? props.action.note : undefined,
+                            status: props.action.status !== undefined ? props.action.status : undefined,
+                            fee: props.action.fee !== undefined ? props.action.fee : undefined,
+                            trade: props.action.trade ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: props.action.trade.id !== undefined ? props.action.trade.id : undefined,
+                                    },
+                                    create: {
+                                        qty: props.action.trade.qty !== undefined ? props.action.trade.qty : undefined,
+                                        price: props.action.trade.price !== undefined ? props.action.trade.price : undefined,
+                                        total: props.action.trade.total !== undefined ? props.action.trade.total : undefined,
+                                        signal: props.action.trade.signal !== undefined ? props.action.trade.signal : undefined,
+                                        strategy: props.action.trade.strategy !== undefined ? props.action.trade.strategy : undefined,
+                                        analysis: props.action.trade.analysis !== undefined ? props.action.trade.analysis : undefined,
+                                        confidence: props.action.trade.confidence !== undefined ? props.action.trade.confidence : undefined,
+                                        timestamp: props.action.trade.timestamp !== undefined ? props.action.trade.timestamp : undefined,
+                                        status: props.action.trade.status !== undefined ? props.action.trade.status : undefined,
+                                        optionContractType: props.action.trade.optionContractType !== undefined ? props.action.trade.optionContractType : undefined,
+                                    },
+                                }
+                            } : undefined,
+                        },
+                    }
+                } : undefined,
                 asset: props.asset ? {
                     connectOrCreate: {
                         where: {
@@ -426,6 +462,8 @@ export const Order = {
                             sharesOutstanding: props.asset.sharesOutstanding !== undefined ? props.asset.sharesOutstanding : undefined,
                             dividendDate: props.asset.dividendDate !== undefined ? props.asset.dividendDate : undefined,
                             exDividendDate: props.asset.exDividendDate !== undefined ? props.asset.exDividendDate : undefined,
+                            sellPrice: props.asset.sellPrice !== undefined ? props.asset.sellPrice : undefined,
+                            buyPrice: props.asset.buyPrice !== undefined ? props.asset.buyPrice : undefined,
                             trades: props.asset.trades ? {
                                 connectOrCreate: props.asset.trades.map((item) => ({
                                     where: {
@@ -520,11 +558,13 @@ export const Order = {
             data: props.map(prop => ({
                 alpacaAccountId: prop.alpacaAccountId !== undefined ? prop.alpacaAccountId : undefined,
                 assetId: prop.assetId !== undefined ? prop.assetId : undefined,
+                actionId: prop.actionId !== undefined ? prop.actionId : undefined,
                 type: prop.type !== undefined ? prop.type : undefined,
-                action: prop.action !== undefined ? prop.action : undefined,
+                side: prop.side !== undefined ? prop.side : undefined,
                 qty: prop.qty !== undefined ? prop.qty : undefined,
                 price: prop.price !== undefined ? prop.price : undefined,
                 status: prop.status !== undefined ? prop.status : undefined,
+                executionTime: prop.executionTime !== undefined ? prop.executionTime : undefined,
             })),
         };
         const filteredVariables = removeUndefinedProps(variables);
@@ -557,13 +597,15 @@ export const Order = {
           id
           alpacaAccountId
           assetId
+          actionId
           type
-          action
+          side
           qty
           price
           status
           createdAt
           updatedAt
+          executionTime
           alpacaAccount {
             id
             type
@@ -722,6 +764,8 @@ export const Order = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -740,25 +784,19 @@ export const Order = {
               optionContractType
               actions {
                 id
-                tradeId
                 sequence
-                action
-                hedgeType
-                hedgePrice
-                buyPrice
-                sellPrice
-                qty
-                side
+                tradeId
                 type
-                stopLoss
-                targetPrice
+                orderId
                 note
-                executionTime
                 status
                 fee
                 trade {
                   id
                 }
+                order {
+                  id
+                }
               }
             }
             orders {
@@ -801,6 +839,9 @@ export const Order = {
               }
             }
           }
+          action {
+            id
+          }
           asset {
             id
           }
@@ -817,8 +858,8 @@ export const Order = {
                 type: props.type !== undefined ? {
                     set: props.type
                 } : undefined,
-                action: props.action !== undefined ? {
-                    set: props.action
+                side: props.side !== undefined ? {
+                    set: props.side
                 } : undefined,
                 qty: props.qty !== undefined ? {
                     set: props.qty
@@ -835,6 +876,9 @@ export const Order = {
                 updatedAt: props.updatedAt !== undefined ? {
                     set: props.updatedAt
                 } : undefined,
+                executionTime: props.executionTime !== undefined ? {
+                    set: props.executionTime
+                } : undefined,
                 alpacaAccount: props.alpacaAccount ? {
                     upsert: {
                         where: {
@@ -1150,6 +1194,121 @@ export const Order = {
                         },
                     }
                 } : undefined,
+                action: props.action ? {
+                    upsert: {
+                        where: {
+                            id: props.action.id !== undefined ? {
+                                equals: props.action.id
+                            } : undefined,
+                        },
+                        update: {
+                            id: props.action.id !== undefined ? {
+                                set: props.action.id
+                            } : undefined,
+                            sequence: props.action.sequence !== undefined ? {
+                                set: props.action.sequence
+                            } : undefined,
+                            type: props.action.type !== undefined ? {
+                                set: props.action.type
+                            } : undefined,
+                            orderId: props.action.orderId !== undefined ? {
+                                set: props.action.orderId
+                            } : undefined,
+                            note: props.action.note !== undefined ? {
+                                set: props.action.note
+                            } : undefined,
+                            status: props.action.status !== undefined ? {
+                                set: props.action.status
+                            } : undefined,
+                            fee: props.action.fee !== undefined ? {
+                                set: props.action.fee
+                            } : undefined,
+                            trade: props.action.trade ? {
+                                upsert: {
+                                    where: {
+                                        id: props.action.trade.id !== undefined ? {
+                                            equals: props.action.trade.id
+                                        } : undefined,
+                                    },
+                                    update: {
+                                        id: props.action.trade.id !== undefined ? {
+                                            set: props.action.trade.id
+                                        } : undefined,
+                                        qty: props.action.trade.qty !== undefined ? {
+                                            set: props.action.trade.qty
+                                        } : undefined,
+                                        price: props.action.trade.price !== undefined ? {
+                                            set: props.action.trade.price
+                                        } : undefined,
+                                        total: props.action.trade.total !== undefined ? {
+                                            set: props.action.trade.total
+                                        } : undefined,
+                                        signal: props.action.trade.signal !== undefined ? {
+                                            set: props.action.trade.signal
+                                        } : undefined,
+                                        strategy: props.action.trade.strategy !== undefined ? {
+                                            set: props.action.trade.strategy
+                                        } : undefined,
+                                        analysis: props.action.trade.analysis !== undefined ? {
+                                            set: props.action.trade.analysis
+                                        } : undefined,
+                                        confidence: props.action.trade.confidence !== undefined ? {
+                                            set: props.action.trade.confidence
+                                        } : undefined,
+                                        timestamp: props.action.trade.timestamp !== undefined ? {
+                                            set: props.action.trade.timestamp
+                                        } : undefined,
+                                        status: props.action.trade.status !== undefined ? {
+                                            set: props.action.trade.status
+                                        } : undefined,
+                                        optionContractType: props.action.trade.optionContractType !== undefined ? {
+                                            set: props.action.trade.optionContractType
+                                        } : undefined,
+                                    },
+                                    create: {
+                                        qty: props.action.trade.qty !== undefined ? props.action.trade.qty : undefined,
+                                        price: props.action.trade.price !== undefined ? props.action.trade.price : undefined,
+                                        total: props.action.trade.total !== undefined ? props.action.trade.total : undefined,
+                                        signal: props.action.trade.signal !== undefined ? props.action.trade.signal : undefined,
+                                        strategy: props.action.trade.strategy !== undefined ? props.action.trade.strategy : undefined,
+                                        analysis: props.action.trade.analysis !== undefined ? props.action.trade.analysis : undefined,
+                                        confidence: props.action.trade.confidence !== undefined ? props.action.trade.confidence : undefined,
+                                        timestamp: props.action.trade.timestamp !== undefined ? props.action.trade.timestamp : undefined,
+                                        status: props.action.trade.status !== undefined ? props.action.trade.status : undefined,
+                                        optionContractType: props.action.trade.optionContractType !== undefined ? props.action.trade.optionContractType : undefined,
+                                    },
+                                }
+                            } : undefined,
+                        },
+                        create: {
+                            sequence: props.action.sequence !== undefined ? props.action.sequence : undefined,
+                            type: props.action.type !== undefined ? props.action.type : undefined,
+                            orderId: props.action.orderId !== undefined ? props.action.orderId : undefined,
+                            note: props.action.note !== undefined ? props.action.note : undefined,
+                            status: props.action.status !== undefined ? props.action.status : undefined,
+                            fee: props.action.fee !== undefined ? props.action.fee : undefined,
+                            trade: props.action.trade ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: props.action.trade.id !== undefined ? props.action.trade.id : undefined,
+                                    },
+                                    create: {
+                                        qty: props.action.trade.qty !== undefined ? props.action.trade.qty : undefined,
+                                        price: props.action.trade.price !== undefined ? props.action.trade.price : undefined,
+                                        total: props.action.trade.total !== undefined ? props.action.trade.total : undefined,
+                                        signal: props.action.trade.signal !== undefined ? props.action.trade.signal : undefined,
+                                        strategy: props.action.trade.strategy !== undefined ? props.action.trade.strategy : undefined,
+                                        analysis: props.action.trade.analysis !== undefined ? props.action.trade.analysis : undefined,
+                                        confidence: props.action.trade.confidence !== undefined ? props.action.trade.confidence : undefined,
+                                        timestamp: props.action.trade.timestamp !== undefined ? props.action.trade.timestamp : undefined,
+                                        status: props.action.trade.status !== undefined ? props.action.trade.status : undefined,
+                                        optionContractType: props.action.trade.optionContractType !== undefined ? props.action.trade.optionContractType : undefined,
+                                    },
+                                }
+                            } : undefined,
+                        },
+                    }
+                } : undefined,
                 asset: props.asset ? {
                     upsert: {
                         where: {
@@ -1326,6 +1485,12 @@ export const Order = {
                             exDividendDate: props.asset.exDividendDate !== undefined ? {
                                 set: props.asset.exDividendDate
                             } : undefined,
+                            sellPrice: props.asset.sellPrice !== undefined ? {
+                                set: props.asset.sellPrice
+                            } : undefined,
+                            buyPrice: props.asset.buyPrice !== undefined ? {
+                                set: props.asset.buyPrice
+                            } : undefined,
                             trades: props.asset.trades ? {
                                 upsert: props.asset.trades.map((item) => ({
                                     where: {
@@ -1532,6 +1697,8 @@ export const Order = {
                             sharesOutstanding: props.asset.sharesOutstanding !== undefined ? props.asset.sharesOutstanding : undefined,
                             dividendDate: props.asset.dividendDate !== undefined ? props.asset.dividendDate : undefined,
                             exDividendDate: props.asset.exDividendDate !== undefined ? props.asset.exDividendDate : undefined,
+                            sellPrice: props.asset.sellPrice !== undefined ? props.asset.sellPrice : undefined,
+                            buyPrice: props.asset.buyPrice !== undefined ? props.asset.buyPrice : undefined,
                             trades: props.asset.trades ? {
                                 connectOrCreate: props.asset.trades.map((item) => ({
                                     where: {
@@ -1633,8 +1800,8 @@ export const Order = {
                 type: prop.type !== undefined ? {
                     set: prop.type
                 } : undefined,
-                action: prop.action !== undefined ? {
-                    set: prop.action
+                side: prop.side !== undefined ? {
+                    set: prop.side
                 } : undefined,
                 qty: prop.qty !== undefined ? {
                     set: prop.qty
@@ -1651,6 +1818,9 @@ export const Order = {
                 updatedAt: prop.updatedAt !== undefined ? {
                     set: prop.updatedAt
                 } : undefined,
+                executionTime: prop.executionTime !== undefined ? {
+                    set: prop.executionTime
+                } : undefined,
                 alpacaAccount: prop.alpacaAccount ? {
                     upsert: {
                         where: {
@@ -1966,6 +2136,121 @@ export const Order = {
                         },
                     }
                 } : undefined,
+                action: prop.action ? {
+                    upsert: {
+                        where: {
+                            id: prop.action.id !== undefined ? {
+                                equals: prop.action.id
+                            } : undefined,
+                        },
+                        update: {
+                            id: prop.action.id !== undefined ? {
+                                set: prop.action.id
+                            } : undefined,
+                            sequence: prop.action.sequence !== undefined ? {
+                                set: prop.action.sequence
+                            } : undefined,
+                            type: prop.action.type !== undefined ? {
+                                set: prop.action.type
+                            } : undefined,
+                            orderId: prop.action.orderId !== undefined ? {
+                                set: prop.action.orderId
+                            } : undefined,
+                            note: prop.action.note !== undefined ? {
+                                set: prop.action.note
+                            } : undefined,
+                            status: prop.action.status !== undefined ? {
+                                set: prop.action.status
+                            } : undefined,
+                            fee: prop.action.fee !== undefined ? {
+                                set: prop.action.fee
+                            } : undefined,
+                            trade: prop.action.trade ? {
+                                upsert: {
+                                    where: {
+                                        id: prop.action.trade.id !== undefined ? {
+                                            equals: prop.action.trade.id
+                                        } : undefined,
+                                    },
+                                    update: {
+                                        id: prop.action.trade.id !== undefined ? {
+                                            set: prop.action.trade.id
+                                        } : undefined,
+                                        qty: prop.action.trade.qty !== undefined ? {
+                                            set: prop.action.trade.qty
+                                        } : undefined,
+                                        price: prop.action.trade.price !== undefined ? {
+                                            set: prop.action.trade.price
+                                        } : undefined,
+                                        total: prop.action.trade.total !== undefined ? {
+                                            set: prop.action.trade.total
+                                        } : undefined,
+                                        signal: prop.action.trade.signal !== undefined ? {
+                                            set: prop.action.trade.signal
+                                        } : undefined,
+                                        strategy: prop.action.trade.strategy !== undefined ? {
+                                            set: prop.action.trade.strategy
+                                        } : undefined,
+                                        analysis: prop.action.trade.analysis !== undefined ? {
+                                            set: prop.action.trade.analysis
+                                        } : undefined,
+                                        confidence: prop.action.trade.confidence !== undefined ? {
+                                            set: prop.action.trade.confidence
+                                        } : undefined,
+                                        timestamp: prop.action.trade.timestamp !== undefined ? {
+                                            set: prop.action.trade.timestamp
+                                        } : undefined,
+                                        status: prop.action.trade.status !== undefined ? {
+                                            set: prop.action.trade.status
+                                        } : undefined,
+                                        optionContractType: prop.action.trade.optionContractType !== undefined ? {
+                                            set: prop.action.trade.optionContractType
+                                        } : undefined,
+                                    },
+                                    create: {
+                                        qty: prop.action.trade.qty !== undefined ? prop.action.trade.qty : undefined,
+                                        price: prop.action.trade.price !== undefined ? prop.action.trade.price : undefined,
+                                        total: prop.action.trade.total !== undefined ? prop.action.trade.total : undefined,
+                                        signal: prop.action.trade.signal !== undefined ? prop.action.trade.signal : undefined,
+                                        strategy: prop.action.trade.strategy !== undefined ? prop.action.trade.strategy : undefined,
+                                        analysis: prop.action.trade.analysis !== undefined ? prop.action.trade.analysis : undefined,
+                                        confidence: prop.action.trade.confidence !== undefined ? prop.action.trade.confidence : undefined,
+                                        timestamp: prop.action.trade.timestamp !== undefined ? prop.action.trade.timestamp : undefined,
+                                        status: prop.action.trade.status !== undefined ? prop.action.trade.status : undefined,
+                                        optionContractType: prop.action.trade.optionContractType !== undefined ? prop.action.trade.optionContractType : undefined,
+                                    },
+                                }
+                            } : undefined,
+                        },
+                        create: {
+                            sequence: prop.action.sequence !== undefined ? prop.action.sequence : undefined,
+                            type: prop.action.type !== undefined ? prop.action.type : undefined,
+                            orderId: prop.action.orderId !== undefined ? prop.action.orderId : undefined,
+                            note: prop.action.note !== undefined ? prop.action.note : undefined,
+                            status: prop.action.status !== undefined ? prop.action.status : undefined,
+                            fee: prop.action.fee !== undefined ? prop.action.fee : undefined,
+                            trade: prop.action.trade ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: prop.action.trade.id !== undefined ? prop.action.trade.id : undefined,
+                                    },
+                                    create: {
+                                        qty: prop.action.trade.qty !== undefined ? prop.action.trade.qty : undefined,
+                                        price: prop.action.trade.price !== undefined ? prop.action.trade.price : undefined,
+                                        total: prop.action.trade.total !== undefined ? prop.action.trade.total : undefined,
+                                        signal: prop.action.trade.signal !== undefined ? prop.action.trade.signal : undefined,
+                                        strategy: prop.action.trade.strategy !== undefined ? prop.action.trade.strategy : undefined,
+                                        analysis: prop.action.trade.analysis !== undefined ? prop.action.trade.analysis : undefined,
+                                        confidence: prop.action.trade.confidence !== undefined ? prop.action.trade.confidence : undefined,
+                                        timestamp: prop.action.trade.timestamp !== undefined ? prop.action.trade.timestamp : undefined,
+                                        status: prop.action.trade.status !== undefined ? prop.action.trade.status : undefined,
+                                        optionContractType: prop.action.trade.optionContractType !== undefined ? prop.action.trade.optionContractType : undefined,
+                                    },
+                                }
+                            } : undefined,
+                        },
+                    }
+                } : undefined,
                 asset: prop.asset ? {
                     upsert: {
                         where: {
@@ -2142,6 +2427,12 @@ export const Order = {
                             exDividendDate: prop.asset.exDividendDate !== undefined ? {
                                 set: prop.asset.exDividendDate
                             } : undefined,
+                            sellPrice: prop.asset.sellPrice !== undefined ? {
+                                set: prop.asset.sellPrice
+                            } : undefined,
+                            buyPrice: prop.asset.buyPrice !== undefined ? {
+                                set: prop.asset.buyPrice
+                            } : undefined,
                             trades: prop.asset.trades ? {
                                 upsert: prop.asset.trades.map((item) => ({
                                     where: {
@@ -2348,6 +2639,8 @@ export const Order = {
                             sharesOutstanding: prop.asset.sharesOutstanding !== undefined ? prop.asset.sharesOutstanding : undefined,
                             dividendDate: prop.asset.dividendDate !== undefined ? prop.asset.dividendDate : undefined,
                             exDividendDate: prop.asset.exDividendDate !== undefined ? prop.asset.exDividendDate : undefined,
+                            sellPrice: prop.asset.sellPrice !== undefined ? prop.asset.sellPrice : undefined,
+                            buyPrice: prop.asset.buyPrice !== undefined ? prop.asset.buyPrice : undefined,
                             trades: prop.asset.trades ? {
                                 connectOrCreate: prop.asset.trades.map((item) => ({
                                     where: {
@@ -2438,13 +2731,15 @@ export const Order = {
           id
           alpacaAccountId
           assetId
+          actionId
           type
-          action
+          side
           qty
           price
           status
           createdAt
           updatedAt
+          executionTime
           alpacaAccount {
             id
             type
@@ -2603,6 +2898,8 @@ export const Order = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -2621,25 +2918,19 @@ export const Order = {
               optionContractType
               actions {
                 id
-                tradeId
                 sequence
-                action
-                hedgeType
-                hedgePrice
-                buyPrice
-                sellPrice
-                qty
-                side
+                tradeId
                 type
-                stopLoss
-                targetPrice
+                orderId
                 note
-                executionTime
                 status
                 fee
                 trade {
                   id
                 }
+                order {
+                  id
+                }
               }
             }
             orders {
@@ -2682,6 +2973,9 @@ export const Order = {
               }
             }
           }
+          action {
+            id
+          }
           asset {
             id
           }
@@ -2722,13 +3016,15 @@ export const Order = {
           id
           alpacaAccountId
           assetId
+          actionId
           type
-          action
+          side
           qty
           price
           status
           createdAt
           updatedAt
+          executionTime
           alpacaAccount {
             id
             type
@@ -2887,6 +3183,8 @@ export const Order = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -2905,25 +3203,19 @@ export const Order = {
               optionContractType
               actions {
                 id
-                tradeId
                 sequence
-                action
-                hedgeType
-                hedgePrice
-                buyPrice
-                sellPrice
-                qty
-                side
+                tradeId
                 type
-                stopLoss
-                targetPrice
+                orderId
                 note
-                executionTime
                 status
                 fee
                 trade {
                   id
                 }
+                order {
+                  id
+                }
               }
             }
             orders {
@@ -2966,6 +3258,9 @@ export const Order = {
               }
             }
           }
+          action {
+            id
+          }
           asset {
             id
           }
@@ -3005,13 +3300,15 @@ export const Order = {
           id
           alpacaAccountId
           assetId
+          actionId
           type
-          action
+          side
           qty
           price
           status
           createdAt
           updatedAt
+          executionTime
           alpacaAccount {
             id
             type
@@ -3170,6 +3467,8 @@ export const Order = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -3188,25 +3487,19 @@ export const Order = {
               optionContractType
               actions {
                 id
-                tradeId
                 sequence
-                action
-                hedgeType
-                hedgePrice
-                buyPrice
-                sellPrice
-                qty
-                side
+                tradeId
                 type
-                stopLoss
-                targetPrice
+                orderId
                 note
-                executionTime
                 status
                 fee
                 trade {
                   id
                 }
+                order {
+                  id
+                }
               }
             }
             orders {
@@ -3249,6 +3542,9 @@ export const Order = {
               }
             }
           }
+          action {
+            id
+          }
           asset {
             id
           }
@@ -3283,13 +3579,15 @@ export const Order = {
           id
           alpacaAccountId
           assetId
+          actionId
           type
-          action
+          side
           qty
           price
           status
           createdAt
           updatedAt
+          executionTime
           alpacaAccount {
             id
             type
@@ -3448,6 +3746,8 @@ export const Order = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -3466,25 +3766,19 @@ export const Order = {
               optionContractType
               actions {
                 id
-                tradeId
                 sequence
-                action
-                hedgeType
-                hedgePrice
-                buyPrice
-                sellPrice
-                qty
-                side
+                tradeId
                 type
-                stopLoss
-                targetPrice
+                orderId
                 note
-                executionTime
                 status
                 fee
                 trade {
                   id
                 }
+                order {
+                  id
+                }
               }
             }
             orders {
@@ -3527,6 +3821,9 @@ export const Order = {
               }
             }
           }
+          action {
+            id
+          }
           asset {
             id
           }