NMWDI · TylerAdamMartinez · Sep 4, 2025 · May 5, 2025 · May 7, 2025 · May 9, 2025
diff --git a/.github/workflows/deploy-to-gcp.yml b/.github/workflows/deploy-to-gcp.yml
@@ -0,0 +1,57 @@
+name: Deploy to GCP Compute VM
+
+on:
+  push:
+    branches:
+      - pre-production
+      - production
+
+jobs:
+  deploy:
+    name: Deploy to GCP VM
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set environment
+        run: |
+          if [[ "${GITHUB_REF_NAME}" == "production" ]]; then
+            echo "SSH_HOST=${{ secrets.GCP_PROD_SSH_HOST }}" >> "$GITHUB_ENV"
+            echo "COMPOSE_FILE=docker-compose.production.yml" >> "$GITHUB_ENV"
+          else
+            echo "SSH_HOST=${{ secrets.GCP_PREPROD_SSH_HOST }}" >> "$GITHUB_ENV"
+            echo "COMPOSE_FILE=docker-compose.development.yml" >> "$GITHUB_ENV"
+          fi
+
+      - name: Show CI key fingerprint
+        shell: bash
+        env:
+          KEY: ${{ github.ref_name == 'production' && secrets.GCP_PROD_SSH_PRIVATE_KEY || secrets.GCP_PREPROD_SSH_PRIVATE_KEY }}
+        run: |
+          set -euo pipefail
+          printf '%s\n' "$KEY" > key.pem
+          chmod 600 key.pem
+          echo -n "CI key fingerprint: "
+          ssh-keygen -yf key.pem | ssh-keygen -lf -
+
+      # Use a single SSH step; choose the key by branch
+      - name: Deploy to VM via SSH
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ env.SSH_HOST }}
+          username: ${{ secrets.GCP_SSH_USER }}
+          key: ${{ github.ref_name == 'production' && secrets.GCP_PROD_SSH_PRIVATE_KEY || secrets.GCP_PREPROD_SSH_PRIVATE_KEY }}
+          script: |
+            set -e
+            cd ${{ secrets.DEPLOYMENT_PATH }}
+
+            git fetch origin --prune
+            git checkout "${{ github.ref_name }}"
+            git pull --ff-only origin "${{ github.ref_name }}"
+
+            docker compose -f "${{ env.COMPOSE_FILE }}" down
+            docker compose -f "${{ env.COMPOSE_FILE }}" up -d --build
+
+            docker image prune -f
diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
@@ -0,0 +1,35 @@
+name: PRs Docker Build Test
+
+on:
+  pull_request:
+
+jobs:
+  docker-build:
+    name: Test Production Docker Builds
+    runs-on: ubuntu-latest
+
+    services:
+      docker:
+        image: docker:24.0.5
+        options: --privileged
+        ports:
+          - 5173:80
+          - 8000:8000
+          - 8080:8080
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # Build Frontend Production Image
+      - name: Build Frontend Docker Image
+        run: |
+          docker build -t frontend-prod -f frontend/Dockerfile ./frontend
+
+      # Build Backend Production Image
+      - name: Build API Docker Image
+        run: |
+          docker build -t api-prod -f api/Dockerfile ./api
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,63 @@
+# Changelog
+
+All notable changes to **Meter Manager** will be documented in this file.
+
+| Version   | Changes |
+|-----------|---------|
+| v0.2.0    | Parts-used report functional with PDF download |
+| v0.1.52   | Deploy chlorides for admin testing |
+| v0.1.51.1 | Increased frontend signout to 300 minutes |
+| v0.1.51   | Improved monitoring well page |
+| v0.1.50   | Fixed wells map bug and update register if part used |
+| v0.1.49   | Added outside recorder wells to monitoring page |
+| v0.1.48   | Changed well owner to be meter water users |
+| v0.1.47   | Add TRSS grids to meter map and fixed meter register save bug |
+| v0.1.46   | Change how data is displayed in Wells table |
+| v0.1.45   | Color code meter markers on map by last PM |
+| v0.1.44   | Fix bug in continuous monitoring well data and added data to OSE endpoint |
+| v0.1.43   | Fix navigation from work orders to activity, add OSE endpoint for "data issues" |
+| v0.1.42   | Fix pagination, add 'uninstall and hold' |
+| v0.1.41   | Add UI for water source on wells and some other minor changes |
+| v0.1.40   | Add register to UI on meter details |
+| v0.1.39   | Default share ose when workorder, OSE access to register information |
+| v0.1.38   | Change logout time to 8 hours, show work order count in navigation |
+| v0.1.37.1 | Fix various work order bugs |
+| v0.1.37   | Update OSE API to include ose_request_id and new endpoint |
+| v0.1.36   | Improved work orders, testing still needed |
+| v0.1.35.1 | Fix bug with well search failing on certain inputs |
+| v0.1.35   | Update continuous data stream IDs for monitoring wells |
+| v0.1.34   | Work orders ready for alpha testing, reordered monitoring wells |
+| v0.1.33   | Add Meter Status Filter to Meters Table |
+| v0.1.32   | Fix Monitoring Wells so that table updates after change |
+| v0.1.31   | Added note "verified register ratio" and made it appear by default |
+| v0.1.30   | Admin can edit monitoring well data (note that monitoring well table still not updating automatically) |
+| v0.1.29   | Fixed bug preventing meter type change |
+| v0.1.28   | Full admin UI on meter page |
+| v0.1.27   | Give admin ability to add out of order activities, fix zoom on map, other minor changes |
+| v0.1.26   | Add functional merge button for admin |
+| v0.1.25   | Fix datesort on meter history, give techs limited well management |
+| v0.1.24   | Add non-functional merge button for initial testing |
+| v0.1.23   | Prevent duplicate activities from being added |
+| v0.1.22   | Change ownership so there is now water_users and meter_owner |
+| v0.1.21   | Implement Degrees Minutes Seconds (DMS) for lat/long |
+| v0.1.20   | Fix monitoring wells sort |
+| v0.1.19   | Updated OSE endpoint to have activity_id, reorganized data returned |
+| v0.1.18   | Only require well on install activity, display OSE tag |
+| v0.1.17   | Restructure security code to prevent database connection problems |
+| v0.1.16   | Fixed bug where status is changed when clearing well from meter |
+| v0.1.15   | Updated backend to use SQLAlchemy 2 (resolve connection issue?) |
+| v0.1.14   | Display RA number instead of well name, well distance is now observation, new default observations |
+| v0.1.13   | Add checkbox for sharing activities with OSE |
+| v0.1.12   | Change lat/long to DMS, reorder observation inputs, block out of order activities |
+| v0.1.11   | Remove all async code to see if it fixes deadlock issue |
+| v0.1.10   | Fix owners and osetag on Wells page |
+| v0.1.9    | Add owners to Meters table, fix various bugs |
+| v0.1.8    | Fix bug in meter selection autocomplete |
+| v0.1.7    | Fixed bugs in Add Meter |
+| v0.1.6    | Various fixes and meter search via map UI |
+| v0.1.5    | Various minor bug fixes |
+| v0.1.4    | Updated "current installation" section of activities to match Meters page |
+| v0.1.3    | Added user admin, improved appearance, fixed OSE endpoint scope |
+| v0.1.2    | Added an initial parts inventory and minor meter installation UI improvements |
+| v0.1.1    | Initial version with new clean database |
+| v0.0.0    | Initial minimum viable product |
diff --git a/LICENSE.md → LICENSE b/LICENSE.md → LICENSE
diff --git a/README.md b/README.md
@@ -1,80 +1,31 @@
-# WaterManagerDB
+# Meter Manager
 
-[![Unittests](https://github.com/NMWDI/WaterManagerDB/actions/workflows/testing.yml/badge.svg)](https://github.com/NMWDI/WaterManagerDB/actions/workflows/testing.yml)
-[![Format code](https://github.com/NMWDI/WaterManagerDB/actions/workflows/format_code.yml/badge.svg)](https://github.com/NMWDI/WaterManagerDB/actions/workflows/format_code.yml)
+### Purpose
 
-## Versions
-- V0.1.52 - Deploy chlorides for admin testing
-- V0.1.51.1 - Increased frontend signout to 300 minutes
-- V0.1.51 - Improved monitoring well page
-- V0.1.50 - Fixed wells map bug and update register if part used
-- V0.1.49 - Added outside recorder wells to monitoring page
-- V0.1.48 - Changed well owner to be meter water users
-- V0.1.47 - Add TRSS grids to meter map and fixed meter register save bug
-- V0.1.46 - Change how data is displayed in Wells table
-- V0.1.45 - Color code meter markers on map by last PM
-- V0.1.44 - Fix bug in continuous monitoring well data and added data to OSE endpoint
-- V0.1.43 - Fix navigation from work orders to activity, add OSE endpoint for "data issues"
-- V0.1.42 - Fix pagination, add 'uninstall and hold'
-- V0.1.41 - Add UI for water source on wells and some other minor changes
-- V0.1.40 - Add register to UI on meter details
-- V0.1.39 - Default share ose when workorder, OSE access to register information
-- V0.1.38 - Change logout time to 8 hours, show work order count in navigation
-- V0.1.37.1 - Fix various work order bugs
-- V0.1.37 - Update OSE API to include ose_request_id and new endpoint
-- V0.1.36 - Improved work orders, testing still needed
-- V0.1.35.1 - Fix bug with well search failing on certain inputs
-- V0.1.35 - Update continuous data stream IDs for monitoring wells
-- V0.1.34 - Work orders ready for alpha testing, reordered monitoring wells
-- V0.1.33 - Add Meter Status Filter to Meters Table
-- V0.1.32 - Fix Monitoring Wells so that table updates after change
-- V0.1.31 - Added note "verified register ratio" and made it appear by default
-- V0.1.30 - Admin can edit monitoring well data (note that monitoring well table still not updating automatically)
-- V0.1.29 - Fixed bug preventing meter type change
-- V0.1.28 - Full admin UI on meter page
-- V0.1.27 - Give admin ability to add out of order activities, fix zoom on map, other minor changes
-- V0.1.26 - Add functional merge button for admin
-- V0.1.25 - Fix datesort on meter history, give techs limited well management
-- V0.1.24 - Add non-functional merge button for initial testing
-- V0.1.23 - Prevent duplicate activities from being added
-- V0.1.22 - Change ownership so there is now water_users and meter_owner
-- V0.1.21 - Implement Degrees Minutes Seconds (DMS) for lat/long
-- V0.1.20 - Fix monitoring wells sort
-- V0.1.19 - Updated OSE endpoint to have activity_id, reorganized data returned
-- V0.1.18 - Only require well on install activity, display OSE tag
-- V0.1.17 - Restructure security code to prevent database connection problems
-- V0.1.16 - Fixed bug where status is changed when clearing well from meter
-- V0.1.15 - Updated backend to use SQLAlchemy 2 (resolve connection issue?)
-- V0.1.14 - Display RA number instead of well name, well distance is now observation, new default observations
-- V0.1.13 - Add checkbox for sharing activities with OSE.
-- V0.1.12 - Change lat/long to DMS, reorder observation inputs, block out of order activities
-- V0.1.11 - Remove all async code to see if it fixes deadlock issue
-- V0.1.10 - Fix owners and osetag on Wells page
-- V0.1.9 - Add owners to Meters table, fix various bugs
-- V0.1.8 - Fix bug in meter selection autocomplete
-- V0.1.7 - Fixed bugs in Add Meter
-- V0.1.6 - Various fixes and meter search via map UI
-- V0.1.5 - Various minor bug fixes
-- V0.1.4 - Updated "current installation" section of activities to match Meters page
-- V0.1.3 - Added user admin, improved appearance, fixed OSE endpoint scope.
-- V0.1.2 - Added an initial parts inventory and minor meter installation UI improvements
-- V0.1.1 - Initial version with new clean database
-- V0.0 - Initial minimum viable product
+**Meter Manager** is a web application designed to help **PVACD** manage its water data. It provides tools for spatial visualization, maintenance tracking, and regulatory reporting.
 
-## Purpose
-This web app facilitates reporting of water management operations to other organizations. The initial goal is to help water conservation districts communicate with local and state governments. However, the interface may eventually be developed to be more general.
+---
 
-## Installation
-The app is built with the following components:
-* PostgreSQL database with PostGIS extension
-* Python FastAPI backend for interfacing with database
-* React based frontend
+### Features
 
-App components are organized into Docker containers, but it can also be run locally.
+- 🗺️ Interactive map UI for meters and wells  
+- 🔧 Meter activities, maintenance history, and preventive maintenance (PM) tracking  
+- 📦 Inventory and part usage tracking  
+- 📋 Work order and technician assignment system  
+- 📑 OSE-compliant reporting endpoint  
+- 🛠️ Admin features for editing, merging, and managing records  
+- 👥 Role-based access control (techs, admins, etc.)  
+- 🛰️ TRSS grid overlays for spatial reference  
+- 💧 Continuous monitoring support for observation wells  
 
-To run the app, clone the repository and use Docker Compose to run:
-```
-/watermanagerdb >> docker compose -f docker-compose.dev.yml --build
-```
+---
 
-The API component will need several environmental variables that should be specified in the file 'api/.env'. See api/.env_example for an example. The PostgreSQL environmental variables should match the database settings.
+### Tech Stack
+
+| Layer         | Technology           |
+|---------------|----------------------|
+| **Frontend**  | React + TypeScript   |
+| **Backend**   | FastAPI (Python)     |
+| **Database**  | PostgreSQL + PostGIS |
+| **Container** | Docker Compose       |
+| **CI/CD**     | GitHub Actions       |
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -1,17 +1,31 @@
-#
-FROM python:3.10
+FROM python:3.12.11
 
-#
-WORKDIR .
+WORKDIR /app
 
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
 
-#
+# Install system dependencies (trixie) + JDK (default is 21) + PostgreSQL client
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+      libpango-1.0-0 \
+      libcairo2 \
+      libgdk-pixbuf-2.0-0 \
+      libffi-dev \
+      default-jdk-headless \
+      postgresql-client \
+ && rm -rf /var/lib/apt/lists/*
+
+# Make Java headers discoverable by builds
+ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
+ENV JDK_HOME=$JAVA_HOME
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+ENV PYTHONPATH=/app
+
+# Now install the rest of the requirements
 COPY ./requirements.txt .
+RUN pip install --no-cache-dir --upgrade pip setuptools wheel \
+ && pip install --no-cache-dir -r requirements.txt
 
-#
-RUN pip install --no-cache-dir --upgrade -r requirements.txt
+COPY . /app/api
 
-#
-COPY . .
diff --git a/api/Dockerfile_dev b/api/Dockerfile_dev
diff --git a/api/main.py b/api/main.py
@@ -23,12 +23,14 @@
 from api.schemas import security_schemas
 from api.models.main_models import Users
 
-from api.routes.meters import meter_router
-from api.routes.well_measurements import well_measurement_router
 from api.routes.activities import activity_router
+from api.routes.admin import admin_router
+from api.routes.chlorides import chlorides_router
+from api.routes.maintenance import maintenance_router
+from api.routes.meters import meter_router
 from api.routes.OSE import ose_router
 from api.routes.parts import part_router
-from api.routes.admin import admin_router
+from api.routes.well_measurements import well_measurement_router
 from api.routes.wells import well_router
 
 from api.security import (
@@ -126,11 +128,13 @@ def login_for_access_token(
 
 # =======================================
 
-authenticated_router.include_router(meter_router)
 authenticated_router.include_router(activity_router)
-authenticated_router.include_router(well_measurement_router)
-authenticated_router.include_router(part_router)
 authenticated_router.include_router(admin_router)
+authenticated_router.include_router(chlorides_router)
+authenticated_router.include_router(maintenance_router)
+authenticated_router.include_router(meter_router)
+authenticated_router.include_router(part_router)
+authenticated_router.include_router(well_measurement_router)
 authenticated_router.include_router(well_router)
 
 add_pagination(app)

diff --git a/api/models/main_models.py b/api/models/main_models.py
@@ -69,6 +69,7 @@ class Parts(Base):
     note: Mapped[Optional[str]]
     in_use: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
     commonly_used: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    price: Mapped[Optional[float]] = mapped_column(Float)
 
     part_type_id: Mapped[int] = mapped_column(
         Integer, ForeignKey("PartTypeLU.id"), nullable=False
@@ -580,6 +581,7 @@ class meterRegisters(Base):
     __tablename__ = "meter_registers"
     brand: Mapped[str] = mapped_column(String, nullable=False)
     meter_size: Mapped[float] = mapped_column(Float, nullable=False)
+    part_id: Mapped[int] = mapped_column(Integer, ForeignKey("Parts.id"))
     ratio: Mapped[str] = mapped_column(String)
     dial_units_id: Mapped[int] = mapped_column(Integer, ForeignKey("Units.id"), nullable=False)
     totalizer_units_id: Mapped[int] = mapped_column(Integer, ForeignKey("Units.id"), nullable=False)