Skip to content

Commit

Permalink
Merge branch 'feature/AREG-125' of github.com:MetaCell/scicrunch-anti…
Browse files Browse the repository at this point in the history
…body-registry into feature/AREG-126
  • Loading branch information
filippomc committed Apr 17, 2024
2 parents 5c8c1dd + 9c48b51 commit e5bf2ff
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
3 changes: 3 additions & 0 deletions applications/portal/backend/api/services/antibody_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ def create_antibody(body: AddAntibodyDTO, userid: str) -> AntibodyDTO:
antibody.uid = userid
antibody.save()

if antibody.get_duplicate():
raise DuplicatedAntibody(antibody_mapper.to_dto(antibody))

return antibody_mapper.to_dto(antibody)


Expand Down
17 changes: 9 additions & 8 deletions applications/portal/backend/api/tests/test_antibodies.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from api.services.search_service import fts_antibodies
from api.models import Vendor, VendorDomain, VendorSynonym
from api.repositories.maintainance import refresh_search_view
from api.utilities.exceptions import DuplicatedAntibody

from openapi.models import (
AddAntibody as AddAntibodyDTO,
Expand Down Expand Up @@ -108,14 +109,14 @@ def test_create(self):
a.save()

duplicated = AddAntibodyDTO(**example_ab)
# duplicated.vendorName = "My vendor synonym" # should keep the same vendor and add a synonym
da = create_antibody(duplicated, "bbb")

assert da.accession != da.abId
assert da.abId == ab.abId
assert da.status == Status.QUEUE
assert da.vendorId == ab.vendorId
assert da.vendorName == "My vendorname"
with self.assertRaises(DuplicatedAntibody) as exc:
create_antibody(duplicated, "bbb")

da = exc.exception.antibody
self.assertEqual(da.abId, ab.abId)
self.assertEqual(da.status, Status.QUEUE)
self.assertEqual(da.vendorId, ab.vendorId)
self.assertEqual(da.vendorName, "My vendorname")

assert VendorDomain.objects.all().count() == 2
assert Vendor.objects.all().count() == 1
Expand Down

0 comments on commit e5bf2ff

Please sign in to comment.