change pickoncollect to property

src/adverts/advert-mutations/claims/cancel-advert-claim.ts

@@ -1,4 +1,3 @@
-import { makeUser } from '../../../login'
 import { TxErrors, txBuilder } from '../../../transactions'
 import type { Services } from '../../../types'
 import { normalizeAdvertClaims } from '../../advert-claims'

src/adverts/advert-mutations/claims/convert-advert-claim.spec.ts

@@ -144,10 +144,13 @@ describe('convertAdvertClaim - picking', () => {
       advertWasCollected,
       advertWasCollectedOwner,
     })
-    const doPickOnCollect = jest.fn(() => true)
     const workflow = {
-      doPickOnCollect,
+      get pickOnCollect() {
+        return true
+      },
     }
+    const spy = jest.spyOn(workflow, 'pickOnCollect', 'get')
+
     return end2endTest(
       {
         services: { notifications, workflow },
@@ -195,7 +198,7 @@ describe('convertAdvertClaim - picking', () => {
           )
         )
         T('should have checked configuration', () =>
-          expect(doPickOnCollect).toHaveBeenCalled()
+          expect(spy).toHaveBeenCalled()
         )
       }
     )

src/adverts/advert-mutations/claims/convert-advert-claim.ts

@@ -21,7 +21,7 @@ export const createConvertAdvertClaim =
   ({
     adverts,
     notifications,
-    workflow,
+    workflow: { pickOnCollect },
   }: Pick<
     Services,
     'adverts' | 'notifications' | 'workflow'
@@ -63,7 +63,7 @@ export const createConvertAdvertClaim =
           )
         )
         const pickedAt =
-          newType === AdvertClaimType.collected && workflow.doPickOnCollect()
+          newType === AdvertClaimType.collected && pickOnCollect
             ? at
             : advert.pickedAt
 

src/adverts/advert-mutations/collecting/collect-advert.spec.ts

@@ -144,10 +144,12 @@ describe('collectAdvert', () => {
       advertWasCollected,
       advertWasCollectedOwner,
     })
-    const doPickOnCollect = jest.fn(() => true)
     const workflow = {
-      doPickOnCollect,
+      get pickOnCollect() {
+        return true
+      },
     }
+    const spy = jest.spyOn(workflow, 'pickOnCollect', 'get')
 
     return end2endTest(
       { services: { notifications, workflow } },
@@ -184,7 +186,7 @@ describe('collectAdvert', () => {
         )
 
         T('should have checked configuration', () =>
-          expect(doPickOnCollect).toHaveBeenCalled()
+          expect(spy).toHaveBeenCalled()
         )
       }
     )

src/adverts/advert-mutations/collecting/collect-advert.ts

@@ -15,7 +15,7 @@ export const createCollectAdvert =
   ({
     adverts,
     notifications,
-    workflow,
+    workflow: { pickOnCollect },
   }: Pick<
     Services,
     'adverts' | 'notifications' | 'workflow'
@@ -63,7 +63,7 @@ export const createCollectAdvert =
             .map(({ quantity }) => quantity)
             .reduce((s, v) => s + v, 0)
 
-          const pickedAt = workflow.doPickOnCollect() ? at : advert.pickedAt
+          const pickedAt = pickOnCollect ? at : advert.pickedAt
 
           return {
             ...advert,

src/test-utils/test-app.ts

@@ -125,7 +125,9 @@ export const createTestNotificationServices = (
 
 export const createTestServices = (services: Partial<Services>): Services => {
   const workflow = {
-    doPickOnCollect: () => false,
+    get pickOnCollect() {
+      return false
+    },
   }
   const settings = services.settings || createInMemorySettingsService()
   const userMapper = services.userMapper || createUserMapper(null, settings)

src/workflow/index.ts

@@ -2,6 +2,7 @@ import { getEnv } from '../lib/gdi-api-node'
 import type { WorkflowService } from './types'
 
 export const createWorkflowServiceFromEnv = (): WorkflowService => ({
-  doPickOnCollect: () =>
-    Number(getEnv('PICK_ON_COLLECT', { fallback: '0' })) === 1,
+  get pickOnCollect() {
+    return Number(getEnv('PICK_ON_COLLECT', { fallback: '0' })) === 1
+  },
 })

src/workflow/types.ts

@@ -1,3 +1,3 @@
 export interface WorkflowService {
-  doPickOnCollect: () => boolean
+  pickOnCollect: boolean
 }