@ossy/booking 1.16.0 → 1.16.2

package/src/delete-service.task.js

@@ -0,0 +1,41 @@
+import { Aggregate } from '@ossy/event-store'
+import { Resource, ResourcesEvents } from '@ossy/resources/server'
+import { getBookingResources } from './booking-resources.js'
+
+export const metadata = { id: 'booking/delete-service' }
+
+export async function run ({ payload, req, log }) {
+  const workspaceId = req?.workspaceId
+  const { serviceId } = payload ?? {}
+
+  if (!workspaceId) {
+    throw Object.assign(new Error('workspaceId is required'), { status: 400 })
+  }
+  if (!serviceId) {
+    throw Object.assign(new Error('serviceId is required'), { status: 400 })
+  }
+
+  const existing = await getBookingResources({
+    type: '@ossy/booking/service',
+    belongsTo: workspaceId,
+  })
+
+  const resource = existing.find(r => r.id === serviceId)
+  if (!resource) {
+    throw Object.assign(new Error('Service not found'), { status: 404 })
+  }
+
+  log?.info(`[booking/delete-service] Deleting service ${serviceId}`)
+
+  await Aggregate.Of(Resource, serviceId)
+    .then(
+      Aggregate.Add(
+        ResourcesEvents.Deleted({
+          createdBy: req?.userId ?? 'system',
+        }),
+      ),
+    )
+    .then(Aggregate.Save())
+
+  return { id: serviceId, deleted: true }
+}

package/src/en.translations.json

@@ -1,5 +1,5 @@
 {
-  "booking.home.documentTitle": "Booking calendar – Ossy",
+  "booking/home.documentTitle": "Booking calendar – Ossy",
   "booking.home.cover.title": "Let clients book time directly",
   "booking.home.cover.text": "Share a link. Clients pick a slot. You focus on the work.",
   "booking.home.cover.ctaPrimary": "Get started free",
@@ -16,7 +16,7 @@
   "booking.home.features.doubleBook.text": "One calendar here, one link there — we keep track so the same slot isn't booked twice.",
   "booking.sales.overview": "Overview",
   "booking.sales.features": "Features",
-  "booking.bookings.documentTitle": "Bookings",
+  "booking/bookings.documentTitle": "Bookings",
   "booking.bookings.titleSuffix": "Bookings",
   "booking.bookings.description": "Manage booking requests and confirmed meetings.",
   "booking.bookings.tab.pending": "Requests",
@@ -33,7 +33,7 @@
   "booking.bookings.errorConfirm": "Confirmation failed",
   "booking.bookings.errorDecline": "Decline failed",
   "booking.bookings.errorCancel": "Cancellation failed",
-  "booking.bookingDetail.documentTitle": "Booking details",
+  "booking/booking-detail.documentTitle": "Booking details",
   "booking.bookingDetail.back": "← All bookings",
   "booking.bookingDetail.loading": "Loading…",
   "booking.bookingDetail.notFound": "Booking not found",
@@ -66,10 +66,10 @@
   "booking.bookingDetail.cancelling": "Cancelling…",
   "booking.bookingDetail.errorCancel": "Cancellation failed",
   "booking.bookingDetail.cancelButton": "Cancel",
-  "booking.availability.documentTitle": "Availability",
+  "booking/availability.documentTitle": "Availability",
   "booking.availability.titleSuffix": "Availability",
   "booking.availability.description": "Set your weekly availability. Clients can only book slots within these windows.",
-  "booking.availabilitySetup.documentTitle": "Availability",
+  "booking/availability-setup.documentTitle": "Availability",
   "booking.availabilitySetup.title": "Availability",
   "booking.availabilitySetup.description": "Set when you are available for bookings. Clients can only book times within these windows.",
   "booking.availabilitySetup.loading": "Loading…",
@@ -97,7 +97,7 @@
   "booking.availabilitySetup.savedBody": "Your booking link is ready to share with clients.",
   "booking.availabilitySetup.copyLink": "Copy link",
   "booking.availabilitySetup.copied": "Copied!",
-  "booking.services.documentTitle": "Services",
+  "booking/services.documentTitle": "Services",
   "booking.services.titleSuffix": "Services",
   "booking.services.description": "Define what you offer — name, duration, and price. Clients will see these when booking.",
   "booking.services.addService": "Add service",
@@ -106,7 +106,7 @@
   "booking.services.example.introCall.description": "A free 30-minute intro to see if we're a good fit.",
   "booking.services.example.strategy.name": "Strategy session",
   "booking.services.example.strategy.description": "Deep-dive strategy session.",
-  "booking.book.documentTitle": "Book a session",
+  "booking/book.documentTitle": "Book a session",
   "booking.book.title": "Book a session",
   "booking.book.description": "Pick a time that works for you and confirm your appointment.",
   "booking.book.form.chooseService": "Choose a service",
@@ -135,7 +135,7 @@
   "booking.availabilityEditor.day.thu": "Thu",
   "booking.availabilityEditor.day.fri": "Fri",
   "booking.availabilityEditor.day.sat": "Sat",
-  "publicBooking.documentTitle": "Book an appointment",
+  "public-booking.documentTitle": "Book an appointment",
   "publicBooking.title": "Book an appointment",
   "publicBooking.description": "Choose a date and time that works for you.",
   "publicBooking.loadingSlots": "Loading times…",
@@ -209,5 +209,38 @@
   "booking/confirm.label": "Confirm booking",
   "booking/confirm.description": "Confirm a pending booking request",
   "booking/cancel.label": "Cancel booking",
-  "booking/cancel.description": "Cancel a confirmed booking"
+  "booking/cancel.description": "Cancel a confirmed booking",
+  "booking/get-services.label": "Get services",
+  "booking/get-services.description": "List bookable services for a consultant or workspace",
+  "booking/create-service.label": "Create service",
+  "booking/create-service.description": "Create a new bookable service",
+  "booking/update-service.label": "Update service",
+  "booking/update-service.description": "Update an existing bookable service",
+  "booking/delete-service.label": "Delete service",
+  "booking/delete-service.description": "Remove a bookable service",
+  "booking.services.loading": "Loading…",
+  "booking.services.empty": "No services yet. Add your first service to get started.",
+  "booking.services.errorLoad": "Could not load services ({status})",
+  "booking.services.errorSave": "Could not save service",
+  "booking.services.errorDelete": "Could not delete service",
+  "booking.services.deleteConfirm": "Delete this service?",
+  "booking.services.editService": "Edit service",
+  "booking.services.newService": "New service",
+  "booking.services.save": "Save",
+  "booking.services.saving": "Saving…",
+  "booking.services.cancel": "Cancel",
+  "booking.services.edit": "Edit",
+  "booking.services.delete": "Delete",
+  "booking.services.field.name": "Name",
+  "booking.services.field.duration": "Duration (minutes)",
+  "booking.services.field.price": "Price (öre/cents)",
+  "booking.services.field.currency": "Currency",
+  "booking.services.field.description": "Description",
+  "booking.services.field.active": "Active (visible to clients)",
+  "publicBooking.chooseService": "Choose a service",
+  "publicBooking.loadingServices": "Loading services…",
+  "publicBooking.servicesError": "Could not load services.",
+  "publicBooking.noServices": "No bookable services are available right now.",
+  "publicBooking.serviceFree": "Free",
+  "publicBooking.serviceMeta": "{duration} min · {price}"
 }

package/src/get-availability.action.js

@@ -1,52 +1 @@
-import { ResourcesQueries } from '@ossy/resources'
-
-export const id = 'booking/get-availability'
-export const access = 'workspace'
-
-export async function run({ payload, req, log }) {
-  const workspaceId = req?.workspaceId
-
-  if (!workspaceId) {
-    throw Object.assign(new Error('workspaceId is required'), { status: 400 })
-  }
-
-  log?.info(`[booking/get-availability] Loading availability for workspace ${workspaceId}`)
-
-  const resources = await ResourcesQueries.GetResources({
-    type: '@ossy/booking/availability',
-    belongsTo: workspaceId,
-  })
-
-  if (!resources.length) {
-    log?.info('[booking/get-availability] No availability configured')
-    return null
-  }
-
-  // New format: single resource with weeklyWindows array
-  const configResource = resources.find(r => Array.isArray(r.content?.weeklyWindows))
-  if (configResource) {
-    return {
-      id: configResource.id,
-      weeklyWindows: configResource.content.weeklyWindows ?? [],
-      sessionDurations: configResource.content.sessionDurations ?? [60],
-      bufferMinutes: configResource.content.bufferMinutes ?? 0,
-      timezone: configResource.content.timezone ?? 'Europe/Stockholm',
-    }
-  }
-
-  // Legacy format: one resource per day — reconstruct config shape
-  const firstResource = resources[0]
-  return {
-    id: firstResource.id,
-    weeklyWindows: resources
-      .map(r => ({
-        dayOfWeek: r.content?.dayOfWeek,
-        startTime: r.content?.startTime ?? '09:00',
-        endTime: r.content?.endTime ?? '17:00',
-      }))
-      .filter(w => w.dayOfWeek != null),
-    sessionDurations: [firstResource?.content?.sessionDuration ?? 60],
-    bufferMinutes: firstResource?.content?.bufferMinutes ?? 0,
-    timezone: firstResource?.content?.timezone ?? 'Europe/Stockholm',
-  }
-}
+export const metadata = { id: 'booking/get-availability', access: 'workspace' }

package/src/get-availability.task.js

@@ -0,0 +1,51 @@
+import { getBookingResources } from './booking-resources.js'
+
+export const metadata = { id: 'booking/get-availability' }
+
+export async function run({ payload, req, log }) {
+  const workspaceId = req?.workspaceId
+
+  if (!workspaceId) {
+    throw Object.assign(new Error('workspaceId is required'), { status: 400 })
+  }
+
+  log?.info(`[booking/get-availability] Loading availability for workspace ${workspaceId}`)
+
+  const resources = await getBookingResources({
+    type: '@ossy/booking/availability',
+    belongsTo: workspaceId,
+  })
+
+  if (!resources.length) {
+    log?.info('[booking/get-availability] No availability configured')
+    return null
+  }
+
+  // New format: single resource with weeklyWindows array
+  const configResource = resources.find(r => Array.isArray(r.content?.weeklyWindows))
+  if (configResource) {
+    return {
+      id: configResource.id,
+      weeklyWindows: configResource.content.weeklyWindows ?? [],
+      sessionDurations: configResource.content.sessionDurations ?? [60],
+      bufferMinutes: configResource.content.bufferMinutes ?? 0,
+      timezone: configResource.content.timezone ?? 'Europe/Stockholm',
+    }
+  }
+
+  // Legacy format: one resource per day — reconstruct config shape
+  const firstResource = resources[0]
+  return {
+    id: firstResource.id,
+    weeklyWindows: resources
+      .map(r => ({
+        dayOfWeek: r.content?.dayOfWeek,
+        startTime: r.content?.startTime ?? '09:00',
+        endTime: r.content?.endTime ?? '17:00',
+      }))
+      .filter(w => w.dayOfWeek != null),
+    sessionDurations: [firstResource?.content?.sessionDuration ?? 60],
+    bufferMinutes: firstResource?.content?.bufferMinutes ?? 0,
+    timezone: firstResource?.content?.timezone ?? 'Europe/Stockholm',
+  }
+}

package/src/get-available-slots.action.js

@@ -1,89 +1 @@
-import { ResourcesQueries } from '@ossy/resources'
-import { getAvailableSlots } from './availability-engine.js'
-
-export const id = 'booking/get-available-slots'
-export const access = 'public'
-
-const DEFAULT_DURATION = 60 // minutes
-const DEFAULT_RANGE_DAYS = 30
-
-export async function run({ payload, log }) {
-  const { consultantId, duration, from, to } = payload ?? {}
-
-  if (!consultantId) {
-    throw Object.assign(new Error('consultantId is required'), { status: 400 })
-  }
-
-  log?.info(`[booking/get-available-slots] Loading slots for consultant ${consultantId}`)
-
-  const availabilityResources = await ResourcesQueries.GetResources({
-    type: '@ossy/booking/availability',
-    belongsTo: consultantId,
-  })
-
-  if (!availabilityResources.length) {
-    log?.info('[booking/get-available-slots] No availability resources found, returning []')
-    return []
-  }
-
-  // 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 fromDate = from ? new Date(from) : new Date()
-  const toDate = to
-    ? new Date(to)
-    : new Date(Date.now() + DEFAULT_RANGE_DAYS * 24 * 60 * 60 * 1000)
-
-  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 sessionDurations = configResource
-    ? (configResource.content.sessionDurations ?? [DEFAULT_DURATION])
-    : [firstResource?.content?.sessionDuration ?? DEFAULT_DURATION]
-
-  const slotDuration = duration ?? sessionDurations[0] ?? DEFAULT_DURATION
-
-  const slots = getAvailableSlots({
-    availability,
-    bookings: confirmedBookings,
-    fromDate,
-    toDate,
-    duration: slotDuration,
-  })
-
-  log?.info(`[booking/get-available-slots] Returning ${slots.length} slots`)
-  return slots
-}
+export const metadata = { id: 'booking/get-available-slots', access: 'public' }

package/src/get-available-slots.task.js

@@ -0,0 +1,99 @@
+import { getAvailableSlots } from './availability-engine.js'
+import { getBookingResources } from './booking-resources.js'
+
+export const metadata = { id: 'booking/get-available-slots' }
+
+const DEFAULT_DURATION = 60 // minutes
+const DEFAULT_RANGE_DAYS = 30
+
+export async function run ({ payload, log }) {
+  const { consultantId, duration, serviceId, from, to } = payload ?? {}
+
+  if (!consultantId) {
+    throw Object.assign(new Error('consultantId is required'), { status: 400 })
+  }
+
+  log?.info(`[booking/get-available-slots] Loading slots for consultant ${consultantId}`)
+
+  let slotDuration = duration
+
+  if (serviceId) {
+    const serviceResources = await getBookingResources({
+      type: '@ossy/booking/service',
+      belongsTo: consultantId,
+    })
+    const service = serviceResources.find(r => r.id === serviceId)
+    if (service?.content?.duration) {
+      slotDuration = service.content.duration
+    }
+  }
+
+  const availabilityResources = await getBookingResources({
+    type: '@ossy/booking/availability',
+    belongsTo: consultantId,
+  })
+
+  if (!availabilityResources.length) {
+    log?.info('[booking/get-available-slots] No availability resources found, returning []')
+    return []
+  }
+
+  const configResource = availabilityResources.find(r => Array.isArray(r.content?.weeklyWindows))
+  let weeklyWindows, firstResource
+
+  if (configResource) {
+    weeklyWindows = configResource.content.weeklyWindows ?? []
+    firstResource = configResource
+  } else {
+    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 fromDate = from ? new Date(from) : new Date()
+  const toDate = to
+    ? new Date(to)
+    : new Date(Date.now() + DEFAULT_RANGE_DAYS * 24 * 60 * 60 * 1000)
+
+  const allBookingResources = await getBookingResources({
+    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 sessionDurations = configResource
+    ? (configResource.content.sessionDurations ?? [DEFAULT_DURATION])
+    : [firstResource?.content?.sessionDuration ?? DEFAULT_DURATION]
+
+  const resolvedDuration = slotDuration ?? sessionDurations[0] ?? DEFAULT_DURATION
+
+  const slots = getAvailableSlots({
+    availability,
+    bookings: confirmedBookings,
+    fromDate,
+    toDate,
+    duration: resolvedDuration,
+  })
+
+  log?.info(`[booking/get-available-slots] Returning ${slots.length} slots`)
+  return slots
+}

package/src/get-services.action.js

@@ -0,0 +1 @@
+export const metadata = { id: 'booking/get-services', access: 'public' }

package/src/get-services.task.js

@@ -0,0 +1,37 @@
+import { getBookingResources } from './booking-resources.js'
+
+export const metadata = { id: 'booking/get-services' }
+
+export async function run ({ payload, req, log }) {
+  const workspaceId = payload?.consultantId ?? payload?.workspaceId ?? req?.workspaceId
+
+  if (!workspaceId) {
+    throw Object.assign(new Error('consultantId or workspaceId is required'), { status: 400 })
+  }
+
+  log?.info(`[booking/get-services] Loading services for ${workspaceId}`)
+
+  const resources = await getBookingResources({
+    type: '@ossy/booking/service',
+    belongsTo: workspaceId,
+  })
+
+  const includeInactive = payload?.includeInactive === true
+
+  const services = resources
+    .map(r => ({
+      id: r.id,
+      name: r.content?.name ?? r.name,
+      duration: r.content?.duration ?? 60,
+      price: r.content?.price ?? 0,
+      currency: r.content?.currency ?? 'SEK',
+      description: r.content?.description ?? '',
+      active: r.content?.active !== false,
+    }))
+    .filter(s => includeInactive || s.active)
+    .sort((a, b) => (a.name || '').localeCompare(b.name || ''))
+
+  log?.info(`[booking/get-services] Returning ${services.length} service(s)`)
+
+  return services
+}

package/src/index.js

@@ -1,7 +1,26 @@
 export { Definition } from './Definition.js'
+export {
+  location,
+  services,
+  bookings,
+  availability,
+  locationByType,
+} from './locations.js'
+export { metadata as CreateBooking } from './create-booking.action.js'
+export { metadata as CreateService } from './create-service.action.js'
+export { metadata as UpdateService } from './update-service.action.js'
+export { metadata as DeleteService } from './delete-service.action.js'
+export { metadata as SaveAvailability } from './save-availability.action.js'
+export { metadata as ConfirmBooking } from './confirm-booking.action.js'
+export { metadata as DeclineBooking } from './decline-booking.action.js'
+export { metadata as CancelBooking } from './cancel-booking.action.js'
+export { metadata as GetAvailableSlots } from './get-available-slots.action.js'
+export { metadata as GetAvailability } from './get-availability.action.js'
+export { metadata as ListBookings } from './list-bookings.action.js'
+export { metadata as GetServices } from './get-services.action.js'
+export { invokeErrorMessage } from './invoke-error-message.js'
 
 export { ServiceCard } from './ServiceCard.jsx'
-export { BookingForm } from './BookingForm.jsx'
 export { BookingList } from './BookingList.jsx'
 export { AvailabilityEditor } from './AvailabilityEditor.jsx'
 

package/src/invoke-error-message.js

@@ -0,0 +1,10 @@
+/** Normalize errors from `sdk.invoke` (Response, string, or Error). */
+export async function invokeErrorMessage(err, fallback) {
+  if (typeof err === 'string') return err
+  if (err instanceof Response) {
+    const data = await err.json().catch(() => ({}))
+    return data?.message ?? data?.error ?? fallback
+  }
+  if (err instanceof Error) return err.message ?? fallback
+  return fallback
+}

package/src/list-bookings.action.js

@@ -1,36 +1 @@
-import { ResourcesQueries } from '@ossy/resources'
-
-export const id = 'booking/list'
-export const access = 'workspace'
-
-export async function run({ payload, req, log }) {
-  const workspaceId = req?.workspaceId
-  const status = payload?.status ?? null
-
-  log?.info(`[booking/list] Loading bookings for workspace ${workspaceId}`, { status })
-
-  const resources = await ResourcesQueries.GetResources({
-    type: '@ossy/booking/booking',
-    belongsTo: workspaceId,
-  })
-
-  let bookings = resources.map(r => ({
-    id: r.id,
-    ...r.content,
-    createdAt: r.createdAt,
-  }))
-
-  if (status) {
-    bookings = bookings.filter(b => b.status === status)
-  }
-
-  bookings.sort((a, b) => {
-    const dateA = new Date(a.startsAt ?? a.createdAt ?? 0).getTime()
-    const dateB = new Date(b.startsAt ?? b.createdAt ?? 0).getTime()
-    return dateB - dateA
-  })
-
-  log?.info(`[booking/list] Found ${bookings.length} booking(s)`)
-
-  return bookings
-}
+export const metadata = { id: 'booking/list', access: 'workspace' }

package/src/list-bookings.task.js

@@ -0,0 +1,35 @@
+import { getBookingResources } from './booking-resources.js'
+
+export const metadata = { id: 'booking/list' }
+
+export async function run({ payload, req, log }) {
+  const workspaceId = req?.workspaceId
+  const status = payload?.status ?? null
+
+  log?.info(`[booking/list] Loading bookings for workspace ${workspaceId}`, { status })
+
+  const resources = await getBookingResources({
+    type: '@ossy/booking/booking',
+    belongsTo: workspaceId,
+  })
+
+  let bookings = resources.map(r => ({
+    id: r.id,
+    ...r.content,
+    createdAt: r.createdAt,
+  }))
+
+  if (status) {
+    bookings = bookings.filter(b => b.status === status)
+  }
+
+  bookings.sort((a, b) => {
+    const dateA = new Date(a.startsAt ?? a.createdAt ?? 0).getTime()
+    const dateB = new Date(b.startsAt ?? b.createdAt ?? 0).getTime()
+    return dateB - dateA
+  })
+
+  log?.info(`[booking/list] Found ${bookings.length} booking(s)`)
+
+  return bookings
+}

package/src/locations.js

@@ -0,0 +1,14 @@
+/** Booking feature root. Sub-areas use the paths below. */
+export const location = '/@ossy/booking/'
+
+/** Canonical resource locations per area. */
+export const services = '/@ossy/booking/services/'
+export const bookings = '/@ossy/booking/bookings/'
+export const availability = '/@ossy/booking/availability/'
+
+/** Map resource type → canonical location (for create actions). */
+export const locationByType = {
+  '@ossy/booking/service': services,
+  '@ossy/booking/booking': bookings,
+  '@ossy/booking/availability': availability,
+}