From 6a0c4c9dac3597e066f6b6a8714dcd08e149a925 Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Thu, 13 Jul 2023 17:50:20 +0300
Subject: [PATCH] Added http errors handing to all fettch requests

---
 front/src/hooks/api/useAddAnnouncement.ts |  3 +++
 front/src/hooks/api/useAuth.ts            |  4 ++++
 front/src/hooks/api/useBook.ts            |  3 +++
 front/src/hooks/api/useFetch.ts           | 15 +++------------
 front/src/pages/AddPage.tsx               |  5 +++++
 front/src/utils/index.ts                  | 16 +++++++++++++++-
 6 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/front/src/hooks/api/useAddAnnouncement.ts b/front/src/hooks/api/useAddAnnouncement.ts
index c8c4158..84416ae 100644
--- a/front/src/hooks/api/useAddAnnouncement.ts
+++ b/front/src/hooks/api/useAddAnnouncement.ts
@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from "react"
 
 import { API_URL } from "../../config"
 import { isLiteralUnion } from "../../utils/types"
+import { handleHTTPErrors } from "../../utils"
 
 const addErrors = ["Не удалось опубликовать объявление", 'Неверный ответ от сервера', 'Неизвестная ошибка'] as const
 type AddError = typeof addErrors[number]
@@ -45,6 +46,8 @@ const useAddAnnouncement = () => {
                 signal: abortController.signal
             })
 
+            handleHTTPErrors(res)
+
             const data: unknown = await res.json()
 
             if (!isAddResponse(data)) throw new Error('Неверный ответ от сервера')
diff --git a/front/src/hooks/api/useAuth.ts b/front/src/hooks/api/useAuth.ts
index 265855c..90c6acc 100644
--- a/front/src/hooks/api/useAuth.ts
+++ b/front/src/hooks/api/useAuth.ts
@@ -1,6 +1,7 @@
 import { useState } from "react"
 import { API_URL } from "../../config"
 import { isConst, isObject } from "../../utils/types"
+import { handleHTTPErrors } from "../../utils"
 
 interface AuthData {
     email: string,
@@ -57,6 +58,9 @@ function useAuth() {
                         'Content-Type': 'application/json'
                     }
                 })
+
+                handleHTTPErrors(res)
+
                 const signupData: unknown = await res.json()
 
                 if (!isSignUpResponse(signupData)) {
diff --git a/front/src/hooks/api/useBook.ts b/front/src/hooks/api/useBook.ts
index f81dd92..e5d153b 100644
--- a/front/src/hooks/api/useBook.ts
+++ b/front/src/hooks/api/useBook.ts
@@ -4,6 +4,7 @@ import { useNavigate } from "react-router-dom"
 import { getToken } from "../../utils/auth"
 import { API_URL } from "../../config"
 import { isObject } from "../../utils/types"
+import { handleHTTPErrors } from "../../utils"
 
 type BookResponse = {
     Success: boolean
@@ -39,6 +40,8 @@ function useBook(id: number) {
                     }
                 })
 
+                handleHTTPErrors(res)
+
                 const data: unknown = await res.json()
 
                 if (!isBookResponse(data)) {
diff --git a/front/src/hooks/api/useFetch.ts b/front/src/hooks/api/useFetch.ts
index 77caf4e..385331c 100644
--- a/front/src/hooks/api/useFetch.ts
+++ b/front/src/hooks/api/useFetch.ts
@@ -1,5 +1,6 @@
 import { useEffect, useRef, useState } from "react"
-import { isAborted } from '../../utils'
+
+import { handleHTTPErrors, isAborted } from '../../utils'
 
 const useFetch = <T>(url: string, params: RequestInit | undefined, initialData: T, dataGuard: (obj: unknown) => obj is T) => {
     const [data, setData] = useState(initialData)
@@ -18,17 +19,7 @@ const useFetch = <T>(url: string, params: RequestInit | undefined, initialData:
 
         fetch(url, { ...params, signal: abortControllerRef.current.signal })
             .then(res => {
-                if (!res.ok) {
-                    switch (res.status) {
-                        case 401:
-                            throw new Error("Ошибка авторизации")
-                        case 404:
-                            throw new Error("Объект не найден")
-                        default: {
-                            throw new Error("Ошибка ответа от сервера")
-                        }
-                    }
-                }
+                handleHTTPErrors(res)
 
                 return res.json()
             })
diff --git a/front/src/pages/AddPage.tsx b/front/src/pages/AddPage.tsx
index b209170..a8c2059 100644
--- a/front/src/pages/AddPage.tsx
+++ b/front/src/pages/AddPage.tsx
@@ -9,6 +9,7 @@ import { useAddAnnouncement, useTrashboxes } from "../hooks/api"
 import { categoryNames } from "../assets/category"
 import { stations, lines, lineNames } from "../assets/metro"
 import { isObject } from "../utils/types"
+import { handleHTTPErrors } from "../utils"
 
 function AddPage() {
     const [addressPosition, setAddressPosition] = useState(latLng(59.972, 30.3227))
@@ -22,6 +23,8 @@ function AddPage() {
             try {
                 const res = await fetch(location.protocol + "//nominatim.openstreetmap.org/search?format=json&q=" + address)
 
+                handleHTTPErrors(res)
+
                 const fetchData: unknown = await res.json()
 
                 console.log("f", fetchData)
@@ -37,6 +40,8 @@ function AddPage() {
             try {
                 const res = await fetch(`${location.protocol}//nominatim.openstreetmap.org/reverse?format=json&accept-language=ru&lat=${addressPosition.lat}&lon=${addressPosition.lng}`)
 
+                handleHTTPErrors(res)
+
                 const fetchData: unknown = await res.json()
 
                 if (!isObject<{ display_name: string }>(fetchData, { "display_name": "string" })) {
diff --git a/front/src/utils/index.ts b/front/src/utils/index.ts
index 085bfc8..92f646a 100644
--- a/front/src/utils/index.ts
+++ b/front/src/utils/index.ts
@@ -1,3 +1,17 @@
 const isAborted = (err: Error) => err.name === 'AbortError'
 
-export { isAborted }
+const handleHTTPErrors = (res: Response) => {
+    if (!res.ok) {
+        switch (res.status) {
+            case 401:
+                throw new Error("Ошибка авторизации")
+            case 404:
+                throw new Error("Объект не найден")
+            default: {
+                throw new Error("Ошибка ответа от сервера")
+            }
+        }
+    }
+}
+
+export { isAborted, handleHTTPErrors }