adaptic-backend 1.0.66 → 1.0.68

package/server/Trade.mjs

@@ -122,16 +122,35 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
+              stopLoss
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -204,6 +223,7 @@ export const Trade = {
                   id
                 }
               }
+              fee
             }
             positions {
               id
@@ -248,23 +268,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            qty
-            side
-            type
-            boughtPrice
-            soldPrice
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
         }
       }
@@ -321,10 +324,13 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -435,10 +441,13 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -488,18 +497,28 @@ export const Trade = {
                         },
                         create: {
                             sequence: item.sequence !== undefined ? item.sequence : undefined,
-                            action: item.action !== undefined ? item.action : undefined,
-                            qty: item.qty !== undefined ? item.qty : undefined,
-                            side: item.side !== undefined ? item.side : undefined,
                             type: item.type !== undefined ? item.type : undefined,
-                            boughtPrice: item.boughtPrice !== undefined ? item.boughtPrice : undefined,
-                            soldPrice: item.soldPrice !== undefined ? item.soldPrice : undefined,
-                            stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
-                            targetPrice: item.targetPrice !== undefined ? item.targetPrice : undefined,
+                            orderId: item.orderId !== undefined ? item.orderId : undefined,
                             note: item.note !== undefined ? item.note : undefined,
-                            executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                             status: item.status !== undefined ? item.status : undefined,
                             fee: item.fee !== undefined ? item.fee : undefined,
+                            order: item.order ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.order.id !== undefined ? item.order.id : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        stopLoss: item.order.stopLoss !== undefined ? item.order.stopLoss : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                        fee: item.order.fee !== undefined ? item.order.fee : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -684,16 +703,35 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
+              stopLoss
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -766,6 +804,7 @@ export const Trade = {
                   id
                 }
               }
+              fee
             }
             positions {
               id
@@ -810,23 +849,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            qty
-            side
-            type
-            boughtPrice
-            soldPrice
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
       }
       }`;
@@ -970,8 +992,8 @@ export const Trade = {
                                         type: item.type !== undefined ? {
                                             set: item.type
                                         } : undefined,
-                                        action: item.action !== undefined ? {
-                                            set: item.action
+                                        side: item.side !== undefined ? {
+                                            set: item.side
                                         } : undefined,
                                         qty: item.qty !== undefined ? {
                                             set: item.qty
@@ -979,16 +1001,28 @@ export const Trade = {
                                         price: item.price !== undefined ? {
                                             set: item.price
                                         } : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? {
+                                            set: item.stopLoss
+                                        } : undefined,
                                         status: item.status !== undefined ? {
                                             set: item.status
                                         } : undefined,
+                                        executionTime: item.executionTime !== undefined ? {
+                                            set: item.executionTime
+                                        } : undefined,
+                                        fee: item.fee !== undefined ? {
+                                            set: item.fee
+                                        } : 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,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1120,10 +1154,13 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1358,8 +1395,8 @@ export const Trade = {
                                         type: item.type !== undefined ? {
                                             set: item.type
                                         } : undefined,
-                                        action: item.action !== undefined ? {
-                                            set: item.action
+                                        side: item.side !== undefined ? {
+                                            set: item.side
                                         } : undefined,
                                         qty: item.qty !== undefined ? {
                                             set: item.qty
@@ -1367,16 +1404,28 @@ export const Trade = {
                                         price: item.price !== undefined ? {
                                             set: item.price
                                         } : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? {
+                                            set: item.stopLoss
+                                        } : undefined,
                                         status: item.status !== undefined ? {
                                             set: item.status
                                         } : undefined,
+                                        executionTime: item.executionTime !== undefined ? {
+                                            set: item.executionTime
+                                        } : undefined,
+                                        fee: item.fee !== undefined ? {
+                                            set: item.fee
+                                        } : 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,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1541,10 +1590,13 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1599,57 +1651,94 @@ export const Trade = {
                             sequence: item.sequence !== undefined ? {
                                 set: item.sequence
                             } : undefined,
-                            action: item.action !== undefined ? {
-                                set: item.action
-                            } : 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,
-                            boughtPrice: item.boughtPrice !== undefined ? {
-                                set: item.boughtPrice
-                            } : undefined,
-                            soldPrice: item.soldPrice !== undefined ? {
-                                set: item.soldPrice
-                            } : undefined,
-                            stopLoss: item.stopLoss !== undefined ? {
-                                set: item.stopLoss
-                            } : undefined,
-                            targetPrice: item.targetPrice !== undefined ? {
-                                set: item.targetPrice
+                            orderId: item.orderId !== undefined ? {
+                                set: item.orderId
                             } : undefined,
                             note: item.note !== undefined ? {
                                 set: item.note
                             } : undefined,
-                            executionTime: item.executionTime !== undefined ? {
-                                set: item.executionTime
-                            } : undefined,
                             status: item.status !== undefined ? {
                                 set: item.status
                             } : undefined,
                             fee: item.fee !== undefined ? {
                                 set: item.fee
                             } : undefined,
+                            order: item.order ? {
+                                upsert: {
+                                    where: {
+                                        id: item.order.id !== undefined ? {
+                                            equals: item.order.id
+                                        } : undefined,
+                                    },
+                                    update: {
+                                        id: item.order.id !== undefined ? {
+                                            set: item.order.id
+                                        } : undefined,
+                                        type: item.order.type !== undefined ? {
+                                            set: item.order.type
+                                        } : undefined,
+                                        side: item.order.side !== undefined ? {
+                                            set: item.order.side
+                                        } : undefined,
+                                        qty: item.order.qty !== undefined ? {
+                                            set: item.order.qty
+                                        } : undefined,
+                                        price: item.order.price !== undefined ? {
+                                            set: item.order.price
+                                        } : undefined,
+                                        stopLoss: item.order.stopLoss !== undefined ? {
+                                            set: item.order.stopLoss
+                                        } : undefined,
+                                        status: item.order.status !== undefined ? {
+                                            set: item.order.status
+                                        } : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? {
+                                            set: item.order.executionTime
+                                        } : undefined,
+                                        fee: item.order.fee !== undefined ? {
+                                            set: item.order.fee
+                                        } : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        stopLoss: item.order.stopLoss !== undefined ? item.order.stopLoss : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                        fee: item.order.fee !== undefined ? item.order.fee : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                         create: {
                             sequence: item.sequence !== undefined ? item.sequence : undefined,
-                            action: item.action !== undefined ? item.action : undefined,
-                            qty: item.qty !== undefined ? item.qty : undefined,
-                            side: item.side !== undefined ? item.side : undefined,
                             type: item.type !== undefined ? item.type : undefined,
-                            boughtPrice: item.boughtPrice !== undefined ? item.boughtPrice : undefined,
-                            soldPrice: item.soldPrice !== undefined ? item.soldPrice : undefined,
-                            stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
-                            targetPrice: item.targetPrice !== undefined ? item.targetPrice : undefined,
+                            orderId: item.orderId !== undefined ? item.orderId : undefined,
                             note: item.note !== undefined ? item.note : undefined,
-                            executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                             status: item.status !== undefined ? item.status : undefined,
                             fee: item.fee !== undefined ? item.fee : undefined,
+                            order: item.order ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.order.id !== undefined ? item.order.id : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        stopLoss: item.order.stopLoss !== undefined ? item.order.stopLoss : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                        fee: item.order.fee !== undefined ? item.order.fee : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -1825,8 +1914,8 @@ export const Trade = {
                                         type: item.type !== undefined ? {
                                             set: item.type
                                         } : undefined,
-                                        action: item.action !== undefined ? {
-                                            set: item.action
+                                        side: item.side !== undefined ? {
+                                            set: item.side
                                         } : undefined,
                                         qty: item.qty !== undefined ? {
                                             set: item.qty
@@ -1834,16 +1923,28 @@ export const Trade = {
                                         price: item.price !== undefined ? {
                                             set: item.price
                                         } : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? {
+                                            set: item.stopLoss
+                                        } : undefined,
                                         status: item.status !== undefined ? {
                                             set: item.status
                                         } : undefined,
+                                        executionTime: item.executionTime !== undefined ? {
+                                            set: item.executionTime
+                                        } : undefined,
+                                        fee: item.fee !== undefined ? {
+                                            set: item.fee
+                                        } : 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,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -1975,10 +2076,13 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -2213,8 +2317,8 @@ export const Trade = {
                                         type: item.type !== undefined ? {
                                             set: item.type
                                         } : undefined,
-                                        action: item.action !== undefined ? {
-                                            set: item.action
+                                        side: item.side !== undefined ? {
+                                            set: item.side
                                         } : undefined,
                                         qty: item.qty !== undefined ? {
                                             set: item.qty
@@ -2222,16 +2326,28 @@ export const Trade = {
                                         price: item.price !== undefined ? {
                                             set: item.price
                                         } : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? {
+                                            set: item.stopLoss
+                                        } : undefined,
                                         status: item.status !== undefined ? {
                                             set: item.status
                                         } : undefined,
+                                        executionTime: item.executionTime !== undefined ? {
+                                            set: item.executionTime
+                                        } : undefined,
+                                        fee: item.fee !== undefined ? {
+                                            set: item.fee
+                                        } : 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,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -2396,10 +2512,13 @@ export const Trade = {
                                     },
                                     create: {
                                         type: item.type !== undefined ? item.type : undefined,
-                                        action: item.action !== undefined ? item.action : undefined,
+                                        side: item.side !== undefined ? item.side : undefined,
                                         qty: item.qty !== undefined ? item.qty : undefined,
                                         price: item.price !== undefined ? item.price : undefined,
+                                        stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
                                         status: item.status !== undefined ? item.status : undefined,
+                                        executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
+                                        fee: item.fee !== undefined ? item.fee : undefined,
                                     },
                                 }))
                             } : undefined,
@@ -2454,57 +2573,94 @@ export const Trade = {
                             sequence: item.sequence !== undefined ? {
                                 set: item.sequence
                             } : undefined,
-                            action: item.action !== undefined ? {
-                                set: item.action
-                            } : 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,
-                            boughtPrice: item.boughtPrice !== undefined ? {
-                                set: item.boughtPrice
-                            } : undefined,
-                            soldPrice: item.soldPrice !== undefined ? {
-                                set: item.soldPrice
-                            } : undefined,
-                            stopLoss: item.stopLoss !== undefined ? {
-                                set: item.stopLoss
-                            } : undefined,
-                            targetPrice: item.targetPrice !== undefined ? {
-                                set: item.targetPrice
+                            orderId: item.orderId !== undefined ? {
+                                set: item.orderId
                             } : undefined,
                             note: item.note !== undefined ? {
                                 set: item.note
                             } : undefined,
-                            executionTime: item.executionTime !== undefined ? {
-                                set: item.executionTime
-                            } : undefined,
                             status: item.status !== undefined ? {
                                 set: item.status
                             } : undefined,
                             fee: item.fee !== undefined ? {
                                 set: item.fee
                             } : undefined,
+                            order: item.order ? {
+                                upsert: {
+                                    where: {
+                                        id: item.order.id !== undefined ? {
+                                            equals: item.order.id
+                                        } : undefined,
+                                    },
+                                    update: {
+                                        id: item.order.id !== undefined ? {
+                                            set: item.order.id
+                                        } : undefined,
+                                        type: item.order.type !== undefined ? {
+                                            set: item.order.type
+                                        } : undefined,
+                                        side: item.order.side !== undefined ? {
+                                            set: item.order.side
+                                        } : undefined,
+                                        qty: item.order.qty !== undefined ? {
+                                            set: item.order.qty
+                                        } : undefined,
+                                        price: item.order.price !== undefined ? {
+                                            set: item.order.price
+                                        } : undefined,
+                                        stopLoss: item.order.stopLoss !== undefined ? {
+                                            set: item.order.stopLoss
+                                        } : undefined,
+                                        status: item.order.status !== undefined ? {
+                                            set: item.order.status
+                                        } : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? {
+                                            set: item.order.executionTime
+                                        } : undefined,
+                                        fee: item.order.fee !== undefined ? {
+                                            set: item.order.fee
+                                        } : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        stopLoss: item.order.stopLoss !== undefined ? item.order.stopLoss : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                        fee: item.order.fee !== undefined ? item.order.fee : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                         create: {
                             sequence: item.sequence !== undefined ? item.sequence : undefined,
-                            action: item.action !== undefined ? item.action : undefined,
-                            qty: item.qty !== undefined ? item.qty : undefined,
-                            side: item.side !== undefined ? item.side : undefined,
                             type: item.type !== undefined ? item.type : undefined,
-                            boughtPrice: item.boughtPrice !== undefined ? item.boughtPrice : undefined,
-                            soldPrice: item.soldPrice !== undefined ? item.soldPrice : undefined,
-                            stopLoss: item.stopLoss !== undefined ? item.stopLoss : undefined,
-                            targetPrice: item.targetPrice !== undefined ? item.targetPrice : undefined,
+                            orderId: item.orderId !== undefined ? item.orderId : undefined,
                             note: item.note !== undefined ? item.note : undefined,
-                            executionTime: item.executionTime !== undefined ? item.executionTime : undefined,
                             status: item.status !== undefined ? item.status : undefined,
                             fee: item.fee !== undefined ? item.fee : undefined,
+                            order: item.order ? {
+                                connectOrCreate: {
+                                    where: {
+                                        id: item.order.id !== undefined ? item.order.id : undefined,
+                                    },
+                                    create: {
+                                        type: item.order.type !== undefined ? item.order.type : undefined,
+                                        side: item.order.side !== undefined ? item.order.side : undefined,
+                                        qty: item.order.qty !== undefined ? item.order.qty : undefined,
+                                        price: item.order.price !== undefined ? item.order.price : undefined,
+                                        stopLoss: item.order.stopLoss !== undefined ? item.order.stopLoss : undefined,
+                                        status: item.order.status !== undefined ? item.order.status : undefined,
+                                        executionTime: item.order.executionTime !== undefined ? item.order.executionTime : undefined,
+                                        fee: item.order.fee !== undefined ? item.order.fee : undefined,
+                                    },
+                                }
+                            } : undefined,
                         },
                     }))
                 } : undefined,
@@ -2643,16 +2799,35 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
+              stopLoss
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -2725,6 +2900,7 @@ export const Trade = {
                   id
                 }
               }
+              fee
             }
             positions {
               id
@@ -2769,23 +2945,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            qty
-            side
-            type
-            boughtPrice
-            soldPrice
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
       }
       }`;
@@ -2927,16 +3086,35 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
+              stopLoss
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -3009,6 +3187,7 @@ export const Trade = {
                   id
                 }
               }
+              fee
             }
             positions {
               id
@@ -3053,23 +3232,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            qty
-            side
-            type
-            boughtPrice
-            soldPrice
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
         }
       }`;
@@ -3210,16 +3372,35 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
+              stopLoss
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -3292,6 +3473,7 @@ export const Trade = {
                   id
                 }
               }
+              fee
             }
             positions {
               id
@@ -3336,23 +3518,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            qty
-            side
-            type
-            boughtPrice
-            soldPrice
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
       }
       }`;
@@ -3488,16 +3653,35 @@ export const Trade = {
               id
               alpacaAccountId
               assetId
+              actionId
               type
-              action
+              side
               qty
               price
+              stopLoss
               status
               createdAt
               updatedAt
+              executionTime
               alpacaAccount {
                 id
               }
+              action {
+                id
+                sequence
+                tradeId
+                type
+                orderId
+                note
+                status
+                fee
+                trade {
+                  id
+                }
+                order {
+                  id
+                }
+              }
               asset {
                 id
                 symbol
@@ -3570,6 +3754,7 @@ export const Trade = {
                   id
                 }
               }
+              fee
             }
             positions {
               id
@@ -3614,23 +3799,6 @@ export const Trade = {
           optionContractType
           actions {
             id
-            tradeId
-            sequence
-            action
-            qty
-            side
-            type
-            boughtPrice
-            soldPrice
-            stopLoss
-            targetPrice
-            note
-            executionTime
-            status
-            fee
-            trade {
-              id
-            }
           }
       }
       }`;