Skip to content

Commit

Permalink
OpenConceptLab/ocl_issues#1564 | removed concept unused fields
Browse files Browse the repository at this point in the history
  • Loading branch information
snyaggarwal committed Apr 25, 2023
1 parent 56500f6 commit 37a7e40
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 13 deletions.
27 changes: 14 additions & 13 deletions core/common/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,55 +396,56 @@ def test_public_url_for(self):
'http://oclapi2-dev.s3.amazonaws.com/some/path'
)


class FhirHelpersTest(OCLTestCase):
def test_language_to_default_locale(self):
query_fields = list(CodeSystemDetailSerializer.Meta.fields)
query_params = {'language': 'eng'}
query_set = Concept.objects.all()
query_set = Source.objects.all()

query_set = translate_fhir_query(query_fields, query_params, query_set)
self.assertTrue('"concepts"."default_locale" = eng' in str(query_set.query))
self.assertTrue('"sources"."default_locale" = eng' in str(query_set.query))

def test_status_retired(self):
query_fields = list(CodeSystemDetailSerializer.Meta.fields)
query_params = {'status': 'retired'}
query_set = Concept.objects.all()
query_set = Source.objects.all()

query_set = translate_fhir_query(query_fields, query_params, query_set)
self.assertTrue('WHERE "concepts"."retired"' in str(query_set.query))
self.assertTrue('WHERE "sources"."retired"' in str(query_set.query))

def test_status_active(self):
query_fields = list(CodeSystemDetailSerializer.Meta.fields)
query_params = {'status': 'active'}
query_set = Concept.objects.all()
query_set = Source.objects.all()

query_set = translate_fhir_query(query_fields, query_params, query_set)
self.assertTrue('WHERE "concepts"."released"' in str(query_set.query))
self.assertTrue('WHERE "sources"."released"' in str(query_set.query))

def test_status_draft(self):
query_fields = list(CodeSystemDetailSerializer.Meta.fields)
query_params = {'status': 'draft'}
query_set = Concept.objects.all()
query_set = Source.objects.all()

query_set = translate_fhir_query(query_fields, query_params, query_set)
self.assertTrue('WHERE NOT "concepts"."released"' in str(query_set.query))
self.assertTrue('WHERE NOT "sources"."released"' in str(query_set.query))

def test_title_to_full_name(self):
query_fields = list(CodeSystemDetailSerializer.Meta.fields)
query_params = {'title': 'some title'}
query_set = Concept.objects.all()
query_set = Source.objects.all()

query_set = translate_fhir_query(query_fields, query_params, query_set)
self.assertTrue('WHERE "concepts"."full_name" = some title' in str(query_set.query))
self.assertTrue('WHERE "sources"."full_name" = some title' in str(query_set.query))

def test_other_fields(self):
query_fields = list(CodeSystemDetailSerializer.Meta.fields)
query_params = {'version': 'v1', 'id': '2'}
query_set = Concept.objects.all()
query_set = Source.objects.all()

query_set = translate_fhir_query(query_fields, query_params, query_set)
self.assertTrue('"concepts"."version" = v1' in str(query_set.query))
self.assertTrue('"concepts"."id" = 2' in str(query_set.query))
self.assertTrue('"sources"."version" = v1' in str(query_set.query))
self.assertTrue('"sources"."id" = 2' in str(query_set.query))


class IdentifierSerializerTest(OCLTestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 4.1.7 on 2023-04-25 04:20

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('concepts', '0067_remove_concept_default_locale_and_more'),
]

operations = [
migrations.RemoveField(
model_name='concept',
name='full_name',
),
migrations.RemoveField(
model_name='concept',
name='name',
),
]
2 changes: 2 additions & 0 deletions core/concepts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ class Meta:
_counted = models.BooleanField(default=True, null=True, blank=True)
_index = models.BooleanField(default=True)
logo_path = None
name = None
full_name = None
default_locale = None
supported_locales = None
website = None
Expand Down

0 comments on commit 37a7e40

Please sign in to comment.