add lat and long as parameter
This commit is contained in:
parent
360ac8771a
commit
4c2d4646ce
@ -42,7 +42,7 @@ async def read_events(authorize: Annotated[bool, Depends(permissions_checker.Per
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/events/search", tags=["events"], response_model=list[events.EventOut])
|
@router.get("/events/search", tags=["events"], response_model=list[events.EventOut])
|
||||||
async def search_events(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], skip: int = 0, limit: int = 20, item: str | None = None, status: int = 1):
|
async def search_events(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], skip: int = 0, limit: int = 20, item: str | None = None, status: int = 1, min_lat: float | None = None, max_lat: float | None = None, min_lon: float | None = None, max_lon: float | None = None):
|
||||||
if limit < 1 or skip < 0 or limit < skip:
|
if limit < 1 or skip < 0 or limit < skip:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
@ -52,6 +52,31 @@ async def search_events(authorize: Annotated[bool, Depends(permissions_checker.P
|
|||||||
listEvents = []
|
listEvents = []
|
||||||
event_repository = events.EventRepository(database=database.database)
|
event_repository = events.EventRepository(database=database.database)
|
||||||
object_search = {}
|
object_search = {}
|
||||||
|
if min_lat is not None and max_lat is not None and min_lon is not None and max_lon is not None:
|
||||||
|
object_search = {
|
||||||
|
"$and": [
|
||||||
|
{
|
||||||
|
"$or": [
|
||||||
|
{"name": {"$regex": item}},
|
||||||
|
{"tags": {"$regex": item}},
|
||||||
|
{"organizers": {"$regex": item}}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{"status": {"$eq": status}},
|
||||||
|
{
|
||||||
|
"latitude": {"$gte": min_lat}, # Minimum latitude
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"latitude": {"$lte": max_lat}, # Maximum latitude
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"longitude": {"$gte": min_lon}, # Minimum longitude
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"longitude": {"$lte": max_lon}, # Maximum longitude
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
if item is not None:
|
if item is not None:
|
||||||
object_search = {
|
object_search = {
|
||||||
"$and": [
|
"$and": [
|
||||||
@ -65,6 +90,32 @@ async def search_events(authorize: Annotated[bool, Depends(permissions_checker.P
|
|||||||
{"status": {"$eq": status}}
|
{"status": {"$eq": status}}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
if min_lat is not None and max_lat is not None and min_lon is not None and max_lon is not None:
|
||||||
|
object_search = {
|
||||||
|
"$and": [
|
||||||
|
{
|
||||||
|
"$or": [
|
||||||
|
{"name": {"$regex": item}},
|
||||||
|
{"tags": {"$regex": item}},
|
||||||
|
{"organizers": {"$regex": item}}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{"status": {"$eq": status}},
|
||||||
|
{
|
||||||
|
"latitude": {"$gte": min_lat}, # Minimum latitude
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"latitude": {"$lte": max_lat}, # Maximum latitude
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"longitude": {"$gte": min_lon}, # Minimum longitude
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"longitude": {"$lte": max_lon}, # Maximum longitude
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
for event_index in event_repository.find_by(object_search, limit=limit, skip=skip):
|
for event_index in event_repository.find_by(object_search, limit=limit, skip=skip):
|
||||||
event = events.EventOut(id=event_index.id, tags=event_index.tags, imgUrl=event_index.imgUrl, name=event_index.name, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
|
event = events.EventOut(id=event_index.id, tags=event_index.tags, imgUrl=event_index.imgUrl, name=event_index.name, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
|
||||||
listEvents.append(event)
|
listEvents.append(event)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user