format
This commit is contained in:
parent
ad98cb0d45
commit
ee47575431
3 changed files with 15 additions and 10 deletions
|
|
@ -201,12 +201,15 @@ async def get_diagonalley_stalls(wallet_ids: Union[str, List[str]]) -> List[Stal
|
||||||
)
|
)
|
||||||
return [Stalls(**row) for row in rows]
|
return [Stalls(**row) for row in rows]
|
||||||
|
|
||||||
async def get_diagonalley_stalls_by_ids(stall_ids: Union[str, List[str]]) -> List[Stalls]:
|
|
||||||
|
async def get_diagonalley_stalls_by_ids(
|
||||||
|
stall_ids: Union[str, List[str]]
|
||||||
|
) -> List[Stalls]:
|
||||||
q = ",".join(["?"] * len(stall_ids))
|
q = ",".join(["?"] * len(stall_ids))
|
||||||
rows = await db.fetchall(
|
rows = await db.fetchall(
|
||||||
f"SELECT * FROM diagonalley.stalls WHERE id IN ({q})", (*stall_ids,)
|
f"SELECT * FROM diagonalley.stalls WHERE id IN ({q})", (*stall_ids,)
|
||||||
)
|
)
|
||||||
return [Stalls(**row) for row in rows]
|
return [Stalls(**row) for row in rows]
|
||||||
|
|
||||||
|
|
||||||
async def delete_diagonalley_stall(stall_id: str) -> None:
|
async def delete_diagonalley_stall(stall_id: str) -> None:
|
||||||
|
|
@ -353,10 +356,10 @@ async def get_diagonalley_market(market_id: str) -> Optional[Market]:
|
||||||
async def get_diagonalley_market_stalls(market_id: str):
|
async def get_diagonalley_market_stalls(market_id: str):
|
||||||
rows = await db.fetchall(
|
rows = await db.fetchall(
|
||||||
"SELECT * FROM diagonalley.market_stalls WHERE marketid = ?", (market_id,)
|
"SELECT * FROM diagonalley.market_stalls WHERE marketid = ?", (market_id,)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
ids = [row["stallid"] for row in rows]
|
||||||
|
|
||||||
ids = [row["stallid"] for row in rows]
|
|
||||||
|
|
||||||
return await get_diagonalley_stalls_by_ids(ids)
|
return await get_diagonalley_stalls_by_ids(ids)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,15 +64,17 @@ async def display(request: Request, stall_id):
|
||||||
@diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
|
@diagonalley_ext.get("/market/{market_id}", response_class=HTMLResponse)
|
||||||
async def display(request: Request, market_id):
|
async def display(request: Request, market_id):
|
||||||
market = await get_diagonalley_market(market_id)
|
market = await get_diagonalley_market(market_id)
|
||||||
|
|
||||||
if not market:
|
if not market:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=HTTPStatus.NOT_FOUND, detail="Marketplace doesn't exist."
|
status_code=HTTPStatus.NOT_FOUND, detail="Marketplace doesn't exist."
|
||||||
)
|
)
|
||||||
|
|
||||||
stalls = await get_diagonalley_market_stalls(market_id)
|
stalls = await get_diagonalley_market_stalls(market_id)
|
||||||
stalls_ids = [stall.id for stall in stalls]
|
stalls_ids = [stall.id for stall in stalls]
|
||||||
products = [product.dict() for product in await get_diagonalley_products(stalls_ids)]
|
products = [
|
||||||
|
product.dict() for product in await get_diagonalley_products(stalls_ids)
|
||||||
|
]
|
||||||
|
|
||||||
return diagonalley_renderer().TemplateResponse(
|
return diagonalley_renderer().TemplateResponse(
|
||||||
"diagonalley/market.html",
|
"diagonalley/market.html",
|
||||||
|
|
@ -80,6 +82,6 @@ async def display(request: Request, market_id):
|
||||||
"request": request,
|
"request": request,
|
||||||
"market": market,
|
"market": market,
|
||||||
"stalls": [stall.dict() for stall in stalls],
|
"stalls": [stall.dict() for stall in stalls],
|
||||||
"products": products
|
"products": products,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -444,7 +444,7 @@ async def api_diagonalley_markets(wallet: WalletTypeInfo = Depends(get_key_type)
|
||||||
async def api_diagonalley_market_stalls(market_id: str):
|
async def api_diagonalley_market_stalls(market_id: str):
|
||||||
stall_ids = await get_diagonalley_market_stalls(market_id)
|
stall_ids = await get_diagonalley_market_stalls(market_id)
|
||||||
return stall_ids
|
return stall_ids
|
||||||
|
|
||||||
|
|
||||||
@diagonalley_ext.post("/api/v1/markets")
|
@diagonalley_ext.post("/api/v1/markets")
|
||||||
@diagonalley_ext.put("/api/v1/markets/{market_id}")
|
@diagonalley_ext.put("/api/v1/markets/{market_id}")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue