feat: add objectarium to message

okp4 · Sep 6, 2023 · 91a23c7 · 91a23c7
1 parent fd4a3a3
commit 91a23c7
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 19 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -26,7 +26,7 @@ module.exports = {
     },
     plugins: ["@typescript-eslint"],
     rules: {
-        indent: ["error", 4],
+        indent: ["error", 4, { SwitchCase: 1 }],
         "linebreak-style": ["error", "unix"],
         quotes: ["error", "double"],
         semi: ["error", "always"],

diff --git a/schema.graphql b/schema.graphql
@@ -133,6 +133,10 @@ type Message @entity {
     """
     block: Block!
     """
+    Objectarium that message relates to (for a message which concerns an objectarium smart contract).
+    """
+    objectarium: Objectarium
+    """
     Object that message relates to (for a message which concerns an object).
     """
     objectariumObject: ObjectariumObject
@@ -231,4 +235,8 @@ type Objectarium @entity {
     List of objects contained within the Objectarium instance.
     """
     objectariumObjects: [ObjectariumObject] @derivedFrom(field: "objectarium")
+    """
+    List of messages that concern the entity.
+    """
+    messages: [Message]! @derivedFrom(field: "objectarium")
 }
diff --git a/src/mappings/helper.ts b/src/mappings/helper.ts
@@ -1,4 +1,41 @@
 import { CosmosEvent, CosmosMessage } from "@subql/types-cosmos";
+import { Message } from "../types";
 
 export const messageId = (msg: CosmosMessage | CosmosEvent): string =>
     `${msg.tx.hash}-${msg.idx}`;
+
+export const referenceEntityInMessage = async (
+    msg: CosmosMessage,
+    entity: {
+        id: string;
+        messageField: keyof Pick<
+            Message,
+            | "objectariumObjectId"
+            | "objectariumId"
+            | "blockId"
+            | "transactionId"
+        >;
+    },
+): Promise<void> => {
+    const message = await Message.get(messageId(msg));
+    if (!message) {
+        return;
+    }
+
+    switch (entity.messageField) {
+        case "objectariumObjectId":
+            message.objectariumObjectId = entity.id;
+            break;
+        case "objectariumId":
+            message.objectariumId = entity.id;
+            break;
+        case "blockId":
+            message.blockId = entity.id;
+            break;
+        case "transactionId":
+            message.transactionId = entity.id;
+            break;
+    }
+
+    await message.save();
+};
diff --git a/src/mappings/objectariumHandlers.ts b/src/mappings/objectariumHandlers.ts
@@ -4,13 +4,12 @@ import type {
     MsgInstantiateContract,
 } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import {
-    Message,
     ObjectariumObject,
     Objectarium,
     BucketConfig,
     BucketLimits,
 } from "../types";
-import { messageId } from "./helper";
+import { referenceEntityInMessage } from "./helper";
 import type { Event } from "@cosmjs/tendermint-rpc/build/tendermint37";
 
 type StoreObject = {
@@ -64,7 +63,10 @@ export const handleStoreObject = async (
         pins: isPinned ? [sender] : [],
     }).save();
 
-    await referenceObjectInMessage(msg, objectId);
+    await referenceEntityInMessage(msg, {
+        messageField: "objectariumObjectId",
+        id: objectId,
+    });
 };
 
 export const handleForgetObject = async (
@@ -76,7 +78,10 @@ export const handleForgetObject = async (
     }
 
     await ObjectariumObject.remove(objectId);
-    await referenceObjectInMessage(msg, objectId);
+    await referenceEntityInMessage(msg, {
+        messageField: "objectariumObjectId",
+        id: objectId,
+    });
 };
 
 export const handlePinObject = async (
@@ -94,7 +99,10 @@ export const handlePinObject = async (
         await object.save();
     }
 
-    await referenceObjectInMessage(msg, object.id);
+    await referenceEntityInMessage(msg, {
+        messageField: "objectariumObjectId",
+        id: object.id,
+    });
 };
 
 export const handleUnpinObject = async (
@@ -113,7 +121,10 @@ export const handleUnpinObject = async (
         await object.save();
     }
 
-    await referenceObjectInMessage(msg, object.id);
+    await referenceEntityInMessage(msg, {
+        messageField: "objectariumObjectId",
+        id: object.id,
+    });
 };
 
 export const handleInitObjectarium = async (
@@ -160,19 +171,11 @@ export const handleInitObjectarium = async (
         config,
         limits,
     }).save();
-};
 
-export const referenceObjectInMessage = async (
-    msg: CosmosMessage,
-    objectId: string,
-): Promise<void> => {
-    const message = await Message.get(messageId(msg));
-    if (!message) {
-        return;
-    }
-
-    message.objectariumObjectId = objectId;
-    await message.save();
+    await referenceEntityInMessage(msg, {
+        messageField: "objectariumId",
+        id: contractAddress,
+    });
 };
 
 export const retrieveObjectariumObject = async (