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

adaptic-backend 1.0.307 → 1.0.309

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 (838) hide show

package/Deliverable.cjs CHANGED Viewed

@@ -214,6 +214,7 @@ exports.Deliverable = {
                                                     },
                                                     create: {
                                                         clientOrderId: props.contract.order.clientOrderId !== undefined ? props.contract.order.clientOrderId : undefined,
+                                                        alpacaAccountId: props.contract.order.alpacaAccountId !== undefined ? props.contract.order.alpacaAccountId : undefined,
                                                         qty: props.contract.order.qty !== undefined ? props.contract.order.qty : undefined,
                                                         notional: props.contract.order.notional !== undefined ? props.contract.order.notional : undefined,
                                                         side: props.contract.order.side !== undefined ? props.contract.order.side : undefined,
@@ -284,36 +285,6 @@ exports.Deliverable = {
                                                                         },
                                                                     }
                                                                 } : undefined,
-                                                        alpacaAccount: props.contract.order.alpacaAccount ?
-                                                            typeof props.contract.order.alpacaAccount === 'object' && Object.keys(props.contract.order.alpacaAccount).length === 1 && Object.keys(props.contract.order.alpacaAccount)[0] === 'id'
-                                                                ? { connect: {
-                                                                        id: props.contract.order.alpacaAccount.id
-                                                                    }
-                                                                }
-                                                                : { connectOrCreate: {
-                                                                        where: {
-                                                                            id: props.contract.order.alpacaAccount.id !== undefined ? props.contract.order.alpacaAccount.id : undefined,
-                                                                            userId: props.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                                equals: props.contract.order.alpacaAccount.userId
-                                                                            } : undefined,
-                                                                        },
-                                                                        create: {
-                                                                            type: props.contract.order.alpacaAccount.type !== undefined ? props.contract.order.alpacaAccount.type : undefined,
-                                                                            APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? props.contract.order.alpacaAccount.APIKey : undefined,
-                                                                            APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? props.contract.order.alpacaAccount.APISecret : undefined,
-                                                                            configuration: props.contract.order.alpacaAccount.configuration !== undefined ? props.contract.order.alpacaAccount.configuration : undefined,
-                                                                            marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? props.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                            realTime: props.contract.order.alpacaAccount.realTime !== undefined ? props.contract.order.alpacaAccount.realTime : undefined,
-                                                                            tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? props.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                            minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? props.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                            volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? props.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                            enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? props.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                            portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                            portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? props.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                            reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                        },
-                                                                    }
-                                                                } : undefined,
                                                         action: props.contract.order.action ?
                                                             typeof props.contract.order.action === 'object' && Object.keys(props.contract.order.action).length === 1 && Object.keys(props.contract.order.action)[0] === 'id'
                                                                 ? { connect: {
@@ -603,6 +574,9 @@ exports.Deliverable = {
                                                 clientOrderId: props.contract.order.clientOrderId !== undefined ? {
                                                     set: props.contract.order.clientOrderId
                                                 } : undefined,
+                                                alpacaAccountId: props.contract.order.alpacaAccountId !== undefined ? {
+                                                    set: props.contract.order.alpacaAccountId
+                                                } : undefined,
                                                 qty: props.contract.order.qty !== undefined ? {
                                                     set: props.contract.order.qty
                                                 } : undefined,
@@ -775,82 +749,6 @@ exports.Deliverable = {
                                                             },
                                                         }
                                                     } : undefined,
-                                                alpacaAccount: props.contract.order.alpacaAccount ?
-                                                    typeof props.contract.order.alpacaAccount === 'object' && Object.keys(props.contract.order.alpacaAccount).length === 1 && (Object.keys(props.contract.order.alpacaAccount)[0] === 'id' || Object.keys(props.contract.order.alpacaAccount)[0] === 'symbol')
-                                                        ? {
-                                                            connect: {
-                                                                id: props.contract.order.alpacaAccount.id
-                                                            }
-                                                        } : { upsert: {
-                                                            where: {
-                                                                id: props.contract.order.alpacaAccount.id !== undefined ? {
-                                                                    equals: props.contract.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                userId: props.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                    equals: props.contract.order.alpacaAccount.userId
-                                                                } : undefined,
-                                                            },
-                                                            update: {
-                                                                id: props.contract.order.alpacaAccount.id !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                type: props.contract.order.alpacaAccount.type !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.type
-                                                                } : undefined,
-                                                                APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.APIKey
-                                                                } : undefined,
-                                                                APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.APISecret
-                                                                } : undefined,
-                                                                configuration: props.contract.order.alpacaAccount.configuration !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.configuration
-                                                                } : undefined,
-                                                                marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.marketOpen
-                                                                } : undefined,
-                                                                realTime: props.contract.order.alpacaAccount.realTime !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.realTime
-                                                                } : undefined,
-                                                                tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.tradeAllocationPct
-                                                                } : undefined,
-                                                                minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.minPercentageChange
-                                                                } : undefined,
-                                                                volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.volumeThreshold
-                                                                } : undefined,
-                                                                enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.enablePortfolioTrailingStop
-                                                                } : undefined,
-                                                                portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.portfolioTrailPercent
-                                                                } : undefined,
-                                                                portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent
-                                                                } : undefined,
-                                                                reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent
-                                                                } : undefined,
-                                                            },
-                                                            create: {
-                                                                type: props.contract.order.alpacaAccount.type !== undefined ? props.contract.order.alpacaAccount.type : undefined,
-                                                                APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? props.contract.order.alpacaAccount.APIKey : undefined,
-                                                                APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? props.contract.order.alpacaAccount.APISecret : undefined,
-                                                                configuration: props.contract.order.alpacaAccount.configuration !== undefined ? props.contract.order.alpacaAccount.configuration : undefined,
-                                                                marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? props.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                realTime: props.contract.order.alpacaAccount.realTime !== undefined ? props.contract.order.alpacaAccount.realTime : undefined,
-                                                                tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? props.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? props.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? props.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? props.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? props.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                            },
-                                                        }
-                                                    } : undefined,
                                                 action: props.contract.order.action ?
                                                     typeof props.contract.order.action === 'object' && Object.keys(props.contract.order.action).length === 1 && (Object.keys(props.contract.order.action)[0] === 'id' || Object.keys(props.contract.order.action)[0] === 'symbol')
                                                         ? {
@@ -902,6 +800,7 @@ exports.Deliverable = {
                                             },
                                             create: {
                                                 clientOrderId: props.contract.order.clientOrderId !== undefined ? props.contract.order.clientOrderId : undefined,
+                                                alpacaAccountId: props.contract.order.alpacaAccountId !== undefined ? props.contract.order.alpacaAccountId : undefined,
                                                 qty: props.contract.order.qty !== undefined ? props.contract.order.qty : undefined,
                                                 notional: props.contract.order.notional !== undefined ? props.contract.order.notional : undefined,
                                                 side: props.contract.order.side !== undefined ? props.contract.order.side : undefined,
@@ -972,36 +871,6 @@ exports.Deliverable = {
                                                                 },
                                                             }
                                                         } : undefined,
-                                                alpacaAccount: props.contract.order.alpacaAccount ?
-                                                    typeof props.contract.order.alpacaAccount === 'object' && Object.keys(props.contract.order.alpacaAccount).length === 1 && Object.keys(props.contract.order.alpacaAccount)[0] === 'id'
-                                                        ? { connect: {
-                                                                id: props.contract.order.alpacaAccount.id
-                                                            }
-                                                        }
-                                                        : { connectOrCreate: {
-                                                                where: {
-                                                                    id: props.contract.order.alpacaAccount.id !== undefined ? props.contract.order.alpacaAccount.id : undefined,
-                                                                    userId: props.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                        equals: props.contract.order.alpacaAccount.userId
-                                                                    } : undefined,
-                                                                },
-                                                                create: {
-                                                                    type: props.contract.order.alpacaAccount.type !== undefined ? props.contract.order.alpacaAccount.type : undefined,
-                                                                    APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? props.contract.order.alpacaAccount.APIKey : undefined,
-                                                                    APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? props.contract.order.alpacaAccount.APISecret : undefined,
-                                                                    configuration: props.contract.order.alpacaAccount.configuration !== undefined ? props.contract.order.alpacaAccount.configuration : undefined,
-                                                                    marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? props.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                    realTime: props.contract.order.alpacaAccount.realTime !== undefined ? props.contract.order.alpacaAccount.realTime : undefined,
-                                                                    tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? props.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                    minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? props.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                    volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? props.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                    enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? props.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                    portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                    portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? props.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                    reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                },
-                                                            }
-                                                        } : undefined,
                                                 action: props.contract.order.action ?
                                                     typeof props.contract.order.action === 'object' && Object.keys(props.contract.order.action).length === 1 && Object.keys(props.contract.order.action)[0] === 'id'
                                                         ? { connect: {
@@ -1072,6 +941,7 @@ exports.Deliverable = {
                                                 },
                                                 create: {
                                                     clientOrderId: props.contract.order.clientOrderId !== undefined ? props.contract.order.clientOrderId : undefined,
+                                                    alpacaAccountId: props.contract.order.alpacaAccountId !== undefined ? props.contract.order.alpacaAccountId : undefined,
                                                     qty: props.contract.order.qty !== undefined ? props.contract.order.qty : undefined,
                                                     notional: props.contract.order.notional !== undefined ? props.contract.order.notional : undefined,
                                                     side: props.contract.order.side !== undefined ? props.contract.order.side : undefined,
@@ -1142,36 +1012,6 @@ exports.Deliverable = {
                                                                     },
                                                                 }
                                                             } : undefined,
-                                                    alpacaAccount: props.contract.order.alpacaAccount ?
-                                                        typeof props.contract.order.alpacaAccount === 'object' && Object.keys(props.contract.order.alpacaAccount).length === 1 && Object.keys(props.contract.order.alpacaAccount)[0] === 'id'
-                                                            ? { connect: {
-                                                                    id: props.contract.order.alpacaAccount.id
-                                                                }
-                                                            }
-                                                            : { connectOrCreate: {
-                                                                    where: {
-                                                                        id: props.contract.order.alpacaAccount.id !== undefined ? props.contract.order.alpacaAccount.id : undefined,
-                                                                        userId: props.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                            equals: props.contract.order.alpacaAccount.userId
-                                                                        } : undefined,
-                                                                    },
-                                                                    create: {
-                                                                        type: props.contract.order.alpacaAccount.type !== undefined ? props.contract.order.alpacaAccount.type : undefined,
-                                                                        APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? props.contract.order.alpacaAccount.APIKey : undefined,
-                                                                        APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? props.contract.order.alpacaAccount.APISecret : undefined,
-                                                                        configuration: props.contract.order.alpacaAccount.configuration !== undefined ? props.contract.order.alpacaAccount.configuration : undefined,
-                                                                        marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? props.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                        realTime: props.contract.order.alpacaAccount.realTime !== undefined ? props.contract.order.alpacaAccount.realTime : undefined,
-                                                                        tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? props.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                        minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? props.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                        volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? props.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                        enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? props.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                        portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                        portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? props.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                        reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                    },
-                                                                }
-                                                            } : undefined,
                                                     action: props.contract.order.action ?
                                                         typeof props.contract.order.action === 'object' && Object.keys(props.contract.order.action).length === 1 && Object.keys(props.contract.order.action)[0] === 'id'
                                                             ? { connect: {
@@ -1319,6 +1159,7 @@ exports.Deliverable = {
                                                     },
                                                     create: {
                                                         clientOrderId: props.contract.order.clientOrderId !== undefined ? props.contract.order.clientOrderId : undefined,
+                                                        alpacaAccountId: props.contract.order.alpacaAccountId !== undefined ? props.contract.order.alpacaAccountId : undefined,
                                                         qty: props.contract.order.qty !== undefined ? props.contract.order.qty : undefined,
                                                         notional: props.contract.order.notional !== undefined ? props.contract.order.notional : undefined,
                                                         side: props.contract.order.side !== undefined ? props.contract.order.side : undefined,
@@ -1389,36 +1230,6 @@ exports.Deliverable = {
                                                                         },
                                                                     }
                                                                 } : undefined,
-                                                        alpacaAccount: props.contract.order.alpacaAccount ?
-                                                            typeof props.contract.order.alpacaAccount === 'object' && Object.keys(props.contract.order.alpacaAccount).length === 1 && Object.keys(props.contract.order.alpacaAccount)[0] === 'id'
-                                                                ? { connect: {
-                                                                        id: props.contract.order.alpacaAccount.id
-                                                                    }
-                                                                }
-                                                                : { connectOrCreate: {
-                                                                        where: {
-                                                                            id: props.contract.order.alpacaAccount.id !== undefined ? props.contract.order.alpacaAccount.id : undefined,
-                                                                            userId: props.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                                equals: props.contract.order.alpacaAccount.userId
-                                                                            } : undefined,
-                                                                        },
-                                                                        create: {
-                                                                            type: props.contract.order.alpacaAccount.type !== undefined ? props.contract.order.alpacaAccount.type : undefined,
-                                                                            APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? props.contract.order.alpacaAccount.APIKey : undefined,
-                                                                            APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? props.contract.order.alpacaAccount.APISecret : undefined,
-                                                                            configuration: props.contract.order.alpacaAccount.configuration !== undefined ? props.contract.order.alpacaAccount.configuration : undefined,
-                                                                            marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? props.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                            realTime: props.contract.order.alpacaAccount.realTime !== undefined ? props.contract.order.alpacaAccount.realTime : undefined,
-                                                                            tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? props.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                            minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? props.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                            volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? props.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                            enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? props.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                            portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                            portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? props.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                            reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                        },
-                                                                    }
-                                                                } : undefined,
                                                         action: props.contract.order.action ?
                                                             typeof props.contract.order.action === 'object' && Object.keys(props.contract.order.action).length === 1 && Object.keys(props.contract.order.action)[0] === 'id'
                                                                 ? { connect: {
@@ -1602,6 +1413,9 @@ exports.Deliverable = {
                                                 clientOrderId: props.contract.order.clientOrderId !== undefined ? {
                                                     set: props.contract.order.clientOrderId
                                                 } : undefined,
+                                                alpacaAccountId: props.contract.order.alpacaAccountId !== undefined ? {
+                                                    set: props.contract.order.alpacaAccountId
+                                                } : undefined,
                                                 qty: props.contract.order.qty !== undefined ? {
                                                     set: props.contract.order.qty
                                                 } : undefined,
@@ -1774,82 +1588,6 @@ exports.Deliverable = {
                                                             },
                                                         }
                                                     } : undefined,
-                                                alpacaAccount: props.contract.order.alpacaAccount ?
-                                                    typeof props.contract.order.alpacaAccount === 'object' && Object.keys(props.contract.order.alpacaAccount).length === 1 && (Object.keys(props.contract.order.alpacaAccount)[0] === 'id' || Object.keys(props.contract.order.alpacaAccount)[0] === 'symbol')
-                                                        ? {
-                                                            connect: {
-                                                                id: props.contract.order.alpacaAccount.id
-                                                            }
-                                                        } : { upsert: {
-                                                            where: {
-                                                                id: props.contract.order.alpacaAccount.id !== undefined ? {
-                                                                    equals: props.contract.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                userId: props.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                    equals: props.contract.order.alpacaAccount.userId
-                                                                } : undefined,
-                                                            },
-                                                            update: {
-                                                                id: props.contract.order.alpacaAccount.id !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                type: props.contract.order.alpacaAccount.type !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.type
-                                                                } : undefined,
-                                                                APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.APIKey
-                                                                } : undefined,
-                                                                APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.APISecret
-                                                                } : undefined,
-                                                                configuration: props.contract.order.alpacaAccount.configuration !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.configuration
-                                                                } : undefined,
-                                                                marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.marketOpen
-                                                                } : undefined,
-                                                                realTime: props.contract.order.alpacaAccount.realTime !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.realTime
-                                                                } : undefined,
-                                                                tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.tradeAllocationPct
-                                                                } : undefined,
-                                                                minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.minPercentageChange
-                                                                } : undefined,
-                                                                volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.volumeThreshold
-                                                                } : undefined,
-                                                                enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.enablePortfolioTrailingStop
-                                                                } : undefined,
-                                                                portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.portfolioTrailPercent
-                                                                } : undefined,
-                                                                portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent
-                                                                } : undefined,
-                                                                reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? {
-                                                                    set: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent
-                                                                } : undefined,
-                                                            },
-                                                            create: {
-                                                                type: props.contract.order.alpacaAccount.type !== undefined ? props.contract.order.alpacaAccount.type : undefined,
-                                                                APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? props.contract.order.alpacaAccount.APIKey : undefined,
-                                                                APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? props.contract.order.alpacaAccount.APISecret : undefined,
-                                                                configuration: props.contract.order.alpacaAccount.configuration !== undefined ? props.contract.order.alpacaAccount.configuration : undefined,
-                                                                marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? props.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                realTime: props.contract.order.alpacaAccount.realTime !== undefined ? props.contract.order.alpacaAccount.realTime : undefined,
-                                                                tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? props.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? props.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? props.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? props.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? props.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                            },
-                                                        }
-                                                    } : undefined,
                                                 action: props.contract.order.action ?
                                                     typeof props.contract.order.action === 'object' && Object.keys(props.contract.order.action).length === 1 && (Object.keys(props.contract.order.action)[0] === 'id' || Object.keys(props.contract.order.action)[0] === 'symbol')
                                                         ? {
@@ -1901,6 +1639,7 @@ exports.Deliverable = {
                                             },
                                             create: {
                                                 clientOrderId: props.contract.order.clientOrderId !== undefined ? props.contract.order.clientOrderId : undefined,
+                                                alpacaAccountId: props.contract.order.alpacaAccountId !== undefined ? props.contract.order.alpacaAccountId : undefined,
                                                 qty: props.contract.order.qty !== undefined ? props.contract.order.qty : undefined,
                                                 notional: props.contract.order.notional !== undefined ? props.contract.order.notional : undefined,
                                                 side: props.contract.order.side !== undefined ? props.contract.order.side : undefined,
@@ -1971,36 +1710,6 @@ exports.Deliverable = {
                                                                 },
                                                             }
                                                         } : undefined,
-                                                alpacaAccount: props.contract.order.alpacaAccount ?
-                                                    typeof props.contract.order.alpacaAccount === 'object' && Object.keys(props.contract.order.alpacaAccount).length === 1 && Object.keys(props.contract.order.alpacaAccount)[0] === 'id'
-                                                        ? { connect: {
-                                                                id: props.contract.order.alpacaAccount.id
-                                                            }
-                                                        }
-                                                        : { connectOrCreate: {
-                                                                where: {
-                                                                    id: props.contract.order.alpacaAccount.id !== undefined ? props.contract.order.alpacaAccount.id : undefined,
-                                                                    userId: props.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                        equals: props.contract.order.alpacaAccount.userId
-                                                                    } : undefined,
-                                                                },
-                                                                create: {
-                                                                    type: props.contract.order.alpacaAccount.type !== undefined ? props.contract.order.alpacaAccount.type : undefined,
-                                                                    APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? props.contract.order.alpacaAccount.APIKey : undefined,
-                                                                    APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? props.contract.order.alpacaAccount.APISecret : undefined,
-                                                                    configuration: props.contract.order.alpacaAccount.configuration !== undefined ? props.contract.order.alpacaAccount.configuration : undefined,
-                                                                    marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? props.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                    realTime: props.contract.order.alpacaAccount.realTime !== undefined ? props.contract.order.alpacaAccount.realTime : undefined,
-                                                                    tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? props.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                    minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? props.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                    volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? props.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                    enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? props.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                    portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                    portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? props.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                    reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                },
-                                                            }
-                                                        } : undefined,
                                                 action: props.contract.order.action ?
                                                     typeof props.contract.order.action === 'object' && Object.keys(props.contract.order.action).length === 1 && Object.keys(props.contract.order.action)[0] === 'id'
                                                         ? { connect: {
@@ -2071,6 +1780,7 @@ exports.Deliverable = {
                                                 },
                                                 create: {
                                                     clientOrderId: props.contract.order.clientOrderId !== undefined ? props.contract.order.clientOrderId : undefined,
+                                                    alpacaAccountId: props.contract.order.alpacaAccountId !== undefined ? props.contract.order.alpacaAccountId : undefined,
                                                     qty: props.contract.order.qty !== undefined ? props.contract.order.qty : undefined,
                                                     notional: props.contract.order.notional !== undefined ? props.contract.order.notional : undefined,
                                                     side: props.contract.order.side !== undefined ? props.contract.order.side : undefined,
@@ -2141,36 +1851,6 @@ exports.Deliverable = {
                                                                     },
                                                                 }
                                                             } : undefined,
-                                                    alpacaAccount: props.contract.order.alpacaAccount ?
-                                                        typeof props.contract.order.alpacaAccount === 'object' && Object.keys(props.contract.order.alpacaAccount).length === 1 && Object.keys(props.contract.order.alpacaAccount)[0] === 'id'
-                                                            ? { connect: {
-                                                                    id: props.contract.order.alpacaAccount.id
-                                                                }
-                                                            }
-                                                            : { connectOrCreate: {
-                                                                    where: {
-                                                                        id: props.contract.order.alpacaAccount.id !== undefined ? props.contract.order.alpacaAccount.id : undefined,
-                                                                        userId: props.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                            equals: props.contract.order.alpacaAccount.userId
-                                                                        } : undefined,
-                                                                    },
-                                                                    create: {
-                                                                        type: props.contract.order.alpacaAccount.type !== undefined ? props.contract.order.alpacaAccount.type : undefined,
-                                                                        APIKey: props.contract.order.alpacaAccount.APIKey !== undefined ? props.contract.order.alpacaAccount.APIKey : undefined,
-                                                                        APISecret: props.contract.order.alpacaAccount.APISecret !== undefined ? props.contract.order.alpacaAccount.APISecret : undefined,
-                                                                        configuration: props.contract.order.alpacaAccount.configuration !== undefined ? props.contract.order.alpacaAccount.configuration : undefined,
-                                                                        marketOpen: props.contract.order.alpacaAccount.marketOpen !== undefined ? props.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                        realTime: props.contract.order.alpacaAccount.realTime !== undefined ? props.contract.order.alpacaAccount.realTime : undefined,
-                                                                        tradeAllocationPct: props.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? props.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                        minPercentageChange: props.contract.order.alpacaAccount.minPercentageChange !== undefined ? props.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                        volumeThreshold: props.contract.order.alpacaAccount.volumeThreshold !== undefined ? props.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                        enablePortfolioTrailingStop: props.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? props.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                        portfolioTrailPercent: props.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                        portfolioProfitThresholdPercent: props.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? props.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                        reducedPortfolioTrailPercent: props.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? props.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                    },
-                                                                }
-                                                            } : undefined,
                                                     action: props.contract.order.action ?
                                                         typeof props.contract.order.action === 'object' && Object.keys(props.contract.order.action).length === 1 && Object.keys(props.contract.order.action)[0] === 'id'
                                                             ? { connect: {
@@ -2411,6 +2091,9 @@ exports.Deliverable = {
                                                 clientOrderId: prop.contract.order.clientOrderId !== undefined ? {
                                                     set: prop.contract.order.clientOrderId
                                                 } : undefined,
+                                                alpacaAccountId: prop.contract.order.alpacaAccountId !== undefined ? {
+                                                    set: prop.contract.order.alpacaAccountId
+                                                } : undefined,
                                                 qty: prop.contract.order.qty !== undefined ? {
                                                     set: prop.contract.order.qty
                                                 } : undefined,
@@ -2583,82 +2266,6 @@ exports.Deliverable = {
                                                             },
                                                         }
                                                     } : undefined,
-                                                alpacaAccount: prop.contract.order.alpacaAccount ?
-                                                    typeof prop.contract.order.alpacaAccount === 'object' && Object.keys(prop.contract.order.alpacaAccount).length === 1 && (Object.keys(prop.contract.order.alpacaAccount)[0] === 'id' || Object.keys(prop.contract.order.alpacaAccount)[0] === 'symbol')
-                                                        ? {
-                                                            connect: {
-                                                                id: prop.contract.order.alpacaAccount.id
-                                                            }
-                                                        } : { upsert: {
-                                                            where: {
-                                                                id: prop.contract.order.alpacaAccount.id !== undefined ? {
-                                                                    equals: prop.contract.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                userId: prop.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                    equals: prop.contract.order.alpacaAccount.userId
-                                                                } : undefined,
-                                                            },
-                                                            update: {
-                                                                id: prop.contract.order.alpacaAccount.id !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.id
-                                                                } : undefined,
-                                                                type: prop.contract.order.alpacaAccount.type !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.type
-                                                                } : undefined,
-                                                                APIKey: prop.contract.order.alpacaAccount.APIKey !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.APIKey
-                                                                } : undefined,
-                                                                APISecret: prop.contract.order.alpacaAccount.APISecret !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.APISecret
-                                                                } : undefined,
-                                                                configuration: prop.contract.order.alpacaAccount.configuration !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.configuration
-                                                                } : undefined,
-                                                                marketOpen: prop.contract.order.alpacaAccount.marketOpen !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.marketOpen
-                                                                } : undefined,
-                                                                realTime: prop.contract.order.alpacaAccount.realTime !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.realTime
-                                                                } : undefined,
-                                                                tradeAllocationPct: prop.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.tradeAllocationPct
-                                                                } : undefined,
-                                                                minPercentageChange: prop.contract.order.alpacaAccount.minPercentageChange !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.minPercentageChange
-                                                                } : undefined,
-                                                                volumeThreshold: prop.contract.order.alpacaAccount.volumeThreshold !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.volumeThreshold
-                                                                } : undefined,
-                                                                enablePortfolioTrailingStop: prop.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.enablePortfolioTrailingStop
-                                                                } : undefined,
-                                                                portfolioTrailPercent: prop.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.portfolioTrailPercent
-                                                                } : undefined,
-                                                                portfolioProfitThresholdPercent: prop.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.portfolioProfitThresholdPercent
-                                                                } : undefined,
-                                                                reducedPortfolioTrailPercent: prop.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? {
-                                                                    set: prop.contract.order.alpacaAccount.reducedPortfolioTrailPercent
-                                                                } : undefined,
-                                                            },
-                                                            create: {
-                                                                type: prop.contract.order.alpacaAccount.type !== undefined ? prop.contract.order.alpacaAccount.type : undefined,
-                                                                APIKey: prop.contract.order.alpacaAccount.APIKey !== undefined ? prop.contract.order.alpacaAccount.APIKey : undefined,
-                                                                APISecret: prop.contract.order.alpacaAccount.APISecret !== undefined ? prop.contract.order.alpacaAccount.APISecret : undefined,
-                                                                configuration: prop.contract.order.alpacaAccount.configuration !== undefined ? prop.contract.order.alpacaAccount.configuration : undefined,
-                                                                marketOpen: prop.contract.order.alpacaAccount.marketOpen !== undefined ? prop.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                realTime: prop.contract.order.alpacaAccount.realTime !== undefined ? prop.contract.order.alpacaAccount.realTime : undefined,
-                                                                tradeAllocationPct: prop.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? prop.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                minPercentageChange: prop.contract.order.alpacaAccount.minPercentageChange !== undefined ? prop.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                volumeThreshold: prop.contract.order.alpacaAccount.volumeThreshold !== undefined ? prop.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                enablePortfolioTrailingStop: prop.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? prop.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                portfolioTrailPercent: prop.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? prop.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                portfolioProfitThresholdPercent: prop.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? prop.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                reducedPortfolioTrailPercent: prop.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? prop.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                            },
-                                                        }
-                                                    } : undefined,
                                                 action: prop.contract.order.action ?
                                                     typeof prop.contract.order.action === 'object' && Object.keys(prop.contract.order.action).length === 1 && (Object.keys(prop.contract.order.action)[0] === 'id' || Object.keys(prop.contract.order.action)[0] === 'symbol')
                                                         ? {
@@ -2710,6 +2317,7 @@ exports.Deliverable = {
                                             },
                                             create: {
                                                 clientOrderId: prop.contract.order.clientOrderId !== undefined ? prop.contract.order.clientOrderId : undefined,
+                                                alpacaAccountId: prop.contract.order.alpacaAccountId !== undefined ? prop.contract.order.alpacaAccountId : undefined,
                                                 qty: prop.contract.order.qty !== undefined ? prop.contract.order.qty : undefined,
                                                 notional: prop.contract.order.notional !== undefined ? prop.contract.order.notional : undefined,
                                                 side: prop.contract.order.side !== undefined ? prop.contract.order.side : undefined,
@@ -2780,36 +2388,6 @@ exports.Deliverable = {
                                                                 },
                                                             }
                                                         } : undefined,
-                                                alpacaAccount: prop.contract.order.alpacaAccount ?
-                                                    typeof prop.contract.order.alpacaAccount === 'object' && Object.keys(prop.contract.order.alpacaAccount).length === 1 && Object.keys(prop.contract.order.alpacaAccount)[0] === 'id'
-                                                        ? { connect: {
-                                                                id: prop.contract.order.alpacaAccount.id
-                                                            }
-                                                        }
-                                                        : { connectOrCreate: {
-                                                                where: {
-                                                                    id: prop.contract.order.alpacaAccount.id !== undefined ? prop.contract.order.alpacaAccount.id : undefined,
-                                                                    userId: prop.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                        equals: prop.contract.order.alpacaAccount.userId
-                                                                    } : undefined,
-                                                                },
-                                                                create: {
-                                                                    type: prop.contract.order.alpacaAccount.type !== undefined ? prop.contract.order.alpacaAccount.type : undefined,
-                                                                    APIKey: prop.contract.order.alpacaAccount.APIKey !== undefined ? prop.contract.order.alpacaAccount.APIKey : undefined,
-                                                                    APISecret: prop.contract.order.alpacaAccount.APISecret !== undefined ? prop.contract.order.alpacaAccount.APISecret : undefined,
-                                                                    configuration: prop.contract.order.alpacaAccount.configuration !== undefined ? prop.contract.order.alpacaAccount.configuration : undefined,
-                                                                    marketOpen: prop.contract.order.alpacaAccount.marketOpen !== undefined ? prop.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                    realTime: prop.contract.order.alpacaAccount.realTime !== undefined ? prop.contract.order.alpacaAccount.realTime : undefined,
-                                                                    tradeAllocationPct: prop.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? prop.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                    minPercentageChange: prop.contract.order.alpacaAccount.minPercentageChange !== undefined ? prop.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                    volumeThreshold: prop.contract.order.alpacaAccount.volumeThreshold !== undefined ? prop.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                    enablePortfolioTrailingStop: prop.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? prop.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                    portfolioTrailPercent: prop.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? prop.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                    portfolioProfitThresholdPercent: prop.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? prop.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                    reducedPortfolioTrailPercent: prop.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? prop.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                },
-                                                            }
-                                                        } : undefined,
                                                 action: prop.contract.order.action ?
                                                     typeof prop.contract.order.action === 'object' && Object.keys(prop.contract.order.action).length === 1 && Object.keys(prop.contract.order.action)[0] === 'id'
                                                         ? { connect: {
@@ -2880,6 +2458,7 @@ exports.Deliverable = {
                                                 },
                                                 create: {
                                                     clientOrderId: prop.contract.order.clientOrderId !== undefined ? prop.contract.order.clientOrderId : undefined,
+                                                    alpacaAccountId: prop.contract.order.alpacaAccountId !== undefined ? prop.contract.order.alpacaAccountId : undefined,
                                                     qty: prop.contract.order.qty !== undefined ? prop.contract.order.qty : undefined,
                                                     notional: prop.contract.order.notional !== undefined ? prop.contract.order.notional : undefined,
                                                     side: prop.contract.order.side !== undefined ? prop.contract.order.side : undefined,
@@ -2950,36 +2529,6 @@ exports.Deliverable = {
                                                                     },
                                                                 }
                                                             } : undefined,
-                                                    alpacaAccount: prop.contract.order.alpacaAccount ?
-                                                        typeof prop.contract.order.alpacaAccount === 'object' && Object.keys(prop.contract.order.alpacaAccount).length === 1 && Object.keys(prop.contract.order.alpacaAccount)[0] === 'id'
-                                                            ? { connect: {
-                                                                    id: prop.contract.order.alpacaAccount.id
-                                                                }
-                                                            }
-                                                            : { connectOrCreate: {
-                                                                    where: {
-                                                                        id: prop.contract.order.alpacaAccount.id !== undefined ? prop.contract.order.alpacaAccount.id : undefined,
-                                                                        userId: prop.contract.order.alpacaAccount.userId !== undefined ? {
-                                                                            equals: prop.contract.order.alpacaAccount.userId
-                                                                        } : undefined,
-                                                                    },
-                                                                    create: {
-                                                                        type: prop.contract.order.alpacaAccount.type !== undefined ? prop.contract.order.alpacaAccount.type : undefined,
-                                                                        APIKey: prop.contract.order.alpacaAccount.APIKey !== undefined ? prop.contract.order.alpacaAccount.APIKey : undefined,
-                                                                        APISecret: prop.contract.order.alpacaAccount.APISecret !== undefined ? prop.contract.order.alpacaAccount.APISecret : undefined,
-                                                                        configuration: prop.contract.order.alpacaAccount.configuration !== undefined ? prop.contract.order.alpacaAccount.configuration : undefined,
-                                                                        marketOpen: prop.contract.order.alpacaAccount.marketOpen !== undefined ? prop.contract.order.alpacaAccount.marketOpen : undefined,
-                                                                        realTime: prop.contract.order.alpacaAccount.realTime !== undefined ? prop.contract.order.alpacaAccount.realTime : undefined,
-                                                                        tradeAllocationPct: prop.contract.order.alpacaAccount.tradeAllocationPct !== undefined ? prop.contract.order.alpacaAccount.tradeAllocationPct : undefined,
-                                                                        minPercentageChange: prop.contract.order.alpacaAccount.minPercentageChange !== undefined ? prop.contract.order.alpacaAccount.minPercentageChange : undefined,
-                                                                        volumeThreshold: prop.contract.order.alpacaAccount.volumeThreshold !== undefined ? prop.contract.order.alpacaAccount.volumeThreshold : undefined,
-                                                                        enablePortfolioTrailingStop: prop.contract.order.alpacaAccount.enablePortfolioTrailingStop !== undefined ? prop.contract.order.alpacaAccount.enablePortfolioTrailingStop : undefined,
-                                                                        portfolioTrailPercent: prop.contract.order.alpacaAccount.portfolioTrailPercent !== undefined ? prop.contract.order.alpacaAccount.portfolioTrailPercent : undefined,
-                                                                        portfolioProfitThresholdPercent: prop.contract.order.alpacaAccount.portfolioProfitThresholdPercent !== undefined ? prop.contract.order.alpacaAccount.portfolioProfitThresholdPercent : undefined,
-                                                                        reducedPortfolioTrailPercent: prop.contract.order.alpacaAccount.reducedPortfolioTrailPercent !== undefined ? prop.contract.order.alpacaAccount.reducedPortfolioTrailPercent : undefined,
-                                                                    },
-                                                                }
-                                                            } : undefined,
                                                     action: prop.contract.order.action ?
                                                         typeof prop.contract.order.action === 'object' && Object.keys(prop.contract.order.action).length === 1 && Object.keys(prop.contract.order.action)[0] === 'id'
                                                             ? { connect: {