fix: get record

guz86 · Sep 24, 2024 · 7478199 · 7478199
1 parent ae8af6e
commit 7478199
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 35 deletions.
diff --git a/app/src/components/AudioRow/AudioRow.tsx b/app/src/components/AudioRow/AudioRow.tsx
@@ -4,24 +4,26 @@ import { getCallRecord } from '../../utils/apiGetRecord';
 interface AudioRowProps {
   length: string;
   isHovered: boolean;
-  recordId: number;
-  partnershipId: string;
+  record: string;
+  partnership_id: string;
 }
 
 const AudioRow: React.FC<AudioRowProps> = ({
   length,
   isHovered,
-  recordId,
-  partnershipId,
+  record,
+  partnership_id,
 }) => {
   if (!length) {
     return null;
   }
 
   const handlePlay = async () => {
     try {
-      const audioUrl = await getCallRecord({ recordId, partnershipId });
+      const audioUrl = await getCallRecord({ record, partnership_id });
+      console.log(audioUrl);
       const newAudio = new Audio(audioUrl);
+
       newAudio.play();
     } catch (error) {
       console.error('Ошибка при воспроизведении записи:', error);

diff --git a/app/src/components/Table/Table.tsx b/app/src/components/Table/Table.tsx
@@ -9,8 +9,8 @@ interface TableRowData {
   source: string;
   score: string;
   length: string;
-  id: number;
-  partnershipId: string;
+  record: string;
+  partnership_id: string;
 }
 
 interface TableProps {

diff --git a/app/src/components/TableRow/TableRow.tsx b/app/src/components/TableRow/TableRow.tsx
@@ -10,8 +10,8 @@ interface TableRowProps {
   source: string;
   score: string;
   length: string;
-  id: number;
-  partnershipId: string;
+  record: string;
+  partnership_id: string;
 }
 
 const TableRow: React.FC<TableRowProps> = ({
@@ -22,8 +22,8 @@ const TableRow: React.FC<TableRowProps> = ({
   source,
   score,
   length,
-  id,
-  partnershipId,
+  record,
+  partnership_id,
 }) => {
   const [isHovered, setIsHovered] = useState(false);
 
@@ -49,8 +49,8 @@ const TableRow: React.FC<TableRowProps> = ({
         <AudioRow
           length={length}
           isHovered={isHovered}
-          recordId={id}
-          partnershipId={partnershipId}
+          record={record}
+          partnership_id={partnership_id}
         />
       </div>
     </div>

diff --git a/app/src/utils/api.ts b/app/src/utils/api.ts
@@ -2,7 +2,8 @@ import axios, { AxiosError } from 'axios';
 
 export interface Call {
   id: number;
-  partnershipId: string;
+  record: string;
+  partnership_id: string;
   date: string;
   time: number;
   from_number: string;

diff --git a/app/src/utils/apiGetRecord.ts b/app/src/utils/apiGetRecord.ts
@@ -1,35 +1,43 @@
-import axios from 'axios';
+import axios, { AxiosError } from 'axios';
 
 const BASE_URL = 'https://api.skilla.ru/mango/getRecord';
 const token = 'testtoken';
 
 interface GetCallRecordParams {
-  recordId: number;
-  partnershipId: string;
+  record: string;
+  partnership_id: string;
+}
+
+interface ApiError {
+  description: string;
 }
 
 export const getCallRecord = async ({
-  recordId,
-  partnershipId,
+  record,
+  partnership_id,
 }: GetCallRecordParams): Promise<string> => {
-  const requestBody = {
-    record: recordId,
-    partnership_id: partnershipId,
-  };
-
   try {
-    const response = await axios.post(BASE_URL, requestBody, {
-      headers: {
-        Authorization: `Bearer ${token}`,
-        'Content-Type': 'application/json',
-      },
-      responseType: 'blob',
-    });
+    const url = `${BASE_URL}?record=${encodeURIComponent(record)}&partnership_id=${encodeURIComponent(partnership_id)}`;
+
+    const response = await axios.post<Blob>(
+      url,
+      {},
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+        responseType: 'blob',
+      }
+    );
 
     const audioUrl = URL.createObjectURL(response.data);
     return audioUrl;
-  } catch (error) {
+  } catch (err) {
+    const error = err as AxiosError<ApiError>;
     console.error('Ошибка при получении записи звонка:', error);
-    throw error;
+    const errorMessage = error.response?.data
+      ? error.response.data.description
+      : 'Ошибка сети';
+    throw new Error(errorMessage);
   }
 };
diff --git a/app/src/utils/formatCalls.ts b/app/src/utils/formatCalls.ts
@@ -29,8 +29,8 @@ export const formatCalls = (calls: Call[]) => {
       source: call.source || '',
       score: 'Отлично',
       length: callLength,
-      id: call.id,
-      partnershipId: call.partnershipId,
+      record: call.record,
+      partnership_id: call.partnership_id,
     };
   });
 };