azpsen/tailfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change stats to return class totals as nested dict

Browse Source
This commit is contained in:
april 2024-01-11 17:05:35 -06:00
parent e7aead4063
commit e0c342be01
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api/database/flights.py
View File

@ -7,7 +7,7 @@ from bson.errors import InvalidId
from fastapi import HTTPException from fastapi import HTTPException
from schemas.aircraft import AircraftCreateSchema, aircraft_add_helper, AircraftCategory, AircraftClass, \ from schemas.aircraft import AircraftCreateSchema, aircraft_add_helper, AircraftCategory, AircraftClass, \
aircraft_class_dict aircraft_class_dict, aircraft_category_dict
from .aircraft import retrieve_aircraft_by_tail, update_aircraft, update_aircraft_field, retrieve_aircraft from .aircraft import retrieve_aircraft_by_tail, update_aircraft, update_aircraft_field, retrieve_aircraft
from .db import flight_collection, aircraft_collection from .db import flight_collection, aircraft_collection
from schemas.flight import FlightConciseSchema, FlightDisplaySchema, FlightCreateSchema, flight_display_helper, \ from schemas.flight import FlightConciseSchema, FlightDisplaySchema, FlightCreateSchema, flight_display_helper, \
@ -68,13 +68,21 @@ async def retrieve_totals(user: str, start_date: datetime = None, end_date: date
}}, }},
{"$unwind": "$flight_data"}, {"$unwind": "$flight_data"},
{"$group": { {"$group": {
"_id": "$aircraft_class", # "_id": "$aircraft_category",
"time_total": {"$sum": "$flight_data.time_total"} "_id": {"aircraft_category": "$aircraft_category", "aircraft_class": "$aircraft_class"},
"time_total": {"$sum": "$flight_data.time_total"},
}},
{"$group": {
"_id": "$_id.aircraft_category",
"classes": {"$push": {
"aircraft_class": "$_id.aircraft_class",
"time_total": "$time_total",
}},
}}, }},
{"$project": { {"$project": {
"_id": 0, "_id": 0,
"aircraft_class": "$_id", "aircraft_category": "$_id",
"time_total": 1 "classes": 1,
}}, }},
{"$facet": { {"$facet": {
"by_class": [{"$match": {}}], "by_class": [{"$match": {}}],
@ -115,10 +123,12 @@ async def retrieve_totals(user: str, start_date: datetime = None, end_date: date
result = dict(result_list[0]) result = dict(result_list[0])
print(aircraft_class_dict) # for entry in result["by_class"]:
# entry["aircraft_category"] = aircraft_category_dict[entry["aircraft_category"]]
# for cls in entry["classes"]:
# cls["aircraft_class"] = aircraft_class_dict[cls["aircraft_class"]]
for entry in result["by_class"]: print(result)
entry["aircraft_class"] = aircraft_class_dict[entry["aircraft_class"]]
return result return result

3
api/schemas/aircraft.py
View File

@ -48,6 +48,9 @@ class AircraftCategory(Enum):
weight_shift = "Weight-Shift Control" weight_shift = "Weight-Shift Control"
aircraft_category_dict = {cls.name: cls.value for cls in AircraftCategory}
class AircraftClass(Enum): class AircraftClass(Enum):
# Airplane # Airplane
sel = "Single-Engine Land" sel = "Single-Engine Land"