@webitel/api-services 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webitel/api-services",
-	"version": "1.0.7",
+	"version": "1.0.9",
 	"private": false,
 	"repository": {
 		"type": "git",

package/src/api/clients/calendars/__tests__/calendars.spec.ts

@@ -262,6 +262,77 @@ describe('CalendarsAPI', () => {
 			});
 		});
 
+		it('treats omitted work_start on a working except as midnight (protobuf omits 0)', async () => {
+			mockCalendarService.readCalendar.mockResolvedValueOnce({
+				data: {
+					name: 'Cal',
+					timezone: {
+						id: 'tz-1',
+					},
+					excepts: [
+						{
+							name: 'ff',
+							date: 123,
+							repeat: true,
+							working: true,
+							work_stop: 1200,
+						},
+					],
+				},
+			});
+
+			const result = await CalendarsAPI.get({
+				itemId: 1,
+			});
+
+			expect(result.excepts).toEqual([
+				{
+					name: 'ff',
+					date: 123,
+					repeat: true,
+					working: true,
+					workStart: 0,
+					workStop: 1200,
+				},
+			]);
+		});
+
+		it('keeps midnight (0) holiday workStart/workStop instead of coercing to null', async () => {
+			mockCalendarService.readCalendar.mockResolvedValueOnce({
+				data: {
+					name: 'Cal',
+					timezone: {
+						id: 'tz-1',
+					},
+					excepts: [
+						{
+							name: 'holiday',
+							date: 123,
+							repeat: true,
+							working: true,
+							work_start: 0,
+							work_stop: 60,
+						},
+					],
+				},
+			});
+
+			const result = await CalendarsAPI.get({
+				itemId: 1,
+			});
+
+			expect(result.excepts).toEqual([
+				{
+					name: 'holiday',
+					date: 123,
+					repeat: true,
+					working: true,
+					workStart: 0,
+					workStop: 60,
+				},
+			]);
+		});
+
 		it('defaults accepts to an empty array instead of throwing when missing', async () => {
 			mockCalendarService.readCalendar.mockResolvedValueOnce({
 				data: {

package/src/api/clients/calendars/calendars.ts

@@ -55,8 +55,8 @@ const mapCalendarToUi = (item: ApiParams) => {
 			date: except.date || 0,
 			repeat: except.repeat || false,
 			working: except.working || false,
-			workStart: except.workStart || null,
-			workStop: except.workStop || null,
+			workStart: except.workStart ?? (except.working ? 0 : null),
+			workStop: except.workStop ?? (except.working ? 0 : null),
 		}));
 	}
 	return {

package/src/validations/calendar/__tests__/calendar.validations.spec.ts

@@ -456,6 +456,19 @@ describe('calendarSchema', () => {
 	});
 
 	describe('excepts', () => {
+		it('rejects an except with an empty name', () => {
+			const result = calendarSchema.safeParse({
+				...minimalValidInput,
+				excepts: [
+					{
+						name: '',
+					},
+				],
+			});
+
+			expect(result.success).toBe(false);
+		});
+
 		it('accepts valid except objects', () => {
 			const excepts = [
 				{

package/src/validations/calendar/calendar.validations.ts

@@ -155,8 +155,8 @@ export const getCalendarDayRangeIssues = (
 	});
 };
 
-const exceptUiSchema = z.object({
-	name: z.string().optional(),
+export const calendarExceptSchema = z.object({
+	name: z.string().min(1),
 	date: z
 		.union([
 			z.number(),
@@ -210,5 +210,5 @@ export const calendarSchema = z.object<
 	expires: z.boolean().optional().default(false),
 	accepts: acceptsOfDayUiArraySchema.default(defaultAccepts),
 	specials: z.array(acceptOfDayUiSchema).default(defaultSpecials),
-	excepts: z.array(exceptUiSchema).optional().default([]),
+	excepts: z.array(calendarExceptSchema).optional().default([]),
 });