@ossy/booking 1.15.7 → 1.16.1

package/src/bookings.page.jsx

@@ -1,7 +1,14 @@
-import React, { useState, useEffect, useCallback } from 'react'
-import { View, Title, Text, Tabs, Alert } from '@ossy/design-system'
+import React, { useState, useEffect, useCallback, useMemo } from 'react'
+import { useRouter } from '@ossy/router-react'
+import { View, Title, Text, Tabs, Alert, useLocale } from '@ossy/design-system'
+import { useSdk } from '@ossy/sdk-react'
 import { Definition } from './Definition.js'
 import { BookingCard } from './booking-card.component.jsx'
+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'
+import { metadata as ListBookings } from './list-bookings.action.js'
+import { invokeErrorMessage } from './invoke-error-message.js'
 
 export const metadata = {
   id: 'booking/bookings',
@@ -11,45 +18,48 @@ export const metadata = {
   },
 }
 
-const TABS = [
-  { id: 'pending', label: 'Förfrågningar' },
-  { id: 'confirmed', label: 'Bekräftade' },
-  { id: 'all', label: 'Alla' },
-]
-
-const EMPTY_MESSAGES = {
-  pending: { heading: 'Inga förfrågningar', body: 'Du har inga väntande bokningsförfrågningar just nu.' },
-  confirmed: { heading: 'Inga bekräftade bokningar', body: 'Bekräftade bokningar visas här.' },
-  all: { heading: 'Inga bokningar', body: 'Bokningar från dina klienter visas här.' },
-}
-
 export default function BookingsPage () {
+  const { t } = useLocale()
+  const sdk = useSdk()
+  const router = useRouter()
   const [activeTab, setActiveTab] = useState('pending')
   const [bookings, setBookings] = useState([])
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState(null)
 
+  const TABS = useMemo(() => [
+    { id: 'pending', label: t('booking.bookings.tab.pending') },
+    { id: 'confirmed', label: t('booking.bookings.tab.confirmed') },
+    { id: 'all', label: t('booking.bookings.tab.all') },
+  ], [t])
+
+  const EMPTY_MESSAGES = useMemo(() => ({
+    pending: {
+      heading: t('booking.bookings.empty.pending.heading'),
+      body: t('booking.bookings.empty.pending.body'),
+    },
+    confirmed: {
+      heading: t('booking.bookings.empty.confirmed.heading'),
+      body: t('booking.bookings.empty.confirmed.body'),
+    },
+    all: {
+      heading: t('booking.bookings.empty.all.heading'),
+      body: t('booking.bookings.empty.all.body'),
+    },
+  }), [t])
+
   const loadBookings = useCallback(async () => {
     setLoading(true)
     setError(null)
     try {
-      const res = await fetch('/actions/booking/list', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({}),
-      })
-      if (!res.ok) {
-        const data = await res.json().catch(() => ({}))
-        throw new Error(data?.message ?? `Fel ${res.status}`)
-      }
-      const data = await res.json()
+      const data = await sdk.invoke(ListBookings, {})
       setBookings(data)
     } catch (err) {
       setError(err.message)
     } finally {
       setLoading(false)
     }
-  }, [])
+  }, [sdk, t])
 
   useEffect(() => {
     loadBookings()
@@ -60,46 +70,34 @@ export default function BookingsPage () {
   const visible = activeTab === 'pending' ? pending : activeTab === 'confirmed' ? confirmed : bookings
 
   const handleConfirm = async (booking) => {
-    const res = await fetch('/actions/booking/confirm', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookingId: booking.id }),
-    })
-    if (!res.ok) {
-      const data = await res.json().catch(() => ({}))
-      throw new Error(data?.message ?? 'Bekräftning misslyckades')
+    try {
+      await sdk.invoke(ConfirmBooking, { bookingId: booking.id })
+      await loadBookings()
+    } catch (err) {
+      throw new Error(await invokeErrorMessage(err, t('booking.bookings.errorConfirm')))
     }
-    await loadBookings()
   }
 
   const handleDecline = async (booking) => {
-    const res = await fetch('/actions/booking/decline', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookingId: booking.id }),
-    })
-    if (!res.ok) {
-      const data = await res.json().catch(() => ({}))
-      throw new Error(data?.message ?? 'Avböjning misslyckades')
+    try {
+      await sdk.invoke(DeclineBooking, { bookingId: booking.id })
+      await loadBookings()
+    } catch (err) {
+      throw new Error(await invokeErrorMessage(err, t('booking.bookings.errorDecline')))
     }
-    await loadBookings()
   }
 
   const handleCancel = async (booking) => {
-    const res = await fetch('/actions/booking/cancel', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookingId: booking.id }),
-    })
-    if (!res.ok) {
-      const data = await res.json().catch(() => ({}))
-      throw new Error(data?.message ?? 'Avbokning misslyckades')
+    try {
+      await sdk.invoke(CancelBooking, { bookingId: booking.id })
+      await loadBookings()
+    } catch (err) {
+      throw new Error(await invokeErrorMessage(err, t('booking.bookings.errorCancel')))
     }
-    await loadBookings()
   }
 
   const handleView = (booking) => {
-    window.location.href = `/bokningar/${booking.id}`
+    window.location.href = router.getHref({ id: 'booking/booking-detail', params: { bookingId: booking.id } })
   }
 
   const empty = EMPTY_MESSAGES[activeTab] ?? EMPTY_MESSAGES.all
@@ -111,9 +109,9 @@ export default function BookingsPage () {
       style={{ padding: 'var(--space-m) var(--space-l)', height: '100%', overflowY: 'auto' }}
     >
       <View inset="s" gap="s">
-        <Title>{Definition.title} — Bokningar</Title>
+        <Title>{Definition.title} — {t('booking.bookings.titleSuffix')}</Title>
         <Text style={{ maxWidth: '400px' }}>
-          Hantera bokningsförfrågningar och bekräftade möten.
+          {t('booking.bookings.description')}
         </Text>
       </View>
 
@@ -126,7 +124,7 @@ export default function BookingsPage () {
 
         {loading ? (
           <Text color="secondary" style={{ textAlign: 'center', padding: 'var(--space-l)' }}>
-            Laddar…
+            {t('booking.bookings.loading')}
           </Text>
         ) : error ? (
           <Alert variant="danger">{error}</Alert>

package/src/cancel-booking.action.js

@@ -1,61 +1 @@
-import { Aggregate } from '@ossy/event-store'
-import { Resource, ResourcesEvents } from '@ossy/resources'
-import BookingCancellationEmail from './booking-cancellation.email.jsx'
-
-export const id = 'booking/cancel'
-export const access = 'authenticated'
-
-export async function run({ payload, req, log, integrations }) {
-  const bookingId = payload?.bookingId ?? req?.params?.bookingId
-  const workspaceId = payload?.workspaceId ?? req?.workspaceId
-
-  if (!bookingId) throw Object.assign(new Error('bookingId is required'), { status: 400 })
-
-  log?.info(`[booking/cancel] Cancelling booking ${bookingId}`)
-
-  const booking = await Aggregate.Of(Resource, bookingId).then(Aggregate.View())
-  if (!booking?.id) throw Object.assign(new Error('Booking not found'), { status: 404 })
-
-  if (booking.belongsTo !== workspaceId) {
-    throw Object.assign(new Error('You do not have permission to cancel this booking'), { status: 403 })
-  }
-
-  if (booking.content?.status === 'cancelled') {
-    throw Object.assign(new Error('Booking is already cancelled'), { status: 409 })
-  }
-
-  const updated = await Aggregate.Of(Resource, bookingId)
-    .then(Aggregate.Add(
-      ResourcesEvents.ContentUpdated({
-        createdBy: req?.userId ?? 'system',
-        content: { ...booking.content, status: 'cancelled' },
-      }),
-    ))
-    .then(Aggregate.Save())
-
-  log?.info(`[booking/cancel] Booking ${bookingId} cancelled`)
-
-  // Send cancellation email to client
-  const emailClient = integrations?.get?.('email')
-  if (emailClient && booking.content?.clientEmail) {
-    try {
-      await emailClient.sendTemplate(
-        BookingCancellationEmail,
-        {
-          clientName: booking.content.clientName,
-          startAt: booking.content.startsAt,
-          duration: booking.content.duration,
-        },
-        {
-          to: booking.content.clientEmail,
-          from: 'noreply@ossy.se',
-          subject: 'Din bokning har avbokats',
-        },
-      )
-    } catch (err) {
-      log?.error('[booking/cancel] Failed to send cancellation email', err)
-    }
-  }
-
-  return { id: bookingId, status: 'cancelled' }
-}
+export const metadata = { id: 'booking/cancel', access: 'authenticated' }

package/src/cancel-booking.task.js

@@ -0,0 +1,60 @@
+import { Aggregate } from '@ossy/event-store'
+import { Resource, ResourcesEvents } from '@ossy/resources/server'
+import BookingCancellationEmail from './booking-cancellation.email.jsx'
+
+export const metadata = { id: 'booking/cancel' }
+
+export async function run({ payload, req, log, integrations }) {
+  const bookingId = payload?.bookingId ?? req?.params?.bookingId
+  const workspaceId = payload?.workspaceId ?? req?.workspaceId
+
+  if (!bookingId) throw Object.assign(new Error('bookingId is required'), { status: 400 })
+
+  log?.info(`[booking/cancel] Cancelling booking ${bookingId}`)
+
+  const booking = await Aggregate.Of(Resource, bookingId).then(Aggregate.View())
+  if (!booking?.id) throw Object.assign(new Error('Booking not found'), { status: 404 })
+
+  if (booking.belongsTo !== workspaceId) {
+    throw Object.assign(new Error('You do not have permission to cancel this booking'), { status: 403 })
+  }
+
+  if (booking.content?.status === 'cancelled') {
+    throw Object.assign(new Error('Booking is already cancelled'), { status: 409 })
+  }
+
+  const updated = await Aggregate.Of(Resource, bookingId)
+    .then(Aggregate.Add(
+      ResourcesEvents.ContentUpdated({
+        createdBy: req?.userId ?? 'system',
+        content: { ...booking.content, status: 'cancelled' },
+      }),
+    ))
+    .then(Aggregate.Save())
+
+  log?.info(`[booking/cancel] Booking ${bookingId} cancelled`)
+
+  // Send cancellation email to client
+  const emailClient = integrations?.get?.('email')
+  if (emailClient && booking.content?.clientEmail) {
+    try {
+      await emailClient.sendTemplate(
+        BookingCancellationEmail,
+        {
+          clientName: booking.content.clientName,
+          startAt: booking.content.startsAt,
+          duration: booking.content.duration,
+        },
+        {
+          to: booking.content.clientEmail,
+          from: 'noreply@ossy.se',
+          subject: 'Din bokning har avbokats',
+        },
+      )
+    } catch (err) {
+      log?.error('[booking/cancel] Failed to send cancellation email', err)
+    }
+  }
+
+  return { id: bookingId, status: 'cancelled' }
+}

package/src/confirm-booking.action.js

@@ -1,82 +1 @@
-import { Aggregate } from '@ossy/event-store'
-import { Resource, ResourcesEvents } from '@ossy/resources'
-import BookingConfirmationEmail from './booking-confirmation.email.jsx'
-
-export const id = 'booking/confirm'
-export const access = 'workspace'
-
-export async function run({ payload, req, log, integrations }) {
-  const bookingId = payload?.bookingId ?? req?.params?.bookingId
-  const workspaceId = payload?.workspaceId ?? req?.workspaceId
-  const { consultantName, baseUrl } = payload ?? {}
-
-  if (!bookingId) throw Object.assign(new Error('bookingId is required'), { status: 400 })
-
-  log?.info(`[booking/confirm] Confirming booking ${bookingId}`)
-
-  const booking = await Aggregate.Of(Resource, bookingId).then(Aggregate.View())
-  if (!booking?.id) throw Object.assign(new Error('Booking not found'), { status: 404 })
-
-  if (booking.belongsTo !== workspaceId) {
-    throw Object.assign(new Error('You do not have permission to confirm this booking'), { status: 403 })
-  }
-
-  if (booking.content?.status !== 'pending') {
-    throw Object.assign(
-      new Error(`Booking cannot be confirmed from status '${booking.content?.status}'`),
-      { status: 409 },
-    )
-  }
-
-  await Aggregate.Of(Resource, bookingId)
-    .then(Aggregate.Add(
-      ResourcesEvents.ContentUpdated({
-        createdBy: req?.userId ?? 'system',
-        content: { ...booking.content, status: 'confirmed' },
-      }),
-    ))
-    .then(Aggregate.Save())
-
-  log?.info(`[booking/confirm] Booking ${bookingId} confirmed`)
-
-  // Send confirmation email with .ics to the client
-  const emailClient = integrations?.get?.('email')
-  if (emailClient && booking.content?.clientEmail) {
-    try {
-      await emailClient.sendTemplate(
-        BookingConfirmationEmail,
-        {
-          clientName: booking.content.clientName,
-          consultantName: consultantName ?? 'Din konsult',
-          startAt: booking.content.startsAt,
-          duration: booking.content.duration,
-          baseUrl: baseUrl ?? '',
-        },
-        {
-          to: booking.content.clientEmail,
-          from: 'noreply@ossy.se',
-          subject: 'Bokningsbekräftelse',
-        },
-      )
-      log?.info(`[booking/confirm] Confirmation email sent to ${booking.content.clientEmail}`)
-    } catch (err) {
-      log?.error('[booking/confirm] Failed to send confirmation email to client', err)
-    }
-
-    // Brief notification to the consultant that the booking is now locked in
-    if (booking.content?.consultantId) {
-      try {
-        await emailClient.send({
-          to: booking.content.consultantId,
-          from: 'noreply@ossy.se',
-          subject: 'Bokning bekräftad',
-          text: `Du bekräftade bokningen med ${booking.content.clientName} (${booking.content.clientEmail}). En kalenderinbjudan har skickats till klienten.`,
-        })
-      } catch (err) {
-        log?.error('[booking/confirm] Failed to send confirmation notification to consultant', err)
-      }
-    }
-  }
-
-  return { id: bookingId, status: 'confirmed' }
-}
+export const metadata = { id: 'booking/confirm', access: 'workspace' }

package/src/confirm-booking.task.js

@@ -0,0 +1,81 @@
+import { Aggregate } from '@ossy/event-store'
+import { Resource, ResourcesEvents } from '@ossy/resources/server'
+import BookingConfirmationEmail from './booking-confirmation.email.jsx'
+
+export const metadata = { id: 'booking/confirm' }
+
+export async function run({ payload, req, log, integrations }) {
+  const bookingId = payload?.bookingId ?? req?.params?.bookingId
+  const workspaceId = payload?.workspaceId ?? req?.workspaceId
+  const { consultantName, baseUrl } = payload ?? {}
+
+  if (!bookingId) throw Object.assign(new Error('bookingId is required'), { status: 400 })
+
+  log?.info(`[booking/confirm] Confirming booking ${bookingId}`)
+
+  const booking = await Aggregate.Of(Resource, bookingId).then(Aggregate.View())
+  if (!booking?.id) throw Object.assign(new Error('Booking not found'), { status: 404 })
+
+  if (booking.belongsTo !== workspaceId) {
+    throw Object.assign(new Error('You do not have permission to confirm this booking'), { status: 403 })
+  }
+
+  if (booking.content?.status !== 'pending') {
+    throw Object.assign(
+      new Error(`Booking cannot be confirmed from status '${booking.content?.status}'`),
+      { status: 409 },
+    )
+  }
+
+  await Aggregate.Of(Resource, bookingId)
+    .then(Aggregate.Add(
+      ResourcesEvents.ContentUpdated({
+        createdBy: req?.userId ?? 'system',
+        content: { ...booking.content, status: 'confirmed' },
+      }),
+    ))
+    .then(Aggregate.Save())
+
+  log?.info(`[booking/confirm] Booking ${bookingId} confirmed`)
+
+  // Send confirmation email with .ics to the client
+  const emailClient = integrations?.get?.('email')
+  if (emailClient && booking.content?.clientEmail) {
+    try {
+      await emailClient.sendTemplate(
+        BookingConfirmationEmail,
+        {
+          clientName: booking.content.clientName,
+          consultantName: consultantName ?? 'Din konsult',
+          startAt: booking.content.startsAt,
+          duration: booking.content.duration,
+          baseUrl: baseUrl ?? '',
+        },
+        {
+          to: booking.content.clientEmail,
+          from: 'noreply@ossy.se',
+          subject: 'Bokningsbekräftelse',
+        },
+      )
+      log?.info(`[booking/confirm] Confirmation email sent to ${booking.content.clientEmail}`)
+    } catch (err) {
+      log?.error('[booking/confirm] Failed to send confirmation email to client', err)
+    }
+
+    // Brief notification to the consultant that the booking is now locked in
+    if (booking.content?.consultantId) {
+      try {
+        await emailClient.send({
+          to: booking.content.consultantId,
+          from: 'noreply@ossy.se',
+          subject: 'Bokning bekräftad',
+          text: `Du bekräftade bokningen med ${booking.content.clientName} (${booking.content.clientEmail}). En kalenderinbjudan har skickats till klienten.`,
+        })
+      } catch (err) {
+        log?.error('[booking/confirm] Failed to send confirmation notification to consultant', err)
+      }
+    }
+  }
+
+  return { id: bookingId, status: 'confirmed' }
+}

package/src/create-booking.action.js

@@ -1,168 +1 @@
-import { nanoid } from 'nanoid'
-import { Aggregate } from '@ossy/event-store'
-import { Resource, ResourcesEvents } from '@ossy/resources'
-import { ResourcesQueries } from '@ossy/resources'
-import { getAvailableSlots } from './availability-engine.js'
-import BookingRequestEmail from './booking-request.email.jsx'
-
-export const id = 'booking/create'
-export const access = 'public'
-
-export async function run({ payload, log, integrations }) {
-  const {
-    consultantId,
-    startAt,
-    duration,
-    clientName,
-    clientEmail,
-    clientMessage,
-    consultantName,
-    consultantEmail,
-    baseUrl,
-    confirmUrl,
-    declineUrl,
-  } = payload ?? {}
-
-  if (!consultantId) throw Object.assign(new Error('consultantId is required'), { status: 400 })
-  if (!startAt) throw Object.assign(new Error('startAt is required'), { status: 400 })
-  if (!duration) throw Object.assign(new Error('duration is required'), { status: 400 })
-  if (!clientName) throw Object.assign(new Error('clientName is required'), { status: 400 })
-  if (!clientEmail) throw Object.assign(new Error('clientEmail is required'), { status: 400 })
-
-  log?.info(`[booking/create] Creating booking for ${clientEmail} with ${consultantId}`)
-
-  // Re-validate slot availability
-  const availabilityResources = await ResourcesQueries.GetResources({
-    type: '@ossy/booking/availability',
-    belongsTo: consultantId,
-  })
-
-  // New format: single resource with weeklyWindows array in content
-  const configResource = availabilityResources.find(r => Array.isArray(r.content?.weeklyWindows))
-  let weeklyWindows, firstResource
-
-  if (configResource) {
-    weeklyWindows = configResource.content.weeklyWindows ?? []
-    firstResource = configResource
-  } else {
-    // Legacy format: one resource per day
-    firstResource = availabilityResources[0]
-    weeklyWindows = availabilityResources
-      .map(r => ({
-        dayOfWeek: r.content?.dayOfWeek,
-        startTime: r.content?.startTime ?? '09:00',
-        endTime: r.content?.endTime ?? '17:00',
-      }))
-      .filter(w => w.dayOfWeek != null)
-  }
-
-  const availability = {
-    weeklyWindows,
-    bufferMinutes: firstResource?.content?.bufferMinutes ?? 0,
-    blackoutDates: firstResource?.content?.blackoutDates ?? [],
-    timezone: firstResource?.content?.timezone ?? 'Europe/Stockholm',
-  }
-
-  const allBookingResources = await ResourcesQueries.GetResources({
-    type: '@ossy/booking/booking',
-    belongsTo: consultantId,
-  })
-
-  const confirmedBookings = allBookingResources
-    .filter(b => b.content?.status === 'confirmed')
-    .map(b => ({
-      startAt: b.content.startsAt,
-      endAt: b.content.endsAt,
-      status: 'confirmed',
-    }))
-
-  const startDate = new Date(startAt)
-  const endAt = new Date(startDate.getTime() + duration * 60 * 1000).toISOString()
-
-  // Validate the requested slot is still open
-  const openSlots = getAvailableSlots({
-    availability,
-    bookings: confirmedBookings,
-    fromDate: startDate,
-    toDate: startDate,
-    duration,
-  })
-
-  const isAvailable = openSlots.some(s => s.startAt === startDate.toISOString())
-  if (!isAvailable) {
-    throw Object.assign(new Error('The requested slot is no longer available'), { status: 409 })
-  }
-
-  // Create the booking resource
-  const bookingId = nanoid()
-  const event = ResourcesEvents.Created({
-    aggregateId: bookingId,
-    type: '@ossy/booking/booking',
-    createdBy: 'public',
-    belongsTo: consultantId,
-    location: '/bookings/',
-    name: `booking-${bookingId}.json`,
-    content: {
-      clientName,
-      clientEmail,
-      clientMessage: clientMessage ?? '',
-      consultantId,
-      startsAt: startDate.toISOString(),
-      endsAt: endAt,
-      duration,
-      status: 'pending',
-      paymentStatus: 'unpaid',
-    },
-  })
-
-  const booking = await Aggregate.Of(Resource, event).then(Aggregate.View())
-
-  log?.info(`[booking/create] Booking ${bookingId} created`)
-
-  const emailClient = integrations?.get?.('email')
-  if (emailClient) {
-    // Notify the consultant of the new booking request
-    if (consultantEmail) {
-      try {
-        await emailClient.sendTemplate(
-          BookingRequestEmail,
-          {
-            consultantName: consultantName ?? 'Hej',
-            clientName,
-            clientEmail,
-            startAt: startDate.toISOString(),
-            duration,
-            message: clientMessage ?? '',
-            confirmUrl: confirmUrl ?? `${baseUrl ?? ''}/actions/booking/confirm?bookingId=${bookingId}`,
-            declineUrl: declineUrl ?? `${baseUrl ?? ''}/actions/booking/decline?bookingId=${bookingId}`,
-          },
-          {
-            to: consultantEmail,
-            from: 'noreply@ossy.se',
-            subject: 'Ny bokningsförfrågan',
-          },
-        )
-        log?.info(`[booking/create] Booking request email sent to consultant ${consultantEmail}`)
-      } catch (err) {
-        log?.error('[booking/create] Failed to send booking request email to consultant', err)
-      }
-    }
-
-    // Send a simple receipt to the client — no .ics yet (sent after consultant confirms)
-    try {
-      await emailClient.send(
-        {
-          to: clientEmail,
-          from: 'noreply@ossy.se',
-          subject: 'Vi har tagit emot din förfrågan',
-          text: `Hej ${clientName},\n\nVi har tagit emot din bokningsförfrågan. Konsulten bekräftar inom kort och du får ett nytt mejl med kalenderinbjudan när bokningen är bekräftad.\n\nMvh\nOssy`,
-        },
-      )
-      log?.info(`[booking/create] Receipt email sent to client ${clientEmail}`)
-    } catch (err) {
-      log?.error('[booking/create] Failed to send receipt email to client', err)
-    }
-  }
-
-  return booking
-}
+export const metadata = { id: 'booking/create', access: 'public' }