Add functionality to get invited users for a user and resend pending …

…invites

src/api/tests.py

@@ -87,6 +87,26 @@ def test_should_fail_if_invite_exists_already(self):
         invites = Invite.objects.filter(email=email, organisation=organisation)
         self.assertEquals(len(invites), 1)
 
+    def test_should_return_all_invites_and_can_resend(self):
+        # Given
+        client = self.set_up()
+        organisation_2 = Organisation.objects.create(name="Test org 2")
+        invite_1 = Invite.objects.create(email="test_1@example.com",
+                                         frontend_base_url="https://www.example.com",
+                                         organisation=organisation_2)
+        invite_2 = Invite.objects.create(email="test_2@example.com",
+                                         frontend_base_url="https://www.example.com",
+                                         organisation=organisation_2)
+
+        # When
+        invite_list_response = client.get('/api/v1/organisations/%s/invites/' % organisation_2.id)
+        invite_resend_response = client.post('/api/v1/organisations/%s/invites/%s/resend/' % (
+            organisation_2.id, invite_1.id))
+
+        # Then
+        self.assertEquals(invite_list_response.status_code, status.HTTP_200_OK)
+        self.assertEquals(invite_resend_response.status_code, status.HTTP_200_OK)
+
 
 class ProjectTestCase(TestCase):
 

src/organisations/urls.py

@@ -1,13 +1,19 @@
 from django.conf.urls import url, include
 from rest_framework_nested import routers
+
+from organisations.views import InviteViewSet
 from . import views
 
 
 router = routers.DefaultRouter()
 router.register(r'', views.OrganisationViewSet, base_name="organisation")
 
+organisations_router = routers.NestedSimpleRouter(router, r'', lookup="organisation")
+organisations_router.register(r'invites', InviteViewSet, base_name="organisation-invites")
+
 app_name = "organisations"
 
 urlpatterns = [
     url(r'^', include(router.urls)),
+    url(r'^', include(organisations_router.urls))
 ]

src/organisations/views.py

@@ -9,7 +9,8 @@
 from projects.serializers import ProjectSerializer
 from organisations.serializers import OrganisationSerializer
 from users.models import Invite
-from users.serializers import UserFullSerializer, InviteSerializer, UserListSerializer
+from users.serializers import UserFullSerializer, InviteSerializer, UserListSerializer, \
+    InviteListSerializer
 
 
 class OrganisationViewSet(viewsets.ModelViewSet):
@@ -73,3 +74,18 @@ def invite(self, request, pk):
             raise ValidationError(invites_serializer.errors)
 
         return Response(status=status.HTTP_201_CREATED)
+
+
+class InviteViewSet(viewsets.ModelViewSet):
+    serializer_class = InviteListSerializer
+
+    def get_queryset(self):
+        organisation_pk = self.kwargs.get('organisation_pk')
+        return Invite.objects.filter(organisation=organisation_pk)
+
+    @action(detail=True, methods=["POST"])
+    def resend(self, request, organisation_pk, pk):
+        invite = self.get_object()
+        invite.send_invite_mail()
+        return Response(status=status.HTTP_200_OK)
+

src/users/models.py

@@ -97,12 +97,13 @@ class Invite(models.Model):
     email = models.EmailField()
     hash = models.CharField(max_length=100, default=create_hash, unique=True)
     date_created = models.DateTimeField('DateCreated', auto_now_add=True)
-    organisation = models.ForeignKey(Organisation, on_delete=models.CASCADE)
+    organisation = models.ForeignKey(Organisation, on_delete=models.CASCADE, related_name='invites')
     frontend_base_url = models.CharField(max_length=500, null=False)
     invited_by = models.ForeignKey(FFAdminUser, related_name='sent_invites', null=True)
 
     class Meta:
         unique_together = ('email', 'organisation')
+        ordering = ['organisation', 'date_created']
 
     def save(self, *args, **kwargs):
         # send email invite before saving invite

src/users/serializers.py

@@ -71,4 +71,12 @@ def save(self, request):
 class InviteSerializer(serializers.ModelSerializer):
     class Meta:
         model = Invite
-        fields = ('email', 'organisation', 'frontend_base_url', 'invited_by')
+        fields = ('email', 'organisation', 'frontend_base_url', 'invited_by', 'date_created')
+
+
+class InviteListSerializer(serializers.ModelSerializer):
+    invited_by = UserListSerializer()
+
+    class Meta:
+        model = Invite
+        fields = ('id', 'email', 'date_created', 'invited_by')