@hapl/api-queries 0.1.70 → 0.1.74

package/src/clients/v1/api/experts/findPublishedExperts/index.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosResponse, AxiosError } from 'axios';
+import axios, { AxiosResponse, AxiosError, AxiosTransformer } from 'axios';
 import qs from 'qs';
 import { User, UserDirection, UserOffice } from '../../../types';
 
@@ -7,9 +7,11 @@ type SuccessData = {
   data: Partial<User> & { id: number }[];
   pageParams: { page: number; length: number };
 };
-
 type ErrorData = { success: false; data: { error: string } };
 
+type ResultData = { ids: number[]; byId: Record<string, Partial<User> & { id: number }>; meta: { total: number } };
+type ResultError = string;
+
 export type FindPublishedExpertsParams = {
   filter?: {
     id?: number | number[];
@@ -20,14 +22,8 @@ export type FindPublishedExpertsParams = {
   limits?: { page: number; count: number };
   sorting?: { direction: 'asc' | 'desc'; type: 'id' | 'expert.scoring' };
 };
-
-export type FindPublishedExpertsData = {
-  data: { ids: number[]; byId: Record<string, Partial<User> & { id: number }> };
-  meta: { total: number };
-};
-
-export type FindPublishedExpertsError = { status: number; data: string };
-
+export type FindPublishedExpertsData = AxiosResponse<ResultData>;
+export type FindPublishedExpertsError = AxiosError<ResultError>;
 export type FindPublishedExpertsConfig = { baseURL?: string; params: FindPublishedExpertsParams };
 
 export function findPublishedExpertsRequest({
@@ -40,27 +36,27 @@ export function findPublishedExpertsRequest({
       params,
       paramsSerializer: params => qs.stringify(params, { arrayFormat: 'brackets' }),
       headers: { Accept: 'application/json' },
+      transformResponse: [
+        ...(axios.defaults.transformResponse as AxiosTransformer[]),
+        (data: SuccessData | ErrorData): ResultData | ResultError => {
+          if (data.success) {
+            const ids: ResultData['ids'] = [];
+            const byId: ResultData['byId'] = {};
+
+            data.data.forEach(entity => {
+              byId[entity.id] = entity;
+              ids.push(entity.id);
+            });
+
+            return { ids, byId, meta: { total: data.pageParams.length } };
+          }
+
+          return data.data.error;
+        },
+      ],
     })
-    .then(
-      (res: AxiosResponse<SuccessData>): FindPublishedExpertsData => {
-        const data: FindPublishedExpertsData = {
-          data: { byId: {}, ids: [] },
-          meta: { total: res.data.pageParams.length },
-        };
-
-        res.data.data.forEach(entity => {
-          data.data.byId[entity.id] = entity;
-          data.data.ids.push(entity.id);
-        });
-
-        return data;
-      }
-    )
-    .catch((err: AxiosError<ErrorData>) => {
-      const error: Error & Partial<FindPublishedExpertsError> = new Error(err.message);
-      error.status = err.response?.status ?? 520;
-      error.data = err.response?.data.data.error ?? 'Unknown Error';
-
-      throw error;
+    .then((res: FindPublishedExpertsData) => res)
+    .catch((err: FindPublishedExpertsError) => {
+      throw err;
     });
 }