WIP: User Feedback for PickUps Tests

config/urls.py

@@ -24,7 +24,7 @@
 from foodsaving.groups.api import GroupViewSet
 from foodsaving.history.api import HistoryViewSet
 from foodsaving.invitations.api import InvitationsViewSet, InvitationAcceptViewSet
-from foodsaving.stores.api import StoreViewSet, PickupDateViewSet, PickupDateSeriesViewSet
+from foodsaving.stores.api import StoreViewSet, PickupDateViewSet, PickupDateSeriesViewSet, FeedbackViewSet
 from foodsaving.userauth.api import AuthViewSet
 from foodsaving.users.api import UserViewSet
 
@@ -53,6 +53,9 @@
 router.register('invitations', InvitationsViewSet)
 router.register('invitations', InvitationAcceptViewSet)
 
+# Feedback endpoints
+router.register(r'feedback', FeedbackViewSet)
+
 urlpatterns = [
     url(r'^api/', include(router.urls, namespace='api')),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),

foodsaving/stores/api.py

@@ -7,12 +7,19 @@
 from rest_framework.viewsets import GenericViewSet
 
 from foodsaving.stores.filters import PickupDatesFilter, PickupDateSeriesFilter
-from foodsaving.stores.permissions import IsUpcoming, HasNotJoinedPickupDate, HasJoinedPickupDate, IsEmptyPickupDate, \
-    IsNotFull
-from foodsaving.stores.serializers import StoreSerializer, PickupDateSerializer, PickupDateSeriesSerializer, \
-    PickupDateJoinSerializer, PickupDateLeaveSerializer
-from foodsaving.stores.models import Store as StoreModel, PickupDate as PickupDateModel, \
-    PickupDateSeries as PickupDateSeriesModel
+from foodsaving.stores.permissions import (
+    IsUpcoming, HasNotJoinedPickupDate, HasJoinedPickupDate, IsEmptyPickupDate,
+    IsNotFull)
+from foodsaving.stores.serializers import (
+    StoreSerializer, PickupDateSerializer, PickupDateSeriesSerializer,
+    PickupDateJoinSerializer, PickupDateLeaveSerializer, FeedbackSerializer)
+from foodsaving.stores.models import (
+    Store as StoreModel,
+    PickupDate as PickupDateModel,
+    PickupDateSeries as PickupDateSeriesModel,
+    Feedback as FeedbackModel
+)
+
 from foodsaving.utils.mixins import PartialUpdateModelMixin
 
 pre_pickup_delete = Signal()
@@ -59,6 +66,20 @@ def perform_destroy(self, store):
         PickupDateSeriesModel.objects.filter(store=store).delete()
 
 
+class FeedbackViewSet(
+    mixins.CreateModelMixin,
+    mixins.RetrieveModelMixin,
+    mixins.ListModelMixin,
+    GenericViewSet
+):
+    serializer_class = FeedbackSerializer
+    queryset = FeedbackModel.objects.all()
+    permission_classes = (IsAuthenticated,)
+
+    def get_queryset(self):
+        return self.queryset.filter(about__store__group__members=self.request.user)
+
+
 class PickupDateSeriesViewSet(
     mixins.CreateModelMixin,
     mixins.RetrieveModelMixin,
@@ -67,12 +88,7 @@ class PickupDateSeriesViewSet(
     mixins.DestroyModelMixin,
     viewsets.GenericViewSet
 ):
-    """
-    Pickup Date Series
 
-    # Query parameters
-    - `?store` - filter by store id
-    """
     serializer_class = PickupDateSeriesSerializer
     queryset = PickupDateSeriesModel.objects
     filter_backends = (filters.DjangoFilterBackend,)

foodsaving/stores/migrations/0016_feedback.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-10 09:55
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('stores', '0015_auto_20170727_0943'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Feedback',
+            fields=[
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now)),
+                ('weight', models.PositiveIntegerField()),
+                ('comment', models.CharField(max_length=80)),
+                ('about', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='stores.PickupDate')),
+                ('given_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_feedback', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

foodsaving/stores/migrations/0017_merge_20170815_0930.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-15 09:30
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stores', '0016_feedback'),
+        ('stores', '0016_pickupdate_done_and_processed'),
+    ]
+
+    operations = [
+    ]

foodsaving/stores/migrations/0018_auto_20170831_1256.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-31 12:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stores', '0017_merge_20170815_0930'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='feedback',
+            name='weight',
+            field=models.PositiveIntegerField(blank=True),
+        ),
+    ]

foodsaving/stores/migrations/0019_auto_20170831_1306.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-31 13:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stores', '0018_auto_20170831_1256'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='feedback',
+            name='weight',
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+    ]

foodsaving/stores/migrations/0020_auto_20170831_1312.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-31 13:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stores', '0019_auto_20170831_1306'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='feedback',
+            name='comment',
+            field=models.CharField(max_length=100000),
+        ),
+    ]

foodsaving/stores/migrations/0021_auto_20170831_1341.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-31 13:41
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stores', '0020_auto_20170831_1312'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='feedback',
+            name='given_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='feedback', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

foodsaving/stores/models.py

@@ -30,6 +30,13 @@ def __str__(self):
         return '{} ({})'.format(self.name, self.group)
 
 
+class Feedback(BaseModel):
+    given_by = models.ForeignKey('users.User', on_delete=models.CASCADE, related_name='feedback')
+    about = models.ForeignKey('PickupDate')
+    weight = models.PositiveIntegerField(blank=True, null=True)
+    comment = models.CharField(max_length=settings.DESCRIPTION_MAX_LENGTH)
+
+
 class PickupDateSeriesManager(models.Manager):
     @transaction.atomic
     def create_all_pickup_dates(self):

foodsaving/stores/serializers.py

@@ -8,9 +8,12 @@
 
 from django.conf import settings
 from foodsaving.history.utils import get_changed_data
-from foodsaving.stores.models import PickupDate as PickupDateModel
-from foodsaving.stores.models import PickupDateSeries as PickupDateSeriesModel
-from foodsaving.stores.models import Store as StoreModel
+from foodsaving.stores.models import (
+    PickupDate as PickupDateModel,
+    Feedback as FeedbackModel,
+    PickupDateSeries as PickupDateSeriesModel,
+    Store as StoreModel,
+)
 from foodsaving.stores.signals import post_pickup_create, post_pickup_modify, post_pickup_join, post_pickup_leave, \
     post_series_create, post_series_modify, post_store_create, post_store_modify
 
@@ -229,3 +232,24 @@ def validate_weeks_in_advance(self, w):
         if w < 1:
             raise serializers.ValidationError(_('Set at least one week in advance'))
         return w
+
+
+class FeedbackSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = FeedbackModel
+        fields = ['id', 'weight', 'comment', 'about', 'given_by']
+        read_only_fields = ('given_by',)
+
+    # Tilmanns code (is it to save a user_id of the logged-in user?)
+    def create(self, validated_data):
+        validated_data['given_by'] = self.context['request'].user
+        return super().create(validated_data)
+
+    def validate_about(self, about):
+        user = self.context['request'].user
+        group = about.store.group
+        if not group.is_member(user):
+            raise serializers.ValidationError(_('You are not member of the store\'s group.'))
+        if not about.is_collector(user):
+            raise serializers.ValidationError(_('You aren\'t assign to the pickup.'))
+        return about