Skip to content

Commit

Permalink
rename methods
Browse files Browse the repository at this point in the history
  • Loading branch information
kelvin-muchiri committed Jan 22, 2024
1 parent cc91d4a commit 47843bc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions onadata/apps/api/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
from onadata.libs.utils.api_export_tools import (
custom_response_handler,
get_metadata_format,
get_entity_list_export,
get_entity_list_export_response,
)
from onadata.libs.utils.cache_tools import (
PROJ_BASE_FORMS_CACHE,
Expand Down Expand Up @@ -568,7 +568,7 @@ def get_data_value_objects(value):
export_type = get_metadata_format(metadata.data_value)

if isinstance(obj, EntityList):
return get_entity_list_export(request, obj, filename)
return get_entity_list_export_response(request, obj, filename)

dataview = obj if isinstance(obj, DataView) else False
xform = obj
Expand Down
4 changes: 2 additions & 2 deletions onadata/libs/tests/utils/test_export_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
from onadata.libs.utils.export_tools import (
check_pending_export,
generate_attachments_zip_export,
generate_entity_list_dataset,
generate_entity_list_export,
generate_export,
generate_geojson_export,
generate_kml_export,
Expand Down Expand Up @@ -1031,7 +1031,7 @@ def test_generate_export_entity_list(self):
)
self._make_submission(submission_path)
entity_list = EntityList.objects.get(name="trees")
export = generate_entity_list_dataset(entity_list)
export = generate_entity_list_export(entity_list)
self.assertIsNotNone(export)
self.assertTrue(export.is_successful)
self.assertEqual(GenericExport.objects.count(), 1)
6 changes: 3 additions & 3 deletions onadata/libs/utils/api_export_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
check_pending_export,
get_latest_generic_export,
generate_attachments_zip_export,
generate_entity_list_dataset,
generate_entity_list_export,
generate_export,
generate_external_export,
generate_geojson_export,
Expand Down Expand Up @@ -674,12 +674,12 @@ def _get_google_credential(request):
return credential


def get_entity_list_export(request, entity_list, filename):
def get_entity_list_export_response(request, entity_list, filename):
"""Returns an EntityList dataset export"""

# Check if we need to re-generate,
def _new_export():
return generate_entity_list_dataset(entity_list)
return generate_entity_list_export(entity_list)

if should_create_new_export(
entity_list, Export.CSV_EXPORT, {}, request=request, is_generic=True
Expand Down
2 changes: 1 addition & 1 deletion onadata/libs/utils/export_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ def get_repeat_index_tags(index_tags):
return index_tags


def generate_entity_list_dataset(entity_list: EntityList) -> GenericExport:
def generate_entity_list_export(entity_list: EntityList) -> GenericExport:
"""Generates a CSV for an EntityList dataset"""
username = entity_list.project.organization.username
records = get_entity_list_dataset(entity_list)
Expand Down

0 comments on commit 47843bc

Please sign in to comment.