Skip to content
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

101 organization abbreviation map is mapping none incorrectly #103

Merged
merged 2 commits into from
Nov 22, 2024
Merged

101 organization abbreviation map is mapping none incorrectly #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbfb7c7
fix: strip abbreviations that don't exist from mapping
dbirman Nov 19, 2024
cfc03d5
chore: lint
dbirman Nov 19, 2024
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
2 changes: 1 addition & 1 deletion src/aind_data_schema_models/_generators/templates/organizations.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Organization:

ONE_OF = Annotated[Union[tuple(_OrganizationModel.__subclasses__())], Field(discriminator="name")]

abbreviation_map = {m().abbreviation: m() for m in ALL}
abbreviation_map = {m().abbreviation: m() for m in ALL if m().abbreviation is not None}

@classmethod
def from_abbreviation(cls, abbreviation: str):
Expand Down
2 changes: 1 addition & 1 deletion src/aind_data_schema_models/organizations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ class Organization:

ONE_OF = Annotated[Union[tuple(_OrganizationModel.__subclasses__())], Field(discriminator="name")]

abbreviation_map = {m().abbreviation: m() for m in ALL}
abbreviation_map = {m().abbreviation: m() for m in ALL if m().abbreviation is not None}

@classmethod
def from_abbreviation(cls, abbreviation: str):
Expand Down
5 changes: 5 additions & 0 deletions tests/test_organizations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ def test_none(self):

self.assertEqual(Organization.LIFECANVAS.abbreviation, None)

def test_from_none(self):
"""Test that you can't get an organization from None"""

self.assertEqual(Organization.from_abbreviation(None), None)

def test_groups(self):
"""Test that the organization groups are present"""

Expand Down
Loading