Split code path for grouped workflows

Only use the Cellect API for grouped workflows. Return a default set of workflow data otherwise. Update tests to test for grouped and non-grouped workflows. Update mocks to represent Cellect responses without the grouped attribute.
zooniverse · Feb 19, 2021 · 023f8b0 · 023f8b0
1 parent 91c2444
commit 023f8b0
Show file tree

Hide file tree

Showing 4 changed files with 387 additions and 243 deletions.
diff --git a/packages/app-project/src/helpers/fetchWorkflowsHelper/fetchWorkflowsHelper.js b/packages/app-project/src/helpers/fetchWorkflowsHelper/fetchWorkflowsHelper.js
@@ -2,14 +2,14 @@ import { panoptes } from '@zooniverse/panoptes-js'
 import fetch from 'node-fetch'
 
 async function fetchWorkflowData (activeWorkflows, env) {
-  const response = await panoptes
-    .get('/workflows', {
-      complete: false,
-      env,
-      fields: 'completeness,grouped',
-      id: activeWorkflows.join(','),
-      include: 'subject_sets'
-    })
+  const query = {
+    complete: false,
+    env,
+    fields: 'completeness,grouped',
+    id: activeWorkflows.join(','),
+    include: 'subject_sets'
+  }
+  const response = await panoptes.get('/workflows', query)
   const { workflows, linked } = response.body
   const subjectSets = linked ? linked.subject_sets : []
   await Promise.allSettled(subjectSets.map(subjectSet => fetchPreviewImage(subjectSet, env)))
@@ -33,7 +33,7 @@ async function fetchWorkflowCellectStatus(workflow) {
   const workflowURL = `https://cellect.zooniverse.org/workflows/${workflow.id}/status`
   const response = await fetch(workflowURL)
   const body = await response.json()
-  const { groups } = body ?? {}
+  const groups = body.groups ?? {}
   return groups
 }
 
@@ -50,6 +50,17 @@ async function fetchPreviewImage (subjectSet, env) {
 }
 
 async function buildWorkflow(workflow, displayName, subjectSets, isDefault) {
+  const workflowData = {
+    completeness: workflow.completeness || 0,
+    default: isDefault,
+    displayName,
+    grouped: false,
+    id: workflow.id,
+    subjectSets: []
+  }
+  if (!workflow.grouped) {
+    return workflowData
+  }
   const subjectSetCounts = await fetchWorkflowCellectStatus(workflow)
   const workflowSubjectSets = workflow.links.subject_sets
     .map(subjectSetID => {
@@ -59,14 +70,7 @@ async function buildWorkflow(workflow, displayName, subjectSets, isDefault) {
     })
     .filter(Boolean)
 
-  return {
-    completeness: workflow.completeness || 0,
-    default: isDefault,
-    displayName,
-    grouped: workflow.grouped,
-    id: workflow.id,
-    subjectSets: workflowSubjectSets
-  }
+  return Object.assign(workflowData, { grouped: true, subjectSets: workflowSubjectSets })
 }
 
 async function fetchWorkflowsHelper (language = 'en', activeWorkflows, defaultWorkflow, env) {
@@ -80,7 +84,7 @@ async function fetchWorkflowsHelper (language = 'en', activeWorkflows, defaultWo
     return buildWorkflow(workflow, displayName, subjectSets, isDefault)
   })
   const workflowStatuses = await Promise.allSettled(awaitWorkflows)
-  const workflowsWithSubjectSets = workflowStatuses.map(result => result.value)
+  const workflowsWithSubjectSets = workflowStatuses.map(result => result.value || result.reason)
   return workflowsWithSubjectSets
 }
 

diff --git a/packages/app-project/src/helpers/fetchWorkflowsHelper/fetchWorkflowsHelper.spec.js b/packages/app-project/src/helpers/fetchWorkflowsHelper/fetchWorkflowsHelper.spec.js
@@ -15,7 +15,7 @@ describe('Helpers > fetchWorkflowsHelper', function () {
     {
       id: '2',
       completeness: 0.7,
-      grouped: false,
+      grouped: true,
       links: {
         subject_sets: ['1', '2', '3']
       }
@@ -56,9 +56,7 @@ describe('Helpers > fetchWorkflowsHelper', function () {
     const cellect = nock('https://cellect.zooniverse.org')
     .persist()
     .get('/workflows/1/status')
-    .reply(200, {
-      groups: availableSubjects
-    })
+    .reply(200, {})
     .get('/workflows/2/status')
     .reply(200, {
       groups: availableSubjects
@@ -98,11 +96,7 @@ describe('Helpers > fetchWorkflowsHelper', function () {
         grouped: false,
         id: '1',
         displayName: 'Foo',
-        subjectSets: [
-          Object.assign(subjectSet('1'), { availableSubjects: availableSubjects[1]}),
-          Object.assign(subjectSet('2'), { availableSubjects: availableSubjects[2]}),
-          Object.assign(subjectSet('3'), { availableSubjects: availableSubjects[3]})
-        ]
+        subjectSets: []
       }
     ])
   })
@@ -135,16 +129,12 @@ describe('Helpers > fetchWorkflowsHelper', function () {
         grouped: false,
         id: '1',
         displayName: 'Foo',
-        subjectSets: [
-          Object.assign(subjectSet('1'), { availableSubjects: availableSubjects[1]}),
-          Object.assign(subjectSet('2'), { availableSubjects: availableSubjects[2]}),
-          Object.assign(subjectSet('3'), { availableSubjects: availableSubjects[3]})
-        ]
+        subjectSets: []
       },
       {
         completeness: 0.7,
         default: false,
-        grouped: false,
+        grouped: true,
         id: '2',
         displayName: 'Bar',
         subjectSets: [
@@ -185,16 +175,12 @@ describe('Helpers > fetchWorkflowsHelper', function () {
           grouped: false,
           id: '1',
           displayName: 'Foo',
-          subjectSets: [
-            Object.assign(subjectSet('1'), { availableSubjects: availableSubjects[1]}),
-            Object.assign(subjectSet('2'), { availableSubjects: availableSubjects[2]}),
-            Object.assign(subjectSet('3'), { availableSubjects: availableSubjects[3]})
-          ]
+          subjectSets: []
         },
         {
           completeness: 0.7,
           default: true,
-          grouped: false,
+          grouped: true,
           id: '2',
           displayName: 'Bar',
           subjectSets: [