Pre production

api/main.py

@@ -1,28 +1,11 @@
-# ===============================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ===============================================================================
 from datetime import timedelta
-
 from fastapi import FastAPI, Depends, HTTPException
 from fastapi.security import OAuth2PasswordRequestForm
 from fastapi_pagination import add_pagination
-
 from fastapi.middleware.cors import CORSMiddleware
 from starlette import status
-
 from api.schemas import security_schemas
 from api.models.main_models import Users
-
 from api.routes.activities import activity_router
 from api.routes.admin import admin_router
 from api.routes.chlorides import authenticated_chlorides_router, public_chlorides_router
@@ -33,14 +16,12 @@
 from api.routes.settings import settings_router
 from api.routes.well_measurements import authenticated_well_measurement_router, public_well_measurement_router
 from api.routes.wells import authenticated_well_router, public_well_router
-
 from api.security import (
     authenticate_user,
     create_access_token,
     ACCESS_TOKEN_EXPIRE_HOURS,
     authenticated_router,
 )
-
 from api.session import get_db
 from sqlalchemy.orm import Session
 

api/models/main_models.py

@@ -546,13 +546,13 @@ class WellMeasurements(Base):
     timestamp: Mapped[DateTime] = mapped_column(
         DateTime, default=func.now(), nullable=False
     )
-    value: Mapped[float] = mapped_column(Float, nullable=False)
+    value: Mapped[Optional[float]] = mapped_column(Float, nullable=True)
 
     observed_property_id: Mapped[int] = mapped_column(
         Integer, ForeignKey("ObservedPropertyTypeLU.id"), nullable=False
     )
-    submitting_user_id: Mapped[int] = mapped_column(
-        Integer, ForeignKey("Users.id"), nullable=False
+    submitting_user_id: Mapped[Optional[int]] = mapped_column(
+        Integer, ForeignKey("Users.id"), nullable=True
     )
     unit_id: Mapped[int] = mapped_column(
         Integer, ForeignKey("Units.id"), nullable=False

api/routes/chlorides.py

@@ -1,11 +1,10 @@
 from typing import Optional, List
-from datetime import datetime
-import calendar
+from datetime import datetime, date
 import statistics
 from fastapi.responses import StreamingResponse
 from weasyprint import HTML
 from io import BytesIO
-from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi import APIRouter, Depends, Query
 from pydantic import BaseModel
 from sqlalchemy import and_, select
 from sqlalchemy.orm import Session, joinedload
@@ -117,16 +116,8 @@ class ChlorideReportNums(BaseModel):
     tags=["Chlorides"],
 )
 def get_chlorides_report(
-    from_month: Optional[str] = Query(
-        None,
-        description="Month start, 'YYYY-MM'",
-        pattern=r"^$|^\d{4}-\d{2}$",
-    ),
-    to_month: Optional[str] = Query(
-        None,
-        description="Month end, 'YYYY-MM'",
-        pattern=r"^$|^\d{4}-\d{2}$",
-    ),
+    from_date: date = Query(..., description="Start date in ISO format, 'YYYY-MM-DD'"),
+    to_date: date = Query(..., description="End date in ISO format, 'YYYY-MM-DD'"),
     db: Session = Depends(get_db),
 ):
     """
@@ -136,13 +127,9 @@ def get_chlorides_report(
 
     CHLORIDE_OBSERVED_PROPERTY_ID = 5
 
-    # Parse months
-    start_dt = _parse_month(from_month) if from_month else None
-    end_dt = _parse_month(to_month) if to_month else None
-    if start_dt and not end_dt:
-        end_dt = start_dt
-    if end_dt:
-        end_dt = _month_end(end_dt)
+    # Convert to datetimes for inclusive range
+    start_dt = datetime.combine(from_date, datetime.min.time())
+    end_dt = datetime.combine(to_date, datetime.max.time())
 
     stmt = (
         select(
@@ -218,31 +205,23 @@ def get_chlorides_report(
     tags=["Chlorides"],
 )
 def download_chlorides_report_pdf(
-    from_month: Optional[str] = Query(
-        None,
-        description="Month start, 'YYYY-MM'",
-        pattern=r"^$|^\d{4}-\d{2}$",
-    ),
-    to_month: Optional[str] = Query(
-        None,
-        description="Month end, 'YYYY-MM'",
-        pattern=r"^$|^\d{4}-\d{2}$",
-    ),
+    from_date: date = Query(..., description="Start date in ISO format, 'YYYY-MM-DD'"),
+    to_date: date = Query(..., description="End date in ISO format, 'YYYY-MM-DD'"),
     db: Session = Depends(get_db),
 ):
     """
     Generate a PDF chloride report (north/south/east/west stats)
     for the SE quadrant of New Mexico.
     """
-    # Re-use your existing logic by calling the data endpoint’s function
-    report = get_chlorides_report(from_month=from_month, to_month=to_month, db=db)
+    # Re-use existing logic
+    report = get_chlorides_report(from_date=from_date, to_date=to_date, db=db)
 
     # Render HTML using a template
     template = templates.get_template("chlorides_report.html")
     html_content = template.render(
         report=report,
-        from_month=from_month,
-        to_month=to_month,
+        from_date=from_date,
+        to_date=to_date,
     )
 
     # Convert to PDF
@@ -293,12 +272,13 @@ def patch_chloride_measurement(
     chloride_measurement_patch: well_schemas.PatchChlorideMeasurement,
     db: Session = Depends(get_db),
 ):
-    # Find the measurement
     well_measurement = (
-        db.scalars(select(WellMeasurements).where(WellMeasurements.id == chloride_measurement_patch.id)).first()
+        db.scalars(
+            select(WellMeasurements)
+            .where(WellMeasurements.id == chloride_measurement_patch.id)
+        ).first()
     )
 
-    # Update the fields, all are mandatory
     well_measurement.submitting_user_id = chloride_measurement_patch.submitting_user_id
     well_measurement.timestamp = chloride_measurement_patch.timestamp
     well_measurement.value = chloride_measurement_patch.value
@@ -326,26 +306,6 @@ def delete_chloride_measurement(chloride_measurement_id: int, db: Session = Depe
     return True
 
 
-def _parse_month(m: Optional[str]) -> Optional[datetime]:
-    """
-    Accepts 'YYYY-MM' or 'YYYY MM'. Returns the first day of month at 00:00:00.
-    """
-    if not m:
-        return None
-    m = m.strip()
-    # Try 'YYYY-MM'
-    for fmt in ("%Y-%m", "%Y %m"):
-        try:
-            dt = datetime.strptime(m, fmt)
-            return dt.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
-        except ValueError:
-            continue
-    raise HTTPException(status_code=400, detail="Invalid month format. Use 'YYYY-MM' or 'YYYY MM'.")
-
-def _month_end(dt: datetime) -> datetime:
-    last_day = calendar.monthrange(dt.year, dt.month)[1]
-    return dt.replace(day=last_day, hour=23, minute=59, second=59, microsecond=999999)
-
 def _stats(values: List[Optional[float]]) -> MinMaxAvgMedCount:
     clean = [v for v in values if v is not None]
     if not clean: