Fixed announcement typing

Expired -> obsolete filter front
Removed useless despose utils
This commit is contained in:
2023-08-08 18:18:57 +03:00
parent 6c5c7aa0c2
commit 4135c29160
4 changed files with 22 additions and 39 deletions

View File

@ -1,20 +1,28 @@
import { isObject } from '../../utils/types'
import { Category, isCategory } from '../../assets/category'
type AnnouncementResponse = {
type Announcement = {
id: number,
user_id: number,
userId: number,
name: string,
category: Category,
best_by: string,
bestBy: string,
address: string,
longtitude: number,
latitude: number,
description: string,
lng: number,
lat: number,
description: string | null,
src: string | null,
metro: string,
trashId: number | null,
booked_by: number,
bookedBy: number,
}
type AnnouncementResponse = Omit<Announcement, 'userId' | 'bestBy' | 'bookedBy' | 'lat' | 'lng'> & {
user_id: Announcement['userId'],
best_by: Announcement['bestBy'],
longtitude: Announcement['lng'],
latitude: Announcement['lat'],
booked_by: Announcement['bookedBy'],
}
const isAnnouncementResponse = (obj: unknown): obj is AnnouncementResponse => (
@ -35,22 +43,6 @@ const isAnnouncementResponse = (obj: unknown): obj is AnnouncementResponse => (
})
)
type Announcement = {
id: number,
userId: number,
name: string,
category: Category,
bestBy: number,
address: string,
lng: number,
lat: number,
description: string | null,
src: string | null,
metro: string,
trashId: number | null,
bookedBy: number,
}
export type {
Announcement,
AnnouncementResponse,