diff --git a/README.md b/README.md index 1b81c93a0..e22059596 100644 --- a/README.md +++ b/README.md @@ -171,4 +171,28 @@ app/ ├── services/ # Reusable business logic, helpers, and database interactions ├── tests/ # Code tests └── transfers/ # Scripts to transfer data from NM_Aquifer to current db schema -``` \ No newline at end of file +``` + +## Model Changes + +1. Revise models in the `db/` directory +2. Revise schemas in the `schemas/` directory + 1. Add validators for both fields and models as necessary + 1. Validations on incoming data only should be handled by Pydantic and 422 errors will be raised (default Pydantic) + 2. Validations against values in the database will be handled at the endpoint with custom checks and 409 errors will be raised +3. Revise tests + 1. Revise fixtures in `tests/conftest.py` + 2. Revise fields in POST test payloads and asserts + 3. Revise fields in PATCH test payloads and asserts + 4. Revise fields in GET all and GET by ID test asserts + 5. Add tests for validations as necessary + +Bonus: +- Update transfer scripts by revising fields and delineating where they come from in `NM_Aquifer` + +Notes: +- All `Create` schema fields are defined as `` if non-nullable and ` | None = None` if nullable +- All `Update` schema fields are optional and default to `None` +- All `Response` schema fields are defined as `` if non-nullable and ` | None` if nullable +- All raised exceptions should use the `PydanticStyleException` as defined in `services/exceptions_helper.py` +- Errors handled by the database should be enumerated and handled in a database_error_handler in each router's file \ No newline at end of file diff --git a/core/lexicon.json b/core/lexicon.json index 0a0031747..1cd498752 100644 --- a/core/lexicon.json +++ b/core/lexicon.json @@ -3,6 +3,108 @@ {"categories": [{"name": "qc_sample", "description": null}], "term": "original", "definition": ""}, {"categories": [{"name": "qc_sample", "description": null}], "term": "duplicate", "definition": ""}, + {"categories" : [{"name": "vertical_datum", "description": null}], "term": "NAVD88", "definition": "North American Vertical Datum of 1988"}, + {"categories" : [{"name": "vertical_datum", "description": null}], "term": "NGVD29", "definition": "National Geodetic Vertical Datum of 1929"}, + {"categories" : [{"name": "vertical_datum", "description": null}, + {"name": "horizontal_datum", "description": null}], "term": "WGS84", "definition": "World Geodetic System of 1984"}, + + {"categories": [{"name": "horizontal_datum", "description": null}], "term": "NAD83", "definition": "North American Datum of 1983"}, + {"categories": [{"name": "horizontal_datum", "description": null}], "term": "NAD27", "definition": "North American Datum of 1927"}, + + {"categories": [{"name": "elevation_method", "description": null}], "term": "Altimeter", "definition": "altimeter"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "Differentially corrected GPS", "definition": "differentially corrected GPS"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "Survey-grade GPS", "definition": "survey-grade GPS"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "Global positioning system (GPS)", "definition": "Global positioning system (GPS)"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "LiDAR DEM", "definition": "LiDAR DEM"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "Level or other survey method", "definition": "Level or other survey method"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "Interpolated from topographic map", "definition": "Interpolated from topographic map"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "Interpolated from digital elevation model (DEM)", "definition": "Interpolated from digital elevation model (DEM)"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "Reported", "definition": "Reported"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "Survey-grade Global Navigation Satellite Sys, Lvl1", "definition": "Survey-grade Global Navigation Satellite Sys, Lvl1"}, + {"categories": [{"name": "elevation_method", "description": null}], "term": "USGS National Elevation Dataset (NED)", "definition": "USGS National Elevation Dataset (NED)"}, + {"categories": [{"name": "elevation_method", "description": null}, + {"name": "collection_method", "description": null}, + {"name": "coordinate_method", "description": null}, + {"name": "current_use", "description": null}, + {"name": "status", "description": null}, + {"name": "organization", "description": null}], "term": "Unknown", "definition": "Unknown"}, + + {"categories": [{"name": "collection_method", "description": null}], "term": "bailer", "definition": "bailer"}, + {"categories": [{"name": "collection_method", "description": null}], "term": "faucet at well head", "definition": "faucet at well head"}, + {"categories": [{"name": "collection_method", "description": null}], "term": "faucet or outlet at house", "definition": "faucet or outlet at house"}, + {"categories": [{"name": "collection_method", "description": null}], "term": "grab sample", "definition": "grab sample"}, + {"categories": [{"name": "collection_method", "description": null}], "term": "pump", "definition": "pump"}, + {"categories": [{"name": "collection_method", "description": null}], "term": "thief sampler", "definition": "thief sampler"}, + + {"categories": [{"name": "construction_method", "description": null}], "term": "Air-rotary", "definition": "Air-rotary"}, + {"categories": [{"name": "construction_method", "description": null}], "term": "Bored or augered", "definition": "Bored or augered"}, + {"categories": [{"name": "construction_method", "description": null}], "term": "Cable-tool", "definition": "Cable-tool"}, + {"categories": [{"name": "construction_method", "description": null}], "term": "Hydraulic rotary (mud or water)", "definition": "Hydraulic rotary (mud or water)"}, + {"categories": [{"name": "construction_method", "description": null}], "term": "Air percussion", "definition": "Air percussion"}, + {"categories": [{"name": "construction_method", "description": null}], "term": "Reverse rotary", "definition": "Reverse rotary"}, + {"categories": [{"name": "construction_method", "description": null}], "term": "Driven", "definition": "Driven"}, + {"categories": [{"name": "construction_method", "description": null}, + {"name": "measurement_method", "description": null}], "term": "Other (explain in notes)", "definition": "Other (explain in notes)"}, + + {"categories": [{"name": "coordinate_method", "description": null}], "term": "Differentially corrected GPS", "definition": "Differentially corrected GPS"}, + {"categories": [{"name": "coordinate_method", "description": null}], "term": "Survey-grade global positioning system (SGPS)", "definition": "Survey-grade global positioning system (SGPS)"}, + {"categories": [{"name": "coordinate_method", "description": null}], "term": "GPS, uncorrected", "definition": "GPS, uncorrected"}, + {"categories": [{"name": "coordinate_method", "description": null}], "term": "Interpolated from map", "definition": "Interpolated from map"}, + {"categories": [{"name": "coordinate_method", "description": null}], "term": "Interpolated from DEM", "definition": "Interpolated from DEM"}, + {"categories": [{"name": "coordinate_method", "description": null}], "term": "Reported", "definition": "Reported"}, + {"categories": [{"name": "coordinate_method", "description": null}], "term": "Transit, theodolite, or other survey method", "definition": "Transit, theodolite, or other survey method"}, + + {"categories": [{"name": "current_use", "description": null}], "term": "Open, unequipped well", "definition": "Open, unequipped well"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Commercial", "definition": "Commercial"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Domestic", "definition": "Domestic"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Power generation", "definition": "Power generation"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Irrigation", "definition": "Irrigation"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Livestock", "definition": "Livestock"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Mining", "definition": "Mining"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Industrial", "definition": "Industrial"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Observation", "definition": "Observation"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Public supply", "definition": "Public supply"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Shared domestic", "definition": "Shared domestic"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Institutional", "definition": "Institutional"}, + {"categories": [{"name": "current_use", "description": null}], "term": "Unused", "definition": "Unused"}, + + {"categories": [{"name": "data_quality", "description": null}], "term": "Water level accurate to within two hundreths of a foot", "definition": "Good"}, + {"categories": [{"name": "data_quality", "description": null}], "term": "Water level accurate to within one foot", "definition": "Fair"}, + {"categories": [{"name": "data_quality", "description": null}], "term": "Water level accuracy not to nearest foot or water level not repeatable", "definition": "Poor"}, + {"categories": [{"name": "data_quality", "description": null}], "term": "Water level accurate to nearest foot (USGS accuracy level)", "definition": "Water level accurate to nearest foot (USGS accuracy level)"}, + {"categories": [{"name": "data_quality", "description": null}], "term": "Water level accurate to nearest tenth of a foot (USGS accuracy level)", "definition": "Water level accurate to nearest tenth of a foot (USGS accuracy level)"}, + {"categories": [{"name": "data_quality", "description": null}], "term": "Water level accurate to nearest one-hundredth of a foot (USGS accuracy level)", "definition": "Water level accurate to nearest one-hundredth of a foot (USGS accuracy level)"}, + {"categories": [{"name": "data_quality", "description": null}], "term": "Water level accuracy not to nearest foot (USGS accuracy level)", "definition": "Water level accuracy not to nearest foot (USGS accuracy level)"}, + {"categories": [{"name": "data_quality", "description": null}], "term": "Water level accuracy unknown (USGS accuracy level)", "definition": "Water level accuracy unknown (USGS accuracy level)"}, + {"categories": [{"name": "data_quality", "description": null}], "term": "None", "definition": "NA"}, + + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}, + {"name": "discharge_source", "description": null}], "term": "Reported by another agency", "definition": "Reported by another agency"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}], "term": "From driller's log or well report", "definition": "From driller's log or well report"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}, + {"name": "discharge_source", "description": null}], "term": "Private geologist, consultant or univ associate", "definition": "Private geologist, consultant or univ associate"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}], "term": "Depth interpreted fr geophys logs by source agency", "definition": "Depth interpreted fr geophys logs by source agency"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}], "term": "Memory of owner, operator, driller", "definition": "Memory of owner, operator, driller"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}], "term": "Reported by owner of well", "definition": "Reported by owner of well"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}], "term": "Reported by person other than driller owner agency", "definition": "Reported by person other than driller owner agency"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}], "term": "Measured by NMBGMR staff", "definition": "Measured by NMBGMR staff"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}], "term": "Other", "definition": "Other"}, + {"categories": [{"name": "data_source", "description": null}, + {"name": "depth_completion_source", "description": null}], "term": "Data Portal", "definition": "Data Portal"}, + + {"categories": [{"name": "discharge_source", "description": null}], "term": "Information from a report", "definition": "Information from a report"}, + {"categories": [{"name": "discharge_source", "description": null}], "term": "Measured by Bureau scientist", "definition": "Measured by Bureau scientist"}, + {"categories": [{"name": "discharge_source", "description": null}], "term": "Other (explain)", "definition": "Other (explain)"}, + {"categories": [{"name": "unit", "description": null}], "term": "dimensionless", "definition": ""}, {"categories": [{"name": "unit", "description": null}], "term": "ft", "definition": "feet"}, {"categories": [{"name": "unit", "description": null}], "term": "ftbgs", "definition": "feet below ground surface"}, @@ -13,11 +115,127 @@ {"categories": [{"name": "unit", "description": null}], "term": "W/m·K", "definition": "watts per meter Kelvin"}, {"categories": [{"name": "unit", "description": null}], "term": "m²/s", "definition": "square meters per second"}, {"categories": [{"name": "unit", "description": null}], "term": "deg C", "definition": "degree Celsius"}, + {"categories": [{"name": "unit", "description": null}], "term": "deg second", "definition": "degree second"}, + {"categories": [{"name": "unit", "description": null}], "term": "deg minute", "definition": "degree minute"}, {"categories": [{"name": "observed_property", "description": null}], "term": "groundwater level:groundwater level", "definition": "groundwater level measurement" }, {"categories": [{"name": "observed_property", "description": null}], "term": "geothermal:temperature", "definition": "Temperature measurement"}, {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:pH", "definition": "pH"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Alkalinity, Total", "definition": "Alkalinity, Total"}, {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Alkalinity as CaCO3", "definition": "Alkalinity as CaCO3"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Alkalinity as OH-", "definition": "Alkalinity as OH-"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Calcium", "definition": "Calcium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Calcium, total, unfiltered", "definition": "Calcium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Chloride", "definition": "Chloride"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Carbonate", "definition": "Carbonate"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Conductivity, laboratory", "definition": "Conductivity, laboratory"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Bicarbonate", "definition": "Bicarbonate"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Hardness (CaCO3)", "definition": "Hardness (CaCO3)"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Ion Balance", "definition": "Ion Balance"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Potassium", "definition": "Potassium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Potassium, total, unfiltered", "definition": "Potassium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Magnesium", "definition": "Magnesium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Magnesium, total, unfiltered", "definition": "Magnesium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Sodium", "definition": "Sodium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Sodium, total, unfiltered", "definition": "Sodium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Sodium and Potassium combined", "definition": "Sodium and Potassium combined"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Sulfate", "definition": "Sulfate"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Total Anions", "definition": "Total Anions"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Total Cations", "definition": "Total Cations"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Total Dissolved Solids", "definition": "Total Dissolved Solids"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Tritium", "definition": "Tritium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Age of Water using dissolved gases", "definition": "Age of Water using dissolved gases"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Silver", "definition": "Silver"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Silver, total, unfiltered", "definition": "Silver, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Aluminum", "definition": "Aluminum"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Aluminum, total, unfiltered", "definition": "Aluminum, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Arsenic", "definition": "Arsenic"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Arsenic, total, unfiltered", "definition": "Arsenic, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Boron", "definition": "Boron"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Boron, total, unfiltered", "definition": "Boron, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Barium", "definition": "Barium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Barium, total, unfiltered", "definition": "Barium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Beryllium", "definition": "Beryllium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Beryllium, total, unfiltered", "definition": "Beryllium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Bromide", "definition": "Bromide"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:13C:12C ratio", "definition": "13C:12C ratio"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:14C content, pmc", "definition": "14C content, pmc"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Uncorrected C14 age", "definition": "Uncorrected C14 age"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Cadmium", "definition": "Cadmium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Cadmium, total, unfiltered", "definition": "Cadmium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Chlorofluorocarbon-11 avg age", "definition": "Chlorofluorocarbon-11 avg age"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Chlorofluorocarbon-113 avg age", "definition": "Chlorofluorocarbon-113 avg age"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Chlorofluorocarbon-113/12 avg RATIO age", "definition": "Chlorofluorocarbon-113/12 avg RATIO age"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Chlorofluorocarbon-12 avg age", "definition": "Chlorofluorocarbon-12 avg age"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Cobalt", "definition": "Cobalt"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Cobalt, total, unfiltered", "definition": "Cobalt, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Chromium", "definition": "Chromium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Chromium, total, unfiltered", "definition": "Chromium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Copper", "definition": "Copper"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Copper, total, unfiltered", "definition": "Copper, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:delta O18 sulfate", "definition": "delta O18 sulfate"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Sulfate 34 isotope ratio", "definition": "Sulfate 34 isotope ratio"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Fluoride", "definition": "Fluoride"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Iron", "definition": "Iron"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Iron, total, unfiltered", "definition": "Iron, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Deuterium:Hydrogen ratio", "definition": "Deuterium:Hydrogen ratio"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Mercury", "definition": "Mercury"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Mercury, total, unfiltered", "definition": "Mercury, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Lithium", "definition": "Lithium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Lithium, total, unfiltered", "definition": "Lithium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Manganese", "definition": "Manganese"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Manganese, total, unfiltered", "definition": "Manganese, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Molybdenum", "definition": "Molybdenum"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Molybdenum, total, unfiltered", "definition": "Molybdenum, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Nickel", "definition": "Nickel"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Nickel, total, unfiltered", "definition": "Nickel, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Nitrite (as NO2)", "definition": "Nitrite (as NO2)"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Nitrite (as N)", "definition": "Nitrite (as N)"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Nitrate (as NO3)", "definition": "Nitrate (as NO3)"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Nitrate (as N)", "definition": "Nitrate (as N)"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:18O:16O ratio", "definition": "18O:16O ratio"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Lead", "definition": "Lead"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Lead, total, unfiltered", "definition": "Lead, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Phosphate", "definition": "Phosphate"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Antimony", "definition": "Antimony"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Antimony, total, unfiltered", "definition": "Antimony, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Selenium", "definition": "Selenium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Selenium, total, unfiltered", "definition": "Selenium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Sulfur hexafluoride", "definition": "Sulfur hexafluoride"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Silicon", "definition": "Silicon"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Silicon, total, unfiltered", "definition": "Silicon, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Silica", "definition": "Silica"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Tin", "definition": "Tin"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Tin, total, unfiltered", "definition": "Tin, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Strontium", "definition": "Strontium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Strontium, total, unfiltered", "definition": "Strontium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Strontium 87:86 ratio", "definition": "Strontium 87:86 ratio"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Thorium", "definition": "Thorium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Thorium, total, unfiltered", "definition": "Thorium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Titanium", "definition": "Titanium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Titanium, total, unfiltered", "definition": "Titanium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Thallium", "definition": "Thallium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Thallium, total, unfiltered", "definition": "Thallium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Uranium (total, by ICP-MS)", "definition": "Uranium (total, by ICP-MS)"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Uranium, total, unfiltered", "definition": "Uranium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Vanadium", "definition": "Vanadium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Vanadium, total, unfiltered", "definition": "Vanadium, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Zinc", "definition": "Zinc"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Zinc, total, unfiltered", "definition": "Zinc, total, unfiltered"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Corrected C14 in years", "definition": "Corrected C14 in years"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Arsenite (arsenic species)", "definition": "Arsenite (arsenic species)"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Arsenate (arsenic species)", "definition": "Arsenate (arsenic species)"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Cyanide", "definition": "Cyanide"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Estimated recharge temperature", "definition": "Estimated recharge temperature"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Hydrogen sulfide", "definition": "Hydrogen sulfide"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Ammonia", "definition": "Ammonia"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Ammonium", "definition": "Ammonium"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Total nitrogen", "definition": "Total nitrogen"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Total Kjeldahl nitrogen", "definition": "Total Kjeldahl nitrogen"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Dissolved organic carbon", "definition": "Dissolved organic carbon"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:Total organic carbon", "definition": "Total organic carbon"}, + {"categories": [{"name": "observed_property", "description": null}], "term": "water chemistry:delta C13 of dissolved inorganic carbon", "definition": "delta C13 of dissolved inorganic carbon"}, + {"categories": [{"name": "release_status", "description": null}], "term": "draft", "definition": "draft version"}, {"categories": [{"name": "release_status", "description": null}], "term": "provisional", "definition": "provisional version"}, @@ -41,16 +259,77 @@ {"categories": [{"name": "thing_type", "description": null}], "term": "ephemeral stream", "definition": "a stream that flows only briefly during and after precipitation events"}, {"categories": [{"name": "thing_type", "description": null}], "term": "meteorological station", "definition": "a station that measures the weather conditions at a particular location"}, - {"categories": [{"name": "level_status", "description": null}], "term": "dry", "definition": "well is dry"}, - {"categories": [{"name": "level_status", "description": null}], "term": "normal", "definition": "normal well water level status"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Water level affected by atmospheric pressure", "definition": "Water level affected by atmospheric pressure"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Water level was frozen (no level recorded).", "definition": "Water level was frozen (no level recorded)."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Site was dry", "definition": "Site was dry"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Site was flowing recently.", "definition": "Site was flowing recently."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Site was flowing. Water level or head couldn't be measured w/out additional equipment.", "definition": "Site was flowing. Water level or head couldn't be measured w/out additional equipment."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Nearby site that taps the same aquifer was flowing.", "definition": "Nearby site that taps the same aquifer was flowing."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Nearby site that taps the same aquifer had been flowing recently.", "definition": "Nearby site that taps the same aquifer had been flowing recently."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Recharge water was being injected into the aquifer at this site.", "definition": "Recharge water was being injected into the aquifer at this site."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Recharge water was being injected into nearby site that taps the same aquifer.", "definition": "Recharge water was being injected into nearby site that taps the same aquifer."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Water was cascading down the inside of the well.", "definition": "Water was cascading down the inside of the well."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Water level was affected by brackish or saline water.", "definition": "Water level was affected by brackish or saline water."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Well was not in hydraulic contact w/formation (from source other than defined in USGS C714 or C93).", "definition": "Well was not in hydraulic contact w/formation (from source other than defined in USGS C714 or C93)."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Measurement was discontinued (no level recorded).", "definition": "Measurement was discontinued (no level recorded)."}, + {"categories": [{"name": "level_status", "description": null}], "term": "Obstruction was encountered in the well (no level recorded)", "definition": "Obstruction was encountered in the well (no level recorded)"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Site was being pumped", "definition": "Site was being pumped"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Site was pumped recently", "definition": "Site was pumped recently"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Nearby site that taps the same aquifer was being pumped", "definition": "Nearby site that taps the same aquifer was being pumped"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Nearby site that taps the same aquifer was pumped recently", "definition": "Nearby site that taps the same aquifer was pumped recently"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Foreign substance present on the water surface", "definition": "Foreign substance present on the water surface"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Well was destroyed (no subsequent water levels should be recorded)", "definition": "Well was destroyed (no subsequent water levels should be recorded)"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Water level affected by stage in nearby surface-water site", "definition": "Water level affected by stage in nearby surface-water site"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Other conditions exist that would affect the level (remarks)", "definition": "Other conditions exist that would affect the level (remarks)"}, + {"categories": [{"name": "level_status", "description": null}], "term": "Water level not affected by status", "definition": "Water level not affected by status"}, + + {"categories": [{"name": "status", "description": null}], "term": "Abandoned", "definition": "Abandoned"}, + {"categories": [{"name": "status", "description": null}], "term": "Active, pumping well", "definition": "Active, pumping well"}, + {"categories": [{"name": "status", "description": null}], "term": "Destroyed, exists but not usable", "definition": "Destroyed, exists but not usable"}, + {"categories": [{"name": "status", "description": null}], "term": "Inactive, exists but not used", "definition": "Inactive, exists but not used"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Airline measurement", "definition": "Airline measurement"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Analog or graphic recorder", "definition": "Analog or graphic recorder"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Calibrated airline measurement", "definition": "Calibrated airline measurement"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Differential GPS; especially applicable to surface expression of ground water", "definition": "Differential GPS; especially applicable to surface expression of ground water"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Estimated", "definition": "Estimated"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Transducer", "definition": "Transducer"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Pressure-gage measurement", "definition": "Pressure-gage measurement"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Calibrated pressure-gage measurement", "definition": "Calibrated pressure-gage measurement"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Interpreted from geophysical logs", "definition": "Interpreted from geophysical logs"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Manometer", "definition": "Manometer"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Non-recording gage", "definition": "Non-recording gage"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Observed (required for F, N, and W water level status)", "definition": "Observed (required for F, N, and W water level status)"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Sonic water level meter (acoustic pulse)", "definition": "Sonic water level meter (acoustic pulse)"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Reported, method not known", "definition": "Reported, method not known"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Steel-tape measurement", "definition": "Steel-tape measurement"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Electric tape measurement (E-probe)", "definition": "Electric tape measurement (E-probe)"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Unknown (for legacy data only; not for new data entry)", "definition": "Unknown (for legacy data only; not for new data entry)"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Calibrated electric tape; accuracy of equipment has been checked", "definition": "Calibrated electric tape; accuracy of equipment has been checked"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Calibrated electric cable", "definition": "Calibrated electric cable"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Uncalibrated electric cable", "definition": "Uncalibrated electric cable"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Continuous acoustic sounder", "definition": "Continuous acoustic sounder"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "Measurement not attempted", "definition": "Measurement not attempted"}, + {"categories": [{"name": "measurement_method", "description": null}], "term": "null placeholder", "definition": "null placeholder"}, {"categories": [{"name": "organization", "description": null}], "term": "USGS", "definition": "US Geological Survey"}, {"categories": [{"name": "organization", "description": null}], "term": "TWDB", "definition": "Texas Water Development Board"}, - {"categories": [{"name": "organization", "description": null}], "term": "Unknown", "definition": "Unknown organization"}, {"categories": [{"name": "organization", "description": null}], "term": "NMED", "definition": "New Mexico Environment Department"}, {"categories": [{"name": "organization", "description": null}], "term": "NMOSE", "definition": "New Mexico Office of the State Engineer"}, - + {"categories": [{"name": "organization", "description": null}], "term": "NMBGMR", "definition": "New Mexico Bureau of Geology and Mineral Resources"}, + {"categories": [{"name": "organization", "description": null}], "term": "Bernalillo Cty", "definition": "Bernalillo County"}, + {"categories": [{"name": "organization", "description": null}], "term": "BLM", "definition": "Bureau of Land Management"}, + {"categories": [{"name": "organization", "description": null}], "term": "SFC", "definition": "Santa Fe County"}, + {"categories": [{"name": "organization", "description": null}], "term": "NESWCD", "definition": "Northeast Soil & Water Conservation District"}, + {"categories": [{"name": "organization", "description": null}], "term": "NMISC", "definition": "New Mexico Interstate Stream Commission"}, + {"categories": [{"name": "organization", "description": null}], "term": "PVACD", "definition": "Pecos Valley Artesian Conservancy District"}, + {"categories": [{"name": "organization", "description": null}], "term": "TSWCD", "definition": "Taos Soil & Water Conservation District"}, + {"categories": [{"name": "organization", "description": null}], "term": "Bayard", "definition": "Bayard Municipal Water"}, + {"categories": [{"name": "organization", "description": null}], "term": "OSWCD", "definition": "Otero Soil & Water Conservation District"}, + {"categories": [{"name": "organization", "description": null}], "term": "SNL", "definition": "Sandia National Laboratories"}, + {"categories": [{"name": "organization", "description": null}], "term": "USFS", "definition": "United States Forest Service"}, + {"categories": [{"name": "organization", "description": null}], "term": "NMT", "definition": "New Mexico Tech"}, + {"categories": [{"name": "organization", "description": null}], "term": "NPS", "definition": "National Park Service"}, {"categories": [{"name": "collection_method", "description": null}], "term": "manual", "definition": "manual sampling"}, {"categories": [{"name": "collection_method", "description": null}], "term": "continuous", "definition": "continuous sampling"}, @@ -155,7 +434,6 @@ {"categories": [{"name": "drilling_fluid", "description": null}], "term": "mud", "definition": "drilling mud"}, - {"categories": [{"name": "geochronology", "description": null}], "term": "Ar/Ar", "definition": "Ar40/Ar39 geochronology"}, {"categories": [{"name": "geochronology", "description": null}], "term": "AFT", "definition": "apatite fission track"}, {"categories": [{"name": "geochronology", "description": null}], "term": "K/Ar", "definition": "Potassium-Argon dating"}, @@ -176,5 +454,34 @@ {"categories": [{"name": "publication_type", "description": null}], "term": "Thesis", "definition": "Thesis"}, {"categories": [{"name": "publication_type", "description": null}], "term": "Book", "definition": "Book"}, {"categories": [{"name": "publication_type", "description": null}], "term": "Conference", "definition": "Conference"}, - {"categories": [{"name": "publication_type", "description": null}], "term": "Webpage", "definition": "Webpage"} + {"categories": [{"name": "publication_type", "description": null}], "term": "Webpage", "definition": "Webpage"}, + + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Monitor every six months", "definition": "Monitor every six months"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Annual water level", "definition": "Annual water level"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Monitoring bi-monthly", "definition": "Monitoring bi-monthly"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Monitoring complete", "definition": "Monitoring complete"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Datalogger installed", "definition": "Datalogger installed"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Monitor every 10 years (long-term monitor)", "definition": "Monitor every 10 years (long-term monitor)"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Monitor monthly", "definition": "Monitor monthly"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Sampling complete", "definition": "Sampling complete"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Reported to NMBGMR bimonthly", "definition": "Reported to NMBGMR bimonthly"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Sample well", "definition": "Sample well"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Water level cannot be measured", "definition": "Water level cannot be measured"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Repeat sampling", "definition": "Repeat sampling"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Wellntel device", "definition": "Wellntel device"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Bi-annual (every other year)", "definition": "Bi-annual (every other year)"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Inactive", "definition": "Inactive"}, + {"categories": [{"name": "monitoring_status", "description": null}], "term": "Data share", "definition": "Data share"}, + + {"categories": [{"name": "sample_type", "description": null}], "term": "Background", "definition": "Background"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Equipment blank", "definition": "Equipment blank"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Field blank", "definition": "Field blank"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Field duplicate", "definition": "Field duplicate"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Field parameters only", "definition": "Field parameters only"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Precipitation", "definition": "Precipitation"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Repeat sample", "definition": "Repeat sample"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Standard field sample", "definition": "Standard field sample"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Soil or Rock sample", "definition": "Soil or Rock sample"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Trip blank", "definition": "Trip blank"}, + {"categories": [{"name": "sample_type", "description": null}], "term": "Source water blank", "definition": "Source water blank"} ] \ No newline at end of file diff --git a/tests/conftest.py b/tests/conftest.py index 5e9283d6d..215023674 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -506,7 +506,7 @@ def groundwater_level_observation(sensor, sample): value=10.0, unit="ft", measuring_point_height=5.0, - level_status="normal", + level_status="Water level not affected by status", ) session.add(observation) session.commit() diff --git a/tests/test_observation.py b/tests/test_observation.py index aa04e7cd9..293b59023 100644 --- a/tests/test_observation.py +++ b/tests/test_observation.py @@ -77,7 +77,7 @@ def test_add_groundwater_level_observation(sample, sensor): "measuring_point_height": 53, "sample_id": sample.id, "sensor_id": sensor.id, - "level_status": "normal", + "level_status": "Water level not affected by status", "observed_property": "groundwater level", "unit": "ft", }