@ossy/booking 1.16.2 → 1.16.3

package/src/availability-setup.page.jsx

@@ -1,18 +1,10 @@
 import React, { useState, useEffect, useMemo } from 'react'
-import {
-  View,
-  Title,
-  Text,
-  Button,
-  Input,
-  Select,
-  Alert,
-  useLocale,
-} from '@ossy/design-system'
+import { View, Text, Button, Input, Select, Alert, Page, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
 import { useSdk } from '@ossy/sdk-react'
 import { metadata as SaveAvailability } from './save-availability.action.js'
 import { metadata as GetAvailability } from './get-availability.action.js'
+import { SELECT_DURATION, TOGGLE_AVAILABILITY_DAY } from './availability-action-maps.js'
 import { invokeErrorMessage } from './invoke-error-message.js'
 
 export const metadata = {
@@ -56,7 +48,7 @@ function buildDayState (weeklyWindows = []) {
   }))
 }
 
-function DayRow ({ label, day, onToggle, onTimeChange, t }) {
+function DayRow ({ labelKey, day, toggleAction, onToggle, onTimeChange }) {
   return (
     <View
       layout="row"
@@ -67,7 +59,10 @@ function DayRow ({ label, day, onToggle, onTimeChange, t }) {
       inset="s"
       style={{ border: '1px solid var(--separator)' }}
     >
-      <label style={{ display: 'flex', alignItems: 'center', flexShrink: 0, cursor: 'pointer' }}>
+      <label
+        data-action={toggleAction.id}
+        style={{ display: 'flex', alignItems: 'center', flexShrink: 0, cursor: 'pointer' }}
+      >
         <input
           type="checkbox"
           checked={day.enabled}
@@ -75,7 +70,7 @@ function DayRow ({ label, day, onToggle, onTimeChange, t }) {
           style={{ width: 16, height: 16, accentColor: 'var(--color-accent)' }}
         />
       </label>
-      <Text weight="medium" style={{ width: '4.5rem', flexShrink: 0 }}>{label}</Text>
+      <Text weight="medium" text={labelKey} style={{ width: '4.5rem', flexShrink: 0 }} />
 
       {day.enabled ? (
         <View layout="row" gap="s" alignItems="center" style={{ flex: 1, flexWrap: 'wrap' }}>
@@ -84,7 +79,7 @@ function DayRow ({ label, day, onToggle, onTimeChange, t }) {
           <Input type="time" value={day.endTime} onChange={e => onTimeChange('endTime', e.target.value)} />
         </View>
       ) : (
-        <Text color="secondary" size="s">{t('booking.availabilitySetup.unavailable')}</Text>
+        <Text color="secondary" variant="small" text="booking.availabilitySetup.unavailable" />
       )}
     </View>
   )
@@ -115,7 +110,7 @@ export default function AvailabilitySetupPage ({ workspaceId }) {
   const [copied, setCopied] = useState(false)
 
   const bookingPath = workspaceId
-    ? router.getHref({ id: 'public-booking', params: { consultantSlug: workspaceId } })
+    ? router.getHref({ id: 'public-booking', params: { providerSlug: workspaceId } })
     : ''
   const bookingUrl = typeof window !== 'undefined' && bookingPath
     ? `${window.location.origin}${bookingPath}`
@@ -190,36 +185,33 @@ export default function AvailabilitySetupPage ({ workspaceId }) {
 
   if (loading) {
     return (
-      <View surface="primary" inset="l" style={{ height: '100%', overflowY: 'auto' }}>
-        <Text color="secondary">{t('booking.availabilitySetup.loading')}</Text>
-      </View>
+      <Page>
+        <Text color="secondary" text="booking.availabilitySetup.loading" />
+      </Page>
     )
   }
 
   return (
-    <View
-      gap="m"
-      surface="primary"
-      style={{ padding: 'var(--space-m) var(--space-l)', height: '100%', overflowY: 'auto', maxWidth: 620 }}
+    <Page
+      maxWidth="s"
+      title="booking.availabilitySetup.title"
+      description="booking.availabilitySetup.description"
+      data-availability-status={saved ? 'saved' : 'draft'}
+      {...(workspaceId ? { 'data-provider-slug': workspaceId } : {})}
     >
-      <View inset="s" gap="xs">
-        <Title variant="secondary">{t('booking.availabilitySetup.title')}</Title>
-        <Text style={{ maxWidth: 480 }}>{t('booking.availabilitySetup.description')}</Text>
-      </View>
-
       <View gap="s" surface="secondary" roundness="m" inset="m">
-        <Title variant="tertiary">{t('booking.availabilitySetup.weeklySchedule')}</Title>
+        <Text variant="heading-tertiary" as="h3" text="booking.availabilitySetup.weeklySchedule" />
         <View gap="xs">
           {dayDefs.map(({ dayOfWeek, key }) => {
             const day = dayState.find(d => d.dayOfWeek === dayOfWeek)
             return (
               <DayRow
                 key={dayOfWeek}
-                label={t(key)}
+                labelKey={key}
                 day={day}
+                toggleAction={TOGGLE_AVAILABILITY_DAY[dayOfWeek]}
                 onToggle={() => toggleDay(dayOfWeek)}
                 onTimeChange={(field, value) => updateDayTime(dayOfWeek, field, value)}
-                t={t}
               />
             )
           })}
@@ -227,23 +219,24 @@ export default function AvailabilitySetupPage ({ workspaceId }) {
       </View>
 
       <View gap="s" surface="secondary" roundness="m" inset="m">
-        <Title variant="tertiary">{t('booking.availabilitySetup.sessionDuration')}</Title>
+        <Text variant="heading-tertiary" as="h3" text="booking.availabilitySetup.sessionDuration" />
         <View layout="row" gap="s" style={{ flexWrap: 'wrap' }}>
           {SESSION_DURATIONS.map(dur => (
             <Button
               key={dur}
+              {...SELECT_DURATION[dur]}
               variant={sessionDurations.includes(dur) ? 'tab-active' : 'tab'}
+              label="booking.availabilitySetup.durationMin"
+              params={{ minutes: dur }}
               onClick={() => toggleDuration(dur)}
-            >
-              {t('booking.availabilitySetup.durationMin', { minutes: dur })}
-            </Button>
+            />
           ))}
         </View>
-        <Text size="s" color="secondary">{t('booking.availabilitySetup.sessionDurationHint')}</Text>
+        <Text variant="small" color="secondary" text="booking.availabilitySetup.sessionDurationHint" />
       </View>
 
       <View gap="s" surface="secondary" roundness="m" inset="m">
-        <Text weight="medium">{t('booking.availabilitySetup.bufferLabel')}</Text>
+        <Text weight="medium" text="booking.availabilitySetup.bufferLabel" />
         <Select
           id="buffer-select"
           value={bufferMinutes}
@@ -255,11 +248,11 @@ export default function AvailabilitySetupPage ({ workspaceId }) {
             </option>
           ))}
         </Select>
-        <Text size="s" color="secondary">{t('booking.availabilitySetup.bufferHint')}</Text>
+        <Text variant="small" color="secondary" text="booking.availabilitySetup.bufferHint" />
       </View>
 
       <View gap="s" surface="secondary" roundness="m" inset="m">
-        <Text weight="medium">{t('booking.availabilitySetup.timezone')}</Text>
+        <Text weight="medium" text="booking.availabilitySetup.timezone" />
         <Select id="tz-select" value={timezone} onChange={e => { setTimezone(e.target.value); setSaved(false) }}>
           {TIMEZONE_OPTIONS.map(tz => (
             <option key={tz} value={tz}>{tz}</option>
@@ -269,25 +262,31 @@ export default function AvailabilitySetupPage ({ workspaceId }) {
 
       {error && <Alert variant="danger">{error}</Alert>}
 
-      <Button data-action={SaveAvailability.id} variant="primary" disabled={saving} onClick={handleSave}>
-        {saving ? t('booking.availabilitySetup.saving') : t('booking.availabilitySetup.save')}
-      </Button>
+      <Button
+        {...SaveAvailability}
+        variant="primary"
+        disabled={saving}
+        onClick={handleSave}
+        label={saving ? 'booking.availabilitySetup.saving' : 'booking.availabilitySetup.save'}
+      />
 
       {saved && workspaceId && (
         <Alert variant="success" title={t('booking.availabilitySetup.savedTitle')}>
           <View gap="s">
-            <Text color="secondary">{t('booking.availabilitySetup.savedBody')}</Text>
+            <Text color="secondary" text="booking.availabilitySetup.savedBody" />
             <View layout="row" gap="s" alignItems="center">
               <Text as="code" style={{ flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', fontFamily: 'ui-monospace, monospace' }}>
                 {bookingUrl}
               </Text>
-              <Button variant={copied ? 'cta' : 'primary'} onClick={handleCopyLink}>
-                {copied ? t('booking.availabilitySetup.copied') : t('booking.availabilitySetup.copyLink')}
-              </Button>
+              <Button
+                variant={copied ? 'cta' : 'primary'}
+                onClick={handleCopyLink}
+                label={copied ? 'booking.availabilitySetup.copied' : 'booking.availabilitySetup.copyLink'}
+              />
             </View>
           </View>
         </Alert>
       )}
-    </View>
+    </Page>
   )
 }

package/src/{availability.resource.js → availability.schema.js}

@@ -1,6 +1,6 @@
 export default {
   name: 'Availability',
-  id: '@ossy/booking/availability',
+  id: '@ossy/booking/schema/availability',
   categoryName: 'Booking',
   icon: 'clock',
   fields: [
@@ -19,10 +19,6 @@ export default {
       name: 'endTime',
       type: 'text',
     },
-    {
-      name: 'bufferMinutes',
-      type: 'number',
-    },
     {
       // IANA timezone name, e.g. 'Europe/Stockholm'. Default applied at runtime.
       name: 'timezone',

package/src/booking-cancellation.email.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { EmailLayout, EmailText } from '@ossy/email'
 
-export const id = 'booking/cancellation'
+export const id = '@ossy/booking/emails/cancellation'
 export const subject = 'Din bokning har avbokats'
 
 const SWEDISH_MONTHS = [

package/src/booking-card.component.jsx

@@ -1,10 +1,10 @@
 import React, { useState } from 'react'
-import { View, Title, Text, Button, Badge, Alert, useLocale } from '@ossy/design-system'
+import { View, Text, Button, Badge, Alert, useLocale } from '@ossy/design-system'
 import { metadata as ConfirmBooking } from './confirm-booking.action.js'
 import { metadata as DeclineBooking } from './decline-booking.action.js'
 import { metadata as CancelBooking } from './cancel-booking.action.js'
 
-export const metadata = { id: 'resource:booking/booking/card' }
+export const metadata = { id: '@ossy/booking/view/booking/card' }
 
 const STATUS_VARIANT = {
   pending: 'warning',
@@ -73,7 +73,7 @@ export function BookingCard ({ booking, resource, onConfirm, onDecline, onCancel
       <View layout="row" justifyContent="space-between" alignItems="flex-start" gap="m">
         <View gap="xs" style={{ flex: 1, minWidth: 0 }}>
           <View layout="row" gap="s" alignItems="center" style={{ flexWrap: 'wrap' }}>
-            <Title variant="tertiary">{data.clientName ?? '—'}</Title>
+            <Text variant="heading-tertiary" as="h3">{data.clientName ?? '—'}</Text>
             <Badge
               label={statusLabel[data.status] ?? data.status}
               variant={STATUS_VARIANT[data.status] ?? 'neutral'}

package/src/booking-confirmation.email.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { EmailLayout, EmailText, EmailButton } from '@ossy/email'
 
-export const id = 'booking/confirmation'
+export const id = '@ossy/booking/emails/confirmation'
 export const subject = 'Bokningsbekräftelse'
 
 const SWEDISH_MONTHS = [
@@ -47,13 +47,15 @@ function buildIcsUrl(startAt, duration, title, baseUrl) {
 
 export default function BookingConfirmationEmail({
   clientName,
+  providerName,
   consultantName,
   startAt,
   duration,
   baseUrl = '',
 }) {
   const formattedDate = formatSwedishDateTime(startAt)
-  const icsUrl = buildIcsUrl(startAt, duration, `Möte med ${consultantName}`, baseUrl)
+  const name = providerName ?? consultantName
+  const icsUrl = buildIcsUrl(startAt, duration, `Möte med ${name}`, baseUrl)
 
   return (
     <EmailLayout>
@@ -66,7 +68,7 @@ export default function BookingConfirmationEmail({
       </EmailText>
 
       <EmailText>
-        Din bokning hos <strong>{consultantName}</strong> är nu bekräftad.
+        Din bokning hos <strong>{name}</strong> är nu bekräftad.
       </EmailText>
 
       <table cellPadding={0} cellSpacing={0} style={{ marginBottom: 32, width: '100%' }}>

package/src/booking-detail.page.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback, useMemo } from 'react'
 import { useRouter } from '@ossy/router-react'
-import { View, Title, Text, Button, Badge, Alert, Textarea, useLocale } from '@ossy/design-system'
+import { View, Text, Button, Badge, Alert, Textarea, Page, useLocale } from '@ossy/design-system'
 import { useSdk } from '@ossy/sdk-react'
 import { metadata as ConfirmBooking } from './confirm-booking.action.js'
 import { metadata as DeclineBooking } from './decline-booking.action.js'
@@ -74,7 +74,7 @@ function DeclineForm ({ booking, onSuccess, onError, t, sdk }) {
     <Alert variant="danger" title={t('booking.bookingDetail.declineTitle')}>
       <View gap="s">
         <Textarea value={reason} onChange={e => setReason(e.target.value)} rows={3} placeholder={t('booking.bookingDetail.declinePlaceholder')} />
-        <Text variant="small" color="secondary">{t('booking.bookingDetail.declineReasonHint')}</Text>
+        <Text variant="small" color="secondary" text="booking.bookingDetail.declineReasonHint" />
         <View layout="row" gap="s">
           <Button data-action={DeclineBooking.id} variant="danger" disabled={loading} onClick={handleDecline}>{loading ? t('booking.bookingDetail.declining') : t('booking.bookingDetail.declineConfirm')}</Button>
           <Button variant="neutral" onClick={() => setExpanded(false)}>{t('booking.bookingDetail.cancelButton')}</Button>
@@ -98,7 +98,7 @@ function CancelForm ({ booking, onSuccess, onError, t, sdk }) {
   return (
     <Alert variant="danger" title={t('booking.bookingDetail.cancelTitle')}>
       <View gap="s">
-        <Text color="secondary">{t('booking.bookingDetail.cancelBody')}</Text>
+        <Text color="secondary" text="booking.bookingDetail.cancelBody" />
         <View layout="row" gap="s">
           <Button data-action={CancelBooking.id} variant="danger" disabled={loading} onClick={handleCancel}>{loading ? t('booking.bookingDetail.cancelling') : t('booking.bookingDetail.cancelConfirm')}</Button>
           <Button variant="neutral" onClick={() => setExpanded(false)}>{t('booking.bookingDetail.cancelButton')}</Button>
@@ -143,10 +143,14 @@ export default function BookingDetailPage ({ bookingId: bookingIdProp }) {
   }
 
   return (
-    <View gap="m" surface="primary" style={{ padding: 'var(--space-m) var(--space-l)', height: '100%', overflowY: 'auto' }}>
-      <Button variant="link" onClick={goBack}>{t('booking.bookingDetail.back')}</Button>
+    <Page
+      title="booking.bookingDetail.pageTitle"
+      description="booking.bookingDetail.pageDescription"
+    >
+      <View gap="m">
+      <Button variant="link" onClick={goBack} label="booking.bookingDetail.back" />
       {loading ? (
-        <Text color="secondary" style={{ textAlign: 'center', padding: 'var(--space-l)' }}>{t('booking.bookingDetail.loading')}</Text>
+        <Text color="secondary" style={{ textAlign: 'center', padding: 'var(--space-l)' }} text="booking.bookingDetail.loading" />
       ) : error ? (
         <Alert variant="danger">{error}</Alert>
       ) : booking ? (
@@ -154,7 +158,7 @@ export default function BookingDetailPage ({ bookingId: bookingIdProp }) {
           <View gap="m" surface="secondary" roundness="m" inset="l">
             <View layout="row" justifyContent="space-between" alignItems="flex-start" gap="m" style={{ flexWrap: 'wrap' }}>
               <View gap="xs">
-                <Title variant="secondary">{booking.clientName ?? '—'}</Title>
+                <Text variant="heading-secondary" as="h2">{booking.clientName ?? '—'}</Text>
                 {booking.clientEmail && <Text color="secondary">{booking.clientEmail}</Text>}
               </View>
               <Badge label={statusLabel[booking.status] ?? booking.status} variant={STATUS_VARIANT[booking.status] ?? 'neutral'} />
@@ -164,7 +168,7 @@ export default function BookingDetailPage ({ bookingId: bookingIdProp }) {
               <DetailRow label={t('booking.bookingDetail.label.duration')} value={formatDuration(booking.duration, t)} />
               {booking.clientMessage && (
                 <View gap="xs">
-                  <Text weight="medium" color="secondary">{t('booking.bookingDetail.label.message')}</Text>
+                  <Text weight="medium" color="secondary" text="booking.bookingDetail.label.message" />
                   <View surface="primary" roundness="s" inset="s" style={{ borderLeft: '3px solid var(--separator)' }}>
                     <Text style={{ whiteSpace: 'pre-wrap' }}>{booking.clientMessage}</Text>
                   </View>
@@ -174,7 +178,7 @@ export default function BookingDetailPage ({ bookingId: bookingIdProp }) {
           </View>
           {(booking.status === 'pending' || booking.status === 'confirmed') && (
             <View gap="s" surface="secondary" roundness="m" inset="l">
-              <Title variant="tertiary">{booking.status === 'pending' ? t('booking.bookingDetail.manageRequest') : t('booking.bookingDetail.manageBooking')}</Title>
+              <Text variant="heading-tertiary" as="h3">{booking.status === 'pending' ? t('booking.bookingDetail.manageRequest') : t('booking.bookingDetail.manageBooking')}</Text>
               {actionError && <Alert variant="danger">{actionError}</Alert>}
               {booking.status === 'pending' && (
                 <View gap="s">
@@ -189,6 +193,7 @@ export default function BookingDetailPage ({ bookingId: bookingIdProp }) {
           )}
         </View>
       ) : null}
-    </View>
+      </View>
+    </Page>
   )
 }

package/src/booking-email-token.js

@@ -0,0 +1,45 @@
+import jwt from 'jsonwebtoken'
+import { ConfigService } from '@ossy/platform'
+
+const TOKEN_TYPES = {
+  confirm: 'BookingConfirm',
+  decline: 'BookingDecline',
+}
+
+const BOOKING_TOKEN_VALIDITY = '7d'
+
+/**
+ * Signed token for provider email links (confirm / decline pending bookings).
+ * @param {{ bookingId: string, workspaceId: string, purpose: 'confirm' | 'decline' }}
+ */
+export function createBookingEmailToken ({ bookingId, workspaceId, purpose }) {
+  const type = TOKEN_TYPES[purpose]
+  if (!type) throw new Error(`Unknown booking email token purpose: ${purpose}`)
+  return jwt.sign(
+    { sub: bookingId, workspaceId, type },
+    ConfigService.TokenSecret,
+    { expiresIn: BOOKING_TOKEN_VALIDITY, algorithm: 'HS256' },
+  )
+}
+
+/**
+ * @param {string} token
+ * @param {'confirm' | 'decline'} purpose
+ * @returns {Promise<{ bookingId: string, workspaceId: string }>}
+ */
+export function verifyBookingEmailToken (token, purpose) {
+  const expectedType = TOKEN_TYPES[purpose]
+  return new Promise((resolve, reject) => {
+    if (!token) return reject(Object.assign(new Error('No token provided'), { status: 400 }))
+    jwt.verify(token, ConfigService.TokenSecret, { algorithms: ['HS256'] }, (err, payload) => {
+      if (err) return reject(Object.assign(new Error('Invalid or expired token'), { status: 401 }))
+      if (payload?.type !== expectedType) {
+        return reject(Object.assign(new Error('Invalid token type'), { status: 401 }))
+      }
+      if (!payload?.sub || !payload?.workspaceId) {
+        return reject(Object.assign(new Error('Invalid token payload'), { status: 401 }))
+      }
+      resolve({ bookingId: payload.sub, workspaceId: payload.workspaceId })
+    })
+  })
+}

package/src/booking-home-content.js

@@ -0,0 +1,50 @@
+import { useLocale } from '@ossy/design-system'
+import { OpenSignUp } from '@ossy/authentication'
+
+export function useBookingHomeContent () {
+  const { t } = useLocale()
+
+  const cover = {
+    title: t('booking.home.cover.title'),
+    text: t('booking.home.cover.text'),
+    actions: [
+      {
+        ...OpenSignUp,
+        variant: 'cta',
+        href: '/sign-up',
+        label: t('booking.home.cover.ctaPrimary'),
+      },
+      { label: t('booking.home.cover.ctaSecondary'), variant: 'secondary', href: '/boka/demo' },
+    ],
+  }
+
+  const features = [
+    {
+      title: t('booking.home.features.page.title'),
+      icon: 'share',
+      text: t('booking.home.features.page.text'),
+    },
+    {
+      title: t('booking.home.features.confirmations.title'),
+      icon: 'check-circle',
+      text: t('booking.home.features.confirmations.text'),
+    },
+    {
+      title: t('booking.home.features.availability.title'),
+      icon: 'calendar',
+      text: t('booking.home.features.availability.text'),
+    },
+    {
+      title: t('booking.home.features.email.title'),
+      icon: 'mail',
+      text: t('booking.home.features.email.text'),
+    },
+    {
+      title: t('booking.home.features.doubleBook.title'),
+      icon: 'warning',
+      text: t('booking.home.features.doubleBook.text'),
+    },
+  ]
+
+  return { cover, features }
+}

package/src/booking-list.aggregate.js

@@ -0,0 +1,65 @@
+import { BookingSchema } from './schema-ids.js'
+
+/**
+ * ADR 0008 projection — workspace booking list derived from booking resource events.
+ */
+export class BookingListProjection {
+
+  static kind = 'projection'
+  static ProjectionId = '@ossy/booking/data/booking-list'
+
+  static sources = [
+    { type: BookingSchema.booking, event: 'Created' },
+    { type: BookingSchema.booking, event: 'Patched' },
+    { type: BookingSchema.booking, event: 'Deleted' },
+  ]
+
+  static scopeFromEvent (event) {
+    return event.payload?.belongsTo ?? null
+  }
+
+  static cacheKeys (scopeId) {
+    return [
+      `projection:${BookingListProjection.ProjectionId}:${scopeId}`,
+      'action:@ossy/booking/actions/list',
+    ]
+  }
+
+  static initialState (scopeId) {
+    return { workspaceId: scopeId, bookings: [] }
+  }
+
+  static Apply (event, state) {
+    const workspaceId = event.payload?.belongsTo ?? state.workspaceId
+    const entry = {
+      id: event.resourceId,
+      ...(event.payload?.content ?? {}),
+      updatedAt: event.created,
+    }
+
+    if (event.event === 'Created') {
+      entry.createdAt = event.created
+    }
+
+    const bookings = [...(state.bookings ?? [])]
+
+    if (event.event === 'Deleted') {
+      return {
+        workspaceId,
+        bookings: bookings.filter(b => b.id !== event.resourceId),
+      }
+    }
+
+    const idx = bookings.findIndex(b => b.id === event.resourceId)
+    if (idx >= 0) {
+      bookings[idx] = { ...bookings[idx], ...entry }
+    } else {
+      bookings.push(entry)
+    }
+
+    return { workspaceId, bookings }
+  }
+}
+
+export { BookingListProjection as Aggregate }
+export const id = 'booking/data/booking-list'

package/src/booking-reminder.email.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { EmailLayout, EmailText } from '@ossy/email'
 
-export const id = 'booking/reminder'
+export const id = '@ossy/booking/emails/reminder'
 export const subject = 'Påminnelse: din bokning imorgon'
 
 const SWEDISH_MONTHS = [
@@ -24,8 +24,9 @@ function formatSwedishDateTime(isoString) {
   return `${weekday} ${day} ${month} ${year} kl. ${hours}:${minutes}`
 }
 
-export default function BookingReminderEmail({ clientName, consultantName, startAt, duration }) {
+export default function BookingReminderEmail({ clientName, providerName, consultantName, startAt, duration }) {
   const formattedDate = formatSwedishDateTime(startAt)
+  const name = providerName ?? consultantName
 
   return (
     <EmailLayout>
@@ -37,7 +38,7 @@ export default function BookingReminderEmail({ clientName, consultantName, start
 
       <EmailText>
         Det här är en påminnelse om att du har en bokning hos{' '}
-        <strong>{consultantName ?? 'din konsult'}</strong> imorgon.
+        <strong>{name ?? 'din utförare'}</strong> imorgon.
       </EmailText>
 
       <table cellPadding={0} cellSpacing={0} style={{ marginBottom: 32 }}>

package/src/booking-request.email.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { EmailLayout, EmailText, EmailButton } from '@ossy/email'
 
-export const id = 'booking/request'
+export const id = '@ossy/booking/emails/request'
 export const subject = 'Ny bokningsförfrågan'
 
 const SWEDISH_MONTHS = [
@@ -25,6 +25,7 @@ function formatSwedishDateTime(isoString) {
 }
 
 export default function BookingRequestEmail({
+  providerName,
   consultantName,
   clientName,
   clientEmail,
@@ -36,6 +37,8 @@ export default function BookingRequestEmail({
 }) {
   const formattedDate = formatSwedishDateTime(startAt)
 
+  const name = providerName ?? consultantName
+
   return (
     <EmailLayout>
       <h1 style={{ color: '#111111', fontSize: 24, fontWeight: 700, margin: '0 0 24px' }}>
@@ -43,7 +46,7 @@ export default function BookingRequestEmail({
       </h1>
 
       <EmailText>
-        Hej {consultantName},
+        Hej {name},
       </EmailText>
 
       <EmailText>

package/src/booking-resources.js

@@ -1,10 +1,10 @@
 import { ResourcesQueries } from '@ossy/resources/server'
 
 /**
- * List booking resources by type (and optional workspace).
+ * List booking resources by schema id (and optional workspace).
  */
-export function getBookingResources ({ type, belongsTo }) {
-  const query = { type }
+export function getBookingResources ({ schemaId, belongsTo }) {
+  const query = { type: schemaId }
   if (belongsTo) query.belongsTo = belongsTo
   return ResourcesQueries.GetResources(query)
 }

package/src/{booking.resource.js → booking.schema.js}

@@ -1,6 +1,6 @@
 export default {
   name: 'Booking',
-  id: '@ossy/booking/booking',
+  id: '@ossy/booking/schema/booking',
   categoryName: 'Booking',
   icon: 'calendar-check',
   fields: [
@@ -18,11 +18,11 @@ export default {
     },
     {
       name: 'startsAt',
-      type: 'text',
+      type: 'timestamp',
     },
     {
       name: 'endsAt',
-      type: 'text',
+      type: 'timestamp',
     },
     {
       // pending | confirmed | cancelled
@@ -38,6 +38,15 @@ export default {
       name: 'stripePaymentIntentId',
       type: 'text',
     },
+    {
+      name: 'workspaceId',
+      type: 'text',
+    },
+    {
+      // Legacy alias — reads accept providerId during transition
+      name: 'providerId',
+      type: 'text',
+    },
     {
       name: 'notes',
       type: 'textarea',