BDMS 55: contact coverage & other updates

api/sample.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 # ===============================================================================
 
-from fastapi import APIRouter, Depends, Query, HTTPException, Response
+from fastapi import APIRouter, Depends, Query, Response
 from sqlalchemy.exc import IntegrityError, ProgrammingError
 from sqlalchemy.orm import Session
 from starlette.status import HTTP_201_CREATED, HTTP_409_CONFLICT
@@ -28,6 +28,7 @@
 from schemas.sample import SampleResponse, CreateSample, UpdateSample
 from services.query_helper import paginated_all_getter, simple_get_by_id
 from services.crud_helper import model_patcher, model_deleter
+from services.exceptions_helper import PydanticStyleException
 
 router = APIRouter(
     prefix="/sample",
@@ -46,16 +47,24 @@ def database_error_handler(
         error_message
         == 'duplicate key value violates unique constraint "sample_field_sample_id_key"'
     ):
-        detail = (
-            f"Sample with field_sample_id {payload.field_sample_id} already exists."
-        )
+        detail = {
+            "loc": ["body", "field_sample_id"],
+            "msg": f"Sample with field_sample_id {payload.field_sample_id} already exists.",
+            "type": "value_error",
+            "input": {"field_sample_id": payload.field_sample_id},
+        }
     elif (
         error_message
         == 'insert or update on table "sample" violates foreign key constraint "sample_thing_id_fkey"'
     ):
-        detail = f"Thing with ID {payload.thing_id} does not exist."
-
-    raise HTTPException(status_code=HTTP_409_CONFLICT, detail=detail)
+        detail = {
+            "loc": ["body", "thing_id"],
+            "msg": f"Thing with ID {payload.thing_id} does not exist.",
+            "type": "value_error",
+            "input": {"thing_id": payload.thing_id},
+        }
+
+    raise PydanticStyleException(status_code=HTTP_409_CONFLICT, detail=[detail])
 
 
 # ============= Post =============================================

api/sensor.py

@@ -63,16 +63,18 @@ def update_sensor(
             existing_datetime_removed is not None
             and sensor_data.datetime_installed >= existing_datetime_removed
         ):
-            raise PydanticStyleException(
-                status_code=status.HTTP_409_CONFLICT,
-                loc=["body", "datetime_installed"],
-                msg=f"new datetime installed must be before existing datetime removed of {existing_datetime_removed.isoformat().replace('+00:00', 'Z')}",
-                type="value_error",
-                input={
+            detail = {
+                "loc": ["body", "datetime_installed"],
+                "msg": f"new datetime installed must be before existing datetime removed of {existing_datetime_removed.isoformat().replace('+00:00', 'Z')}",
+                "type": "value_error",
+                "input": {
                     "datetime_installed": sensor_data.datetime_installed.isoformat().replace(
                         "+00:00", "Z"
                     )
                 },
+            }
+            raise PydanticStyleException(
+                status_code=status.HTTP_409_CONFLICT, detail=[detail]
             )
     elif (
         sensor_data.datetime_installed is None
@@ -81,16 +83,18 @@ def update_sensor(
         sensor = simple_get_by_id(session, Sensor, sensor_id)
         existing_datetime_installed = sensor.datetime_installed
         if sensor_data.datetime_removed <= existing_datetime_installed:
-            raise PydanticStyleException(
-                status_code=status.HTTP_409_CONFLICT,
-                loc=["body", "datetime_removed"],
-                msg=f"new datetime removed must be after existing datetime installed of {existing_datetime_installed.isoformat().replace('+00:00', 'Z')}",
-                type="value_error",
-                input={
+            detail = {
+                "loc": ["body", "datetime_removed"],
+                "msg": f"new datetime removed must be after existing datetime installed of {existing_datetime_installed.isoformat().replace('+00:00', 'Z')}",
+                "type": "value_error",
+                "input": {
                     "datetime_removed": sensor_data.datetime_removed.isoformat().replace(
                         "+00:00", "Z"
                     )
                 },
+            }
+            raise PydanticStyleException(
+                status_code=status.HTTP_409_CONFLICT, detail=[detail]
             )
 
     return model_patcher(session, Sensor, sensor_id, sensor_data)

db/contact.py

@@ -22,8 +22,12 @@
 
 
 class ThingContactAssociation(Base, AutoBaseMixin):
-    thing_id = Column(Integer, ForeignKey("thing.id"), primary_key=True)
-    contact_id = Column(Integer, ForeignKey("contact.id"), primary_key=True)
+    thing_id = Column(
+        Integer, ForeignKey("thing.id", ondelete="CASCADE"), nullable=False
+    )
+    contact_id = Column(
+        Integer, ForeignKey("contact.id", ondelete="CASCADE"), nullable=False
+    )
 
     contact = relationship("Contact")
     thing = relationship("Thing")
@@ -33,9 +37,9 @@ class Contact(Base, AutoBaseMixin):
     name = Column(String(100), nullable=False)
     role = lexicon_term(nullable=False)
 
-    phones = relationship("Phone", back_populates="contact")
-    emails = relationship("Email", back_populates="contact")
-    addresses = relationship("Address", back_populates="contact")
+    phones = relationship("Phone", back_populates="contact", passive_deletes=True)
+    emails = relationship("Email", back_populates="contact", passive_deletes=True)
+    addresses = relationship("Address", back_populates="contact", passive_deletes=True)
 
     search_vector = Column(TSVectorType("name", "role"))
 
@@ -49,6 +53,7 @@ class Contact(Base, AutoBaseMixin):
         "ThingContactAssociation",
         back_populates="contact",
         cascade="all, delete-orphan",
+        passive_deletes=True,
     )
     things = association_proxy("thing_associations", "thing")
 
@@ -60,7 +65,7 @@ class Phone(Base, AutoBaseMixin):
     phone_number = Column(String(20), nullable=False)
     phone_type = lexicon_term(nullable=False)
 
-    contact = relationship("Contact", back_populates="phones")
+    contact = relationship("Contact", back_populates="phones", passive_deletes=True)
     search_vector = Column(TSVectorType("phone_number"))
 
 
@@ -71,7 +76,7 @@ class Email(Base, AutoBaseMixin):
     email = Column(String(100), nullable=False)
     email_type = lexicon_term(nullable=False)
 
-    contact = relationship("Contact", back_populates="emails")
+    contact = relationship("Contact", back_populates="emails", passive_deletes=True)
 
     search_vector = Column(TSVectorType("email"))
 
@@ -88,7 +93,7 @@ class Address(Base, AutoBaseMixin):
     country = lexicon_term(nullable=False, default="United States")
     address_type = lexicon_term(nullable=False)
 
-    contact = relationship("Contact", back_populates="addresses")
+    contact = relationship("Contact", back_populates="addresses", passive_deletes=True)
     search_vector = Column(
         TSVectorType(
             "address_line_1",

db/thing.py

@@ -15,7 +15,7 @@
 # ===============================================================================
 from sqlalchemy import Integer, ForeignKey, String, Column, Float
 from sqlalchemy.ext.associationproxy import association_proxy
-from sqlalchemy.orm import relationship, mapped_column, declared_attr
+from sqlalchemy.orm import relationship, mapped_column
 from sqlalchemy_utils import TSVectorType
 
 from db import lexicon_term
@@ -45,6 +45,14 @@ class Thing(Base, AutoBaseMixin, ReleaseMixin):
     )
     locations = association_proxy("location_associations", "location")
 
+    contact_associations = relationship(
+        "ThingContactAssociation",
+        back_populates="thing",
+        overlaps="contacts",
+        cascade="all, delete-orphan",
+    )
+    contacts = association_proxy("contact_associations", "contact")
+
     # Well fields
     well_depth = Column(
         Float,