@webitel/api-services 0.1.66 → 0.1.67

package/package.json

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

package/src/api/clients/slaConditions/slaConditions.ts

@@ -1,10 +1,12 @@
-import { SLAConditionsApiFactory } from 'webitel-sdk';
 import {
-	getDefaultGetListResponse,
-	getDefaultGetParams,
-	getDefaultInstance,
-	getDefaultOpenAPIConfig,
-} from '../../defaults';
+	CreateSLAConditionBody,
+	getSlaconditions,
+	ListSLAConditionsQueryParams,
+	UpdateSLAConditionBody,
+} from '@webitel/api-services/gen';
+import { getShallowFieldsToSendFromZodSchema } from '@webitel/api-services/gen/utils';
+
+import { getDefaultGetListResponse, getDefaultGetParams } from '../../defaults';
 import {
 	applyTransform,
 	camelToSnake,
@@ -13,24 +15,7 @@ import {
 	sanitize,
 	snakeToCamel,
 } from '../../transformers';
-import type { ApiId, ApiParams, UpdateItemParams } from '../_shared/types';
-
-const instance = getDefaultInstance();
-const configuration = getDefaultOpenAPIConfig();
-
-const slaConditionsService = SLAConditionsApiFactory(
-	configuration,
-	'',
-	instance,
-);
-
-const fieldsToSend = [
-	'name',
-	'priorities',
-	'sla_id',
-	'reaction_time',
-	'resolution_time',
-];
+import type { ApiId, ApiParams } from '../_shared/types';
 
 const getConditionsList = async ({
 	parentId,
@@ -38,16 +23,9 @@ const getConditionsList = async ({
 }: {
 	parentId: ApiId;
 } & ApiParams) => {
-	const fieldsToSend = [
-		'page',
-		'size',
-		'q',
-		'sort',
-		'fields',
-		'id',
-		'slaConditionId',
-		'priorityId',
-	];
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		ListSLAConditionsQueryParams,
+	);
 
 	const {
 		page,
@@ -60,25 +38,23 @@ const getConditionsList = async ({
 		priority_id: priorityId,
 	} = applyTransform(rest, [
 		merge(getDefaultGetParams()),
-		(params) => ({
-			...params,
-			q: params.search,
-		}),
 		sanitize(fieldsToSend),
 		camelToSnake(),
 	]);
 
 	try {
-		const response = await slaConditionsService.listSLAConditions(
+		const response = await getSlaconditions().listSLAConditions(
 			String(parentId),
-			page,
-			size,
-			fields,
-			sort,
-			id,
-			q,
-			slaConditionId,
-			priorityId,
+			{
+				page,
+				size,
+				fields,
+				sort,
+				id,
+				q,
+				slaConditionId,
+				priorityId,
+			},
 		);
 		const { items, next } = applyTransform(response.data, [
 			merge(getDefaultGetListResponse()),
@@ -103,15 +79,12 @@ const getCondition = async ({
 	parentId: ApiId;
 	itemId: ApiId;
 }) => {
-	const itemResponseHandler = (item: ApiParams) => {
-		return item.slaCondition;
-	};
+	const itemResponseHandler = (item: ApiParams) => item.slaCondition;
 
 	try {
-		const response = await slaConditionsService.locateSLACondition(
+		const response = await getSlaconditions().locateSLACondition(
 			String(parentId),
 			String(id),
-			fieldsToSend,
 		);
 		return applyTransform(response.data, [
 			snakeToCamel(),
@@ -124,19 +97,25 @@ const getCondition = async ({
 	}
 };
 
-const updateCondition = async ({
+const addCondition = async ({
 	itemInstance,
-	itemId: id,
-}: UpdateItemParams) => {
+	parentId,
+}: {
+	itemInstance: ApiParams;
+	parentId: ApiId;
+}) => {
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		CreateSLAConditionBody,
+	);
+
 	const item = applyTransform(itemInstance, [
-		camelToSnake(),
 		sanitize(fieldsToSend),
+		camelToSnake(),
 	]);
 
 	try {
-		const response = await slaConditionsService.updateSLACondition(
-			itemInstance.slaId,
-			String(id),
+		const response = await getSlaconditions().createSLACondition(
+			String(parentId),
 			item,
 		);
 		return applyTransform(response.data, [
@@ -149,21 +128,26 @@ const updateCondition = async ({
 	}
 };
 
-const addCondition = async ({
+const updateCondition = async ({
 	itemInstance,
-	parentId,
+	itemId: id,
 }: {
 	itemInstance: ApiParams;
-	parentId: ApiId;
+	itemId: ApiId;
 }) => {
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		UpdateSLAConditionBody,
+	);
+
 	const item = applyTransform(itemInstance, [
-		camelToSnake(),
 		sanitize(fieldsToSend),
+		camelToSnake(),
 	]);
 
 	try {
-		const response = await slaConditionsService.createSLACondition(
-			String(parentId),
+		const response = await getSlaconditions().updateSLACondition(
+			String(itemInstance.slaId),
+			String(id),
 			item,
 		);
 		return applyTransform(response.data, [
@@ -184,7 +168,7 @@ const deleteCondition = async ({
 	parentId: ApiId;
 }) => {
 	try {
-		const response = await slaConditionsService.deleteSLACondition(
+		const response = await getSlaconditions().deleteSLACondition(
 			String(parentId),
 			String(id),
 		);

package/src/api/clients/slas/slas.ts

@@ -1,10 +1,12 @@
-import { SLAsApiFactory } from 'webitel-sdk';
 import {
-	getDefaultGetListResponse,
-	getDefaultGetParams,
-	getDefaultInstance,
-	getDefaultOpenAPIConfig,
-} from '../../defaults';
+	CreateSLABody,
+	getSlas,
+	ListSLAsQueryParams,
+	UpdateSLABody,
+} from '@webitel/api-services/gen';
+import { getShallowFieldsToSendFromZodSchema } from '@webitel/api-services/gen/utils';
+
+import { getDefaultGetListResponse, getDefaultGetParams } from '../../defaults';
 import {
 	applyTransform,
 	camelToSnake,
@@ -21,42 +23,24 @@ import type {
 	UpdateItemParams,
 } from '../_shared/types';
 
-const instance = getDefaultInstance();
-const configuration = getDefaultOpenAPIConfig();
-
-const slaService = SLAsApiFactory(configuration, '', instance);
-
-const fieldsToSend = [
-	'name',
-	'description',
-	'valid_from',
-	'valid_to',
-	'calendar',
-	'reaction_time',
-	'resolution_time',
-];
-
 const getSlasList = async (params: ApiParams) => {
-	const fieldsToSend = [
-		'page',
-		'size',
-		'q',
-		'sort',
-		'fields',
-		'id',
-	];
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(ListSLAsQueryParams);
 
 	const { page, size, fields, sort, id, q } = applyTransform(params, [
 		merge(getDefaultGetParams()),
-		(params) => ({
-			...params,
-			q: params.search,
-		}),
 		sanitize(fieldsToSend),
 		camelToSnake(),
 	]);
+
 	try {
-		const response = await slaService.listSLAs(page, size, fields, sort, id, q);
+		const response = await getSlas().listSLAs({
+			page,
+			size,
+			fields,
+			sort,
+			id,
+			q: q || params.search,
+		});
 		const { items, next } = applyTransform(response.data, [
 			merge(getDefaultGetListResponse()),
 		]);
@@ -72,12 +56,10 @@ const getSlasList = async (params: ApiParams) => {
 };
 
 const getSla = async ({ itemId: id }: GetItemParams) => {
-	const itemResponseHandler = (item: ApiParams) => {
-		return item.sla;
-	};
+	const itemResponseHandler = (item: ApiParams) => item.sla;
 
 	try {
-		const response = await slaService.locateSLA(String(id), fieldsToSend);
+		const response = await getSlas().locateSLA(String(id));
 		return applyTransform(response.data, [
 			snakeToCamel(),
 			itemResponseHandler,
@@ -90,12 +72,14 @@ const getSla = async ({ itemId: id }: GetItemParams) => {
 };
 
 const addSla = async ({ itemInstance }: AddItemParams) => {
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(CreateSLABody);
+
 	const item = applyTransform(itemInstance, [
-		camelToSnake(),
 		sanitize(fieldsToSend),
+		camelToSnake(),
 	]);
 	try {
-		const response = await slaService.createSLA(item);
+		const response = await getSlas().createSLA(item);
 		return applyTransform(response.data, [
 			snakeToCamel(),
 		]);
@@ -107,12 +91,15 @@ const addSla = async ({ itemInstance }: AddItemParams) => {
 };
 
 const updateSla = async ({ itemInstance, itemId: id }: UpdateItemParams) => {
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(UpdateSLABody);
+
 	const item = applyTransform(itemInstance, [
-		camelToSnake(),
 		sanitize(fieldsToSend),
+		camelToSnake(),
 	]);
+
 	try {
-		const response = await slaService.updateSLA(String(id), item);
+		const response = await getSlas().updateSLA(String(id), item);
 		return applyTransform(response.data, [
 			snakeToCamel(),
 		]);
@@ -125,7 +112,7 @@ const updateSla = async ({ itemInstance, itemId: id }: UpdateItemParams) => {
 
 const deleteSla = async ({ id }: DeleteItemParams) => {
 	try {
-		const response = await slaService.deleteSLA(String(id));
+		const response = await getSlas().deleteSLA(String(id));
 		return applyTransform(response.data, []);
 	} catch (err) {
 		throw applyTransform(err, [

package/src/validations/_shared/duration.validations.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+
+export const requiredDurationSchema = (min = 1) =>
+	z.union([
+		z.string().min(min),
+		z.number().min(min),
+	]);

package/src/validations/index.ts

@@ -1,3 +1,4 @@
+export * from './_shared/duration.validations';
 export * from './_shared/lookup.validations';
 export * from './auditForm/auditForm.validations';
 export * from './bucket/bucket.validations';
@@ -10,4 +11,6 @@ export * from './contactGroup/contactGroup.validations';
 export * from './contactGroupCondition/contactGroupCondition.validations';
 export * from './OAuth/OAuth.validations';
 export * from './onlineSkill/onlineSkill.validations';
+export * from './sla/sla.validations';
+export * from './slaCondition/slaCondition.validations';
 export * from './types';

package/src/validations/sla/sla.validations.ts

@@ -0,0 +1,49 @@
+import type { WebitelCasesSLA } from '@webitel/api-services/gen/models';
+import { z } from 'zod';
+import { requiredDurationSchema } from '../_shared/duration.validations';
+import { requiredLookupSchema } from '../_shared/lookup.validations';
+import type { ZodShape } from '../types';
+
+const MINUTE_IN_MS = 60000;
+
+export const slaSchema = z
+	.object<ZodShape<WebitelCasesSLA>>({
+		name: z.string().min(1),
+		description: z.string().optional(),
+		calendar: requiredLookupSchema,
+		reactionTime: requiredDurationSchema(),
+		resolutionTime: requiredDurationSchema(),
+		validFrom: z
+			.union([
+				z.string(),
+				z.number(),
+			])
+			.nullish(),
+		validTo: z
+			.union([
+				z.string(),
+				z.number(),
+			])
+			.nullish(),
+	})
+	.superRefine((data, ctx) => {
+		if (!data.validFrom || !data.validTo) return;
+
+		const validFrom = Number(data.validFrom);
+		const validTo = Number(data.validTo);
+
+		if (Number.isNaN(validFrom) || Number.isNaN(validTo)) return;
+
+		if (validFrom > validTo - MINUTE_IN_MS) {
+			ctx.addIssue({
+				code: 'too_big',
+				origin: 'date',
+				maximum: validTo,
+				inclusive: false,
+				input: data.validFrom,
+				path: [
+					'validFrom',
+				],
+			});
+		}
+	});

package/src/validations/slaCondition/slaCondition.validations.ts

@@ -0,0 +1,12 @@
+import type { WebitelCasesSLACondition } from '@webitel/api-services/gen/models';
+import { z } from 'zod';
+import { requiredDurationSchema } from '../_shared/duration.validations';
+import { requiredLookupSchema } from '../_shared/lookup.validations';
+import type { ZodShape } from '../types';
+
+export const slaConditionSchema = z.object<ZodShape<WebitelCasesSLACondition>>({
+	name: z.string().min(1),
+	priorities: z.array(requiredLookupSchema).min(1),
+	reactionTime: requiredDurationSchema(),
+	resolutionTime: requiredDurationSchema(),
+});