Self hosted FLOSS fitness/workout, nutrition and weight tracker
Also handle deleted and merged exercises
Roland Geidercaf312b07ee9
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 7d2e3c80a..f22fcd19c 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -114,12 +114,39 @@ class ExerciseViewSet(ModelViewSet):except ValueError:uuid = None+ transfer_media = 'transfer_media' in self.request.query_params+ transfer_translations = 'transfer_translations' in self.request.query_params++ replacement = Exercise.objects.filter(uuid=uuid).first() if uuid else None++ deleted_repr = str(instance)+ deleted_uuid = str(instance.uuid)+instance.delete(replace_by=uuid,- transfer_media='transfer_media' in self.request.query_params,- transfer_translations='transfer_translations' in self.request.query_params,+ transfer_media=transfer_media,+ transfer_translations=transfer_translations,)+ if replacement:+ actstream_action.send(+ self.request.user,+ verb=StreamVerbs.MERGED.value,+ action_object=replacement,+ deleted_uuid=deleted_uuid,+ deleted_repr=deleted_repr,+ transfer_media=transfer_media,+ transfer_translations=transfer_translations,+ )+ else:+ actstream_action.send(+ self.request.user,+ verb=StreamVerbs.DELETED.value,+ deleted_uuid=deleted_uuid,+ deleted_repr=deleted_repr,+ model_type='exercise',+ )+class ExerciseTranslationViewSet(ModelViewSet):"""diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.pyindex 8aa87c1ce..eeb15f8c2 100644--- a/wger/exercises/models/base.py+++ b/wger/exercises/models/base.py@@ -132,7 +132,7 @@ class Exercise(AbstractLicenseModel, AbstractHistoryMixin, models.Model):"""Return a more human-readable representation"""- return f'base {self.uuid} ({self.get_translation()})'+ return f'exercise {self.uuid} ({self.get_translation()})'def get_absolute_url(self):"""diff --git a/wger/exercises/templates/history/overview.html b/wger/exercises/templates/history/overview.htmlindex 2517bf74a..a87c78e27 100644--- a/wger/exercises/templates/history/overview.html+++ b/wger/exercises/templates/history/overview.html@@ -70,6 +70,10 @@<span class="text-success {% fa_class 'circle-plus' %}"></span>{% elif event.stream.verb == verbs.UPDATED.value %}<span class="text-primary {% fa_class 'pen' %}"></span>+ {% elif event.stream.verb == verbs.DELETED.value %}+ <span class="text-danger {% fa_class 'trash' %}"></span>+ {% elif event.stream.verb == verbs.MERGED.value %}+ <span class="text-warning {% fa_class 'code-merge' %}"></span>{% else %}<span class="text-muted {% fa_class 'circle-question' %}"></span>{% endif %}@@ -90,6 +94,10 @@<span class="text-muted">{% translate "created" %}</span>{% elif event.stream.verb == verbs.UPDATED.value %}<span class="text-muted">{% translate "edited" %}</span>+ {% elif event.stream.verb == verbs.DELETED.value %}+ <span class="text-muted">{% translate "deleted" %}</span>+ {% elif event.stream.verb == verbs.MERGED.value %}+ <span class="text-muted">{% translate "merged" %}</span>{% else %}<span class="text-muted">{{ event.verb }}</span>{% endif %}@@ -98,7 +106,26 @@<span class="badge {{ event.badge_class }}">{{ event.model_key }}</span>{% endif %}- {% if event.object_missing %}+ {% if event.stream.verb == verbs.DELETED.value %}+ <em>{{ event.stream.data.deleted_repr }}</em>+ {% elif event.stream.verb == verbs.MERGED.value %}+ <em>{{ event.stream.data.deleted_repr }}</em>+ <span class="text-muted">{% translate "into" %}</span>+ {% if event.stream.action_object.get_absolute_url %}+ <a href="{{ event.stream.action_object.get_absolute_url }}"+ class="fw-semibold text-decoration-none">+ {{ event.stream.action_object }}+ </a>+ {% else %}+ {{ event.stream.action_object }}+ {% endif %}+ {% if event.stream.data.transfer_media %}+ <span class="badge text-bg-light">+{% translate "media" %}</span>+ {% endif %}+ {% if event.stream.data.transfer_translations %}+ <span class="badge text-bg-light">+{% translate "translations" %}</span>+ {% endif %}+ {% elif event.object_missing %}<em class="text-muted">{% translate "Object was deleted" %}</em>{% elif event.stream.action_object.get_absolute_url %}<a href="{{ event.stream.action_object.get_absolute_url }}"diff --git a/wger/exercises/tests/api/test_exercise_delete_api.py b/wger/exercises/tests/api/test_exercise_delete_api.pyindex 1db8eedb8..ec48a440d 100644--- a/wger/exercises/tests/api/test_exercise_delete_api.py+++ b/wger/exercises/tests/api/test_exercise_delete_api.py@@ -14,6 +14,7 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.# Third Party+from actstream.models import Actionfrom rest_framework import status# wger@@ -25,6 +26,7 @@ from wger.exercises.models import ()from wger.exercises.models.image import ExerciseImagefrom wger.exercises.models.video import ExerciseVideo+from wger.exercises.views.helper import StreamVerbsclass ExerciseDeleteApiTestCase(BaseTestCase, ApiBaseTestCase):@@ -138,6 +140,75 @@ class ExerciseDeleteApiTestCase(BaseTestCase, ApiBaseTestCase):self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)self.assertFalse(Exercise.objects.filter(pk=self.source_pk).exists())+ def test_delete_without_replacement_emits_deleted_event(self):+ """A plain delete fires a DELETED actstream event with the model_type."""+ self.authenticate('admin')++ before = Action.objects.filter(verb=StreamVerbs.DELETED.value).count()+ source = Exercise.objects.get(pk=self.source_pk)+ deleted_uuid = str(source.uuid)+ deleted_repr = str(source)++ response = self.client.delete(self.url())+ self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)++ self.assertEqual(+ Action.objects.filter(verb=StreamVerbs.DELETED.value).count(),+ before + 1,+ )+ event = Action.objects.filter(verb=StreamVerbs.DELETED.value).latest('timestamp')+ self.assertIsNone(event.action_object)+ self.assertEqual(event.data['deleted_uuid'], deleted_uuid)+ self.assertEqual(event.data['deleted_repr'], deleted_repr)+ self.assertEqual(event.data['model_type'], 'exercise')++ def test_delete_with_replacement_emits_merged_event(self):+ """A delete with replace_by fires a MERGED event pointing at the target."""+ self.authenticate('admin')++ before = Action.objects.filter(verb=StreamVerbs.MERGED.value).count()+ source = Exercise.objects.get(pk=self.source_pk)+ deleted_uuid = str(source.uuid)+ deleted_repr = str(source)++ response = self.client.delete(+ f'{self.url()}?replaced_by={self.target_uuid}&transfer_media&transfer_translations'+ )+ self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)++ self.assertEqual(+ Action.objects.filter(verb=StreamVerbs.MERGED.value).count(),+ before + 1,+ )+ event = Action.objects.filter(verb=StreamVerbs.MERGED.value).latest('timestamp')+ self.assertEqual(event.action_object, Exercise.objects.get(pk=self.target_pk))+ self.assertEqual(event.data['deleted_uuid'], deleted_uuid)+ self.assertEqual(event.data['deleted_repr'], deleted_repr)+ self.assertTrue(event.data['transfer_media'])+ self.assertTrue(event.data['transfer_translations'])++ def test_delete_with_invalid_replacement_emits_deleted_event(self):+ """+ An unresolvable replaced_by must fall through to a DELETED event, not+ emit a MERGED one referencing a non-existent target.+ """+ self.authenticate('admin')++ before_deleted = Action.objects.filter(verb=StreamVerbs.DELETED.value).count()+ before_merged = Action.objects.filter(verb=StreamVerbs.MERGED.value).count()++ response = self.client.delete(f'{self.url()}?replaced_by=not-a-uuid')+ self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)++ self.assertEqual(+ Action.objects.filter(verb=StreamVerbs.DELETED.value).count(),+ before_deleted + 1,+ )+ self.assertEqual(+ Action.objects.filter(verb=StreamVerbs.MERGED.value).count(),+ before_merged,+ )+def test_delete_requires_authentication(self):"""Anonymous users cannot delete exercises."""response = self.client.delete(self.url())diff --git a/wger/exercises/tests/test_history.py b/wger/exercises/tests/test_history.pyindex 73762607f..a853d3845 100644--- a/wger/exercises/tests/test_history.py+++ b/wger/exercises/tests/test_history.py@@ -237,3 +237,78 @@ class ExerciseHistoryControlExtras(WgerTestCase):self.assertGreaterEqual(response.context['stats']['last_24h'], 1)self.assertGreaterEqual(response.context['stats']['last_7d'], 1)self.assertGreaterEqual(response.context['stats']['last_30d'], 1)++ def test_deleted_event_surfaces_without_action_object(self):+ """+ A DELETED actstream event has no action_object (the original is gone)+ but must still appear in the feed with model_key picked up from+ ``data.model_type``.+ """+ actstream_action.send(+ self.user,+ verb=StreamVerbs.DELETED.value,+ deleted_uuid='ae3328ba-9a35-4731-bc23-5da50720c5aa',+ deleted_repr='Some deleted exercise',+ model_type='exercise',+ )++ response = self.client.get(reverse('exercise:history:overview'))+ self.assertEqual(response.status_code, 200)++ deleted_events = [+ e for e in response.context['context']+ if e['verb'] == StreamVerbs.DELETED.value+ ]+ self.assertEqual(len(deleted_events), 1)+ self.assertEqual(deleted_events[0]['model_key'], 'exercise')+ self.assertContains(response, 'Some deleted exercise')++ def test_merged_event_links_to_replacement(self):+ """+ A MERGED event keeps its action_object pointing at the surviving+ replacement exercise.+ """+ replacement = Translation.objects.get(pk=2).exercise++ actstream_action.send(+ self.user,+ verb=StreamVerbs.MERGED.value,+ action_object=replacement,+ deleted_uuid='ae3328ba-9a35-4731-bc23-5da50720c5aa',+ deleted_repr='Duplicate exercise',+ transfer_media=True,+ transfer_translations=False,+ )++ response = self.client.get(reverse('exercise:history:overview'))+ self.assertEqual(response.status_code, 200)++ merged_events = [+ e for e in response.context['context']+ if e['verb'] == StreamVerbs.MERGED.value+ ]+ self.assertEqual(len(merged_events), 1)+ self.assertEqual(merged_events[0]['stream'].action_object, replacement)+ self.assertContains(response, 'Duplicate exercise')++ def test_filter_by_verb_deleted(self):+ """The verb dropdown can isolate DELETED events."""+ translation = Translation.objects.get(pk=2)+ self._make_action(translation, verb=StreamVerbs.UPDATED.value)+ actstream_action.send(+ self.user,+ verb=StreamVerbs.DELETED.value,+ deleted_uuid='ae3328ba-9a35-4731-bc23-5da50720c5aa',+ deleted_repr='Gone',+ model_type='exercise',+ )++ response = self.client.get(+ reverse('exercise:history:overview') + '?verb=deleted'+ )+ self.assertEqual(response.status_code, 200)+ self.assertEqual(len(response.context['context']), 1)+ self.assertEqual(+ response.context['context'][0]['verb'],+ StreamVerbs.DELETED.value,+ )diff --git a/wger/exercises/views/helper.py b/wger/exercises/views/helper.pyindex 195166110..8d9f54b02 100644--- a/wger/exercises/views/helper.py+++ b/wger/exercises/views/helper.py@@ -18,3 +18,5 @@ import enumclass StreamVerbs(enum.Enum):CREATED = 'created'UPDATED = 'updated'+ DELETED = 'deleted'+ MERGED = 'merged'diff --git a/wger/exercises/views/history.py b/wger/exercises/views/history.pyindex ca6c77906..764e97887 100644--- a/wger/exercises/views/history.py+++ b/wger/exercises/views/history.py@@ -27,7 +27,7 @@ from django.core.paginator import (PageNotAnInteger,Paginator,)-from django.db.models import QuerySet+from django.db.models import Q, QuerySetfrom django.http import HttpResponseRedirect, HttpRequest, HttpResponsefrom django.shortcuts import (get_object_or_404,@@ -144,17 +144,26 @@ class ActionHistoryFilter(django_filters.FilterSet):if not value:return querysetuser_ct = ContentType.objects.get_for_model(User)+ # ``actor_object_id`` is a CharField in actstream (generic FK), but+ # ``User.pk`` is an integer. Postgres rejects the implicit cast, so the+ # subquery is materialized and stringified here.+ user_pks = User.objects.filter(+ username__icontains=value,+ ).values_list('pk', flat=True)return queryset.filter(actor_content_type=user_ct,- actor_object_id__in=User.objects.filter(- username__icontains=value- ).values_list('pk', flat=True),+ actor_object_id__in=[str(pk) for pk in user_pks],)def filter_model_type(self, queryset: QuerySet, name: str, value: str):ct_map = _content_type_map()if value in ct_map:- return queryset.filter(action_object_content_type=ct_map[value])+ # Also include DELETED events for this type, where action_object is+ # gone and the model is recorded in ``data.model_type`` instead.+ return queryset.filter(+ Q(action_object_content_type=ct_map[value])+ | Q(verb=StreamVerbs.DELETED.value, data__model_type=value)+ )return queryset@@ -169,21 +178,28 @@ def control(request: HttpRequest) -> HttpResponse:ct_id_to_key = {ct.id: key for key, ct in ct_map.items()}tracked_ct_ids = [ct.id for ct in ct_map.values()]+ # Include events tied to a tracked exercise model via action_object, plus+ # DELETED events that no longer have an action_object (the original was+ # deleted) but recorded their model in ``data.model_type``.+ tracked_filter = Q(action_object_content_type__in=tracked_ct_ids) | Q(+ verb=StreamVerbs.DELETED.value,+ data__model_type__in=[key for key, *_ in TRACKED_MODELS],+ )+base_queryset = (Action.objects.select_related('actor_content_type','action_object_content_type','target_content_type',)- # Only show events related to tracked exercise models- .filter(action_object_content_type__in=tracked_ct_ids)+ .filter(tracked_filter).order_by('-timestamp'))action_filter = ActionHistoryFilter(request.GET, queryset=base_queryset)now = timezone.now()- stats_base = Action.objects.filter(action_object_content_type__in=tracked_ct_ids)+ stats_base = Action.objects.filter(tracked_filter)stats = {'last_24h': stats_base.filter(timestamp__gte=now - timedelta(days=1)).count(),'last_7d': stats_base.filter(timestamp__gte=now - timedelta(days=7)).count(),@@ -219,6 +235,11 @@ def control(request: HttpRequest) -> HttpResponse:)model_key = ct_id_to_key.get(entry.action_object_content_type_id)+ # DELETED events have no action_object — the model type is carried in+ # ``data.model_type`` instead.+ if not model_key and entry.verb == StreamVerbs.DELETED.value and entry.data:+ model_key = entry.data.get('model_type')+data = {'verb': entry.verb,'stream': entry,