Skip to content

mc_425_agency_search_endpoint #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxachis merged 3 commits into from
Sep 26, 2025
Merged

mc_425_agency_search_endpoint #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df49b4a
Relax requirements for some URL types
maxachis Sep 26, 2025
89fec42
Fix tests
maxachis Sep 26, 2025
a2e8c16
Fix tests
maxachis Sep 26, 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
30 changes: 0 additions & 30 deletions src/api/endpoints/annotate/all/post/models/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,6 @@ def forbid_record_type_if_meta_url_or_individual_record(self):
raise FailedValidationException("record_type must be None if suggested_status is META_URL")
return self

@model_validator(mode="after")
def require_record_type_if_data_source(self):
if self.suggested_status == URLType.DATA_SOURCE and self.record_type is None:
raise FailedValidationException("record_type must be provided if suggested_status is DATA_SOURCE")
return self

@model_validator(mode="after")
def require_location_if_relevant(self):
if self.suggested_status not in [
URLType.META_URL,
URLType.DATA_SOURCE,
URLType.INDIVIDUAL_RECORD,
]:
return self
if len(self.location_ids) == 0:
raise FailedValidationException("location_ids must be provided if suggested_status is META_URL or DATA_SOURCE")
return self

@model_validator(mode="after")
def require_agency_id_if_relevant(self):
if self.suggested_status not in [
URLType.META_URL,
URLType.DATA_SOURCE,
URLType.INDIVIDUAL_RECORD,
]:
return self
if len(self.agency_ids) == 0:
raise FailedValidationException("agencies must be provided if suggested_status is META_URL or DATA_SOURCE")
return self

@model_validator(mode="after")
def forbid_all_else_if_not_relevant(self):
if self.suggested_status != URLType.NOT_RELEVANT:
Expand Down
50 changes: 0 additions & 50 deletions tests/automated/unit/api/test_all_annotation_post_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,42 +54,6 @@ class TestAllAnnotationPostInfoParams(BaseModel):
location_ids=[3, 4],
raise_exception=True
),
TestAllAnnotationPostInfoParams(
suggested_status=URLType.META_URL,
record_type=None,
agency_ids=[], # No agency IDs
location_ids=[3, 4],
raise_exception=True
),
TestAllAnnotationPostInfoParams(
suggested_status=URLType.META_URL,
record_type=None,
agency_ids=[1, 2],
location_ids=[], # No Location IDs
raise_exception=True
),
# Error Paths - Data Source
TestAllAnnotationPostInfoParams(
suggested_status=URLType.DATA_SOURCE,
record_type=None, # No record type
agency_ids=[1, 2],
location_ids=[3, 4],
raise_exception=True
),
TestAllAnnotationPostInfoParams(
suggested_status=URLType.DATA_SOURCE,
record_type=RecordType.ACCIDENT_REPORTS,
agency_ids=[], # No Agency IDs
location_ids=[3, 4],
raise_exception=True
),
TestAllAnnotationPostInfoParams(
suggested_status=URLType.DATA_SOURCE,
record_type=RecordType.ACCIDENT_REPORTS,
agency_ids=[1, 2],
location_ids=[], # No Location IDs
raise_exception=True
),
# Error Paths - Not Relevant
TestAllAnnotationPostInfoParams(
suggested_status=URLType.NOT_RELEVANT,
Expand Down Expand Up @@ -120,20 +84,6 @@ class TestAllAnnotationPostInfoParams(BaseModel):
location_ids=[],
raise_exception=True
),
TestAllAnnotationPostInfoParams(
suggested_status=URLType.INDIVIDUAL_RECORD,
record_type=None,
agency_ids=[1, 2], # Agency IDs Included
location_ids=[],
raise_exception=True
),
TestAllAnnotationPostInfoParams(
suggested_status=URLType.INDIVIDUAL_RECORD,
record_type=None,
agency_ids=[],
location_ids=[1, 2], # Location IDs included
raise_exception=True
)
]
)
def test_all_annotation_post_info(
Expand Down