Fix download request in the taxon management (#4110)

* Fix download request in the taxon management

bims/admin.py

@@ -977,6 +977,26 @@ class SearchProcessAdmin(admin.ModelAdmin):
  'category',
  'finished')
 
+ def delete_model(self, request, obj):
+ if obj.locked:
+ self.message_user(
+ request,
+ "This record is locked and cannot be deleted.",
+ level='warning')
+ else:
+ super().delete_model(request, obj)
+
+ def delete_queryset(self, request, queryset):
+ for obj in queryset:
+ if obj.locked:
+ self.message_user(
+ request,
+ f"Record with ID {obj.id} is locked and cannot be deleted.",
+ level='warning')
+ queryset = queryset.filter(locked=False)
+ if queryset:
+ super().delete_queryset(request, queryset)
+
 
 class PageviewAdmin(admin.ModelAdmin):
  date_hierarchy = 'view_time'

bims/api_views/location_site.py

@@ -102,8 +102,7 @@ def get(self, request):
 
  search_process, created = get_or_create_search_process(
  SITES_SUMMARY,
- query=search_uri,
- requester=self.request.user
+ query=search_uri
  )
 
  if not use_cached:

bims/api_views/location_site_overview.py

@@ -172,8 +172,7 @@ def get(self, request):
 
  search_process, created = get_or_create_search_process(
  search_type=SITES_SUMMARY,
- query=search_uri,
- site=Site.objects.get_current()
+ query=search_uri
  )
  results = search_process.get_file_if_exits()
  if results:

bims/api_views/search.py

@@ -60,7 +60,6 @@ def get(self, request):
  search_process, created = get_or_create_search_process(
  search_type=SEARCH_RESULTS,
  query=search_uri,
- requester=request.user
  )
 
  if self.is_cached():

bims/download/collection_record.py

@@ -68,7 +68,8 @@ def download_collection_records(
  path_file,
  request,
  send_email=False,
- user_id=None
+ user_id=None,
+ process_id=None
 ):
  from django.contrib.auth import get_user_model
  from bims.serializers.bio_collection_serializer import (

bims/migrations/0429_searchprocess_locked_alter_taxonomy_rank_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.11 on 2024-07-25 12:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('bims', '0428_remove_biologicalcollectionrecord_accuracy_of_identification_and_more'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='searchprocess',
+ name='locked',
+ field=models.BooleanField(default=False),
+ ),
+ migrations.AlterField(
+ model_name='taxonomy',
+ name='rank',
+ field=models.CharField(blank=True, choices=[('DOMAIN', 'Domain'), ('KINGDOM', 'Kingdom'), ('PHYLUM', 'Phylum'), ('SUBPHYLUM', 'SubPhylum'), ('CLASS', 'Class'), ('SUBCLASS', 'Sub Class'), ('ORDER', 'Order'), ('SUBORDER', 'Sub Order'), ('INFRAORDER', 'Infra Order'), ('SUPERFAMILY', 'Super Family'), ('FAMILY', 'Family'), ('SUBFAMILY', 'Sub Family'), ('TRIBE', 'Tribe'), ('SUBTRIBE', 'Sub Tribe'), ('GENUS', 'Genus'), ('SUBGENUS', 'Sub Genus'), ('SPECIES', 'Species'), ('SUBSPECIES', 'Sub Species'), ('VARIETY', 'Variety'), ('FORMA', 'Forma')], max_length=50, verbose_name='Taxonomic Rank'),
+ ),
+ migrations.AlterField(
+ model_name='taxonomyupdateproposal',
+ name='rank',
+ field=models.CharField(blank=True, choices=[('DOMAIN', 'Domain'), ('KINGDOM', 'Kingdom'), ('PHYLUM', 'Phylum'), ('SUBPHYLUM', 'SubPhylum'), ('CLASS', 'Class'), ('SUBCLASS', 'Sub Class'), ('ORDER', 'Order'), ('SUBORDER', 'Sub Order'), ('INFRAORDER', 'Infra Order'), ('SUPERFAMILY', 'Super Family'), ('FAMILY', 'Family'), ('SUBFAMILY', 'Sub Family'), ('TRIBE', 'Tribe'), ('SUBTRIBE', 'Sub Tribe'), ('GENUS', 'Genus'), ('SUBGENUS', 'Sub Genus'), ('SPECIES', 'Species'), ('SUBSPECIES', 'Sub Species'), ('VARIETY', 'Variety'), ('FORMA', 'Forma')], max_length=50, verbose_name='Taxonomic Rank'),
+ ),
+ ]

bims/models/search_process.py

@@ -2,6 +2,7 @@
 """Search process model definition.
 
 """
+import logging
 import os
 import json
 import errno
@@ -24,6 +25,8 @@
 SEARCH_FINISHED = 'finished'
 SEARCH_FAILED = 'failed'
 
+logger = logging.getLogger(__name__)
+
 
 def format_search_result_raw_query(raw_query):
  if not raw_query:
@@ -50,6 +53,20 @@ def format_search_result_raw_query(raw_query):
  return query_string
 
 
+class SearchProcessQuerySet(models.QuerySet):
+ def delete(self, *args, **kwargs):
+ locked_objects = self.filter(locked=True)
+ if locked_objects.exists():
+ for obj in locked_objects:
+ logger.warning(f"Attempted to delete locked SearchProcess with ID {obj.id}")
+ unlocked_objects = self.filter(locked=False)
+ return super(SearchProcessQuerySet, unlocked_objects).delete(*args, **kwargs)
+
+class SearchProcessManager(models.Manager):
+ def get_queryset(self):
+ return SearchProcessQuerySet(self.model, using=self._db)
+
+
 class SearchProcess(models.Model):
  """Search process model
  """
@@ -59,6 +76,7 @@ class SearchProcess(models.Model):
  (SITES_SUMMARY, 'Site Summary'),
  (TAXON_SUMMARY, 'Taxon Summary'),
  )
+ objects = SearchProcessManager()
 
  file_path = models.CharField(
  blank=True,
@@ -84,6 +102,9 @@ class SearchProcess(models.Model):
  null=True,
  blank=True
  )
+ locked = models.BooleanField(
+ default=False
+ )
  site = models.ForeignKey(
  Site,
  on_delete=models.CASCADE,
@@ -100,6 +121,12 @@ class SearchProcess(models.Model):
  null=True,
  )
 
+ def delete(self, *args, **kwargs):
+ if self.locked:
+ logger.warning(f"Attempted to delete locked SearchProcess with ID {self.id}")
+ else:
+ super(SearchProcess, self).delete(*args, **kwargs)
+
  def save(self, *args, **kwargs):
  super(SearchProcess, self).save(*args, **kwargs)
 

bims/static/js/non_requirejs/download_request_popup.js

@@ -1,3 +1,7 @@
+function isInt(value) {
+ return !isNaN(value) && (function(x) { return (x | 0) === x; })(parseFloat(value))
+}
+
 function showDownloadPopup(resource_type, resource_name, callback, auto_approved = true, on_hidden = null) {
  const $downloadPopup = $('#download-popup');
  if(resource_type === 'CSV'){
@@ -19,8 +23,8 @@ function showDownloadPopup(resource_type, resource_name, callback, auto_approved
  const url = '/api/download-request/';
 
  let urlParams = new URLSearchParams(window.location.href.replace('/taxon', '/&taxon'))
- let taxon_id = urlParams.get('taxon');
- let site_id = urlParams.get('siteId');
+ let taxon_id = isInt(urlParams.get('taxon')) ? urlParams.get('taxon') : null;
+ let site_id = isInt(urlParams.get('siteId')) ? urlParams.get('siteId') : null;
  let survey_id = urlParams.get('survey');
 
  $submitDownloadPopup.on('click', function () {

bims/utils/sentry.py

@@ -2,13 +2,18 @@
 
 logging.basicConfig(level=logging.INFO)
 
+
 def before_send(event, hint):
  logging.info(f"Processing event: {event}")
- logging.info(f'hint: {hint}')
+ logging.info(f'Hint: {hint}')
+
  if 'exc_info' in hint:
  exc_type, exc_value, tb = hint['exc_info']
- logging.info(f"exc_type: {str(exc_value)}")
- if 'easyaudit.signals.model_signals.pre_save' in str(exc_value):
- logging.info("Ignoring easyaudit.signals.model_signals.pre_save error")
+ logging.info(f"Exception type: {exc_type}")
+ logging.info(f"Exception value: {exc_value}")
+
+ if 'easyaudit.signals.model_signals' in str(exc_value):
+ logging.info("Ignoring easyaudit.signals.model_signals error")
  return None
+
  return event

core/urls.py

@@ -36,7 +36,6 @@
  re_path(r'^bibliography/',
  include(('td_biblio.urls', 'bibliography'),
  namespace = 'td_biblio')),
- re_path(r'^', include('example.urls')),
 
  # prometheus monitoring
  # re_path(r'', include('django_prometheus.urls')),
@@ -49,15 +48,6 @@
  name='home'),
 ]
 
-# for geonode_pattern in geonode_urlpatterns:
-# try:
-# if 'admin' in geonode_pattern.app_dict:
-# geonode_urlpatterns.remove(geonode_pattern)
-# except AttributeError:
-# continue
-#
-# urlpatterns += geonode_urlpatterns
-
 urlpatterns += [
  re_path('^admin/', admin.site.urls),
 ]