Test

.github/workflows/ci.yaml

@@ -41,6 +41,7 @@ jobs:
         run: |  
           touch .env
           echo "AZURE_STORAGE_CONNECTION_STRING=${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}" >> .env
+          echo "VIPPS_MERCHANT_SERIAL_NUMBER=${{ secrets.VIPPS_MERCHANT_SERIAL_NUMBER }}" >> .env
 
       - name: Build the Stack
         run:  docker-compose build

.github/workflows/deploy_dev.yml

@@ -10,7 +10,7 @@ jobs:
   deploy:
     uses: TIHLDE/Lepton/.github/workflows/deploy_to_azure.yml@dev
     with:
-      registry_name: leptondevregistry
+      registry_name: leptonregistrydev
     secrets:
       registry_username: ${{ secrets.ACI_DEV_USERNAME }}
       registry_password: ${{ secrets.ACI_DEV_PASSWORD }}

CHANGELOG.md

@@ -14,6 +14,15 @@
 
 ## Neste versjon
 
+## Versjon 2023.01.15
+- ✨ **Reaksjoner** Brukere kan reagere med emojier på arrangementer og nyheter.
+- 🎨 **JubKom Rettigheter** Medlemmer av JubKom kan ikke lenger lage arrangementer.
+- 🦟 **KoK Rettigheter** Medlemmer av KoK kan nå lage arrangementer, nyheter og manuelt legge til medlemmer på arrangement.
+- 🦟 **Aktiviteter** Filterering av aktiviteter og arrangementer fungerer nå riktig. I visning av gruppe, vil nå også aktiviteter vises.
+- 🦟 **Manuell Registering** Man får nå en feilmelding om at man ikke kan legge til dobbel manuell registering for en bruker på et arrangement.
+- ⚡ **Mine Arrangementer** En bruker kan nå se alle sine tidligere arrangementer som de har deltatt på.
+- 🦟 **Vipps** En ny versjon av Vipps betaling har nå kommet.
+
 ## Versjon 2023.11.06
 - ✨ **Påmelding** Medlemmer av undergrupper kan nå manuelt legge til brukere på arrangementer.
 - ⚡ **Venteliste** Brukere på venteliste kan nå se sin egen plass på ventelisten.
@@ -24,13 +33,15 @@
 ## Versjon 2023.10.23
 - ⚡ **Brukere** HS kan styre medlemmer
 - ✨ **Bannere** Filtrering på bannere
+- ✨ **emoji** Nyheter kan nå ha reaksjoner
 - ✨ **Spørreskjemaer** NOK medlemmer kan lage spørreskjema.
 - ⚡ **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.
 - ⚡ **Arrangementer** Du kan nå se hvilken plass du har på ventelisten til et arrangement.
+- ✨ **Profil** Filtrere kommende og tidligere arrangementer
 
 ## Versjon 2022.10.13
 

app/common/enums.py

@@ -27,7 +27,7 @@ class AdminGroup(ChoiceEnum):
     NOK = "Nok"
     PROMO = "Promo"
     SOSIALEN = "Sosialen"
-    KOK = "Kok"
+    KOK = "Kontkom"
 
     @classmethod
     def all(cls):
@@ -43,6 +43,7 @@ class Groups(ChoiceEnum):
     JUBKOM = "JubKom"
     REDAKSJONEN = "Redaksjonen"
     FONDET = "Forvaltningsgruppen"
+    PLASK = "Plask"
 
 
 class AppModel(ChoiceEnum):

app/content/exceptions.py

@@ -4,7 +4,12 @@
 
 class APIPaidEventCantBeChangedToFreeEventException(APIException):
     status_code = status.HTTP_400_BAD_REQUEST
-    default_detail = "Arrangementet er et betalt arrangement, og kan ikke endres til et gratis arrangement"
+    default_detail = "Arrangementet er et betalt arrangement med påmeldte deltagere, og kan ikke endres til et gratis arrangement"
+
+
+class APIEventCantBeChangedToPaidEventException(APIException):
+    status_code = status.HTTP_400_BAD_REQUEST
+    default_detail = "Arrangementet er et gratis arrangement med påmeldte deltagere, og kan ikke endres til et betalt arrangement"
 
 
 class APIUserAlreadyAttendedEvent(APIException):
@@ -48,3 +53,7 @@ class UnansweredFormError(ValueError):
 
 class EventIsFullError(ValueError):
     pass
+
+
+class RefundFailedError(ValueError):
+    pass

app/content/factories/event_factory.py

@@ -20,3 +20,4 @@ class Meta:
     start_registration_at = timezone.now() - timedelta(days=1)
     end_registration_at = timezone.now() + timedelta(days=9)
     sign_off_deadline = timezone.now() + timedelta(days=8)
+    emojis_allowed = True

app/content/factories/news_factory.py

@@ -11,3 +11,4 @@ class Meta:
     title = factory.Faker("sentence", nb_words=5)
     header = factory.Faker("sentence", nb_words=5)
     body = factory.Faker("paragraph", nb_sentences=10)
+    emojis_allowed = True

app/content/migrations/0054_qrcode.py

@@ -44,4 +44,4 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "qr_codes",
             },
         ),
-    ]
+    ]

app/content/migrations/0054_registration_payment_expiredate.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-18 08:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("content", "0053_event_contact_person"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="registration",
+            name="payment_expiredate",
+            field=models.DateTimeField(default=None, null=True),
+        ),
+    ]

app/content/migrations/0055_remove_qrcode_url_qrcode_content.py

@@ -20,4 +20,4 @@ class Migration(migrations.Migration):
             field=models.CharField(default=None, max_length=600),
             preserve_default=False,
         ),
-    ]
+    ]

app/content/migrations/0057_event_emojis_allowed_news_emojis_allowed.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.5 on 2023-12-15 17:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("content", "0056_registration_created_by_admin"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="event",
+            name="emojis_allowed",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="news",
+            name="emojis_allowed",
+            field=models.BooleanField(default=False),
+        ),
+    ]

app/content/migrations/0058_merge_20231217_2155.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.2.5 on 2023-12-17 20:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("content", "0054_registration_payment_expiredate"),
+        ("content", "0057_event_emojis_allowed_news_emojis_allowed"),
+    ]
+
+    operations = []

app/content/models/event.py

@@ -1,16 +1,18 @@
 from datetime import timedelta
 
+from django.contrib.contenttypes.fields import GenericRelation
 from django.core.exceptions import ValidationError
 from django.db import models
 
-from app.common.enums import AdminGroup, Groups
+from app.common.enums import AdminGroup
 from app.common.permissions import (
     BasePermissionModel,
     check_has_access,
     set_user_id,
 )
 from app.content.models import Category
 from app.content.models.user import User
+from app.emoji.models.reaction import Reaction
 from app.forms.enums import EventFormType
 from app.group.models.group import Group
 from app.util.models import BaseModel, OptionalImage
@@ -19,7 +21,7 @@
 
 class Event(BaseModel, OptionalImage, BasePermissionModel):
 
-    write_access = (*AdminGroup.admin(), AdminGroup.PROMO, Groups.JUBKOM)
+    write_access = (*AdminGroup.admin(), AdminGroup.PROMO)
 
     title = models.CharField(max_length=200)
     start_date = models.DateTimeField()
@@ -77,6 +79,10 @@ class Event(BaseModel, OptionalImage, BasePermissionModel):
     runned_sign_off_deadline_reminder = models.BooleanField(default=False)
     runned_sign_up_start_notifier = models.BooleanField(default=False)
 
+    """ Reactions """
+    emojis_allowed = models.BooleanField(default=False)
+    reactions = GenericRelation(Reaction)
+
     class Meta:
         ordering = ("start_date",)
 
@@ -102,6 +108,11 @@ def list_count(self):
         """Number of users registered to attend the event"""
         return self.get_participants().count()
 
+    @property
+    def has_participants(self):
+        """Returns if the event has users registered to attend the event"""
+        return self.list_count > 0
+
     @property
     def waiting_list_count(self):
         """Number of users on the waiting list"""
@@ -134,6 +145,9 @@ def get_waiting_list(self):
     def user_has_attended_event(self, user):
         return self.get_participants().filter(user=user, has_attended=True).exists()
 
+    def user_is_participant(self, user):
+        return self.get_participants().filter(user=user).exists()
+
     @property
     def is_past_sign_off_deadline(self):
         return now() >= self.sign_off_deadline

app/content/models/news.py

@@ -1,8 +1,10 @@
 from django.conf import settings
+from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
 
 from app.common.enums import AdminGroup, Groups
 from app.common.permissions import BasePermissionModel
+from app.emoji.models.reaction import Reaction
 from app.util.models import BaseModel, OptionalImage
 
 
@@ -17,6 +19,8 @@ class News(BaseModel, OptionalImage, BasePermissionModel):
         related_name="created_news",
     )
     body = models.TextField()
+    emojis_allowed = models.BooleanField(default=False)
+    reactions = GenericRelation(Reaction)
 
     write_access = [*AdminGroup.all(), Groups.FONDET]
 

app/content/models/registration.py

@@ -4,6 +4,8 @@
 from django.db import models
 from django.db.models import Q
 
+from sentry_sdk import capture_exception
+
 from app.common.enums import StrikeEnum
 from app.common.permissions import BasePermissionModel
 from app.communication.enums import UserNotificationSettingType
@@ -17,7 +19,9 @@
 from app.content.models.event import Event
 from app.content.models.strike import create_strike
 from app.content.models.user import User
+from app.content.util.registration_utils import get_payment_expiredate
 from app.forms.enums import EventFormType
+from app.payment.util.order_utils import check_if_order_is_paid, has_paid_order
 from app.util import now
 from app.util.models import BaseModel
 from app.util.utils import datetime_format
@@ -36,6 +40,7 @@ class Registration(BaseModel, BasePermissionModel):
     is_on_wait = models.BooleanField(default=False, verbose_name="waiting list")
     has_attended = models.BooleanField(default=False)
     allow_photo = models.BooleanField(default=True)
+    payment_expiredate = models.DateTimeField(null=True, default=None)
     created_by_admin = models.BooleanField(default=False)
 
     class Meta:
@@ -86,7 +91,27 @@ def delete_submission_if_exists(self):
         )[:1]
         Submission.objects.filter(form=event_form, user=self.user).delete()
 
+    def refund_payment_if_exist(self):
+        from app.content.util.event_utils import refund_vipps_order
+
+        if not self.event.is_paid_event:
+            return
+
+        orders = self.event.orders.filter(user=self.user)
+
+        if has_paid_order(orders):
+            for order in orders:
+                if check_if_order_is_paid(order):
+                    refund_vipps_order(
+                        order_id=order.order_id,
+                        event=self.event,
+                        transaction_text=f"Refund for {self.event.title} - {self.user.first_name} {self.user.last_name}",
+                    )
+                    self.send_notification_and_mail_for_refund(order)
+
     def delete(self, *args, **kwargs):
+        from app.content.util.event_utils import start_payment_countdown
+
         moved_registration = None
         if not self.is_on_wait:
             if self.event.is_past_sign_off_deadline:
@@ -99,9 +124,26 @@ def delete(self, *args, **kwargs):
             moved_registration = self.move_from_waiting_list_to_queue()
 
         self.delete_submission_if_exists()
+
+        # TODO: Add this for refund
+        # self.refund_payment_if_exist()
+
         registration = super().delete(*args, **kwargs)
         if moved_registration:
             moved_registration.save()
+
+            if (
+                moved_registration.event.is_paid_event
+                and not moved_registration.is_on_wait
+            ):
+                try:
+                    start_payment_countdown(
+                        moved_registration.event, moved_registration
+                    )
+                except Exception as countdown_error:
+                    capture_exception(countdown_error)
+                    moved_registration.delete()
+
         return registration
 
     def admin_unregister(self, *args, **kwargs):
@@ -115,6 +157,7 @@ def admin_unregister(self, *args, **kwargs):
             moved_registration.save()
 
     def save(self, *args, **kwargs):
+
         if not self.registration_id:
             self.create()
 
@@ -208,6 +251,19 @@ def send_notification_and_mail(self):
                 self.event.pk
             ).send()
 
+    def send_notification_and_mail_for_refund(self, order):
+        Notify(
+            [self.user],
+            f'Du har blitt meldt av "{self.event.title}" og vil bli refundert',
+            UserNotificationSettingType.UNREGISTRATION,
+        ).add_paragraph(f"Hei, {self.user.first_name}!").add_paragraph(
+            f"Du har blitt meldt av {self.event.title} og vil bli refundert."
+        ).add_paragraph(
+            "Du vil få pengene tilbake på kontoen din innen 2 til 3 virkedager. I enkelte tilfeller, avhengig av bank, tar det inntil 10 virkedager."
+        ).add_paragraph(
+            f"Hvis det skulle oppstå noen problemer så kontakt oss på [email protected]. Ditt ordrenummer er {order.order_id}."
+        ).send()
+
     def should_swap_with_non_prioritized_user(self):
         return (
             self.is_on_wait
@@ -279,6 +335,12 @@ def move_from_waiting_list_to_queue(self):
                 registrations_in_waiting_list[0],
             )
             registration_move_to_queue.is_on_wait = False
+
+            if self.event.is_paid_event:
+                registration_move_to_queue.payment_expiredate = get_payment_expiredate(
+                    self.event
+                )
+
             return registration_move_to_queue
 
     def move_from_queue_to_waiting_list(self):