@dakkitor/api-contracts 1.1.153 → 1.4.0

package/dist/bookings/bookings.contract.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bookingsContractRouter = exports.BookingArraySchema = exports.PaginatedBookingResponseSchema = exports.FilterCalendarBookingsSchema = exports.CalendarBookingsResponseSchema = exports.DayBookingsSchema = exports.OngoingBookingCategorySchema = exports.OngoingBookingSchema = exports.BookingCategoryGroupSchema = exports.FilterBookingSchema = exports.BatchDeleteBookingResponseSchema = exports.BatchDeleteBookingSchema = exports.BatchUpdateBookingResponseSchema = exports.BatchUpdateBookingSchema = exports.UpdateBookingSchema = exports.UpdateBookingBaseSchema = exports.CreateBookingSchema = exports.CalendarCollaborationGroupSchema = exports.CollaborationGroupHeaderSchema = exports.CalendarJobGroupSchema = exports.CalendarBookingSchema = exports.BookingSchema = exports.CalendarJobSchema = exports.CalendarCollaborationSchema = exports.CalendarCompanySchema = exports.CalendarClientSchema = exports.CalendarLocationSchema = exports.CalendarUserSchema = exports.CalendarWorkerSchema = exports.BookingWorkerSchema = exports.FilterJobInBookingSchema = exports.BookingItemSchema = exports.BookingPaySchema = exports.BookingSortableFieldsSchema = exports.FilterBookingStatusSchema = exports.BookingStatusSchema = exports.BookingTypeSchema = exports.BookingCategoryEnumSchema = exports.BookingType = exports.BookingCategory = void 0;
+exports.BookingArraySchema = exports.PaginatedBookingListResponseSchema = exports.BookingListItemSchema = exports.BookingJobSummarySchema = exports.BookingWorkerSummarySchema = exports.PaginatedBookingResponseSchema = exports.FilterCalendarBookingsSchema = exports.FlatCalendarBookingsResponseSchema = exports.FlatCalendarBookingSchema = exports.CalendarBookingsResponseSchema = exports.DayBookingsSchema = exports.OngoingBookingCategorySchema = exports.OngoingBookingSchema = exports.BookingCategoryGroupSchema = exports.FilterBookingSchema = exports.BatchDeleteBookingResponseSchema = exports.BatchDeleteBookingSchema = exports.BatchUpdateBookingResponseSchema = exports.BatchUpdateBookingSchema = exports.UpdateBookingSchema = exports.UpdateBookingBaseSchema = exports.CreateBookingSchema = exports.CalendarCollaborationGroupSchema = exports.CollaborationGroupHeaderSchema = exports.CalendarJobGroupSchema = exports.CalendarBookingSchema = exports.BookingSchema = exports.BookingJobSchema = exports.CalendarJobSchema = exports.CalendarCollaborationSchema = exports.CalendarCompanySchema = exports.CalendarClientSchema = exports.CalendarLocationSchema = exports.CalendarUserSchema = exports.CalendarWorkerSchema = exports.BookingWorkerSchema = exports.FilterJobInBookingSchema = exports.BookingItemSchema = exports.bookingItemCrossFieldRules = exports.BookingPaySchema = exports.BookingSortFieldMapping = exports.BookingSortableFieldsSchema = exports.FilterBookingStatusSchema = exports.BookingStatusSchema = exports.BookingTypeSchema = exports.BookingCategoryEnumSchema = exports.WorkingDaysSchema = exports.MAX_ACTIVES_FOR_JOB_CHANGE = exports.BookingType = exports.BookingCategory = void 0;
+exports.bookingsContractRouter = exports.BookingConflictsResponseSchema = void 0;
+exports.isBookingJobLocked = isBookingJobLocked;
 const zod_openapi_1 = require("@anatine/zod-openapi");
 const core_1 = require("@ts-rest/core");
 const zod_1 = require("zod");
@@ -11,6 +13,10 @@ const pagination_schema_1 = require("../common/pagination.schema");
 const jobs_contract_1 = require("../jobs/jobs.contract");
 const users_contract_1 = require("../users/users.contract");
 const workers_contract_1 = require("../workers/workers.contract");
+const summary_schemas_1 = require("../shared/summary-schemas");
+const live_booking_schema_1 = require("../shared/live-booking.schema");
+const booking_history_schema_1 = require("../shared/booking-history.schema");
+const contact_suppressions_contract_1 = require("../shared/contact-suppressions.contract");
 (0, zod_openapi_1.extendZodWithOpenApi)(zod_1.z);
 // Enums
 var BookingCategory;
@@ -18,7 +24,7 @@ var BookingCategory;
     BookingCategory["ATTEMPT"] = "ATTEMPT";
     BookingCategory["FAILED_START"] = "FAILED_START";
     BookingCategory["IN_PROGRESS"] = "IN_PROGRESS";
-    BookingCategory["COMPLETED"] = "COMPLETED";
+    BookingCategory["FINISHED_THE_JOB"] = "FINISHED_THE_JOB";
     BookingCategory["CANCELLED"] = "CANCELLED";
 })(BookingCategory || (exports.BookingCategory = BookingCategory = {}));
 var BookingType;
@@ -47,6 +53,50 @@ var BookingType;
     BookingType["STARTED_THE_JOB"] = "STARTED_THE_JOB";
     BookingType["COMPLETED"] = "COMPLETED";
 })(BookingType || (exports.BookingType = BookingType = {}));
+/**
+ * Max number of active days a booking may have accrued and still allow its job
+ * to be reassigned. Expressed in active-day terms so the date-based estimate
+ * below can later be swapped for an exact COUNT(actives) with no rule change.
+ */
+exports.MAX_ACTIVES_FOR_JOB_CHANGE = 3;
+const MS_PER_DAY = 86400000;
+/** UTC midnight (ms) for a 'YYYY-MM-DD' string or a Date — matches this codebase's UTC date convention. */
+function utcDayStart(value) {
+    const d = typeof value === 'string' ? new Date(value) : value;
+    return Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());
+}
+/**
+ * Whether a booking's job is locked from reassignment because it has real
+ * history. Only IN_PROGRESS / FINISHED_THE_JOB can lock (the categories where
+ * Active records exist). The active-day count is *estimated* from dates:
+ * one active per calendar day from startDate to min(today, endDate), inclusive.
+ *
+ * `category` is typed as string so callers can pass the discriminated-union
+ * literal (web `booking.status.category`) or the entity VO value without enum
+ * coercion.
+ */
+function isBookingJobLocked(args) {
+    const { category, startDate, endDate, now } = args;
+    if (category !== BookingCategory.IN_PROGRESS &&
+        category !== BookingCategory.FINISHED_THE_JOB) {
+        return false;
+    }
+    const start = utcDayStart(startDate);
+    const today = utcDayStart(now);
+    const endRef = endDate != null && utcDayStart(endDate) < today
+        ? utcDayStart(endDate)
+        : today;
+    const estimatedActiveDays = Math.floor((endRef - start) / MS_PER_DAY) + 1;
+    return estimatedActiveDays > exports.MAX_ACTIVES_FOR_JOB_CHANGE;
+}
+// ─── Schema Definitions ────────────────────────────────────────────────────
+exports.WorkingDaysSchema = zod_1.z
+    .array(zod_1.z.number().int().min(1).max(7))
+    .min(1, 'At least one working day is required')
+    .refine((days) => new Set(days).size === days.length, {
+    message: 'Working days must be unique',
+})
+    .describe('Working days as ISO weekday numbers (1=Mon … 7=Sun)');
 // Enum Schemas
 exports.BookingCategoryEnumSchema = zod_1.z
     .nativeEnum(BookingCategory)
@@ -54,8 +104,7 @@ exports.BookingCategoryEnumSchema = zod_1.z
 exports.BookingTypeSchema = zod_1.z
     .nativeEnum(BookingType)
     .openapi({ title: 'BookingType' });
-exports.BookingStatusSchema = zod_1.z
-    .discriminatedUnion('category', [
+exports.BookingStatusSchema = zod_1.z.discriminatedUnion('category', [
     zod_1.z.object({
         category: zod_1.z.literal('ATTEMPT'),
         type: zod_1.z.enum([
@@ -67,7 +116,7 @@ exports.BookingStatusSchema = zod_1.z
             'REFUSED_BY_FIRST_BECAUSE_OF_DISTANCE',
             'WAITING_FOR_CONFIRMATION',
             'CONFIRMED',
-        ]),
+        ], { message: 'Required' }),
     }),
     zod_1.z.object({
         category: zod_1.z.literal('FAILED_START'),
@@ -80,7 +129,7 @@ exports.BookingStatusSchema = zod_1.z
             'DIDNT_START_OVERBOOK_BY_CLIENT',
             'DIDNT_START_OVERBOOK_BY_US',
             'ANOTHER_SITUATION',
-        ]),
+        ], { message: 'Required' }),
     }),
     zod_1.z.object({
         category: zod_1.z.literal('IN_PROGRESS'),
@@ -89,18 +138,17 @@ exports.BookingStatusSchema = zod_1.z
             'ON_THE_WAY_TO_THE_SITE',
             'AT_THE_INDUCTION',
             'STARTED_THE_JOB',
-        ]),
+        ], { message: 'Required' }),
     }),
     zod_1.z.object({
-        category: zod_1.z.literal('COMPLETED'),
-        type: zod_1.z.literal('COMPLETED'),
+        category: zod_1.z.literal('FINISHED_THE_JOB'),
+        type: zod_1.z.literal('COMPLETED', { message: 'Required' }),
     }),
     zod_1.z.object({
         category: zod_1.z.literal('CANCELLED'),
-        type: zod_1.z.enum(['CANCELLED', 'JOB_CANCELLED']),
+        type: zod_1.z.enum(['CANCELLED', 'JOB_CANCELLED'], { message: 'Required' }),
     }),
-])
-    .openapi({ title: 'BookingStatus' });
+]);
 exports.FilterBookingStatusSchema = zod_1.z
     .discriminatedUnion('category', [
     zod_1.z.object({
@@ -145,7 +193,7 @@ exports.FilterBookingStatusSchema = zod_1.z
             .optional(),
     }),
     zod_1.z.object({
-        category: zod_1.z.literal('COMPLETED'),
+        category: zod_1.z.literal('FINISHED_THE_JOB'),
         type: zod_1.z.literal('COMPLETED').optional(),
     }),
     zod_1.z.object({
@@ -169,27 +217,36 @@ exports.BookingSortableFieldsSchema = zod_1.z
     'updatedAt',
 ])
     .openapi({ title: 'BookingSortableFields' });
+/** Maps sort field values to ability field paths on SortBookingSchema. */
+exports.BookingSortFieldMapping = {
+    status: 'status',
+    startDate: 'startDate',
+    endDate: 'endDate',
+    workerName: 'workerName',
+    payRate: 'payRate',
+    secondAgent: 'agentId',
+    collaborationCompany: 'job.companyId',
+    collaborationClient: 'job.clientId',
+    collaborationAgent: 'job.userId',
+    createdAt: 'createdAt',
+    updatedAt: 'updatedAt',
+};
 // Nested Schemas
-exports.BookingPaySchema = zod_1.z
-    .object({
-    rate: zod_1.z.coerce.number().describe('Pay Rate'),
-    unit: common_schemas_1.RateUnitSchema.default('HOURLY').describe('Pay Unit'),
-})
-    .openapi({ title: 'BookingPay' });
+exports.BookingPaySchema = zod_1.z.object({
+    rate: zod_1.z.coerce.number().describe('Pay rate'),
+    unit: common_schemas_1.RateUnitSchema.default('HOURLY').describe('Pay unit'),
+});
 // ResourceIdSchema is imported from common-schemas
-exports.BookingItemSchema = zod_1.z
-    .object({
-    worker: common_schemas_1.ResourceIdSchema.describe('Worker to Book'),
-    startDate: zod_1.z.string().date().describe('Start Date'),
-    endDate: zod_1.z.string().date().nullable().optional().describe('End Date'),
-    pay: exports.BookingPaySchema.optional().describe('Pay Information'),
-    status: exports.BookingStatusSchema.optional().describe('Booking Status'),
-})
-    .superRefine((data, ctx) => {
+/**
+ * Cross-field validation rules shared by every schema that captures booking
+ * details (BookingItemSchema and CandidateBookingFieldsSchema), so the rules
+ * cannot drift between the regular and candidate booking flows.
+ */
+const bookingItemCrossFieldRules = (data, ctx) => {
     if (data.status?.type === 'COMPLETED' && !data.endDate) {
         ctx.addIssue({
             code: zod_1.z.ZodIssueCode.custom,
-            message: 'End date is required when a booking is marked as completed',
+            message: 'End date is required when a booking is marked as Finished the job.',
             path: ['endDate'],
         });
     }
@@ -198,12 +255,49 @@ exports.BookingItemSchema = zod_1.z
         if (data.startDate > today) {
             ctx.addIssue({
                 code: zod_1.z.ZodIssueCode.custom,
-                message: "IN_PROGRESS booking startDate must be before or equal to today's date",
+                message: "In Progress booking start date must be before or equal to today's date.",
                 path: ['startDate'],
             });
         }
     }
+    if (data.status?.category === 'FINISHED_THE_JOB' && data.endDate) {
+        const today = new Date().toISOString().split('T')[0];
+        if (data.endDate > today) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'Cannot set status to Finished the Job when end date is in the future.',
+                path: ['status', 'category'],
+            });
+        }
+    }
+    if ((data.status?.category === 'FAILED_START' ||
+        data.status?.category === 'CANCELLED') &&
+        (data.comment ?? '').trim().length <= 8) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            message: 'too short',
+            path: ['comment'],
+        });
+    }
+};
+exports.bookingItemCrossFieldRules = bookingItemCrossFieldRules;
+exports.BookingItemSchema = zod_1.z
+    .object({
+    worker: common_schemas_1.ResourceIdSchema.describe('Worker to Book'),
+    startDate: zod_1.z.string().date().describe('Start Date'),
+    endDate: zod_1.z.string().date().nullable().optional().describe('End Date'),
+    expectedEndDate: zod_1.z
+        .string()
+        .date()
+        .nullable()
+        .optional()
+        .describe('Expected End Date'),
+    pay: exports.BookingPaySchema.optional().describe('Pay Information'),
+    status: exports.BookingStatusSchema.optional().describe('Booking Status'),
+    comment: zod_1.z.string().optional().describe('Optional comment'),
+    workingDays: exports.WorkingDaysSchema.optional().describe('Working days (defaults to Mon–Fri when omitted)'),
 })
+    .superRefine(exports.bookingItemCrossFieldRules)
     .openapi({ title: 'BookingItem' });
 exports.FilterJobInBookingSchema = zod_1.z
     .object({
@@ -221,6 +315,9 @@ exports.FilterJobInBookingSchema = zod_1.z
         .nullable()
         .describe('Search Company'),
     tradeId: zod_1.z.string().uuid().optional().nullable().describe('Trade'),
+    location: common_schemas_1.LocationFilterSchema.optional()
+        .nullable()
+        .describe('Filter by location'),
 })
     .openapi({ title: 'FilterJobInBooking' });
 exports.BookingWorkerSchema = zod_1.z.object({
@@ -240,13 +337,11 @@ exports.CalendarWorkerSchema = zod_1.z
     lastName: zod_1.z.string().optional().nullable().describe('Last Name'),
 })
     .openapi({ title: 'CalendarWorker' });
-exports.CalendarUserSchema = zod_1.z
-    .object({
+exports.CalendarUserSchema = zod_1.z.object({
     id: zod_1.z.string().uuid().describe('User ID'),
     firstName: zod_1.z.string().describe('First Name'),
     lastName: zod_1.z.string().describe('Last Name'),
-})
-    .openapi({ title: 'CalendarUser' });
+});
 exports.CalendarLocationSchema = zod_1.z
     .object({
     postcode: zod_1.z.string().optional().nullable().describe('Postcode'),
@@ -264,7 +359,7 @@ exports.CalendarCompanySchema = zod_1.z
     .openapi({ title: 'CalendarCompany' });
 exports.CalendarCollaborationSchema = zod_1.z
     .object({
-    id: zod_1.z.string().uuid().describe('Collaboration ID'),
+    id: zod_1.z.string().uuid().nullable().describe('Collaboration ID'),
     userId: zod_1.z
         .string()
         .uuid()
@@ -279,7 +374,7 @@ exports.CalendarCollaborationSchema = zod_1.z
 exports.CalendarJobSchema = zod_1.z
     .object({
     id: zod_1.z.string().uuid().describe('Job ID'),
-    tradeId: zod_1.z.string().uuid().describe('Trade ID'),
+    tradeId: zod_1.z.string().uuid().nullable().describe('Trade ID'),
     createdById: zod_1.z
         .string()
         .uuid()
@@ -287,43 +382,58 @@ exports.CalendarJobSchema = zod_1.z
         .optional()
         .describe('Creator User ID (used for CASL condition evaluation)'),
     location: exports.CalendarLocationSchema.optional().nullable().describe('Location'),
-    currentCollaboration: exports.CalendarCollaborationSchema.nullable()
+    collaboration: exports.CalendarCollaborationSchema.nullable()
         .optional()
-        .describe('Current Collaboration'),
+        .describe('Collaboration'),
     createdAt: zod_1.z
         .union([zod_1.z.string().datetime(), zod_1.z.date()])
         .transform((val) => (val instanceof Date ? val.toISOString() : val))
         .describe('Creation Date'),
 })
     .openapi({ title: 'CalendarJob' });
+// BookingJobSchema overrides JobSchema.collaboration to use the summary shape.
+// findOne (and create/update) synthesize collaboration from the booking's own
+// denormalized snapshot (booking.client / company / faUser), so id/status are
+// always null. CollaborationSummarySchema accepts null id/status (Task 7).
+exports.BookingJobSchema = jobs_contract_1.JobSchema.extend({
+    collaboration: summary_schemas_1.CollaborationSummarySchema.nullable().optional(),
+    tradeId: zod_1.z.string().uuid().nullable(),
+}).openapi({ title: 'BookingJob' });
 // Main Schemas
 exports.BookingSchema = zod_1.z
     .object({
     id: zod_1.z.string().uuid().describe('Booking ID'),
-    status: exports.BookingStatusSchema.describe('Booking Status'),
+    status: exports.BookingStatusSchema,
     startDate: zod_1.z
         .union([zod_1.z.string(), zod_1.z.date()])
-        .transform((val) => (val instanceof Date ? val.toISOString() : val))
-        .describe('Start Date'),
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
     endDate: zod_1.z
         .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
         .transform((val) => (val instanceof Date ? val.toISOString() : val))
         .nullable()
-        .optional()
-        .describe('End Date'),
-    worker: workers_contract_1.WorkerSchema.describe('Worker'),
-    user: users_contract_1.UserSchema.describe('User'),
-    pay: exports.BookingPaySchema.describe('Pay Information'),
-    job: jobs_contract_1.JobSchema.describe('Job'),
-    userId: zod_1.z.string().uuid().describe('User ID'),
+        .optional(),
+    expectedEndDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional(),
+    worker: workers_contract_1.WorkerSchema,
+    user: users_contract_1.UserSchema,
+    pay: exports.BookingPaySchema,
+    job: exports.BookingJobSchema,
+    userId: zod_1.z.string().uuid(),
+    // Denormalized first agent — see BookingListItemSchema.faUserId. Required
+    // so the FieldFilterInterceptor can enforce the FA read-rule condition that
+    // gates job.collaboration client/company.
+    faUserId: zod_1.z.string().uuid().nullable().optional(),
+    comment: zod_1.z.string().nullable(),
+    workingDays: exports.WorkingDaysSchema,
     createdAt: zod_1.z
         .union([zod_1.z.string().datetime(), zod_1.z.date()])
-        .transform((val) => (val instanceof Date ? val.toISOString() : val))
-        .describe('Creation Date'),
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
     updatedAt: zod_1.z
         .union([zod_1.z.string().datetime(), zod_1.z.date()])
-        .transform((val) => (val instanceof Date ? val.toISOString() : val))
-        .describe('Last Update Date'),
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
 })
     .openapi({ title: 'Booking' });
 exports.CalendarBookingSchema = zod_1.z
@@ -340,9 +450,16 @@ exports.CalendarBookingSchema = zod_1.z
         .nullable()
         .optional()
         .describe('End Date'),
+    expectedEndDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional()
+        .describe('Expected End Date'),
     worker: exports.CalendarWorkerSchema.describe('Worker'),
     user: exports.CalendarUserSchema.describe('User'),
     userId: zod_1.z.string().uuid().describe('User ID'),
+    comment: zod_1.z.string().nullable().optional().describe('Optional comment'),
     createdAt: zod_1.z
         .union([zod_1.z.string().datetime(), zod_1.z.date()])
         .transform((val) => (val instanceof Date ? val.toISOString() : val))
@@ -363,7 +480,9 @@ exports.CalendarJobGroupSchema = zod_1.z
     .openapi({ title: 'CalendarJobGroup' });
 exports.CollaborationGroupHeaderSchema = zod_1.z
     .object({
-    id: zod_1.z.string().uuid().describe('Collaboration ID'),
+    id: zod_1.z
+        .string()
+        .describe('Group key. A real collaboration UUID in the calendar view, or a synthetic composite key (collab:client|company|fa / creator:<id>) in the actives view.'),
     userId: zod_1.z
         .string()
         .uuid()
@@ -386,6 +505,10 @@ exports.CalendarCollaborationGroupSchema = zod_1.z
     .openapi({ title: 'CalendarCollaborationGroup' });
 exports.CreateBookingSchema = zod_1.z
     .object({
+    submissionId: zod_1.z
+        .string()
+        .uuid()
+        .describe('Stable idempotency key for this logical booking submission'),
     job: common_schemas_1.ResourceIdSchema.describe('Job'),
     bookings: zod_1.z.array(exports.BookingItemSchema).describe('List of Workers to Book'),
 })
@@ -398,24 +521,34 @@ exports.CreateBookingSchema = zod_1.z
 exports.UpdateBookingBaseSchema = zod_1.z.object({
     startDate: zod_1.z.string().date().optional().describe('Start Date'),
     endDate: zod_1.z.string().date().optional().nullable().describe('End Date'),
+    expectedEndDate: zod_1.z
+        .string()
+        .date()
+        .optional()
+        .nullable()
+        .describe('Expected End Date'),
     pay: exports.BookingPaySchema.optional().describe('Pay Information'),
     status: exports.BookingStatusSchema.optional().describe('Booking Status'),
+    comment: zod_1.z.string().nullable().optional().describe('Optional comment'),
+    workingDays: exports.WorkingDaysSchema.optional().describe('Working days (1=Mon … 7=Sun)'),
+    job: common_schemas_1.ResourceIdSchema.optional().describe('Reassign the booking to a different job (corrective). Cascades to denormalized fields and active records.'),
 });
 exports.UpdateBookingSchema = exports.UpdateBookingBaseSchema.superRefine((data, ctx) => {
     if (data.status?.type === 'COMPLETED' && !data.endDate) {
         ctx.addIssue({
             code: zod_1.z.ZodIssueCode.custom,
-            message: 'End date is required when a booking is marked as completed',
+            message: 'End date is required when a booking is marked as Finished the job.',
             path: ['endDate'],
         });
     }
     if (data.endDate) {
         const today = new Date().toISOString().split('T')[0];
-        if (data.endDate === today && data.status?.category !== 'COMPLETED') {
+        if (data.endDate === today &&
+            data.status?.category !== 'FINISHED_THE_JOB') {
             ctx.addIssue({
                 code: zod_1.z.ZodIssueCode.custom,
-                message: 'When setting endDate to today, booking status must be COMPLETED',
-                path: ['status'],
+                message: 'When setting endDate to today, booking status must be FINISHED_THE_JOB',
+                path: ['status', 'category'],
             });
         }
     }
@@ -424,11 +557,21 @@ exports.UpdateBookingSchema = exports.UpdateBookingBaseSchema.superRefine((data,
         if (data.startDate > today) {
             ctx.addIssue({
                 code: zod_1.z.ZodIssueCode.custom,
-                message: "IN_PROGRESS booking startDate must be before or equal to today's date",
+                message: "In Progress booking start date must be before or equal to today's date.",
                 path: ['startDate'],
             });
         }
     }
+    if (data.status?.category === 'FINISHED_THE_JOB' && data.endDate) {
+        const today = new Date().toISOString().split('T')[0];
+        if (data.endDate > today) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'Cannot set status to Finished the Job when end date is in the future.',
+                path: ['status', 'category'],
+            });
+        }
+    }
 }).openapi({ title: 'UpdateBooking' });
 exports.BatchUpdateBookingSchema = zod_1.z
     .object({
@@ -460,37 +603,35 @@ exports.BatchDeleteBookingResponseSchema = zod_1.z
 })
     .openapi({ title: 'BatchDeleteBookingResponse' });
 exports.FilterBookingSchema = pagination_query_schema_1.PaginationQuerySchema.extend({
-    workerName: zod_1.z.string().optional().nullable().describe('Search Worker'),
-    agentId: zod_1.z
-        .string()
-        .uuid()
-        .optional()
+    startDate: common_schemas_1.DateRangeSchema.optional()
         .nullable()
-        .describe('Search Second Agent'),
+        .describe('Filter by start date range'),
+    workerName: common_schemas_1.NameFilterSchema.optional()
+        .nullable()
+        .describe('Search Worker (value) with optional exact match'),
     status: exports.FilterBookingStatusSchema.optional()
         .nullable()
         .describe('Filter by status'),
     job: exports.FilterJobInBookingSchema.optional()
         .nullable()
         .describe('Filter by job details'),
+    agentId: zod_1.z
+        .string()
+        .uuid()
+        .optional()
+        .nullable()
+        .describe('Search Second Agent'),
+    endDate: common_schemas_1.DateRangeSchema.optional()
+        .nullable()
+        .describe('Filter by end date range'),
     createdAt: common_schemas_1.DateRangeSchema.optional()
         .nullable()
         .describe('Filter by created date range'),
     updatedAt: common_schemas_1.DateRangeSchema.optional()
         .nullable()
         .describe('Filter by updated date range'),
-    startDate: common_schemas_1.DateRangeSchema.optional()
-        .nullable()
-        .describe('Filter by start date range'),
-    endDate: common_schemas_1.DateRangeSchema.optional()
-        .nullable()
-        .describe('Filter by end date range'),
-    sortBy: exports.BookingSortableFieldsSchema.optional()
-        .nullable()
-        .describe('Field to sort by'),
-    sortOrder: common_schemas_1.SortOrderSchema.optional().nullable().describe('Sort order'),
+    sort: (0, common_schemas_1.createSortArraySchema)(exports.BookingSortableFieldsSchema),
 });
-const actives_contract_1 = require("../actives/actives.contract");
 exports.BookingCategoryGroupSchema = zod_1.z
     .object({
     bookings: zod_1.z
@@ -500,9 +641,13 @@ exports.BookingCategoryGroupSchema = zod_1.z
 })
     .openapi({ title: 'BookingCategoryGroup' });
 // Ongoing bookings can have an associated Active record for the specific day
+// ActiveSchema is referenced via lazy require() to break the bookings↔actives
+// circular import (both contracts reference each other's schemas).
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const getActiveSchema = () => require('../actives/actives.contract').ActiveSchema;
 exports.OngoingBookingSchema = exports.BookingSchema.extend({
     active: zod_1.z
-        .lazy(() => actives_contract_1.ActiveSchema.omit({ booking: true }))
+        .lazy(() => getActiveSchema().omit({ booking: true }))
         .optional()
         .nullable()
         .describe('Active record for the specific calendar date'),
@@ -543,31 +688,167 @@ exports.CalendarBookingsResponseSchema = zod_1.z
         .describe('Pagination metadata (search mode only)'),
 })
     .openapi({ title: 'CalendarBookingsResponse' });
-exports.FilterCalendarBookingsSchema = exports.FilterBookingSchema.extend({
+/** Flat calendar booking with embedded job context — frontend groups by date/collaboration/job */
+exports.FlatCalendarBookingSchema = zod_1.z
+    .object({
+    id: zod_1.z.string().uuid(),
+    status: exports.BookingStatusSchema,
     startDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+    endDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional(),
+    expectedEndDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional(),
+    createdAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+    userId: zod_1.z.string().uuid().describe('Booking owner User ID'),
+    // Denormalized first agent — see BookingListItemSchema.faUserId. Required so
+    // the FieldFilterInterceptor can enforce the FA read-rule condition that
+    // gates job.collaboration client/company on the calendar view too.
+    faUserId: zod_1.z
         .string()
-        .date()
-        .optional()
-        .describe('Start date for calendar view'),
-    limit: zod_1.z.coerce
-        .number()
+        .uuid()
+        .nullable()
         .optional()
-        .default(7)
-        .describe('Days per page (default 7)'),
-    includeEmptyDays: zod_1.z
-        .preprocess((val) => val === 'true' || val === true, zod_1.z.boolean())
+        .describe('First Agent User ID'),
+    comment: zod_1.z.string().nullable().optional().describe('Optional comment'),
+    worker: exports.CalendarWorkerSchema,
+    user: exports.CalendarUserSchema,
+    job: zod_1.z.object({
+        id: zod_1.z.string().uuid(),
+        tradeId: zod_1.z.string().uuid().nullable(),
+        createdById: zod_1.z.string().uuid().nullable().optional(),
+        createdAt: zod_1.z
+            .union([zod_1.z.string().datetime(), zod_1.z.date()])
+            .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+        location: exports.CalendarLocationSchema.optional().nullable(),
+        collaboration: zod_1.z
+            .object({
+            id: zod_1.z.string().uuid().nullable(),
+            userId: zod_1.z.string().uuid().nullable().optional(),
+            client: exports.CalendarClientSchema.nullable().optional(),
+            company: exports.CalendarCompanySchema.nullable().optional(),
+            user: exports.CalendarUserSchema.nullable().optional().describe('FA Agent'),
+        })
+            .nullable()
+            .optional(),
+    }),
+})
+    .openapi({ title: 'FlatCalendarBooking' });
+/** Response for calendar endpoint — uses `data` key for interceptor compatibility */
+exports.FlatCalendarBookingsResponseSchema = zod_1.z
+    .object({
+    mode: zod_1.z.enum(['calendar', 'search']),
+    startDate: zod_1.z.string().date().nullable(),
+    endDate: zod_1.z.string().date().nullable(),
+    data: zod_1.z.array(exports.FlatCalendarBookingSchema),
+    pagination: zod_1.z
+        .object({
+        totalBookings: zod_1.z.number(),
+    })
+        .optional(),
+})
+    .openapi({ title: 'FlatCalendarBookingsResponse' });
+exports.FilterCalendarBookingsSchema = exports.FilterBookingSchema.omit({
+    page: true,
+    limit: true,
+    startDate: true,
+    endDate: true,
+    createdAt: true,
+    updatedAt: true,
+})
+    .extend({
+    weekEnding: zod_1.z
+        .string()
+        .date()
         .optional()
-        .default(true)
-        .describe('Include days with no bookings (default true)'),
-}).openapi({ title: 'FilterCalendarBookings' });
+        .describe('Week-ending Sunday date for calendar view'),
+})
+    .openapi({ title: 'FilterCalendarBookings' });
 exports.PaginatedBookingResponseSchema = (0, pagination_schema_1.createPaginatedResponseSchema)(exports.BookingSchema)
     .describe('Bookings retrieved successfully')
     .openapi({ title: 'BookingsPaginatedResponse' });
+// ─── Booking List Item Schemas ────────────────────────────────────────────────
+// Slim schemas used by the bookings list/table view.
+// Includes phone numbers for WhatsApp button, but avoids full worker/user payloads.
+// Worker summary with phone numbers (needed for WhatsApp button in table)
+exports.BookingWorkerSummarySchema = summary_schemas_1.WorkerSummarySchema.extend({
+    phoneNumbers: zod_1.z.array(workers_contract_1.WorkerPhoneNumberSchema).default([]),
+    bookingHistory: booking_history_schema_1.BookingHistorySchema.optional(),
+}).openapi({ title: 'BookingWorkerSummary' });
+// Job summary for booking context (only tradeId + location + collaboration)
+exports.BookingJobSummarySchema = zod_1.z
+    .object({
+    id: zod_1.z.string().uuid(),
+    tradeId: zod_1.z.string().uuid().nullable(),
+    createdById: zod_1.z.string().uuid().nullable().optional(),
+    createdBy: summary_schemas_1.UserSummarySchema.nullable().optional(),
+    location: summary_schemas_1.LocationSummarySchema.nullable().optional(),
+    collaboration: summary_schemas_1.CollaborationSummarySchema.nullable().optional(),
+})
+    .openapi({ title: 'BookingJobSummary' });
+exports.BookingListItemSchema = zod_1.z
+    .object({
+    id: zod_1.z.string().uuid(),
+    startDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+    endDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional(),
+    expectedEndDate: zod_1.z
+        .union([zod_1.z.string(), zod_1.z.date(), zod_1.z.null()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val))
+        .nullable()
+        .optional(),
+    userId: zod_1.z.string().uuid(),
+    // Denormalized collaboration owner (first agent). Exposed so the
+    // FieldFilterInterceptor can evaluate the FA read-rule condition
+    // (`faUserId == me`) that gates the collaboration client/company fields.
+    // Without it the condition is unverifiable and passes vacuously, leaking
+    // those fields to second agents on collaborations they don't own.
+    faUserId: zod_1.z.string().uuid().nullable().optional(),
+    status: exports.BookingStatusSchema,
+    comment: zod_1.z.string().nullable(),
+    pay: exports.BookingPaySchema,
+    worker: exports.BookingWorkerSummarySchema,
+    user: summary_schemas_1.UserSummarySchema,
+    job: exports.BookingJobSummarySchema,
+    createdAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+    updatedAt: zod_1.z
+        .union([zod_1.z.string().datetime(), zod_1.z.date()])
+        .transform((val) => (val instanceof Date ? val.toISOString() : val)),
+})
+    .openapi({ title: 'BookingListItem' });
+exports.PaginatedBookingListResponseSchema = (0, pagination_schema_1.createPaginatedResponseSchema)(exports.BookingListItemSchema)
+    .describe('Bookings list retrieved successfully')
+    .openapi({ title: 'BookingListPaginatedResponse' });
 exports.BookingArraySchema = zod_1.z
     .array(exports.BookingSchema)
     .openapi({ title: 'BookingArray' });
 // Contract Definition
 const c = (0, core_1.initContract)();
+exports.BookingConflictsResponseSchema = zod_1.z
+    .array(zod_1.z.object({
+    workerId: zod_1.z.string().uuid(),
+    /** Live (current or upcoming) bookings on this worker's identity, ending-last first. */
+    conflicts: zod_1.z.array(live_booking_schema_1.LiveBookingSummarySchema),
+    /** Active contact suppression on this worker's identity, when present. */
+    suppression: contact_suppressions_contract_1.SuppressionStateSchema.optional(),
+}))
+    .openapi({ title: 'BookingConflictsResponse' });
 exports.bookingsContractRouter = c.router({
     create: {
         method: 'POST',
@@ -583,11 +864,22 @@ exports.bookingsContractRouter = c.router({
             openApi: { operationId: 'createBookings' },
         },
     },
+    checkConflicts: {
+        method: 'GET',
+        path: '/v2/bookings/conflicts',
+        query: zod_1.z.object({
+            /** CSV of worker ids (max 50) to check. */
+            workerIds: zod_1.z.string().min(1),
+        }),
+        responses: { 200: exports.BookingConflictsResponseSchema },
+        summary: 'Advisory pre-booking conflict check: live or upcoming bookings on each worker identity (self, curated siblings, curated denorm). Does not block creation.',
+        metadata: { tags: ['Bookings'] },
+    },
     findAll: {
         method: 'GET',
         path: '/v2/bookings',
         responses: {
-            200: exports.PaginatedBookingResponseSchema,
+            200: exports.PaginatedBookingListResponseSchema,
         },
         query: exports.FilterBookingSchema,
         summary: 'Get all bookings',
@@ -683,7 +975,7 @@ exports.bookingsContractRouter = c.router({
         method: 'GET',
         path: '/v2/bookings/calendar',
         responses: {
-            200: exports.CalendarBookingsResponseSchema,
+            200: exports.FlatCalendarBookingsResponseSchema,
         },
         query: exports.FilterCalendarBookingsSchema,
         summary: 'Get bookings grouped by day for calendar view',