style(handler): improve handler code style

okp4 · Aug 4, 2023 · f6a5d1e · f6a5d1e
1 parent 4ea24c8
commit f6a5d1e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 24 deletions.
diff --git a/src/mappings/handlePinObject.ts b/src/mappings/handlePinObject.ts
@@ -7,15 +7,15 @@ export const handlePinObject = async (
     msg: CosmosMessage<MsgExecuteContract>
 ): Promise<void> => {
     const objectId = getObjectariumObjectId(msg.tx.tx.events);
-    const object = objectId && (await ObjectariumObject.get(objectId));
+    const object = objectId ? await ObjectariumObject.get(objectId) : null;
 
     if (object) {
-        if (object.pins && !object.pins.includes(msg.msg.decodedMsg.sender)) {
-            object.pins.push(msg.msg.decodedMsg.sender);
-            await object.save();
-        }
-        if (!object.pins) {
-            object.pins = [msg.msg.decodedMsg.sender];
+        const { sender } = msg.msg.decodedMsg;
+
+        object.pins = object.pins || [];
+
+        if (!object.pins.includes(sender)) {
+            object.pins.push(sender);
             await object.save();
         }
     }

diff --git a/src/mappings/handleStoreObject.ts b/src/mappings/handleStoreObject.ts
@@ -21,18 +21,15 @@ export const handleStoreObject = async (
     const objectId = getObjectariumObjectId(msg.tx.tx.events);
 
     if (objectId) {
-        msg.msg.decodedMsg.msg.store_object.pin
-            ? await ObjectariumObject.create({
-                  id: objectId,
-                  sender: msg.msg.decodedMsg.sender,
-                  contract: msg.msg.decodedMsg.contract,
-                  pins: [msg.msg.decodedMsg.sender],
-              }).save()
-            : await ObjectariumObject.create({
-                  id: objectId,
-                  sender: msg.msg.decodedMsg.sender,
-                  contract: msg.msg.decodedMsg.contract,
-                  pins: [],
-              }).save();
+        const { sender, contract } = msg.msg.decodedMsg;
+        const isPinned = msg.msg.decodedMsg.msg.store_object.pin;
+        const pins = isPinned ? [sender] : [];
+
+        await ObjectariumObject.create({
+            id: objectId,
+            sender,
+            contract,
+            pins,
+        }).save();
     }
 };
diff --git a/src/mappings/handleUnpinObject.ts b/src/mappings/handleUnpinObject.ts
@@ -7,14 +7,15 @@ export const handleUnpinObject = async (
     msg: CosmosMessage<MsgExecuteContract>
 ): Promise<void> => {
     const objectId = getObjectariumObjectId(msg.tx.tx.events);
-    const object = objectId && (await ObjectariumObject.get(objectId));
+    const object = objectId ? await ObjectariumObject.get(objectId) : null;
 
-    if (object && object.pins) {
+    if (object?.pins) {
+        const { sender } = msg.msg.decodedMsg;
         const filteredPins = object.pins.filter(
-            (address) => address !== msg.msg.decodedMsg.sender
+            (address) => address !== sender
         );
 
-        if (!object.pins.every((address) => filteredPins.includes(address))) {
+        if (filteredPins.length !== object.pins.length) {
             object.pins = filteredPins;
             await object.save();
         }