@webitel/api-services 0.1.67 → 0.1.68

package/package.json

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

package/src/api/clients/caseCloseReasonGroups/caseCloseReasonGroups.ts

@@ -1,10 +1,12 @@
-import { CloseReasonGroupsApiFactory } from 'webitel-sdk';
 import {
-	getDefaultGetListResponse,
-	getDefaultGetParams,
-	getDefaultInstance,
-	getDefaultOpenAPIConfig,
-} from '../../defaults';
+	CreateCloseReasonGroupBody,
+	getCloseReasonGroups,
+	ListCloseReasonGroupsQueryParams,
+	UpdateCloseReasonGroupBody,
+} from '@webitel/api-services/gen';
+import { getShallowFieldsToSendFromZodSchema } from '@webitel/api-services/gen/utils';
+
+import { getDefaultGetListResponse, getDefaultGetParams } from '../../defaults';
 import {
 	applyTransform,
 	camelToSnake,
@@ -21,48 +23,26 @@ import type {
 	UpdateItemParams,
 } from '../_shared/types';
 
-const instance = getDefaultInstance();
-const configuration = getDefaultOpenAPIConfig();
-
-const closeReasonGroupsService = CloseReasonGroupsApiFactory(
-	configuration,
-	'',
-	instance,
-);
-
-const fieldsToSend = [
-	'name',
-	'description',
-];
-
 const getCloseReasonGroupsList = async (params: ApiParams) => {
-	const fieldsToSend = [
-		'page',
-		'size',
-		'q',
-		'sort',
-		'fields',
-		'id',
-	];
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		ListCloseReasonGroupsQueryParams,
+	);
 
 	const { page, size, fields, sort, id, q } = applyTransform(params, [
 		merge(getDefaultGetParams()),
-		(params) => ({
-			...params,
-			q: params.search,
-		}),
 		sanitize(fieldsToSend),
 		camelToSnake(),
 	]);
+
 	try {
-		const response = await closeReasonGroupsService.listCloseReasonGroups(
+		const response = await getCloseReasonGroups().listCloseReasonGroups({
 			page,
 			size,
 			fields,
 			sort,
 			id,
-			q,
-		);
+			q: q || params.search,
+		});
 		const { items, next } = applyTransform(response.data, [
 			merge(getDefaultGetListResponse()),
 		]);
@@ -77,15 +57,12 @@ const getCloseReasonGroupsList = async (params: ApiParams) => {
 	}
 };
 
-const getCloseReasonGroups = async ({ itemId: id }: GetItemParams) => {
-	const itemResponseHandler = (item: ApiParams) => {
-		return item.closeReasonGroup;
-	};
+const getCloseReasonGroup = async ({ itemId: id }: GetItemParams) => {
+	const itemResponseHandler = (item: ApiParams) => item.closeReasonGroup;
 
 	try {
-		const response = await closeReasonGroupsService.locateCloseReasonGroup(
+		const response = await getCloseReasonGroups().locateCloseReasonGroup(
 			String(id),
-			fieldsToSend,
 		);
 		return applyTransform(response.data, [
 			snakeToCamel(),
@@ -98,14 +75,17 @@ const getCloseReasonGroups = async ({ itemId: id }: GetItemParams) => {
 	}
 };
 
-const addCloseReasonGroups = async ({ itemInstance }: AddItemParams) => {
+const addCloseReasonGroup = async ({ itemInstance }: AddItemParams) => {
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		CreateCloseReasonGroupBody,
+	);
+
 	const item = applyTransform(itemInstance, [
-		camelToSnake(),
 		sanitize(fieldsToSend),
+		camelToSnake(),
 	]);
 	try {
-		const response =
-			await closeReasonGroupsService.createCloseReasonGroup(item);
+		const response = await getCloseReasonGroups().createCloseReasonGroup(item);
 		return applyTransform(response.data, [
 			snakeToCamel(),
 		]);
@@ -116,16 +96,21 @@ const addCloseReasonGroups = async ({ itemInstance }: AddItemParams) => {
 	}
 };
 
-const updateCloseReasonGroups = async ({
+const updateCloseReasonGroup = async ({
 	itemInstance,
 	itemId: id,
 }: UpdateItemParams) => {
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		UpdateCloseReasonGroupBody,
+	);
+
 	const item = applyTransform(itemInstance, [
-		camelToSnake(),
 		sanitize(fieldsToSend),
+		camelToSnake(),
 	]);
+
 	try {
-		const response = await closeReasonGroupsService.updateCloseReasonGroup(
+		const response = await getCloseReasonGroups().updateCloseReasonGroup(
 			String(id),
 			item,
 		);
@@ -139,9 +124,9 @@ const updateCloseReasonGroups = async ({
 	}
 };
 
-const deleteCloseReasonGroups = async ({ id }: DeleteItemParams) => {
+const deleteCloseReasonGroup = async ({ id }: DeleteItemParams) => {
 	try {
-		const response = await closeReasonGroupsService.deleteCloseReasonGroup(
+		const response = await getCloseReasonGroups().deleteCloseReasonGroup(
 			String(id),
 		);
 		return applyTransform(response.data, []);
@@ -165,9 +150,9 @@ const getCloseReasonGroupsLookup = async (
 
 export const CaseCloseReasonGroupsAPI = {
 	getList: getCloseReasonGroupsList,
-	get: getCloseReasonGroups,
-	add: addCloseReasonGroups,
-	update: updateCloseReasonGroups,
-	delete: deleteCloseReasonGroups,
+	get: getCloseReasonGroup,
+	add: addCloseReasonGroup,
+	update: updateCloseReasonGroup,
+	delete: deleteCloseReasonGroup,
 	getLookup: getCloseReasonGroupsLookup,
 };

package/src/api/clients/caseCloseReasons/caseCloseReasons.ts

@@ -1,10 +1,12 @@
-import { CloseReasonsApiFactory } from 'webitel-sdk';
 import {
-	getDefaultGetListResponse,
-	getDefaultGetParams,
-	getDefaultInstance,
-	getDefaultOpenAPIConfig,
-} from '../../defaults';
+	CreateCloseReasonBody,
+	getCloseReasons,
+	ListCloseReasonsQueryParams,
+	UpdateCloseReasonBody,
+} from '@webitel/api-services/gen';
+import { getShallowFieldsToSendFromZodSchema } from '@webitel/api-services/gen/utils';
+
+import { getDefaultGetListResponse, getDefaultGetParams } from '../../defaults';
 import {
 	applyTransform,
 	camelToSnake,
@@ -15,49 +17,33 @@ import {
 } from '../../transformers';
 import type { ApiId, ApiParams, UpdateItemParams } from '../_shared/types';
 
-const instance = getDefaultInstance();
-const configuration = getDefaultOpenAPIConfig();
-
-const closeReasonsService = CloseReasonsApiFactory(configuration, '', instance);
-
-const fieldsToSend = [
-	'name',
-	'description',
-];
-
 const getCloseReasonsList = async ({
 	parentId,
 	...rest
 }: {
 	parentId: ApiId;
 } & ApiParams) => {
-	const fieldsToSend = [
-		'page',
-		'size',
-		'q',
-		'sort',
-		'fields',
-		'id',
-	];
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		ListCloseReasonsQueryParams,
+	);
 
 	const { page, size, fields, sort, id, q } = applyTransform(rest, [
 		merge(getDefaultGetParams()),
-		(params) => ({
-			...params,
-			q: params.search,
-		}),
 		sanitize(fieldsToSend),
 		camelToSnake(),
 	]);
+
 	try {
-		const response = await closeReasonsService.listCloseReasons(
+		const response = await getCloseReasons().listCloseReasons(
 			String(parentId),
-			page,
-			size,
-			fields,
-			sort,
-			id,
-			q,
+			{
+				page,
+				size,
+				fields,
+				sort,
+				id,
+				q: q || rest.search,
+			},
 		);
 		const { items, next } = applyTransform(response.data, [
 			merge(getDefaultGetListResponse()),
@@ -82,12 +68,10 @@ const getCloseReason = async ({
 	parentId: ApiId;
 	itemId: ApiId;
 }) => {
-	const itemResponseHandler = (item: ApiParams) => {
-		return item.closeReason;
-	};
+	const itemResponseHandler = (item: ApiParams) => item.closeReason;
 
 	try {
-		const response = await closeReasonsService.locateCloseReason(
+		const response = await getCloseReasons().locateCloseReason(
 			String(parentId),
 			String(id),
 		);
@@ -109,13 +93,17 @@ const addCloseReason = async ({
 	itemInstance: ApiParams;
 	parentId: ApiId;
 }) => {
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		CreateCloseReasonBody,
+	);
+
 	const item = applyTransform(itemInstance, [
-		camelToSnake(),
 		sanitize(fieldsToSend),
+		camelToSnake(),
 	]);
 
 	try {
-		const response = await closeReasonsService.createCloseReason(
+		const response = await getCloseReasons().createCloseReason(
 			String(parentId),
 			item,
 		);
@@ -133,13 +121,18 @@ const updateCloseReason = async ({
 	itemInstance,
 	itemId: id,
 }: UpdateItemParams) => {
+	const fieldsToSend = getShallowFieldsToSendFromZodSchema(
+		UpdateCloseReasonBody,
+	);
+
 	const item = applyTransform(itemInstance, [
+		sanitize(fieldsToSend),
 		camelToSnake(),
 	]);
 
 	try {
-		const response = await closeReasonsService.updateCloseReason(
-			itemInstance.id,
+		const response = await getCloseReasons().updateCloseReason(
+			String(itemInstance.closeReasonGroupId),
 			String(id),
 			item,
 		);
@@ -161,7 +154,7 @@ const deleteCloseReason = async ({
 	parentId: ApiId;
 }) => {
 	try {
-		const response = await closeReasonsService.deleteCloseReason(
+		const response = await getCloseReasons().deleteCloseReason(
 			String(parentId),
 			String(id),
 		);

package/src/validations/caseCloseReason/caseCloseReason.validations.ts

@@ -0,0 +1,10 @@
+import type { WebitelCasesCloseReason } from '@webitel/api-services/gen/models';
+import { z } from 'zod';
+import type { ZodShape } from '../types';
+
+export const caseCloseReasonSchema = z.object<
+	ZodShape<WebitelCasesCloseReason>
+>({
+	name: z.string().min(1),
+	description: z.string().optional(),
+});

package/src/validations/caseCloseReasonGroup/caseCloseReasonGroup.validations.ts

@@ -0,0 +1,10 @@
+import type { WebitelCasesCloseReasonGroup } from '@webitel/api-services/gen/models';
+import { z } from 'zod';
+import type { ZodShape } from '../types';
+
+export const caseCloseReasonGroupSchema = z.object<
+	ZodShape<WebitelCasesCloseReasonGroup>
+>({
+	name: z.string().min(1),
+	description: z.string().optional(),
+});

package/src/validations/index.ts

@@ -3,6 +3,8 @@ export * from './_shared/lookup.validations';
 export * from './auditForm/auditForm.validations';
 export * from './bucket/bucket.validations';
 export * from './calendar/calendar.validations';
+export * from './caseCloseReason/caseCloseReason.validations';
+export * from './caseCloseReasonGroup/caseCloseReasonGroup.validations';
 export * from './casePriority/casePriority.validations';
 export * from './caseSource/caseSource.validations';
 export * from './caseStatus/caseStatus.validations';