Join pool schema to market schema (#232)

* Update schema

* Overwrite migration file based on schema changes

* Regenerate code

* Connect pool schema to market at poolCreate handler

* Modify account details before saving pool

schema.graphql

@@ -150,8 +150,8 @@ type Market @entity {
   scoringRule: String!
   "Status of the market"
   status: String!
-  "Zeitgeist's indentifier for liquidity pool"
-  poolId: Int
+  "Market's liquidity pool details"
+  pool: Pool
   "Reported outcome of the market. Null if the market is not reported yet"
   report: MarketReport
   "Resolved outcome for the market"

src/mappings/swaps/index.ts

@@ -82,23 +82,6 @@ export async function poolCreate(ctx: EventHandlerContext<Store, {event: {args:
     await store.save<Account>(acc)
   }
 
-  let market = await store.get(Market, { where: { marketId: pool.marketId } })
-  if (market) {
-    market.poolId = pool.poolId
-    console.log(`[${event.name}] Saving market: ${JSON.stringify(market, null, 2)}`)
-    await store.save<Market>(market)
-
-    let hm = new HistoricalMarket()
-    hm.id = event.id + '-' + market.marketId
-    hm.marketId = market.marketId
-    hm.event = event.name.split('.')[1]
-    hm.poolId = market.poolId
-    hm.blockNumber = block.height
-    hm.timestamp = new Date(block.timestamp)
-    console.log(`[${event.name}] Saving historical market: ${JSON.stringify(hm, null, 2)}`)
-    await store.save<HistoricalMarket>(hm)
-  }
-
   if (swapPool.weights && swapPool.weights[swapPool.weights.length - 1][0].__kind == 'Ztg') {
     const tokenWeightIn = +swapPool.weights[swapPool.weights.length - 1][1].toString()
     await Promise.all(
@@ -152,6 +135,23 @@ export async function poolCreate(ctx: EventHandlerContext<Store, {event: {args:
   hp.timestamp = new Date(block.timestamp)
   console.log(`[${event.name}] Saving historical pool: ${JSON.stringify(hp, null, 2)}`)
   await store.save<HistoricalPool>(hp)
+
+  let market = await store.get(Market, { where: { marketId: pool.marketId } })
+  if (market) {
+    market.pool = pool
+    console.log(`[${event.name}] Saving market: ${JSON.stringify(market, null, 2)}`)
+    await store.save<Market>(market)
+
+    let hm = new HistoricalMarket()
+    hm.id = event.id + '-' + market.marketId
+    hm.marketId = market.marketId
+    hm.event = event.name.split('.')[1]
+    hm.poolId = market.pool.poolId
+    hm.blockNumber = block.height
+    hm.timestamp = new Date(block.timestamp)
+    console.log(`[${event.name}] Saving historical market: ${JSON.stringify(hm, null, 2)}`)
+    await store.save<HistoricalMarket>(hm)
+  }
 }
 
 export async function poolExit(ctx: EventHandlerContext<Store, {event: {args: true}}>) {

src/model/generated/market.model.ts

@@ -1,9 +1,10 @@
-import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_} from "typeorm"
+import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, ManyToOne as ManyToOne_, Index as Index_} from "typeorm"
 import * as marshal from "./marshal"
 import {CategoryMetadata} from "./_categoryMetadata"
 import {MarketDeadlines} from "./_marketDeadlines"
 import {MarketType} from "./_marketType"
 import {MarketPeriod} from "./_marketPeriod"
+import {Pool} from "./pool.model"
 import {MarketReport} from "./_marketReport"
 import {MarketDisputeMechanism} from "./_marketDisputeMechanism"
 
@@ -137,10 +138,11 @@ export class Market {
   status!: string
 
   /**
-   * Zeitgeist's indentifier for liquidity pool
+   * Market's liquidity pool details
    */
-  @Column_("int4", {nullable: true})
-  poolId!: number | undefined | null
+  @Index_()
+  @ManyToOne_(() => Pool, {nullable: true})
+  pool!: Pool | undefined | null
 
   /**
    * Reported outcome of the market. Null if the market is not reported yet