Merge branch 'asynchronous-porridger' of https://git.dm1sh.ru/dm1sh/porridger into asynchronous-porridger

back/api.py

@@ -89,7 +89,7 @@ async def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form(
         if f.tell() > 0:
             f.seek(0)
             destination = pathlib.Path("./uploads/" + str(hash(f)) + pathlib.Path(src.filename).suffix.lower())
-            async with destination.open('wb') as buffer:
+            with destination.open('wb') as buffer:
                 shutil.copyfileobj(f, buffer)
 
             # изменяем название директории загруженного файла
@@ -103,6 +103,8 @@ async def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form(
         db.add(temp_ancmt)     # добавляем в бд
         await db.commit()     # сохраняем изменения
         await db.refresh(temp_ancmt)  # обновляем состояние объекта
+        
+        return {"Success": True}
     except:
         raise HTTPException(status_code=500, detail="problem with adding object to db")
 
@@ -119,6 +121,8 @@ async def delete_from_db(announcement: pydantic_schemas.DelAnnouncement, db: Ann
     try:
         await db.delete(to_delete)   # удаление из БД
         await db.commit()     # сохраняем изменения
+
+        return {"Success": True}
     except:
         raise HTTPException(status_code=500, detail="Problem with adding to database")
     

front/src/api/putAnnouncement/index.ts

@@ -6,7 +6,7 @@ const composePutAnnouncementURL = () => (
 )
 
 const processPutAnnouncement = (data: PutAnnouncementResponse): PutAnnouncement => {
-    return data.Answer
+    return data.Success
 }
 
 export { composePutAnnouncementURL, processPutAnnouncement }

front/src/api/putAnnouncement/types.ts

@@ -1,12 +1,12 @@
 import { isObject } from '../../utils/types'
 
 type PutAnnouncementResponse = {
-    Answer: boolean,
+    Success: boolean,
 }
 
 const isPutAnnouncementResponse = (obj: unknown): obj is PutAnnouncementResponse => (
     isObject(obj, {
-        'Answer': 'boolean',
+        'Success': 'boolean',
     })
 )
 

front/src/api/removeAnnouncement/index.ts

@@ -6,11 +6,11 @@ const composeRemoveAnnouncementURL = () => (
 )
 
 function processRemoveAnnouncement(data: RemoveAnnouncementResponse): RemoveAnnouncement {
-    if (!data.Answer) {
+    if (!data.Success) {
         throw new Error('Не удалось закрыть объявление')
     }
 
-    return data.Answer
+    return data.Success
 }
 
 export { composeRemoveAnnouncementURL, processRemoveAnnouncement }

front/src/api/removeAnnouncement/types.ts

@@ -1,12 +1,12 @@
 import { isObject } from '../../utils/types'
 
 type RemoveAnnouncementResponse = {
-    Answer: boolean,
+    Success: boolean,
 }
 
 const isRemoveAnnouncementResponse = (obj: unknown): obj is RemoveAnnouncementResponse => (
     isObject(obj, {
-        'Answer': 'boolean',
+        'Success': 'boolean',
     })
 )
 

front/src/hooks/api/useAddAnnouncement.ts

@@ -14,8 +14,8 @@ function useAddAnnouncement() {
         processPutAnnouncement
     )
 
-    function handleAdd(formData: FormData) {
-        void doSend({}, {
+    async function handleAdd(formData: FormData) {
+        await doSend({}, {
             body: formData,
         })
     }

front/src/hooks/api/useBook.ts

@@ -15,8 +15,8 @@ function useBook() {
         processBook,
     )
 
-    const handleBook = useCallback((id: number) => {
-        void doSend({}, {
+    const handleBook = useCallback(async (id: number) => {
+        await doSend({}, {
             body: JSON.stringify({
                 id,
             }),

front/src/hooks/useSendButtonCaption.ts

@@ -12,7 +12,7 @@ function useSendButtonCaption(
     const [title, setTitle] = useState(initial)
 
     const update = useCallback(<T extends NonNullable<unknown>>(data: T | null | undefined) => {
-        if (data !== undefined) { // not loading
+        if (data !== undefined && data !== null) { // not loading or error
             setCaption(result)
             setTitle('Отправить ещё раз')