fix: add sort to Event list

dandelion/api/api_v1/endpoints/rsi_clcs.py

@@ -21,6 +21,7 @@
 
 from dandelion import crud, models, schemas
 from dandelion.api import deps
+from dandelion.schemas.utils import Sort
 
 router = APIRouter()
 
@@ -44,6 +45,7 @@
     },
 )
 def get_all(
+    sort_dir: Sort = Query(Sort.desc, alias="sortDir", description="Sort by ID(asc/desc)"),
     info: Optional[int] = Query(None, alias="info", description="UseCase type"),
     page_num: int = Query(1, alias="pageNum", ge=1, description="Page number"),
     page_size: int = Query(10, alias="pageSize", ge=-1, description="Page size"),
@@ -55,6 +57,7 @@ def get_all(
         db,
         skip=skip,
         limit=page_size,
+        sort=sort_dir,
         info=info,
     )
     return schemas.RSICLCs(total=total, data=[clc.to_all_dict() for clc in data])

dandelion/api/api_v1/endpoints/rsi_cwms.py

@@ -21,6 +21,7 @@
 
 from dandelion import crud, models, schemas
 from dandelion.api import deps
+from dandelion.schemas.utils import Sort
 
 router = APIRouter()
 
@@ -48,6 +49,7 @@ def get_all(
     collision_type: Optional[int] = Query(
         None, alias="collisionType", description="Collision Type"
     ),
+    sort_dir: Sort = Query(Sort.desc, alias="sortDir", description="Sort by ID(asc/desc)"),
     page_num: int = Query(1, alias="pageNum", ge=1, description="Page number"),
     page_size: int = Query(10, alias="pageSize", ge=-1, description="Page size"),
     db: Session = Depends(deps.get_db),
@@ -58,6 +60,7 @@ def get_all(
         db,
         skip=skip,
         limit=page_size,
+        sort=sort_dir,
         event_type=event_type,
         collision_type=collision_type,
     )

dandelion/api/api_v1/endpoints/rsi_dnps.py

@@ -21,6 +21,7 @@
 
 from dandelion import crud, models, schemas
 from dandelion.api import deps
+from dandelion.schemas.utils import Sort
 
 router = APIRouter()
 
@@ -45,6 +46,7 @@
 )
 def get_all(
     info: Optional[int] = Query(None, alias="info", description="UseCase type"),
+    sort_dir: Sort = Query(Sort.desc, alias="sortDir", description="Sort by ID(asc/desc)"),
     page_num: int = Query(1, alias="pageNum", ge=1, description="Page number"),
     page_size: int = Query(10, alias="pageSize", ge=-1, description="Page size"),
     db: Session = Depends(deps.get_db),
@@ -55,6 +57,7 @@ def get_all(
         db,
         skip=skip,
         limit=page_size,
+        sort=sort_dir,
         info=info,
     )
     return schemas.RSIDNPs(total=total, data=[dnp.to_all_dict() for dnp in data])

dandelion/api/api_v1/endpoints/rsi_events.py

@@ -23,6 +23,7 @@
 
 from dandelion import crud, models, schemas
 from dandelion.api import deps
+from dandelion.schemas.utils import Sort
 
 router = APIRouter()
 LOG: LoggerAdapter = log.getLogger(__name__)
@@ -83,13 +84,20 @@ def get_all(
     address: Optional[str] = Query(
         None, alias="address", description="Filter by address. Fuzzy prefix query is supported"
     ),
+    sort_dir: Sort = Query(Sort.desc, alias="sortDir", description="Sort by ID(asc/desc)"),
     page_num: int = Query(1, alias="pageNum", ge=1, description="Page number"),
     page_size: int = Query(10, alias="pageSize", ge=-1, description="Page size"),
     db: Session = Depends(deps.get_db),
     current_user: models.User = Depends(deps.get_current_user),
 ) -> schemas.RSIEvents:
     skip = page_size * (page_num - 1)
     total, data = crud.rsi_event.get_multi_with_total(
-        db, skip=skip, limit=page_size, event_type=event_type, area_code=area_code, address=address
+        db,
+        skip=skip,
+        limit=page_size,
+        sort=sort_dir,
+        event_type=event_type,
+        area_code=area_code,
+        address=address,
     )
     return schemas.RSIEvents(total=total, data=[rsi_event.to_all_dict() for rsi_event in data])

dandelion/api/api_v1/endpoints/rsi_sdss.py

@@ -21,6 +21,7 @@
 
 from dandelion import crud, models, schemas
 from dandelion.api import deps
+from dandelion.schemas.utils import Sort
 
 router = APIRouter()
 
@@ -47,6 +48,7 @@ def get_all(
     equipment_type: Optional[int] = Query(
         None, alias="equipmentType", description="Equipment Type"
     ),
+    sort_dir: Sort = Query(Sort.desc, alias="sortDir", description="Sort by ID(asc/desc)"),
     page_num: int = Query(1, alias="pageNum", ge=1, description="Page number"),
     page_size: int = Query(10, alias="pageSize", ge=-1, description="Page size"),
     db: Session = Depends(deps.get_db),
@@ -57,6 +59,7 @@ def get_all(
         db,
         skip=skip,
         limit=page_size,
+        sort=sort_dir,
         equipment_type=equipment_type,
     )
     return schemas.RSISDSs(total=total, data=[sds.to_all_dict() for sds in data])

dandelion/api/api_v1/endpoints/rsm_participants.py

@@ -23,6 +23,7 @@
 
 from dandelion import crud, models, schemas
 from dandelion.api import deps
+from dandelion.schemas.utils import Sort
 
 router = APIRouter()
 LOG: LoggerAdapter = log.getLogger(__name__)
@@ -48,14 +49,15 @@
 )
 def get_all(
     ptc_type: Optional[str] = Query(None, alias="ptcType", description="Filter by ptcType"),
+    sort_dir: Sort = Query(Sort.desc, alias="sortDir", description="Sort by ID(asc/desc)"),
     page_num: int = Query(1, alias="pageNum", ge=1, description="Page number"),
     page_size: int = Query(10, alias="pageSize", ge=-1, description="Page size"),
     db: Session = Depends(deps.get_db),
     current_user: models.User = Depends(deps.get_current_user),
 ) -> schemas.RSMParticipants:
     skip = page_size * (page_num - 1)
     total, data = crud.rsm_participant.get_multi_with_total(
-        db, skip=skip, limit=page_size, ptc_type=ptc_type
+        db, skip=skip, limit=page_size, sort=sort_dir, ptc_type=ptc_type
     )
     return schemas.RSMParticipants(
         total=total, data=[rsm_participant.to_dict() for rsm_participant in data]

dandelion/crud/crud_rsi_clc.py

@@ -23,6 +23,7 @@
 from dandelion.crud.base import CRUDBase
 from dandelion.models import RSICLC
 from dandelion.schemas import RSICLCCreate
+from dandelion.schemas.utils import Sort
 
 
 class CRUDRSICLC(CRUDBase[RSICLC, RSICLCCreate, RSICLCCreate]):
@@ -40,13 +41,17 @@ def get_multi_with_total(
         *,
         skip: int = 0,
         limit: int = 10,
+        sort: Sort = Sort.desc,
         info: Optional[int] = None,
     ) -> Tuple[int, List[RSICLC]]:
         query_ = db.query(self.model)
         if info is not None:
             query_ = query_.filter(self.model.info == info)
         total = query_.count()
-        query_ = query_.order_by(desc(self.model.id))
+        if sort == Sort.asc:
+            query_ = query_.order_by(self.model.id)
+        else:
+            query_ = query_.order_by(desc(self.model.id))
         if limit != -1:
             query_ = query_.offset(skip).limit(limit)
         data = query_.all()

dandelion/crud/crud_rsi_cwm.py

@@ -23,6 +23,7 @@
 from dandelion.crud.base import CRUDBase
 from dandelion.models import RSICWM
 from dandelion.schemas import RSICWMCreate
+from dandelion.schemas.utils import Sort
 
 
 class CRUDRSICWM(CRUDBase[RSICWM, RSICWMCreate, RSICWMCreate]):
@@ -40,6 +41,7 @@ def get_multi_with_total(
         *,
         skip: int = 0,
         limit: int = 10,
+        sort: Sort = Sort.desc,
         event_type: Optional[int] = 0,
         collision_type: Optional[int],
     ) -> Tuple[int, List[RSICWM]]:
@@ -49,7 +51,10 @@ def get_multi_with_total(
         if collision_type is not None:
             query_ = query_.filter(self.model.collision_type == collision_type)
         total = query_.count()
-        query_ = query_.order_by(desc(self.model.id))
+        if sort == Sort.asc:
+            query_ = query_.order_by(self.model.id)
+        else:
+            query_ = query_.order_by(desc(self.model.id))
         if limit != -1:
             query_ = query_.offset(skip).limit(limit)
         data = query_.all()

dandelion/crud/crud_rsi_dnp.py

@@ -23,6 +23,7 @@
 from dandelion.crud.base import CRUDBase
 from dandelion.models import RSIDNP
 from dandelion.schemas import RSIDNPCreate
+from dandelion.schemas.utils import Sort
 
 
 class CRUDRSIDNP(CRUDBase[RSIDNP, RSIDNPCreate, RSIDNPCreate]):
@@ -40,13 +41,17 @@ def get_multi_with_total(
         *,
         skip: int = 0,
         limit: int = 10,
+        sort: Sort = Sort.desc,
         info: Optional[int] = None,
     ) -> Tuple[int, List[RSIDNP]]:
         query_ = db.query(self.model)
         if info is not None:
             query_ = query_.filter(self.model.info == info)
         total = query_.count()
-        query_ = query_.order_by(desc(self.model.id))
+        if sort == Sort.asc:
+            query_ = query_.order_by(self.model.id)
+        else:
+            query_ = query_.order_by(desc(self.model.id))
         if limit != -1:
             query_ = query_.offset(skip).limit(limit)
         data = query_.all()

dandelion/crud/crud_rsi_event.py

@@ -23,6 +23,7 @@
 from dandelion.crud.base import CRUDBase
 from dandelion.models import RSU, RSIEvent
 from dandelion.schemas import RSIEventCreate, RSIEventUpdate
+from dandelion.schemas.utils import Sort
 
 
 class CRUDRSIEvent(CRUDBase[RSIEvent, RSIEventCreate, RSIEventUpdate]):
@@ -43,6 +44,7 @@ def get_multi_with_total(
         *,
         skip: int = 0,
         limit: int = 10,
+        sort: Sort = Sort.desc,
         event_type: Optional[int] = None,
         area_code: Optional[str] = None,
         address: Optional[str] = None,
@@ -55,7 +57,10 @@ def get_multi_with_total(
         if address is not None:
             query_ = query_.filter(self.model.address.like(f"{address}%"))
         total = query_.count()
-        query_ = query_.order_by(desc(self.model.id))
+        if sort == Sort.asc:
+            query_ = query_.order_by(self.model.id)
+        else:
+            query_ = query_.order_by(desc(self.model.id))
         if limit != -1:
             query_ = query_.offset(skip).limit(limit)
         data = query_.all()

dandelion/crud/crud_rsi_sds.py

@@ -23,6 +23,7 @@
 from dandelion.crud.base import CRUDBase
 from dandelion.models import RSISDS
 from dandelion.schemas import RSISDSCreate
+from dandelion.schemas.utils import Sort
 
 
 class CRUDRSISDS(CRUDBase[RSISDS, RSISDSCreate, RSISDSCreate]):
@@ -40,13 +41,17 @@ def get_multi_with_total(
         *,
         skip: int = 0,
         limit: int = 10,
+        sort: Sort = Sort.desc,
         equipment_type: Optional[int] = None,
     ) -> Tuple[int, List[RSISDS]]:
         query_ = db.query(self.model)
         if equipment_type is not None:
             query_ = query_.filter(self.model.equipment_type == equipment_type)
         total = query_.count()
-        query_ = query_.order_by(desc(self.model.id))
+        if sort == Sort.asc:
+            query_ = query_.order_by(self.model.id)
+        else:
+            query_ = query_.order_by(desc(self.model.id))
         if limit != -1:
             query_ = query_.offset(skip).limit(limit)
         data = query_.all()

dandelion/crud/crud_rsm_participant.py

@@ -22,6 +22,7 @@
 from dandelion.crud.base import CRUDBase
 from dandelion.models import Participants
 from dandelion.schemas import RSMParticipantCreate, RSMParticipantUpdate
+from dandelion.schemas.utils import Sort
 
 
 class CRUDRSMParticipant(CRUDBase[Participants, RSMParticipantCreate, RSMParticipantUpdate]):
@@ -33,13 +34,17 @@ def get_multi_with_total(
         *,
         skip: int = 0,
         limit: int = 10,
+        sort: Sort = Sort.desc,
         ptc_type: Optional[str] = None,
     ) -> Tuple[int, List[Participants]]:
         query_ = db.query(self.model)
         if ptc_type is not None:
             query_ = query_.filter(self.model.ptc_type == ptc_type)
         total = query_.count()
-        query_ = query_.order_by(desc(self.model.id))
+        if sort == Sort.asc:
+            query_ = query_.order_by(self.model.id)
+        else:
+            query_ = query_.order_by(desc(self.model.id))
         if limit != -1:
             query_ = query_.offset(skip).limit(limit)
         data = query_.all()

dandelion/schemas/rsi_clc.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+from datetime import datetime
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
@@ -47,6 +48,7 @@ class RSICLCCreate(RSICLCBase):
 
 class RSICLCInDBBase(RSICLCBase):
     id: int = Field(..., alias="id", description="CLC ID")
+    create_time: datetime = Field(..., alias="createTime", description="Create Time")
 
     class Config:
         orm_mode = True

dandelion/schemas/rsi_cwm.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+from datetime import datetime
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
@@ -64,6 +65,7 @@ class RSICWMCreate(RSICWMBase):
 
 class RSICWMInDBBase(RSICWMBase):
     id: int = Field(..., alias="id", description="CWM ID")
+    create_time: datetime = Field(..., alias="createTime", description="Create Time")
 
     class Config:
         orm_mode = True

dandelion/schemas/rsi_dnp.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+from datetime import datetime
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
@@ -59,6 +60,7 @@ class RSIDNPCreate(RSIDNPBase):
 
 class RSIDNPInDBBase(RSIDNPBase):
     id: int = Field(..., alias="id", description="DNP ID")
+    create_time: datetime = Field(..., alias="createTime", description="Create Time")
 
     class Config:
         orm_mode = True

dandelion/schemas/rsi_sds.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+from datetime import datetime
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
@@ -42,6 +43,7 @@ class RSISDSCreate(RSISDSBase):
 
 class RSISDSInDBBase(RSISDSBase):
     id: int = Field(..., alias="id", description="SDS ID")
+    create_time: datetime = Field(..., alias="createTime", description="Create Time")
 
     class Config:
         orm_mode = True

dandelion/schemas/utils.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class Sort(str, Enum):
+    asc = "asc"
+    desc = "desc"