Fixing tests. Rebasing with master.

Author: pgrill

api/models/config.py

@@ -29,10 +29,18 @@ class ConfigDTO(SnakeModel):
     periodicTasks: Optional[List[PeriodicTaskDTO]] = []
 
 
+class ConfigMetrics(BaseModel):
+    social_distancing: bool
+    facemask: bool
+    occupancy: bool
+    in_out: bool
+
+
 class ConfigInfo(BaseModel):
     version: str
     device: str
     has_been_configured: bool
+    metrics: ConfigMetrics
 
     class Config:
         schema_extra = {

api/tests/app/test_camera.py

@@ -171,8 +171,6 @@ def test_edit_a_camera_properly(self, config_rollback, camera_sample, rollback_c
 
         camera_id = camera_sample["id"]
         body = {
-            "violation_threshold": 22,
-            "notify_every_minutes": 22,
             "id": camera_id,
             "name": "new_Kitchen",
             "video_path": "/repo/api/tests/data/mocked_data/data/softbio_vid.mp4",