Skip to content

Commit 626285d

Browse files
authored
Merge pull request #1131 from NASA-IMPACT/3055-optmize-the-retrieval-of-url-counts-on-admin-page
3055 optmize the retrieval of url counts on admin page
2 parents c889c15 + 69950af commit 626285d

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

sde_collections/admin.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,9 @@ class CollectionAdmin(admin.ModelAdmin, ExportCsvMixin, UpdateConfigMixin):
244244
list_display = (
245245
"name",
246246
"candidate_urls_count",
247+
"included_candidate_urls_count",
247248
"delta_urls_count",
249+
"included_delta_urls_count",
248250
"included_curated_urls_count",
249251
"config_folder",
250252
"url",
@@ -254,6 +256,26 @@ class CollectionAdmin(admin.ModelAdmin, ExportCsvMixin, UpdateConfigMixin):
254256
"reindexing_status",
255257
)
256258

259+
def included_candidate_urls_count(self, obj) -> int:
260+
return obj.candidate_urls.filter(excluded=False).count()
261+
262+
included_candidate_urls_count.short_description = "Included Candidate URLs Count"
263+
264+
def delta_urls_count(self, obj) -> int:
265+
return obj.delta_urls.count()
266+
267+
delta_urls_count.short_description = "Total Delta URLs Count"
268+
269+
def included_delta_urls_count(self, obj) -> int:
270+
return obj.delta_urls.filter(excluded=False).count()
271+
272+
included_delta_urls_count.short_description = "Included Delta URLs Count"
273+
274+
def included_curated_urls_count(self, obj) -> int:
275+
return obj.curated_urls.filter(excluded=False).count()
276+
277+
included_curated_urls_count.short_description = "Included Curated URLs Count"
278+
257279
readonly_fields = ("config_folder",)
258280
list_filter = (
259281
"division",

sde_collections/models/collection.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -266,20 +266,6 @@ def add_to_public_query(self):
266266
scraper_content = scraper_editor.update_config_xml()
267267
gh.create_or_update_file(query_path, scraper_content)
268268

269-
@property
270-
def included_urls_count(self):
271-
return self.candidate_urls.filter(excluded=False).count()
272-
273-
@property
274-
def delta_urls_count(self):
275-
"""get the total number of delta urls"""
276-
return self.delta_urls.filter(excluded=False).count()
277-
278-
@property
279-
def included_curated_urls_count(self):
280-
"""get the number of included, curated urls"""
281-
return self.curated_urls.filter(excluded=False).count()
282-
283269
@property
284270
def _scraper_config_path(self) -> str:
285271
return f"sources/scrapers/{self.config_folder}/default.xml"

0 commit comments

Comments
 (0)