Skip to content

Commit

Permalink
OpenConceptLab/ocl_issues#1151 | mapping importer | fixing exist chec…
Browse files Browse the repository at this point in the history
…k criteria
  • Loading branch information
snyaggarwal committed Dec 14, 2021
1 parent 73aa0e2 commit 8faaf17
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions core/importers/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from core.common.constants import HEAD
from core.common.services import RedisService
from core.common.tasks import bulk_import_parts_inline, delete_organization
from core.common.utils import drop_version, is_url_encoded_string, encode_string
from core.common.utils import drop_version, is_url_encoded_string, encode_string, to_parent_uri
from core.concepts.models import Concept
from core.mappings.models import Mapping
from core.orgs.models import Organization
Expand Down Expand Up @@ -473,14 +473,18 @@ def get_queryset(self):
filters['to_concept__versioned_object_id'] = to_concept.versioned_object_id
else:
filters['to_concept_code'] = compact(versionless_to_concept_url.split('/'))[-1]
if not to_source_url:
filters['to_source__uri'] = to_parent_uri(versionless_to_concept_url)

if self.get('id'):
filters['mnemonic'] = self.get('id')

if to_concept_code and to_source_url:
filters['to_concept_code'] = to_concept_code
if to_source_url:
filters['to_source__uri'] = drop_version(to_source_url)

if to_concept_code:
filters['to_concept_code'] = to_concept_code

self.queryset = Mapping.objects.filter(**filters)

return self.queryset
Expand Down

0 comments on commit 8faaf17

Please sign in to comment.