adaptic-backend 1.0.74 → 1.0.76

package/server/Order.mjs

@@ -218,7 +218,6 @@ export const Order = {
                 sequence
                 tradeId
                 type
-                orderId
                 note
                 status
                 fee
@@ -298,250 +297,304 @@ export const Order = {
                 filledAt: props.filledAt !== undefined ? props.filledAt : undefined,
                 filledAvgPrice: props.filledAvgPrice !== undefined ? props.filledAvgPrice : undefined,
                 fee: props.fee !== undefined ? props.fee : undefined,
-                alpacaAccount: props.alpacaAccount ? {
-                    connectOrCreate: {
-                        where: {
-                            id: props.alpacaAccount.id !== undefined ? props.alpacaAccount.id : undefined,
-                        },
-                        create: {
-                            type: props.alpacaAccount.type !== undefined ? props.alpacaAccount.type : undefined,
-                            APIKey: props.alpacaAccount.APIKey !== undefined ? props.alpacaAccount.APIKey : undefined,
-                            APISecret: props.alpacaAccount.APISecret !== undefined ? props.alpacaAccount.APISecret : undefined,
-                            configuration: props.alpacaAccount.configuration !== undefined ? props.alpacaAccount.configuration : undefined,
-                            marketOpen: props.alpacaAccount.marketOpen !== undefined ? props.alpacaAccount.marketOpen : undefined,
-                            user: props.alpacaAccount.user ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.alpacaAccount.user.id !== undefined ? props.alpacaAccount.user.id : undefined,
-                                        email: props.alpacaAccount.user.email !== undefined ? props.alpacaAccount.user.email : undefined,
-                                        name: props.alpacaAccount.user.name !== undefined ? {
-                                            equals: props.alpacaAccount.user.name
-                                        } : undefined,
-                                    },
-                                    create: {
-                                        name: props.alpacaAccount.user.name !== undefined ? props.alpacaAccount.user.name : undefined,
-                                        email: props.alpacaAccount.user.email !== undefined ? props.alpacaAccount.user.email : undefined,
-                                        emailVerified: props.alpacaAccount.user.emailVerified !== undefined ? props.alpacaAccount.user.emailVerified : undefined,
-                                        image: props.alpacaAccount.user.image !== undefined ? props.alpacaAccount.user.image : undefined,
-                                        role: props.alpacaAccount.user.role !== undefined ? props.alpacaAccount.user.role : undefined,
-                                        bio: props.alpacaAccount.user.bio !== undefined ? props.alpacaAccount.user.bio : undefined,
-                                        jobTitle: props.alpacaAccount.user.jobTitle !== undefined ? props.alpacaAccount.user.jobTitle : undefined,
-                                        currentAccount: props.alpacaAccount.user.currentAccount !== undefined ? props.alpacaAccount.user.currentAccount : undefined,
-                                        plan: props.alpacaAccount.user.plan !== undefined ? props.alpacaAccount.user.plan : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            trades: props.alpacaAccount.trades ? {
-                                connectOrCreate: props.alpacaAccount.trades.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        price: item.price !== undefined ? item.price : undefined,
-                                        total: item.total !== undefined ? item.total : undefined,
-                                        signal: item.signal !== undefined ? item.signal : undefined,
-                                        strategy: item.strategy !== undefined ? item.strategy : undefined,
-                                        analysis: item.analysis !== undefined ? item.analysis : undefined,
-                                        confidence: item.confidence !== undefined ? item.confidence : undefined,
-                                        timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
-                                        status: item.status !== undefined ? item.status : undefined,
-                                        optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            positions: props.alpacaAccount.positions ? {
-                                connectOrCreate: props.alpacaAccount.positions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
-                                        marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
-                                        costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
-                                        unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
-                                        unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
-                                        unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
-                                        unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
-                                        currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
-                                        lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
-                                        changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
-                                        assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            alerts: props.alpacaAccount.alerts ? {
-                                connectOrCreate: props.alpacaAccount.alerts.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        message: item.message !== undefined ? item.message : undefined,
-                                        type: item.type !== undefined ? item.type : undefined,
-                                        isRead: item.isRead !== undefined ? item.isRead : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                        },
-                    }
-                } : undefined,
-                action: props.action ? {
-                    connectOrCreate: {
-                        where: {
-                            id: props.action.id !== undefined ? props.action.id : undefined,
-                        },
-                        create: {
-                            sequence: props.action.sequence !== undefined ? props.action.sequence : undefined,
-                            type: props.action.type !== undefined ? props.action.type : undefined,
-                            orderId: props.action.orderId !== undefined ? props.action.orderId : undefined,
-                            note: props.action.note !== undefined ? props.action.note : undefined,
-                            status: props.action.status !== undefined ? props.action.status : undefined,
-                            fee: props.action.fee !== undefined ? props.action.fee : undefined,
-                            trade: props.action.trade ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.action.trade.id !== undefined ? props.action.trade.id : undefined,
-                                    },
-                                    create: {
-                                        qty: props.action.trade.qty !== undefined ? props.action.trade.qty : undefined,
-                                        price: props.action.trade.price !== undefined ? props.action.trade.price : undefined,
-                                        total: props.action.trade.total !== undefined ? props.action.trade.total : undefined,
-                                        signal: props.action.trade.signal !== undefined ? props.action.trade.signal : undefined,
-                                        strategy: props.action.trade.strategy !== undefined ? props.action.trade.strategy : undefined,
-                                        analysis: props.action.trade.analysis !== undefined ? props.action.trade.analysis : undefined,
-                                        confidence: props.action.trade.confidence !== undefined ? props.action.trade.confidence : undefined,
-                                        timestamp: props.action.trade.timestamp !== undefined ? props.action.trade.timestamp : undefined,
-                                        status: props.action.trade.status !== undefined ? props.action.trade.status : undefined,
-                                        optionContractType: props.action.trade.optionContractType !== undefined ? props.action.trade.optionContractType : undefined,
-                                    },
-                                }
-                            } : undefined,
-                        },
-                    }
-                } : undefined,
-                asset: props.asset ? {
-                    connectOrCreate: {
-                        where: {
-                            id: props.asset.id !== undefined ? props.asset.id : undefined,
-                            symbol: props.asset.symbol !== undefined ? props.asset.symbol : undefined,
-                            name: props.asset.name !== undefined ? props.asset.name : undefined,
-                        },
-                        create: {
-                            symbol: props.asset.symbol !== undefined ? props.asset.symbol : undefined,
-                            name: props.asset.name !== undefined ? props.asset.name : undefined,
-                            type: props.asset.type !== undefined ? props.asset.type : undefined,
-                            logoUrl: props.asset.logoUrl !== undefined ? props.asset.logoUrl : undefined,
-                            description: props.asset.description !== undefined ? props.asset.description : undefined,
-                            cik: props.asset.cik !== undefined ? props.asset.cik : undefined,
-                            exchange: props.asset.exchange !== undefined ? props.asset.exchange : undefined,
-                            currency: props.asset.currency !== undefined ? props.asset.currency : undefined,
-                            country: props.asset.country !== undefined ? props.asset.country : undefined,
-                            sector: props.asset.sector !== undefined ? props.asset.sector : undefined,
-                            industry: props.asset.industry !== undefined ? props.asset.industry : undefined,
-                            address: props.asset.address !== undefined ? props.asset.address : undefined,
-                            officialSite: props.asset.officialSite !== undefined ? props.asset.officialSite : undefined,
-                            fiscalYearEnd: props.asset.fiscalYearEnd !== undefined ? props.asset.fiscalYearEnd : undefined,
-                            latestQuarter: props.asset.latestQuarter !== undefined ? props.asset.latestQuarter : undefined,
-                            marketCapitalization: props.asset.marketCapitalization !== undefined ? props.asset.marketCapitalization : undefined,
-                            ebitda: props.asset.ebitda !== undefined ? props.asset.ebitda : undefined,
-                            peRatio: props.asset.peRatio !== undefined ? props.asset.peRatio : undefined,
-                            pegRatio: props.asset.pegRatio !== undefined ? props.asset.pegRatio : undefined,
-                            bookValue: props.asset.bookValue !== undefined ? props.asset.bookValue : undefined,
-                            dividendPerShare: props.asset.dividendPerShare !== undefined ? props.asset.dividendPerShare : undefined,
-                            dividendYield: props.asset.dividendYield !== undefined ? props.asset.dividendYield : undefined,
-                            eps: props.asset.eps !== undefined ? props.asset.eps : undefined,
-                            revenuePerShareTTM: props.asset.revenuePerShareTTM !== undefined ? props.asset.revenuePerShareTTM : undefined,
-                            profitMargin: props.asset.profitMargin !== undefined ? props.asset.profitMargin : undefined,
-                            operatingMarginTTM: props.asset.operatingMarginTTM !== undefined ? props.asset.operatingMarginTTM : undefined,
-                            returnOnAssetsTTM: props.asset.returnOnAssetsTTM !== undefined ? props.asset.returnOnAssetsTTM : undefined,
-                            returnOnEquityTTM: props.asset.returnOnEquityTTM !== undefined ? props.asset.returnOnEquityTTM : undefined,
-                            revenueTTM: props.asset.revenueTTM !== undefined ? props.asset.revenueTTM : undefined,
-                            grossProfitTTM: props.asset.grossProfitTTM !== undefined ? props.asset.grossProfitTTM : undefined,
-                            dilutedEPSTTM: props.asset.dilutedEPSTTM !== undefined ? props.asset.dilutedEPSTTM : undefined,
-                            quarterlyEarningsGrowthYOY: props.asset.quarterlyEarningsGrowthYOY !== undefined ? props.asset.quarterlyEarningsGrowthYOY : undefined,
-                            quarterlyRevenueGrowthYOY: props.asset.quarterlyRevenueGrowthYOY !== undefined ? props.asset.quarterlyRevenueGrowthYOY : undefined,
-                            analystTargetPrice: props.asset.analystTargetPrice !== undefined ? props.asset.analystTargetPrice : undefined,
-                            analystRatingStrongBuy: props.asset.analystRatingStrongBuy !== undefined ? props.asset.analystRatingStrongBuy : undefined,
-                            analystRatingBuy: props.asset.analystRatingBuy !== undefined ? props.asset.analystRatingBuy : undefined,
-                            analystRatingHold: props.asset.analystRatingHold !== undefined ? props.asset.analystRatingHold : undefined,
-                            analystRatingSell: props.asset.analystRatingSell !== undefined ? props.asset.analystRatingSell : undefined,
-                            analystRatingStrongSell: props.asset.analystRatingStrongSell !== undefined ? props.asset.analystRatingStrongSell : undefined,
-                            trailingPE: props.asset.trailingPE !== undefined ? props.asset.trailingPE : undefined,
-                            forwardPE: props.asset.forwardPE !== undefined ? props.asset.forwardPE : undefined,
-                            priceToSalesRatioTTM: props.asset.priceToSalesRatioTTM !== undefined ? props.asset.priceToSalesRatioTTM : undefined,
-                            priceToBookRatio: props.asset.priceToBookRatio !== undefined ? props.asset.priceToBookRatio : undefined,
-                            evToRevenue: props.asset.evToRevenue !== undefined ? props.asset.evToRevenue : undefined,
-                            evToEbitda: props.asset.evToEbitda !== undefined ? props.asset.evToEbitda : undefined,
-                            beta: props.asset.beta !== undefined ? props.asset.beta : undefined,
-                            week52High: props.asset.week52High !== undefined ? props.asset.week52High : undefined,
-                            week52Low: props.asset.week52Low !== undefined ? props.asset.week52Low : undefined,
-                            day50MovingAverage: props.asset.day50MovingAverage !== undefined ? props.asset.day50MovingAverage : undefined,
-                            day200MovingAverage: props.asset.day200MovingAverage !== undefined ? props.asset.day200MovingAverage : undefined,
-                            sharesOutstanding: props.asset.sharesOutstanding !== undefined ? props.asset.sharesOutstanding : undefined,
-                            dividendDate: props.asset.dividendDate !== undefined ? props.asset.dividendDate : undefined,
-                            exDividendDate: props.asset.exDividendDate !== undefined ? props.asset.exDividendDate : undefined,
-                            sellPrice: props.asset.sellPrice !== undefined ? props.asset.sellPrice : undefined,
-                            buyPrice: props.asset.buyPrice !== undefined ? props.asset.buyPrice : undefined,
-                            trades: props.asset.trades ? {
-                                connectOrCreate: props.asset.trades.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        price: item.price !== undefined ? item.price : undefined,
-                                        total: item.total !== undefined ? item.total : undefined,
-                                        signal: item.signal !== undefined ? item.signal : undefined,
-                                        strategy: item.strategy !== undefined ? item.strategy : undefined,
-                                        analysis: item.analysis !== undefined ? item.analysis : undefined,
-                                        confidence: item.confidence !== undefined ? item.confidence : undefined,
-                                        timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
-                                        status: item.status !== undefined ? item.status : undefined,
-                                        optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            positions: props.asset.positions ? {
-                                connectOrCreate: props.asset.positions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
-                                        marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
-                                        costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
-                                        unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
-                                        unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
-                                        unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
-                                        unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
-                                        currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
-                                        lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
-                                        changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
-                                        assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            newsMentions: props.asset.newsMentions ? {
-                                connectOrCreate: props.asset.newsMentions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                        url: item.url !== undefined ? item.url : undefined,
-                                    },
-                                    create: {
-                                        url: item.url !== undefined ? item.url : undefined,
-                                        relevancyScore: item.relevancyScore !== undefined ? item.relevancyScore : undefined,
-                                        sentimentScore: item.sentimentScore !== undefined ? item.sentimentScore : undefined,
-                                        sentimentLabel: item.sentimentLabel !== undefined ? item.sentimentLabel : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                        },
-                    }
-                } : undefined,
+                alpacaAccount: props.alpacaAccount ?
+                    typeof props.alpacaAccount === 'object' && Object.keys(props.alpacaAccount).length === 1 && Object.keys(props.alpacaAccount)[0] === 'id'
+                        ? { connect: {
+                                id: props.alpacaAccount.id
+                            }
+                        }
+                        : { connectOrCreate: {
+                                where: {
+                                    id: props.alpacaAccount.id !== undefined ? props.alpacaAccount.id : undefined,
+                                },
+                                create: {
+                                    type: props.alpacaAccount.type !== undefined ? props.alpacaAccount.type : undefined,
+                                    APIKey: props.alpacaAccount.APIKey !== undefined ? props.alpacaAccount.APIKey : undefined,
+                                    APISecret: props.alpacaAccount.APISecret !== undefined ? props.alpacaAccount.APISecret : undefined,
+                                    configuration: props.alpacaAccount.configuration !== undefined ? props.alpacaAccount.configuration : undefined,
+                                    marketOpen: props.alpacaAccount.marketOpen !== undefined ? props.alpacaAccount.marketOpen : undefined,
+                                    user: props.alpacaAccount.user ?
+                                        typeof props.alpacaAccount.user === 'object' && Object.keys(props.alpacaAccount.user).length === 1 && Object.keys(props.alpacaAccount.user)[0] === 'id'
+                                            ? { connect: {
+                                                    id: props.alpacaAccount.user.id
+                                                }
+                                            }
+                                            : { connectOrCreate: {
+                                                    where: {
+                                                        id: props.alpacaAccount.user.id !== undefined ? props.alpacaAccount.user.id : undefined,
+                                                        email: props.alpacaAccount.user.email !== undefined ? props.alpacaAccount.user.email : undefined,
+                                                        name: props.alpacaAccount.user.name !== undefined ? {
+                                                            equals: props.alpacaAccount.user.name
+                                                        } : undefined,
+                                                    },
+                                                    create: {
+                                                        name: props.alpacaAccount.user.name !== undefined ? props.alpacaAccount.user.name : undefined,
+                                                        email: props.alpacaAccount.user.email !== undefined ? props.alpacaAccount.user.email : undefined,
+                                                        emailVerified: props.alpacaAccount.user.emailVerified !== undefined ? props.alpacaAccount.user.emailVerified : undefined,
+                                                        image: props.alpacaAccount.user.image !== undefined ? props.alpacaAccount.user.image : undefined,
+                                                        role: props.alpacaAccount.user.role !== undefined ? props.alpacaAccount.user.role : undefined,
+                                                        bio: props.alpacaAccount.user.bio !== undefined ? props.alpacaAccount.user.bio : undefined,
+                                                        jobTitle: props.alpacaAccount.user.jobTitle !== undefined ? props.alpacaAccount.user.jobTitle : undefined,
+                                                        currentAccount: props.alpacaAccount.user.currentAccount !== undefined ? props.alpacaAccount.user.currentAccount : undefined,
+                                                        plan: props.alpacaAccount.user.plan !== undefined ? props.alpacaAccount.user.plan : undefined,
+                                                    },
+                                                }
+                                            } : undefined,
+                                    trades: props.alpacaAccount.trades ?
+                                        typeof props.alpacaAccount.trades[0] === 'object' && Object.keys(props.alpacaAccount.trades).length === 1 && Object.keys(props.alpacaAccount.trades)[0] === 'id'
+                                            ? { connect: props.alpacaAccount.trades.map((item) => ({
+                                                    id: item.id
+                                                }))
+                                            }
+                                            : { connectOrCreate: props.alpacaAccount.trades.map((item) => ({
+                                                    where: {
+                                                        id: item.id !== undefined ? item.id : undefined,
+                                                    },
+                                                    create: {
+                                                        qty: item.qty !== undefined ? item.qty : undefined,
+                                                        price: item.price !== undefined ? item.price : undefined,
+                                                        total: item.total !== undefined ? item.total : undefined,
+                                                        signal: item.signal !== undefined ? item.signal : undefined,
+                                                        strategy: item.strategy !== undefined ? item.strategy : undefined,
+                                                        analysis: item.analysis !== undefined ? item.analysis : undefined,
+                                                        confidence: item.confidence !== undefined ? item.confidence : undefined,
+                                                        timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
+                                                        status: item.status !== undefined ? item.status : undefined,
+                                                        optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
+                                                    },
+                                                }))
+                                            } : undefined,
+                                    positions: props.alpacaAccount.positions ?
+                                        typeof props.alpacaAccount.positions[0] === 'object' && Object.keys(props.alpacaAccount.positions).length === 1 && Object.keys(props.alpacaAccount.positions)[0] === 'id'
+                                            ? { connect: props.alpacaAccount.positions.map((item) => ({
+                                                    id: item.id
+                                                }))
+                                            }
+                                            : { connectOrCreate: props.alpacaAccount.positions.map((item) => ({
+                                                    where: {
+                                                        id: item.id !== undefined ? item.id : undefined,
+                                                    },
+                                                    create: {
+                                                        averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
+                                                        qty: item.qty !== undefined ? item.qty : undefined,
+                                                        qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
+                                                        marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
+                                                        costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
+                                                        unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
+                                                        unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
+                                                        unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
+                                                        unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
+                                                        currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
+                                                        lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
+                                                        changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
+                                                        assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
+                                                    },
+                                                }))
+                                            } : undefined,
+                                    alerts: props.alpacaAccount.alerts ?
+                                        typeof props.alpacaAccount.alerts[0] === 'object' && Object.keys(props.alpacaAccount.alerts).length === 1 && Object.keys(props.alpacaAccount.alerts)[0] === 'id'
+                                            ? { connect: props.alpacaAccount.alerts.map((item) => ({
+                                                    id: item.id
+                                                }))
+                                            }
+                                            : { connectOrCreate: props.alpacaAccount.alerts.map((item) => ({
+                                                    where: {
+                                                        id: item.id !== undefined ? item.id : undefined,
+                                                    },
+                                                    create: {
+                                                        message: item.message !== undefined ? item.message : undefined,
+                                                        type: item.type !== undefined ? item.type : undefined,
+                                                        isRead: item.isRead !== undefined ? item.isRead : undefined,
+                                                    },
+                                                }))
+                                            } : undefined,
+                                },
+                            }
+                        } : undefined,
+                action: props.action ?
+                    typeof props.action === 'object' && Object.keys(props.action).length === 1 && Object.keys(props.action)[0] === 'id'
+                        ? { connect: {
+                                id: props.action.id
+                            }
+                        }
+                        : { connectOrCreate: {
+                                where: {
+                                    id: props.action.id !== undefined ? props.action.id : undefined,
+                                },
+                                create: {
+                                    sequence: props.action.sequence !== undefined ? props.action.sequence : undefined,
+                                    type: props.action.type !== undefined ? props.action.type : undefined,
+                                    note: props.action.note !== undefined ? props.action.note : undefined,
+                                    status: props.action.status !== undefined ? props.action.status : undefined,
+                                    fee: props.action.fee !== undefined ? props.action.fee : undefined,
+                                    trade: props.action.trade ?
+                                        typeof props.action.trade === 'object' && Object.keys(props.action.trade).length === 1 && Object.keys(props.action.trade)[0] === 'id'
+                                            ? { connect: {
+                                                    id: props.action.trade.id
+                                                }
+                                            }
+                                            : { connectOrCreate: {
+                                                    where: {
+                                                        id: props.action.trade.id !== undefined ? props.action.trade.id : undefined,
+                                                    },
+                                                    create: {
+                                                        qty: props.action.trade.qty !== undefined ? props.action.trade.qty : undefined,
+                                                        price: props.action.trade.price !== undefined ? props.action.trade.price : undefined,
+                                                        total: props.action.trade.total !== undefined ? props.action.trade.total : undefined,
+                                                        signal: props.action.trade.signal !== undefined ? props.action.trade.signal : undefined,
+                                                        strategy: props.action.trade.strategy !== undefined ? props.action.trade.strategy : undefined,
+                                                        analysis: props.action.trade.analysis !== undefined ? props.action.trade.analysis : undefined,
+                                                        confidence: props.action.trade.confidence !== undefined ? props.action.trade.confidence : undefined,
+                                                        timestamp: props.action.trade.timestamp !== undefined ? props.action.trade.timestamp : undefined,
+                                                        status: props.action.trade.status !== undefined ? props.action.trade.status : undefined,
+                                                        optionContractType: props.action.trade.optionContractType !== undefined ? props.action.trade.optionContractType : undefined,
+                                                    },
+                                                }
+                                            } : undefined,
+                                },
+                            }
+                        } : undefined,
+                asset: props.asset ?
+                    typeof props.asset === 'object' && Object.keys(props.asset).length === 1 && Object.keys(props.asset)[0] === 'id'
+                        ? { connect: {
+                                id: props.asset.id
+                            }
+                        }
+                        : { connectOrCreate: {
+                                where: {
+                                    id: props.asset.id !== undefined ? props.asset.id : undefined,
+                                    symbol: props.asset.symbol !== undefined ? props.asset.symbol : undefined,
+                                    name: props.asset.name !== undefined ? props.asset.name : undefined,
+                                },
+                                create: {
+                                    symbol: props.asset.symbol !== undefined ? props.asset.symbol : undefined,
+                                    name: props.asset.name !== undefined ? props.asset.name : undefined,
+                                    type: props.asset.type !== undefined ? props.asset.type : undefined,
+                                    logoUrl: props.asset.logoUrl !== undefined ? props.asset.logoUrl : undefined,
+                                    description: props.asset.description !== undefined ? props.asset.description : undefined,
+                                    cik: props.asset.cik !== undefined ? props.asset.cik : undefined,
+                                    exchange: props.asset.exchange !== undefined ? props.asset.exchange : undefined,
+                                    currency: props.asset.currency !== undefined ? props.asset.currency : undefined,
+                                    country: props.asset.country !== undefined ? props.asset.country : undefined,
+                                    sector: props.asset.sector !== undefined ? props.asset.sector : undefined,
+                                    industry: props.asset.industry !== undefined ? props.asset.industry : undefined,
+                                    address: props.asset.address !== undefined ? props.asset.address : undefined,
+                                    officialSite: props.asset.officialSite !== undefined ? props.asset.officialSite : undefined,
+                                    fiscalYearEnd: props.asset.fiscalYearEnd !== undefined ? props.asset.fiscalYearEnd : undefined,
+                                    latestQuarter: props.asset.latestQuarter !== undefined ? props.asset.latestQuarter : undefined,
+                                    marketCapitalization: props.asset.marketCapitalization !== undefined ? props.asset.marketCapitalization : undefined,
+                                    ebitda: props.asset.ebitda !== undefined ? props.asset.ebitda : undefined,
+                                    peRatio: props.asset.peRatio !== undefined ? props.asset.peRatio : undefined,
+                                    pegRatio: props.asset.pegRatio !== undefined ? props.asset.pegRatio : undefined,
+                                    bookValue: props.asset.bookValue !== undefined ? props.asset.bookValue : undefined,
+                                    dividendPerShare: props.asset.dividendPerShare !== undefined ? props.asset.dividendPerShare : undefined,
+                                    dividendYield: props.asset.dividendYield !== undefined ? props.asset.dividendYield : undefined,
+                                    eps: props.asset.eps !== undefined ? props.asset.eps : undefined,
+                                    revenuePerShareTTM: props.asset.revenuePerShareTTM !== undefined ? props.asset.revenuePerShareTTM : undefined,
+                                    profitMargin: props.asset.profitMargin !== undefined ? props.asset.profitMargin : undefined,
+                                    operatingMarginTTM: props.asset.operatingMarginTTM !== undefined ? props.asset.operatingMarginTTM : undefined,
+                                    returnOnAssetsTTM: props.asset.returnOnAssetsTTM !== undefined ? props.asset.returnOnAssetsTTM : undefined,
+                                    returnOnEquityTTM: props.asset.returnOnEquityTTM !== undefined ? props.asset.returnOnEquityTTM : undefined,
+                                    revenueTTM: props.asset.revenueTTM !== undefined ? props.asset.revenueTTM : undefined,
+                                    grossProfitTTM: props.asset.grossProfitTTM !== undefined ? props.asset.grossProfitTTM : undefined,
+                                    dilutedEPSTTM: props.asset.dilutedEPSTTM !== undefined ? props.asset.dilutedEPSTTM : undefined,
+                                    quarterlyEarningsGrowthYOY: props.asset.quarterlyEarningsGrowthYOY !== undefined ? props.asset.quarterlyEarningsGrowthYOY : undefined,
+                                    quarterlyRevenueGrowthYOY: props.asset.quarterlyRevenueGrowthYOY !== undefined ? props.asset.quarterlyRevenueGrowthYOY : undefined,
+                                    analystTargetPrice: props.asset.analystTargetPrice !== undefined ? props.asset.analystTargetPrice : undefined,
+                                    analystRatingStrongBuy: props.asset.analystRatingStrongBuy !== undefined ? props.asset.analystRatingStrongBuy : undefined,
+                                    analystRatingBuy: props.asset.analystRatingBuy !== undefined ? props.asset.analystRatingBuy : undefined,
+                                    analystRatingHold: props.asset.analystRatingHold !== undefined ? props.asset.analystRatingHold : undefined,
+                                    analystRatingSell: props.asset.analystRatingSell !== undefined ? props.asset.analystRatingSell : undefined,
+                                    analystRatingStrongSell: props.asset.analystRatingStrongSell !== undefined ? props.asset.analystRatingStrongSell : undefined,
+                                    trailingPE: props.asset.trailingPE !== undefined ? props.asset.trailingPE : undefined,
+                                    forwardPE: props.asset.forwardPE !== undefined ? props.asset.forwardPE : undefined,
+                                    priceToSalesRatioTTM: props.asset.priceToSalesRatioTTM !== undefined ? props.asset.priceToSalesRatioTTM : undefined,
+                                    priceToBookRatio: props.asset.priceToBookRatio !== undefined ? props.asset.priceToBookRatio : undefined,
+                                    evToRevenue: props.asset.evToRevenue !== undefined ? props.asset.evToRevenue : undefined,
+                                    evToEbitda: props.asset.evToEbitda !== undefined ? props.asset.evToEbitda : undefined,
+                                    beta: props.asset.beta !== undefined ? props.asset.beta : undefined,
+                                    week52High: props.asset.week52High !== undefined ? props.asset.week52High : undefined,
+                                    week52Low: props.asset.week52Low !== undefined ? props.asset.week52Low : undefined,
+                                    day50MovingAverage: props.asset.day50MovingAverage !== undefined ? props.asset.day50MovingAverage : undefined,
+                                    day200MovingAverage: props.asset.day200MovingAverage !== undefined ? props.asset.day200MovingAverage : undefined,
+                                    sharesOutstanding: props.asset.sharesOutstanding !== undefined ? props.asset.sharesOutstanding : undefined,
+                                    dividendDate: props.asset.dividendDate !== undefined ? props.asset.dividendDate : undefined,
+                                    exDividendDate: props.asset.exDividendDate !== undefined ? props.asset.exDividendDate : undefined,
+                                    sellPrice: props.asset.sellPrice !== undefined ? props.asset.sellPrice : undefined,
+                                    buyPrice: props.asset.buyPrice !== undefined ? props.asset.buyPrice : undefined,
+                                    trades: props.asset.trades ?
+                                        typeof props.asset.trades[0] === 'object' && Object.keys(props.asset.trades).length === 1 && Object.keys(props.asset.trades)[0] === 'id'
+                                            ? { connect: props.asset.trades.map((item) => ({
+                                                    id: item.id
+                                                }))
+                                            }
+                                            : { connectOrCreate: props.asset.trades.map((item) => ({
+                                                    where: {
+                                                        id: item.id !== undefined ? item.id : undefined,
+                                                    },
+                                                    create: {
+                                                        qty: item.qty !== undefined ? item.qty : undefined,
+                                                        price: item.price !== undefined ? item.price : undefined,
+                                                        total: item.total !== undefined ? item.total : undefined,
+                                                        signal: item.signal !== undefined ? item.signal : undefined,
+                                                        strategy: item.strategy !== undefined ? item.strategy : undefined,
+                                                        analysis: item.analysis !== undefined ? item.analysis : undefined,
+                                                        confidence: item.confidence !== undefined ? item.confidence : undefined,
+                                                        timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
+                                                        status: item.status !== undefined ? item.status : undefined,
+                                                        optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
+                                                    },
+                                                }))
+                                            } : undefined,
+                                    positions: props.asset.positions ?
+                                        typeof props.asset.positions[0] === 'object' && Object.keys(props.asset.positions).length === 1 && Object.keys(props.asset.positions)[0] === 'id'
+                                            ? { connect: props.asset.positions.map((item) => ({
+                                                    id: item.id
+                                                }))
+                                            }
+                                            : { connectOrCreate: props.asset.positions.map((item) => ({
+                                                    where: {
+                                                        id: item.id !== undefined ? item.id : undefined,
+                                                    },
+                                                    create: {
+                                                        averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
+                                                        qty: item.qty !== undefined ? item.qty : undefined,
+                                                        qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
+                                                        marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
+                                                        costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
+                                                        unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
+                                                        unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
+                                                        unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
+                                                        unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
+                                                        currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
+                                                        lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
+                                                        changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
+                                                        assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
+                                                    },
+                                                }))
+                                            } : undefined,
+                                    newsMentions: props.asset.newsMentions ?
+                                        typeof props.asset.newsMentions[0] === 'object' && Object.keys(props.asset.newsMentions).length === 1 && Object.keys(props.asset.newsMentions)[0] === 'id'
+                                            ? { connect: props.asset.newsMentions.map((item) => ({
+                                                    id: item.id
+                                                }))
+                                            }
+                                            : { connectOrCreate: props.asset.newsMentions.map((item) => ({
+                                                    where: {
+                                                        id: item.id !== undefined ? item.id : undefined,
+                                                        url: item.url !== undefined ? item.url : undefined,
+                                                    },
+                                                    create: {
+                                                        url: item.url !== undefined ? item.url : undefined,
+                                                        relevancyScore: item.relevancyScore !== undefined ? item.relevancyScore : undefined,
+                                                        sentimentScore: item.sentimentScore !== undefined ? item.sentimentScore : undefined,
+                                                        sentimentLabel: item.sentimentLabel !== undefined ? item.sentimentLabel : undefined,
+                                                    },
+                                                }))
+                                            } : undefined,
+                                },
+                            }
+                        } : undefined,
             },
         };
         const filteredVariables = removeUndefinedProps(variables);
@@ -826,7 +879,6 @@ export const Order = {
                 sequence
                 tradeId
                 type
-                orderId
                 note
                 status
                 fee
@@ -1186,81 +1238,101 @@ export const Order = {
                             APISecret: props.alpacaAccount.APISecret !== undefined ? props.alpacaAccount.APISecret : undefined,
                             configuration: props.alpacaAccount.configuration !== undefined ? props.alpacaAccount.configuration : undefined,
                             marketOpen: props.alpacaAccount.marketOpen !== undefined ? props.alpacaAccount.marketOpen : undefined,
-                            user: props.alpacaAccount.user ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.alpacaAccount.user.id !== undefined ? props.alpacaAccount.user.id : undefined,
-                                        email: props.alpacaAccount.user.email !== undefined ? props.alpacaAccount.user.email : undefined,
-                                        name: props.alpacaAccount.user.name !== undefined ? {
-                                            equals: props.alpacaAccount.user.name
-                                        } : undefined,
-                                    },
-                                    create: {
-                                        name: props.alpacaAccount.user.name !== undefined ? props.alpacaAccount.user.name : undefined,
-                                        email: props.alpacaAccount.user.email !== undefined ? props.alpacaAccount.user.email : undefined,
-                                        emailVerified: props.alpacaAccount.user.emailVerified !== undefined ? props.alpacaAccount.user.emailVerified : undefined,
-                                        image: props.alpacaAccount.user.image !== undefined ? props.alpacaAccount.user.image : undefined,
-                                        role: props.alpacaAccount.user.role !== undefined ? props.alpacaAccount.user.role : undefined,
-                                        bio: props.alpacaAccount.user.bio !== undefined ? props.alpacaAccount.user.bio : undefined,
-                                        jobTitle: props.alpacaAccount.user.jobTitle !== undefined ? props.alpacaAccount.user.jobTitle : undefined,
-                                        currentAccount: props.alpacaAccount.user.currentAccount !== undefined ? props.alpacaAccount.user.currentAccount : undefined,
-                                        plan: props.alpacaAccount.user.plan !== undefined ? props.alpacaAccount.user.plan : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            trades: props.alpacaAccount.trades ? {
-                                connectOrCreate: props.alpacaAccount.trades.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        price: item.price !== undefined ? item.price : undefined,
-                                        total: item.total !== undefined ? item.total : undefined,
-                                        signal: item.signal !== undefined ? item.signal : undefined,
-                                        strategy: item.strategy !== undefined ? item.strategy : undefined,
-                                        analysis: item.analysis !== undefined ? item.analysis : undefined,
-                                        confidence: item.confidence !== undefined ? item.confidence : undefined,
-                                        timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
-                                        status: item.status !== undefined ? item.status : undefined,
-                                        optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            positions: props.alpacaAccount.positions ? {
-                                connectOrCreate: props.alpacaAccount.positions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
-                                        marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
-                                        costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
-                                        unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
-                                        unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
-                                        unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
-                                        unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
-                                        currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
-                                        lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
-                                        changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
-                                        assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            alerts: props.alpacaAccount.alerts ? {
-                                connectOrCreate: props.alpacaAccount.alerts.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        message: item.message !== undefined ? item.message : undefined,
-                                        type: item.type !== undefined ? item.type : undefined,
-                                        isRead: item.isRead !== undefined ? item.isRead : undefined,
-                                    },
-                                }))
-                            } : undefined,
+                            user: props.alpacaAccount.user ?
+                                typeof props.alpacaAccount.user === 'object' && Object.keys(props.alpacaAccount.user).length === 1 && Object.keys(props.alpacaAccount.user)[0] === 'id'
+                                    ? { connect: {
+                                            id: props.alpacaAccount.user.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: props.alpacaAccount.user.id !== undefined ? props.alpacaAccount.user.id : undefined,
+                                                email: props.alpacaAccount.user.email !== undefined ? props.alpacaAccount.user.email : undefined,
+                                                name: props.alpacaAccount.user.name !== undefined ? {
+                                                    equals: props.alpacaAccount.user.name
+                                                } : undefined,
+                                            },
+                                            create: {
+                                                name: props.alpacaAccount.user.name !== undefined ? props.alpacaAccount.user.name : undefined,
+                                                email: props.alpacaAccount.user.email !== undefined ? props.alpacaAccount.user.email : undefined,
+                                                emailVerified: props.alpacaAccount.user.emailVerified !== undefined ? props.alpacaAccount.user.emailVerified : undefined,
+                                                image: props.alpacaAccount.user.image !== undefined ? props.alpacaAccount.user.image : undefined,
+                                                role: props.alpacaAccount.user.role !== undefined ? props.alpacaAccount.user.role : undefined,
+                                                bio: props.alpacaAccount.user.bio !== undefined ? props.alpacaAccount.user.bio : undefined,
+                                                jobTitle: props.alpacaAccount.user.jobTitle !== undefined ? props.alpacaAccount.user.jobTitle : undefined,
+                                                currentAccount: props.alpacaAccount.user.currentAccount !== undefined ? props.alpacaAccount.user.currentAccount : undefined,
+                                                plan: props.alpacaAccount.user.plan !== undefined ? props.alpacaAccount.user.plan : undefined,
+                                            },
+                                        }
+                                    } : undefined,
+                            trades: props.alpacaAccount.trades ?
+                                typeof props.alpacaAccount.trades[0] === 'object' && Object.keys(props.alpacaAccount.trades).length === 1 && Object.keys(props.alpacaAccount.trades)[0] === 'id'
+                                    ? { connect: props.alpacaAccount.trades.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: props.alpacaAccount.trades.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                qty: item.qty !== undefined ? item.qty : undefined,
+                                                price: item.price !== undefined ? item.price : undefined,
+                                                total: item.total !== undefined ? item.total : undefined,
+                                                signal: item.signal !== undefined ? item.signal : undefined,
+                                                strategy: item.strategy !== undefined ? item.strategy : undefined,
+                                                analysis: item.analysis !== undefined ? item.analysis : undefined,
+                                                confidence: item.confidence !== undefined ? item.confidence : undefined,
+                                                timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
+                                                status: item.status !== undefined ? item.status : undefined,
+                                                optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
+                            positions: props.alpacaAccount.positions ?
+                                typeof props.alpacaAccount.positions[0] === 'object' && Object.keys(props.alpacaAccount.positions).length === 1 && Object.keys(props.alpacaAccount.positions)[0] === 'id'
+                                    ? { connect: props.alpacaAccount.positions.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: props.alpacaAccount.positions.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
+                                                qty: item.qty !== undefined ? item.qty : undefined,
+                                                qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
+                                                marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
+                                                costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
+                                                unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
+                                                unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
+                                                unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
+                                                unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
+                                                currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
+                                                lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
+                                                changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
+                                                assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
+                            alerts: props.alpacaAccount.alerts ?
+                                typeof props.alpacaAccount.alerts[0] === 'object' && Object.keys(props.alpacaAccount.alerts).length === 1 && Object.keys(props.alpacaAccount.alerts)[0] === 'id'
+                                    ? { connect: props.alpacaAccount.alerts.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: props.alpacaAccount.alerts.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                message: item.message !== undefined ? item.message : undefined,
+                                                type: item.type !== undefined ? item.type : undefined,
+                                                isRead: item.isRead !== undefined ? item.isRead : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -1281,9 +1353,6 @@ export const Order = {
                             type: props.action.type !== undefined ? {
                                 set: props.action.type
                             } : undefined,
-                            orderId: props.action.orderId !== undefined ? {
-                                set: props.action.orderId
-                            } : undefined,
                             note: props.action.note !== undefined ? {
                                 set: props.action.note
                             } : undefined,
@@ -1353,29 +1422,33 @@ export const Order = {
                         create: {
                             sequence: props.action.sequence !== undefined ? props.action.sequence : undefined,
                             type: props.action.type !== undefined ? props.action.type : undefined,
-                            orderId: props.action.orderId !== undefined ? props.action.orderId : undefined,
                             note: props.action.note !== undefined ? props.action.note : undefined,
                             status: props.action.status !== undefined ? props.action.status : undefined,
                             fee: props.action.fee !== undefined ? props.action.fee : undefined,
-                            trade: props.action.trade ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: props.action.trade.id !== undefined ? props.action.trade.id : undefined,
-                                    },
-                                    create: {
-                                        qty: props.action.trade.qty !== undefined ? props.action.trade.qty : undefined,
-                                        price: props.action.trade.price !== undefined ? props.action.trade.price : undefined,
-                                        total: props.action.trade.total !== undefined ? props.action.trade.total : undefined,
-                                        signal: props.action.trade.signal !== undefined ? props.action.trade.signal : undefined,
-                                        strategy: props.action.trade.strategy !== undefined ? props.action.trade.strategy : undefined,
-                                        analysis: props.action.trade.analysis !== undefined ? props.action.trade.analysis : undefined,
-                                        confidence: props.action.trade.confidence !== undefined ? props.action.trade.confidence : undefined,
-                                        timestamp: props.action.trade.timestamp !== undefined ? props.action.trade.timestamp : undefined,
-                                        status: props.action.trade.status !== undefined ? props.action.trade.status : undefined,
-                                        optionContractType: props.action.trade.optionContractType !== undefined ? props.action.trade.optionContractType : undefined,
-                                    },
-                                }
-                            } : undefined,
+                            trade: props.action.trade ?
+                                typeof props.action.trade === 'object' && Object.keys(props.action.trade).length === 1 && Object.keys(props.action.trade)[0] === 'id'
+                                    ? { connect: {
+                                            id: props.action.trade.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: props.action.trade.id !== undefined ? props.action.trade.id : undefined,
+                                            },
+                                            create: {
+                                                qty: props.action.trade.qty !== undefined ? props.action.trade.qty : undefined,
+                                                price: props.action.trade.price !== undefined ? props.action.trade.price : undefined,
+                                                total: props.action.trade.total !== undefined ? props.action.trade.total : undefined,
+                                                signal: props.action.trade.signal !== undefined ? props.action.trade.signal : undefined,
+                                                strategy: props.action.trade.strategy !== undefined ? props.action.trade.strategy : undefined,
+                                                analysis: props.action.trade.analysis !== undefined ? props.action.trade.analysis : undefined,
+                                                confidence: props.action.trade.confidence !== undefined ? props.action.trade.confidence : undefined,
+                                                timestamp: props.action.trade.timestamp !== undefined ? props.action.trade.timestamp : undefined,
+                                                status: props.action.trade.status !== undefined ? props.action.trade.status : undefined,
+                                                optionContractType: props.action.trade.optionContractType !== undefined ? props.action.trade.optionContractType : undefined,
+                                            },
+                                        }
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -1769,61 +1842,76 @@ export const Order = {
                             exDividendDate: props.asset.exDividendDate !== undefined ? props.asset.exDividendDate : undefined,
                             sellPrice: props.asset.sellPrice !== undefined ? props.asset.sellPrice : undefined,
                             buyPrice: props.asset.buyPrice !== undefined ? props.asset.buyPrice : undefined,
-                            trades: props.asset.trades ? {
-                                connectOrCreate: props.asset.trades.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        price: item.price !== undefined ? item.price : undefined,
-                                        total: item.total !== undefined ? item.total : undefined,
-                                        signal: item.signal !== undefined ? item.signal : undefined,
-                                        strategy: item.strategy !== undefined ? item.strategy : undefined,
-                                        analysis: item.analysis !== undefined ? item.analysis : undefined,
-                                        confidence: item.confidence !== undefined ? item.confidence : undefined,
-                                        timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
-                                        status: item.status !== undefined ? item.status : undefined,
-                                        optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            positions: props.asset.positions ? {
-                                connectOrCreate: props.asset.positions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
-                                        marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
-                                        costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
-                                        unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
-                                        unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
-                                        unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
-                                        unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
-                                        currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
-                                        lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
-                                        changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
-                                        assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            newsMentions: props.asset.newsMentions ? {
-                                connectOrCreate: props.asset.newsMentions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                        url: item.url !== undefined ? item.url : undefined,
-                                    },
-                                    create: {
-                                        url: item.url !== undefined ? item.url : undefined,
-                                        relevancyScore: item.relevancyScore !== undefined ? item.relevancyScore : undefined,
-                                        sentimentScore: item.sentimentScore !== undefined ? item.sentimentScore : undefined,
-                                        sentimentLabel: item.sentimentLabel !== undefined ? item.sentimentLabel : undefined,
-                                    },
-                                }))
-                            } : undefined,
+                            trades: props.asset.trades ?
+                                typeof props.asset.trades[0] === 'object' && Object.keys(props.asset.trades).length === 1 && Object.keys(props.asset.trades)[0] === 'id'
+                                    ? { connect: props.asset.trades.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: props.asset.trades.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                qty: item.qty !== undefined ? item.qty : undefined,
+                                                price: item.price !== undefined ? item.price : undefined,
+                                                total: item.total !== undefined ? item.total : undefined,
+                                                signal: item.signal !== undefined ? item.signal : undefined,
+                                                strategy: item.strategy !== undefined ? item.strategy : undefined,
+                                                analysis: item.analysis !== undefined ? item.analysis : undefined,
+                                                confidence: item.confidence !== undefined ? item.confidence : undefined,
+                                                timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
+                                                status: item.status !== undefined ? item.status : undefined,
+                                                optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
+                            positions: props.asset.positions ?
+                                typeof props.asset.positions[0] === 'object' && Object.keys(props.asset.positions).length === 1 && Object.keys(props.asset.positions)[0] === 'id'
+                                    ? { connect: props.asset.positions.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: props.asset.positions.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
+                                                qty: item.qty !== undefined ? item.qty : undefined,
+                                                qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
+                                                marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
+                                                costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
+                                                unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
+                                                unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
+                                                unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
+                                                unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
+                                                currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
+                                                lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
+                                                changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
+                                                assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
+                            newsMentions: props.asset.newsMentions ?
+                                typeof props.asset.newsMentions[0] === 'object' && Object.keys(props.asset.newsMentions).length === 1 && Object.keys(props.asset.newsMentions)[0] === 'id'
+                                    ? { connect: props.asset.newsMentions.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: props.asset.newsMentions.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                                url: item.url !== undefined ? item.url : undefined,
+                                            },
+                                            create: {
+                                                url: item.url !== undefined ? item.url : undefined,
+                                                relevancyScore: item.relevancyScore !== undefined ? item.relevancyScore : undefined,
+                                                sentimentScore: item.sentimentScore !== undefined ? item.sentimentScore : undefined,
+                                                sentimentLabel: item.sentimentLabel !== undefined ? item.sentimentLabel : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -2158,81 +2246,101 @@ export const Order = {
                             APISecret: prop.alpacaAccount.APISecret !== undefined ? prop.alpacaAccount.APISecret : undefined,
                             configuration: prop.alpacaAccount.configuration !== undefined ? prop.alpacaAccount.configuration : undefined,
                             marketOpen: prop.alpacaAccount.marketOpen !== undefined ? prop.alpacaAccount.marketOpen : undefined,
-                            user: prop.alpacaAccount.user ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: prop.alpacaAccount.user.id !== undefined ? prop.alpacaAccount.user.id : undefined,
-                                        email: prop.alpacaAccount.user.email !== undefined ? prop.alpacaAccount.user.email : undefined,
-                                        name: prop.alpacaAccount.user.name !== undefined ? {
-                                            equals: prop.alpacaAccount.user.name
-                                        } : undefined,
-                                    },
-                                    create: {
-                                        name: prop.alpacaAccount.user.name !== undefined ? prop.alpacaAccount.user.name : undefined,
-                                        email: prop.alpacaAccount.user.email !== undefined ? prop.alpacaAccount.user.email : undefined,
-                                        emailVerified: prop.alpacaAccount.user.emailVerified !== undefined ? prop.alpacaAccount.user.emailVerified : undefined,
-                                        image: prop.alpacaAccount.user.image !== undefined ? prop.alpacaAccount.user.image : undefined,
-                                        role: prop.alpacaAccount.user.role !== undefined ? prop.alpacaAccount.user.role : undefined,
-                                        bio: prop.alpacaAccount.user.bio !== undefined ? prop.alpacaAccount.user.bio : undefined,
-                                        jobTitle: prop.alpacaAccount.user.jobTitle !== undefined ? prop.alpacaAccount.user.jobTitle : undefined,
-                                        currentAccount: prop.alpacaAccount.user.currentAccount !== undefined ? prop.alpacaAccount.user.currentAccount : undefined,
-                                        plan: prop.alpacaAccount.user.plan !== undefined ? prop.alpacaAccount.user.plan : undefined,
-                                    },
-                                }
-                            } : undefined,
-                            trades: prop.alpacaAccount.trades ? {
-                                connectOrCreate: prop.alpacaAccount.trades.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        price: item.price !== undefined ? item.price : undefined,
-                                        total: item.total !== undefined ? item.total : undefined,
-                                        signal: item.signal !== undefined ? item.signal : undefined,
-                                        strategy: item.strategy !== undefined ? item.strategy : undefined,
-                                        analysis: item.analysis !== undefined ? item.analysis : undefined,
-                                        confidence: item.confidence !== undefined ? item.confidence : undefined,
-                                        timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
-                                        status: item.status !== undefined ? item.status : undefined,
-                                        optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            positions: prop.alpacaAccount.positions ? {
-                                connectOrCreate: prop.alpacaAccount.positions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
-                                        marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
-                                        costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
-                                        unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
-                                        unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
-                                        unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
-                                        unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
-                                        currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
-                                        lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
-                                        changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
-                                        assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            alerts: prop.alpacaAccount.alerts ? {
-                                connectOrCreate: prop.alpacaAccount.alerts.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        message: item.message !== undefined ? item.message : undefined,
-                                        type: item.type !== undefined ? item.type : undefined,
-                                        isRead: item.isRead !== undefined ? item.isRead : undefined,
-                                    },
-                                }))
-                            } : undefined,
+                            user: prop.alpacaAccount.user ?
+                                typeof prop.alpacaAccount.user === 'object' && Object.keys(prop.alpacaAccount.user).length === 1 && Object.keys(prop.alpacaAccount.user)[0] === 'id'
+                                    ? { connect: {
+                                            id: prop.alpacaAccount.user.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: prop.alpacaAccount.user.id !== undefined ? prop.alpacaAccount.user.id : undefined,
+                                                email: prop.alpacaAccount.user.email !== undefined ? prop.alpacaAccount.user.email : undefined,
+                                                name: prop.alpacaAccount.user.name !== undefined ? {
+                                                    equals: prop.alpacaAccount.user.name
+                                                } : undefined,
+                                            },
+                                            create: {
+                                                name: prop.alpacaAccount.user.name !== undefined ? prop.alpacaAccount.user.name : undefined,
+                                                email: prop.alpacaAccount.user.email !== undefined ? prop.alpacaAccount.user.email : undefined,
+                                                emailVerified: prop.alpacaAccount.user.emailVerified !== undefined ? prop.alpacaAccount.user.emailVerified : undefined,
+                                                image: prop.alpacaAccount.user.image !== undefined ? prop.alpacaAccount.user.image : undefined,
+                                                role: prop.alpacaAccount.user.role !== undefined ? prop.alpacaAccount.user.role : undefined,
+                                                bio: prop.alpacaAccount.user.bio !== undefined ? prop.alpacaAccount.user.bio : undefined,
+                                                jobTitle: prop.alpacaAccount.user.jobTitle !== undefined ? prop.alpacaAccount.user.jobTitle : undefined,
+                                                currentAccount: prop.alpacaAccount.user.currentAccount !== undefined ? prop.alpacaAccount.user.currentAccount : undefined,
+                                                plan: prop.alpacaAccount.user.plan !== undefined ? prop.alpacaAccount.user.plan : undefined,
+                                            },
+                                        }
+                                    } : undefined,
+                            trades: prop.alpacaAccount.trades ?
+                                typeof prop.alpacaAccount.trades[0] === 'object' && Object.keys(prop.alpacaAccount.trades).length === 1 && Object.keys(prop.alpacaAccount.trades)[0] === 'id'
+                                    ? { connect: prop.alpacaAccount.trades.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: prop.alpacaAccount.trades.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                qty: item.qty !== undefined ? item.qty : undefined,
+                                                price: item.price !== undefined ? item.price : undefined,
+                                                total: item.total !== undefined ? item.total : undefined,
+                                                signal: item.signal !== undefined ? item.signal : undefined,
+                                                strategy: item.strategy !== undefined ? item.strategy : undefined,
+                                                analysis: item.analysis !== undefined ? item.analysis : undefined,
+                                                confidence: item.confidence !== undefined ? item.confidence : undefined,
+                                                timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
+                                                status: item.status !== undefined ? item.status : undefined,
+                                                optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
+                            positions: prop.alpacaAccount.positions ?
+                                typeof prop.alpacaAccount.positions[0] === 'object' && Object.keys(prop.alpacaAccount.positions).length === 1 && Object.keys(prop.alpacaAccount.positions)[0] === 'id'
+                                    ? { connect: prop.alpacaAccount.positions.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: prop.alpacaAccount.positions.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
+                                                qty: item.qty !== undefined ? item.qty : undefined,
+                                                qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
+                                                marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
+                                                costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
+                                                unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
+                                                unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
+                                                unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
+                                                unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
+                                                currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
+                                                lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
+                                                changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
+                                                assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
+                            alerts: prop.alpacaAccount.alerts ?
+                                typeof prop.alpacaAccount.alerts[0] === 'object' && Object.keys(prop.alpacaAccount.alerts).length === 1 && Object.keys(prop.alpacaAccount.alerts)[0] === 'id'
+                                    ? { connect: prop.alpacaAccount.alerts.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: prop.alpacaAccount.alerts.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                message: item.message !== undefined ? item.message : undefined,
+                                                type: item.type !== undefined ? item.type : undefined,
+                                                isRead: item.isRead !== undefined ? item.isRead : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -2253,9 +2361,6 @@ export const Order = {
                             type: prop.action.type !== undefined ? {
                                 set: prop.action.type
                             } : undefined,
-                            orderId: prop.action.orderId !== undefined ? {
-                                set: prop.action.orderId
-                            } : undefined,
                             note: prop.action.note !== undefined ? {
                                 set: prop.action.note
                             } : undefined,
@@ -2325,29 +2430,33 @@ export const Order = {
                         create: {
                             sequence: prop.action.sequence !== undefined ? prop.action.sequence : undefined,
                             type: prop.action.type !== undefined ? prop.action.type : undefined,
-                            orderId: prop.action.orderId !== undefined ? prop.action.orderId : undefined,
                             note: prop.action.note !== undefined ? prop.action.note : undefined,
                             status: prop.action.status !== undefined ? prop.action.status : undefined,
                             fee: prop.action.fee !== undefined ? prop.action.fee : undefined,
-                            trade: prop.action.trade ? {
-                                connectOrCreate: {
-                                    where: {
-                                        id: prop.action.trade.id !== undefined ? prop.action.trade.id : undefined,
-                                    },
-                                    create: {
-                                        qty: prop.action.trade.qty !== undefined ? prop.action.trade.qty : undefined,
-                                        price: prop.action.trade.price !== undefined ? prop.action.trade.price : undefined,
-                                        total: prop.action.trade.total !== undefined ? prop.action.trade.total : undefined,
-                                        signal: prop.action.trade.signal !== undefined ? prop.action.trade.signal : undefined,
-                                        strategy: prop.action.trade.strategy !== undefined ? prop.action.trade.strategy : undefined,
-                                        analysis: prop.action.trade.analysis !== undefined ? prop.action.trade.analysis : undefined,
-                                        confidence: prop.action.trade.confidence !== undefined ? prop.action.trade.confidence : undefined,
-                                        timestamp: prop.action.trade.timestamp !== undefined ? prop.action.trade.timestamp : undefined,
-                                        status: prop.action.trade.status !== undefined ? prop.action.trade.status : undefined,
-                                        optionContractType: prop.action.trade.optionContractType !== undefined ? prop.action.trade.optionContractType : undefined,
-                                    },
-                                }
-                            } : undefined,
+                            trade: prop.action.trade ?
+                                typeof prop.action.trade === 'object' && Object.keys(prop.action.trade).length === 1 && Object.keys(prop.action.trade)[0] === 'id'
+                                    ? { connect: {
+                                            id: prop.action.trade.id
+                                        }
+                                    }
+                                    : { connectOrCreate: {
+                                            where: {
+                                                id: prop.action.trade.id !== undefined ? prop.action.trade.id : undefined,
+                                            },
+                                            create: {
+                                                qty: prop.action.trade.qty !== undefined ? prop.action.trade.qty : undefined,
+                                                price: prop.action.trade.price !== undefined ? prop.action.trade.price : undefined,
+                                                total: prop.action.trade.total !== undefined ? prop.action.trade.total : undefined,
+                                                signal: prop.action.trade.signal !== undefined ? prop.action.trade.signal : undefined,
+                                                strategy: prop.action.trade.strategy !== undefined ? prop.action.trade.strategy : undefined,
+                                                analysis: prop.action.trade.analysis !== undefined ? prop.action.trade.analysis : undefined,
+                                                confidence: prop.action.trade.confidence !== undefined ? prop.action.trade.confidence : undefined,
+                                                timestamp: prop.action.trade.timestamp !== undefined ? prop.action.trade.timestamp : undefined,
+                                                status: prop.action.trade.status !== undefined ? prop.action.trade.status : undefined,
+                                                optionContractType: prop.action.trade.optionContractType !== undefined ? prop.action.trade.optionContractType : undefined,
+                                            },
+                                        }
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -2741,61 +2850,76 @@ export const Order = {
                             exDividendDate: prop.asset.exDividendDate !== undefined ? prop.asset.exDividendDate : undefined,
                             sellPrice: prop.asset.sellPrice !== undefined ? prop.asset.sellPrice : undefined,
                             buyPrice: prop.asset.buyPrice !== undefined ? prop.asset.buyPrice : undefined,
-                            trades: prop.asset.trades ? {
-                                connectOrCreate: prop.asset.trades.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        price: item.price !== undefined ? item.price : undefined,
-                                        total: item.total !== undefined ? item.total : undefined,
-                                        signal: item.signal !== undefined ? item.signal : undefined,
-                                        strategy: item.strategy !== undefined ? item.strategy : undefined,
-                                        analysis: item.analysis !== undefined ? item.analysis : undefined,
-                                        confidence: item.confidence !== undefined ? item.confidence : undefined,
-                                        timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
-                                        status: item.status !== undefined ? item.status : undefined,
-                                        optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            positions: prop.asset.positions ? {
-                                connectOrCreate: prop.asset.positions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                    },
-                                    create: {
-                                        averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
-                                        qty: item.qty !== undefined ? item.qty : undefined,
-                                        qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
-                                        marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
-                                        costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
-                                        unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
-                                        unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
-                                        unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
-                                        unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
-                                        currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
-                                        lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
-                                        changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
-                                        assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
-                                    },
-                                }))
-                            } : undefined,
-                            newsMentions: prop.asset.newsMentions ? {
-                                connectOrCreate: prop.asset.newsMentions.map((item) => ({
-                                    where: {
-                                        id: item.id !== undefined ? item.id : undefined,
-                                        url: item.url !== undefined ? item.url : undefined,
-                                    },
-                                    create: {
-                                        url: item.url !== undefined ? item.url : undefined,
-                                        relevancyScore: item.relevancyScore !== undefined ? item.relevancyScore : undefined,
-                                        sentimentScore: item.sentimentScore !== undefined ? item.sentimentScore : undefined,
-                                        sentimentLabel: item.sentimentLabel !== undefined ? item.sentimentLabel : undefined,
-                                    },
-                                }))
-                            } : undefined,
+                            trades: prop.asset.trades ?
+                                typeof prop.asset.trades[0] === 'object' && Object.keys(prop.asset.trades).length === 1 && Object.keys(prop.asset.trades)[0] === 'id'
+                                    ? { connect: prop.asset.trades.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: prop.asset.trades.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                qty: item.qty !== undefined ? item.qty : undefined,
+                                                price: item.price !== undefined ? item.price : undefined,
+                                                total: item.total !== undefined ? item.total : undefined,
+                                                signal: item.signal !== undefined ? item.signal : undefined,
+                                                strategy: item.strategy !== undefined ? item.strategy : undefined,
+                                                analysis: item.analysis !== undefined ? item.analysis : undefined,
+                                                confidence: item.confidence !== undefined ? item.confidence : undefined,
+                                                timestamp: item.timestamp !== undefined ? item.timestamp : undefined,
+                                                status: item.status !== undefined ? item.status : undefined,
+                                                optionContractType: item.optionContractType !== undefined ? item.optionContractType : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
+                            positions: prop.asset.positions ?
+                                typeof prop.asset.positions[0] === 'object' && Object.keys(prop.asset.positions).length === 1 && Object.keys(prop.asset.positions)[0] === 'id'
+                                    ? { connect: prop.asset.positions.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: prop.asset.positions.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                            },
+                                            create: {
+                                                averageEntryPrice: item.averageEntryPrice !== undefined ? item.averageEntryPrice : undefined,
+                                                qty: item.qty !== undefined ? item.qty : undefined,
+                                                qtyAvailable: item.qtyAvailable !== undefined ? item.qtyAvailable : undefined,
+                                                marketValue: item.marketValue !== undefined ? item.marketValue : undefined,
+                                                costBasis: item.costBasis !== undefined ? item.costBasis : undefined,
+                                                unrealizedPL: item.unrealizedPL !== undefined ? item.unrealizedPL : undefined,
+                                                unrealizedPLPC: item.unrealizedPLPC !== undefined ? item.unrealizedPLPC : undefined,
+                                                unrealisedIntradayPL: item.unrealisedIntradayPL !== undefined ? item.unrealisedIntradayPL : undefined,
+                                                unrealisedIntradayPLPC: item.unrealisedIntradayPLPC !== undefined ? item.unrealisedIntradayPLPC : undefined,
+                                                currentPrice: item.currentPrice !== undefined ? item.currentPrice : undefined,
+                                                lastTradePrice: item.lastTradePrice !== undefined ? item.lastTradePrice : undefined,
+                                                changeToday: item.changeToday !== undefined ? item.changeToday : undefined,
+                                                assetMarginable: item.assetMarginable !== undefined ? item.assetMarginable : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
+                            newsMentions: prop.asset.newsMentions ?
+                                typeof prop.asset.newsMentions[0] === 'object' && Object.keys(prop.asset.newsMentions).length === 1 && Object.keys(prop.asset.newsMentions)[0] === 'id'
+                                    ? { connect: prop.asset.newsMentions.map((item) => ({
+                                            id: item.id
+                                        }))
+                                    }
+                                    : { connectOrCreate: prop.asset.newsMentions.map((item) => ({
+                                            where: {
+                                                id: item.id !== undefined ? item.id : undefined,
+                                                url: item.url !== undefined ? item.url : undefined,
+                                            },
+                                            create: {
+                                                url: item.url !== undefined ? item.url : undefined,
+                                                relevancyScore: item.relevancyScore !== undefined ? item.relevancyScore : undefined,
+                                                sentimentScore: item.sentimentScore !== undefined ? item.sentimentScore : undefined,
+                                                sentimentLabel: item.sentimentLabel !== undefined ? item.sentimentLabel : undefined,
+                                            },
+                                        }))
+                                    } : undefined,
                         },
                     }
                 } : undefined,
@@ -3030,7 +3154,6 @@ export const Order = {
                 sequence
                 tradeId
                 type
-                orderId
                 note
                 status
                 fee
@@ -3325,7 +3448,6 @@ export const Order = {
                 sequence
                 tradeId
                 type
-                orderId
                 note
                 status
                 fee
@@ -3619,7 +3741,6 @@ export const Order = {
                 sequence
                 tradeId
                 type
-                orderId
                 note
                 status
                 fee
@@ -3908,7 +4029,6 @@ export const Order = {
                 sequence
                 tradeId
                 type
-                orderId
                 note
                 status
                 fee