NO TICKET: removed admin and old schemas, added observation/water-chemistry

alembic/versions/66ac1af4ba69_initial_migration.py

@@ -402,7 +402,7 @@ def upgrade() -> None:
     # op.create_table('observation',
     # sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
     # sa.Column('series_id', sa.Integer(), nullable=False),
-    # sa.Column('observation_timestamp', sa.TIMESTAMP(), nullable=False),
+    # sa.Column('observation_datetime', sa.TIMESTAMP(), nullable=False),
     # sa.Column('observation_type', sa.String(length=100), nullable=True),
     # sa.Column('depth_to_water', sa.Float(), nullable=True),
     # sa.Column('measuring_point_height', sa.Float(), nullable=True),
@@ -415,7 +415,7 @@ def upgrade() -> None:
     # sa.ForeignKeyConstraint(['observation_type'], ['lexicon_term.term'], ),
     # sa.ForeignKeyConstraint(['release_status'], ['lexicon_term.term'], ),
     # sa.ForeignKeyConstraint(['series_id'], ['series.id'], ondelete='CASCADE'),
-    # sa.PrimaryKeyConstraint('id', 'observation_timestamp')
+    # sa.PrimaryKeyConstraint('id', 'observation_datetime')
     # )
     # ### end Alembic commands ###
 

api/asset.py

@@ -27,7 +27,7 @@
 from core.dependencies import session_dependency
 from db import Thing
 from db.asset import Asset, AssetThingAssociation
-from schemas_v2.asset import AssetResponse, CreateAsset, UpdateAsset
+from schemas.asset import AssetResponse, CreateAsset, UpdateAsset
 from services.crud_helper import model_patcher
 
 router = APIRouter(prefix="/asset", tags=["asset"])

api/author.py

@@ -19,7 +19,7 @@
 
 from db.engine import get_db_session
 from db.publication import Author
-from schemas_v2.publication import PublicationResponse
+from schemas.publication import PublicationResponse
 
 router = APIRouter(
     prefix="/author",

api/contact.py

@@ -28,7 +28,7 @@
 from core.dependencies import session_dependency
 from db import ThingContactAssociation, Thing
 from db.contact import Contact, Email, Phone, Address
-from schemas_v2.contact import (
+from schemas.contact import (
     CreateContact,
     PhoneResponse,
     EmailResponse,

api/geochronology.py

@@ -17,7 +17,7 @@
 from fastapi import APIRouter, Depends, status
 from db import adder
 from db.engine import get_db_session
-from schemas.create.geochronology import CreateGeochronologyAge
+from schemas.geochronology import CreateGeochronologyAge
 from sqlalchemy.orm import Session
 from sqlalchemy import select
 

api/geospatial.py

@@ -22,7 +22,7 @@
 # from starlette.responses import FileResponse
 
 from core.dependencies import session_dependency
-from schemas_v2.thing import FeatureCollectionResponse
+from schemas.thing import FeatureCollectionResponse
 from services.geospatial_helper import create_shapefile, get_thing_features
 
 router = APIRouter(prefix="/geospatial", tags=["geospatial"])

api/geothermal.py

@@ -13,11 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ===============================================================================
-from fastapi import APIRouter, Depends, status
-from sqlalchemy.orm import Session
-
-from db import adder
-from db.engine import get_db_session
+from fastapi import APIRouter
 
 #
 # from db.geothermal import (
@@ -30,16 +26,6 @@
 #     GeothermalSampleSet,
 #     GeothermalBottomHoleTemperatureHeader,
 # )
-from schemas.create.geothermal import (
-    CreateTemperatureProfile,
-    CreateTemperatureProfileObservation,
-    CreateGeothermalSampleSet,
-    CreateBottomHoleTemperatureHeader,
-    CreateBottomHoleTemperature,
-    CreateGeothermalInterval,
-    CreateThermalConductivity,
-    CreateHeatFlow,
-)
 
 router = APIRouter(prefix="/geothermal", tags=["geothermal"])
 

api/group.py

@@ -23,9 +23,9 @@
 from db import adder
 from db.engine import get_db_session
 from db.group import Group, GroupThingAssociation
-from schemas_v2.group import UpdateGroup
-from schemas_v2.location import CreateGroup, CreateGroupThing
-from schemas_v2.thing import GroupResponse
+from schemas.group import UpdateGroup
+from schemas.location import CreateGroup, CreateGroupThing
+from schemas.thing import GroupResponse
 from services.crud_helper import model_patcher
 from services.query_helper import (
     simple_get_by_id,

api/lexicon.py

@@ -13,23 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ===============================================================================
-from fastapi import APIRouter, Depends
-from fastapi import status
+from fastapi import APIRouter, Depends, Query, status
 from fastapi_pagination.ext.sqlalchemy import paginate
 from sqlalchemy import select
 
 from api.pagination import CustomPage
 from core.dependencies import session_dependency
 from db.engine import get_db_session
 from db.lexicon import Category, LexiconTriple, Lexicon, TermCategoryAssociation
-from schemas_v2.lexicon import (
+from schemas.lexicon import (
     CreateLexiconTerm,
     CreateLexiconCategory,
     CreateTriple,
     LexiconTermResponse,
     LexiconCategoryResponse,
 )
 from services.lexicon import add_lexicon_term
+from services.query_helper import (
+    simple_all_getter,
+    paginated_all_getter,
+    order_sort_filter,
+)
 
 router = APIRouter(
     prefix="/lexicon",
@@ -106,6 +110,9 @@ def get_lexicon_terms(
     session: session_dependency,
     category: str | None = None,
     term: str | None = None,
+    sort: str = None,
+    order: str = None,
+    filter_: str = Query(alias="filter", default=None),
 ) -> CustomPage[LexiconTermResponse]:
     """
     Endpoint to retrieve lexicon terms.
@@ -120,7 +127,27 @@ def get_lexicon_terms(
     if term:
         sql = sql.where(Lexicon.term.ilike(f"%{term}%"))
 
+    # If sort is 'categories', we do not apply sorting or filtering
+    if sort == "categories":
+        sort = None
+        order = None
+
+    sql = order_sort_filter(sql, Lexicon, sort=sort, order=order, filter_=filter_)
     return paginate(query=sql, conn=session)
+    # return paginated_all_getter(session, sql, filter_)
+
+
+@router.get("/category")
+def get_lexicon_categories(
+    session: session_dependency,
+    sort: str = None,
+    order: str = None,
+    filter_: str = Query(alias="filter", default=None),
+) -> CustomPage[LexiconCategoryResponse]:
+    """
+    Endpoint to retrieve lexicon categories.
+    """
+    return paginated_all_getter(session, Category, sort, order, filter_)
 
 
 # ============= EOF =============================================

api/location.py

@@ -26,8 +26,8 @@
 from db import adder
 from db.location import Location
 from db.engine import get_db_session
-from schemas_v2.location import CreateLocation, LocationResponse, UpdateLocation
-from schemas_v2.thing import LocationWellResponse
+from schemas.location import CreateLocation, LocationResponse, UpdateLocation
+from schemas.thing import LocationWellResponse
 from services.geospatial_helper import make_within_wkt
 from services.query_helper import make_query, order_sort_filter
 from services.crud_helper import model_patcher