@ossy/booking 1.16.2 → 3.0.1

package/README.md

@@ -1,46 +1,73 @@
 # @ossy/booking
 
-Booking feature package for the Ossy platform. Lets consultants define services, set weekly availability, and accept client bookings.
+Booking feature package for the Ossy platform. Lets providers define services, set weekly availability, and accept client bookings.
 
 ## Pages
 
 | Page | Path | Audience |
 |------|------|----------|
-| `public-booking` | `/book/:consultantSlug` · `/boka/:consultantSlug` | Public (clients) |
-| `services` | `/services` · `/tjanster` | Consultant (authenticated) |
-| `bookings` | `/bookings` · `/bokningar` | Consultant (authenticated) |
-| `availability-setup` | `/availability` · `/tillganglighet` | Consultant (authenticated) |
-| `booking-detail` | `/bookings/:bookingId` · `/bokningar/:bookingId` | Consultant (authenticated) |
+| `public-booking` | `/book/:providerSlug` · `/boka/:providerSlug` | Public (clients) |
+| `services` | `/services` · `/tjanster` | Provider (authenticated) |
+| `bookings` | `/bookings` · `/bokningar` | Provider (authenticated) |
+| `availability-setup` | `/availability` · `/tillganglighet` | Provider (authenticated) |
+| `booking-detail` | `/bookings/:bookingId` · `/bokningar/:bookingId` | Provider (authenticated) |
 
 ## Public booking flow
 
 1. Client opens `public-booking` (no auth; `metadata.public: true`)
 2. Picks a service → calendar slot → contact details
-3. `booking/create` stores a pending booking and sends notification emails
+3. `@ossy/booking/actions/create` stores a pending booking and sends notification emails
 
-## Service actions
+## Actions
+
+Actions are declared in `*.action.js` and discovered at build time. Each action delegates to a matching `*.task.js`.
 
 | Action | Access |
 |--------|--------|
-| `booking/get-services` | public |
-| `booking/create-service` | workspace |
-| `booking/update-service` | workspace |
-| `booking/delete-service` | workspace |
+| `@ossy/booking/actions/get-services` | public |
+| `@ossy/booking/actions/create-service` | workspace |
+| `@ossy/booking/actions/update-service` | workspace |
+| `@ossy/booking/actions/delete-service` | workspace |
+| `@ossy/booking/actions/create` | public |
+| `@ossy/booking/actions/list` | workspace |
+| `@ossy/booking/actions/confirm` | workspace |
+| `@ossy/booking/actions/decline` | workspace |
+| `@ossy/booking/actions/cancel` | authenticated |
+| `@ossy/booking/actions/get-availability` | workspace |
+| `@ossy/booking/actions/save-availability` | workspace |
+| `@ossy/booking/actions/get-available-slots` | public |
+
+## Schemas
+
+Resource schemas live in `src/*.schema.js` and are auto-discovered by `@ossy/app build`. Canonical ids are exported from `schema-ids.js` as `BookingSchema`:
+
+| Schema | Id | File |
+|--------|----|------|
+| Service | `@ossy/booking/schema/service` | `service.schema.js` |
+| Booking | `@ossy/booking/schema/booking` | `booking.schema.js` |
+| Availability | `@ossy/booking/schema/availability` | `availability.schema.js` |
+| Public booking form | `@ossy/booking/schema/public-booking-form` | `public-booking-form.schema.js` |
 
-## Resource templates
+Documents are stored under canonical locations. Import paths from `@ossy/booking` (`services`, `bookings`, `availability`).
 
-- `@ossy/booking/service` — what a consultant sells (`/@ossy/booking/services/`)
-- `@ossy/booking/booking` — an appointment (`/@ossy/booking/bookings/`)
-- `@ossy/booking/availability` — weekly availability config (`/@ossy/booking/availability/`)
+Tasks write resources via `commitResource` / `mutateResource` from `@ossy/resources/server`, using `schemaId` on resource events (ADR 0008).
 
-Import locations from `@ossy/booking` (`services`, `bookings`, `availability`).
+## Projections
 
-## Resource view slots
+| Projection | Id | Purpose |
+|------------|----|---------|
+| `BookingListProjection` | `@ossy/booking/data/booking-list` | Workspace-scoped booking list; `@ossy/booking/actions/list` reads this first and falls back to a resource scan |
+
+## View slots
 
 | Component | Slot key |
 |-----------|----------|
-| `service-detail.component.jsx` | `resource:booking/service/detail` |
-| `service-card-slot.component.jsx` | `resource:booking/service/card` |
-| `booking-card.component.jsx` | `resource:booking/booking/card` |
+| `service-detail.component.jsx` | `@ossy/booking/view/service` |
+| `service-card-slot.component.jsx` | `@ossy/booking/view/service/card` |
+| `booking-card.component.jsx` | `@ossy/booking/view/booking/card` |
 
 See [SPEC.md](./SPEC.md) for the full product specification.
+
+## Preview
+
+Booking pages and flows are exercised in **`@ossy/app-test`** on the production build path. Enable the package in `devEntitlements`, then open Booking from the sidebar or `/packages/booking`. See [`packages/app-test/README.md`](../app-test/README.md).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/booking",
-  "description": "Booking feature package — services, availability, and appointment management for Ossy consultants",
-  "version": "1.16.2",
+  "description": "Booking feature package — services, availability, and appointment management for Ossy providers",
+  "version": "3.0.1",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -14,13 +14,16 @@
     "src": "./src"
   },
   "dependencies": {
-    "@ossy/email": "^1.6.2",
-    "@ossy/event-store": "^1.8.2",
-    "@ossy/observability": "^1.8.2",
-    "@ossy/platform": "^1.39.2",
-    "@ossy/resources": "^1.12.2"
+    "@ossy/email": "^3.0.1",
+    "@ossy/event-store": "^3.0.1",
+    "@ossy/observability": "^3.0.1",
+    "@ossy/platform": "^3.0.1",
+    "@ossy/resources": "^3.0.1",
+    "@ossy/users": "^3.0.1",
+    "@ossy/workspaces": "^3.0.1"
   },
   "peerDependencies": {
+    "@ossy/app": ">=1.0.0",
     "@ossy/design-system": ">=1.0.0",
     "@ossy/router-react": ">=1.0.0",
     "@ossy/sdk-react": ">=1.0.0",
@@ -34,5 +37,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "2b8745d57fee8b6c08787e2755b4df489291a5cd"
+  "gitHead": "4a70ec216448680d2fddc57b2a8a0077489720ae"
 }

package/src/AvailabilityEditor.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useMemo } from 'react'
 import { View, Text, Button, Input, useLocale } from '@ossy/design-system'
 
-const DEFAULT_WINDOW = { enabled: false, startTime: '09:00', endTime: '17:00', bufferMinutes: 0 }
+const DEFAULT_WINDOW = { enabled: false, startTime: '09:00', endTime: '17:00' }
 
 const buildInitialState = (availability = []) => {
   const state = Array.from({ length: 7 }, () => ({ ...DEFAULT_WINDOW }))
@@ -11,7 +11,6 @@ const buildInitialState = (availability = []) => {
         enabled: true,
         startTime: window.startTime ?? '09:00',
         endTime: window.endTime ?? '17:00',
-        bufferMinutes: window.bufferMinutes ?? 0,
       }
     }
   }
@@ -39,11 +38,10 @@ export const AvailabilityEditor = ({ availability = [], onSave }) => {
     const windows = days
       .map((d, idx) => ({ dayOfWeek: idx, ...d }))
       .filter((d) => d.enabled)
-      .map(({ dayOfWeek, startTime, endTime, bufferMinutes }) => ({
+      .map(({ dayOfWeek, startTime, endTime }) => ({
         dayOfWeek,
         startTime,
         endTime,
-        bufferMinutes: Number(bufferMinutes),
       }))
 
     onSave?.(windows)
@@ -87,15 +85,6 @@ export const AvailabilityEditor = ({ availability = [], onSave }) => {
                   onChange={(v) => update(idx, { endTime: v })}
                   size="s"
                 />
-                <Text color="secondary" size="s">{t('booking.availabilityEditor.buffer')}</Text>
-                <Input
-                  type="number"
-                  value={String(days[idx].bufferMinutes)}
-                  onChange={(v) => update(idx, { bufferMinutes: v })}
-                  size="s"
-                  style={{ width: '4rem' }}
-                />
-                <Text color="secondary" size="s">{t('booking.availabilityEditor.min')}</Text>
               </View>
             ) : (
               <Text color="secondary" size="s">{t('booking.availabilityEditor.unavailable')}</Text>

package/src/BookingList.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { View, Title, Text, Badge } from '@ossy/design-system'
+import { View, Text, Badge } from '@ossy/design-system'
 
 const STATUS_VARIANT = {
   pending: 'warning',

package/src/BookingProductHome.jsx

@@ -0,0 +1,38 @@
+import React from 'react'
+import { useRouter } from '@ossy/router-react'
+import { Text, View, Button, Page, useLocale } from '@ossy/design-system'
+import { metadata as OpenAvailabilitySetup } from './open-availability-setup.action.js'
+import { metadata as OpenServices } from './open-services.action.js'
+import { metadata as OpenBookings } from './open-bookings.action.js'
+
+export default function BookingProductHome () {
+  const { t } = useLocale()
+  const router = useRouter()
+
+  return (
+    <Page maxWidth="xl" gap="l" data-booking-status="on">
+      <View gap="m">
+        <Text as="h1" variant="heading-primary" text="booking.product.title" />
+        <Text style={{ maxWidth: '600px' }} text="booking.product.description" />
+      </View>
+
+      <View gap="m" layout="row-wrap">
+        <Button
+          {...OpenAvailabilitySetup}
+          variant="cta"
+          href={router.getHref({ id: 'booking/availability-setup' })}
+        />
+        <Button
+          {...OpenServices}
+          variant="primary"
+          href={router.getHref({ id: 'booking/services' })}
+        />
+        <Button
+          {...OpenBookings}
+          variant="secondary"
+          href={router.getHref({ id: 'booking/bookings' })}
+        />
+      </View>
+    </Page>
+  )
+}

package/src/BookingSalesPage.jsx

@@ -0,0 +1,55 @@
+import React, { useState, useCallback } from 'react'
+import { GetWorkspace, EnableService } from '@ossy/workspaces'
+import { useSdk, cacheKey } from '@ossy/sdk-react'
+import { Text, View, Button, Page, useLocale } from '@ossy/design-system'
+import SalesSection from './SalesSection.jsx'
+import { useBookingHomeContent } from './booking-home-content.js'
+
+export default function BookingSalesPage ({ isAuthenticated }) {
+  const { t } = useLocale()
+  const { invoke, invalidate } = useSdk()
+  const [error, setError] = useState(null)
+  const { cover: baseCover, features } = useBookingHomeContent()
+
+  const handleEnable = useCallback(() => {
+    setError(null)
+    invoke(EnableService, { service: '@ossy/booking' })
+      .then(() => invalidate(cacheKey(GetWorkspace)))
+      .catch(() => setError(t('booking.sales.enableError')))
+  }, [invoke, invalidate, t])
+
+  const enableAction = {
+    ...EnableService,
+    'data-service': '@ossy/booking',
+    variant: 'cta',
+    label: 'booking.sales.enable',
+    onClick: handleEnable,
+  }
+
+  const cover = isAuthenticated
+    ? {
+        ...baseCover,
+        actions: [
+          enableAction,
+          baseCover.actions[1],
+        ],
+      }
+    : baseCover
+
+  return (
+    <View data-booking-status="off">
+      <SalesSection cover={cover} features={features} />
+
+      {isAuthenticated && (
+        <Page maxWidth="xl" gap="l">
+          <View gap="m" inset="l">
+            <Text variant="heading-secondary" as="h2" text="booking.sales.enable" />
+            <Text style={{ maxWidth: '600px' }} text="booking.sales.enableDescription" />
+            <Button {...enableAction} variant="cta" />
+            {error && <Text variant="small">{error}</Text>}
+          </View>
+        </Page>
+      )}
+    </View>
+  )
+}

package/src/Definition.js

@@ -1,7 +1,7 @@
 export const Definition = {
   id: 'booking',
   title: 'Booking',
-  description: 'Services, availability windows, and client appointment management for consultants.',
+  description: 'Services, availability windows, and client appointment management for service providers.',
   icon: 'calendar',
-  statuses: ['beta'],
+  status: ['beta'],
 }

package/src/HeroCover.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Title, Button, View, PageSection } from '@ossy/design-system'
+import { Button, View, PageSection, Text } from '@ossy/design-system'
 
 const Cover = ({
   title,
@@ -19,13 +19,13 @@ const Cover = ({
     }}
   >
     <View gap="m" alignItems="center">
-      <Title as="h1" variant="display" style={{ maxWidth: titleMaxWidth, textWrap: 'balance' }}>
+      <Text as="h1" variant="display" style={{ maxWidth: titleMaxWidth, textWrap: 'balance' }}>
         {title}
-      </Title>
+      </Text>
 
-      <Title as="h2" variant="title-tertiary" style={{ maxWidth: '800px' }}>
+      <Text as="h2" variant="heading-tertiary" style={{ maxWidth: '800px' }}>
         {text}
-      </Title>
+      </Text>
     </View>
 
     <View gap="m" layout="row" justifyContent="center" style={{ flexWrap: 'wrap' }}>

package/src/SalesSection.jsx

@@ -1,13 +1,5 @@
 import React from 'react'
-import {
-  Title,
-  Text,
-  View,
-  Icon,
-  PageSection,
-  MarkdownViewer,
-  useLocale,
-} from '@ossy/design-system'
+import { Text, View, Icon, PageSection, MarkdownViewer, useLocale } from '@ossy/design-system'
 import { HeroCover } from './HeroCover.jsx'
 
 export default ({
@@ -22,9 +14,9 @@ export default ({
       <HeroCover {...cover} />
 
       <View gap="m" inset="s">
-        <Title variant="secondary">
+        <Text variant="heading-secondary" as="h2">
           {t('booking.sales.overview')}
-        </Title>
+        </Text>
 
         <View gap="m" layout="row-wrap">
           {features.map(x => (
@@ -50,9 +42,9 @@ export default ({
       </View>
 
       <View gap="m" inset="s">
-        <Title variant="secondary">
+        <Text variant="heading-secondary" as="h2">
           {t('booking.sales.features')}
-        </Title>
+        </Text>
 
         {features.map(x => (
           <View key={x.title} roundness="m" gap="m" inset="l" style={{ border: '1px solid var(--separator)' }}>
@@ -60,9 +52,9 @@ export default ({
               <View justifyContent="center" alignItems="center">
                 <Icon name={x.icon} size="m" />
               </View>
-              <Title variant="tertiary">
+              <Text variant="heading-tertiary" as="h3">
                 {x.title}
-              </Title>
+              </Text>
             </View>
 
             <Text>{x.text}</Text>

package/src/ServiceCard.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { View, Title, Text, Badge } from '@ossy/design-system'
+import { View, Text, Badge } from '@ossy/design-system'
 
 const formatPrice = (cents, currency) => {
   if (cents === 0) return 'Free'
@@ -25,7 +25,7 @@ export const ServiceCard = ({ name, duration, price, currency = 'SEK', descripti
   >
     <View gap="xs" style={{ flex: 1 }}>
       <View layout="row" gap="s" alignItems="center">
-        <Title variant="secondary">{name}</Title>
+        <Text variant="heading-secondary" as="h2">{name}</Text>
         {!active && <Badge label="Inactive" variant="neutral" size="s" />}
       </View>
       {description && <Text size="s" color="secondary">{description}</Text>}

package/src/availability-action-maps.js

@@ -0,0 +1,39 @@
+import { metadata as ToggleAvailabilityDay0 } from './toggle-availability-day-0.action.js'
+import { metadata as ToggleAvailabilityDay1 } from './toggle-availability-day-1.action.js'
+import { metadata as ToggleAvailabilityDay2 } from './toggle-availability-day-2.action.js'
+import { metadata as ToggleAvailabilityDay3 } from './toggle-availability-day-3.action.js'
+import { metadata as ToggleAvailabilityDay4 } from './toggle-availability-day-4.action.js'
+import { metadata as ToggleAvailabilityDay5 } from './toggle-availability-day-5.action.js'
+import { metadata as ToggleAvailabilityDay6 } from './toggle-availability-day-6.action.js'
+import { metadata as SelectDuration30 } from './select-duration-30.action.js'
+import { metadata as SelectDuration60 } from './select-duration-60.action.js'
+import { metadata as SelectDuration90 } from './select-duration-90.action.js'
+
+export {
+  ToggleAvailabilityDay0,
+  ToggleAvailabilityDay1,
+  ToggleAvailabilityDay2,
+  ToggleAvailabilityDay3,
+  ToggleAvailabilityDay4,
+  ToggleAvailabilityDay5,
+  ToggleAvailabilityDay6,
+  SelectDuration30,
+  SelectDuration60,
+  SelectDuration90,
+}
+
+export const TOGGLE_AVAILABILITY_DAY = {
+  0: ToggleAvailabilityDay0,
+  1: ToggleAvailabilityDay1,
+  2: ToggleAvailabilityDay2,
+  3: ToggleAvailabilityDay3,
+  4: ToggleAvailabilityDay4,
+  5: ToggleAvailabilityDay5,
+  6: ToggleAvailabilityDay6,
+}
+
+export const SELECT_DURATION = {
+  30: SelectDuration30,
+  60: SelectDuration60,
+  90: SelectDuration90,
+}

package/src/availability-engine.js

@@ -1,3 +1,5 @@
+import { toMs } from './time.js'
+
 /**
  * Returns the local date string "YYYY-MM-DD" for a UTC date in the given timezone.
  */
@@ -42,7 +44,7 @@ function addDays(date, days) {
 }
 
 /**
- * Computes available booking slots for a consultant.
+ * Computes available booking slots for a provider.
  *
  * @param {object} params
  * @param {object} params.availability
@@ -51,11 +53,11 @@ function addDays(date, days) {
  *   - bufferMinutes:    Buffer added after each confirmed booking (default 0)
  *   - blackoutDates:    Array of "YYYY-MM-DD" strings to exclude
  *   - timezone:         IANA timezone string (e.g. "Europe/Stockholm")
- * @param {Array} params.bookings   Existing bookings [{ startAt, endAt, status }]
- * @param {Date|string} params.fromDate  Start of range (inclusive)
- * @param {Date|string} params.toDate    End of range (inclusive)
+ * @param {Array} params.bookings   Existing bookings [{ startAt, endAt, status }] — ms or legacy ISO
+ * @param {Date|string|number} params.fromDate  Start of range (inclusive)
+ * @param {Date|string|number} params.toDate    End of range (inclusive)
  * @param {number} params.duration       Slot duration in minutes
- * @returns {Array<{ startAt: string, endAt: string, duration: number }>}
+ * @returns {Array<{ startAt: number, endAt: number, duration: number }>}
  */
 export function getAvailableSlots({ availability, bookings = [], fromDate, toDate, duration }) {
   const {
@@ -65,7 +67,7 @@ export function getAvailableSlots({ availability, bookings = [], fromDate, toDat
     timezone = 'UTC',
   } = availability
 
-  const now = new Date()
+  const now = Date.now()
   const from = new Date(fromDate)
   const to = new Date(toDate)
 
@@ -91,20 +93,22 @@ export function getAvailableSlots({ availability, bookings = [], fromDate, toDat
     let slotStart = new Date(windowStart)
 
     while (slotStart.getTime() + slotMs <= windowEnd.getTime()) {
-      const slotEnd = new Date(slotStart.getTime() + slotMs)
+      const slotEndMs = slotStart.getTime() + slotMs
 
-      if (slotEnd > now) {
+      if (slotEndMs > now) {
         const hasOverlap = bookings.some(booking => {
           if (booking.status === 'cancelled') return false
-          const bStart = new Date(booking.startAt)
-          const bEnd = new Date(new Date(booking.endAt).getTime() + bufferMinutes * 60 * 1000)
-          return slotStart < bEnd && slotEnd > bStart
+          const bStart = toMs(booking.startAt)
+          const bEnd = toMs(booking.endAt)
+          if (bStart == null || bEnd == null) return false
+          const bufferedEnd = bEnd + bufferMinutes * 60 * 1000
+          return slotStart.getTime() < bufferedEnd && slotEndMs > bStart
         })
 
         if (!hasOverlap) {
           slots.push({
-            startAt: slotStart.toISOString(),
-            endAt: slotEnd.toISOString(),
+            startAt: slotStart.getTime(),
+            endAt: slotEndMs,
             duration,
           })
         }
@@ -114,5 +118,5 @@ export function getAvailableSlots({ availability, bookings = [], fromDate, toDat
     }
   }
 
-  return slots.sort((a, b) => (a.startAt > b.startAt ? 1 : -1))
+  return slots.sort((a, b) => a.startAt - b.startAt)
 }

package/src/availability-engine.spec.js

@@ -1,17 +1,17 @@
+import { describe, it, expect, beforeAll, afterAll, jest } from '@jest/globals'
 import { getAvailableSlots } from './availability-engine.js'
 
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
 
-/** Build a UTC ISO string for a given date at HH:MM in Europe/Stockholm. */
+/** Build Unix ms for a given date at HH:MM in Europe/Stockholm. */
 function sthlm(dateStr, timeStr) {
-  // Use the same localToUTC logic duplicated here to keep tests self-contained
   const naive = new Date(`${dateStr}T${timeStr}:00Z`)
   const utcDate = new Date(naive.toLocaleString('en-US', { timeZone: 'UTC' }))
   const tzDate = new Date(naive.toLocaleString('en-US', { timeZone: 'Europe/Stockholm' }))
   const offsetMs = utcDate - tzDate
-  return new Date(naive.getTime() + offsetMs).toISOString()
+  return new Date(naive.getTime() + offsetMs).getTime()
 }
 
 const TZ = 'Europe/Stockholm'
@@ -34,6 +34,14 @@ const BASE_AVAILABILITY = {
 // ---------------------------------------------------------------------------
 
 describe('getAvailableSlots', () => {
+  beforeAll(() => {
+    jest.useFakeTimers()
+    jest.setSystemTime(new Date('2024-06-01T12:00:00Z'))
+  })
+
+  afterAll(() => {
+    jest.useRealTimers()
+  })
 
   describe('basic slot generation', () => {
     it('returns slots at correct interval within the window', () => {
@@ -130,7 +138,7 @@ describe('getAvailableSlots', () => {
         toDate: new Date(`${MON2}T23:59:59Z`),
         duration: 60,
       })
-      expect(slots.every(s => !s.startAt.startsWith(MON))).toBe(true)
+      expect(slots.every(s => s.startAt !== sthlm(MON, '09:00'))).toBe(true)
       expect(slots.length).toBeGreaterThan(0)
     })
   })
@@ -160,6 +168,30 @@ describe('getAvailableSlots', () => {
       expect(slots[0].startAt).toBe(sthlm(MON, '10:00'))
     })
 
+    it('accepts legacy ISO booking times', () => {
+      const from = new Date(`${MON}T00:00:00Z`)
+      const to = new Date(`${MON}T23:59:59Z`)
+
+      const bookings = [
+        {
+          startAt: new Date(sthlm(MON, '09:00')).toISOString(),
+          endAt: new Date(sthlm(MON, '10:00')).toISOString(),
+          status: 'confirmed',
+        },
+      ]
+
+      const slots = getAvailableSlots({
+        availability: BASE_AVAILABILITY,
+        bookings,
+        fromDate: from,
+        toDate: to,
+        duration: 60,
+      })
+
+      expect(slots).toHaveLength(2)
+      expect(slots[0].startAt).toBe(sthlm(MON, '10:00'))
+    })
+
     it('does NOT remove a slot blocked by a cancelled booking', () => {
       const from = new Date(`${MON}T00:00:00Z`)
       const to = new Date(`${MON}T23:59:59Z`)