Merge pull request #106 from DataIntegrationGroup/jab-api-coverage-lexicon

BDMS 55: lexicon coverage & other updates

Author: jirhiker

README.md

@@ -148,6 +148,10 @@ After the database container is running, you can run tests with Pytest from your
 </table>
 
 
+#### Staging Data
+
+To get staging data into the database run `python -m transfers.transfer` from the root directory of the project.
+
 ### 🧭 Project Structure
 ```text
 app/

api/contact.py

@@ -27,7 +27,7 @@
     amp_editor_dependency,
     amp_viewer_dependency,
 )
-from db import ThingContactAssociation, Thing, Contact, Email, Phone, Address, adder
+from db import ThingContactAssociation, Thing, Contact, Email, Phone, Address
 from schemas.contact import (
     CreateContact,
     CreateAddress,
@@ -42,7 +42,7 @@
     UpdatePhone,
     UpdateAddress,
 )
-from services.crud_helper import model_patcher, model_deleter
+from services.crud_helper import model_patcher, model_deleter, model_adder
 from services.contact_helper import (
     add_contact,
 )
@@ -146,7 +146,7 @@ def create_address(
     :return: Response containing the added address
     """
     try:
-        return adder(session, Address, address_data, user=user)
+        return model_adder(session, Address, address_data, user=user)
     except ProgrammingError as e:
         database_error_handler(address_data, e)
 
@@ -162,7 +162,7 @@ def create_email(
     user: amp_admin_dependency,
 ) -> EmailResponse:
     try:
-        return adder(session, Email, email_data, user=user)
+        return model_adder(session, Email, email_data, user=user)
     except ProgrammingError as e:
         database_error_handler(email_data, e)
 
@@ -178,7 +178,7 @@ def create_phone(
     user: amp_admin_dependency,
 ) -> PhoneResponse:
     try:
-        return adder(session, Phone, phone_data, user=user)
+        return model_adder(session, Phone, phone_data, user=user)
     except ProgrammingError as e:
         database_error_handler(phone_data, e)
 

api/geochronology.py

@@ -15,7 +15,7 @@
 # ===============================================================================
 from db.geochronology import GeochronologyAge
 from fastapi import APIRouter, Depends, status
-from db import adder
+from services.crud_helper import model_adder
 from db.engine import get_db_session
 from schemas.geochronology import CreateGeochronologyAge
 from sqlalchemy.orm import Session
@@ -33,7 +33,7 @@ async def create_age(
     """
     # Placeholder for actual implementation
     # return {"message": "Geochronology age created successfully.", "data": age}
-    return adder(session, GeochronologyAge, age)
+    return model_adder(session, GeochronologyAge, age)
 
 
 @router.get("/age", tags=["geochronology"])

api/group.py

@@ -24,10 +24,9 @@
     editor_dependency,
     viewer_function,
 )
-from db import adder
 from db.group import Group
 from schemas.group import UpdateGroup, CreateGroup, GroupResponse
-from services.crud_helper import model_patcher, model_deleter
+from services.crud_helper import model_patcher, model_deleter, model_adder
 from services.query_helper import (
     simple_get_by_id,
     paginated_all_getter,
@@ -47,7 +46,7 @@ def create_group(
     """
     Create a new group in the database.
     """
-    return adder(session, Group, group_data, user=user)
+    return model_adder(session, Group, group_data, user=user)
 
 
 # @router.post(