Minor re code reog

Author: matteius

opensensor/collection_apis.py

@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta, timezone
 from typing import Generic, List, Optional, Type, TypeVar
 
+from bson import Binary
 from fastapi import APIRouter, Depends, HTTPException, Path, Query, Response, status
 from fastapi_pagination.default import Page as BasePage
 from fastapi_pagination.default import Params as BaseParams
@@ -22,7 +23,6 @@
 from opensensor.db import get_open_sensor_db
 from opensensor.users import (
     User,
-    _record_data_point_to_ts_collection,
     auth,
     device_id_is_allowed_for_user,
     get_api_keys_by_device_id,
@@ -46,6 +46,27 @@ class Page(BasePage[T], Generic[T]):
 router = APIRouter()
 
 
+def _record_data_point_to_ts_collection(
+    collection,
+    ts_column_name: str,
+    device_metadata: DeviceMetadata,
+    data_point,
+    user: User = None,
+):
+    metadata = device_metadata.dict()
+    metadata.pop("api_key", None)
+    if user:
+        metadata["user_id"] = Binary.from_uuid(user.fief_user_id)
+    if hasattr(data_point, "unit"):
+        metadata["unit"] = data_point.unit
+    data = {
+        "timestamp": datetime.utcnow(),
+        "metadata": metadata,
+        ts_column_name: str(getattr(data_point, ts_column_name)),
+    }
+    collection.insert_one(data)
+
+
 @router.post("/rh/", response_model=Humidity)
 async def record_humidity(
     device_metadata: DeviceMetadata,
@@ -112,6 +133,17 @@ async def record_moisture_readings(
     return Response(status_code=status.HTTP_201_CREATED)
 
 
+@app.post("/pH/", response_model=PH)
+async def record_ph(
+    device_metadata: DeviceMetadata,
+    ph: PH,
+    user: User = Depends(validate_device_metadata),
+):
+    db = get_open_sensor_db()
+    _record_data_point_to_ts_collection(db.pH, "pH", device_metadata, ph, user)
+    return Response(status_code=status.HTTP_201_CREATED)
+
+
 def get_collection_name(response_model: Type[T]):
     if hasattr(response_model, "collection_name"):
         return response_model.collection_name()
@@ -246,17 +278,6 @@ async def historical_data_route(
     return historical_data_route
 
 
-@app.post("/pH/", response_model=PH)
-async def record_ph(
-    device_metadata: DeviceMetadata,
-    ph: PH,
-    user: User = Depends(validate_device_metadata),
-):
-    db = get_open_sensor_db()
-    _record_data_point_to_ts_collection(db.pH, "pH", device_metadata, ph, user)
-    return Response(status_code=status.HTTP_201_CREATED)
-
-
 router.add_api_route(
     "/temp/{device_id}",
     create_historical_data_route(Temperature),

opensensor/users.py

@@ -2,7 +2,6 @@
 import os
 import secrets
 from collections import defaultdict
-from datetime import datetime
 from typing import Dict, List, Optional
 from uuid import UUID
 
@@ -344,24 +343,3 @@ def validate_api_key(api_key: str, device_id: str, device_name: str) -> User:
 
 
 auth = oauth2_auth
-
-
-def _record_data_point_to_ts_collection(
-    collection,
-    ts_column_name: str,
-    device_metadata: DeviceMetadata,
-    data_point,
-    user: User = None,
-):
-    metadata = device_metadata.dict()
-    metadata.pop("api_key", None)
-    if user:
-        metadata["user_id"] = Binary.from_uuid(user.fief_user_id)
-    if hasattr(data_point, "unit"):
-        metadata["unit"] = data_point.unit
-    data = {
-        "timestamp": datetime.utcnow(),
-        "metadata": metadata,
-        ts_column_name: str(getattr(data_point, ts_column_name)),
-    }
-    collection.insert_one(data)

tests/__init__.py

@@ -0,0 +1,11 @@
+
+from fastapi.testclient import TestClient
+from main import app
+
+client = TestClient(app)
+
+
+def test_read_root():
+    response = client.get("/")
+    assert response.status_code == 200
+    assert response.json() == {"message": "Welcome to OpenSensor.io!  Navigate to /docs for current Alpha API spec."}