@ossy/booking 1.16.2 → 1.16.3

package/src/moduleStatus.js

@@ -1,2 +1,30 @@
-export const moduleStatusTags = (definition) =>
-  (definition.statuses ?? []).map((status) => ({ label: status }))
+export const MODULE_STATUS = {
+  beta: 'beta',
+  comingSoon: 'coming-soon',
+  stable: 'stable',
+  hidden: 'hidden',
+}
+
+const STATUS_TO_TAG_LABEL = {
+  [MODULE_STATUS.beta]: 'Beta',
+  [MODULE_STATUS.comingSoon]: 'Coming Soon',
+  [MODULE_STATUS.stable]: null,
+  [MODULE_STATUS.hidden]: null,
+}
+
+export function moduleStatuses(definition) {
+  const fromArray = Array.isArray(definition?.statuses) ? definition.statuses : []
+  const fromLegacy = definition?.status && typeof definition.status === 'string' ? [definition.status] : []
+  if (fromArray.length) return [...new Set(fromArray)]
+  if (fromLegacy.length) return [...new Set(fromLegacy)]
+  return []
+}
+
+export function moduleStatusTags(definition) {
+  const labels = []
+  for (const s of moduleStatuses(definition)) {
+    const label = STATUS_TO_TAG_LABEL[s]
+    if (label) labels.push(label)
+  }
+  return [...new Set(labels)]
+}

package/src/open-availability-setup.action.js

@@ -0,0 +1,5 @@
+export const metadata = {
+  id: '@ossy/booking/actions/open-availability-setup',
+  access: 'workspace',
+  label: '@ossy/booking/actions/open-availability-setup.label',
+}

package/src/open-bookings.action.js

@@ -0,0 +1,5 @@
+export const metadata = {
+  id: '@ossy/booking/actions/open-bookings',
+  access: 'workspace',
+  label: '@ossy/booking/actions/open-bookings.label',
+}

package/src/open-create-service.action.js

@@ -0,0 +1,5 @@
+export const metadata = {
+  id: '@ossy/booking/actions/open-create-service',
+  access: 'workspace',
+  label: '@ossy/booking/actions/open-create-service.label',
+}

package/src/open-services.action.js

@@ -0,0 +1,5 @@
+export const metadata = {
+  id: '@ossy/booking/actions/open-services',
+  access: 'workspace',
+  label: '@ossy/booking/actions/open-services.label',
+}

package/src/provider-availability.flow.js

@@ -0,0 +1,39 @@
+import providerOnboard from './provider-onboard.flow.js'
+import { metadata as SaveAvailability } from './save-availability.action.js'
+import { metadata as OpenAvailabilitySetup } from './open-availability-setup.action.js'
+import {
+  ToggleAvailabilityDay1,
+  ToggleAvailabilityDay2,
+  ToggleAvailabilityDay3,
+  ToggleAvailabilityDay4,
+  ToggleAvailabilityDay5,
+  SelectDuration60,
+} from './availability-action-maps.js'
+
+export const metadata = {
+  id: '@ossy/booking/flows/provider-availability',
+  feature: 'booking',
+  requires: ['server', 'database'],
+}
+
+/**
+ * Provider signs up, enables booking, and configures weekly availability.
+ */
+export default {
+  title: 'Set up availability',
+  description:
+    'New service provider registers, verifies email, enables booking, and saves weekly availability',
+  steps: [
+    ...providerOnboard.steps,
+    { action: OpenAvailabilitySetup },
+    { result: { action: SaveAvailability, timeout: 10000 } },
+    { action: ToggleAvailabilityDay1 },
+    { action: ToggleAvailabilityDay2 },
+    { action: ToggleAvailabilityDay3 },
+    { action: ToggleAvailabilityDay4 },
+    { action: ToggleAvailabilityDay5 },
+    { action: SelectDuration60 },
+    { action: SaveAvailability },
+    { result: { selector: '[data-availability-status="saved"]', timeout: 10000 } },
+  ],
+}

package/src/provider-fields.js

@@ -0,0 +1,34 @@
+/** Read provider/workspace fields; accept legacy consultant* names during transition. */
+
+export function workspaceIdFromPayload (payload) {
+  return payload?.workspaceId ?? payload?.providerId ?? payload?.consultantId
+}
+
+export function workspaceIdFromContent (content) {
+  return content?.workspaceId ?? content?.providerId ?? content?.consultantId
+}
+
+/** @deprecated Prefer workspaceIdFromPayload — providerId is the legacy alias for workspaceId. */
+export function resolveProviderId (payload) {
+  return workspaceIdFromPayload(payload)
+}
+
+export function resolveProviderSlug (payload, routerParams) {
+  return payload?.providerSlug
+    ?? payload?.consultantSlug
+    ?? routerParams?.providerSlug
+    ?? routerParams?.consultantSlug
+}
+
+export function resolveProviderEmail (payload) {
+  return payload?.providerEmail ?? payload?.consultantEmail
+}
+
+export function resolveProviderName (payload) {
+  return payload?.providerName ?? payload?.consultantName
+}
+
+/** @deprecated Prefer workspaceIdFromContent. */
+export function providerIdFromContent (content) {
+  return workspaceIdFromContent(content)
+}

package/src/provider-onboard.flow.js

@@ -0,0 +1,25 @@
+import signUpFlow from '@ossy/authentication/sign-up.flow.js'
+import { EnableService } from '@ossy/workspaces'
+
+export const metadata = {
+  id: '@ossy/booking/flows/provider-onboard',
+  feature: 'booking',
+  requires: ['server', 'database'],
+}
+
+/**
+ * Step 1 — provider signs up and enables the booking capability for their workspace.
+ *
+ * Next flows (catalog setup, client booking, confirm) will compose after this.
+ */
+export default {
+  title: 'Enable booking',
+  description: 'New service provider registers, verifies email, and activates booking from the booking home sales page',
+  steps: [
+    ...signUpFlow.steps,
+    { page: '@booking/home' },
+    { result: { action: { ...EnableService, service: '@ossy/booking' }, timeout: 10000 } },
+    { action: { ...EnableService, service: '@ossy/booking' } },
+    { result: { selector: '[data-booking-status="on"]', timeout: 10000 } },
+  ],
+}

package/src/public-booking-form.form.js

@@ -0,0 +1,7 @@
+import { BookingSchema } from './schema-ids.js'
+
+export const metadata = {
+  id: '@ossy/booking/form/public-booking',
+  schemaId: BookingSchema.publicBookingForm,
+  label: '@ossy/booking/form/public-booking.label',
+}

package/src/public-booking-form.schema.js

@@ -0,0 +1,12 @@
+/** Public booking client-details form — UI fields and flow faker schema. */
+export default {
+  id: '@ossy/booking/schema/public-booking-form',
+  name: 'Public booking',
+  icon: 'calendar-check',
+  fields: [
+    { name: 'clientName', type: 'text', required: true },
+    { name: 'clientEmail', type: 'email', required: true },
+    { name: 'clientMessage', type: 'textarea' },
+    { name: 'attachments', type: 'file', max: 5, accept: 'image/*,.pdf' },
+  ],
+}

package/src/public-booking.page.jsx

@@ -1,8 +1,11 @@
-import React, { useState, useEffect, useMemo } from 'react'
+import React, { useState, useEffect } from 'react'
 import { useRouter } from '@ossy/router-react'
-import { View, Title, Text, Button, Input, Textarea, Alert, useLocale } from '@ossy/design-system'
+import { View, Text, Button, Alert, Form, FieldFactory, FormStatus, useLocale } from '@ossy/design-system'
 import { useSdk } from '@ossy/sdk-react'
+import { useDocumentValidator } from '@ossy/resources'
 import { metadata as CreateBooking } from './create-booking.action.js'
+import { metadata as PublicBookingForm } from './public-booking-form.form.js'
+import publicBookingTemplate from './public-booking-form.schema.js'
 import { metadata as GetServices } from './get-services.action.js'
 import { metadata as GetAvailableSlots } from './get-available-slots.action.js'
 import { invokeErrorMessage } from './invoke-error-message.js'
@@ -81,7 +84,7 @@ function MonthCalendar ({ year, month, slotsGrouped, selectedDate, onSelectDate,
           const isPast = dateKey < todayKey
           const disabled = !hasSlots || isPast
           return (
-            <Button key={dateKey} variant={isSelected ? 'tab-active' : hasSlots && !isPast ? 'tab' : 'neutral'} disabled={disabled}
+            <Button key={dateKey} data-action="public-booking/pick-date" variant={isSelected ? 'tag-active' : hasSlots && !isPast ? 'tag' : 'neutral'} disabled={disabled}
               onClick={() => !disabled && onSelectDate(dateKey)} style={{ padding: '8px 4px', minWidth: 0 }}>{day}</Button>
           )
         })}
@@ -91,11 +94,11 @@ function MonthCalendar ({ year, month, slotsGrouped, selectedDate, onSelectDate,
 }
 
 function SlotPicker ({ slots, selectedSlot, onSelectSlot, t, language }) {
-  if (!slots?.length) return <Text color="secondary">{t('publicBooking.noSlots')}</Text>
+  if (!slots?.length) return <Text color="secondary" text="publicBooking.noSlots" />
   return (
     <View layout="row" gap="s" style={{ flexWrap: 'wrap' }}>
       {slots.map(slot => (
-        <Button key={slot.startAt} variant={selectedSlot?.startAt === slot.startAt ? 'tab-active' : 'tab'} onClick={() => onSelectSlot(slot)}>
+        <Button key={slot.startAt} data-action="public-booking/pick-slot" variant={selectedSlot?.startAt === slot.startAt ? 'tag-active' : 'tag'} onClick={() => onSelectSlot(slot)}>
           {formatSlotRange(slot.startAt, slot.duration, language)}
         </Button>
       ))}
@@ -103,59 +106,54 @@ function SlotPicker ({ slots, selectedSlot, onSelectSlot, t, language }) {
   )
 }
 
-function BookingForm ({ slot, service, consultantSlug, onSuccess, t }) {
-  const sdk = useSdk();
-  const [clientName, setClientName] = useState('')
-  const [clientEmail, setClientEmail] = useState('')
-  const [clientMessage, setClientMessage] = useState('')
+function BookingForm ({ slot, service, providerSlug, providerContact, onSuccess, t }) {
+  const sdk = useSdk()
   const [submitting, setSubmitting] = useState(false)
   const [error, setError] = useState(null)
+  const validate = useDocumentValidator(publicBookingTemplate)
 
-  const handleSubmit = async (e) => {
-    e.preventDefault()
-    if (!clientName.trim() || !clientEmail.trim()) return
+  const handleSubmit = async (data) => {
     setSubmitting(true); setError(null)
     try {
       await sdk.invoke(CreateBooking, {
-        consultantId: consultantSlug,
+        providerSlug,
+        workspaceId: providerContact?.workspaceId,
+        providerEmail: providerContact?.providerEmail,
+        providerName: providerContact?.providerName,
         startAt: slot.startAt,
         duration: slot.duration,
         serviceId: service?.id,
-        clientName: clientName.trim(),
-        clientEmail: clientEmail.trim(),
-        clientMessage: clientMessage.trim(),
+        clientName: String(data.clientName ?? '').trim(),
+        clientEmail: String(data.clientEmail ?? '').trim(),
+        clientMessage: String(data.clientMessage ?? '').trim(),
+        attachments: Array.isArray(data.attachments) ? data.attachments : undefined,
       })
       onSuccess()
     } catch (err) { setError(await invokeErrorMessage(err, t('publicBooking.form.error', { status: '' }))) } finally { setSubmitting(false) }
   }
 
   return (
-    <form onSubmit={handleSubmit}>
-      <View gap="m">
-        <View gap="xs">
-          <Text weight="medium">{t('publicBooking.form.name')}</Text>
-          <Input type="text" required value={clientName} onChange={e => setClientName(e.target.value)} placeholder={t('publicBooking.form.namePlaceholder')} />
-        </View>
-        <View gap="xs">
-          <Text weight="medium">{t('publicBooking.form.email')}</Text>
-          <Input type="email" required value={clientEmail} onChange={e => setClientEmail(e.target.value)} placeholder={t('publicBooking.form.emailPlaceholder')} />
-        </View>
-        <View gap="xs">
-          <Text weight="medium">{t('publicBooking.form.message')}</Text>
-          <Textarea value={clientMessage} onChange={e => setClientMessage(e.target.value)} placeholder={t('publicBooking.form.messagePlaceholder')} rows={3} />
-        </View>
-        {error && <Alert variant="danger">{error}</Alert>}
-        <Button data-action={CreateBooking.id} type="submit" variant="primary" disabled={submitting}>{submitting ? t('publicBooking.form.submitting') : t('publicBooking.form.submit')}</Button>
-      </View>
-    </form>
+    <Form
+      id={PublicBookingForm.id}
+      schemaId={PublicBookingForm.schemaId}
+      fields={publicBookingTemplate.fields}
+      defaultData={{}}
+      onSubmit={handleSubmit}
+      validate={validate}
+      status={submitting ? [FormStatus.Submitting] : []}
+    >
+      <FieldFactory />
+      {error && <Alert variant="danger">{error}</Alert>}
+      <Button data-action={CreateBooking.id} type="submit" variant="primary" disabled={submitting}>{submitting ? t('publicBooking.form.submitting') : t('publicBooking.form.submit')}</Button>
+    </Form>
   )
 }
 
 function PendingScreen ({ slot, t, language }) {
   return (
     <View gap="m" alignItems="center" style={{ textAlign: 'center' }}>
-      <Title variant="secondary">{t('publicBooking.pending.title')}</Title>
-      <Text color="secondary">{t('publicBooking.pending.body')}</Text>
+      <Text variant="heading-secondary" as="h2" text="publicBooking.pending.title" />
+      <Text color="secondary" text="publicBooking.pending.body" />
       <Alert variant="warning" title={t('publicBooking.pending.requestedTime')}>
         <Text>{formatDate(slot.startAt, t, language)}</Text>
         <Text color="secondary">{t('publicBooking.pending.duration', { minutes: slot.duration })}</Text>
@@ -167,12 +165,12 @@ function PendingScreen ({ slot, t, language }) {
 export const metadata = {
   id: 'public-booking',
   public: true,
-  path: { sv: '/boka/:consultantSlug', en: '/book/:consultantSlug' },
+  path: { sv: '/boka/:providerSlug', en: '/book/:providerSlug' },
 }
 
 function ServicePicker ({ services, selectedService, onSelect, t, language }) {
   if (!services?.length) {
-    return <Text color="secondary">{t('publicBooking.noServices')}</Text>
+    return <Text color="secondary" text="publicBooking.noServices" />
   }
   const formatPrice = (cents, currency) => {
     if (!cents) return t('publicBooking.serviceFree')
@@ -183,7 +181,8 @@ function ServicePicker ({ services, selectedService, onSelect, t, language }) {
       {services.map(service => (
         <Button
           key={service.id}
-          variant={selectedService?.id === service.id ? 'tab-active' : 'tab'}
+          data-action="public-booking/pick-service"
+          variant={selectedService?.id === service.id ? 'tag-active' : 'tag'}
           onClick={() => onSelect(service)}
           style={{ justifyContent: 'flex-start', textAlign: 'left' }}
         >
@@ -199,13 +198,14 @@ function ServicePicker ({ services, selectedService, onSelect, t, language }) {
   )
 }
 
-export default function PublicBookingPage ({ consultantSlug }) {
+export default function PublicBookingPage ({ providerSlug }) {
   const { t, language } = useLocale()
   const sdk = useSdk()
   const router = useRouter()
-  const slug = consultantSlug ?? router?.params?.consultantSlug
+  const slug = providerSlug ?? router?.params?.providerSlug ?? router?.params?.consultantSlug
   const today = new Date()
   const [services, setServices] = useState([])
+  const [providerContact, setProviderContact] = useState(null)
   const [loadingServices, setLoadingServices] = useState(true)
   const [servicesError, setServicesError] = useState(null)
   const [selectedService, setSelectedService] = useState(null)
@@ -222,10 +222,12 @@ export default function PublicBookingPage ({ consultantSlug }) {
     if (!slug) return
     setLoadingServices(true)
     setServicesError(null)
-    sdk.invoke(GetServices, { consultantId: slug })
+    sdk.invoke(GetServices, { providerSlug: slug, includeContact: true })
       .then(data => {
-        const list = Array.isArray(data) ? data : []
+        const list = Array.isArray(data) ? data : (data?.services ?? [])
+        const contact = Array.isArray(data) ? null : data?.contact
         setServices(list)
+        setProviderContact(contact)
         if (list.length === 1) setSelectedService(list[0])
         setLoadingServices(false)
       })
@@ -238,7 +240,7 @@ export default function PublicBookingPage ({ consultantSlug }) {
     const from = new Date().toISOString()
     const to = new Date(Date.now() + 60 * 24 * 60 * 60 * 1000).toISOString()
     sdk.invoke(GetAvailableSlots, {
-      consultantId: slug,
+      providerSlug: slug,
       serviceId: selectedService.id,
       from,
       to,
@@ -254,8 +256,8 @@ export default function PublicBookingPage ({ consultantSlug }) {
     <View surface="base" layout="off-center-s" inset="s" style={{ minHeight: '100dvh' }}>
       <View inset="m" roundness="l" surface="primary" slot="content" gap="l" style={{ maxWidth: 720, width: '100%' }}>
         <View gap="xs" style={{ borderBottom: '1px solid var(--separator)', paddingBottom: 'var(--space-m)' }}>
-          <Title variant="secondary">{t('publicBooking.title')}</Title>
-          <Text color="secondary">{t('publicBooking.description')}</Text>
+          <Text variant="heading-secondary" as="h2" text="publicBooking.title" />
+          <Text color="secondary" text="publicBooking.description" />
         </View>
         {step === 'confirmed' && selectedSlot ? (
           <PendingScreen slot={selectedSlot} t={t} language={language} />
@@ -272,7 +274,7 @@ export default function PublicBookingPage ({ consultantSlug }) {
               <Text weight="medium">{t('publicBooking.selectedTime', { datetime: formatDate(selectedSlot.startAt, t, language) })}</Text>
               <Text color="secondary">{t('publicBooking.durationMin', { minutes: selectedSlot.duration })}</Text>
             </View>
-            <BookingForm slot={selectedSlot} service={selectedService} consultantSlug={slug} onSuccess={() => setStep('confirmed')} t={t} />
+            <BookingForm slot={selectedSlot} service={selectedService} providerSlug={slug} providerContact={providerContact} onSuccess={() => setStep('confirmed')} t={t} />
           </View>
         ) : step === 'pick-slot' && selectedService ? (
           <View gap="m">
@@ -284,7 +286,7 @@ export default function PublicBookingPage ({ consultantSlug }) {
             <View gap="l" layout="row" style={{ flexWrap: 'wrap' }}>
               <View style={{ flex: 1, minWidth: 260 }}>
                 {loadingSlots ? (
-                  <Text color="secondary" style={{ textAlign: 'center', padding: 'var(--space-l)' }}>{t('publicBooking.loadingSlots')}</Text>
+                  <Text color="secondary" style={{ textAlign: 'center', padding: 'var(--space-l)' }} text="publicBooking.loadingSlots" />
                 ) : slotsError ? (
                   <Alert variant="danger">{slotsError}</Alert>
                 ) : (
@@ -298,15 +300,15 @@ export default function PublicBookingPage ({ consultantSlug }) {
               <View gap="m" style={{ flex: 1, minWidth: 260 }}>
                 {selectedDate ? (
                   <>
-                    <Title variant="tertiary">
+                    <Text variant="heading-tertiary" as="h3">
                       {(() => { const [y, m, d] = selectedDate.split('-').map(Number); return `${d} ${t(MONTH_KEYS[m - 1])} ${y}` })()}
-                    </Title>
+                    </Text>
                     <SlotPicker slots={selectedDateSlots} selectedSlot={selectedSlot} onSelectSlot={setSelectedSlot} t={t} language={language} />
-                    {selectedSlot && <Button variant="primary" onClick={() => setStep('fill-form')}>{t('publicBooking.continue')}</Button>}
+                    {selectedSlot && <Button data-action="public-booking/continue" variant="primary" onClick={() => setStep('fill-form')}>{t('publicBooking.continue')}</Button>}
                   </>
                 ) : (
                   <View gap="s" alignItems="center" justifyContent="center" inset="l" style={{ minHeight: 180 }}>
-                    <Text color="secondary" style={{ textAlign: 'center' }}>{t('publicBooking.pickDate')}</Text>
+                    <Text color="secondary" style={{ textAlign: 'center' }} text="publicBooking.pickDate" />
                   </View>
                 )}
               </View>
@@ -314,9 +316,9 @@ export default function PublicBookingPage ({ consultantSlug }) {
           </View>
         ) : (
           <View gap="m">
-            <Title variant="tertiary">{t('publicBooking.chooseService')}</Title>
+            <Text variant="heading-tertiary" as="h3" text="publicBooking.chooseService" />
             {loadingServices ? (
-              <Text color="secondary">{t('publicBooking.loadingServices')}</Text>
+              <Text color="secondary" text="publicBooking.loadingServices" />
             ) : servicesError ? (
               <Alert variant="danger">{servicesError}</Alert>
             ) : (
@@ -329,7 +331,7 @@ export default function PublicBookingPage ({ consultantSlug }) {
               />
             )}
             {selectedService && (
-              <Button variant="primary" onClick={() => setStep('pick-slot')}>{t('publicBooking.continue')}</Button>
+              <Button data-action="public-booking/continue" variant="primary" onClick={() => setStep('pick-slot')}>{t('publicBooking.continue')}</Button>
             )}
           </View>
         )}

package/src/resolve-workspace-contact.js

@@ -0,0 +1,55 @@
+import { Aggregate } from '@ossy/event-store'
+import { Workspace } from '@ossy/workspaces/server'
+import { User } from '@ossy/users/server'
+import { resolveProviderSlug, workspaceIdFromPayload } from './provider-fields.js'
+
+/**
+ * Resolve tenancy id from payload. Public routes pass providerSlug (workspace slug alias);
+ * slug may equal workspace id until dedicated slug lookup exists.
+ */
+export async function resolveWorkspaceId (payload) {
+  const direct = workspaceIdFromPayload(payload)
+  if (direct) return direct
+
+  const slug = resolveProviderSlug(payload)
+  if (!slug) return null
+
+  try {
+    const workspace = await Aggregate.Of(Workspace, slug).then(Aggregate.View())
+    return workspace?.id ?? slug
+  } catch {
+    return slug
+  }
+}
+
+/** Workspace owner / booking contact for provider-facing emails. */
+export async function resolveWorkspaceContact (workspaceId) {
+  if (!workspaceId) return null
+
+  try {
+    const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
+    if (!workspace?.id) return null
+
+    const ownerId = workspace.createdBy ?? workspace.users?.[0]
+    if (!ownerId) {
+      return {
+        workspaceId: workspace.id,
+        providerName: workspace.name ?? null,
+        providerEmail: null,
+      }
+    }
+
+    const user = await Aggregate.Of(User, ownerId).then(Aggregate.View(User.UserForWorkspace))
+    const providerName = (workspace.name
+      ?? [user?.firstName, user?.lastName].filter(Boolean).join(' '))
+      || null
+
+    return {
+      workspaceId: workspace.id,
+      providerName,
+      providerEmail: user?.email ?? null,
+    }
+  } catch {
+    return null
+  }
+}

package/src/save-availability.action.js

@@ -1 +1,5 @@
-export const metadata = { id: 'booking/save-availability', access: 'workspace' }
+export const metadata = {
+  id: '@ossy/booking/actions/save-availability',
+  access: 'workspace',
+  label: 'booking.availabilitySetup.save',
+}

package/src/save-availability.task.js

@@ -1,12 +1,12 @@
 import { nanoid } from 'nanoid'
-import { Aggregate } from '@ossy/event-store'
-import { Resource, ResourcesEvents } from '@ossy/resources/server'
+import { ResourcesEvents, commitResource, mutateResource } from '@ossy/resources/server'
+import { BookingSchema } from './schema-ids.js'
 import { getBookingResources } from './booking-resources.js'
 import { availability } from './locations.js'
 
-export const metadata = { id: 'booking/save-availability' }
+export const metadata = { id: '@ossy/booking/tasks/save-availability' }
 
-export async function run({ payload, req, log }) {
+export async function run ({ payload, req, log }) {
   const workspaceId = req?.workspaceId
 
   if (!workspaceId) {
@@ -15,10 +15,14 @@ export async function run({ payload, req, log }) {
 
   const { weeklyWindows, sessionDurations, bufferMinutes, timezone } = payload ?? {}
 
-  log?.info(`[booking/save-availability] Saving availability for workspace ${workspaceId}`)
+  log?.info(`[booking/tasks/save-availability] Saving availability for workspace ${workspaceId}`)
 
   const content = {
-    weeklyWindows: weeklyWindows ?? [],
+    weeklyWindows: (weeklyWindows ?? []).map(({ dayOfWeek, startTime, endTime }) => ({
+      dayOfWeek,
+      startTime,
+      endTime,
+    })),
     sessionDurations: Array.isArray(sessionDurations) && sessionDurations.length
       ? sessionDurations
       : [60],
@@ -26,49 +30,43 @@ export async function run({ payload, req, log }) {
     timezone: timezone ?? 'Europe/Stockholm',
   }
 
-  // Check if a config resource already exists for this workspace
   const existing = await getBookingResources({
-    type: '@ossy/booking/availability',
+    schemaId: BookingSchema.availability,
     belongsTo: workspaceId,
   })
 
-  // Identify the single config resource (new format has weeklyWindows array in content)
   const configResource = existing.find(r => Array.isArray(r.content?.weeklyWindows))
 
   if (configResource) {
-    log?.info(`[booking/save-availability] Updating existing resource ${configResource.id}`)
-
-    await Aggregate.Of(Resource, configResource.id)
-      .then(
-        Aggregate.Add(
-          ResourcesEvents.ContentUpdated({
-            createdBy: req?.userId ?? 'system',
-            content,
-          }),
-        ),
-      )
-      .then(Aggregate.Save())
+    log?.info(`[booking/tasks/save-availability] Updating existing resource ${configResource.id}`)
+
+    await mutateResource(
+      configResource.id,
+      ResourcesEvents.Patched({
+        createdBy: req?.userId ?? 'system',
+        content,
+      }),
+    )
 
     return { id: configResource.id, content }
   }
 
-  // No config resource found — create a new one
   const resourceId = nanoid()
-  log?.info(`[booking/save-availability] Creating new resource ${resourceId}`)
+  log?.info(`[booking/tasks/save-availability] Creating new resource ${resourceId}`)
 
   const event = ResourcesEvents.Created({
-    aggregateId: resourceId,
-    type: '@ossy/booking/availability',
+    resourceId,
+    schemaId: BookingSchema.availability,
     createdBy: req?.userId ?? 'system',
     belongsTo: workspaceId,
     location: availability,
-    name: `availability-config.json`,
+    name: 'availability-config.json',
     content,
   })
 
-  await Aggregate.Of(Resource, event).then(Aggregate.View())
+  await commitResource(event)
 
-  log?.info(`[booking/save-availability] Resource ${resourceId} created`)
+  log?.info(`[booking/tasks/save-availability] Resource ${resourceId} created`)
 
   return { id: resourceId, content }
 }

package/src/schema-ids.js

@@ -0,0 +1,7 @@
+/** Canonical schema ids for @ossy/booking (ADR 0006). */
+export const BookingSchema = Object.freeze({
+  availability: '@ossy/booking/schema/availability',
+  booking: '@ossy/booking/schema/booking',
+  publicBookingForm: '@ossy/booking/schema/public-booking-form',
+  service: '@ossy/booking/schema/service',
+})

package/src/select-duration-30.action.js

@@ -0,0 +1,4 @@
+export const metadata = {
+  id: '@ossy/booking/actions/select-duration-30',
+  access: 'workspace',
+}

package/src/select-duration-60.action.js

@@ -0,0 +1,4 @@
+export const metadata = {
+  id: '@ossy/booking/actions/select-duration-60',
+  access: 'workspace',
+}

package/src/select-duration-90.action.js

@@ -0,0 +1,4 @@
+export const metadata = {
+  id: '@ossy/booking/actions/select-duration-90',
+  access: 'workspace',
+}