add swappable models for drf part

Author: artushghazaryan

actstream/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from actstream import models
+from actstream.settings import get_action_model, get_follow_model
 
 # Use django-generic-admin widgets if available
 try:
@@ -25,5 +25,5 @@ class FollowAdmin(ModelAdmin):
     raw_id_fields = ('user', 'content_type')
 
 
-admin.site.register(models.Action, ActionAdmin)
-admin.site.register(models.Follow, FollowAdmin)
+admin.site.register(get_action_model(), ActionAdmin)
+admin.site.register(get_follow_model(), FollowAdmin)

actstream/drf/serializers.py

@@ -1,7 +1,7 @@
 from rest_framework import serializers
 from generic_relations.relations import GenericRelatedField
 
-from actstream.models import Follow, Action
+from actstream import settings as actstream_settings
 from actstream.registry import registry, label
 from actstream.settings import DRF_SETTINGS, import_obj
 
@@ -72,7 +72,7 @@ class ActionSerializer(DEFAULT_SERIALIZER):
     action_object = get_grf()
 
     class Meta:
-        model = Action
+        model = actstream_settings.get_action_model()
         fields = 'id verb public description timestamp actor target action_object'.split()
 
 
@@ -97,7 +97,7 @@ class FollowSerializer(DEFAULT_SERIALIZER):
     follow_object = get_grf()
 
     class Meta:
-        model = Follow
+        model = actstream_settings.get_follow_model()
         fields = 'id flag user follow_object started actor_only'.split()
 
 
@@ -108,5 +108,5 @@ class FollowingSerializer(DEFAULT_SERIALIZER):
     follow_object = get_grf()
 
     class Meta:
-        model = Follow
+        model = actstream_settings.get_follow_model()
         fields = ['follow_object']

actstream/drf/views.py

@@ -13,7 +13,7 @@
 from actstream.drf import serializers
 from actstream import models
 from actstream.registry import label
-from actstream.settings import DRF_SETTINGS, import_obj
+from actstream.settings import DRF_SETTINGS, import_obj, get_action_model, get_follow_model
 from actstream.signals import action as action_signal
 from actstream.actions import follow as follow_action
 
@@ -52,7 +52,7 @@ def get_permissions(self):
 
 
 class ActionViewSet(DefaultModelViewSet):
-    queryset = models.Action.objects.public().order_by('-timestamp', '-id').prefetch_related()
+    queryset = get_action_model().objects.public().order_by('-timestamp', '-id').prefetch_related()
     serializer_class = serializers.ActionSerializer
 
     @action(detail=False, permission_classes=[permissions.IsAuthenticated], methods=['POST'], serializer_class=serializers.SendActionSerializer)
@@ -159,7 +159,7 @@ def any_stream(self, request, content_type_id, object_id):
 
 
 class FollowViewSet(DefaultModelViewSet):
-    queryset = models.Follow.objects.order_by('-started', '-id').prefetch_related()
+    queryset = get_follow_model().objects.order_by('-started', '-id').prefetch_related()
     serializer_class = serializers.FollowSerializer
     permission_classes = [permissions.IsAuthenticated]
 
@@ -185,7 +185,7 @@ def is_following(self, request,  content_type_id, object_id):
         """
         ctype = get_object_or_404(ContentType, id=content_type_id)
         instance = ctype.get_object_for_this_type(pk=object_id)
-        following = models.Follow.objects.is_following(request.user, instance)
+        following = get_follow_model().objects.is_following(request.user, instance)
         data = {'is_following': following}
         return Response(json.dumps(data))
 
@@ -195,7 +195,7 @@ def following(self, request):
         """
         Returns a JSON response whether the current user is following the object from content_type_id/object_id pair
         """
-        qs = models.Follow.objects.following_qs(request.user)
+        qs = get_follow_model().objects.following_qs(request.user)
         return Response(serializers.FollowingSerializer(qs, many=True).data)
 
     @action(detail=False, permission_classes=[permissions.IsAuthenticated],
@@ -208,7 +208,7 @@ def followers(self, request):
         if user_model not in serializers.registered_serializers:
             raise ModelNotRegistered(f'Auth user "{user_model.__name__}" not registered with actstream')
         serializer = serializers.registered_serializers[user_model]
-        followers = models.Follow.objects.followers(request.user)
+        followers = get_follow_model().objects.followers(request.user)
         return Response(serializer(followers, many=True).data)
 
 

actstream/follows.py

@@ -1,6 +1,6 @@
 from django.core.exceptions import ImproperlyConfigured
 
-from actstream.models import Follow
+from actstream.settings import get_follow_model
 
 
 def delete_orphaned_follows(sender, instance=None, **kwargs):
@@ -11,6 +11,6 @@ def delete_orphaned_follows(sender, instance=None, **kwargs):
         return
 
     try:
-        Follow.objects.for_object(instance).delete()
+        get_follow_model().objects.for_object(instance).delete()
     except ImproperlyConfigured:  # raised by actstream for irrelevant models
         pass

actstream/tests/test_drf.py

@@ -5,8 +5,7 @@
 from django.urls import reverse
 
 from actstream.tests.base import DataTestCase
-from actstream.settings import USE_DRF, DRF_SETTINGS
-from actstream.models import Action, Follow
+from actstream.settings import USE_DRF, DRF_SETTINGS, get_action_model, get_follow_model
 from actstream import signals
 
 
@@ -125,7 +124,7 @@ def test_action_send(self):
         }
         post = self.auth_client.post(reverse('action-send'), body)
         assert post.status_code == 201
-        action = Action.objects.first()
+        action = get_action_model().objects.first()
         assert action.description == body['description']
         assert action.verb == body['verb']
         assert action.actor == self.user1
@@ -141,7 +140,7 @@ def test_follow(self):
         }
         post = self.auth_client.post(reverse('follow-follow'), body)
         assert post.status_code == 201
-        follow = Follow.objects.order_by('-id').first()
+        follow = get_follow_model().objects.order_by('-id').first()
         assert follow.follow_object == self.comment
         assert follow.user == self.user1
         assert follow.user == self.user1

actstream/tests/test_views.py

@@ -2,6 +2,7 @@
 
 from django.urls import reverse
 
+from actstream.settings import get_action_model, get_follow_model
 from actstream import models
 from actstream.tests.base import DataTestCase
 
@@ -34,13 +35,13 @@ def test_follow_unfollow(self):
         action = {'actor_content_type': self.user_ct, 'actor_object_id': self.user1.pk,
                   'target_content_type': self.user_ct, 'target_object_id': self.user3.pk,
                   'verb': 'started following'}
-        models.Follow.objects.get(**follow)
-        models.Action.objects.get(**action)
+        get_follow_model().objects.get(**follow)
+        get_action_model().objects.get(**action)
 
         response = self.get('actstream_unfollow', self.user_ct.pk, self.user3.pk)
         self.assertEqual(response.status_code, 204)
         self.assertEqual(len(response.templates), 0)
-        self.assertRaises(models.Follow.DoesNotExist, models.Follow.objects.get, **follow)
+        self.assertRaises(get_follow_model().DoesNotExist, get_follow_model().objects.get, **follow)
 
         response = self.get('actstream_unfollow', self.user_ct.pk, self.user3.pk, next='/redirect/')
         self.assertEqual(response.status_code, 302)
@@ -55,13 +56,13 @@ def test_follow_unfollow_with_flag(self):
         action = {'actor_content_type': self.user_ct, 'actor_object_id': self.user1.pk,
                   'target_content_type': self.user_ct, 'target_object_id': self.user3.pk,
                   'verb': 'started watching'}
-        models.Follow.objects.get(**follow)
-        models.Action.objects.get(**action)
+        get_follow_model().objects.get(**follow)
+        get_action_model().objects.get(**action)
 
         response = self.get('actstream_unfollow', self.user_ct.pk, self.user3.pk, 'watching')
         self.assertEqual(response.status_code, 204)
         self.assertEqual(len(response.templates), 0)
-        self.assertRaises(models.Follow.DoesNotExist, models.Follow.objects.get, **follow)
+        self.assertRaises(get_follow_model().DoesNotExist, get_follow_model().objects.get, **follow)
 
         response = self.get('actstream_unfollow', self.user_ct.pk, self.user3.pk, 'watching', next='/redirect/')
         self.assertEqual(response.status_code, 302)