Return only offer ids for trades

src/model/trade.ts

@@ -37,7 +37,7 @@ export class Trade implements ITrade {
     this.baseAccount = data.baseAccount;
     this.baseAmount = data.baseAmount;
     this.baseAsset = data.baseAsset;
-    this.counterOffer = data.baseOffer;
+    this.counterOffer = data.counterOffer;
     this.counterAccount = data.counterAccount;
     this.counterAsset = data.counterAsset;
     this.baseIsSeller = data.baseIsSeller;

src/schema/resolvers/trades.ts

@@ -1,34 +1,17 @@
-import { getRepository } from "typeorm";
 import { IHorizonTradeData } from "../../datasource/types";
 import { IApolloContext } from "../../graphql_server";
 import { Trade } from "../../model";
 import { TradeFactory } from "../../model/factories";
-import { Offer } from "../../orm/entities";
-import { createBatchResolver, idOnlyRequested, makeConnection } from "./util";
+import { makeConnection } from "./util";
 
 import * as resolvers from "./shared";
 
-const offerResolver = createBatchResolver<any, Offer[]>(async (source: any, args: any, context: any, info: any) => {
-  const ids: string[] = source.map((s: any) => s[info.fieldName]);
-
-  if (idOnlyRequested(info)) {
-    return ids.map(id => (id ? { id } : null));
-  }
-
-  const offers = await getRepository(Offer).findByIds(ids);
-
-  return ids.map(id => offers.find(o => o.id === id) || null);
-});
-
 export default {
   Trade: {
     baseAsset: resolvers.asset,
     counterAsset: resolvers.asset,
     baseAccount: resolvers.account,
-    counterAccount: resolvers.account,
-    offer: offerResolver,
-    baseOffer: offerResolver,
-    counterOffer: offerResolver
+    counterAccount: resolvers.account
   },
   Query: {
     trades: async (root: any, args: any, ctx: IApolloContext, info: any) => {

src/schema/trades.ts

@@ -7,14 +7,14 @@ export const typeDefs = gql`
     "When the ledger with this trade was closed"
     ledgerCloseTime: DateTime!
     "The sell offer"
-    offer: Offer
-    baseOffer: Offer
+    offer: OfferID
+    baseOffer: OfferID
     "Base party of this trade"
     baseAccount: Account
     "Amount of \`baseAsset\` that was moved from \`baseAccount\` to \`counterAccount\`"
     baseAmount: Float!
     baseAsset: Asset!
-    counterOffer: Offer
+    counterOffer: OfferID
     "Counter party of this trade"
     counterAccount: Account
     "Amount of \`counterAsset\` that was moved from \`counterAccount\` to \`baseAccount\`"