Feat(payment)/order listing

CHANGELOG.md

@@ -13,11 +13,13 @@
 ---
 
 ## Neste versjon
+
 - ✨ **Spørreskjemaer** NOK medlemmer kan lage spørreskjema.
-- ⚡ **Bruker** Nå kan ikke HS lenger endre eller slette brukere. 
+- ⚡ **Bruker** Nå kan ikke HS lenger endre eller slette brukere.
 - ⚡ **Mails** Nå logger vi på eposttjeneren kun en gang per batch med epost som sendes.
 - 🦟 **Bøter** Nå skal bilder på bøter ikke lengre forsvinne.
 - ✨ **Betalte arrangementer med Vipps betaling**. Det kan nå opprettes arrangementer som krever betaling for å melde seg på. Denne betalingen betales via Vipps.
+- ⚡ **Nyheter** Fondesforvalere kan nå lage nyheter.
 
 ## Versjon 2022.10.13
 

app/common/enums.py

@@ -39,8 +39,9 @@ def admin(cls):
 
 class Groups(ChoiceEnum):
     TIHLDE = "TIHLDE"
-    REDAKSJONEN = "redaksjonen"
     JUBKOM = "JubKom"
+    REDAKSJONEN = "Redaksjonen"
+    FONDET = "Forvaltningsgruppen"
 
 
 class AppModel(ChoiceEnum):

app/content/models/news.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.db import models
 
-from app.common.enums import AdminGroup
+from app.common.enums import AdminGroup, Groups
 from app.common.permissions import BasePermissionModel
 from app.util.models import BaseModel, OptionalImage
 
@@ -18,7 +18,7 @@ class News(BaseModel, OptionalImage, BasePermissionModel):
     )
     body = models.TextField()
 
-    write_access = AdminGroup.all()
+    write_access = [*AdminGroup.all(), Groups.FONDET]
 
     class Meta:
         verbose_name_plural = "News"

app/content/serializers/event.py

@@ -60,6 +60,7 @@ class Meta:
             "permissions",
             "priority_pools",
             "paid_information",
+            "is_paid_event",
             "contact_person",
         )
 

app/content/views/registration.py

@@ -65,7 +65,11 @@ def create(self, request, *args, **kwargs):
             serializer, event=event, user=request.user
         )
 
-        create_payment_order(event, request, registration)
+        try:
+            create_payment_order(event, request, registration)
+        except Exception as e:
+            registration.delete()
+            raise e
 
         registration_serializer = RegistrationSerializer(
             registration, context={"user": registration.user}

app/content/views/user.py

@@ -37,9 +37,10 @@
     MembershipHistorySerializer,
     MembershipSerializer,
 )
+from app.payment.views import OrderListSerializer
 from app.util.export_user_data import export_user_data
 from app.util.utils import CaseInsensitiveBooleanQueryParam
-
+from app.payment.util.order_utils import filter_user_event_orders
 
 class UserViewSet(BaseViewSet, ActionMixin):
     """API endpoint to display one user"""
@@ -285,6 +286,18 @@ def get_user_events(self, request, *args, **kwargs):
             data=events, serializer=EventListSerializer, context={"request": request}
         )
 
+    @action(detail=False, methods=["get"], url_path="me/payment_orders")
+    def get_user_payment_orders(self, request, *args, **kwargs):
+        payment_orders = request.user.orders.all()
+
+        filtered_orders = filter_user_event_orders(payment_orders)
+
+        return self.paginate_response(
+            data=filtered_orders,
+            serializer=OrderListSerializer,
+            context={"request": request},
+        )
+
     @action(detail=False, methods=["get"], url_path="me/forms")
     def get_user_forms(self, request, *args, **kwargs):
         forms = request.user.forms

app/group/admin.py

@@ -24,6 +24,11 @@ class MembershipAdmin(admin.ModelAdmin):
         "user",
     )
 
+    search_fields = [
+        "user__first_name",
+        "user__last_name"
+    ]
+
 
 @admin.register(models.MembershipHistory)
 class MembershipHistoryAdmin(admin.ModelAdmin):

app/payment/factories/__init__.py

@@ -0,0 +1,2 @@
+from app.payment.factories.order_factory import OrderFactory
+from app.payment.factories.paid_event_factory import PaidEventFactory

app/payment/factories/order_factory.py

@@ -1,4 +1,5 @@
 import random
+import string
 from datetime import timedelta
 
 import factory
@@ -19,3 +20,4 @@ class Meta:
     event = factory.SubFactory(EventFactory)
     status = random.choice([e.value for e in OrderStatus])
     expire_date = now() + timedelta(hours=1)
+    payment_link = "".join(random.choices(string.ascii_letters, k=36))

app/payment/filters/__init__.py

@@ -0,0 +1 @@
+from app.payment.filters.order import OrderFilter

app/payment/filters/order.py

@@ -0,0 +1,26 @@
+from django.db.models import Exists, OuterRef
+from django_filters import filters
+from django_filters.rest_framework.filterset import FilterSet
+
+from app.payment.models import Order, PaidEvent
+
+
+class OrderFilter(FilterSet):
+    """
+    Filters payment orders by user, paid events and status.
+    """
+
+    user = filters.CharFilter(method="filter_user")
+    event = filters.NumberFilter(method="filter_paid_event")
+
+    class Meta:
+        model = Order
+        fields = ["user", "event", "status"]
+
+    def filter_user(self, queryset, name, value):
+        if value and self.request.user:
+            return queryset.filter(user__user_id=self.request.user.user_id)
+        return queryset
+
+    def filter_paid_event(self, queryset, name, value):
+        return queryset.filter(Exists(PaidEvent.objects.filter(event=value)))

app/payment/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.0.8 on 2023-05-08 17:11
+# Generated by Django 4.0.8 on 2023-09-11 19:01
 
 from django.conf import settings
 from django.db import migrations, models
@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('content', '0052_event_rules_and_photo_in_user'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('content', '0053_event_contact_person'),
     ]
 
     operations = [
@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('event', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, primary_key=True, related_name='paid_information', serialize=False, to='content.event')),
+                ('event', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='paid_information', serialize=False, to='content.event')),
                 ('price', models.DecimalField(decimal_places=2, max_digits=6)),
                 ('paytime', models.TimeField()),
             ],
@@ -38,8 +38,8 @@ class Migration(migrations.Migration):
                 ('status', models.CharField(choices=[('INITIATE', 'Initiate'), ('RESERVE', 'Reserve'), ('CAPTURE', 'Capture'), ('REFUND', 'Refund'), ('CANCEL', 'Cancel'), ('SALE', 'Sale'), ('VOID', 'Void')], default='INITIATE', max_length=16)),
                 ('expire_date', models.DateTimeField()),
                 ('payment_link', models.URLField(max_length=2000)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orders', to='content.event')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orders', to=settings.AUTH_USER_MODEL)),
+                ('event', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='orders', to='content.event')),
+                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='orders', to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'verbose_name_plural': 'Orders',

app/payment/models/order.py

@@ -32,8 +32,8 @@ class Meta:
         verbose_name_plural = "Orders"
         ordering = ("-created_at",)
 
-        def __str__(self):
-            return f"{self.order_id} {self.user} {self.event} {self.status} {self.expire_date}"
+    def __str__(self):
+        return f"{self.user.first_name} {self.user.last_name} - {self.status} - {self.created_at}"
 
     @property
     def expired(self):

app/payment/serializers/__init__.py

@@ -1 +1,5 @@
-from .order import OrderSerializer
+from app.payment.serializers.order import (
+    OrderSerializer,
+    OrderListSerializer,
+    OrderUpdateCreateSerializer,
+)

app/payment/serializers/order.py

@@ -29,3 +29,17 @@ def create(self, validated_data):
             return Order.objects.create(
                 user=user, expired_date=now() + paytime, **validated_data
             )
+
+
+class OrderEventListSerializer(BaseModelSerializer):
+    class Meta:
+        model = Event
+        fields = ("title", "id")
+
+
+class OrderListSerializer(BaseModelSerializer):
+    event = OrderEventListSerializer(read_only=True)
+
+    class Meta:
+        model = Order
+        fields = ("order_id", "status", "payment_link", "user", "event")

app/payment/util/order_utils.py

@@ -0,0 +1,41 @@
+from app.payment.enums import OrderStatus
+
+
+def filter_user_event_orders(orders):
+    """
+    Filter user payment orders for events, so the user only get
+    displayed the paid order for an event. All refunds will be displayed.
+    """
+
+    STATUS_PRIORITY = [
+        OrderStatus.SALE,
+        OrderStatus.RESERVE,
+        OrderStatus.CAPTURE,
+        OrderStatus.INITIATE,
+        OrderStatus.CANCEL
+    ]
+
+    filtered_orders = {}
+    final_orders = []
+
+    for order in orders:
+        if (
+            not order.event or
+            order.event.expired
+        ):
+            continue
+
+        if order.status == OrderStatus.REFUND:
+            final_orders.append(order)
+            continue
+
+        if (
+            order.event.id not in filtered_orders or
+            STATUS_PRIORITY.index(order.status) < STATUS_PRIORITY.index(filtered_orders[order.event.id].status)
+        ):
+            filtered_orders[order.event.id] = order
+
+    filtered_orders = list(filtered_orders.values())
+    final_orders += filtered_orders
+
+    return final_orders

app/payment/util/payment_utils.py

@@ -17,7 +17,13 @@ def get_new_access_token():
         "Merchant-Serial-Number": settings.VIPPS_MERCHANT_SERIAL_NUMBER,
     }
 
-    response = requests.post(TOKEN_URL, headers=TOKEN_HEADERS).json()
+    response = requests.post(TOKEN_URL, headers=TOKEN_HEADERS)
+
+    if response.status_code != 200:
+        raise Exception("Could not get access token")
+
+    response = response.json()
+
     return (response["expires_on"], response["access_token"])
 
 

app/payment/views/__init__.py

@@ -0,0 +1 @@
+from app.payment.views.order import Order, OrderListSerializer