Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c14378d
refactor: rename lexicon.py lexicon_helper.py for standard style
jacob-a-brown Aug 23, 2025
ec6dcdf
refactor: rename lexicon.py lexicon_helper.py for standard style
jacob-a-brown Aug 23, 2025
1ddafdb
feat: allow user to add multiple categories for a new term
jacob-a-brown Aug 23, 2025
9742ed3
feat: allow user to add multiple categories for a new term
jacob-a-brown Aug 23, 2025
80449de
refactor: if no TermCategoryAssociation return empty list
jacob-a-brown Aug 23, 2025
6076f28
feat: implement tests to add lexicon terms
jacob-a-brown Aug 23, 2025
cb56b61
Merge branch 'jab-api-coverage-group' into jab-api-coverage-lexicon
jacob-a-brown Aug 25, 2025
df4ebe1
refactor: organize lexicon api
jacob-a-brown Aug 25, 2025
c9b0493
feat: implement GET lexicon terms and by ID
jacob-a-brown Aug 25, 2025
7c9ce9f
Merge branch 'jab-api-coverage-group' into jab-api-coverage-lexicon
jacob-a-brown Aug 25, 2025
94cf3c7
test: implement test GET by ID 404 not found
jacob-a-brown Aug 25, 2025
3c497c4
feat: implement PATCH lexicon term
jacob-a-brown Aug 25, 2025
de43e34
feat: implement DELETE lexicon term
jacob-a-brown Aug 25, 2025
c0f99b1
Merge branch 'jab-api-coverage-group' into jab-api-coverage-lexicon
jacob-a-brown Aug 25, 2025
581a029
Merge branch 'pre-production' into jab-api-coverage-lexicon
jacob-a-brown Aug 25, 2025
1ae4528
test: implement POST test for category
jacob-a-brown Aug 25, 2025
f917a4c
refactor: update init_lexicon and lexicon.json to allow term to be as…
jacob-a-brown Aug 25, 2025
cdc997f
refactor: make transfers2 calleable as module from root directory
jacob-a-brown Aug 26, 2025
75d936f
feat: implement GET lexicon category
jacob-a-brown Aug 26, 2025
b85f104
doc: update README about staging data
jacob-a-brown Aug 26, 2025
f4a5a5a
feat: have Pydantic serialize response for PATCH lexicon
jacob-a-brown Aug 26, 2025
0fe6a63
refactor: connect term/category through their IDs
jacob-a-brown Aug 26, 2025
1db6482
feat: test PATCH category
jacob-a-brown Aug 26, 2025
b7db615
feat: enable DELETE lexicon category
jacob-a-brown Aug 26, 2025
3673d0d
feat: POST lexicon triple endpoint and tests
jacob-a-brown Aug 26, 2025
fab5e58
feat: implement GET lexicon triple
jacob-a-brown Aug 26, 2025
d5726e2
feat: implement PATCH lexicon triple
jacob-a-brown Aug 26, 2025
32e1a2d
refactor: consolidate lexicon tests
jacob-a-brown Aug 26, 2025
bd09f5d
feat: implement DELETE lexicon triple
jacob-a-brown Aug 26, 2025
60c883f
refactor: rename Lexicon LexiconTerm and Category LexiconCategory
jacob-a-brown Aug 26, 2025
8ba3c6f
refactor: move adder to crud_helper and rename model_adder
jacob-a-brown Aug 26, 2025
4a1c262
fix: add assets to import
jacob-a-brown Aug 26, 2025
11b2eee
refactor: revert to pre-production transfers/
jacob-a-brown Aug 27, 2025
245c1cd
ci: remove assets
jacob-a-brown Aug 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
10 changes: 5 additions & 5 deletions api/contact.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
)
Expand Down Expand Up @@ -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)

Expand All @@ -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)

Expand All @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions api/geochronology.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"])
Expand Down
5 changes: 2 additions & 3 deletions api/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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(
Expand Down
Loading
Loading