Added expiration filter to front

front/src/assets/userCategories.ts

@@ -2,26 +2,33 @@ import { Announcement } from '../api/announcement/types'
 import { getId } from '../utils/auth'
 import { FiltersType } from '../utils/filters'
 
-const userCategories = ['givingOut'] as const
+const userCategories = ['givingOut', 'needDispose'] as const
 
 type UserCategory = typeof userCategories[number]
 
 const UserCategoriesNames: Record<UserCategory, string> = {
     givingOut: 'Раздача',
+    needDispose: 'Нужно утилизировать',
 }
 
 const userCategoriesInfos: Record<UserCategory, (ann: Announcement) => string> = {
     givingOut: (ann: Announcement) => (
         `Годен до ${new Date(ann.bestBy).toLocaleDateString('ru')}`
     ),
+    needDispose: (ann: Announcement) => (
+        `Были заинтересованы: ${ann.bookedBy} чел.`
+    ),
 }
 
 const composeUserCategoriesFilters: Record<UserCategory, () => FiltersType> = {
-    givingOut: () => {
+    givingOut: () => ({
-        const userId = getId()
+        userId: getId(),
-
+        expired: false,
-        return ({ userId })
+    }),
-    },
+    needDispose: () => ({
+        userId: getId(),
+        expired: true,
+    }),
 }
 
 export type { UserCategory }

front/src/utils/filters.ts

@@ -1,13 +1,18 @@
 import { Announcement } from '../api/announcement/types'
 import { isCategory } from '../assets/category'
-import { fallbackToUndefined, isInt } from './types'
+import { fallbackToUndefined, isBoolean, isInt } from './types'
 
-const filterNames = ['userId', 'category', 'metro', 'bookedBy'] as const
+const filterNames = ['userId', 'category', 'metro', 'expired'] as const
 type FilterNames = typeof filterNames[number]
 
-type FiltersType = Partial<Pick<Announcement, FilterNames>>
+type FiltersType = Partial<
+    Pick<Announcement, FilterNames & keyof Announcement> &
+    {
+        expired: boolean,
+    }
+>
 
-const defaultFilters: FiltersType = { userId: undefined, category: undefined, metro: undefined, bookedBy: undefined }
+const defaultFilters: FiltersType = { userId: undefined, category: undefined, metro: undefined, expired: false }
 
 const URLEncodeFilters = (filters: FiltersType) => (
     Object.fromEntries(
@@ -31,17 +36,16 @@ const URLDecoreFilters = (params: URLSearchParams): FiltersType => {
     )
 
     return {
-        bookedBy: fallbackToUndefined(Number.parseInt(strFilters['bookedBy']), isInt),
+        userId: fallbackToUndefined(Number.parseInt(strFilters['userId']), isInt),
         category: fallbackToUndefined(strFilters['category'], isCategory),
         metro: strFilters['metro'],
-        userId: fallbackToUndefined(Number.parseInt(strFilters['userId']), isInt),
+        expired: fallbackToUndefined(strFilters['bookedBy'] === 'true', isBoolean),
     }
 }
 
 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 }

front/src/utils/types.ts

@@ -64,6 +64,10 @@ const isInt = (obj: unknown): obj is number => (
     Number.isSafeInteger(obj)
 )
 
+const isBoolean = (obj: unknown): obj is boolean => (
+    typeof obj === 'boolean'
+)
+
 function fallbackToUndefined<T>(obj: unknown, isT: ((obj: unknown) => obj is T)) {
     if (!isT(obj)) return undefined
 
@@ -80,4 +84,4 @@ type SetState<T> = React.Dispatch<React.SetStateAction<T>>
 
 export type { SetState }
 
-export { isRecord, isObject, isConst, isLiteralUnion, isArrayOf, isString, isInt, fallbackToUndefined, fallbackTo }
+export { isRecord, isObject, isConst, isLiteralUnion, isArrayOf, isString, isInt, isBoolean, fallbackToUndefined, fallbackTo }