npm - adaptic-backend - Versions diffs - 1.0.219 → 1.0.221 - Mend

adaptic-backend 1.0.219 → 1.0.221

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

Files changed (349) hide show

package/Contract.cjs CHANGED Viewed

@@ -276,15 +276,13 @@ exports.Contract = {
                         : { connectOrCreate: props.deliverables.map((item) => ({
                                 where: {
                                     id: item.id !== undefined ? item.id : undefined,
+                                    contractId: item.contractId !== undefined ? item.contractId : undefined,
                                     symbol: item.symbol !== undefined ? {
                                         equals: item.symbol
                                     } : undefined,
                                     assetId: item.assetId !== undefined ? {
                                         equals: item.assetId
                                     } : undefined,
-                                    contractId: item.contractId !== undefined ? {
-                                        equals: item.contractId
-                                    } : undefined,
                                 },
                                 create: {
                                     type: item.type !== undefined ? item.type : undefined,
@@ -584,13 +582,15 @@ exports.Contract = {
                                                                             id: item.contract.id !== undefined ? item.contract.id : undefined,
                                                                             alpacaId: item.contract.alpacaId !== undefined ? item.contract.alpacaId : undefined,
                                                                             symbol: item.contract.symbol !== undefined ? item.contract.symbol : undefined,
-                                                                            assetId: item.contract.assetId !== undefined ? item.contract.assetId : undefined,
                                                                             name: item.contract.name !== undefined ? {
                                                                                 equals: item.contract.name
                                                                             } : undefined,
                                                                             underlyingAssetId: item.contract.underlyingAssetId !== undefined ? {
                                                                                 equals: item.contract.underlyingAssetId
                                                                             } : undefined,
+                                                                            assetId: item.contract.assetId !== undefined ? {
+                                                                                equals: item.contract.assetId
+                                                                            } : undefined,
                                                                             orderId: item.contract.orderId !== undefined ? {
                                                                                 equals: item.contract.orderId
                                                                             } : undefined,
@@ -1183,13 +1183,15 @@ exports.Contract = {
                                                                             id: item.id !== undefined ? item.id : undefined,
                                                                             alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                                             symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                                            assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                                             name: item.name !== undefined ? {
                                                                                 equals: item.name
                                                                             } : undefined,
                                                                             underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                                                 equals: item.underlyingAssetId
                                                                             } : undefined,
+                                                                            assetId: item.assetId !== undefined ? {
+                                                                                equals: item.assetId
+                                                                            } : undefined,
                                                                             orderId: item.orderId !== undefined ? {
                                                                                 equals: item.orderId
                                                                             } : undefined,
@@ -1314,13 +1316,15 @@ exports.Contract = {
                 id: props.id !== undefined ? props.id : undefined,
                 alpacaId: props.alpacaId !== undefined ? props.alpacaId : undefined,
                 symbol: props.symbol !== undefined ? props.symbol : undefined,
-                assetId: props.assetId !== undefined ? props.assetId : undefined,
                 name: props.name !== undefined ? {
                     equals: props.name
                 } : undefined,
                 underlyingAssetId: props.underlyingAssetId !== undefined ? {
                     equals: props.underlyingAssetId
                 } : undefined,
+                assetId: props.assetId !== undefined ? {
+                    equals: props.assetId
+                } : undefined,
                 orderId: props.orderId !== undefined ? {
                     equals: props.orderId
                 } : undefined,
@@ -1399,15 +1403,13 @@ exports.Contract = {
                     upsert: props.deliverables.map((item) => ({
                         where: {
                             id: item.id !== undefined ? item.id : undefined,
+                            contractId: item.contractId !== undefined ? item.contractId : undefined,
                             symbol: item.symbol !== undefined ? {
                                 equals: item.symbol
                             } : undefined,
                             assetId: item.assetId !== undefined ? {
                                 equals: item.assetId
                             } : undefined,
-                            contractId: item.contractId !== undefined ? {
-                                equals: item.contractId
-                            } : undefined,
                         },
                         update: {
                             id: item.id !== undefined ? {
@@ -2315,13 +2317,15 @@ exports.Contract = {
                                                             id: item.contract.id !== undefined ? item.contract.id : undefined,
                                                             alpacaId: item.contract.alpacaId !== undefined ? item.contract.alpacaId : undefined,
                                                             symbol: item.contract.symbol !== undefined ? item.contract.symbol : undefined,
-                                                            assetId: item.contract.assetId !== undefined ? item.contract.assetId : undefined,
                                                             name: item.contract.name !== undefined ? {
                                                                 equals: item.contract.name
                                                             } : undefined,
                                                             underlyingAssetId: item.contract.underlyingAssetId !== undefined ? {
                                                                 equals: item.contract.underlyingAssetId
                                                             } : undefined,
+                                                            assetId: item.contract.assetId !== undefined ? {
+                                                                equals: item.contract.assetId
+                                                            } : undefined,
                                                             orderId: item.contract.orderId !== undefined ? {
                                                                 equals: item.contract.orderId
                                                             } : undefined,
@@ -2927,13 +2931,15 @@ exports.Contract = {
                                                                     id: item.contract.id !== undefined ? item.contract.id : undefined,
                                                                     alpacaId: item.contract.alpacaId !== undefined ? item.contract.alpacaId : undefined,
                                                                     symbol: item.contract.symbol !== undefined ? item.contract.symbol : undefined,
-                                                                    assetId: item.contract.assetId !== undefined ? item.contract.assetId : undefined,
                                                                     name: item.contract.name !== undefined ? {
                                                                         equals: item.contract.name
                                                                     } : undefined,
                                                                     underlyingAssetId: item.contract.underlyingAssetId !== undefined ? {
                                                                         equals: item.contract.underlyingAssetId
                                                                     } : undefined,
+                                                                    assetId: item.contract.assetId !== undefined ? {
+                                                                        equals: item.contract.assetId
+                                                                    } : undefined,
                                                                     orderId: item.contract.orderId !== undefined ? {
                                                                         equals: item.contract.orderId
                                                                     } : undefined,
@@ -4153,13 +4159,15 @@ exports.Contract = {
                                                     id: item.id !== undefined ? item.id : undefined,
                                                     alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                     symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                    assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                     name: item.name !== undefined ? {
                                                         equals: item.name
                                                     } : undefined,
                                                     underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                         equals: item.underlyingAssetId
                                                     } : undefined,
+                                                    assetId: item.assetId !== undefined ? {
+                                                        equals: item.assetId
+                                                    } : undefined,
                                                     orderId: item.orderId !== undefined ? {
                                                         equals: item.orderId
                                                     } : undefined,
@@ -4411,13 +4419,15 @@ exports.Contract = {
                                                             id: item.id !== undefined ? item.id : undefined,
                                                             alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                             symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                            assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                             name: item.name !== undefined ? {
                                                                 equals: item.name
                                                             } : undefined,
                                                             underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                                 equals: item.underlyingAssetId
                                                             } : undefined,
+                                                            assetId: item.assetId !== undefined ? {
+                                                                equals: item.assetId
+                                                            } : undefined,
                                                             orderId: item.orderId !== undefined ? {
                                                                 equals: item.orderId
                                                             } : undefined,
@@ -4872,13 +4882,15 @@ exports.Contract = {
                                                                     id: item.id !== undefined ? item.id : undefined,
                                                                     alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                                     symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                                    assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                                     name: item.name !== undefined ? {
                                                                         equals: item.name
                                                                     } : undefined,
                                                                     underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                                         equals: item.underlyingAssetId
                                                                     } : undefined,
+                                                                    assetId: item.assetId !== undefined ? {
+                                                                        equals: item.assetId
+                                                                    } : undefined,
                                                                     orderId: item.orderId !== undefined ? {
                                                                         equals: item.orderId
                                                                     } : undefined,
@@ -4949,13 +4961,15 @@ exports.Contract = {
                 id: props.id !== undefined ? props.id : undefined,
                 alpacaId: props.alpacaId !== undefined ? props.alpacaId : undefined,
                 symbol: props.symbol !== undefined ? props.symbol : undefined,
-                assetId: props.assetId !== undefined ? props.assetId : undefined,
                 name: props.name !== undefined ? {
                     equals: props.name
                 } : undefined,
                 underlyingAssetId: props.underlyingAssetId !== undefined ? {
                     equals: props.underlyingAssetId
                 } : undefined,
+                assetId: props.assetId !== undefined ? {
+                    equals: props.assetId
+                } : undefined,
                 orderId: props.orderId !== undefined ? {
                     equals: props.orderId
                 } : undefined,
@@ -4990,15 +5004,13 @@ exports.Contract = {
                         : { connectOrCreate: props.deliverables.map((item) => ({
                                 where: {
                                     id: item.id !== undefined ? item.id : undefined,
+                                    contractId: item.contractId !== undefined ? item.contractId : undefined,
                                     symbol: item.symbol !== undefined ? {
                                         equals: item.symbol
                                     } : undefined,
                                     assetId: item.assetId !== undefined ? {
                                         equals: item.assetId
                                     } : undefined,
-                                    contractId: item.contractId !== undefined ? {
-                                        equals: item.contractId
-                                    } : undefined,
                                 },
                                 create: {
                                     type: item.type !== undefined ? item.type : undefined,
@@ -5298,13 +5310,15 @@ exports.Contract = {
                                                                             id: item.contract.id !== undefined ? item.contract.id : undefined,
                                                                             alpacaId: item.contract.alpacaId !== undefined ? item.contract.alpacaId : undefined,
                                                                             symbol: item.contract.symbol !== undefined ? item.contract.symbol : undefined,
-                                                                            assetId: item.contract.assetId !== undefined ? item.contract.assetId : undefined,
                                                                             name: item.contract.name !== undefined ? {
                                                                                 equals: item.contract.name
                                                                             } : undefined,
                                                                             underlyingAssetId: item.contract.underlyingAssetId !== undefined ? {
                                                                                 equals: item.contract.underlyingAssetId
                                                                             } : undefined,
+                                                                            assetId: item.contract.assetId !== undefined ? {
+                                                                                equals: item.contract.assetId
+                                                                            } : undefined,
                                                                             orderId: item.contract.orderId !== undefined ? {
                                                                                 equals: item.contract.orderId
                                                                             } : undefined,
@@ -5897,13 +5911,15 @@ exports.Contract = {
                                                                             id: item.id !== undefined ? item.id : undefined,
                                                                             alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                                             symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                                            assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                                             name: item.name !== undefined ? {
                                                                                 equals: item.name
                                                                             } : undefined,
                                                                             underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                                                 equals: item.underlyingAssetId
                                                                             } : undefined,
+                                                                            assetId: item.assetId !== undefined ? {
+                                                                                equals: item.assetId
+                                                                            } : undefined,
                                                                             orderId: item.orderId !== undefined ? {
                                                                                 equals: item.orderId
                                                                             } : undefined,
@@ -6004,15 +6020,13 @@ exports.Contract = {
                     upsert: props.deliverables.map((item) => ({
                         where: {
                             id: item.id !== undefined ? item.id : undefined,
+                            contractId: item.contractId !== undefined ? item.contractId : undefined,
                             symbol: item.symbol !== undefined ? {
                                 equals: item.symbol
                             } : undefined,
                             assetId: item.assetId !== undefined ? {
                                 equals: item.assetId
                             } : undefined,
-                            contractId: item.contractId !== undefined ? {
-                                equals: item.contractId
-                            } : undefined,
                         },
                         update: {
                             id: item.id !== undefined ? {
@@ -6920,13 +6934,15 @@ exports.Contract = {
                                                             id: item.contract.id !== undefined ? item.contract.id : undefined,
                                                             alpacaId: item.contract.alpacaId !== undefined ? item.contract.alpacaId : undefined,
                                                             symbol: item.contract.symbol !== undefined ? item.contract.symbol : undefined,
-                                                            assetId: item.contract.assetId !== undefined ? item.contract.assetId : undefined,
                                                             name: item.contract.name !== undefined ? {
                                                                 equals: item.contract.name
                                                             } : undefined,
                                                             underlyingAssetId: item.contract.underlyingAssetId !== undefined ? {
                                                                 equals: item.contract.underlyingAssetId
                                                             } : undefined,
+                                                            assetId: item.contract.assetId !== undefined ? {
+                                                                equals: item.contract.assetId
+                                                            } : undefined,
                                                             orderId: item.contract.orderId !== undefined ? {
                                                                 equals: item.contract.orderId
                                                             } : undefined,
@@ -7532,13 +7548,15 @@ exports.Contract = {
                                                                     id: item.contract.id !== undefined ? item.contract.id : undefined,
                                                                     alpacaId: item.contract.alpacaId !== undefined ? item.contract.alpacaId : undefined,
                                                                     symbol: item.contract.symbol !== undefined ? item.contract.symbol : undefined,
-                                                                    assetId: item.contract.assetId !== undefined ? item.contract.assetId : undefined,
                                                                     name: item.contract.name !== undefined ? {
                                                                         equals: item.contract.name
                                                                     } : undefined,
                                                                     underlyingAssetId: item.contract.underlyingAssetId !== undefined ? {
                                                                         equals: item.contract.underlyingAssetId
                                                                     } : undefined,
+                                                                    assetId: item.contract.assetId !== undefined ? {
+                                                                        equals: item.contract.assetId
+                                                                    } : undefined,
                                                                     orderId: item.contract.orderId !== undefined ? {
                                                                         equals: item.contract.orderId
                                                                     } : undefined,
@@ -8758,13 +8776,15 @@ exports.Contract = {
                                                     id: item.id !== undefined ? item.id : undefined,
                                                     alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                     symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                    assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                     name: item.name !== undefined ? {
                                                         equals: item.name
                                                     } : undefined,
                                                     underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                         equals: item.underlyingAssetId
                                                     } : undefined,
+                                                    assetId: item.assetId !== undefined ? {
+                                                        equals: item.assetId
+                                                    } : undefined,
                                                     orderId: item.orderId !== undefined ? {
                                                         equals: item.orderId
                                                     } : undefined,
@@ -9016,13 +9036,15 @@ exports.Contract = {
                                                             id: item.id !== undefined ? item.id : undefined,
                                                             alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                             symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                            assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                             name: item.name !== undefined ? {
                                                                 equals: item.name
                                                             } : undefined,
                                                             underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                                 equals: item.underlyingAssetId
                                                             } : undefined,
+                                                            assetId: item.assetId !== undefined ? {
+                                                                equals: item.assetId
+                                                            } : undefined,
                                                             orderId: item.orderId !== undefined ? {
                                                                 equals: item.orderId
                                                             } : undefined,
@@ -9477,13 +9499,15 @@ exports.Contract = {
                                                                     id: item.id !== undefined ? item.id : undefined,
                                                                     alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                                     symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                                    assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                                     name: item.name !== undefined ? {
                                                                         equals: item.name
                                                                     } : undefined,
                                                                     underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                                         equals: item.underlyingAssetId
                                                                     } : undefined,
+                                                                    assetId: item.assetId !== undefined ? {
+                                                                        equals: item.assetId
+                                                                    } : undefined,
                                                                     orderId: item.orderId !== undefined ? {
                                                                         equals: item.orderId
                                                                     } : undefined,
@@ -9554,13 +9578,15 @@ exports.Contract = {
                 id: prop.id !== undefined ? prop.id : undefined,
                 alpacaId: prop.alpacaId !== undefined ? prop.alpacaId : undefined,
                 symbol: prop.symbol !== undefined ? prop.symbol : undefined,
-                assetId: prop.assetId !== undefined ? prop.assetId : undefined,
                 name: prop.name !== undefined ? {
                     equals: prop.name
                 } : undefined,
                 underlyingAssetId: prop.underlyingAssetId !== undefined ? {
                     equals: prop.underlyingAssetId
                 } : undefined,
+                assetId: prop.assetId !== undefined ? {
+                    equals: prop.assetId
+                } : undefined,
                 orderId: prop.orderId !== undefined ? {
                     equals: prop.orderId
                 } : undefined,
@@ -9639,15 +9665,13 @@ exports.Contract = {
                     upsert: prop.deliverables.map((item) => ({
                         where: {
                             id: item.id !== undefined ? item.id : undefined,
+                            contractId: item.contractId !== undefined ? item.contractId : undefined,
                             symbol: item.symbol !== undefined ? {
                                 equals: item.symbol
                             } : undefined,
                             assetId: item.assetId !== undefined ? {
                                 equals: item.assetId
                             } : undefined,
-                            contractId: item.contractId !== undefined ? {
-                                equals: item.contractId
-                            } : undefined,
                         },
                         update: {
                             id: item.id !== undefined ? {
@@ -10555,13 +10579,15 @@ exports.Contract = {
                                                             id: item.contract.id !== undefined ? item.contract.id : undefined,
                                                             alpacaId: item.contract.alpacaId !== undefined ? item.contract.alpacaId : undefined,
                                                             symbol: item.contract.symbol !== undefined ? item.contract.symbol : undefined,
-                                                            assetId: item.contract.assetId !== undefined ? item.contract.assetId : undefined,
                                                             name: item.contract.name !== undefined ? {
                                                                 equals: item.contract.name
                                                             } : undefined,
                                                             underlyingAssetId: item.contract.underlyingAssetId !== undefined ? {
                                                                 equals: item.contract.underlyingAssetId
                                                             } : undefined,
+                                                            assetId: item.contract.assetId !== undefined ? {
+                                                                equals: item.contract.assetId
+                                                            } : undefined,
                                                             orderId: item.contract.orderId !== undefined ? {
                                                                 equals: item.contract.orderId
                                                             } : undefined,
@@ -11167,13 +11193,15 @@ exports.Contract = {
                                                                     id: item.contract.id !== undefined ? item.contract.id : undefined,
                                                                     alpacaId: item.contract.alpacaId !== undefined ? item.contract.alpacaId : undefined,
                                                                     symbol: item.contract.symbol !== undefined ? item.contract.symbol : undefined,
-                                                                    assetId: item.contract.assetId !== undefined ? item.contract.assetId : undefined,
                                                                     name: item.contract.name !== undefined ? {
                                                                         equals: item.contract.name
                                                                     } : undefined,
                                                                     underlyingAssetId: item.contract.underlyingAssetId !== undefined ? {
                                                                         equals: item.contract.underlyingAssetId
                                                                     } : undefined,
+                                                                    assetId: item.contract.assetId !== undefined ? {
+                                                                        equals: item.contract.assetId
+                                                                    } : undefined,
                                                                     orderId: item.contract.orderId !== undefined ? {
                                                                         equals: item.contract.orderId
                                                                     } : undefined,
@@ -12393,13 +12421,15 @@ exports.Contract = {
                                                     id: item.id !== undefined ? item.id : undefined,
                                                     alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                     symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                    assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                     name: item.name !== undefined ? {
                                                         equals: item.name
                                                     } : undefined,
                                                     underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                         equals: item.underlyingAssetId
                                                     } : undefined,
+                                                    assetId: item.assetId !== undefined ? {
+                                                        equals: item.assetId
+                                                    } : undefined,
                                                     orderId: item.orderId !== undefined ? {
                                                         equals: item.orderId
                                                     } : undefined,
@@ -12651,13 +12681,15 @@ exports.Contract = {
                                                             id: item.id !== undefined ? item.id : undefined,
                                                             alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                             symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                            assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                             name: item.name !== undefined ? {
                                                                 equals: item.name
                                                             } : undefined,
                                                             underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                                 equals: item.underlyingAssetId
                                                             } : undefined,
+                                                            assetId: item.assetId !== undefined ? {
+                                                                equals: item.assetId
+                                                            } : undefined,
                                                             orderId: item.orderId !== undefined ? {
                                                                 equals: item.orderId
                                                             } : undefined,
@@ -13112,13 +13144,15 @@ exports.Contract = {
                                                                     id: item.id !== undefined ? item.id : undefined,
                                                                     alpacaId: item.alpacaId !== undefined ? item.alpacaId : undefined,
                                                                     symbol: item.symbol !== undefined ? item.symbol : undefined,
-                                                                    assetId: item.assetId !== undefined ? item.assetId : undefined,
                                                                     name: item.name !== undefined ? {
                                                                         equals: item.name
                                                                     } : undefined,
                                                                     underlyingAssetId: item.underlyingAssetId !== undefined ? {
                                                                         equals: item.underlyingAssetId
                                                                     } : undefined,
+                                                                    assetId: item.assetId !== undefined ? {
+                                                                        equals: item.assetId
+                                                                    } : undefined,
                                                                     orderId: item.orderId !== undefined ? {
                                                                         equals: item.orderId
                                                                     } : undefined,
@@ -13224,13 +13258,15 @@ exports.Contract = {
                 id: props.id !== undefined ? props.id : undefined,
                 alpacaId: props.alpacaId !== undefined ? props.alpacaId : undefined,
                 symbol: props.symbol !== undefined ? props.symbol : undefined,
-                assetId: props.assetId !== undefined ? props.assetId : undefined,
                 name: props.name !== undefined ? {
                     equals: props.name
                 } : undefined,
                 underlyingAssetId: props.underlyingAssetId !== undefined ? {
                     equals: props.underlyingAssetId
                 } : undefined,
+                assetId: props.assetId !== undefined ? {
+                    equals: props.assetId
+                } : undefined,
                 orderId: props.orderId !== undefined ? {
                     equals: props.orderId
                 } : undefined,

package/Deliverable.cjs CHANGED Viewed

@@ -266,13 +266,15 @@ exports.Deliverable = {
                                     id: props.contract.id !== undefined ? props.contract.id : undefined,
                                     alpacaId: props.contract.alpacaId !== undefined ? props.contract.alpacaId : undefined,
                                     symbol: props.contract.symbol !== undefined ? props.contract.symbol : undefined,
-                                    assetId: props.contract.assetId !== undefined ? props.contract.assetId : undefined,
                                     name: props.contract.name !== undefined ? {
                                         equals: props.contract.name
                                     } : undefined,
                                     underlyingAssetId: props.contract.underlyingAssetId !== undefined ? {
                                         equals: props.contract.underlyingAssetId
                                     } : undefined,
+                                    assetId: props.contract.assetId !== undefined ? {
+                                        equals: props.contract.assetId
+                                    } : undefined,
                                     orderId: props.contract.orderId !== undefined ? {
                                         equals: props.contract.orderId
                                     } : undefined,
@@ -789,15 +791,13 @@ exports.Deliverable = {
         const variables = {
             where: {
                 id: props.id !== undefined ? props.id : undefined,
+                contractId: props.contractId !== undefined ? props.contractId : undefined,
                 symbol: props.symbol !== undefined ? {
                     equals: props.symbol
                 } : undefined,
                 assetId: props.assetId !== undefined ? {
                     equals: props.assetId
                 } : undefined,
-                contractId: props.contractId !== undefined ? {
-                    equals: props.contractId
-                } : undefined,
             },
             data: {
                 id: props.id !== undefined ? {
@@ -2758,15 +2758,13 @@ exports.Deliverable = {
         const variables = {
             where: {
                 id: props.id !== undefined ? props.id : undefined,
+                contractId: props.contractId !== undefined ? props.contractId : undefined,
                 symbol: props.symbol !== undefined ? {
                     equals: props.symbol
                 } : undefined,
                 assetId: props.assetId !== undefined ? {
                     equals: props.assetId
                 } : undefined,
-                contractId: props.contractId !== undefined ? {
-                    equals: props.contractId
-                } : undefined,
             },
             create: {
                 type: props.type !== undefined ? props.type : undefined,
@@ -2788,13 +2786,15 @@ exports.Deliverable = {
                                     id: props.contract.id !== undefined ? props.contract.id : undefined,
                                     alpacaId: props.contract.alpacaId !== undefined ? props.contract.alpacaId : undefined,
                                     symbol: props.contract.symbol !== undefined ? props.contract.symbol : undefined,
-                                    assetId: props.contract.assetId !== undefined ? props.contract.assetId : undefined,
                                     name: props.contract.name !== undefined ? {
                                         equals: props.contract.name
                                     } : undefined,
                                     underlyingAssetId: props.contract.underlyingAssetId !== undefined ? {
                                         equals: props.contract.underlyingAssetId
                                     } : undefined,
+                                    assetId: props.contract.assetId !== undefined ? {
+                                        equals: props.contract.assetId
+                                    } : undefined,
                                     orderId: props.contract.orderId !== undefined ? {
                                         equals: props.contract.orderId
                                     } : undefined,
@@ -5186,15 +5186,13 @@ exports.Deliverable = {
         const variables = props.map(prop => ({
             where: {
                 id: prop.id !== undefined ? prop.id : undefined,
+                contractId: prop.contractId !== undefined ? prop.contractId : undefined,
                 symbol: prop.symbol !== undefined ? {
                     equals: prop.symbol
                 } : undefined,
                 assetId: prop.assetId !== undefined ? {
                     equals: prop.assetId
                 } : undefined,
-                contractId: prop.contractId !== undefined ? {
-                    equals: prop.contractId
-                } : undefined,
             },
             data: {
                 id: prop.id !== undefined ? {
@@ -7190,15 +7188,13 @@ exports.Deliverable = {
         const variables = {
             where: {
                 id: props.id !== undefined ? props.id : undefined,
+                contractId: props.contractId !== undefined ? props.contractId : undefined,
                 symbol: props.symbol !== undefined ? {
                     equals: props.symbol
                 } : undefined,
                 assetId: props.assetId !== undefined ? {
                     equals: props.assetId
                 } : undefined,
-                contractId: props.contractId !== undefined ? {
-                    equals: props.contractId
-                } : undefined,
             },
         };
         const filteredVariables = (0, utils_1.removeUndefinedProps)(variables);