npm - adaptic-backend - Versions diffs - 1.0.74 → 1.0.76 - Mend

adaptic-backend 1.0.74 → 1.0.76

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

package/Action.cjs CHANGED Viewed

@@ -22,7 +22,6 @@ exports.Action = {
           sequence
           tradeId
           type
-          orderId
           note
           status
           fee
@@ -253,214 +252,243 @@ exports.Action = {
             data: {
                 sequence: props.sequence !== undefined ? props.sequence : undefined,
                 type: props.type !== undefined ? props.type : undefined,
-                orderId: props.orderId !== undefined ? props.orderId : undefined,
                 note: props.note !== undefined ? props.note : undefined,
                 status: props.status !== undefined ? props.status : undefined,
                 fee: props.fee !== undefined ? props.fee : undefined,
-                trade: props.trade ? {
-                    connectOrCreate: {
-                        where: {
-                            id: props.trade.id !== undefined ? props.trade.id : undefined,
-                        },
-                        create: {
-                            qty: props.trade.qty !== undefined ? props.trade.qty : undefined,
-                            price: props.trade.price !== undefined ? props.trade.price : undefined,
-                            total: props.trade.total !== undefined ? props.trade.total : undefined,
-                            signal: props.trade.signal !== undefined ? props.trade.signal : undefined,
-                            strategy: props.trade.strategy !== undefined ? props.trade.strategy : undefined,
-                            analysis: props.trade.analysis !== undefined ? props.trade.analysis : undefined,
-                            confidence: props.trade.confidence !== undefined ? props.trade.confidence : undefined,
-                            timestamp: props.trade.timestamp !== undefined ? props.trade.timestamp : undefined,
-                            status: props.trade.status !== undefined ? props.trade.status : undefined,
-                            optionContractType: props.trade.optionContractType !== undefined ? props.trade.optionContractType : undefined,
-                            alpacaAccount: props.trade.alpacaAccount ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.trade.alpacaAccount.id !== undefined ? props.trade.alpacaAccount.id : undefined,
-                                    },
-                                    create: {
-                                        type: props.trade.alpacaAccount.type !== undefined ? props.trade.alpacaAccount.type : undefined,
-                                        APIKey: props.trade.alpacaAccount.APIKey !== undefined ? props.trade.alpacaAccount.APIKey : undefined,
-                                        APISecret: props.trade.alpacaAccount.APISecret !== undefined ? props.trade.alpacaAccount.APISecret : undefined,
-                                        configuration: props.trade.alpacaAccount.configuration !== undefined ? props.trade.alpacaAccount.configuration : undefined,
-                                        marketOpen: props.trade.alpacaAccount.marketOpen !== undefined ? props.trade.alpacaAccount.marketOpen : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            asset: props.trade.asset ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.trade.asset.id !== undefined ? props.trade.asset.id : undefined,
-                                        symbol: props.trade.asset.symbol !== undefined ? props.trade.asset.symbol : undefined,
-                                        name: props.trade.asset.name !== undefined ? props.trade.asset.name : undefined,
-                                    },
-                                    create: {
-                                        symbol: props.trade.asset.symbol !== undefined ? props.trade.asset.symbol : undefined,
-                                        name: props.trade.asset.name !== undefined ? props.trade.asset.name : undefined,
-                                        type: props.trade.asset.type !== undefined ? props.trade.asset.type : undefined,
-                                        logoUrl: props.trade.asset.logoUrl !== undefined ? props.trade.asset.logoUrl : undefined,
-                                        description: props.trade.asset.description !== undefined ? props.trade.asset.description : undefined,
-                                        cik: props.trade.asset.cik !== undefined ? props.trade.asset.cik : undefined,
-                                        exchange: props.trade.asset.exchange !== undefined ? props.trade.asset.exchange : undefined,
-                                        currency: props.trade.asset.currency !== undefined ? props.trade.asset.currency : undefined,
-                                        country: props.trade.asset.country !== undefined ? props.trade.asset.country : undefined,
-                                        sector: props.trade.asset.sector !== undefined ? props.trade.asset.sector : undefined,
-                                        industry: props.trade.asset.industry !== undefined ? props.trade.asset.industry : undefined,
-                                        address: props.trade.asset.address !== undefined ? props.trade.asset.address : undefined,
-                                        officialSite: props.trade.asset.officialSite !== undefined ? props.trade.asset.officialSite : undefined,
-                                        fiscalYearEnd: props.trade.asset.fiscalYearEnd !== undefined ? props.trade.asset.fiscalYearEnd : undefined,
-                                        latestQuarter: props.trade.asset.latestQuarter !== undefined ? props.trade.asset.latestQuarter : undefined,
-                                        marketCapitalization: props.trade.asset.marketCapitalization !== undefined ? props.trade.asset.marketCapitalization : undefined,
-                                        ebitda: props.trade.asset.ebitda !== undefined ? props.trade.asset.ebitda : undefined,
-                                        peRatio: props.trade.asset.peRatio !== undefined ? props.trade.asset.peRatio : undefined,
-                                        pegRatio: props.trade.asset.pegRatio !== undefined ? props.trade.asset.pegRatio : undefined,
-                                        bookValue: props.trade.asset.bookValue !== undefined ? props.trade.asset.bookValue : undefined,
-                                        dividendPerShare: props.trade.asset.dividendPerShare !== undefined ? props.trade.asset.dividendPerShare : undefined,
-                                        dividendYield: props.trade.asset.dividendYield !== undefined ? props.trade.asset.dividendYield : undefined,
-                                        eps: props.trade.asset.eps !== undefined ? props.trade.asset.eps : undefined,
-                                        revenuePerShareTTM: props.trade.asset.revenuePerShareTTM !== undefined ? props.trade.asset.revenuePerShareTTM : undefined,
-                                        profitMargin: props.trade.asset.profitMargin !== undefined ? props.trade.asset.profitMargin : undefined,
-                                        operatingMarginTTM: props.trade.asset.operatingMarginTTM !== undefined ? props.trade.asset.operatingMarginTTM : undefined,
-                                        returnOnAssetsTTM: props.trade.asset.returnOnAssetsTTM !== undefined ? props.trade.asset.returnOnAssetsTTM : undefined,
-                                        returnOnEquityTTM: props.trade.asset.returnOnEquityTTM !== undefined ? props.trade.asset.returnOnEquityTTM : undefined,
-                                        revenueTTM: props.trade.asset.revenueTTM !== undefined ? props.trade.asset.revenueTTM : undefined,
-                                        grossProfitTTM: props.trade.asset.grossProfitTTM !== undefined ? props.trade.asset.grossProfitTTM : undefined,
-                                        dilutedEPSTTM: props.trade.asset.dilutedEPSTTM !== undefined ? props.trade.asset.dilutedEPSTTM : undefined,
-                                        quarterlyEarningsGrowthYOY: props.trade.asset.quarterlyEarningsGrowthYOY !== undefined ? props.trade.asset.quarterlyEarningsGrowthYOY : undefined,
-                                        quarterlyRevenueGrowthYOY: props.trade.asset.quarterlyRevenueGrowthYOY !== undefined ? props.trade.asset.quarterlyRevenueGrowthYOY : undefined,
-                                        analystTargetPrice: props.trade.asset.analystTargetPrice !== undefined ? props.trade.asset.analystTargetPrice : undefined,
-                                        analystRatingStrongBuy: props.trade.asset.analystRatingStrongBuy !== undefined ? props.trade.asset.analystRatingStrongBuy : undefined,
-                                        analystRatingBuy: props.trade.asset.analystRatingBuy !== undefined ? props.trade.asset.analystRatingBuy : undefined,
-                                        analystRatingHold: props.trade.asset.analystRatingHold !== undefined ? props.trade.asset.analystRatingHold : undefined,
-                                        analystRatingSell: props.trade.asset.analystRatingSell !== undefined ? props.trade.asset.analystRatingSell : undefined,
-                                        analystRatingStrongSell: props.trade.asset.analystRatingStrongSell !== undefined ? props.trade.asset.analystRatingStrongSell : undefined,
-                                        trailingPE: props.trade.asset.trailingPE !== undefined ? props.trade.asset.trailingPE : undefined,
-                                        forwardPE: props.trade.asset.forwardPE !== undefined ? props.trade.asset.forwardPE : undefined,
-                                        priceToSalesRatioTTM: props.trade.asset.priceToSalesRatioTTM !== undefined ? props.trade.asset.priceToSalesRatioTTM : undefined,
-                                        priceToBookRatio: props.trade.asset.priceToBookRatio !== undefined ? props.trade.asset.priceToBookRatio : undefined,
-                                        evToRevenue: props.trade.asset.evToRevenue !== undefined ? props.trade.asset.evToRevenue : undefined,
-                                        evToEbitda: props.trade.asset.evToEbitda !== undefined ? props.trade.asset.evToEbitda : undefined,
-                                        beta: props.trade.asset.beta !== undefined ? props.trade.asset.beta : undefined,
-                                        week52High: props.trade.asset.week52High !== undefined ? props.trade.asset.week52High : undefined,
-                                        week52Low: props.trade.asset.week52Low !== undefined ? props.trade.asset.week52Low : undefined,
-                                        day50MovingAverage: props.trade.asset.day50MovingAverage !== undefined ? props.trade.asset.day50MovingAverage : undefined,
-                                        day200MovingAverage: props.trade.asset.day200MovingAverage !== undefined ? props.trade.asset.day200MovingAverage : undefined,
-                                        sharesOutstanding: props.trade.asset.sharesOutstanding !== undefined ? props.trade.asset.sharesOutstanding : undefined,
-                                        dividendDate: props.trade.asset.dividendDate !== undefined ? props.trade.asset.dividendDate : undefined,
-                                        exDividendDate: props.trade.asset.exDividendDate !== undefined ? props.trade.asset.exDividendDate : undefined,
-                                        sellPrice: props.trade.asset.sellPrice !== undefined ? props.trade.asset.sellPrice : undefined,
-                                        buyPrice: props.trade.asset.buyPrice !== undefined ? props.trade.asset.buyPrice : undefined,
-                                    },
-                                }
-                            } : undefined,
-                        },
-                    }
-                } : undefined,
-                order: props.order ? {
-                    connectOrCreate: {
-                        where: {
-                            id: props.order.id !== undefined ? props.order.id : undefined,
-                        },
-                        create: {
-                            qty: props.order.qty !== undefined ? props.order.qty : undefined,
-                            notional: props.order.notional !== undefined ? props.order.notional : undefined,
-                            side: props.order.side !== undefined ? props.order.side : undefined,
-                            type: props.order.type !== undefined ? props.order.type : undefined,
-                            timeInForce: props.order.timeInForce !== undefined ? props.order.timeInForce : undefined,
-                            limitPrice: props.order.limitPrice !== undefined ? props.order.limitPrice : undefined,
-                            stopPrice: props.order.stopPrice !== undefined ? props.order.stopPrice : undefined,
-                            trailPrice: props.order.trailPrice !== undefined ? props.order.trailPrice : undefined,
-                            trailPercent: props.order.trailPercent !== undefined ? props.order.trailPercent : undefined,
-                            extendedHours: props.order.extendedHours !== undefined ? props.order.extendedHours : undefined,
-                            clientOrderId: props.order.clientOrderId !== undefined ? props.order.clientOrderId : undefined,
-                            status: props.order.status !== undefined ? props.order.status : undefined,
-                            submittedAt: props.order.submittedAt !== undefined ? props.order.submittedAt : undefined,
-                            filledAt: props.order.filledAt !== undefined ? props.order.filledAt : undefined,
-                            filledAvgPrice: props.order.filledAvgPrice !== undefined ? props.order.filledAvgPrice : undefined,
-                            fee: props.order.fee !== undefined ? props.order.fee : undefined,
-                            alpacaAccount: props.order.alpacaAccount ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.order.alpacaAccount.id !== undefined ? props.order.alpacaAccount.id : undefined,
-                                    },
-                                    create: {
-                                        type: props.order.alpacaAccount.type !== undefined ? props.order.alpacaAccount.type : undefined,
-                                        APIKey: props.order.alpacaAccount.APIKey !== undefined ? props.order.alpacaAccount.APIKey : undefined,
-                                        APISecret: props.order.alpacaAccount.APISecret !== undefined ? props.order.alpacaAccount.APISecret : undefined,
-                                        configuration: props.order.alpacaAccount.configuration !== undefined ? props.order.alpacaAccount.configuration : undefined,
-                                        marketOpen: props.order.alpacaAccount.marketOpen !== undefined ? props.order.alpacaAccount.marketOpen : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            asset: props.order.asset ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.order.asset.id !== undefined ? props.order.asset.id : undefined,
-                                        symbol: props.order.asset.symbol !== undefined ? props.order.asset.symbol : undefined,
-                                        name: props.order.asset.name !== undefined ? props.order.asset.name : undefined,
-                                    },
-                                    create: {
-                                        symbol: props.order.asset.symbol !== undefined ? props.order.asset.symbol : undefined,
-                                        name: props.order.asset.name !== undefined ? props.order.asset.name : undefined,
-                                        type: props.order.asset.type !== undefined ? props.order.asset.type : undefined,
-                                        logoUrl: props.order.asset.logoUrl !== undefined ? props.order.asset.logoUrl : undefined,
-                                        description: props.order.asset.description !== undefined ? props.order.asset.description : undefined,
-                                        cik: props.order.asset.cik !== undefined ? props.order.asset.cik : undefined,
-                                        exchange: props.order.asset.exchange !== undefined ? props.order.asset.exchange : undefined,
-                                        currency: props.order.asset.currency !== undefined ? props.order.asset.currency : undefined,
-                                        country: props.order.asset.country !== undefined ? props.order.asset.country : undefined,
-                                        sector: props.order.asset.sector !== undefined ? props.order.asset.sector : undefined,
-                                        industry: props.order.asset.industry !== undefined ? props.order.asset.industry : undefined,
-                                        address: props.order.asset.address !== undefined ? props.order.asset.address : undefined,
-                                        officialSite: props.order.asset.officialSite !== undefined ? props.order.asset.officialSite : undefined,
-                                        fiscalYearEnd: props.order.asset.fiscalYearEnd !== undefined ? props.order.asset.fiscalYearEnd : undefined,
-                                        latestQuarter: props.order.asset.latestQuarter !== undefined ? props.order.asset.latestQuarter : undefined,
-                                        marketCapitalization: props.order.asset.marketCapitalization !== undefined ? props.order.asset.marketCapitalization : undefined,
-                                        ebitda: props.order.asset.ebitda !== undefined ? props.order.asset.ebitda : undefined,
-                                        peRatio: props.order.asset.peRatio !== undefined ? props.order.asset.peRatio : undefined,
-                                        pegRatio: props.order.asset.pegRatio !== undefined ? props.order.asset.pegRatio : undefined,
-                                        bookValue: props.order.asset.bookValue !== undefined ? props.order.asset.bookValue : undefined,
-                                        dividendPerShare: props.order.asset.dividendPerShare !== undefined ? props.order.asset.dividendPerShare : undefined,
-                                        dividendYield: props.order.asset.dividendYield !== undefined ? props.order.asset.dividendYield : undefined,
-                                        eps: props.order.asset.eps !== undefined ? props.order.asset.eps : undefined,
-                                        revenuePerShareTTM: props.order.asset.revenuePerShareTTM !== undefined ? props.order.asset.revenuePerShareTTM : undefined,
-                                        profitMargin: props.order.asset.profitMargin !== undefined ? props.order.asset.profitMargin : undefined,
-                                        operatingMarginTTM: props.order.asset.operatingMarginTTM !== undefined ? props.order.asset.operatingMarginTTM : undefined,
-                                        returnOnAssetsTTM: props.order.asset.returnOnAssetsTTM !== undefined ? props.order.asset.returnOnAssetsTTM : undefined,
-                                        returnOnEquityTTM: props.order.asset.returnOnEquityTTM !== undefined ? props.order.asset.returnOnEquityTTM : undefined,
-                                        revenueTTM: props.order.asset.revenueTTM !== undefined ? props.order.asset.revenueTTM : undefined,
-                                        grossProfitTTM: props.order.asset.grossProfitTTM !== undefined ? props.order.asset.grossProfitTTM : undefined,
-                                        dilutedEPSTTM: props.order.asset.dilutedEPSTTM !== undefined ? props.order.asset.dilutedEPSTTM : undefined,
-                                        quarterlyEarningsGrowthYOY: props.order.asset.quarterlyEarningsGrowthYOY !== undefined ? props.order.asset.quarterlyEarningsGrowthYOY : undefined,
-                                        quarterlyRevenueGrowthYOY: props.order.asset.quarterlyRevenueGrowthYOY !== undefined ? props.order.asset.quarterlyRevenueGrowthYOY : undefined,
-                                        analystTargetPrice: props.order.asset.analystTargetPrice !== undefined ? props.order.asset.analystTargetPrice : undefined,
-                                        analystRatingStrongBuy: props.order.asset.analystRatingStrongBuy !== undefined ? props.order.asset.analystRatingStrongBuy : undefined,
-                                        analystRatingBuy: props.order.asset.analystRatingBuy !== undefined ? props.order.asset.analystRatingBuy : undefined,
-                                        analystRatingHold: props.order.asset.analystRatingHold !== undefined ? props.order.asset.analystRatingHold : undefined,
-                                        analystRatingSell: props.order.asset.analystRatingSell !== undefined ? props.order.asset.analystRatingSell : undefined,
-                                        analystRatingStrongSell: props.order.asset.analystRatingStrongSell !== undefined ? props.order.asset.analystRatingStrongSell : undefined,
-                                        trailingPE: props.order.asset.trailingPE !== undefined ? props.order.asset.trailingPE : undefined,
-                                        forwardPE: props.order.asset.forwardPE !== undefined ? props.order.asset.forwardPE : undefined,
-                                        priceToSalesRatioTTM: props.order.asset.priceToSalesRatioTTM !== undefined ? props.order.asset.priceToSalesRatioTTM : undefined,
-                                        priceToBookRatio: props.order.asset.priceToBookRatio !== undefined ? props.order.asset.priceToBookRatio : undefined,
-                                        evToRevenue: props.order.asset.evToRevenue !== undefined ? props.order.asset.evToRevenue : undefined,
-                                        evToEbitda: props.order.asset.evToEbitda !== undefined ? props.order.asset.evToEbitda : undefined,
-                                        beta: props.order.asset.beta !== undefined ? props.order.asset.beta : undefined,
-                                        week52High: props.order.asset.week52High !== undefined ? props.order.asset.week52High : undefined,
-                                        week52Low: props.order.asset.week52Low !== undefined ? props.order.asset.week52Low : undefined,
-                                        day50MovingAverage: props.order.asset.day50MovingAverage !== undefined ? props.order.asset.day50MovingAverage : undefined,
-                                        day200MovingAverage: props.order.asset.day200MovingAverage !== undefined ? props.order.asset.day200MovingAverage : undefined,
-                                        sharesOutstanding: props.order.asset.sharesOutstanding !== undefined ? props.order.asset.sharesOutstanding : undefined,
-                                        dividendDate: props.order.asset.dividendDate !== undefined ? props.order.asset.dividendDate : undefined,
-                                        exDividendDate: props.order.asset.exDividendDate !== undefined ? props.order.asset.exDividendDate : undefined,
-                                        sellPrice: props.order.asset.sellPrice !== undefined ? props.order.asset.sellPrice : undefined,
-                                        buyPrice: props.order.asset.buyPrice !== undefined ? props.order.asset.buyPrice : undefined,
-                                    },
-                                }
-                            } : undefined,
-                        },
-                    }
-                } : undefined,
+                trade: props.trade ?
+                    typeof props.trade === 'object' && Object.keys(props.trade).length === 1 && Object.keys(props.trade)[0] === 'id'
+                        ? { connect: {
+                                id: props.trade.id
+                            }
+                        }
+                        : { connectOrCreate: {
+                                where: {
+                                    id: props.trade.id !== undefined ? props.trade.id : undefined,
+                                },
+                                create: {
+                                    qty: props.trade.qty !== undefined ? props.trade.qty : undefined,
+                                    price: props.trade.price !== undefined ? props.trade.price : undefined,
+                                    total: props.trade.total !== undefined ? props.trade.total : undefined,
+                                    signal: props.trade.signal !== undefined ? props.trade.signal : undefined,
+                                    strategy: props.trade.strategy !== undefined ? props.trade.strategy : undefined,
+                                    analysis: props.trade.analysis !== undefined ? props.trade.analysis : undefined,
+                                    confidence: props.trade.confidence !== undefined ? props.trade.confidence : undefined,
+                                    timestamp: props.trade.timestamp !== undefined ? props.trade.timestamp : undefined,
+                                    status: props.trade.status !== undefined ? props.trade.status : undefined,
+                                    optionContractType: props.trade.optionContractType !== undefined ? props.trade.optionContractType : undefined,
+                                    alpacaAccount: props.trade.alpacaAccount ?
+                                        typeof props.trade.alpacaAccount === 'object' && Object.keys(props.trade.alpacaAccount).length === 1 && Object.keys(props.trade.alpacaAccount)[0] === 'id'
+                                            ? { connect: {
+                                                    id: props.trade.alpacaAccount.id
+                                                }
+                                            }
+                                            : { connectOrCreate: {
+                                                    where: {
+                                                        id: props.trade.alpacaAccount.id !== undefined ? props.trade.alpacaAccount.id : undefined,
+                                                    },
+                                                    create: {
+                                                        type: props.trade.alpacaAccount.type !== undefined ? props.trade.alpacaAccount.type : undefined,
+                                                        APIKey: props.trade.alpacaAccount.APIKey !== undefined ? props.trade.alpacaAccount.APIKey : undefined,
+                                                        APISecret: props.trade.alpacaAccount.APISecret !== undefined ? props.trade.alpacaAccount.APISecret : undefined,
+                                                        configuration: props.trade.alpacaAccount.configuration !== undefined ? props.trade.alpacaAccount.configuration : undefined,
+                                                        marketOpen: props.trade.alpacaAccount.marketOpen !== undefined ? props.trade.alpacaAccount.marketOpen : undefined,
+                                                    },
+                                                }
+                                            } : undefined,
+                                    asset: props.trade.asset ?
+                                        typeof props.trade.asset === 'object' && Object.keys(props.trade.asset).length === 1 && Object.keys(props.trade.asset)[0] === 'id'
+                                            ? { connect: {
+                                                    id: props.trade.asset.id
+                                                }
+                                            }
+                                            : { connectOrCreate: {
+                                                    where: {
+                                                        id: props.trade.asset.id !== undefined ? props.trade.asset.id : undefined,
+                                                        symbol: props.trade.asset.symbol !== undefined ? props.trade.asset.symbol : undefined,
+                                                        name: props.trade.asset.name !== undefined ? props.trade.asset.name : undefined,
+                                                    },
+                                                    create: {
+                                                        symbol: props.trade.asset.symbol !== undefined ? props.trade.asset.symbol : undefined,
+                                                        name: props.trade.asset.name !== undefined ? props.trade.asset.name : undefined,
+                                                        type: props.trade.asset.type !== undefined ? props.trade.asset.type : undefined,
+                                                        logoUrl: props.trade.asset.logoUrl !== undefined ? props.trade.asset.logoUrl : undefined,
+                                                        description: props.trade.asset.description !== undefined ? props.trade.asset.description : undefined,
+                                                        cik: props.trade.asset.cik !== undefined ? props.trade.asset.cik : undefined,
+                                                        exchange: props.trade.asset.exchange !== undefined ? props.trade.asset.exchange : undefined,
+                                                        currency: props.trade.asset.currency !== undefined ? props.trade.asset.currency : undefined,
+                                                        country: props.trade.asset.country !== undefined ? props.trade.asset.country : undefined,
+                                                        sector: props.trade.asset.sector !== undefined ? props.trade.asset.sector : undefined,
+                                                        industry: props.trade.asset.industry !== undefined ? props.trade.asset.industry : undefined,
+                                                        address: props.trade.asset.address !== undefined ? props.trade.asset.address : undefined,
+                                                        officialSite: props.trade.asset.officialSite !== undefined ? props.trade.asset.officialSite : undefined,
+                                                        fiscalYearEnd: props.trade.asset.fiscalYearEnd !== undefined ? props.trade.asset.fiscalYearEnd : undefined,
+                                                        latestQuarter: props.trade.asset.latestQuarter !== undefined ? props.trade.asset.latestQuarter : undefined,
+                                                        marketCapitalization: props.trade.asset.marketCapitalization !== undefined ? props.trade.asset.marketCapitalization : undefined,
+                                                        ebitda: props.trade.asset.ebitda !== undefined ? props.trade.asset.ebitda : undefined,
+                                                        peRatio: props.trade.asset.peRatio !== undefined ? props.trade.asset.peRatio : undefined,
+                                                        pegRatio: props.trade.asset.pegRatio !== undefined ? props.trade.asset.pegRatio : undefined,
+                                                        bookValue: props.trade.asset.bookValue !== undefined ? props.trade.asset.bookValue : undefined,
+                                                        dividendPerShare: props.trade.asset.dividendPerShare !== undefined ? props.trade.asset.dividendPerShare : undefined,
+                                                        dividendYield: props.trade.asset.dividendYield !== undefined ? props.trade.asset.dividendYield : undefined,
+                                                        eps: props.trade.asset.eps !== undefined ? props.trade.asset.eps : undefined,
+                                                        revenuePerShareTTM: props.trade.asset.revenuePerShareTTM !== undefined ? props.trade.asset.revenuePerShareTTM : undefined,
+                                                        profitMargin: props.trade.asset.profitMargin !== undefined ? props.trade.asset.profitMargin : undefined,
+                                                        operatingMarginTTM: props.trade.asset.operatingMarginTTM !== undefined ? props.trade.asset.operatingMarginTTM : undefined,
+                                                        returnOnAssetsTTM: props.trade.asset.returnOnAssetsTTM !== undefined ? props.trade.asset.returnOnAssetsTTM : undefined,
+                                                        returnOnEquityTTM: props.trade.asset.returnOnEquityTTM !== undefined ? props.trade.asset.returnOnEquityTTM : undefined,
+                                                        revenueTTM: props.trade.asset.revenueTTM !== undefined ? props.trade.asset.revenueTTM : undefined,
+                                                        grossProfitTTM: props.trade.asset.grossProfitTTM !== undefined ? props.trade.asset.grossProfitTTM : undefined,
+                                                        dilutedEPSTTM: props.trade.asset.dilutedEPSTTM !== undefined ? props.trade.asset.dilutedEPSTTM : undefined,
+                                                        quarterlyEarningsGrowthYOY: props.trade.asset.quarterlyEarningsGrowthYOY !== undefined ? props.trade.asset.quarterlyEarningsGrowthYOY : undefined,
+                                                        quarterlyRevenueGrowthYOY: props.trade.asset.quarterlyRevenueGrowthYOY !== undefined ? props.trade.asset.quarterlyRevenueGrowthYOY : undefined,
+                                                        analystTargetPrice: props.trade.asset.analystTargetPrice !== undefined ? props.trade.asset.analystTargetPrice : undefined,
+                                                        analystRatingStrongBuy: props.trade.asset.analystRatingStrongBuy !== undefined ? props.trade.asset.analystRatingStrongBuy : undefined,
+                                                        analystRatingBuy: props.trade.asset.analystRatingBuy !== undefined ? props.trade.asset.analystRatingBuy : undefined,
+                                                        analystRatingHold: props.trade.asset.analystRatingHold !== undefined ? props.trade.asset.analystRatingHold : undefined,
+                                                        analystRatingSell: props.trade.asset.analystRatingSell !== undefined ? props.trade.asset.analystRatingSell : undefined,
+                                                        analystRatingStrongSell: props.trade.asset.analystRatingStrongSell !== undefined ? props.trade.asset.analystRatingStrongSell : undefined,
+                                                        trailingPE: props.trade.asset.trailingPE !== undefined ? props.trade.asset.trailingPE : undefined,
+                                                        forwardPE: props.trade.asset.forwardPE !== undefined ? props.trade.asset.forwardPE : undefined,
+                                                        priceToSalesRatioTTM: props.trade.asset.priceToSalesRatioTTM !== undefined ? props.trade.asset.priceToSalesRatioTTM : undefined,
+                                                        priceToBookRatio: props.trade.asset.priceToBookRatio !== undefined ? props.trade.asset.priceToBookRatio : undefined,
+                                                        evToRevenue: props.trade.asset.evToRevenue !== undefined ? props.trade.asset.evToRevenue : undefined,
+                                                        evToEbitda: props.trade.asset.evToEbitda !== undefined ? props.trade.asset.evToEbitda : undefined,
+                                                        beta: props.trade.asset.beta !== undefined ? props.trade.asset.beta : undefined,
+                                                        week52High: props.trade.asset.week52High !== undefined ? props.trade.asset.week52High : undefined,
+                                                        week52Low: props.trade.asset.week52Low !== undefined ? props.trade.asset.week52Low : undefined,
+                                                        day50MovingAverage: props.trade.asset.day50MovingAverage !== undefined ? props.trade.asset.day50MovingAverage : undefined,
+                                                        day200MovingAverage: props.trade.asset.day200MovingAverage !== undefined ? props.trade.asset.day200MovingAverage : undefined,
+                                                        sharesOutstanding: props.trade.asset.sharesOutstanding !== undefined ? props.trade.asset.sharesOutstanding : undefined,
+                                                        dividendDate: props.trade.asset.dividendDate !== undefined ? props.trade.asset.dividendDate : undefined,
+                                                        exDividendDate: props.trade.asset.exDividendDate !== undefined ? props.trade.asset.exDividendDate : undefined,
+                                                        sellPrice: props.trade.asset.sellPrice !== undefined ? props.trade.asset.sellPrice : undefined,
+                                                        buyPrice: props.trade.asset.buyPrice !== undefined ? props.trade.asset.buyPrice : undefined,
+                                                    },
+                                                }
+                                            } : undefined,
+                                },
+                            }
+                        } : undefined,
+                order: props.order ?
+                    typeof props.order === 'object' && Object.keys(props.order).length === 1 && Object.keys(props.order)[0] === 'id'
+                        ? { connect: {
+                                id: props.order.id
+                            }
+                        }
+                        : { connectOrCreate: {
+                                where: {
+                                    id: props.order.id !== undefined ? props.order.id : undefined,
+                                },
+                                create: {
+                                    qty: props.order.qty !== undefined ? props.order.qty : undefined,
+                                    notional: props.order.notional !== undefined ? props.order.notional : undefined,
+                                    side: props.order.side !== undefined ? props.order.side : undefined,
+                                    type: props.order.type !== undefined ? props.order.type : undefined,
+                                    timeInForce: props.order.timeInForce !== undefined ? props.order.timeInForce : undefined,
+                                    limitPrice: props.order.limitPrice !== undefined ? props.order.limitPrice : undefined,
+                                    stopPrice: props.order.stopPrice !== undefined ? props.order.stopPrice : undefined,
+                                    trailPrice: props.order.trailPrice !== undefined ? props.order.trailPrice : undefined,
+                                    trailPercent: props.order.trailPercent !== undefined ? props.order.trailPercent : undefined,
+                                    extendedHours: props.order.extendedHours !== undefined ? props.order.extendedHours : undefined,
+                                    clientOrderId: props.order.clientOrderId !== undefined ? props.order.clientOrderId : undefined,
+                                    status: props.order.status !== undefined ? props.order.status : undefined,
+                                    submittedAt: props.order.submittedAt !== undefined ? props.order.submittedAt : undefined,
+                                    filledAt: props.order.filledAt !== undefined ? props.order.filledAt : undefined,
+                                    filledAvgPrice: props.order.filledAvgPrice !== undefined ? props.order.filledAvgPrice : undefined,
+                                    fee: props.order.fee !== undefined ? props.order.fee : undefined,
+                                    alpacaAccount: props.order.alpacaAccount ?
+                                        typeof props.order.alpacaAccount === 'object' && Object.keys(props.order.alpacaAccount).length === 1 && Object.keys(props.order.alpacaAccount)[0] === 'id'
+                                            ? { connect: {
+                                                    id: props.order.alpacaAccount.id
+                                                }
+                                            }
+                                            : { connectOrCreate: {
+                                                    where: {
+                                                        id: props.order.alpacaAccount.id !== undefined ? props.order.alpacaAccount.id : undefined,
+                                                    },
+                                                    create: {
+                                                        type: props.order.alpacaAccount.type !== undefined ? props.order.alpacaAccount.type : undefined,
+                                                        APIKey: props.order.alpacaAccount.APIKey !== undefined ? props.order.alpacaAccount.APIKey : undefined,
+                                                        APISecret: props.order.alpacaAccount.APISecret !== undefined ? props.order.alpacaAccount.APISecret : undefined,
+                                                        configuration: props.order.alpacaAccount.configuration !== undefined ? props.order.alpacaAccount.configuration : undefined,
+                                                        marketOpen: props.order.alpacaAccount.marketOpen !== undefined ? props.order.alpacaAccount.marketOpen : undefined,
+                                                    },
+                                                }
+                                            } : undefined,
+                                    asset: props.order.asset ?
+                                        typeof props.order.asset === 'object' && Object.keys(props.order.asset).length === 1 && Object.keys(props.order.asset)[0] === 'id'
+                                            ? { connect: {
+                                                    id: props.order.asset.id
+                                                }
+                                            }
+                                            : { connectOrCreate: {
+                                                    where: {
+                                                        id: props.order.asset.id !== undefined ? props.order.asset.id : undefined,
+                                                        symbol: props.order.asset.symbol !== undefined ? props.order.asset.symbol : undefined,
+                                                        name: props.order.asset.name !== undefined ? props.order.asset.name : undefined,
+                                                    },
+                                                    create: {
+                                                        symbol: props.order.asset.symbol !== undefined ? props.order.asset.symbol : undefined,
+                                                        name: props.order.asset.name !== undefined ? props.order.asset.name : undefined,
+                                                        type: props.order.asset.type !== undefined ? props.order.asset.type : undefined,
+                                                        logoUrl: props.order.asset.logoUrl !== undefined ? props.order.asset.logoUrl : undefined,
+                                                        description: props.order.asset.description !== undefined ? props.order.asset.description : undefined,
+                                                        cik: props.order.asset.cik !== undefined ? props.order.asset.cik : undefined,
+                                                        exchange: props.order.asset.exchange !== undefined ? props.order.asset.exchange : undefined,
+                                                        currency: props.order.asset.currency !== undefined ? props.order.asset.currency : undefined,
+                                                        country: props.order.asset.country !== undefined ? props.order.asset.country : undefined,
+                                                        sector: props.order.asset.sector !== undefined ? props.order.asset.sector : undefined,
+                                                        industry: props.order.asset.industry !== undefined ? props.order.asset.industry : undefined,
+                                                        address: props.order.asset.address !== undefined ? props.order.asset.address : undefined,
+                                                        officialSite: props.order.asset.officialSite !== undefined ? props.order.asset.officialSite : undefined,
+                                                        fiscalYearEnd: props.order.asset.fiscalYearEnd !== undefined ? props.order.asset.fiscalYearEnd : undefined,
+                                                        latestQuarter: props.order.asset.latestQuarter !== undefined ? props.order.asset.latestQuarter : undefined,
+                                                        marketCapitalization: props.order.asset.marketCapitalization !== undefined ? props.order.asset.marketCapitalization : undefined,
+                                                        ebitda: props.order.asset.ebitda !== undefined ? props.order.asset.ebitda : undefined,
+                                                        peRatio: props.order.asset.peRatio !== undefined ? props.order.asset.peRatio : undefined,
+                                                        pegRatio: props.order.asset.pegRatio !== undefined ? props.order.asset.pegRatio : undefined,
+                                                        bookValue: props.order.asset.bookValue !== undefined ? props.order.asset.bookValue : undefined,
+                                                        dividendPerShare: props.order.asset.dividendPerShare !== undefined ? props.order.asset.dividendPerShare : undefined,
+                                                        dividendYield: props.order.asset.dividendYield !== undefined ? props.order.asset.dividendYield : undefined,
+                                                        eps: props.order.asset.eps !== undefined ? props.order.asset.eps : undefined,
+                                                        revenuePerShareTTM: props.order.asset.revenuePerShareTTM !== undefined ? props.order.asset.revenuePerShareTTM : undefined,
+                                                        profitMargin: props.order.asset.profitMargin !== undefined ? props.order.asset.profitMargin : undefined,
+                                                        operatingMarginTTM: props.order.asset.operatingMarginTTM !== undefined ? props.order.asset.operatingMarginTTM : undefined,
+                                                        returnOnAssetsTTM: props.order.asset.returnOnAssetsTTM !== undefined ? props.order.asset.returnOnAssetsTTM : undefined,
+                                                        returnOnEquityTTM: props.order.asset.returnOnEquityTTM !== undefined ? props.order.asset.returnOnEquityTTM : undefined,
+                                                        revenueTTM: props.order.asset.revenueTTM !== undefined ? props.order.asset.revenueTTM : undefined,
+                                                        grossProfitTTM: props.order.asset.grossProfitTTM !== undefined ? props.order.asset.grossProfitTTM : undefined,
+                                                        dilutedEPSTTM: props.order.asset.dilutedEPSTTM !== undefined ? props.order.asset.dilutedEPSTTM : undefined,
+                                                        quarterlyEarningsGrowthYOY: props.order.asset.quarterlyEarningsGrowthYOY !== undefined ? props.order.asset.quarterlyEarningsGrowthYOY : undefined,
+                                                        quarterlyRevenueGrowthYOY: props.order.asset.quarterlyRevenueGrowthYOY !== undefined ? props.order.asset.quarterlyRevenueGrowthYOY : undefined,
+                                                        analystTargetPrice: props.order.asset.analystTargetPrice !== undefined ? props.order.asset.analystTargetPrice : undefined,
+                                                        analystRatingStrongBuy: props.order.asset.analystRatingStrongBuy !== undefined ? props.order.asset.analystRatingStrongBuy : undefined,
+                                                        analystRatingBuy: props.order.asset.analystRatingBuy !== undefined ? props.order.asset.analystRatingBuy : undefined,
+                                                        analystRatingHold: props.order.asset.analystRatingHold !== undefined ? props.order.asset.analystRatingHold : undefined,
+                                                        analystRatingSell: props.order.asset.analystRatingSell !== undefined ? props.order.asset.analystRatingSell : undefined,
+                                                        analystRatingStrongSell: props.order.asset.analystRatingStrongSell !== undefined ? props.order.asset.analystRatingStrongSell : undefined,
+                                                        trailingPE: props.order.asset.trailingPE !== undefined ? props.order.asset.trailingPE : undefined,
+                                                        forwardPE: props.order.asset.forwardPE !== undefined ? props.order.asset.forwardPE : undefined,
+                                                        priceToSalesRatioTTM: props.order.asset.priceToSalesRatioTTM !== undefined ? props.order.asset.priceToSalesRatioTTM : undefined,
+                                                        priceToBookRatio: props.order.asset.priceToBookRatio !== undefined ? props.order.asset.priceToBookRatio : undefined,
+                                                        evToRevenue: props.order.asset.evToRevenue !== undefined ? props.order.asset.evToRevenue : undefined,
+                                                        evToEbitda: props.order.asset.evToEbitda !== undefined ? props.order.asset.evToEbitda : undefined,
+                                                        beta: props.order.asset.beta !== undefined ? props.order.asset.beta : undefined,
+                                                        week52High: props.order.asset.week52High !== undefined ? props.order.asset.week52High : undefined,
+                                                        week52Low: props.order.asset.week52Low !== undefined ? props.order.asset.week52Low : undefined,
+                                                        day50MovingAverage: props.order.asset.day50MovingAverage !== undefined ? props.order.asset.day50MovingAverage : undefined,
+                                                        day200MovingAverage: props.order.asset.day200MovingAverage !== undefined ? props.order.asset.day200MovingAverage : undefined,
+                                                        sharesOutstanding: props.order.asset.sharesOutstanding !== undefined ? props.order.asset.sharesOutstanding : undefined,
+                                                        dividendDate: props.order.asset.dividendDate !== undefined ? props.order.asset.dividendDate : undefined,
+                                                        exDividendDate: props.order.asset.exDividendDate !== undefined ? props.order.asset.exDividendDate : undefined,
+                                                        sellPrice: props.order.asset.sellPrice !== undefined ? props.order.asset.sellPrice : undefined,
+                                                        buyPrice: props.order.asset.buyPrice !== undefined ? props.order.asset.buyPrice : undefined,
+                                                    },
+                                                }
+                                            } : undefined,
+                                },
+                            }
+                        } : undefined,
             },
         };
         const filteredVariables = (0, utils_1.removeUndefinedProps)(variables);
@@ -498,7 +526,6 @@ exports.Action = {
                 sequence: prop.sequence !== undefined ? prop.sequence : undefined,
                 tradeId: prop.tradeId !== undefined ? prop.tradeId : undefined,
                 type: prop.type !== undefined ? prop.type : undefined,
-                orderId: prop.orderId !== undefined ? prop.orderId : undefined,
                 note: prop.note !== undefined ? prop.note : undefined,
                 status: prop.status !== undefined ? prop.status : undefined,
                 fee: prop.fee !== undefined ? prop.fee : undefined,
@@ -535,7 +562,6 @@ exports.Action = {
           sequence
           tradeId
           type
-          orderId
           note
           status
           fee
@@ -775,9 +801,6 @@ exports.Action = {
                 type: props.type !== undefined ? {
                     set: props.type
                 } : undefined,
-                orderId: props.orderId !== undefined ? {
-                    set: props.orderId
-                } : undefined,
                 note: props.note !== undefined ? {
                     set: props.note
                 } : undefined,
@@ -1118,86 +1141,96 @@ exports.Action = {
                             timestamp: props.trade.timestamp !== undefined ? props.trade.timestamp : undefined,
                             status: props.trade.status !== undefined ? props.trade.status : undefined,
                             optionContractType: props.trade.optionContractType !== undefined ? props.trade.optionContractType : undefined,
-                            alpacaAccount: props.trade.alpacaAccount ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.trade.alpacaAccount.id !== undefined ? props.trade.alpacaAccount.id : undefined,
-                                    },
-                                    create: {
-                                        type: props.trade.alpacaAccount.type !== undefined ? props.trade.alpacaAccount.type : undefined,
-                                        APIKey: props.trade.alpacaAccount.APIKey !== undefined ? props.trade.alpacaAccount.APIKey : undefined,
-                                        APISecret: props.trade.alpacaAccount.APISecret !== undefined ? props.trade.alpacaAccount.APISecret : undefined,
-                                        configuration: props.trade.alpacaAccount.configuration !== undefined ? props.trade.alpacaAccount.configuration : undefined,
-                                        marketOpen: props.trade.alpacaAccount.marketOpen !== undefined ? props.trade.alpacaAccount.marketOpen : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            asset: props.trade.asset ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.trade.asset.id !== undefined ? props.trade.asset.id : undefined,
-                                        symbol: props.trade.asset.symbol !== undefined ? props.trade.asset.symbol : undefined,
-                                        name: props.trade.asset.name !== undefined ? props.trade.asset.name : undefined,
-                                    },
-                                    create: {
-                                        symbol: props.trade.asset.symbol !== undefined ? props.trade.asset.symbol : undefined,
-                                        name: props.trade.asset.name !== undefined ? props.trade.asset.name : undefined,
-                                        type: props.trade.asset.type !== undefined ? props.trade.asset.type : undefined,
-                                        logoUrl: props.trade.asset.logoUrl !== undefined ? props.trade.asset.logoUrl : undefined,
-                                        description: props.trade.asset.description !== undefined ? props.trade.asset.description : undefined,
-                                        cik: props.trade.asset.cik !== undefined ? props.trade.asset.cik : undefined,
-                                        exchange: props.trade.asset.exchange !== undefined ? props.trade.asset.exchange : undefined,
-                                        currency: props.trade.asset.currency !== undefined ? props.trade.asset.currency : undefined,
-                                        country: props.trade.asset.country !== undefined ? props.trade.asset.country : undefined,
-                                        sector: props.trade.asset.sector !== undefined ? props.trade.asset.sector : undefined,
-                                        industry: props.trade.asset.industry !== undefined ? props.trade.asset.industry : undefined,
-                                        address: props.trade.asset.address !== undefined ? props.trade.asset.address : undefined,
-                                        officialSite: props.trade.asset.officialSite !== undefined ? props.trade.asset.officialSite : undefined,
-                                        fiscalYearEnd: props.trade.asset.fiscalYearEnd !== undefined ? props.trade.asset.fiscalYearEnd : undefined,
-                                        latestQuarter: props.trade.asset.latestQuarter !== undefined ? props.trade.asset.latestQuarter : undefined,
-                                        marketCapitalization: props.trade.asset.marketCapitalization !== undefined ? props.trade.asset.marketCapitalization : undefined,
-                                        ebitda: props.trade.asset.ebitda !== undefined ? props.trade.asset.ebitda : undefined,
-                                        peRatio: props.trade.asset.peRatio !== undefined ? props.trade.asset.peRatio : undefined,
-                                        pegRatio: props.trade.asset.pegRatio !== undefined ? props.trade.asset.pegRatio : undefined,
-                                        bookValue: props.trade.asset.bookValue !== undefined ? props.trade.asset.bookValue : undefined,
-                                        dividendPerShare: props.trade.asset.dividendPerShare !== undefined ? props.trade.asset.dividendPerShare : undefined,
-                                        dividendYield: props.trade.asset.dividendYield !== undefined ? props.trade.asset.dividendYield : undefined,
-                                        eps: props.trade.asset.eps !== undefined ? props.trade.asset.eps : undefined,
-                                        revenuePerShareTTM: props.trade.asset.revenuePerShareTTM !== undefined ? props.trade.asset.revenuePerShareTTM : undefined,
-                                        profitMargin: props.trade.asset.profitMargin !== undefined ? props.trade.asset.profitMargin : undefined,
-                                        operatingMarginTTM: props.trade.asset.operatingMarginTTM !== undefined ? props.trade.asset.operatingMarginTTM : undefined,
-                                        returnOnAssetsTTM: props.trade.asset.returnOnAssetsTTM !== undefined ? props.trade.asset.returnOnAssetsTTM : undefined,
-                                        returnOnEquityTTM: props.trade.asset.returnOnEquityTTM !== undefined ? props.trade.asset.returnOnEquityTTM : undefined,
-                                        revenueTTM: props.trade.asset.revenueTTM !== undefined ? props.trade.asset.revenueTTM : undefined,
-                                        grossProfitTTM: props.trade.asset.grossProfitTTM !== undefined ? props.trade.asset.grossProfitTTM : undefined,
-                                        dilutedEPSTTM: props.trade.asset.dilutedEPSTTM !== undefined ? props.trade.asset.dilutedEPSTTM : undefined,
-                                        quarterlyEarningsGrowthYOY: props.trade.asset.quarterlyEarningsGrowthYOY !== undefined ? props.trade.asset.quarterlyEarningsGrowthYOY : undefined,
-                                        quarterlyRevenueGrowthYOY: props.trade.asset.quarterlyRevenueGrowthYOY !== undefined ? props.trade.asset.quarterlyRevenueGrowthYOY : undefined,
-                                        analystTargetPrice: props.trade.asset.analystTargetPrice !== undefined ? props.trade.asset.analystTargetPrice : undefined,
-                                        analystRatingStrongBuy: props.trade.asset.analystRatingStrongBuy !== undefined ? props.trade.asset.analystRatingStrongBuy : undefined,
-                                        analystRatingBuy: props.trade.asset.analystRatingBuy !== undefined ? props.trade.asset.analystRatingBuy : undefined,
-                                        analystRatingHold: props.trade.asset.analystRatingHold !== undefined ? props.trade.asset.analystRatingHold : undefined,
-                                        analystRatingSell: props.trade.asset.analystRatingSell !== undefined ? props.trade.asset.analystRatingSell : undefined,
-                                        analystRatingStrongSell: props.trade.asset.analystRatingStrongSell !== undefined ? props.trade.asset.analystRatingStrongSell : undefined,
-                                        trailingPE: props.trade.asset.trailingPE !== undefined ? props.trade.asset.trailingPE : undefined,
-                                        forwardPE: props.trade.asset.forwardPE !== undefined ? props.trade.asset.forwardPE : undefined,
-                                        priceToSalesRatioTTM: props.trade.asset.priceToSalesRatioTTM !== undefined ? props.trade.asset.priceToSalesRatioTTM : undefined,
-                                        priceToBookRatio: props.trade.asset.priceToBookRatio !== undefined ? props.trade.asset.priceToBookRatio : undefined,
-                                        evToRevenue: props.trade.asset.evToRevenue !== undefined ? props.trade.asset.evToRevenue : undefined,
-                                        evToEbitda: props.trade.asset.evToEbitda !== undefined ? props.trade.asset.evToEbitda : undefined,
-                                        beta: props.trade.asset.beta !== undefined ? props.trade.asset.beta : undefined,
-                                        week52High: props.trade.asset.week52High !== undefined ? props.trade.asset.week52High : undefined,
-                                        week52Low: props.trade.asset.week52Low !== undefined ? props.trade.asset.week52Low : undefined,
-                                        day50MovingAverage: props.trade.asset.day50MovingAverage !== undefined ? props.trade.asset.day50MovingAverage : undefined,
-                                        day200MovingAverage: props.trade.asset.day200MovingAverage !== undefined ? props.trade.asset.day200MovingAverage : undefined,
-                                        sharesOutstanding: props.trade.asset.sharesOutstanding !== undefined ? props.trade.asset.sharesOutstanding : undefined,
-                                        dividendDate: props.trade.asset.dividendDate !== undefined ? props.trade.asset.dividendDate : undefined,
-                                        exDividendDate: props.trade.asset.exDividendDate !== undefined ? props.trade.asset.exDividendDate : undefined,
-                                        sellPrice: props.trade.asset.sellPrice !== undefined ? props.trade.asset.sellPrice : undefined,
-                                        buyPrice: props.trade.asset.buyPrice !== undefined ? props.trade.asset.buyPrice : undefined,
-                                    },
-                                }
-                            } : undefined,
+                            alpacaAccount: props.trade.alpacaAccount ?
+                                typeof props.trade.alpacaAccount === 'object' && Object.keys(props.trade.alpacaAccount).length === 1 && Object.keys(props.trade.alpacaAccount)[0] === 'id'
+                                    ? { connect: {
+                                            id: props.trade.alpacaAccount.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: props.trade.alpacaAccount.id !== undefined ? props.trade.alpacaAccount.id : undefined,
+                                            },
+                                            create: {
+                                                type: props.trade.alpacaAccount.type !== undefined ? props.trade.alpacaAccount.type : undefined,
+                                                APIKey: props.trade.alpacaAccount.APIKey !== undefined ? props.trade.alpacaAccount.APIKey : undefined,
+                                                APISecret: props.trade.alpacaAccount.APISecret !== undefined ? props.trade.alpacaAccount.APISecret : undefined,
+                                                configuration: props.trade.alpacaAccount.configuration !== undefined ? props.trade.alpacaAccount.configuration : undefined,
+                                                marketOpen: props.trade.alpacaAccount.marketOpen !== undefined ? props.trade.alpacaAccount.marketOpen : undefined,
+                                            },
+                                        }
+                                    } : undefined,
+                            asset: props.trade.asset ?
+                                typeof props.trade.asset === 'object' && Object.keys(props.trade.asset).length === 1 && Object.keys(props.trade.asset)[0] === 'id'
+                                    ? { connect: {
+                                            id: props.trade.asset.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: props.trade.asset.id !== undefined ? props.trade.asset.id : undefined,
+                                                symbol: props.trade.asset.symbol !== undefined ? props.trade.asset.symbol : undefined,
+                                                name: props.trade.asset.name !== undefined ? props.trade.asset.name : undefined,
+                                            },
+                                            create: {
+                                                symbol: props.trade.asset.symbol !== undefined ? props.trade.asset.symbol : undefined,
+                                                name: props.trade.asset.name !== undefined ? props.trade.asset.name : undefined,
+                                                type: props.trade.asset.type !== undefined ? props.trade.asset.type : undefined,
+                                                logoUrl: props.trade.asset.logoUrl !== undefined ? props.trade.asset.logoUrl : undefined,
+                                                description: props.trade.asset.description !== undefined ? props.trade.asset.description : undefined,
+                                                cik: props.trade.asset.cik !== undefined ? props.trade.asset.cik : undefined,
+                                                exchange: props.trade.asset.exchange !== undefined ? props.trade.asset.exchange : undefined,
+                                                currency: props.trade.asset.currency !== undefined ? props.trade.asset.currency : undefined,
+                                                country: props.trade.asset.country !== undefined ? props.trade.asset.country : undefined,
+                                                sector: props.trade.asset.sector !== undefined ? props.trade.asset.sector : undefined,
+                                                industry: props.trade.asset.industry !== undefined ? props.trade.asset.industry : undefined,
+                                                address: props.trade.asset.address !== undefined ? props.trade.asset.address : undefined,
+                                                officialSite: props.trade.asset.officialSite !== undefined ? props.trade.asset.officialSite : undefined,
+                                                fiscalYearEnd: props.trade.asset.fiscalYearEnd !== undefined ? props.trade.asset.fiscalYearEnd : undefined,
+                                                latestQuarter: props.trade.asset.latestQuarter !== undefined ? props.trade.asset.latestQuarter : undefined,
+                                                marketCapitalization: props.trade.asset.marketCapitalization !== undefined ? props.trade.asset.marketCapitalization : undefined,
+                                                ebitda: props.trade.asset.ebitda !== undefined ? props.trade.asset.ebitda : undefined,
+                                                peRatio: props.trade.asset.peRatio !== undefined ? props.trade.asset.peRatio : undefined,
+                                                pegRatio: props.trade.asset.pegRatio !== undefined ? props.trade.asset.pegRatio : undefined,
+                                                bookValue: props.trade.asset.bookValue !== undefined ? props.trade.asset.bookValue : undefined,
+                                                dividendPerShare: props.trade.asset.dividendPerShare !== undefined ? props.trade.asset.dividendPerShare : undefined,
+                                                dividendYield: props.trade.asset.dividendYield !== undefined ? props.trade.asset.dividendYield : undefined,
+                                                eps: props.trade.asset.eps !== undefined ? props.trade.asset.eps : undefined,
+                                                revenuePerShareTTM: props.trade.asset.revenuePerShareTTM !== undefined ? props.trade.asset.revenuePerShareTTM : undefined,
+                                                profitMargin: props.trade.asset.profitMargin !== undefined ? props.trade.asset.profitMargin : undefined,
+                                                operatingMarginTTM: props.trade.asset.operatingMarginTTM !== undefined ? props.trade.asset.operatingMarginTTM : undefined,
+                                                returnOnAssetsTTM: props.trade.asset.returnOnAssetsTTM !== undefined ? props.trade.asset.returnOnAssetsTTM : undefined,
+                                                returnOnEquityTTM: props.trade.asset.returnOnEquityTTM !== undefined ? props.trade.asset.returnOnEquityTTM : undefined,
+                                                revenueTTM: props.trade.asset.revenueTTM !== undefined ? props.trade.asset.revenueTTM : undefined,
+                                                grossProfitTTM: props.trade.asset.grossProfitTTM !== undefined ? props.trade.asset.grossProfitTTM : undefined,
+                                                dilutedEPSTTM: props.trade.asset.dilutedEPSTTM !== undefined ? props.trade.asset.dilutedEPSTTM : undefined,
+                                                quarterlyEarningsGrowthYOY: props.trade.asset.quarterlyEarningsGrowthYOY !== undefined ? props.trade.asset.quarterlyEarningsGrowthYOY : undefined,
+                                                quarterlyRevenueGrowthYOY: props.trade.asset.quarterlyRevenueGrowthYOY !== undefined ? props.trade.asset.quarterlyRevenueGrowthYOY : undefined,
+                                                analystTargetPrice: props.trade.asset.analystTargetPrice !== undefined ? props.trade.asset.analystTargetPrice : undefined,
+                                                analystRatingStrongBuy: props.trade.asset.analystRatingStrongBuy !== undefined ? props.trade.asset.analystRatingStrongBuy : undefined,
+                                                analystRatingBuy: props.trade.asset.analystRatingBuy !== undefined ? props.trade.asset.analystRatingBuy : undefined,
+                                                analystRatingHold: props.trade.asset.analystRatingHold !== undefined ? props.trade.asset.analystRatingHold : undefined,
+                                                analystRatingSell: props.trade.asset.analystRatingSell !== undefined ? props.trade.asset.analystRatingSell : undefined,
+                                                analystRatingStrongSell: props.trade.asset.analystRatingStrongSell !== undefined ? props.trade.asset.analystRatingStrongSell : undefined,
+                                                trailingPE: props.trade.asset.trailingPE !== undefined ? props.trade.asset.trailingPE : undefined,
+                                                forwardPE: props.trade.asset.forwardPE !== undefined ? props.trade.asset.forwardPE : undefined,
+                                                priceToSalesRatioTTM: props.trade.asset.priceToSalesRatioTTM !== undefined ? props.trade.asset.priceToSalesRatioTTM : undefined,
+                                                priceToBookRatio: props.trade.asset.priceToBookRatio !== undefined ? props.trade.asset.priceToBookRatio : undefined,
+                                                evToRevenue: props.trade.asset.evToRevenue !== undefined ? props.trade.asset.evToRevenue : undefined,
+                                                evToEbitda: props.trade.asset.evToEbitda !== undefined ? props.trade.asset.evToEbitda : undefined,
+                                                beta: props.trade.asset.beta !== undefined ? props.trade.asset.beta : undefined,
+                                                week52High: props.trade.asset.week52High !== undefined ? props.trade.asset.week52High : undefined,
+                                                week52Low: props.trade.asset.week52Low !== undefined ? props.trade.asset.week52Low : undefined,
+                                                day50MovingAverage: props.trade.asset.day50MovingAverage !== undefined ? props.trade.asset.day50MovingAverage : undefined,
+                                                day200MovingAverage: props.trade.asset.day200MovingAverage !== undefined ? props.trade.asset.day200MovingAverage : undefined,
+                                                sharesOutstanding: props.trade.asset.sharesOutstanding !== undefined ? props.trade.asset.sharesOutstanding : undefined,
+                                                dividendDate: props.trade.asset.dividendDate !== undefined ? props.trade.asset.dividendDate : undefined,
+                                                exDividendDate: props.trade.asset.exDividendDate !== undefined ? props.trade.asset.exDividendDate : undefined,
+                                                sellPrice: props.trade.asset.sellPrice !== undefined ? props.trade.asset.sellPrice : undefined,
+                                                buyPrice: props.trade.asset.buyPrice !== undefined ? props.trade.asset.buyPrice : undefined,
+                                            },
+                                        }
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -1556,86 +1589,96 @@ exports.Action = {
                             filledAt: props.order.filledAt !== undefined ? props.order.filledAt : undefined,
                             filledAvgPrice: props.order.filledAvgPrice !== undefined ? props.order.filledAvgPrice : undefined,
                             fee: props.order.fee !== undefined ? props.order.fee : undefined,
-                            alpacaAccount: props.order.alpacaAccount ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.order.alpacaAccount.id !== undefined ? props.order.alpacaAccount.id : undefined,
-                                    },
-                                    create: {
-                                        type: props.order.alpacaAccount.type !== undefined ? props.order.alpacaAccount.type : undefined,
-                                        APIKey: props.order.alpacaAccount.APIKey !== undefined ? props.order.alpacaAccount.APIKey : undefined,
-                                        APISecret: props.order.alpacaAccount.APISecret !== undefined ? props.order.alpacaAccount.APISecret : undefined,
-                                        configuration: props.order.alpacaAccount.configuration !== undefined ? props.order.alpacaAccount.configuration : undefined,
-                                        marketOpen: props.order.alpacaAccount.marketOpen !== undefined ? props.order.alpacaAccount.marketOpen : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            asset: props.order.asset ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.order.asset.id !== undefined ? props.order.asset.id : undefined,
-                                        symbol: props.order.asset.symbol !== undefined ? props.order.asset.symbol : undefined,
-                                        name: props.order.asset.name !== undefined ? props.order.asset.name : undefined,
-                                    },
-                                    create: {
-                                        symbol: props.order.asset.symbol !== undefined ? props.order.asset.symbol : undefined,
-                                        name: props.order.asset.name !== undefined ? props.order.asset.name : undefined,
-                                        type: props.order.asset.type !== undefined ? props.order.asset.type : undefined,
-                                        logoUrl: props.order.asset.logoUrl !== undefined ? props.order.asset.logoUrl : undefined,
-                                        description: props.order.asset.description !== undefined ? props.order.asset.description : undefined,
-                                        cik: props.order.asset.cik !== undefined ? props.order.asset.cik : undefined,
-                                        exchange: props.order.asset.exchange !== undefined ? props.order.asset.exchange : undefined,
-                                        currency: props.order.asset.currency !== undefined ? props.order.asset.currency : undefined,
-                                        country: props.order.asset.country !== undefined ? props.order.asset.country : undefined,
-                                        sector: props.order.asset.sector !== undefined ? props.order.asset.sector : undefined,
-                                        industry: props.order.asset.industry !== undefined ? props.order.asset.industry : undefined,
-                                        address: props.order.asset.address !== undefined ? props.order.asset.address : undefined,
-                                        officialSite: props.order.asset.officialSite !== undefined ? props.order.asset.officialSite : undefined,
-                                        fiscalYearEnd: props.order.asset.fiscalYearEnd !== undefined ? props.order.asset.fiscalYearEnd : undefined,
-                                        latestQuarter: props.order.asset.latestQuarter !== undefined ? props.order.asset.latestQuarter : undefined,
-                                        marketCapitalization: props.order.asset.marketCapitalization !== undefined ? props.order.asset.marketCapitalization : undefined,
-                                        ebitda: props.order.asset.ebitda !== undefined ? props.order.asset.ebitda : undefined,
-                                        peRatio: props.order.asset.peRatio !== undefined ? props.order.asset.peRatio : undefined,
-                                        pegRatio: props.order.asset.pegRatio !== undefined ? props.order.asset.pegRatio : undefined,
-                                        bookValue: props.order.asset.bookValue !== undefined ? props.order.asset.bookValue : undefined,
-                                        dividendPerShare: props.order.asset.dividendPerShare !== undefined ? props.order.asset.dividendPerShare : undefined,
-                                        dividendYield: props.order.asset.dividendYield !== undefined ? props.order.asset.dividendYield : undefined,
-                                        eps: props.order.asset.eps !== undefined ? props.order.asset.eps : undefined,
-                                        revenuePerShareTTM: props.order.asset.revenuePerShareTTM !== undefined ? props.order.asset.revenuePerShareTTM : undefined,
-                                        profitMargin: props.order.asset.profitMargin !== undefined ? props.order.asset.profitMargin : undefined,
-                                        operatingMarginTTM: props.order.asset.operatingMarginTTM !== undefined ? props.order.asset.operatingMarginTTM : undefined,
-                                        returnOnAssetsTTM: props.order.asset.returnOnAssetsTTM !== undefined ? props.order.asset.returnOnAssetsTTM : undefined,
-                                        returnOnEquityTTM: props.order.asset.returnOnEquityTTM !== undefined ? props.order.asset.returnOnEquityTTM : undefined,
-                                        revenueTTM: props.order.asset.revenueTTM !== undefined ? props.order.asset.revenueTTM : undefined,
-                                        grossProfitTTM: props.order.asset.grossProfitTTM !== undefined ? props.order.asset.grossProfitTTM : undefined,
-                                        dilutedEPSTTM: props.order.asset.dilutedEPSTTM !== undefined ? props.order.asset.dilutedEPSTTM : undefined,
-                                        quarterlyEarningsGrowthYOY: props.order.asset.quarterlyEarningsGrowthYOY !== undefined ? props.order.asset.quarterlyEarningsGrowthYOY : undefined,
-                                        quarterlyRevenueGrowthYOY: props.order.asset.quarterlyRevenueGrowthYOY !== undefined ? props.order.asset.quarterlyRevenueGrowthYOY : undefined,
-                                        analystTargetPrice: props.order.asset.analystTargetPrice !== undefined ? props.order.asset.analystTargetPrice : undefined,
-                                        analystRatingStrongBuy: props.order.asset.analystRatingStrongBuy !== undefined ? props.order.asset.analystRatingStrongBuy : undefined,
-                                        analystRatingBuy: props.order.asset.analystRatingBuy !== undefined ? props.order.asset.analystRatingBuy : undefined,
-                                        analystRatingHold: props.order.asset.analystRatingHold !== undefined ? props.order.asset.analystRatingHold : undefined,
-                                        analystRatingSell: props.order.asset.analystRatingSell !== undefined ? props.order.asset.analystRatingSell : undefined,
-                                        analystRatingStrongSell: props.order.asset.analystRatingStrongSell !== undefined ? props.order.asset.analystRatingStrongSell : undefined,
-                                        trailingPE: props.order.asset.trailingPE !== undefined ? props.order.asset.trailingPE : undefined,
-                                        forwardPE: props.order.asset.forwardPE !== undefined ? props.order.asset.forwardPE : undefined,
-                                        priceToSalesRatioTTM: props.order.asset.priceToSalesRatioTTM !== undefined ? props.order.asset.priceToSalesRatioTTM : undefined,
-                                        priceToBookRatio: props.order.asset.priceToBookRatio !== undefined ? props.order.asset.priceToBookRatio : undefined,
-                                        evToRevenue: props.order.asset.evToRevenue !== undefined ? props.order.asset.evToRevenue : undefined,
-                                        evToEbitda: props.order.asset.evToEbitda !== undefined ? props.order.asset.evToEbitda : undefined,
-                                        beta: props.order.asset.beta !== undefined ? props.order.asset.beta : undefined,
-                                        week52High: props.order.asset.week52High !== undefined ? props.order.asset.week52High : undefined,
-                                        week52Low: props.order.asset.week52Low !== undefined ? props.order.asset.week52Low : undefined,
-                                        day50MovingAverage: props.order.asset.day50MovingAverage !== undefined ? props.order.asset.day50MovingAverage : undefined,
-                                        day200MovingAverage: props.order.asset.day200MovingAverage !== undefined ? props.order.asset.day200MovingAverage : undefined,
-                                        sharesOutstanding: props.order.asset.sharesOutstanding !== undefined ? props.order.asset.sharesOutstanding : undefined,
-                                        dividendDate: props.order.asset.dividendDate !== undefined ? props.order.asset.dividendDate : undefined,
-                                        exDividendDate: props.order.asset.exDividendDate !== undefined ? props.order.asset.exDividendDate : undefined,
-                                        sellPrice: props.order.asset.sellPrice !== undefined ? props.order.asset.sellPrice : undefined,
-                                        buyPrice: props.order.asset.buyPrice !== undefined ? props.order.asset.buyPrice : undefined,
-                                    },
-                                }
-                            } : undefined,
+                            alpacaAccount: props.order.alpacaAccount ?
+                                typeof props.order.alpacaAccount === 'object' && Object.keys(props.order.alpacaAccount).length === 1 && Object.keys(props.order.alpacaAccount)[0] === 'id'
+                                    ? { connect: {
+                                            id: props.order.alpacaAccount.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: props.order.alpacaAccount.id !== undefined ? props.order.alpacaAccount.id : undefined,
+                                            },
+                                            create: {
+                                                type: props.order.alpacaAccount.type !== undefined ? props.order.alpacaAccount.type : undefined,
+                                                APIKey: props.order.alpacaAccount.APIKey !== undefined ? props.order.alpacaAccount.APIKey : undefined,
+                                                APISecret: props.order.alpacaAccount.APISecret !== undefined ? props.order.alpacaAccount.APISecret : undefined,
+                                                configuration: props.order.alpacaAccount.configuration !== undefined ? props.order.alpacaAccount.configuration : undefined,
+                                                marketOpen: props.order.alpacaAccount.marketOpen !== undefined ? props.order.alpacaAccount.marketOpen : undefined,
+                                            },
+                                        }
+                                    } : undefined,
+                            asset: props.order.asset ?
+                                typeof props.order.asset === 'object' && Object.keys(props.order.asset).length === 1 && Object.keys(props.order.asset)[0] === 'id'
+                                    ? { connect: {
+                                            id: props.order.asset.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: props.order.asset.id !== undefined ? props.order.asset.id : undefined,
+                                                symbol: props.order.asset.symbol !== undefined ? props.order.asset.symbol : undefined,
+                                                name: props.order.asset.name !== undefined ? props.order.asset.name : undefined,
+                                            },
+                                            create: {
+                                                symbol: props.order.asset.symbol !== undefined ? props.order.asset.symbol : undefined,
+                                                name: props.order.asset.name !== undefined ? props.order.asset.name : undefined,
+                                                type: props.order.asset.type !== undefined ? props.order.asset.type : undefined,
+                                                logoUrl: props.order.asset.logoUrl !== undefined ? props.order.asset.logoUrl : undefined,
+                                                description: props.order.asset.description !== undefined ? props.order.asset.description : undefined,
+                                                cik: props.order.asset.cik !== undefined ? props.order.asset.cik : undefined,
+                                                exchange: props.order.asset.exchange !== undefined ? props.order.asset.exchange : undefined,
+                                                currency: props.order.asset.currency !== undefined ? props.order.asset.currency : undefined,
+                                                country: props.order.asset.country !== undefined ? props.order.asset.country : undefined,
+                                                sector: props.order.asset.sector !== undefined ? props.order.asset.sector : undefined,
+                                                industry: props.order.asset.industry !== undefined ? props.order.asset.industry : undefined,
+                                                address: props.order.asset.address !== undefined ? props.order.asset.address : undefined,
+                                                officialSite: props.order.asset.officialSite !== undefined ? props.order.asset.officialSite : undefined,
+                                                fiscalYearEnd: props.order.asset.fiscalYearEnd !== undefined ? props.order.asset.fiscalYearEnd : undefined,
+                                                latestQuarter: props.order.asset.latestQuarter !== undefined ? props.order.asset.latestQuarter : undefined,
+                                                marketCapitalization: props.order.asset.marketCapitalization !== undefined ? props.order.asset.marketCapitalization : undefined,
+                                                ebitda: props.order.asset.ebitda !== undefined ? props.order.asset.ebitda : undefined,
+                                                peRatio: props.order.asset.peRatio !== undefined ? props.order.asset.peRatio : undefined,
+                                                pegRatio: props.order.asset.pegRatio !== undefined ? props.order.asset.pegRatio : undefined,
+                                                bookValue: props.order.asset.bookValue !== undefined ? props.order.asset.bookValue : undefined,
+                                                dividendPerShare: props.order.asset.dividendPerShare !== undefined ? props.order.asset.dividendPerShare : undefined,
+                                                dividendYield: props.order.asset.dividendYield !== undefined ? props.order.asset.dividendYield : undefined,
+                                                eps: props.order.asset.eps !== undefined ? props.order.asset.eps : undefined,
+                                                revenuePerShareTTM: props.order.asset.revenuePerShareTTM !== undefined ? props.order.asset.revenuePerShareTTM : undefined,
+                                                profitMargin: props.order.asset.profitMargin !== undefined ? props.order.asset.profitMargin : undefined,
+                                                operatingMarginTTM: props.order.asset.operatingMarginTTM !== undefined ? props.order.asset.operatingMarginTTM : undefined,
+                                                returnOnAssetsTTM: props.order.asset.returnOnAssetsTTM !== undefined ? props.order.asset.returnOnAssetsTTM : undefined,
+                                                returnOnEquityTTM: props.order.asset.returnOnEquityTTM !== undefined ? props.order.asset.returnOnEquityTTM : undefined,
+                                                revenueTTM: props.order.asset.revenueTTM !== undefined ? props.order.asset.revenueTTM : undefined,
+                                                grossProfitTTM: props.order.asset.grossProfitTTM !== undefined ? props.order.asset.grossProfitTTM : undefined,
+                                                dilutedEPSTTM: props.order.asset.dilutedEPSTTM !== undefined ? props.order.asset.dilutedEPSTTM : undefined,
+                                                quarterlyEarningsGrowthYOY: props.order.asset.quarterlyEarningsGrowthYOY !== undefined ? props.order.asset.quarterlyEarningsGrowthYOY : undefined,
+                                                quarterlyRevenueGrowthYOY: props.order.asset.quarterlyRevenueGrowthYOY !== undefined ? props.order.asset.quarterlyRevenueGrowthYOY : undefined,
+                                                analystTargetPrice: props.order.asset.analystTargetPrice !== undefined ? props.order.asset.analystTargetPrice : undefined,
+                                                analystRatingStrongBuy: props.order.asset.analystRatingStrongBuy !== undefined ? props.order.asset.analystRatingStrongBuy : undefined,
+                                                analystRatingBuy: props.order.asset.analystRatingBuy !== undefined ? props.order.asset.analystRatingBuy : undefined,
+                                                analystRatingHold: props.order.asset.analystRatingHold !== undefined ? props.order.asset.analystRatingHold : undefined,
+                                                analystRatingSell: props.order.asset.analystRatingSell !== undefined ? props.order.asset.analystRatingSell : undefined,
+                                                analystRatingStrongSell: props.order.asset.analystRatingStrongSell !== undefined ? props.order.asset.analystRatingStrongSell : undefined,
+                                                trailingPE: props.order.asset.trailingPE !== undefined ? props.order.asset.trailingPE : undefined,
+                                                forwardPE: props.order.asset.forwardPE !== undefined ? props.order.asset.forwardPE : undefined,
+                                                priceToSalesRatioTTM: props.order.asset.priceToSalesRatioTTM !== undefined ? props.order.asset.priceToSalesRatioTTM : undefined,
+                                                priceToBookRatio: props.order.asset.priceToBookRatio !== undefined ? props.order.asset.priceToBookRatio : undefined,
+                                                evToRevenue: props.order.asset.evToRevenue !== undefined ? props.order.asset.evToRevenue : undefined,
+                                                evToEbitda: props.order.asset.evToEbitda !== undefined ? props.order.asset.evToEbitda : undefined,
+                                                beta: props.order.asset.beta !== undefined ? props.order.asset.beta : undefined,
+                                                week52High: props.order.asset.week52High !== undefined ? props.order.asset.week52High : undefined,
+                                                week52Low: props.order.asset.week52Low !== undefined ? props.order.asset.week52Low : undefined,
+                                                day50MovingAverage: props.order.asset.day50MovingAverage !== undefined ? props.order.asset.day50MovingAverage : undefined,
+                                                day200MovingAverage: props.order.asset.day200MovingAverage !== undefined ? props.order.asset.day200MovingAverage : undefined,
+                                                sharesOutstanding: props.order.asset.sharesOutstanding !== undefined ? props.order.asset.sharesOutstanding : undefined,
+                                                dividendDate: props.order.asset.dividendDate !== undefined ? props.order.asset.dividendDate : undefined,
+                                                exDividendDate: props.order.asset.exDividendDate !== undefined ? props.order.asset.exDividendDate : undefined,
+                                                sellPrice: props.order.asset.sellPrice !== undefined ? props.order.asset.sellPrice : undefined,
+                                                buyPrice: props.order.asset.buyPrice !== undefined ? props.order.asset.buyPrice : undefined,
+                                            },
+                                        }
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -1685,9 +1728,6 @@ exports.Action = {
                 type: prop.type !== undefined ? {
                     set: prop.type
                 } : undefined,
-                orderId: prop.orderId !== undefined ? {
-                    set: prop.orderId
-                } : undefined,
                 note: prop.note !== undefined ? {
                     set: prop.note
                 } : undefined,
@@ -2028,86 +2068,96 @@ exports.Action = {
                             timestamp: prop.trade.timestamp !== undefined ? prop.trade.timestamp : undefined,
                             status: prop.trade.status !== undefined ? prop.trade.status : undefined,
                             optionContractType: prop.trade.optionContractType !== undefined ? prop.trade.optionContractType : undefined,
-                            alpacaAccount: prop.trade.alpacaAccount ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: prop.trade.alpacaAccount.id !== undefined ? prop.trade.alpacaAccount.id : undefined,
-                                    },
-                                    create: {
-                                        type: prop.trade.alpacaAccount.type !== undefined ? prop.trade.alpacaAccount.type : undefined,
-                                        APIKey: prop.trade.alpacaAccount.APIKey !== undefined ? prop.trade.alpacaAccount.APIKey : undefined,
-                                        APISecret: prop.trade.alpacaAccount.APISecret !== undefined ? prop.trade.alpacaAccount.APISecret : undefined,
-                                        configuration: prop.trade.alpacaAccount.configuration !== undefined ? prop.trade.alpacaAccount.configuration : undefined,
-                                        marketOpen: prop.trade.alpacaAccount.marketOpen !== undefined ? prop.trade.alpacaAccount.marketOpen : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            asset: prop.trade.asset ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: prop.trade.asset.id !== undefined ? prop.trade.asset.id : undefined,
-                                        symbol: prop.trade.asset.symbol !== undefined ? prop.trade.asset.symbol : undefined,
-                                        name: prop.trade.asset.name !== undefined ? prop.trade.asset.name : undefined,
-                                    },
-                                    create: {
-                                        symbol: prop.trade.asset.symbol !== undefined ? prop.trade.asset.symbol : undefined,
-                                        name: prop.trade.asset.name !== undefined ? prop.trade.asset.name : undefined,
-                                        type: prop.trade.asset.type !== undefined ? prop.trade.asset.type : undefined,
-                                        logoUrl: prop.trade.asset.logoUrl !== undefined ? prop.trade.asset.logoUrl : undefined,
-                                        description: prop.trade.asset.description !== undefined ? prop.trade.asset.description : undefined,
-                                        cik: prop.trade.asset.cik !== undefined ? prop.trade.asset.cik : undefined,
-                                        exchange: prop.trade.asset.exchange !== undefined ? prop.trade.asset.exchange : undefined,
-                                        currency: prop.trade.asset.currency !== undefined ? prop.trade.asset.currency : undefined,
-                                        country: prop.trade.asset.country !== undefined ? prop.trade.asset.country : undefined,
-                                        sector: prop.trade.asset.sector !== undefined ? prop.trade.asset.sector : undefined,
-                                        industry: prop.trade.asset.industry !== undefined ? prop.trade.asset.industry : undefined,
-                                        address: prop.trade.asset.address !== undefined ? prop.trade.asset.address : undefined,
-                                        officialSite: prop.trade.asset.officialSite !== undefined ? prop.trade.asset.officialSite : undefined,
-                                        fiscalYearEnd: prop.trade.asset.fiscalYearEnd !== undefined ? prop.trade.asset.fiscalYearEnd : undefined,
-                                        latestQuarter: prop.trade.asset.latestQuarter !== undefined ? prop.trade.asset.latestQuarter : undefined,
-                                        marketCapitalization: prop.trade.asset.marketCapitalization !== undefined ? prop.trade.asset.marketCapitalization : undefined,
-                                        ebitda: prop.trade.asset.ebitda !== undefined ? prop.trade.asset.ebitda : undefined,
-                                        peRatio: prop.trade.asset.peRatio !== undefined ? prop.trade.asset.peRatio : undefined,
-                                        pegRatio: prop.trade.asset.pegRatio !== undefined ? prop.trade.asset.pegRatio : undefined,
-                                        bookValue: prop.trade.asset.bookValue !== undefined ? prop.trade.asset.bookValue : undefined,
-                                        dividendPerShare: prop.trade.asset.dividendPerShare !== undefined ? prop.trade.asset.dividendPerShare : undefined,
-                                        dividendYield: prop.trade.asset.dividendYield !== undefined ? prop.trade.asset.dividendYield : undefined,
-                                        eps: prop.trade.asset.eps !== undefined ? prop.trade.asset.eps : undefined,
-                                        revenuePerShareTTM: prop.trade.asset.revenuePerShareTTM !== undefined ? prop.trade.asset.revenuePerShareTTM : undefined,
-                                        profitMargin: prop.trade.asset.profitMargin !== undefined ? prop.trade.asset.profitMargin : undefined,
-                                        operatingMarginTTM: prop.trade.asset.operatingMarginTTM !== undefined ? prop.trade.asset.operatingMarginTTM : undefined,
-                                        returnOnAssetsTTM: prop.trade.asset.returnOnAssetsTTM !== undefined ? prop.trade.asset.returnOnAssetsTTM : undefined,
-                                        returnOnEquityTTM: prop.trade.asset.returnOnEquityTTM !== undefined ? prop.trade.asset.returnOnEquityTTM : undefined,
-                                        revenueTTM: prop.trade.asset.revenueTTM !== undefined ? prop.trade.asset.revenueTTM : undefined,
-                                        grossProfitTTM: prop.trade.asset.grossProfitTTM !== undefined ? prop.trade.asset.grossProfitTTM : undefined,
-                                        dilutedEPSTTM: prop.trade.asset.dilutedEPSTTM !== undefined ? prop.trade.asset.dilutedEPSTTM : undefined,
-                                        quarterlyEarningsGrowthYOY: prop.trade.asset.quarterlyEarningsGrowthYOY !== undefined ? prop.trade.asset.quarterlyEarningsGrowthYOY : undefined,
-                                        quarterlyRevenueGrowthYOY: prop.trade.asset.quarterlyRevenueGrowthYOY !== undefined ? prop.trade.asset.quarterlyRevenueGrowthYOY : undefined,
-                                        analystTargetPrice: prop.trade.asset.analystTargetPrice !== undefined ? prop.trade.asset.analystTargetPrice : undefined,
-                                        analystRatingStrongBuy: prop.trade.asset.analystRatingStrongBuy !== undefined ? prop.trade.asset.analystRatingStrongBuy : undefined,
-                                        analystRatingBuy: prop.trade.asset.analystRatingBuy !== undefined ? prop.trade.asset.analystRatingBuy : undefined,
-                                        analystRatingHold: prop.trade.asset.analystRatingHold !== undefined ? prop.trade.asset.analystRatingHold : undefined,
-                                        analystRatingSell: prop.trade.asset.analystRatingSell !== undefined ? prop.trade.asset.analystRatingSell : undefined,
-                                        analystRatingStrongSell: prop.trade.asset.analystRatingStrongSell !== undefined ? prop.trade.asset.analystRatingStrongSell : undefined,
-                                        trailingPE: prop.trade.asset.trailingPE !== undefined ? prop.trade.asset.trailingPE : undefined,
-                                        forwardPE: prop.trade.asset.forwardPE !== undefined ? prop.trade.asset.forwardPE : undefined,
-                                        priceToSalesRatioTTM: prop.trade.asset.priceToSalesRatioTTM !== undefined ? prop.trade.asset.priceToSalesRatioTTM : undefined,
-                                        priceToBookRatio: prop.trade.asset.priceToBookRatio !== undefined ? prop.trade.asset.priceToBookRatio : undefined,
-                                        evToRevenue: prop.trade.asset.evToRevenue !== undefined ? prop.trade.asset.evToRevenue : undefined,
-                                        evToEbitda: prop.trade.asset.evToEbitda !== undefined ? prop.trade.asset.evToEbitda : undefined,
-                                        beta: prop.trade.asset.beta !== undefined ? prop.trade.asset.beta : undefined,
-                                        week52High: prop.trade.asset.week52High !== undefined ? prop.trade.asset.week52High : undefined,
-                                        week52Low: prop.trade.asset.week52Low !== undefined ? prop.trade.asset.week52Low : undefined,
-                                        day50MovingAverage: prop.trade.asset.day50MovingAverage !== undefined ? prop.trade.asset.day50MovingAverage : undefined,
-                                        day200MovingAverage: prop.trade.asset.day200MovingAverage !== undefined ? prop.trade.asset.day200MovingAverage : undefined,
-                                        sharesOutstanding: prop.trade.asset.sharesOutstanding !== undefined ? prop.trade.asset.sharesOutstanding : undefined,
-                                        dividendDate: prop.trade.asset.dividendDate !== undefined ? prop.trade.asset.dividendDate : undefined,
-                                        exDividendDate: prop.trade.asset.exDividendDate !== undefined ? prop.trade.asset.exDividendDate : undefined,
-                                        sellPrice: prop.trade.asset.sellPrice !== undefined ? prop.trade.asset.sellPrice : undefined,
-                                        buyPrice: prop.trade.asset.buyPrice !== undefined ? prop.trade.asset.buyPrice : undefined,
-                                    },
-                                }
-                            } : undefined,
+                            alpacaAccount: prop.trade.alpacaAccount ?
+                                typeof prop.trade.alpacaAccount === 'object' && Object.keys(prop.trade.alpacaAccount).length === 1 && Object.keys(prop.trade.alpacaAccount)[0] === 'id'
+                                    ? { connect: {
+                                            id: prop.trade.alpacaAccount.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: prop.trade.alpacaAccount.id !== undefined ? prop.trade.alpacaAccount.id : undefined,
+                                            },
+                                            create: {
+                                                type: prop.trade.alpacaAccount.type !== undefined ? prop.trade.alpacaAccount.type : undefined,
+                                                APIKey: prop.trade.alpacaAccount.APIKey !== undefined ? prop.trade.alpacaAccount.APIKey : undefined,
+                                                APISecret: prop.trade.alpacaAccount.APISecret !== undefined ? prop.trade.alpacaAccount.APISecret : undefined,
+                                                configuration: prop.trade.alpacaAccount.configuration !== undefined ? prop.trade.alpacaAccount.configuration : undefined,
+                                                marketOpen: prop.trade.alpacaAccount.marketOpen !== undefined ? prop.trade.alpacaAccount.marketOpen : undefined,
+                                            },
+                                        }
+                                    } : undefined,
+                            asset: prop.trade.asset ?
+                                typeof prop.trade.asset === 'object' && Object.keys(prop.trade.asset).length === 1 && Object.keys(prop.trade.asset)[0] === 'id'
+                                    ? { connect: {
+                                            id: prop.trade.asset.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: prop.trade.asset.id !== undefined ? prop.trade.asset.id : undefined,
+                                                symbol: prop.trade.asset.symbol !== undefined ? prop.trade.asset.symbol : undefined,
+                                                name: prop.trade.asset.name !== undefined ? prop.trade.asset.name : undefined,
+                                            },
+                                            create: {
+                                                symbol: prop.trade.asset.symbol !== undefined ? prop.trade.asset.symbol : undefined,
+                                                name: prop.trade.asset.name !== undefined ? prop.trade.asset.name : undefined,
+                                                type: prop.trade.asset.type !== undefined ? prop.trade.asset.type : undefined,
+                                                logoUrl: prop.trade.asset.logoUrl !== undefined ? prop.trade.asset.logoUrl : undefined,
+                                                description: prop.trade.asset.description !== undefined ? prop.trade.asset.description : undefined,
+                                                cik: prop.trade.asset.cik !== undefined ? prop.trade.asset.cik : undefined,
+                                                exchange: prop.trade.asset.exchange !== undefined ? prop.trade.asset.exchange : undefined,
+                                                currency: prop.trade.asset.currency !== undefined ? prop.trade.asset.currency : undefined,
+                                                country: prop.trade.asset.country !== undefined ? prop.trade.asset.country : undefined,
+                                                sector: prop.trade.asset.sector !== undefined ? prop.trade.asset.sector : undefined,
+                                                industry: prop.trade.asset.industry !== undefined ? prop.trade.asset.industry : undefined,
+                                                address: prop.trade.asset.address !== undefined ? prop.trade.asset.address : undefined,
+                                                officialSite: prop.trade.asset.officialSite !== undefined ? prop.trade.asset.officialSite : undefined,
+                                                fiscalYearEnd: prop.trade.asset.fiscalYearEnd !== undefined ? prop.trade.asset.fiscalYearEnd : undefined,
+                                                latestQuarter: prop.trade.asset.latestQuarter !== undefined ? prop.trade.asset.latestQuarter : undefined,
+                                                marketCapitalization: prop.trade.asset.marketCapitalization !== undefined ? prop.trade.asset.marketCapitalization : undefined,
+                                                ebitda: prop.trade.asset.ebitda !== undefined ? prop.trade.asset.ebitda : undefined,
+                                                peRatio: prop.trade.asset.peRatio !== undefined ? prop.trade.asset.peRatio : undefined,
+                                                pegRatio: prop.trade.asset.pegRatio !== undefined ? prop.trade.asset.pegRatio : undefined,
+                                                bookValue: prop.trade.asset.bookValue !== undefined ? prop.trade.asset.bookValue : undefined,
+                                                dividendPerShare: prop.trade.asset.dividendPerShare !== undefined ? prop.trade.asset.dividendPerShare : undefined,
+                                                dividendYield: prop.trade.asset.dividendYield !== undefined ? prop.trade.asset.dividendYield : undefined,
+                                                eps: prop.trade.asset.eps !== undefined ? prop.trade.asset.eps : undefined,
+                                                revenuePerShareTTM: prop.trade.asset.revenuePerShareTTM !== undefined ? prop.trade.asset.revenuePerShareTTM : undefined,
+                                                profitMargin: prop.trade.asset.profitMargin !== undefined ? prop.trade.asset.profitMargin : undefined,
+                                                operatingMarginTTM: prop.trade.asset.operatingMarginTTM !== undefined ? prop.trade.asset.operatingMarginTTM : undefined,
+                                                returnOnAssetsTTM: prop.trade.asset.returnOnAssetsTTM !== undefined ? prop.trade.asset.returnOnAssetsTTM : undefined,
+                                                returnOnEquityTTM: prop.trade.asset.returnOnEquityTTM !== undefined ? prop.trade.asset.returnOnEquityTTM : undefined,
+                                                revenueTTM: prop.trade.asset.revenueTTM !== undefined ? prop.trade.asset.revenueTTM : undefined,
+                                                grossProfitTTM: prop.trade.asset.grossProfitTTM !== undefined ? prop.trade.asset.grossProfitTTM : undefined,
+                                                dilutedEPSTTM: prop.trade.asset.dilutedEPSTTM !== undefined ? prop.trade.asset.dilutedEPSTTM : undefined,
+                                                quarterlyEarningsGrowthYOY: prop.trade.asset.quarterlyEarningsGrowthYOY !== undefined ? prop.trade.asset.quarterlyEarningsGrowthYOY : undefined,
+                                                quarterlyRevenueGrowthYOY: prop.trade.asset.quarterlyRevenueGrowthYOY !== undefined ? prop.trade.asset.quarterlyRevenueGrowthYOY : undefined,
+                                                analystTargetPrice: prop.trade.asset.analystTargetPrice !== undefined ? prop.trade.asset.analystTargetPrice : undefined,
+                                                analystRatingStrongBuy: prop.trade.asset.analystRatingStrongBuy !== undefined ? prop.trade.asset.analystRatingStrongBuy : undefined,
+                                                analystRatingBuy: prop.trade.asset.analystRatingBuy !== undefined ? prop.trade.asset.analystRatingBuy : undefined,
+                                                analystRatingHold: prop.trade.asset.analystRatingHold !== undefined ? prop.trade.asset.analystRatingHold : undefined,
+                                                analystRatingSell: prop.trade.asset.analystRatingSell !== undefined ? prop.trade.asset.analystRatingSell : undefined,
+                                                analystRatingStrongSell: prop.trade.asset.analystRatingStrongSell !== undefined ? prop.trade.asset.analystRatingStrongSell : undefined,
+                                                trailingPE: prop.trade.asset.trailingPE !== undefined ? prop.trade.asset.trailingPE : undefined,
+                                                forwardPE: prop.trade.asset.forwardPE !== undefined ? prop.trade.asset.forwardPE : undefined,
+                                                priceToSalesRatioTTM: prop.trade.asset.priceToSalesRatioTTM !== undefined ? prop.trade.asset.priceToSalesRatioTTM : undefined,
+                                                priceToBookRatio: prop.trade.asset.priceToBookRatio !== undefined ? prop.trade.asset.priceToBookRatio : undefined,
+                                                evToRevenue: prop.trade.asset.evToRevenue !== undefined ? prop.trade.asset.evToRevenue : undefined,
+                                                evToEbitda: prop.trade.asset.evToEbitda !== undefined ? prop.trade.asset.evToEbitda : undefined,
+                                                beta: prop.trade.asset.beta !== undefined ? prop.trade.asset.beta : undefined,
+                                                week52High: prop.trade.asset.week52High !== undefined ? prop.trade.asset.week52High : undefined,
+                                                week52Low: prop.trade.asset.week52Low !== undefined ? prop.trade.asset.week52Low : undefined,
+                                                day50MovingAverage: prop.trade.asset.day50MovingAverage !== undefined ? prop.trade.asset.day50MovingAverage : undefined,
+                                                day200MovingAverage: prop.trade.asset.day200MovingAverage !== undefined ? prop.trade.asset.day200MovingAverage : undefined,
+                                                sharesOutstanding: prop.trade.asset.sharesOutstanding !== undefined ? prop.trade.asset.sharesOutstanding : undefined,
+                                                dividendDate: prop.trade.asset.dividendDate !== undefined ? prop.trade.asset.dividendDate : undefined,
+                                                exDividendDate: prop.trade.asset.exDividendDate !== undefined ? prop.trade.asset.exDividendDate : undefined,
+                                                sellPrice: prop.trade.asset.sellPrice !== undefined ? prop.trade.asset.sellPrice : undefined,
+                                                buyPrice: prop.trade.asset.buyPrice !== undefined ? prop.trade.asset.buyPrice : undefined,
+                                            },
+                                        }
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -2466,86 +2516,96 @@ exports.Action = {
                             filledAt: prop.order.filledAt !== undefined ? prop.order.filledAt : undefined,
                             filledAvgPrice: prop.order.filledAvgPrice !== undefined ? prop.order.filledAvgPrice : undefined,
                             fee: prop.order.fee !== undefined ? prop.order.fee : undefined,
-                            alpacaAccount: prop.order.alpacaAccount ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: prop.order.alpacaAccount.id !== undefined ? prop.order.alpacaAccount.id : undefined,
-                                    },
-                                    create: {
-                                        type: prop.order.alpacaAccount.type !== undefined ? prop.order.alpacaAccount.type : undefined,
-                                        APIKey: prop.order.alpacaAccount.APIKey !== undefined ? prop.order.alpacaAccount.APIKey : undefined,
-                                        APISecret: prop.order.alpacaAccount.APISecret !== undefined ? prop.order.alpacaAccount.APISecret : undefined,
-                                        configuration: prop.order.alpacaAccount.configuration !== undefined ? prop.order.alpacaAccount.configuration : undefined,
-                                        marketOpen: prop.order.alpacaAccount.marketOpen !== undefined ? prop.order.alpacaAccount.marketOpen : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            asset: prop.order.asset ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: prop.order.asset.id !== undefined ? prop.order.asset.id : undefined,
-                                        symbol: prop.order.asset.symbol !== undefined ? prop.order.asset.symbol : undefined,
-                                        name: prop.order.asset.name !== undefined ? prop.order.asset.name : undefined,
-                                    },
-                                    create: {
-                                        symbol: prop.order.asset.symbol !== undefined ? prop.order.asset.symbol : undefined,
-                                        name: prop.order.asset.name !== undefined ? prop.order.asset.name : undefined,
-                                        type: prop.order.asset.type !== undefined ? prop.order.asset.type : undefined,
-                                        logoUrl: prop.order.asset.logoUrl !== undefined ? prop.order.asset.logoUrl : undefined,
-                                        description: prop.order.asset.description !== undefined ? prop.order.asset.description : undefined,
-                                        cik: prop.order.asset.cik !== undefined ? prop.order.asset.cik : undefined,
-                                        exchange: prop.order.asset.exchange !== undefined ? prop.order.asset.exchange : undefined,
-                                        currency: prop.order.asset.currency !== undefined ? prop.order.asset.currency : undefined,
-                                        country: prop.order.asset.country !== undefined ? prop.order.asset.country : undefined,
-                                        sector: prop.order.asset.sector !== undefined ? prop.order.asset.sector : undefined,
-                                        industry: prop.order.asset.industry !== undefined ? prop.order.asset.industry : undefined,
-                                        address: prop.order.asset.address !== undefined ? prop.order.asset.address : undefined,
-                                        officialSite: prop.order.asset.officialSite !== undefined ? prop.order.asset.officialSite : undefined,
-                                        fiscalYearEnd: prop.order.asset.fiscalYearEnd !== undefined ? prop.order.asset.fiscalYearEnd : undefined,
-                                        latestQuarter: prop.order.asset.latestQuarter !== undefined ? prop.order.asset.latestQuarter : undefined,
-                                        marketCapitalization: prop.order.asset.marketCapitalization !== undefined ? prop.order.asset.marketCapitalization : undefined,
-                                        ebitda: prop.order.asset.ebitda !== undefined ? prop.order.asset.ebitda : undefined,
-                                        peRatio: prop.order.asset.peRatio !== undefined ? prop.order.asset.peRatio : undefined,
-                                        pegRatio: prop.order.asset.pegRatio !== undefined ? prop.order.asset.pegRatio : undefined,
-                                        bookValue: prop.order.asset.bookValue !== undefined ? prop.order.asset.bookValue : undefined,
-                                        dividendPerShare: prop.order.asset.dividendPerShare !== undefined ? prop.order.asset.dividendPerShare : undefined,
-                                        dividendYield: prop.order.asset.dividendYield !== undefined ? prop.order.asset.dividendYield : undefined,
-                                        eps: prop.order.asset.eps !== undefined ? prop.order.asset.eps : undefined,
-                                        revenuePerShareTTM: prop.order.asset.revenuePerShareTTM !== undefined ? prop.order.asset.revenuePerShareTTM : undefined,
-                                        profitMargin: prop.order.asset.profitMargin !== undefined ? prop.order.asset.profitMargin : undefined,
-                                        operatingMarginTTM: prop.order.asset.operatingMarginTTM !== undefined ? prop.order.asset.operatingMarginTTM : undefined,
-                                        returnOnAssetsTTM: prop.order.asset.returnOnAssetsTTM !== undefined ? prop.order.asset.returnOnAssetsTTM : undefined,
-                                        returnOnEquityTTM: prop.order.asset.returnOnEquityTTM !== undefined ? prop.order.asset.returnOnEquityTTM : undefined,
-                                        revenueTTM: prop.order.asset.revenueTTM !== undefined ? prop.order.asset.revenueTTM : undefined,
-                                        grossProfitTTM: prop.order.asset.grossProfitTTM !== undefined ? prop.order.asset.grossProfitTTM : undefined,
-                                        dilutedEPSTTM: prop.order.asset.dilutedEPSTTM !== undefined ? prop.order.asset.dilutedEPSTTM : undefined,
-                                        quarterlyEarningsGrowthYOY: prop.order.asset.quarterlyEarningsGrowthYOY !== undefined ? prop.order.asset.quarterlyEarningsGrowthYOY : undefined,
-                                        quarterlyRevenueGrowthYOY: prop.order.asset.quarterlyRevenueGrowthYOY !== undefined ? prop.order.asset.quarterlyRevenueGrowthYOY : undefined,
-                                        analystTargetPrice: prop.order.asset.analystTargetPrice !== undefined ? prop.order.asset.analystTargetPrice : undefined,
-                                        analystRatingStrongBuy: prop.order.asset.analystRatingStrongBuy !== undefined ? prop.order.asset.analystRatingStrongBuy : undefined,
-                                        analystRatingBuy: prop.order.asset.analystRatingBuy !== undefined ? prop.order.asset.analystRatingBuy : undefined,
-                                        analystRatingHold: prop.order.asset.analystRatingHold !== undefined ? prop.order.asset.analystRatingHold : undefined,
-                                        analystRatingSell: prop.order.asset.analystRatingSell !== undefined ? prop.order.asset.analystRatingSell : undefined,
-                                        analystRatingStrongSell: prop.order.asset.analystRatingStrongSell !== undefined ? prop.order.asset.analystRatingStrongSell : undefined,
-                                        trailingPE: prop.order.asset.trailingPE !== undefined ? prop.order.asset.trailingPE : undefined,
-                                        forwardPE: prop.order.asset.forwardPE !== undefined ? prop.order.asset.forwardPE : undefined,
-                                        priceToSalesRatioTTM: prop.order.asset.priceToSalesRatioTTM !== undefined ? prop.order.asset.priceToSalesRatioTTM : undefined,
-                                        priceToBookRatio: prop.order.asset.priceToBookRatio !== undefined ? prop.order.asset.priceToBookRatio : undefined,
-                                        evToRevenue: prop.order.asset.evToRevenue !== undefined ? prop.order.asset.evToRevenue : undefined,
-                                        evToEbitda: prop.order.asset.evToEbitda !== undefined ? prop.order.asset.evToEbitda : undefined,
-                                        beta: prop.order.asset.beta !== undefined ? prop.order.asset.beta : undefined,
-                                        week52High: prop.order.asset.week52High !== undefined ? prop.order.asset.week52High : undefined,
-                                        week52Low: prop.order.asset.week52Low !== undefined ? prop.order.asset.week52Low : undefined,
-                                        day50MovingAverage: prop.order.asset.day50MovingAverage !== undefined ? prop.order.asset.day50MovingAverage : undefined,
-                                        day200MovingAverage: prop.order.asset.day200MovingAverage !== undefined ? prop.order.asset.day200MovingAverage : undefined,
-                                        sharesOutstanding: prop.order.asset.sharesOutstanding !== undefined ? prop.order.asset.sharesOutstanding : undefined,
-                                        dividendDate: prop.order.asset.dividendDate !== undefined ? prop.order.asset.dividendDate : undefined,
-                                        exDividendDate: prop.order.asset.exDividendDate !== undefined ? prop.order.asset.exDividendDate : undefined,
-                                        sellPrice: prop.order.asset.sellPrice !== undefined ? prop.order.asset.sellPrice : undefined,
-                                        buyPrice: prop.order.asset.buyPrice !== undefined ? prop.order.asset.buyPrice : undefined,
-                                    },
-                                }
-                            } : undefined,
+                            alpacaAccount: prop.order.alpacaAccount ?
+                                typeof prop.order.alpacaAccount === 'object' && Object.keys(prop.order.alpacaAccount).length === 1 && Object.keys(prop.order.alpacaAccount)[0] === 'id'
+                                    ? { connect: {
+                                            id: prop.order.alpacaAccount.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: prop.order.alpacaAccount.id !== undefined ? prop.order.alpacaAccount.id : undefined,
+                                            },
+                                            create: {
+                                                type: prop.order.alpacaAccount.type !== undefined ? prop.order.alpacaAccount.type : undefined,
+                                                APIKey: prop.order.alpacaAccount.APIKey !== undefined ? prop.order.alpacaAccount.APIKey : undefined,
+                                                APISecret: prop.order.alpacaAccount.APISecret !== undefined ? prop.order.alpacaAccount.APISecret : undefined,
+                                                configuration: prop.order.alpacaAccount.configuration !== undefined ? prop.order.alpacaAccount.configuration : undefined,
+                                                marketOpen: prop.order.alpacaAccount.marketOpen !== undefined ? prop.order.alpacaAccount.marketOpen : undefined,
+                                            },
+                                        }
+                                    } : undefined,
+                            asset: prop.order.asset ?
+                                typeof prop.order.asset === 'object' && Object.keys(prop.order.asset).length === 1 && Object.keys(prop.order.asset)[0] === 'id'
+                                    ? { connect: {
+                                            id: prop.order.asset.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: prop.order.asset.id !== undefined ? prop.order.asset.id : undefined,
+                                                symbol: prop.order.asset.symbol !== undefined ? prop.order.asset.symbol : undefined,
+                                                name: prop.order.asset.name !== undefined ? prop.order.asset.name : undefined,
+                                            },
+                                            create: {
+                                                symbol: prop.order.asset.symbol !== undefined ? prop.order.asset.symbol : undefined,
+                                                name: prop.order.asset.name !== undefined ? prop.order.asset.name : undefined,
+                                                type: prop.order.asset.type !== undefined ? prop.order.asset.type : undefined,
+                                                logoUrl: prop.order.asset.logoUrl !== undefined ? prop.order.asset.logoUrl : undefined,
+                                                description: prop.order.asset.description !== undefined ? prop.order.asset.description : undefined,
+                                                cik: prop.order.asset.cik !== undefined ? prop.order.asset.cik : undefined,
+                                                exchange: prop.order.asset.exchange !== undefined ? prop.order.asset.exchange : undefined,
+                                                currency: prop.order.asset.currency !== undefined ? prop.order.asset.currency : undefined,
+                                                country: prop.order.asset.country !== undefined ? prop.order.asset.country : undefined,
+                                                sector: prop.order.asset.sector !== undefined ? prop.order.asset.sector : undefined,
+                                                industry: prop.order.asset.industry !== undefined ? prop.order.asset.industry : undefined,
+                                                address: prop.order.asset.address !== undefined ? prop.order.asset.address : undefined,
+                                                officialSite: prop.order.asset.officialSite !== undefined ? prop.order.asset.officialSite : undefined,
+                                                fiscalYearEnd: prop.order.asset.fiscalYearEnd !== undefined ? prop.order.asset.fiscalYearEnd : undefined,
+                                                latestQuarter: prop.order.asset.latestQuarter !== undefined ? prop.order.asset.latestQuarter : undefined,
+                                                marketCapitalization: prop.order.asset.marketCapitalization !== undefined ? prop.order.asset.marketCapitalization : undefined,
+                                                ebitda: prop.order.asset.ebitda !== undefined ? prop.order.asset.ebitda : undefined,
+                                                peRatio: prop.order.asset.peRatio !== undefined ? prop.order.asset.peRatio : undefined,
+                                                pegRatio: prop.order.asset.pegRatio !== undefined ? prop.order.asset.pegRatio : undefined,
+                                                bookValue: prop.order.asset.bookValue !== undefined ? prop.order.asset.bookValue : undefined,
+                                                dividendPerShare: prop.order.asset.dividendPerShare !== undefined ? prop.order.asset.dividendPerShare : undefined,
+                                                dividendYield: prop.order.asset.dividendYield !== undefined ? prop.order.asset.dividendYield : undefined,
+                                                eps: prop.order.asset.eps !== undefined ? prop.order.asset.eps : undefined,
+                                                revenuePerShareTTM: prop.order.asset.revenuePerShareTTM !== undefined ? prop.order.asset.revenuePerShareTTM : undefined,
+                                                profitMargin: prop.order.asset.profitMargin !== undefined ? prop.order.asset.profitMargin : undefined,
+                                                operatingMarginTTM: prop.order.asset.operatingMarginTTM !== undefined ? prop.order.asset.operatingMarginTTM : undefined,
+                                                returnOnAssetsTTM: prop.order.asset.returnOnAssetsTTM !== undefined ? prop.order.asset.returnOnAssetsTTM : undefined,
+                                                returnOnEquityTTM: prop.order.asset.returnOnEquityTTM !== undefined ? prop.order.asset.returnOnEquityTTM : undefined,
+                                                revenueTTM: prop.order.asset.revenueTTM !== undefined ? prop.order.asset.revenueTTM : undefined,
+                                                grossProfitTTM: prop.order.asset.grossProfitTTM !== undefined ? prop.order.asset.grossProfitTTM : undefined,
+                                                dilutedEPSTTM: prop.order.asset.dilutedEPSTTM !== undefined ? prop.order.asset.dilutedEPSTTM : undefined,
+                                                quarterlyEarningsGrowthYOY: prop.order.asset.quarterlyEarningsGrowthYOY !== undefined ? prop.order.asset.quarterlyEarningsGrowthYOY : undefined,
+                                                quarterlyRevenueGrowthYOY: prop.order.asset.quarterlyRevenueGrowthYOY !== undefined ? prop.order.asset.quarterlyRevenueGrowthYOY : undefined,
+                                                analystTargetPrice: prop.order.asset.analystTargetPrice !== undefined ? prop.order.asset.analystTargetPrice : undefined,
+                                                analystRatingStrongBuy: prop.order.asset.analystRatingStrongBuy !== undefined ? prop.order.asset.analystRatingStrongBuy : undefined,
+                                                analystRatingBuy: prop.order.asset.analystRatingBuy !== undefined ? prop.order.asset.analystRatingBuy : undefined,
+                                                analystRatingHold: prop.order.asset.analystRatingHold !== undefined ? prop.order.asset.analystRatingHold : undefined,
+                                                analystRatingSell: prop.order.asset.analystRatingSell !== undefined ? prop.order.asset.analystRatingSell : undefined,
+                                                analystRatingStrongSell: prop.order.asset.analystRatingStrongSell !== undefined ? prop.order.asset.analystRatingStrongSell : undefined,
+                                                trailingPE: prop.order.asset.trailingPE !== undefined ? prop.order.asset.trailingPE : undefined,
+                                                forwardPE: prop.order.asset.forwardPE !== undefined ? prop.order.asset.forwardPE : undefined,
+                                                priceToSalesRatioTTM: prop.order.asset.priceToSalesRatioTTM !== undefined ? prop.order.asset.priceToSalesRatioTTM : undefined,
+                                                priceToBookRatio: prop.order.asset.priceToBookRatio !== undefined ? prop.order.asset.priceToBookRatio : undefined,
+                                                evToRevenue: prop.order.asset.evToRevenue !== undefined ? prop.order.asset.evToRevenue : undefined,
+                                                evToEbitda: prop.order.asset.evToEbitda !== undefined ? prop.order.asset.evToEbitda : undefined,
+                                                beta: prop.order.asset.beta !== undefined ? prop.order.asset.beta : undefined,
+                                                week52High: prop.order.asset.week52High !== undefined ? prop.order.asset.week52High : undefined,
+                                                week52Low: prop.order.asset.week52Low !== undefined ? prop.order.asset.week52Low : undefined,
+                                                day50MovingAverage: prop.order.asset.day50MovingAverage !== undefined ? prop.order.asset.day50MovingAverage : undefined,
+                                                day200MovingAverage: prop.order.asset.day200MovingAverage !== undefined ? prop.order.asset.day200MovingAverage : undefined,
+                                                sharesOutstanding: prop.order.asset.sharesOutstanding !== undefined ? prop.order.asset.sharesOutstanding : undefined,
+                                                dividendDate: prop.order.asset.dividendDate !== undefined ? prop.order.asset.dividendDate : undefined,
+                                                exDividendDate: prop.order.asset.exDividendDate !== undefined ? prop.order.asset.exDividendDate : undefined,
+                                                sellPrice: prop.order.asset.sellPrice !== undefined ? prop.order.asset.sellPrice : undefined,
+                                                buyPrice: prop.order.asset.buyPrice !== undefined ? prop.order.asset.buyPrice : undefined,
+                                            },
+                                        }
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -2582,7 +2642,6 @@ exports.Action = {
           sequence
           tradeId
           type
-          orderId
           note
           status
           fee
@@ -2845,7 +2904,6 @@ exports.Action = {
           sequence
           tradeId
           type
-          orderId
           note
           status
           fee
@@ -3107,7 +3165,6 @@ exports.Action = {
           sequence
           tradeId
           type
-          orderId
           note
           status
           fee
@@ -3363,7 +3420,6 @@ exports.Action = {
           sequence
           tradeId
           type
-          orderId
           note
           status
           fee