Fixed homepage filters setting, names, and userId category

front/src/api/announcements/index.ts

@@ -1,5 +1,5 @@
 import { API_URL } from '../../config'
-import { FiltersType, URLEncodeFilters } from '../../utils/filters'
+import { FiltersType, URLEncodeFilters, convertFilterNames } from '../../utils/filters'
 import { processAnnouncement } from '../announcement'
 import { Announcement } from '../announcement/types'
 import { AnnouncementsResponse } from './types'
@@ -7,7 +7,7 @@ import { AnnouncementsResponse } from './types'
 const initialAnnouncements: Announcement[] = []
 
 const composeAnnouncementsURL = (filters: FiltersType) => (
-    API_URL + '/announcements?' + new URLSearchParams(URLEncodeFilters(filters)).toString()
+    API_URL + '/announcements?' + new URLSearchParams(convertFilterNames(URLEncodeFilters(filters))).toString()
 )
 
 const processAnnouncements = (data: AnnouncementsResponse): Announcement[] => (

front/src/assets/userCategories.ts

@@ -1,4 +1,5 @@
 import { Announcement } from '../api/announcement/types'
+import { getId } from '../utils/auth'
 import { FiltersType } from '../utils/filters'
 
 const userCategories = ['givingOut'] as const
@@ -17,7 +18,7 @@ const userCategoriesInfos: Record<UserCategory, (ann: Announcement) => string> =
 
 const composeUserCategoriesFilters: Record<UserCategory, () => FiltersType> = {
     givingOut: () => {
-        const userId = -1
+        const userId = getId()
 
         return ({ userId })
     },

front/src/hooks/useStoryIndex.ts

@@ -8,9 +8,11 @@ function useStoryIndex(annLength: number | undefined) {
     const [searchParams, setSearchParams] = useSearchParams()
 
     const withReset = <T>(f: SetState<T>) => (...args: Parameters<SetState<T>>) => {
-        console.log('resetting index')
         setIndex(0)
-        setSearchParams(prev => ({ ...prev, storyIndex: '0' }), { replace: true })
+        setSearchParams(prev => ({
+            ...Object.fromEntries(prev),
+            storyIndex: '0'
+        }), { replace: true })
         f(...args)
     }
 
@@ -24,14 +26,20 @@ function useStoryIndex(annLength: number | undefined) {
 
     const increment = () => setIndex(prev => {
         const newIndex = (prev + 1) % (annLength || 1)
-        setSearchParams(prev => ({ ...prev, storyIndex: newIndex.toString() }), { replace: true })
+        setSearchParams(prev => ({
+            ...Object.fromEntries(prev),
+            storyIndex: newIndex.toString()
+        }), { replace: true })
 
         return newIndex
     })
 
     const decrement = () => setIndex(prev => {
         const newIndex = prev > 0 ? (prev - 1) : 0
-        setSearchParams(prev => ({ ...prev, storyIndex: newIndex.toString() }), { replace: true })
+        setSearchParams(prev => ({
+            ...Object.fromEntries(prev),
+            storyIndex: newIndex.toString()
+        }), { replace: true })
 
         return newIndex
     })

front/src/utils/filters.ts

@@ -31,12 +31,18 @@ const URLDecoreFilters = (params: URLSearchParams): FiltersType => {
     )
 
     return {
-        bookedBy: fallbackToUndefined(strFilters['bookedBy'], isInt),
+        bookedBy: fallbackToUndefined(Number.parseInt(strFilters['bookedBy']), isInt),
         category: fallbackToUndefined(strFilters['category'], isCategory),
         metro: strFilters['metro'],
-        userId: fallbackToUndefined(strFilters['userId'], isInt)
+        userId: fallbackToUndefined(Number.parseInt(strFilters['userId']), isInt),
     }
 }
 
+const convertFilterNames = (input: Record<string, string>) => ({
+    ...input,
+    ...(input['userId'] === undefined ? {} : { 'user_id': input['userId'] }),
+    ...(input['bookedBy'] === undefined ? {} : { 'booked_by': input['bookedBy'] }),
+})
+
 export type { FilterNames, FiltersType }
-export { defaultFilters, filterNames, URLEncodeFilters, URLDecoreFilters }
+export { defaultFilters, filterNames, URLEncodeFilters, URLDecoreFilters, convertFilterNames }