fix: serial badge actions (#1254)

* fix: run revoke/reinstate serially, and hide revoked badges with Other reason * refactor: add status reason to governance badge
decentraland · Sep 11, 2023 · cef989a · cef989a
1 parent b158ba7
commit cef989a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 25 deletions.
diff --git a/src/entities/Badges/types.ts b/src/entities/Badges/types.ts
@@ -14,13 +14,15 @@ export enum BadgeStatusReason {
   TenureEnded = 'tenure ended',
   Minted = 'Badge minted by user',
   BurnedByUser = 'Badge burned by user',
+  Other = 'other',
 }
 
 export type Badge = {
   name: string
   description: string
   image: string
   status: BadgeStatus
+  statusReason: BadgeStatusReason
   isPastBadge: boolean
   createdAt: number
   transactionHash: string
@@ -55,11 +57,20 @@ export function isBadgeStatus(value: string | null | undefined): boolean {
   return !!value && new Set<string>(Object.values(BadgeStatus)).has(value)
 }
 
+export function isBadgeStatusReason(value: string | null | undefined): boolean {
+  return !!value && new Set<string>(Object.values(BadgeStatusReason)).has(value)
+}
+
 export function toBadgeStatus(value: string | null | undefined): BadgeStatus {
   if (isBadgeStatus(value)) return value as BadgeStatus
   else throw new Error(`Invalid BadgeStatus ${value}`)
 }
 
+export function toBadgeStatusReason(value: string | null | undefined): BadgeStatusReason {
+  if (isBadgeStatusReason(value)) return value as BadgeStatusReason
+  else throw new Error(`Invalid BadgeStatusReason ${value}`)
+}
+
 export function isPastBadge(badge: OtterspaceBadge) {
   const status = toBadgeStatus(badge.status)
   const expiresAt = badge.spec.metadata.expiresAt
@@ -77,6 +88,7 @@ export function toGovernanceBadge(otterspaceBadge: OtterspaceBadge) {
     createdAt: otterspaceBadge.createdAt,
     image: getIpfsHttpsLink(image),
     status: toBadgeStatus(otterspaceBadge.status),
+    statusReason: toBadgeStatusReason(otterspaceBadge.statusReason),
     isPastBadge: isPastBadge(otterspaceBadge),
     transactionHash: otterspaceBadge.transactionHash || '',
   }
@@ -105,3 +117,12 @@ export function toOtterspaceRevokeReason(
 ): OtterspaceRevokeReason {
   return isOtterspaceRevokeReason(value) ? (value as OtterspaceRevokeReason) : orElse(value)
 }
+
+export function shouldDisplayBadge(badge: Badge) {
+  return (
+    badge.status !== BadgeStatus.Burned &&
+    !(badge.status === BadgeStatus.Revoked && badge.statusReason === BadgeStatusReason.Other) &&
+    badge.name &&
+    badge.name.length > 0
+  )
+}
diff --git a/src/services/BadgesService.ts b/src/services/BadgesService.ts
@@ -23,6 +23,7 @@ import {
   OtterspaceRevokeReason,
   RevokeOrReinstateResult,
   UserBadges,
+  shouldDisplayBadge,
   toGovernanceBadge,
 } from '../entities/Badges/types'
 import {
@@ -54,13 +55,11 @@ export class BadgesService {
     for (const otterspaceBadge of otterspaceBadges) {
       try {
         const badge = toGovernanceBadge(otterspaceBadge)
-        if (badge.status !== BadgeStatus.Burned) {
-          if (otterspaceBadge.spec.metadata) {
-            if (badge.isPastBadge) {
-              expiredBadges.push(badge)
-            } else {
-              currentBadges.push(badge)
-            }
+        if (shouldDisplayBadge(badge)) {
+          if (badge.isPastBadge) {
+            expiredBadges.push(badge)
+          } else {
+            currentBadges.push(badge)
           }
         }
       } catch (error) {
@@ -196,37 +195,36 @@ export class BadgesService {
       return []
     }
 
-    const actionResults = await Promise.all<RevokeOrReinstateResult>(
-      badgeOwnerships.map(async (badgeOwnership) => {
-        const trimmedId = trimOtterspaceId(badgeOwnership.id)
+    const actionResults: RevokeOrReinstateResult[] = []
 
-        if (trimmedId === '') {
-          return {
-            status: ActionStatus.Failed,
-            address: badgeOwnership.address,
-            badgeId: badgeOwnership.id,
-            error: ErrorReason.InvalidBadgeId,
-          }
-        }
+    for (const badgeOwnership of badgeOwnerships) {
+      const trimmedId = trimOtterspaceId(badgeOwnership.id)
 
+      if (trimmedId === '') {
+        actionResults.push({
+          status: ActionStatus.Failed,
+          address: badgeOwnership.address,
+          badgeId: badgeOwnership.id,
+          error: ErrorReason.InvalidBadgeId,
+        })
+      } else {
         try {
           await action(trimmedId)
-          return {
+          actionResults.push({
             status: ActionStatus.Success,
             address: badgeOwnership.address,
             badgeId: trimmedId,
-          }
-          // eslint-disable-next-line
+          })
         } catch (error: any) {
-          return {
+          actionResults.push({
             status: ActionStatus.Failed,
             address: badgeOwnership.address,
             badgeId: trimmedId,
             error: JSON.stringify(error?.reason || error),
-          }
+          })
         }
-      })
-    )
+      }
+    }
 
     return actionResults
   }