npm - adaptic-backend - Versions diffs - 1.0.307 → 1.0.308 - Mend

adaptic-backend 1.0.307 → 1.0.308

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (607) hide show

package/esm/Trade.mjs CHANGED Viewed

@@ -175,6 +175,7 @@ export const Trade = {
                                                     },
                                                     create: {
                                                         clientOrderId: item.order.clientOrderId !== undefined ? item.order.clientOrderId : undefined,
+                                                        alpacaAccountId: item.order.alpacaAccountId !== undefined ? item.order.alpacaAccountId : undefined,
                                                         qty: item.order.qty !== undefined ? item.order.qty : undefined,
                                                         notional: item.order.notional !== undefined ? item.order.notional : undefined,
                                                         side: item.order.side !== undefined ? item.order.side : undefined,
@@ -245,36 +246,6 @@ export const Trade = {
                                                                         },
                                                                     }
                                                                 } : undefined,
-                                                        alpacaAccount: item.order.alpacaAccount ?
-                                                            typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && Object.keys(item.order.alpacaAccount)[0] === 'id'
-                                                                ? { connect: {
-                                                                        id: item.order.alpacaAccount.id
-                                                                    }
-                                                                }
-                                                                : { connectOrCreate: {
-                                                                        where: {
-                                                                            id: item.order.alpacaAccount.id !== undefined ? item.order.alpacaAccount.id : undefined,
-                                                                            userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                                equals: item.order.alpacaAccount.userId
-                                                                            } : undefined,
-                                                                        },
-                                                                        create: {
-                                                                            type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                            APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                            APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                            configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                            marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                            realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                            tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                            minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                            volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                            enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                            portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                            portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                            reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                        },
-                                                                    }
-                                                                } : undefined,
                                                         contract: item.order.contract ?
                                                             typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && Object.keys(item.order.contract)[0] === 'id'
                                                                 ? { connect: {
@@ -549,6 +520,9 @@ export const Trade = {
                                                 clientOrderId: item.order.clientOrderId !== undefined ? {
                                                     set: item.order.clientOrderId
                                                 } : undefined,
+                                                alpacaAccountId: item.order.alpacaAccountId !== undefined ? {
+                                                    set: item.order.alpacaAccountId
+                                                } : undefined,
                                                 qty: item.order.qty !== undefined ? {
                                                     set: item.order.qty
                                                 } : undefined,
@@ -721,82 +695,6 @@ export const Trade = {
                                                             },
                                                         }
                                                     } : undefined,
-                                                alpacaAccount: item.order.alpacaAccount ?
-                                                    typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && (Object.keys(item.order.alpacaAccount)[0] === 'id' || Object.keys(item.order.alpacaAccount)[0] === 'symbol')
-                                                        ? {
-                                                            connect: {
-                                                                id: item.order.alpacaAccount.id
-                                                            }
-                                                        } : { upsert: {
-                                                            where: {
-                                                                id: item.order.alpacaAccount.id !== undefined ? {
-                                                                    equals: item.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                    equals: item.order.alpacaAccount.userId
-                                                                } : undefined,
-                                                            },
-                                                            update: {
-                                                                id: item.order.alpacaAccount.id !== undefined ? {
-                                                                    set: item.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                type: item.order.alpacaAccount.type !== undefined ? {
-                                                                    set: item.order.alpacaAccount.type
-                                                                } : undefined,
-                                                                APIKey: item.order.alpacaAccount.APIKey !== undefined ? {
-                                                                    set: item.order.alpacaAccount.APIKey
-                                                                } : undefined,
-                                                                APISecret: item.order.alpacaAccount.APISecret !== undefined ? {
-                                                                    set: item.order.alpacaAccount.APISecret
-                                                                } : undefined,
-                                                                configuration: item.order.alpacaAccount.configuration !== undefined ? {
-                                                                    set: item.order.alpacaAccount.configuration
-                                                                } : undefined,
-                                                                marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? {
-                                                                    set: item.order.alpacaAccount.marketOpen
-                                                                } : undefined,
-                                                                realTime: item.order.alpacaAccount.realTime !== undefined ? {
-                                                                    set: item.order.alpacaAccount.realTime
-                                                                } : undefined,
-                                                                tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? {
-                                                                    set: item.order.alpacaAccount.tradeAllocationPct
-                                                                } : undefined,
-                                                                minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? {
-                                                                    set: item.order.alpacaAccount.minPercentageChange
-                                                                } : undefined,
-                                                                volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? {
-                                                                    set: item.order.alpacaAccount.volumeThreshold
-                                                                } : undefined,
-                                                                enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? {
-                                                                    set: item.order.alpacaAccount.enablePortfolioTrailingStop
-                                                                } : undefined,
-                                                                portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.portfolioTrailPercent
-                                                                } : undefined,
-                                                                portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.portfolioProfitThresholdPercent
-                                                                } : undefined,
-                                                                reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.reducedPortfolioTrailPercent
-                                                                } : undefined,
-                                                            },
-                                                            create: {
-                                                                type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                            },
-                                                        }
-                                                    } : undefined,
                                                 contract: item.order.contract ?
                                                     typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && (Object.keys(item.order.contract)[0] === 'id' || Object.keys(item.order.contract)[0] === 'symbol')
                                                         ? {
@@ -916,6 +814,7 @@ export const Trade = {
                                             },
                                             create: {
                                                 clientOrderId: item.order.clientOrderId !== undefined ? item.order.clientOrderId : undefined,
+                                                alpacaAccountId: item.order.alpacaAccountId !== undefined ? item.order.alpacaAccountId : undefined,
                                                 qty: item.order.qty !== undefined ? item.order.qty : undefined,
                                                 notional: item.order.notional !== undefined ? item.order.notional : undefined,
                                                 side: item.order.side !== undefined ? item.order.side : undefined,
@@ -986,36 +885,6 @@ export const Trade = {
                                                                 },
                                                             }
                                                         } : undefined,
-                                                alpacaAccount: item.order.alpacaAccount ?
-                                                    typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && Object.keys(item.order.alpacaAccount)[0] === 'id'
-                                                        ? { connect: {
-                                                                id: item.order.alpacaAccount.id
-                                                            }
-                                                        }
-                                                        : { connectOrCreate: {
-                                                                where: {
-                                                                    id: item.order.alpacaAccount.id !== undefined ? item.order.alpacaAccount.id : undefined,
-                                                                    userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                        equals: item.order.alpacaAccount.userId
-                                                                    } : undefined,
-                                                                },
-                                                                create: {
-                                                                    type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                    APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                    APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                    configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                    marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                    realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                    tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                    minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                    volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                    enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                    portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                    portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                    reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                },
-                                                            }
-                                                        } : undefined,
                                                 contract: item.order.contract ?
                                                     typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && Object.keys(item.order.contract)[0] === 'id'
                                                         ? { connect: {
@@ -1091,6 +960,7 @@ export const Trade = {
                                                 },
                                                 create: {
                                                     clientOrderId: item.order.clientOrderId !== undefined ? item.order.clientOrderId : undefined,
+                                                    alpacaAccountId: item.order.alpacaAccountId !== undefined ? item.order.alpacaAccountId : undefined,
                                                     qty: item.order.qty !== undefined ? item.order.qty : undefined,
                                                     notional: item.order.notional !== undefined ? item.order.notional : undefined,
                                                     side: item.order.side !== undefined ? item.order.side : undefined,
@@ -1161,36 +1031,6 @@ export const Trade = {
                                                                     },
                                                                 }
                                                             } : undefined,
-                                                    alpacaAccount: item.order.alpacaAccount ?
-                                                        typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && Object.keys(item.order.alpacaAccount)[0] === 'id'
-                                                            ? { connect: {
-                                                                    id: item.order.alpacaAccount.id
-                                                                }
-                                                            }
-                                                            : { connectOrCreate: {
-                                                                    where: {
-                                                                        id: item.order.alpacaAccount.id !== undefined ? item.order.alpacaAccount.id : undefined,
-                                                                        userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                            equals: item.order.alpacaAccount.userId
-                                                                        } : undefined,
-                                                                    },
-                                                                    create: {
-                                                                        type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                        APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                        APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                        configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                        marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                        realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                        tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                        minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                        volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                        enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                        portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                        portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                        reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                    },
-                                                                }
-                                                            } : undefined,
                                                     contract: item.order.contract ?
                                                         typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && Object.keys(item.order.contract)[0] === 'id'
                                                             ? { connect: {
@@ -1344,6 +1184,7 @@ export const Trade = {
                                                     },
                                                     create: {
                                                         clientOrderId: item.order.clientOrderId !== undefined ? item.order.clientOrderId : undefined,
+                                                        alpacaAccountId: item.order.alpacaAccountId !== undefined ? item.order.alpacaAccountId : undefined,
                                                         qty: item.order.qty !== undefined ? item.order.qty : undefined,
                                                         notional: item.order.notional !== undefined ? item.order.notional : undefined,
                                                         side: item.order.side !== undefined ? item.order.side : undefined,
@@ -1414,36 +1255,6 @@ export const Trade = {
                                                                         },
                                                                     }
                                                                 } : undefined,
-                                                        alpacaAccount: item.order.alpacaAccount ?
-                                                            typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && Object.keys(item.order.alpacaAccount)[0] === 'id'
-                                                                ? { connect: {
-                                                                        id: item.order.alpacaAccount.id
-                                                                    }
-                                                                }
-                                                                : { connectOrCreate: {
-                                                                        where: {
-                                                                            id: item.order.alpacaAccount.id !== undefined ? item.order.alpacaAccount.id : undefined,
-                                                                            userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                                equals: item.order.alpacaAccount.userId
-                                                                            } : undefined,
-                                                                        },
-                                                                        create: {
-                                                                            type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                            APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                            APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                            configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                            marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                            realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                            tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                            minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                            volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                            enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                            portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                            portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                            reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                        },
-                                                                    }
-                                                                } : undefined,
                                                         contract: item.order.contract ?
                                                             typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && Object.keys(item.order.contract)[0] === 'id'
                                                                 ? { connect: {
@@ -1607,6 +1418,9 @@ export const Trade = {
                                                 clientOrderId: item.order.clientOrderId !== undefined ? {
                                                     set: item.order.clientOrderId
                                                 } : undefined,
+                                                alpacaAccountId: item.order.alpacaAccountId !== undefined ? {
+                                                    set: item.order.alpacaAccountId
+                                                } : undefined,
                                                 qty: item.order.qty !== undefined ? {
                                                     set: item.order.qty
                                                 } : undefined,
@@ -1779,82 +1593,6 @@ export const Trade = {
                                                             },
                                                         }
                                                     } : undefined,
-                                                alpacaAccount: item.order.alpacaAccount ?
-                                                    typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && (Object.keys(item.order.alpacaAccount)[0] === 'id' || Object.keys(item.order.alpacaAccount)[0] === 'symbol')
-                                                        ? {
-                                                            connect: {
-                                                                id: item.order.alpacaAccount.id
-                                                            }
-                                                        } : { upsert: {
-                                                            where: {
-                                                                id: item.order.alpacaAccount.id !== undefined ? {
-                                                                    equals: item.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                    equals: item.order.alpacaAccount.userId
-                                                                } : undefined,
-                                                            },
-                                                            update: {
-                                                                id: item.order.alpacaAccount.id !== undefined ? {
-                                                                    set: item.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                type: item.order.alpacaAccount.type !== undefined ? {
-                                                                    set: item.order.alpacaAccount.type
-                                                                } : undefined,
-                                                                APIKey: item.order.alpacaAccount.APIKey !== undefined ? {
-                                                                    set: item.order.alpacaAccount.APIKey
-                                                                } : undefined,
-                                                                APISecret: item.order.alpacaAccount.APISecret !== undefined ? {
-                                                                    set: item.order.alpacaAccount.APISecret
-                                                                } : undefined,
-                                                                configuration: item.order.alpacaAccount.configuration !== undefined ? {
-                                                                    set: item.order.alpacaAccount.configuration
-                                                                } : undefined,
-                                                                marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? {
-                                                                    set: item.order.alpacaAccount.marketOpen
-                                                                } : undefined,
-                                                                realTime: item.order.alpacaAccount.realTime !== undefined ? {
-                                                                    set: item.order.alpacaAccount.realTime
-                                                                } : undefined,
-                                                                tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? {
-                                                                    set: item.order.alpacaAccount.tradeAllocationPct
-                                                                } : undefined,
-                                                                minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? {
-                                                                    set: item.order.alpacaAccount.minPercentageChange
-                                                                } : undefined,
-                                                                volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? {
-                                                                    set: item.order.alpacaAccount.volumeThreshold
-                                                                } : undefined,
-                                                                enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? {
-                                                                    set: item.order.alpacaAccount.enablePortfolioTrailingStop
-                                                                } : undefined,
-                                                                portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.portfolioTrailPercent
-                                                                } : undefined,
-                                                                portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.portfolioProfitThresholdPercent
-                                                                } : undefined,
-                                                                reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.reducedPortfolioTrailPercent
-                                                                } : undefined,
-                                                            },
-                                                            create: {
-                                                                type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                            },
-                                                        }
-                                                    } : undefined,
                                                 contract: item.order.contract ?
                                                     typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && (Object.keys(item.order.contract)[0] === 'id' || Object.keys(item.order.contract)[0] === 'symbol')
                                                         ? {
@@ -1974,6 +1712,7 @@ export const Trade = {
                                             },
                                             create: {
                                                 clientOrderId: item.order.clientOrderId !== undefined ? item.order.clientOrderId : undefined,
+                                                alpacaAccountId: item.order.alpacaAccountId !== undefined ? item.order.alpacaAccountId : undefined,
                                                 qty: item.order.qty !== undefined ? item.order.qty : undefined,
                                                 notional: item.order.notional !== undefined ? item.order.notional : undefined,
                                                 side: item.order.side !== undefined ? item.order.side : undefined,
@@ -2044,36 +1783,6 @@ export const Trade = {
                                                                 },
                                                             }
                                                         } : undefined,
-                                                alpacaAccount: item.order.alpacaAccount ?
-                                                    typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && Object.keys(item.order.alpacaAccount)[0] === 'id'
-                                                        ? { connect: {
-                                                                id: item.order.alpacaAccount.id
-                                                            }
-                                                        }
-                                                        : { connectOrCreate: {
-                                                                where: {
-                                                                    id: item.order.alpacaAccount.id !== undefined ? item.order.alpacaAccount.id : undefined,
-                                                                    userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                        equals: item.order.alpacaAccount.userId
-                                                                    } : undefined,
-                                                                },
-                                                                create: {
-                                                                    type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                    APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                    APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                    configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                    marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                    realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                    tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                    minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                    volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                    enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                    portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                    portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                    reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                },
-                                                            }
-                                                        } : undefined,
                                                 contract: item.order.contract ?
                                                     typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && Object.keys(item.order.contract)[0] === 'id'
                                                         ? { connect: {
@@ -2149,6 +1858,7 @@ export const Trade = {
                                                 },
                                                 create: {
                                                     clientOrderId: item.order.clientOrderId !== undefined ? item.order.clientOrderId : undefined,
+                                                    alpacaAccountId: item.order.alpacaAccountId !== undefined ? item.order.alpacaAccountId : undefined,
                                                     qty: item.order.qty !== undefined ? item.order.qty : undefined,
                                                     notional: item.order.notional !== undefined ? item.order.notional : undefined,
                                                     side: item.order.side !== undefined ? item.order.side : undefined,
@@ -2219,36 +1929,6 @@ export const Trade = {
                                                                     },
                                                                 }
                                                             } : undefined,
-                                                    alpacaAccount: item.order.alpacaAccount ?
-                                                        typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && Object.keys(item.order.alpacaAccount)[0] === 'id'
-                                                            ? { connect: {
-                                                                    id: item.order.alpacaAccount.id
-                                                                }
-                                                            }
-                                                            : { connectOrCreate: {
-                                                                    where: {
-                                                                        id: item.order.alpacaAccount.id !== undefined ? item.order.alpacaAccount.id : undefined,
-                                                                        userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                            equals: item.order.alpacaAccount.userId
-                                                                        } : undefined,
-                                                                    },
-                                                                    create: {
-                                                                        type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                        APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                        APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                        configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                        marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                        realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                        tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                        minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                        volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                        enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                        portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                        portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                        reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                    },
-                                                                }
-                                                            } : undefined,
                                                     contract: item.order.contract ?
                                                         typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && Object.keys(item.order.contract)[0] === 'id'
                                                             ? { connect: {
@@ -2469,6 +2149,9 @@ export const Trade = {
                                                 clientOrderId: item.order.clientOrderId !== undefined ? {
                                                     set: item.order.clientOrderId
                                                 } : undefined,
+                                                alpacaAccountId: item.order.alpacaAccountId !== undefined ? {
+                                                    set: item.order.alpacaAccountId
+                                                } : undefined,
                                                 qty: item.order.qty !== undefined ? {
                                                     set: item.order.qty
                                                 } : undefined,
@@ -2641,82 +2324,6 @@ export const Trade = {
                                                             },
                                                         }
                                                     } : undefined,
-                                                alpacaAccount: item.order.alpacaAccount ?
-                                                    typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && (Object.keys(item.order.alpacaAccount)[0] === 'id' || Object.keys(item.order.alpacaAccount)[0] === 'symbol')
-                                                        ? {
-                                                            connect: {
-                                                                id: item.order.alpacaAccount.id
-                                                            }
-                                                        } : { upsert: {
-                                                            where: {
-                                                                id: item.order.alpacaAccount.id !== undefined ? {
-                                                                    equals: item.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                    equals: item.order.alpacaAccount.userId
-                                                                } : undefined,
-                                                            },
-                                                            update: {
-                                                                id: item.order.alpacaAccount.id !== undefined ? {
-                                                                    set: item.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                type: item.order.alpacaAccount.type !== undefined ? {
-                                                                    set: item.order.alpacaAccount.type
-                                                                } : undefined,
-                                                                APIKey: item.order.alpacaAccount.APIKey !== undefined ? {
-                                                                    set: item.order.alpacaAccount.APIKey
-                                                                } : undefined,
-                                                                APISecret: item.order.alpacaAccount.APISecret !== undefined ? {
-                                                                    set: item.order.alpacaAccount.APISecret
-                                                                } : undefined,
-                                                                configuration: item.order.alpacaAccount.configuration !== undefined ? {
-                                                                    set: item.order.alpacaAccount.configuration
-                                                                } : undefined,
-                                                                marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? {
-                                                                    set: item.order.alpacaAccount.marketOpen
-                                                                } : undefined,
-                                                                realTime: item.order.alpacaAccount.realTime !== undefined ? {
-                                                                    set: item.order.alpacaAccount.realTime
-                                                                } : undefined,
-                                                                tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? {
-                                                                    set: item.order.alpacaAccount.tradeAllocationPct
-                                                                } : undefined,
-                                                                minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? {
-                                                                    set: item.order.alpacaAccount.minPercentageChange
-                                                                } : undefined,
-                                                                volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? {
-                                                                    set: item.order.alpacaAccount.volumeThreshold
-                                                                } : undefined,
-                                                                enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? {
-                                                                    set: item.order.alpacaAccount.enablePortfolioTrailingStop
-                                                                } : undefined,
-                                                                portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.portfolioTrailPercent
-                                                                } : undefined,
-                                                                portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.portfolioProfitThresholdPercent
-                                                                } : undefined,
-                                                                reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? {
-                                                                    set: item.order.alpacaAccount.reducedPortfolioTrailPercent
-                                                                } : undefined,
-                                                            },
-                                                            create: {
-                                                                type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                            },
-                                                        }
-                                                    } : undefined,
                                                 contract: item.order.contract ?
                                                     typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && (Object.keys(item.order.contract)[0] === 'id' || Object.keys(item.order.contract)[0] === 'symbol')
                                                         ? {
@@ -2836,6 +2443,7 @@ export const Trade = {
                                             },
                                             create: {
                                                 clientOrderId: item.order.clientOrderId !== undefined ? item.order.clientOrderId : undefined,
+                                                alpacaAccountId: item.order.alpacaAccountId !== undefined ? item.order.alpacaAccountId : undefined,
                                                 qty: item.order.qty !== undefined ? item.order.qty : undefined,
                                                 notional: item.order.notional !== undefined ? item.order.notional : undefined,
                                                 side: item.order.side !== undefined ? item.order.side : undefined,
@@ -2906,36 +2514,6 @@ export const Trade = {
                                                                 },
                                                             }
                                                         } : undefined,
-                                                alpacaAccount: item.order.alpacaAccount ?
-                                                    typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && Object.keys(item.order.alpacaAccount)[0] === 'id'
-                                                        ? { connect: {
-                                                                id: item.order.alpacaAccount.id
-                                                            }
-                                                        }
-                                                        : { connectOrCreate: {
-                                                                where: {
-                                                                    id: item.order.alpacaAccount.id !== undefined ? item.order.alpacaAccount.id : undefined,
-                                                                    userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                        equals: item.order.alpacaAccount.userId
-                                                                    } : undefined,
-                                                                },
-                                                                create: {
-                                                                    type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                    APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                    APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                    configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                    marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                    realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                    tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                    minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                    volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                    enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                    portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                    portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                    reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                },
-                                                            }
-                                                        } : undefined,
                                                 contract: item.order.contract ?
                                                     typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && Object.keys(item.order.contract)[0] === 'id'
                                                         ? { connect: {
@@ -3011,6 +2589,7 @@ export const Trade = {
                                                 },
                                                 create: {
                                                     clientOrderId: item.order.clientOrderId !== undefined ? item.order.clientOrderId : undefined,
+                                                    alpacaAccountId: item.order.alpacaAccountId !== undefined ? item.order.alpacaAccountId : undefined,
                                                     qty: item.order.qty !== undefined ? item.order.qty : undefined,
                                                     notional: item.order.notional !== undefined ? item.order.notional : undefined,
                                                     side: item.order.side !== undefined ? item.order.side : undefined,
@@ -3081,36 +2660,6 @@ export const Trade = {
                                                                     },
                                                                 }
                                                             } : undefined,
-                                                    alpacaAccount: item.order.alpacaAccount ?
-                                                        typeof item.order.alpacaAccount === 'object' && Object.keys(item.order.alpacaAccount).length === 1 && Object.keys(item.order.alpacaAccount)[0] === 'id'
-                                                            ? { connect: {
-                                                                    id: item.order.alpacaAccount.id
-                                                                }
-                                                            }
-                                                            : { connectOrCreate: {
-                                                                    where: {
-                                                                        id: item.order.alpacaAccount.id !== undefined ? item.order.alpacaAccount.id : undefined,
-                                                                        userId: item.order.alpacaAccount.userId !== undefined ? {
-                                                                            equals: item.order.alpacaAccount.userId
-                                                                        } : undefined,
-                                                                    },
-                                                                    create: {
-                                                                        type: item.order.alpacaAccount.type !== undefined ? item.order.alpacaAccount.type : undefined,
-                                                                        APIKey: item.order.alpacaAccount.APIKey !== undefined ? item.order.alpacaAccount.APIKey : undefined,
-                                                                        APISecret: item.order.alpacaAccount.APISecret !== undefined ? item.order.alpacaAccount.APISecret : undefined,
-                                                                        configuration: item.order.alpacaAccount.configuration !== undefined ? item.order.alpacaAccount.configuration : undefined,
-                                                                        marketOpen: item.order.alpacaAccount.marketOpen !== undefined ? item.order.alpacaAccount.marketOpen : undefined,
-                                                                        realTime: item.order.alpacaAccount.realTime !== undefined ? item.order.alpacaAccount.realTime : undefined,
-                                                                        tradeAllocationPct: item.order.alpacaAccount.tradeAllocationPct !== undefined ? item.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                        minPercentageChange: item.order.alpacaAccount.minPercentageChange !== undefined ? item.order.alpacaAccount.minPercentageChange : undefined,
-                                                                        volumeThreshold: item.order.alpacaAccount.volumeThreshold !== undefined ? item.order.alpacaAccount.volumeThreshold : undefined,
-                                                                        enablePortfolioTrailingStop: item.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? item.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                        portfolioTrailPercent: item.order.alpacaAccount.portfolioTrailPercent !== undefined ? item.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                        portfolioProfitThresholdPercent: item.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? item.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                        reducedPortfolioTrailPercent: item.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? item.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                    },
-                                                                }
-                                                            } : undefined,
                                                     contract: item.order.contract ?
                                                         typeof item.order.contract === 'object' && Object.keys(item.order.contract).length === 1 && Object.keys(item.order.contract)[0] === 'id'
                                                             ? { connect: {
@@ -3226,7 +2775,7 @@ export const Trade = {
      * @param globalClient - Apollo Client instance.
      * @returns The retrieved Trade or null.
      */
-    async get(props, globalClient) {
+    async get(props, globalClient, where) {
         const [modules, client] = await Promise.all([
             getApolloModules(),
             globalClient
@@ -3241,7 +2790,7 @@ export const Trade = {
         }
       }`;
         const variables = {
-            where: {
+            where: where ? where : {
                 id: props.id !== undefined ? props.id : undefined,
                 alpacaAccountId: props.alpacaAccountId !== undefined ? {
                     equals: props.alpacaAccountId
@@ -3309,7 +2858,7 @@ export const Trade = {
      * @param globalClient - Apollo Client instance.
      * @returns An array of found Trade records or null.
      */
-    async findMany(props, globalClient) {
+    async findMany(props, globalClient, where) {
         const [modules, client] = await Promise.all([
             getApolloModules(),
             globalClient
@@ -3324,7 +2873,7 @@ export const Trade = {
         }
       }`;
         const variables = {
-            where: {
+            where: where ? where : {
                 id: props.id !== undefined ? {
                     equals: props.id
                 } : undefined,