diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..8101bfe --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "editor.fontSize": 18 +} \ No newline at end of file diff --git a/models/__init__.py b/models/__init__.py index d9be4e1..b36e661 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -4,7 +4,7 @@ from .alarm_item import AlarmItem from .building_item import BuildingItem from .gateway_item import GatewayItem from .operator_item import OperatorItem -from .plan_item import PlanItem +from .floor_item import FloorItem from .remove_item import RemoveItem from .setting_item import SettingItem from .subject_item import SubjectItem @@ -17,7 +17,7 @@ __all__ = ( "BuildingItem", "GatewayItem", "OperatorItem", - "PlanItem", + "FloorItem", "RemoveItem", "SettingItem", "SubjectItem", diff --git a/models/__pycache__/__init__.cpython-310.pyc b/models/__pycache__/__init__.cpython-310.pyc index e914faf..381675b 100644 Binary files a/models/__pycache__/__init__.cpython-310.pyc and b/models/__pycache__/__init__.cpython-310.pyc differ diff --git a/models/__pycache__/floor_item.cpython-310.pyc b/models/__pycache__/floor_item.cpython-310.pyc new file mode 100644 index 0000000..f921a82 Binary files /dev/null and b/models/__pycache__/floor_item.cpython-310.pyc differ diff --git a/reslevis/models/__init__.py b/reslevis/models/__init__.py index d9be4e1..b36e661 100644 --- a/reslevis/models/__init__.py +++ b/reslevis/models/__init__.py @@ -4,7 +4,7 @@ from .alarm_item import AlarmItem from .building_item import BuildingItem from .gateway_item import GatewayItem from .operator_item import OperatorItem -from .plan_item import PlanItem +from .floor_item import FloorItem from .remove_item import RemoveItem from .setting_item import SettingItem from .subject_item import SubjectItem @@ -17,7 +17,7 @@ __all__ = ( "BuildingItem", "GatewayItem", "OperatorItem", - "PlanItem", + "FloorItem", "RemoveItem", "SettingItem", "SubjectItem", diff --git a/routes/__pycache__/reslevis.cpython-310.pyc b/routes/__pycache__/reslevis.cpython-310.pyc index 494e849..bcbcad9 100644 Binary files a/routes/__pycache__/reslevis.cpython-310.pyc and b/routes/__pycache__/reslevis.cpython-310.pyc differ diff --git a/routes/reslevis.py b/routes/reslevis.py index 6c9e6a6..d45b37c 100644 --- a/routes/reslevis.py +++ b/routes/reslevis.py @@ -208,3 +208,86 @@ def removeTrackerZone(tracker_zone_id: str): tracker_zone_repo.remove(tracker_zone_id) return {"message": "OK"} +@router.get( + "/getTracks", + response_model=List[TrackItem], + tags=["Reslevis"], + dependencies=[Depends(get_current_user)], +) +def getTracks(): + return track_repo.list() + + +@router.post("/postTrack", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def postTrack(item: TrackItem): + track_repo.add(item) + return {"message": "OK"} + + +@router.put("/updateTrack", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def updateTrack(item: TrackItem): + track_repo.update(item) + return {"message": "OK"} + + +@router.delete("/removeTrack/{track_id}", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def removeTrack(track_id: str): + track_repo.remove(track_id) + return {"message": "OK"} + + +@router.get( + "/getOperators", + response_model=List[OperatorItem], + tags=["Reslevis"], + dependencies=[Depends(get_current_user)], +) +def getOperators(): + return operator_repo.list() + + +@router.post("/postOperator", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def postOperator(item: OperatorItem): + operator_repo.add(item) + return {"message": "OK"} + + +@router.put("/updateOperator", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def updateOperator(item: OperatorItem): + operator_repo.update(item) + return {"message": "OK"} + + +@router.delete("/removeOperator/{operator_id}", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def removeOperator(operator_id: str): + operator_repo.remove(operator_id) + return {"message": "OK"} + + +@router.get( + "/getSubjects", + response_model=List[SubjectItem], + tags=["Reslevis"], + dependencies=[Depends(get_current_user)], +) +def getSubjects(): + return subject_repo.list() + + +@router.post("/postSubject", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def postSubject(item: SubjectItem): + subject_repo.add(item) + return {"message": "OK"} + + +@router.put("/updateSubject", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def updateSubject(item: SubjectItem): + subject_repo.update(item) + return {"message": "OK"} + + +@router.delete("/removeSubject/{subject_id}", tags=["Reslevis"], dependencies=[Depends(get_current_user)]) +def removeSubject(subject_id: str): + subject_repo.remove(subject_id) + return {"message": "OK"} + diff --git a/schemas/__pycache__/reslevis.cpython-310.pyc b/schemas/__pycache__/reslevis.cpython-310.pyc index 242228c..aa757f6 100644 Binary files a/schemas/__pycache__/reslevis.cpython-310.pyc and b/schemas/__pycache__/reslevis.cpython-310.pyc differ diff --git a/schemas/reslevis.py b/schemas/reslevis.py index 1416ea3..581c50e 100644 --- a/schemas/reslevis.py +++ b/schemas/reslevis.py @@ -53,6 +53,11 @@ class TrackerItem(BaseModel): y: Optional[float] = None floor: Optional[UUID] = None building: Optional[UUID] = None + battery: Optional[str] = None + temperature: Optional[str] = None + acceleration: Optional[str] = None + heartRate: Optional[str] = None + buttonPress: Optional[bool] = None class OperatorItem(BaseModel): id: UUID @@ -111,3 +116,13 @@ class TrackerZoneItem(BaseModel): tracker: UUID days: Optional[str] = None time: Optional[str] = None + +class ConfigItem(BaseModel): + name: str + min: str + max: str + pattern: str + configs:List[str] + propery: List[str] + offset: str +