adaptic-backend 1.0.65 → 1.0.67

package/server/Asset.mjs

@@ -70,6 +70,8 @@ export const Asset = {
           sharesOutstanding
           dividendDate
           exDividendDate
+          sellPrice
+          buyPrice
           createdAt
           updatedAt
           trades {
@@ -134,16 +136,21 @@ export const Asset = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -191,25 +198,19 @@ export const Asset = {
             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 {
@@ -309,6 +310,8 @@ export const Asset = {
                 sharesOutstanding: props.sharesOutstanding !== undefined ? props.sharesOutstanding : undefined,
                 dividendDate: props.dividendDate !== undefined ? props.dividendDate : undefined,
                 exDividendDate: props.exDividendDate !== undefined ? props.exDividendDate : undefined,
+                sellPrice: props.sellPrice !== undefined ? props.sellPrice : undefined,
+                buyPrice: props.buyPrice !== undefined ? props.buyPrice : undefined,
                 trades: props.trades ? {
                     connectOrCreate: props.trades.map((item) => ({
                         where: {
@@ -346,18 +349,9 @@ export const Asset = {
                                     },
                                     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,
                                     },
@@ -373,10 +367,11 @@ export const Asset = {
                         },
                         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,
                             alpacaAccount: item.alpacaAccount ? {
                                 connectOrCreate: {
                                     where: {
@@ -391,6 +386,21 @@ export const Asset = {
                                     },
                                 }
                             } : undefined,
+                            action: item.action ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.action.id !== undefined ? item.action.id : undefined,
+                                    },
+                                    create: {
+                                        sequence: item.action.sequence !== undefined ? item.action.sequence : undefined,
+                                        type: item.action.type !== undefined ? item.action.type : undefined,
+                                        orderId: item.action.orderId !== undefined ? item.action.orderId : undefined,
+                                        note: item.action.note !== undefined ? item.action.note : undefined,
+                                        status: item.action.status !== undefined ? item.action.status : undefined,
+                                        fee: item.action.fee !== undefined ? item.action.fee : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -557,6 +567,8 @@ export const Asset = {
                 sharesOutstanding: prop.sharesOutstanding !== undefined ? prop.sharesOutstanding : undefined,
                 dividendDate: prop.dividendDate !== undefined ? prop.dividendDate : undefined,
                 exDividendDate: prop.exDividendDate !== undefined ? prop.exDividendDate : undefined,
+                sellPrice: prop.sellPrice !== undefined ? prop.sellPrice : undefined,
+                buyPrice: prop.buyPrice !== undefined ? prop.buyPrice : undefined,
             })),
         };
         const filteredVariables = removeUndefinedProps(variables);
@@ -640,6 +652,8 @@ export const Asset = {
           sharesOutstanding
           dividendDate
           exDividendDate
+          sellPrice
+          buyPrice
           createdAt
           updatedAt
           trades {
@@ -704,16 +718,21 @@ export const Asset = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -761,25 +780,19 @@ export const Asset = {
             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 {
@@ -992,6 +1005,12 @@ export const Asset = {
                 exDividendDate: props.exDividendDate !== undefined ? {
                     set: props.exDividendDate
                 } : undefined,
+                sellPrice: props.sellPrice !== undefined ? {
+                    set: props.sellPrice
+                } : undefined,
+                buyPrice: props.buyPrice !== undefined ? {
+                    set: props.buyPrice
+                } : undefined,
                 createdAt: props.createdAt !== undefined ? {
                     set: props.createdAt
                 } : undefined,
@@ -1085,42 +1104,15 @@ export const Asset = {
                                         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,
@@ -1130,18 +1122,9 @@ export const Asset = {
                                     },
                                     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,
                                     },
@@ -1180,18 +1163,9 @@ export const Asset = {
                                     },
                                     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,
                                     },
@@ -1212,8 +1186,8 @@ export const Asset = {
                             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
@@ -1224,6 +1198,9 @@ export const Asset = {
                             status: item.status !== undefined ? {
                                 set: item.status
                             } : undefined,
+                            executionTime: item.executionTime !== undefined ? {
+                                set: item.executionTime
+                            } : undefined,
                             alpacaAccount: item.alpacaAccount ? {
                                 upsert: {
                                     where: {
@@ -1260,13 +1237,54 @@ export const Asset = {
                                     },
                                 }
                             } : undefined,
+                            action: item.action ? {
+                                upsert: {
+                                    where: {
+                                        id: item.action.id !== undefined ? {
+                                            equals: item.action.id
+                                        } : undefined,
+                                    },
+                                    update: {
+                                        id: item.action.id !== undefined ? {
+                                            set: item.action.id
+                                        } : undefined,
+                                        sequence: item.action.sequence !== undefined ? {
+                                            set: item.action.sequence
+                                        } : undefined,
+                                        type: item.action.type !== undefined ? {
+                                            set: item.action.type
+                                        } : undefined,
+                                        orderId: item.action.orderId !== undefined ? {
+                                            set: item.action.orderId
+                                        } : undefined,
+                                        note: item.action.note !== undefined ? {
+                                            set: item.action.note
+                                        } : undefined,
+                                        status: item.action.status !== undefined ? {
+                                            set: item.action.status
+                                        } : undefined,
+                                        fee: item.action.fee !== undefined ? {
+                                            set: item.action.fee
+                                        } : undefined,
+                                    },
+                                    create: {
+                                        sequence: item.action.sequence !== undefined ? item.action.sequence : undefined,
+                                        type: item.action.type !== undefined ? item.action.type : undefined,
+                                        orderId: item.action.orderId !== undefined ? item.action.orderId : undefined,
+                                        note: item.action.note !== undefined ? item.action.note : undefined,
+                                        status: item.action.status !== undefined ? item.action.status : undefined,
+                                        fee: item.action.fee !== undefined ? item.action.fee : undefined,
+                                    },
+                                }
+                            } : 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,
                             alpacaAccount: item.alpacaAccount ? {
                                 connectOrCreate: {
                                     where: {
@@ -1281,6 +1299,21 @@ export const Asset = {
                                     },
                                 }
                             } : undefined,
+                            action: item.action ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.action.id !== undefined ? item.action.id : undefined,
+                                    },
+                                    create: {
+                                        sequence: item.action.sequence !== undefined ? item.action.sequence : undefined,
+                                        type: item.action.type !== undefined ? item.action.type : undefined,
+                                        orderId: item.action.orderId !== undefined ? item.action.orderId : undefined,
+                                        note: item.action.note !== undefined ? item.action.note : undefined,
+                                        status: item.action.status !== undefined ? item.action.status : undefined,
+                                        fee: item.action.fee !== undefined ? item.action.fee : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -1732,6 +1765,12 @@ export const Asset = {
                 exDividendDate: prop.exDividendDate !== undefined ? {
                     set: prop.exDividendDate
                 } : undefined,
+                sellPrice: prop.sellPrice !== undefined ? {
+                    set: prop.sellPrice
+                } : undefined,
+                buyPrice: prop.buyPrice !== undefined ? {
+                    set: prop.buyPrice
+                } : undefined,
                 createdAt: prop.createdAt !== undefined ? {
                     set: prop.createdAt
                 } : undefined,
@@ -1825,42 +1864,15 @@ export const Asset = {
                                         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,
@@ -1870,18 +1882,9 @@ export const Asset = {
                                     },
                                     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,
                                     },
@@ -1920,18 +1923,9 @@ export const Asset = {
                                     },
                                     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,
                                     },
@@ -1952,8 +1946,8 @@ export const Asset = {
                             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
@@ -1964,6 +1958,9 @@ export const Asset = {
                             status: item.status !== undefined ? {
                                 set: item.status
                             } : undefined,
+                            executionTime: item.executionTime !== undefined ? {
+                                set: item.executionTime
+                            } : undefined,
                             alpacaAccount: item.alpacaAccount ? {
                                 upsert: {
                                     where: {
@@ -2000,13 +1997,54 @@ export const Asset = {
                                     },
                                 }
                             } : undefined,
+                            action: item.action ? {
+                                upsert: {
+                                    where: {
+                                        id: item.action.id !== undefined ? {
+                                            equals: item.action.id
+                                        } : undefined,
+                                    },
+                                    update: {
+                                        id: item.action.id !== undefined ? {
+                                            set: item.action.id
+                                        } : undefined,
+                                        sequence: item.action.sequence !== undefined ? {
+                                            set: item.action.sequence
+                                        } : undefined,
+                                        type: item.action.type !== undefined ? {
+                                            set: item.action.type
+                                        } : undefined,
+                                        orderId: item.action.orderId !== undefined ? {
+                                            set: item.action.orderId
+                                        } : undefined,
+                                        note: item.action.note !== undefined ? {
+                                            set: item.action.note
+                                        } : undefined,
+                                        status: item.action.status !== undefined ? {
+                                            set: item.action.status
+                                        } : undefined,
+                                        fee: item.action.fee !== undefined ? {
+                                            set: item.action.fee
+                                        } : undefined,
+                                    },
+                                    create: {
+                                        sequence: item.action.sequence !== undefined ? item.action.sequence : undefined,
+                                        type: item.action.type !== undefined ? item.action.type : undefined,
+                                        orderId: item.action.orderId !== undefined ? item.action.orderId : undefined,
+                                        note: item.action.note !== undefined ? item.action.note : undefined,
+                                        status: item.action.status !== undefined ? item.action.status : undefined,
+                                        fee: item.action.fee !== undefined ? item.action.fee : undefined,
+                                    },
+                                }
+                            } : 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,
                             alpacaAccount: item.alpacaAccount ? {
                                 connectOrCreate: {
                                     where: {
@@ -2021,6 +2059,21 @@ export const Asset = {
                                     },
                                 }
                             } : undefined,
+                            action: item.action ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.action.id !== undefined ? item.action.id : undefined,
+                                    },
+                                    create: {
+                                        sequence: item.action.sequence !== undefined ? item.action.sequence : undefined,
+                                        type: item.action.type !== undefined ? item.action.type : undefined,
+                                        orderId: item.action.orderId !== undefined ? item.action.orderId : undefined,
+                                        note: item.action.note !== undefined ? item.action.note : undefined,
+                                        status: item.action.status !== undefined ? item.action.status : undefined,
+                                        fee: item.action.fee !== undefined ? item.action.fee : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -2354,6 +2407,8 @@ export const Asset = {
           sharesOutstanding
           dividendDate
           exDividendDate
+          sellPrice
+          buyPrice
           createdAt
           updatedAt
           trades {
@@ -2418,16 +2473,21 @@ export const Asset = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -2475,25 +2535,19 @@ export const Asset = {
             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 {
@@ -2623,6 +2677,8 @@ export const Asset = {
           sharesOutstanding
           dividendDate
           exDividendDate
+          sellPrice
+          buyPrice
           createdAt
           updatedAt
           trades {
@@ -2687,16 +2743,21 @@ export const Asset = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -2744,25 +2805,19 @@ export const Asset = {
             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 {
@@ -2893,6 +2948,8 @@ export const Asset = {
           sharesOutstanding
           dividendDate
           exDividendDate
+          sellPrice
+          buyPrice
           createdAt
           updatedAt
           trades {
@@ -2957,16 +3014,21 @@ export const Asset = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -3014,25 +3076,19 @@ export const Asset = {
             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 {
@@ -3156,6 +3212,8 @@ export const Asset = {
           sharesOutstanding
           dividendDate
           exDividendDate
+          sellPrice
+          buyPrice
           createdAt
           updatedAt
           trades {
@@ -3220,16 +3278,21 @@ export const Asset = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -3277,25 +3340,19 @@ export const Asset = {
             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 {