feat: Add session data to calculation time constraints and remove JSON body size limit middleware.

main
Cizz22 1 month ago
parent c1ebb41ff4
commit 4e75df1946

@ -1,3 +1,4 @@
from src.overhaul_scope.schema import ScopeRead
from dataclasses import dataclass from dataclasses import dataclass
from datetime import datetime from datetime import datetime
from typing import Any, Dict, List, Optional, Union from typing import Any, Dict, List, Optional, Union
@ -110,6 +111,7 @@ class CalculationTimeConstrainsReadNoResult(CalculationTimeConstrainsBase):
optimum_oh_day: Optional[int] optimum_oh_day: Optional[int]
max_interval: Optional[int] max_interval: Optional[int]
optimum_analysis: Optional[dict] optimum_analysis: Optional[dict]
session: ScopeRead
# optimum_oh_day: int # optimum_oh_day: int
# max_interval: int # max_interval: int
# optimal_analysis: dict # optimal_analysis: dict

@ -1123,6 +1123,9 @@ async def get_all_calculations(
) -> List[CalculationData]: ) -> List[CalculationData]:
stmt = ( stmt = (
select(CalculationData) select(CalculationData)
.options(
selectinload(CalculationData.session)
)
.where( .where(
CalculationData.optimum_oh_day.isnot(None), CalculationData.optimum_oh_day.isnot(None),
CalculationData.max_interval.isnot(None), CalculationData.max_interval.isnot(None),
@ -1131,6 +1134,7 @@ async def get_all_calculations(
.order_by(CalculationData.created_at.desc()) .order_by(CalculationData.created_at.desc())
) )
result = await db_session.execute(stmt) result = await db_session.execute(stmt)
return result.scalars().all() return result.scalars().all()

@ -144,11 +144,11 @@ class RequestValidationMiddleware(BaseHTTPMiddleware):
if content_type.startswith("application/json"): if content_type.startswith("application/json"):
body = await request.body() body = await request.body()
if len(body) > MAX_JSON_BODY_SIZE: # if len(body) > MAX_JSON_BODY_SIZE:
raise HTTPException( # raise HTTPException(
status_code=413, # status_code=413,
detail="JSON body too large", # detail="JSON body too large",
) # )
if body: if body:
try: try:

Loading…
Cancel
Save