diff --git a/atdb/taskdatabase/tests/test_update_activity.py b/atdb/taskdatabase/tests/test_update_activity.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/atdb/taskdatabase/urls.py b/atdb/taskdatabase/urls.py index 981c97a99cb6facff7b554a0e51c80a1deed830f..906ffe5edfa99879158841e8b5d803431e96a006 100644 --- a/atdb/taskdatabase/urls.py +++ b/atdb/taskdatabase/urls.py @@ -132,9 +132,5 @@ urlpatterns = [ #some migration and repair endpoints path('tasks/repair/associate-activities/', views.AssociateActivities, name='associate-activities'), - path('tasks/repair/update-all-activities/', views.UpdateAllActivities, name='update-all-activities'), path('tasks/repair/update-activity/<sas_id>', views.UpdateActivitySasId, name='update-activity-sasid'), - path('tasks/repair/update-failed-tasks/', views.UpdateFailedTasks, name='update-failed-tasks'), - path('tasks/repair/update-ingestq-tasks/<batch_size>', views.UpdateIngestQTasks, name='update-ingestq-tasks'), - path('tasks/repair/update-finished-tasks/', views.UpdateFinishedTasks, name='update-finished-tasks'), ] diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 18df3dc58a15bf525fa0658df0e0ad474ea90fc1..eb462904c64a075019df95d1337a09913418f55d 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -1703,33 +1703,6 @@ def AssociateActivities(request): connect_signals() return redirect('index') -@staff_member_required -def UpdateAllActivities(request): - - all_activities = Activity.objects.all() - # find a task for every activity - total = all_activities.count() - i = 0 - - for activity in all_activities: - try: - i += 1 - task = Task.objects.filter(sas_id=activity.sas_id)[0] - activities_handler.update_activity(task) - logger.info(f'{i} of {total}') - except Exception as error: - logger.error(error) - - # tasks = Task.objects.all() - # total = tasks.count() - # i = 0 - # for task in tasks: - # i+=1 - # activities.update_activity(task) - # logger.info(f'{i} of {total}') - - return redirect('index') - def UpdateActivitySasId(request, sas_id): # this function is called externally to avoid worker timeouts @@ -1760,45 +1733,3 @@ def UpdateActivitySasId(request, sas_id): 'total': total }) -@staff_member_required -def UpdateFailedTasks(request): - - tasks = Task.objects.filter(status__icontains="failed") - total = tasks.count() - i = 0 - for task in tasks: - i+=1 - activities_handler.update_activity(task) - logger.info(f'{i} of {total}') - - return redirect('index') - -@staff_member_required -def UpdateIngestQTasks(request, batch_size): - tasks = Task.objects.only('sas_id').filter( - Q(status__icontains=State.SCRUBBED.value) | - Q(status__icontains=State.ARCHIVING.value) | - Q(status__icontains=State.ARCHIVED.value) | - Q(status__icontains=State.FINISHING.value)).filter(activity__ingested_fraction__isnull=True)[:int(batch_size)] - - total = tasks.count() - i = 0 - for task in tasks: - i+=1 - - activities_handler.update_activity(task) - logger.info(f'{i} of {total}') - - return redirect('index') - -@staff_member_required -def UpdateFinishedTasks(request): - tasks = Task.objects.only('sas_id').filter(status=State.FINISHED.value) - total = tasks.count() - i = 0 - for task in tasks: - i+=1 - activities_handler.update_activity(task) - logger.info(f'{i} of {total}') - - return redirect('index') \ No newline at end of file