@webitel/api-services 0.0.35 → 0.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webitel/api-services",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "private": false,
   "scripts": {
     "make-all": "npm run gen:api && npm version patch && (npm run build:types || true) && (npm run format:all || true) && npm run publish-lib",

package/src/api/clients/index.ts

@@ -24,7 +24,7 @@ export * from './media/media';
 export * from './object/object';
 export * from './queues/queues';
 export * from './quickReplies/quickReplies';
-// export * from './roles/roles'; // fixme: file imports
+export * from './roles/roles';
 export * from './skills/skills';
 export * from './slas/slas';
 export * from './teams/teams';

package/src/api/clients/roles/roles.ts

@@ -1,10 +1,17 @@
 import deepCopy from 'deep-copy';
-
-import ApplicationsAccess from '../../../modules/Userinfo/classes/ApplicationsAccess';
+import { RolesApiFactory } from 'webitel-sdk';
+
+/**
+ * @author @Oleksandr Palonnyi
+ *
+ * TODO refactor ApplicationsAccess path for @Volodymyr Dekhtyaruk
+ * */
+import ApplicationsAccess from '../../../../../../src/modules/Userinfo/classes/ApplicationsAccess';
 import {
 	getDefaultGetListResponse,
 	getDefaultGetParams,
 	getDefaultInstance,
+	getDefaultOpenAPIConfig,
 } from '../../defaults';
 import {
 	applyTransform,
@@ -18,8 +25,10 @@ import {
 } from '../../transformers';
 
 const instance = getDefaultInstance();
+const configuration = getDefaultOpenAPIConfig();
+
+const rolesApiFactory = RolesApiFactory(configuration, '', instance);
 
-const baseUrl = '/roles';
 const fieldsToSend = ['name', 'description', 'permissions', 'metadata'];
 
 const preRequestHandler = (item) => {
@@ -29,22 +38,29 @@ const preRequestHandler = (item) => {
 };
 
 const getRoleList = async (params) => {
-	const fieldsToSend = ['page', 'size', 'q', 'sort', 'fields', 'ids'];
+	const fieldsToSend = ['page', 'size', 'q', 'sort', 'fields', 'id'];
+
+	const { page, size, q, sort, name, fields, id, userId, userName } =
+		applyTransform(params, [
+			merge(getDefaultGetParams()),
+			starToSearch('search'),
+			(params) => ({ ...params, q: params.search }),
+			sanitize(fieldsToSend),
+			camelToSnake(),
+		]);
 
-	const url = applyTransform(params, [
-		merge(getDefaultGetParams()),
-		(params) => {
-			params.ids = params.ids || params.id; // accept either ids or id as param
-			return params;
-		},
-		starToSearch('search'),
-		(params) => ({ ...params, q: params.search }),
-		sanitize(fieldsToSend),
-		camelToSnake(),
-		generateUrl(baseUrl),
-	]);
 	try {
-		const response = await instance.get(url);
+		const response = await rolesApiFactory.searchRoles(
+			[id],
+			name,
+			userId,
+			userName,
+			q,
+			fields,
+			sort,
+			page,
+			size,
+		);
 		const { items, next } = applyTransform(response.data, [
 			snakeToCamel(),
 			merge(getDefaultGetListResponse()),
@@ -74,10 +90,8 @@ const getRole = async ({ itemId: id }) => {
 		return copy;
 	};
 
-	const url = `${baseUrl}/${id}?fields=metadata&fields=permissions&fields=name&fields=description`;
-
 	try {
-		const response = await instance.get(url);
+		const response = await rolesApiFactory.readRole(id, fieldsToSend);
 		return applyTransform(response.data, [
 			snakeToCamel(),
 			merge(defaultObject),
@@ -88,32 +102,6 @@ const getRole = async ({ itemId: id }) => {
 	}
 };
 
-const getExtendedRoles = async (params) => {
-	const fieldsToSend = ['page', 'size', 'q', 'sort', 'fields', 'id'];
-
-	const url = applyTransform(params, [
-		merge(getDefaultGetParams()),
-		starToSearch('search'),
-		(params) => ({ ...params, q: params.search }),
-		sanitize(fieldsToSend),
-		camelToSnake(),
-		generateUrl(baseUrl),
-	]);
-	try {
-		const response = await instance.get(url);
-		const { items, next } = applyTransform(response.data, [
-			snakeToCamel(),
-			merge(getDefaultGetListResponse()),
-		]);
-		return {
-			items,
-			next,
-		};
-	} catch (err) {
-		throw applyTransform(err, [notify]);
-	}
-};
-
 const addRole = async ({ itemInstance }) => {
 	const item = applyTransform(itemInstance, [
 		preRequestHandler,
@@ -121,7 +109,7 @@ const addRole = async ({ itemInstance }) => {
 		camelToSnake(),
 	]);
 	try {
-		const response = await instance.post(baseUrl, item);
+		const response = await rolesApiFactory.createRole(item);
 		return applyTransform(response.data, [snakeToCamel()]);
 	} catch (err) {
 		throw applyTransform(err, [notify]);
@@ -135,9 +123,8 @@ const updateRole = async ({ itemInstance, itemId: id }) => {
 		camelToSnake(),
 	]);
 
-	const url = `${baseUrl}/${id}`;
 	try {
-		const response = await instance.put(url, item);
+		const response = await rolesApiFactory.updateRole(id, item);
 		return applyTransform(response.data, [snakeToCamel()]);
 	} catch (err) {
 		throw applyTransform(err, [notify]);
@@ -145,9 +132,8 @@ const updateRole = async ({ itemInstance, itemId: id }) => {
 };
 
 const deleteRole = async ({ id }) => {
-	const url = `${baseUrl}/${id}`;
 	try {
-		const response = await instance.delete(url);
+		const response = await rolesApiFactory.deleteRole(id);
 		return applyTransform(response.data, []);
 	} catch (err) {
 		throw applyTransform(err, [notify]);
@@ -196,6 +182,5 @@ export const RolesAPI = {
 	delete: deleteRole,
 	getLookup: getRolesLookup,
 
-	getExtendedRoles,
 	getPermissionsOptions,
 };

package/src/api/transformers/camelToSnake/camelToSnake.transformer.ts

@@ -1,5 +1,7 @@
 import { objCamelToSnake } from '../../../utils/api/caseConverters';
 
-const camelToSnakeTransformer = (skipKeys) => (obj) =>
-	objCamelToSnake(obj, skipKeys);
+const camelToSnakeTransformer =
+	(skipKeys = []) =>
+	(obj) =>
+		objCamelToSnake(obj, skipKeys);
 export default camelToSnakeTransformer;

package/src/api/transformers/snakeToCamel/snakeToCamel.transformer.ts

@@ -1,5 +1,7 @@
 import { objSnakeToCamel } from '../../../utils/api/caseConverters';
 
-const snakeToCamelTransformer = (skipKeys) => (obj) =>
-	objSnakeToCamel(obj, skipKeys);
+const snakeToCamelTransformer =
+	(skipKeys = []) =>
+	(obj) =>
+		objSnakeToCamel(obj, skipKeys);
 export default snakeToCamelTransformer;