poka
--- a/src/data_handler.ts
+++ b/src/data_handler.ts
-
    }

    // Process membership renewed
    for (const membershipRenewed of newData.membershipRenewed) {
-      const identity = await this.getIdtyByIndexOrFail(ctx, membershipRenewed.index);
-      const id = identity.id;
-      // membership should exist for renew
-      const membership = await ctx.store.findOneByOrFail(Membership, { id })
-
+      const { id, index, expire_on, blockNumber } = membershipRenewed;
+      const identity = await this.getIdtyByIndexOrFail(ctx, index);
+      const membership = await ctx.store.findOneOrFail(Membership, {
+        relations: { identity: true },
+        where: { identity: { index: index } },
+      });