adaptic-backend 1.0.65 → 1.0.67

package/server/AlpacaAccount.mjs

@@ -173,6 +173,8 @@ export const AlpacaAccount = {
               sharesOutstanding
               dividendDate
               exDividendDate
+              sellPrice
+              buyPrice
               createdAt
               updatedAt
               trades {
@@ -182,16 +184,21 @@ export const AlpacaAccount = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -239,25 +246,19 @@ export const AlpacaAccount = {
             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 {
@@ -448,6 +449,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -458,18 +461,9 @@ export const AlpacaAccount = {
                                     },
                                     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,
                                     },
@@ -485,10 +479,26 @@ export const AlpacaAccount = {
                         },
                         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,
+                            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,
                             asset: item.asset ? {
                                 connectOrCreate: {
                                     where: {
@@ -550,6 +560,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -636,6 +648,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -880,6 +894,8 @@ export const AlpacaAccount = {
               sharesOutstanding
               dividendDate
               exDividendDate
+              sellPrice
+              buyPrice
               createdAt
               updatedAt
               trades {
@@ -889,16 +905,21 @@ export const AlpacaAccount = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -946,25 +967,19 @@ export const AlpacaAccount = {
             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 {
@@ -1496,6 +1511,12 @@ export const AlpacaAccount = {
                                         exDividendDate: item.asset.exDividendDate !== undefined ? {
                                             set: item.asset.exDividendDate
                                         } : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? {
+                                            set: item.asset.sellPrice
+                                        } : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? {
+                                            set: item.asset.buyPrice
+                                        } : undefined,
                                     },
                                     create: {
                                         symbol: item.asset.symbol !== undefined ? item.asset.symbol : undefined,
@@ -1551,6 +1572,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -1566,42 +1589,15 @@ export const AlpacaAccount = {
                                         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,
@@ -1611,18 +1607,9 @@ export const AlpacaAccount = {
                                     },
                                     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,
                                     },
@@ -1701,6 +1688,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -1711,18 +1700,9 @@ export const AlpacaAccount = {
                                     },
                                     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,
                                     },
@@ -1743,8 +1723,8 @@ export const AlpacaAccount = {
                             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
@@ -1755,6 +1735,49 @@ export const AlpacaAccount = {
                             status: item.status !== undefined ? {
                                 set: item.status
                             } : undefined,
+                            executionTime: item.executionTime !== undefined ? {
+                                set: item.executionTime
+                            } : 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,
                             asset: item.asset ? {
                                 upsert: {
                                     where: {
@@ -1931,6 +1954,12 @@ export const AlpacaAccount = {
                                         exDividendDate: item.asset.exDividendDate !== undefined ? {
                                             set: item.asset.exDividendDate
                                         } : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? {
+                                            set: item.asset.sellPrice
+                                        } : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? {
+                                            set: item.asset.buyPrice
+                                        } : undefined,
                                     },
                                     create: {
                                         symbol: item.asset.symbol !== undefined ? item.asset.symbol : undefined,
@@ -1986,16 +2015,34 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : 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,
+                            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,
                             asset: item.asset ? {
                                 connectOrCreate: {
                                     where: {
@@ -2057,6 +2104,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -2287,6 +2336,12 @@ export const AlpacaAccount = {
                                         exDividendDate: item.asset.exDividendDate !== undefined ? {
                                             set: item.asset.exDividendDate
                                         } : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? {
+                                            set: item.asset.sellPrice
+                                        } : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? {
+                                            set: item.asset.buyPrice
+                                        } : undefined,
                                     },
                                     create: {
                                         symbol: item.asset.symbol !== undefined ? item.asset.symbol : undefined,
@@ -2342,6 +2397,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -2421,6 +2478,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -2994,6 +3053,12 @@ export const AlpacaAccount = {
                                         exDividendDate: item.asset.exDividendDate !== undefined ? {
                                             set: item.asset.exDividendDate
                                         } : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? {
+                                            set: item.asset.sellPrice
+                                        } : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? {
+                                            set: item.asset.buyPrice
+                                        } : undefined,
                                     },
                                     create: {
                                         symbol: item.asset.symbol !== undefined ? item.asset.symbol : undefined,
@@ -3049,6 +3114,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -3064,42 +3131,15 @@ export const AlpacaAccount = {
                                         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,
@@ -3109,18 +3149,9 @@ export const AlpacaAccount = {
                                     },
                                     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,
                                     },
@@ -3199,6 +3230,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -3209,18 +3242,9 @@ export const AlpacaAccount = {
                                     },
                                     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,
                                     },
@@ -3241,8 +3265,8 @@ export const AlpacaAccount = {
                             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
@@ -3253,6 +3277,49 @@ export const AlpacaAccount = {
                             status: item.status !== undefined ? {
                                 set: item.status
                             } : undefined,
+                            executionTime: item.executionTime !== undefined ? {
+                                set: item.executionTime
+                            } : 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,
                             asset: item.asset ? {
                                 upsert: {
                                     where: {
@@ -3429,6 +3496,12 @@ export const AlpacaAccount = {
                                         exDividendDate: item.asset.exDividendDate !== undefined ? {
                                             set: item.asset.exDividendDate
                                         } : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? {
+                                            set: item.asset.sellPrice
+                                        } : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? {
+                                            set: item.asset.buyPrice
+                                        } : undefined,
                                     },
                                     create: {
                                         symbol: item.asset.symbol !== undefined ? item.asset.symbol : undefined,
@@ -3484,16 +3557,34 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : 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,
+                            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,
                             asset: item.asset ? {
                                 connectOrCreate: {
                                     where: {
@@ -3555,6 +3646,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -3785,6 +3878,12 @@ export const AlpacaAccount = {
                                         exDividendDate: item.asset.exDividendDate !== undefined ? {
                                             set: item.asset.exDividendDate
                                         } : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? {
+                                            set: item.asset.sellPrice
+                                        } : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? {
+                                            set: item.asset.buyPrice
+                                        } : undefined,
                                     },
                                     create: {
                                         symbol: item.asset.symbol !== undefined ? item.asset.symbol : undefined,
@@ -3840,6 +3939,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -3919,6 +4020,8 @@ export const AlpacaAccount = {
                                         sharesOutstanding: item.asset.sharesOutstanding !== undefined ? item.asset.sharesOutstanding : undefined,
                                         dividendDate: item.asset.dividendDate !== undefined ? item.asset.dividendDate : undefined,
                                         exDividendDate: item.asset.exDividendDate !== undefined ? item.asset.exDividendDate : undefined,
+                                        sellPrice: item.asset.sellPrice !== undefined ? item.asset.sellPrice : undefined,
+                                        buyPrice: item.asset.buyPrice !== undefined ? item.asset.buyPrice : undefined,
                                     },
                                 }
                             } : undefined,
@@ -4137,6 +4240,8 @@ export const AlpacaAccount = {
               sharesOutstanding
               dividendDate
               exDividendDate
+              sellPrice
+              buyPrice
               createdAt
               updatedAt
               trades {
@@ -4146,16 +4251,21 @@ export const AlpacaAccount = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -4203,25 +4313,19 @@ export const AlpacaAccount = {
             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 {
@@ -4433,6 +4537,8 @@ export const AlpacaAccount = {
               sharesOutstanding
               dividendDate
               exDividendDate
+              sellPrice
+              buyPrice
               createdAt
               updatedAt
               trades {
@@ -4442,16 +4548,21 @@ export const AlpacaAccount = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -4499,25 +4610,19 @@ export const AlpacaAccount = {
             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 {
@@ -4728,6 +4833,8 @@ export const AlpacaAccount = {
               sharesOutstanding
               dividendDate
               exDividendDate
+              sellPrice
+              buyPrice
               createdAt
               updatedAt
               trades {
@@ -4737,16 +4844,21 @@ export const AlpacaAccount = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -4794,25 +4906,19 @@ export const AlpacaAccount = {
             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 {
@@ -5018,6 +5124,8 @@ export const AlpacaAccount = {
               sharesOutstanding
               dividendDate
               exDividendDate
+              sellPrice
+              buyPrice
               createdAt
               updatedAt
               trades {
@@ -5027,16 +5135,21 @@ export const AlpacaAccount = {
                 id
                 alpacaAccountId
                 assetId
+                actionId
                 type
-                action
+                side
                 qty
                 price
                 status
                 createdAt
                 updatedAt
+                executionTime
                 alpacaAccount {
                   id
                 }
+                action {
+                  id
+                }
                 asset {
                   id
                 }
@@ -5084,25 +5197,19 @@ export const AlpacaAccount = {
             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 {