Merge pull request #223 from poap-xyz/release/v1.12.11

Release v1.12.11

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poap-xyz/poap-family",
-  "version": "1.12.10",
+  "version": "1.12.11",
   "author": {
     "name": "POAP",
     "url": "https://poap.xyz"

src/loaders/api.js

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import { FAMILY_API_KEY, FAMILY_API_URL } from '../models/api'
-import { encodeExpiryDates, Event, EventOwners } from '../models/event'
+import { encodeExpiryDates, Event, EventMetrics, EventOwners } from '../models/event'
 
 async function getEventAndOwners(
   eventId,
@@ -313,27 +313,8 @@ async function getEventMetrics(eventId, abortSignal, refresh = false) {
   if (response.status !== 200) {
     throw new Error(`Event ${eventId} failed to fetch metrics (status ${response.status})`)
   }
-  const metrics = await response.json()
-  if (
-    !metrics ||
-    typeof metrics !== 'object' ||
-    !('emailReservations' in metrics) || typeof metrics.emailReservations !== 'number' ||
-    !('emailClaimsMinted' in metrics) || typeof metrics.emailClaimsMinted !== 'number' ||
-    !('emailClaims' in metrics) || typeof metrics.emailClaims !== 'number' ||
-    !('momentsUploaded' in metrics) || typeof metrics.momentsUploaded !== 'number' ||
-    !('collectionsIncludes' in metrics) || typeof metrics.collectionsIncludes !== 'number' ||
-    !('ts' in metrics) || (typeof metrics.ts !== 'number' && metrics.ts !== null)
-  ) {
-    return null
-  }
-  return {
-    emailReservations: metrics.emailReservations,
-    emailClaimsMinted: metrics.emailClaimsMinted,
-    emailClaims: metrics.emailClaims,
-    momentsUploaded: metrics.momentsUploaded,
-    collectionsIncludes: metrics.collectionsIncludes,
-    ts: metrics.ts,
-  }
+  const body = await response.json()
+  return EventMetrics(body)
 }
 
 async function getEventsMetrics(eventIds, abortSignal) {
@@ -367,11 +348,15 @@ async function getEventsMetrics(eventIds, abortSignal) {
     }
     throw new Error(`Events (${eventIds.length}) failed to fetch metrics (status ${response.status})`)
   }
-  const metricsMap = await response.json()
-  if (typeof metricsMap !== 'object') {
+  const body = await response.json()
+  if (typeof body !== 'object') {
     return null
   }
-  return metricsMap
+  return Object.fromEntries(
+    Object.entries(body).map(
+      ([eventId, event]) => [eventId, EventMetrics(event)]
+    )
+  )
 }
 
 async function auth(passphrase) {

src/models/event.js

@@ -19,14 +19,13 @@ function Event(event, includeDescription) {
 }
 
 function EventOwners(eventOwners) {
+  if (eventOwners == null) {
+    return null
+  }
   if (
-    eventOwners == null ||
     typeof eventOwners !== 'object' ||
     !('owners' in eventOwners) ||
-    (
-      eventOwners.owners != null &&
-      !Array.isArray(eventOwners.owners)
-    ) ||
+    !Array.isArray(eventOwners.owners) ||
     !('ts' in eventOwners) ||
     eventOwners.ts == null ||
     typeof eventOwners.ts !== 'number'
@@ -39,6 +38,37 @@ function EventOwners(eventOwners) {
   }
 }
 
+function EventMetrics(eventMetrics) {
+  if (eventMetrics == null) {
+    return null
+  }
+  if (
+    typeof eventMetrics !== 'object' ||
+    !('emailReservations' in eventMetrics) ||
+    typeof eventMetrics.emailReservations !== 'number' ||
+    !('emailClaimsMinted' in eventMetrics) ||
+    typeof eventMetrics.emailClaimsMinted !== 'number' ||
+    !('emailClaims' in eventMetrics) ||
+    typeof eventMetrics.emailClaims !== 'number' ||
+    !('momentsUploaded' in eventMetrics) ||
+    typeof eventMetrics.momentsUploaded !== 'number' ||
+    !('collectionsIncludes' in eventMetrics) ||
+    typeof eventMetrics.collectionsIncludes !== 'number' ||
+    !('ts' in eventMetrics) ||
+    typeof eventMetrics.ts !== 'number'
+  ) {
+    throw new Error('Malformed event metrics')
+  }
+  return {
+    emailReservations: eventMetrics.emailReservations,
+    emailClaimsMinted: eventMetrics.emailClaimsMinted,
+    emailClaims: eventMetrics.emailClaims,
+    momentsUploaded: eventMetrics.momentsUploaded,
+    collectionsIncludes: eventMetrics.collectionsIncludes,
+    ts: eventMetrics.ts,
+  }
+}
+
 function parseEventIds(rawIds) {
   let eventIds = (rawIds ?? '').split(',')
     .filter((value, index, all) => all.indexOf(value) === index)
@@ -87,6 +117,7 @@ const SEARCH_LIMIT = 10
 export {
   Event,
   EventOwners,
+  EventMetrics,
   parseEventIds,
   joinEventIds,
   parseExpiryDates,