add display meta-properties

src/adverts/advert-meta/advert-meta.ts

@@ -1,6 +1,11 @@
 import { normalizeRoles } from '../../login'
 import type { HaffaUser } from '../../login/types'
-import { isClaimOverdue } from '../advert-mutations/claims/mappers'
+import {
+  getClaimReturnInfo,
+  hasCollects,
+  hasReservations,
+  isClaimOverdue,
+} from '../advert-mutations/claims/mappers'
 import { AdvertClaimType, AdvertType } from '../types'
 import type { Advert, AdvertMeta } from '../types'
 
@@ -30,6 +35,10 @@ export const getAdvertMeta = (
   const isNotArchived = !advert.archivedAt
   const isArchived = !isNotArchived
   const isOnMyWaitList = advert.waitlist.includes(user.id)
+  const isLendingAdvert = advert.lendingPeriod > 0
+  const canBook = isLendingAdvert && quantity - claimCount > 0
+  const isReservedBySome = hasReservations(advert.claims)
+  const isCollectedBySome = hasCollects(advert.claims)
 
   const {
     canEditOwnAdverts,
@@ -67,7 +76,7 @@ export const getAdvertMeta = (
       canUnarchive:
         isArchived && canArchiveOwnAdverts && (mine || canManageAllAdverts),
       canRemove: canRemoveOwnAdverts && (mine || canManageAllAdverts),
-      canBook: false, // type === AdvertType.borrow,
+      canBook,
       canReserve: isNotArchived && quantity > claimCount && canReserveAdverts,
       canCancelReservation: myReservationCount > 0 && canReserveAdverts,
       canCollect:
@@ -86,6 +95,10 @@ export const getAdvertMeta = (
       canReturn: canManageReturns && hasSingleCollectClaim(advert),
       reservedyMe: myReservationCount,
       collectedByMe: myCollectedCount,
+      isLendingAdvert,
+      isReservedBySome,
+      isCollectedBySome,
+      returnInfo: getClaimReturnInfo(advert.claims, advert.lendingPeriod),
       claims,
     }
   }
@@ -99,7 +112,7 @@ export const getAdvertMeta = (
     canUnarchive:
       isArchived && canArchiveOwnAdverts && (mine || canManageAllAdverts),
     canRemove: canRemoveOwnAdverts && (mine || canManageAllAdverts),
-    canBook: false, // type === AdvertType.borrow,
+    canBook,
     canReserve: false,
     canCancelReservation: false,
     canCollect: false,
@@ -109,6 +122,10 @@ export const getAdvertMeta = (
     canReturn: false,
     reservedyMe: myReservationCount,
     collectedByMe: myCollectedCount,
+    isLendingAdvert,
+    isReservedBySome,
+    isCollectedBySome,
+    returnInfo: [],
     claims: [],
   }
 }

src/adverts/advert-meta/tests/can-book.spec.ts

@@ -1,29 +1,47 @@
 import { getAdvertMeta } from '..'
-import { makeAdmin } from '../../../login'
-import { HaffaUser } from '../../../login/types'
+import type { HaffaUser } from '../../../login/types'
 import { createEmptyAdvert } from '../../mappers'
-import { AdvertType } from '../../types'
+
+const haffaUser: HaffaUser = {
+  id: 'test@user.se',
+  roles: { canCollectAdverts: true },
+}
 
 describe('getAdvertMeta::canBook', () => {
-  const unbookables = [
-    createEmptyAdvert({ quantity: 1, type: AdvertType.recycle }),
-    createEmptyAdvert({ quantity: 1, type: AdvertType.borrow }),
-    createEmptyAdvert({
-      quantity: 1,
-      type: AdvertType.recycle,
-      createdBy: 'someone@else',
-    }),
-    createEmptyAdvert({
-      quantity: 1,
-      type: AdvertType.borrow,
-      createdBy: 'someone@else',
-    }),
-  ]
-  it('bookings are never supported', () => {
-    unbookables.forEach(advert =>
-      expect(
-        getAdvertMeta(advert, makeAdmin({ id: 'some@admin' })).canBook
-      ).toBe(false)
-    )
+  it('cannot be booked if lending period is zero', () => {
+    expect(
+      getAdvertMeta(
+        createEmptyAdvert({
+          lendingPeriod: 0,
+          quantity: 1,
+          createdBy: 'someone@else',
+        }),
+        haffaUser
+      ).canBook
+    ).toBe(false)
+  })
+  it('cannot be booked if quantity is zero', () => {
+    expect(
+      getAdvertMeta(
+        createEmptyAdvert({
+          lendingPeriod: 5,
+          quantity: 0,
+          createdBy: 'someone@else',
+        }),
+        haffaUser
+      ).canBook
+    ).toBe(false)
+  })
+  it('can be booked if quantity is more than zero and lending period is set', () => {
+    expect(
+      getAdvertMeta(
+        createEmptyAdvert({
+          lendingPeriod: 5,
+          quantity: 1,
+          createdBy: 'someone@else',
+        }),
+        haffaUser
+      ).canBook
+    ).toBe(true)
   })
 })

src/adverts/advert-meta/tests/return-info-spec.ts

@@ -0,0 +1,51 @@
+import { getAdvertMeta } from '..'
+import type { HaffaUser } from '../../../login/types'
+import { createEmptyAdvert } from '../../mappers'
+import type { AdvertClaim } from '../../types'
+import { AdvertClaimType } from '../../types'
+
+const haffaUser: HaffaUser = {
+  id: 'test@user.se',
+  roles: { canCollectAdverts: true },
+}
+
+describe('getAdvertMeta::returnInfo', () => {
+  const createClaim = (defaults?: Partial<AdvertClaim>): AdvertClaim => ({
+    by: 'test@user',
+    at: 'new Date().toISOString()',
+    quantity: 1,
+    type: AdvertClaimType.collected,
+    events: [],
+    ...defaults,
+  })
+
+  it('sorts bookings in correct order', () => {
+    const advert = createEmptyAdvert({
+      lendingPeriod: 10,
+      quantity: 0,
+      claims: [
+        createClaim({ at: '2024-01-05', quantity: 1 }),
+        createClaim({ at: '2024-01-01', quantity: 2 }),
+      ],
+    })
+    const meta = getAdvertMeta(advert, haffaUser)
+
+    expect(meta.returnInfo).toStrictEqual([
+      { at: '2024-01-11T00:00:00.000Z', quantity: 2 },
+      { at: '2024-01-15T00:00:00.000Z', quantity: 1 },
+    ])
+  })
+  it('ignores claims of type reservation', () => {
+    const advert = createEmptyAdvert({
+      lendingPeriod: 10,
+      quantity: 0,
+      claims: [
+        createClaim({ at: '2024-01-05' }),
+        createClaim({ at: '2024-01-06', type: AdvertClaimType.reserved }),
+      ],
+    })
+    const meta = getAdvertMeta(advert, haffaUser)
+
+    expect(meta.returnInfo).toHaveLength(1)
+  })
+})

src/adverts/advert-mutations/claims/mappers.ts

@@ -1,4 +1,9 @@
-import { type AdvertClaim, type AdvertClaimEvent } from '../../types'
+import { AdvertClaimType } from '../../types'
+import type {
+  AdvertReturnInfo,
+  AdvertClaim,
+  AdvertClaimEvent,
+} from '../../types'
 
 const sanitizeInterval = (interval: number) => (interval < 0 ? 0 : interval)
 /**
@@ -55,3 +60,28 @@ export const isClaimOverdue = (
   // No limitation on validity
   return false
 }
+
+export const getClaimReturnInfo = (claims: AdvertClaim[], daysValid: number) =>
+  claims
+    .reduce<AdvertReturnInfo[]>((p, c) => {
+      if (c.type === AdvertClaimType.collected && daysValid > 0) {
+        const at = new Date(c.at)
+        at.setDate(at.getDate() + sanitizeInterval(daysValid))
+
+        return [
+          ...p,
+          {
+            at: at.toISOString(),
+            quantity: c.quantity,
+          },
+        ]
+      }
+      return [...p]
+    }, [])
+    .sort((a, b) => a.at.localeCompare(b.at))
+
+export const hasReservations = (claims: AdvertClaim[]) =>
+  claims.filter(claim => claim.type === AdvertClaimType.reserved).length > 0
+
+export const hasCollects = (claims: AdvertClaim[]) =>
+  claims.filter(claim => claim.type === AdvertClaimType.collected).length > 0

src/adverts/adverts.gql.schema.ts

@@ -215,9 +215,18 @@ export const advertsGqlSchema = /* GraphQL */ `
     canReturn: Boolean!
     reservedyMe: Int!
     collectedByMe: Int!
+    isLendingAdvert: Boolean!
+    isReservedBySome: Boolean!
+    isCollectedBySome: Boolean!
+    returnInfo: [AdvertReturnInfo]!
     claims: [AdvertClaim]!
   }
 
+  type AdvertReturnInfo {
+    at: String
+    quantity: Int
+  }
+
   type AdvertLocation {
     name: String
     adress: String

src/adverts/types.ts

@@ -50,6 +50,10 @@ export interface AdvertMetaClaim extends AdvertClaim {
   canConvert: boolean
   isOverdue: boolean
 }
+export interface AdvertReturnInfo {
+  at: string
+  quantity: number
+}
 export interface AdvertMeta {
   reservableQuantity: number
   collectableQuantity: number
@@ -68,6 +72,10 @@ export interface AdvertMeta {
   canReturn: boolean
   reservedyMe: number
   collectedByMe: number
+  isLendingAdvert: boolean
+  isReservedBySome: boolean
+  isCollectedBySome: boolean
+  returnInfo: AdvertReturnInfo[]
   claims: AdvertMetaClaim[]
 }