adaptic-backend 1.0.65 → 1.0.67

package/server/Trade.mjs

@@ -122,16 +122,34 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -187,6 +205,8 @@ export const Trade = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -246,25 +266,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            hedgeType
-            hedgePrice
-            buyPrice
-            sellPrice
-            qty
-            side
-            type
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
         }
       }
@@ -321,10 +322,11 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -426,6 +428,8 @@ export const Trade = {
                             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,
                             orders: props.asset.orders ? {
                                 connectOrCreate: props.asset.orders.map((item) => ({
                                     where: {
@@ -433,10 +437,11 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -486,20 +491,26 @@ export const Trade = {
                         },
                         create: {
                             sequence: item.sequence !== undefined ? item.sequence : undefined,
-                            action: item.action !== undefined ? item.action : undefined,
-                            hedgeType: item.hedgeType !== undefined ? item.hedgeType : undefined,
-                            hedgePrice: item.hedgePrice !== undefined ? item.hedgePrice : undefined,
-                            buyPrice: item.buyPrice !== undefined ? item.buyPrice : undefined,
-                            sellPrice: item.sellPrice !== undefined ? item.sellPrice : undefined,
-                            qty: item.qty !== undefined ? item.qty : undefined,
-                            side: item.side !== undefined ? item.side : undefined,
                             type: item.type !== undefined ? item.type : undefined,
-                            stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
-                            targetPrice: item.targetPrice !== undefined ? item.targetPrice : undefined,
+                            orderId: item.orderId !== undefined ? item.orderId : undefined,
                             note: item.note !== undefined ? item.note : undefined,
-                            executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                             status: item.status !== undefined ? item.status : undefined,
                             fee: item.fee !== undefined ? item.fee : undefined,
+                            order: item.order ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.order.id !== undefined ? item.order.id : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -684,16 +695,34 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -749,6 +778,8 @@ export const Trade = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -808,25 +839,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            hedgeType
-            hedgePrice
-            buyPrice
-            sellPrice
-            qty
-            side
-            type
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
       }
       }`;
@@ -970,8 +982,8 @@ export const Trade = {
                                         type: item.type !== undefined ? {
                                             set: item.type
                                         } : undefined,
-                                        action: item.action !== undefined ? {
-                                            set: item.action
+                                        side: item.side !== undefined ? {
+                                            set: item.side
                                         } : undefined,
                                         qty: item.qty !== undefined ? {
                                             set: item.qty
@@ -982,13 +994,17 @@ export const Trade = {
                                         status: item.status !== undefined ? {
                                             set: item.status
                                         } : undefined,
+                                        executionTime: item.executionTime !== undefined ? {
+                                            set: item.executionTime
+                                        } : undefined,
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1120,10 +1136,11 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1340,6 +1357,12 @@ export const Trade = {
                             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,
                             orders: props.asset.orders ? {
                                 upsert: props.asset.orders.map((item) => ({
                                     where: {
@@ -1352,8 +1375,8 @@ export const Trade = {
                                         type: item.type !== undefined ? {
                                             set: item.type
                                         } : undefined,
-                                        action: item.action !== undefined ? {
-                                            set: item.action
+                                        side: item.side !== undefined ? {
+                                            set: item.side
                                         } : undefined,
                                         qty: item.qty !== undefined ? {
                                             set: item.qty
@@ -1364,13 +1387,17 @@ export const Trade = {
                                         status: item.status !== undefined ? {
                                             set: item.status
                                         } : undefined,
+                                        executionTime: item.executionTime !== undefined ? {
+                                            set: item.executionTime
+                                        } : undefined,
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1526,6 +1553,8 @@ export const Trade = {
                             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,
                             orders: props.asset.orders ? {
                                 connectOrCreate: props.asset.orders.map((item) => ({
                                     where: {
@@ -1533,10 +1562,11 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1591,65 +1621,84 @@ export const Trade = {
                             sequence: item.sequence !== undefined ? {
                                 set: item.sequence
                             } : undefined,
-                            action: item.action !== undefined ? {
-                                set: item.action
-                            } : undefined,
-                            hedgeType: item.hedgeType !== undefined ? {
-                                set: item.hedgeType
-                            } : undefined,
-                            hedgePrice: item.hedgePrice !== undefined ? {
-                                set: item.hedgePrice
-                            } : undefined,
-                            buyPrice: item.buyPrice !== undefined ? {
-                                set: item.buyPrice
-                            } : undefined,
-                            sellPrice: item.sellPrice !== undefined ? {
-                                set: item.sellPrice
-                            } : undefined,
-                            qty: item.qty !== undefined ? {
-                                set: item.qty
-                            } : undefined,
-                            side: item.side !== undefined ? {
-                                set: item.side
-                            } : undefined,
                             type: item.type !== undefined ? {
                                 set: item.type
                             } : undefined,
-                            stopLoss: item.stopLoss !== undefined ? {
-                                set: item.stopLoss
-                            } : undefined,
-                            targetPrice: item.targetPrice !== undefined ? {
-                                set: item.targetPrice
+                            orderId: item.orderId !== undefined ? {
+                                set: item.orderId
                             } : undefined,
                             note: item.note !== undefined ? {
                                 set: item.note
                             } : undefined,
-                            executionTime: item.executionTime !== undefined ? {
-                                set: item.executionTime
-                            } : undefined,
                             status: item.status !== undefined ? {
                                 set: item.status
                             } : undefined,
                             fee: item.fee !== undefined ? {
                                 set: item.fee
                             } : undefined,
+                            order: item.order ? {
+                                upsert: {
+                                    where: {
+                                        id: item.order.id !== undefined ? {
+                                            equals: item.order.id
+                                        } : undefined,
+                                    },
+                                    update: {
+                                        id: item.order.id !== undefined ? {
+                                            set: item.order.id
+                                        } : undefined,
+                                        type: item.order.type !== undefined ? {
+                                            set: item.order.type
+                                        } : undefined,
+                                        side: item.order.side !== undefined ? {
+                                            set: item.order.side
+                                        } : undefined,
+                                        qty: item.order.qty !== undefined ? {
+                                            set: item.order.qty
+                                        } : undefined,
+                                        price: item.order.price !== undefined ? {
+                                            set: item.order.price
+                                        } : undefined,
+                                        status: item.order.status !== undefined ? {
+                                            set: item.order.status
+                                        } : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? {
+                                            set: item.order.executionTime
+                                        } : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                         create: {
                             sequence: item.sequence !== undefined ? item.sequence : undefined,
-                            action: item.action !== undefined ? item.action : undefined,
-                            hedgeType: item.hedgeType !== undefined ? item.hedgeType : undefined,
-                            hedgePrice: item.hedgePrice !== undefined ? item.hedgePrice : undefined,
-                            buyPrice: item.buyPrice !== undefined ? item.buyPrice : undefined,
-                            sellPrice: item.sellPrice !== undefined ? item.sellPrice : undefined,
-                            qty: item.qty !== undefined ? item.qty : undefined,
-                            side: item.side !== undefined ? item.side : undefined,
                             type: item.type !== undefined ? item.type : undefined,
-                            stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
-                            targetPrice: item.targetPrice !== undefined ? item.targetPrice : undefined,
+                            orderId: item.orderId !== undefined ? item.orderId : undefined,
                             note: item.note !== undefined ? item.note : undefined,
-                            executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                             status: item.status !== undefined ? item.status : undefined,
                             fee: item.fee !== undefined ? item.fee : undefined,
+                            order: item.order ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.order.id !== undefined ? item.order.id : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -1825,8 +1874,8 @@ export const Trade = {
                                         type: item.type !== undefined ? {
                                             set: item.type
                                         } : undefined,
-                                        action: item.action !== undefined ? {
-                                            set: item.action
+                                        side: item.side !== undefined ? {
+                                            set: item.side
                                         } : undefined,
                                         qty: item.qty !== undefined ? {
                                             set: item.qty
@@ -1837,13 +1886,17 @@ export const Trade = {
                                         status: item.status !== undefined ? {
                                             set: item.status
                                         } : undefined,
+                                        executionTime: item.executionTime !== undefined ? {
+                                            set: item.executionTime
+                                        } : undefined,
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1975,10 +2028,11 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -2195,6 +2249,12 @@ export const Trade = {
                             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,
                             orders: prop.asset.orders ? {
                                 upsert: prop.asset.orders.map((item) => ({
                                     where: {
@@ -2207,8 +2267,8 @@ export const Trade = {
                                         type: item.type !== undefined ? {
                                             set: item.type
                                         } : undefined,
-                                        action: item.action !== undefined ? {
-                                            set: item.action
+                                        side: item.side !== undefined ? {
+                                            set: item.side
                                         } : undefined,
                                         qty: item.qty !== undefined ? {
                                             set: item.qty
@@ -2219,13 +2279,17 @@ export const Trade = {
                                         status: item.status !== undefined ? {
                                             set: item.status
                                         } : undefined,
+                                        executionTime: item.executionTime !== undefined ? {
+                                            set: item.executionTime
+                                        } : undefined,
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -2381,6 +2445,8 @@ export const Trade = {
                             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,
                             orders: prop.asset.orders ? {
                                 connectOrCreate: prop.asset.orders.map((item) => ({
                                     where: {
@@ -2388,10 +2454,11 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -2446,65 +2513,84 @@ export const Trade = {
                             sequence: item.sequence !== undefined ? {
                                 set: item.sequence
                             } : undefined,
-                            action: item.action !== undefined ? {
-                                set: item.action
-                            } : undefined,
-                            hedgeType: item.hedgeType !== undefined ? {
-                                set: item.hedgeType
-                            } : undefined,
-                            hedgePrice: item.hedgePrice !== undefined ? {
-                                set: item.hedgePrice
-                            } : undefined,
-                            buyPrice: item.buyPrice !== undefined ? {
-                                set: item.buyPrice
-                            } : undefined,
-                            sellPrice: item.sellPrice !== undefined ? {
-                                set: item.sellPrice
-                            } : undefined,
-                            qty: item.qty !== undefined ? {
-                                set: item.qty
-                            } : undefined,
-                            side: item.side !== undefined ? {
-                                set: item.side
-                            } : undefined,
                             type: item.type !== undefined ? {
                                 set: item.type
                             } : undefined,
-                            stopLoss: item.stopLoss !== undefined ? {
-                                set: item.stopLoss
-                            } : undefined,
-                            targetPrice: item.targetPrice !== undefined ? {
-                                set: item.targetPrice
+                            orderId: item.orderId !== undefined ? {
+                                set: item.orderId
                             } : undefined,
                             note: item.note !== undefined ? {
                                 set: item.note
                             } : undefined,
-                            executionTime: item.executionTime !== undefined ? {
-                                set: item.executionTime
-                            } : undefined,
                             status: item.status !== undefined ? {
                                 set: item.status
                             } : undefined,
                             fee: item.fee !== undefined ? {
                                 set: item.fee
                             } : undefined,
+                            order: item.order ? {
+                                upsert: {
+                                    where: {
+                                        id: item.order.id !== undefined ? {
+                                            equals: item.order.id
+                                        } : undefined,
+                                    },
+                                    update: {
+                                        id: item.order.id !== undefined ? {
+                                            set: item.order.id
+                                        } : undefined,
+                                        type: item.order.type !== undefined ? {
+                                            set: item.order.type
+                                        } : undefined,
+                                        side: item.order.side !== undefined ? {
+                                            set: item.order.side
+                                        } : undefined,
+                                        qty: item.order.qty !== undefined ? {
+                                            set: item.order.qty
+                                        } : undefined,
+                                        price: item.order.price !== undefined ? {
+                                            set: item.order.price
+                                        } : undefined,
+                                        status: item.order.status !== undefined ? {
+                                            set: item.order.status
+                                        } : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? {
+                                            set: item.order.executionTime
+                                        } : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                         create: {
                             sequence: item.sequence !== undefined ? item.sequence : undefined,
-                            action: item.action !== undefined ? item.action : undefined,
-                            hedgeType: item.hedgeType !== undefined ? item.hedgeType : undefined,
-                            hedgePrice: item.hedgePrice !== undefined ? item.hedgePrice : undefined,
-                            buyPrice: item.buyPrice !== undefined ? item.buyPrice : undefined,
-                            sellPrice: item.sellPrice !== undefined ? item.sellPrice : undefined,
-                            qty: item.qty !== undefined ? item.qty : undefined,
-                            side: item.side !== undefined ? item.side : undefined,
                             type: item.type !== undefined ? item.type : undefined,
-                            stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
-                            targetPrice: item.targetPrice !== undefined ? item.targetPrice : undefined,
+                            orderId: item.orderId !== undefined ? item.orderId : undefined,
                             note: item.note !== undefined ? item.note : undefined,
-                            executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                             status: item.status !== undefined ? item.status : undefined,
                             fee: item.fee !== undefined ? item.fee : undefined,
+                            order: item.order ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.order.id !== undefined ? item.order.id : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -2643,16 +2729,34 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -2708,6 +2812,8 @@ export const Trade = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -2767,25 +2873,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            hedgeType
-            hedgePrice
-            buyPrice
-            sellPrice
-            qty
-            side
-            type
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
       }
       }`;
@@ -2927,16 +3014,34 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -2992,6 +3097,8 @@ export const Trade = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -3051,25 +3158,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            hedgeType
-            hedgePrice
-            buyPrice
-            sellPrice
-            qty
-            side
-            type
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
         }
       }`;
@@ -3210,16 +3298,34 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -3275,6 +3381,8 @@ export const Trade = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -3334,25 +3442,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            hedgeType
-            hedgePrice
-            buyPrice
-            sellPrice
-            qty
-            side
-            type
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
       }
       }`;
@@ -3488,16 +3577,34 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -3553,6 +3660,8 @@ export const Trade = {
                 sharesOutstanding
                 dividendDate
                 exDividendDate
+                sellPrice
+                buyPrice
                 createdAt
                 updatedAt
                 trades {
@@ -3612,25 +3721,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            hedgeType
-            hedgePrice
-            buyPrice
-            sellPrice
-            qty
-            side
-            type
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
       }
       }`;