From 2c84f1a72f1cf51998dea6687514a08d904eebc0 Mon Sep 17 00:00:00 2001
From: Christiaan de Die le Clercq <christiaanddlc@q42.nl>
Date: Fri, 18 Apr 2025 23:52:06 +0200
Subject: [PATCH 1/4] WIP: Room type and max users validation

---
 pretix_roomsharing/checkoutflow.py            | 58 ++++++++++++++++++-
 .../pretix_roomsharing/settings.html          |  6 ++
 pretix_roomsharing/views.py                   | 38 ++++++++++--
 3 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/pretix_roomsharing/checkoutflow.py b/pretix_roomsharing/checkoutflow.py
index 78d1d24..cbf6c56 100644
--- a/pretix_roomsharing/checkoutflow.py
+++ b/pretix_roomsharing/checkoutflow.py
@@ -277,8 +277,62 @@ def is_completed(self, request, warn=False):
                     .values("order__all_positions__subevent")
                     .distinct()
                 )
-                # TODO: Validation of same room type
-                # TODO: Validation of max room quantity?
+                # Validation of max people
+                if "check_max_people" in self.request.event.settings.roomsharing__validation_option:
+                    max_people = None
+                    for cartPosition in self.get_cart()["positions"]:
+                        item_id = str(cartPosition.item.id)
+                        max_people_setting_key = f"roomsharing__max_people_{item_id}"
+                        if max_people_setting_key in self.request.event.settings:
+                            max_people = self.request.event.settings[max_people_setting_key]
+                            break
+
+                    if max_people is not None and len(room.orderrooms.all()) >= int(max_people):
+                        if warn:
+                            messages.warning(
+                                request,
+                                _(
+                                    """
+                                    The room you requested to join is already full.
+                                    Please choose a different room.
+                                """
+                                ),
+                            )
+                        return False
+                
+                # Validation of ticket type
+                if "check_ticket_type" in self.request.event.settings.roomsharing__validation_option:
+                    room_ticket_types = set(
+                        c["order__all_positions__item"]
+                        for c in room.orderrooms.filter(
+                            order__all_positions__canceled=False
+                        )
+                        .values("order__all_positions__item")
+                        .distinct()
+                    )
+                    cart_ticket_types = set(
+                        c["item"]
+                        for c in get_cart(request).values("item").distinct()
+                    )
+                    if any(c not in room_ticket_types for c in cart_ticket_types):
+                        if warn:
+                            messages.warning(
+                                request,
+                                _(
+                                    """
+                                    You requested to join a room that participates in "{room_ticket_type}",
+                                    while you chose to participate in "{cart_ticket_type}".
+                                    Please choose a different room.
+                                """
+                                ).format(
+                                    room_ticket_type=room.name,
+                                    cart_ticket_type=SubEvent.objects.get(
+                                        pk=list(cart_ticket_types)[0]
+                                    ).name,
+                                ),
+                            )
+                        return False
+
                 if room_subevents:
                     cart_subevents = set(
                         c["subevent"]
diff --git a/pretix_roomsharing/templates/pretix_roomsharing/settings.html b/pretix_roomsharing/templates/pretix_roomsharing/settings.html
index 967ccc2..cb8eae6 100644
--- a/pretix_roomsharing/templates/pretix_roomsharing/settings.html
+++ b/pretix_roomsharing/templates/pretix_roomsharing/settings.html
@@ -11,6 +11,12 @@ <h1>{% trans "Roomsharing Settings" %}</h1>
             {% bootstrap_form_errors form %}
             <p>{% trans "Selecting a product here requires room shares to be the same product. You can get around this by using bundled products and selecting one of those here." %}</p>
             {% bootstrap_field form.roomsharing__products layout="control" %}
+            {% for field in form %}
+                {% if field.name.startswith "roomsharing__max_people_" %}
+                    {% bootstrap_field field layout="control" %}
+                {% endif %}
+            {% endfor %}
+            {% bootstrap_field form.roomsharing__validation_options layout="control" %}
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
diff --git a/pretix_roomsharing/views.py b/pretix_roomsharing/views.py
index 5388da4..274ccd1 100644
--- a/pretix_roomsharing/views.py
+++ b/pretix_roomsharing/views.py
@@ -41,16 +41,44 @@ class RoomsharingSettingsForm(SettingsForm):
         widget=CheckboxSelectMultiple,
     )
 
+    roomsharing__validation_options = forms.MultipleChoiceField(
+        choices=[
+            ("check_max_people", _("Check if the room has the same maximum number of people")),
+            ("check_ticket_type", _("Check if the room type is the same ticket type")),
+        ],
+        label=_("Validation Options"),
+        required=False,
+        widget=forms.CheckboxSelectMultiple,
+    )
+
     def __init__(self, *args, **kwargs):
         event = kwargs.get("obj")
         super().__init__(*args, **kwargs)
 
-        choices = (
-            (str(i["id"]), i["name"]) for i in event.items.values("name", "id").all()
-        )
-
+        choices = [(str(i["id"]), i["name"]) for i in event.items.values("name", "id").all()]
         self.fields["roomsharing__products"].choices = choices
-        #self.initial["roomsharing__products"] = event.settings.roomsharing__products
+
+        for item_id, item_name in choices:
+            field_name = f"roomsharing__max_people_{item_id}"
+            self.fields[field_name] = forms.IntegerField(
+                label=f"Max people for {item_name}",
+                required=False,
+                initial=1,
+            )
+
+    def clean(self):
+        cleaned_data = super().clean()
+        selected_products = cleaned_data.get("roomsharing__products", [])
+
+        for item_id in selected_products:
+            field_name = f"roomsharing__max_people_{item_id}"
+            max_people = cleaned_data.get(field_name)
+
+        if max_people is not None:
+            if max_people <= 0:
+                self.add_error(field_name, "The maximum number of people must be a positive integer.")
+
+        return cleaned_data
 
 
 class SettingsView(EventSettingsViewMixin, EventSettingsFormView):

From 68d91e8753937080b206973619d50304c745824a Mon Sep 17 00:00:00 2001
From: Christiaan de Die le Clercq <christiaanddlc@q42.nl>
Date: Sat, 19 Apr 2025 00:04:26 +0200
Subject: [PATCH 2/4] Version 0.1.14

---
 pretix_roomsharing/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pretix_roomsharing/__init__.py b/pretix_roomsharing/__init__.py
index 3cb7d95..fb69db9 100644
--- a/pretix_roomsharing/__init__.py
+++ b/pretix_roomsharing/__init__.py
@@ -1 +1 @@
-__version__ = "0.1.13"
+__version__ = "0.1.14"

From 5f339c3086604b03c6cc03ec974fc9ba407f2fc5 Mon Sep 17 00:00:00 2001
From: Christiaan de Die le Clercq <christiaanddlc@q42.nl>
Date: Sat, 19 Apr 2025 01:22:42 +0200
Subject: [PATCH 3/4] Update CI. Fix some things regarding validation

---
 .github/workflows/style.yml                   | 20 +++----
 .github/workflows/tests.yml                   |  4 +-
 MANIFEST.in                                   |  1 +
 pretix_roomsharing/checkoutflow.py            | 40 +++++++------
 pretix_roomsharing/signals.py                 |  7 +--
 .../pretix_roomsharing/settings.html          | 14 +++--
 pretix_roomsharing/templatetags/room_tags.py  |  5 ++
 pretix_roomsharing/views.py                   | 57 ++++++++++++-------
 8 files changed, 86 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index e6477b7..3095e5f 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -18,10 +18,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
@@ -39,10 +39,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
@@ -61,10 +61,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
@@ -83,10 +83,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
@@ -105,10 +105,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 504eec4..21fc7bc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,10 +16,10 @@ jobs:
     name: Tests
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
diff --git a/MANIFEST.in b/MANIFEST.in
index 24f1396..ed8c294 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,3 +3,4 @@ recursive-include pretix_roomsharing/templates *
 recursive-include pretix_roomsharing/locale *
 include LICENSE
 exclude .gitlab-ci.yml
+exclude renovate.json
\ No newline at end of file
diff --git a/pretix_roomsharing/checkoutflow.py b/pretix_roomsharing/checkoutflow.py
index cbf6c56..bb9d4ec 100644
--- a/pretix_roomsharing/checkoutflow.py
+++ b/pretix_roomsharing/checkoutflow.py
@@ -29,9 +29,9 @@ class RoomCreateForm(forms.Form):
     password = forms.CharField(
         max_length=190,
         label=_("Room password"),
-        min_length=3, 
+        min_length=3,
         widget=forms.PasswordInput,
-        required=False
+        required=False,
     )
 
     def __init__(self, *args, **kwargs):
@@ -205,10 +205,12 @@ def create_form(self):
             prefix="create",
             initial=initial,
             current=current,
-            data=self.request.POST
-            if self.request.method == "POST"
-            and self.request.POST.get("room_mode") == "create"
-            else None,
+            data=(
+                self.request.POST
+                if self.request.method == "POST"
+                and self.request.POST.get("room_mode") == "create"
+                else None
+            ),
         )
 
     @cached_property
@@ -232,10 +234,12 @@ def join_form(self):
             event=self.event,
             prefix="join",
             initial=initial,
-            data=self.request.POST
-            if self.request.method == "POST"
-            and self.request.POST.get("room_mode") == "join"
-            else None,
+            data=(
+                self.request.POST
+                if self.request.method == "POST"
+                and self.request.POST.get("room_mode") == "join"
+                else None
+            ),
         )
 
     @cached_property
@@ -278,16 +282,20 @@ def is_completed(self, request, warn=False):
                     .distinct()
                 )
                 # Validation of max people
-                if "check_max_people" in self.request.event.settings.roomsharing__validation_option:
+                if self.request.event.settings.roomsharing__check_max_people:
                     max_people = None
                     for cartPosition in self.get_cart()["positions"]:
                         item_id = str(cartPosition.item.id)
                         max_people_setting_key = f"roomsharing__max_people_{item_id}"
                         if max_people_setting_key in self.request.event.settings:
-                            max_people = self.request.event.settings[max_people_setting_key]
+                            max_people = self.request.event.settings[
+                                max_people_setting_key
+                            ]
                             break
 
-                    if max_people is not None and len(room.orderrooms.all()) >= int(max_people):
+                    if max_people is not None and len(room.orderrooms.all()) >= int(
+                        max_people
+                    ):
                         if warn:
                             messages.warning(
                                 request,
@@ -299,9 +307,8 @@ def is_completed(self, request, warn=False):
                                 ),
                             )
                         return False
-                
                 # Validation of ticket type
-                if "check_ticket_type" in self.request.event.settings.roomsharing__validation_option:
+                if self.request.event.settings.roomsharing__check_ticket_type:
                     room_ticket_types = set(
                         c["order__all_positions__item"]
                         for c in room.orderrooms.filter(
@@ -311,8 +318,7 @@ def is_completed(self, request, warn=False):
                         .distinct()
                     )
                     cart_ticket_types = set(
-                        c["item"]
-                        for c in get_cart(request).values("item").distinct()
+                        c["item"] for c in get_cart(request).values("item").distinct()
                     )
                     if any(c not in room_ticket_types for c in cart_ticket_types):
                         if warn:
diff --git a/pretix_roomsharing/signals.py b/pretix_roomsharing/signals.py
index 8c2fe3d..9414a63 100644
--- a/pretix_roomsharing/signals.py
+++ b/pretix_roomsharing/signals.py
@@ -116,10 +116,7 @@ def order_info(sender: Event, order: Order, **kwargs):
     # Show link for user to change room
     order_has_room = False
     for orderPosition in order.positions.all():
-        if (
-            str(orderPosition.item.id)
-            in sender.settings.roomsharing__products
-        ):
+        if str(orderPosition.item.id) in sender.settings.roomsharing__products:
             order_has_room = True
     ctx["order_has_room"] = order_has_room
 
@@ -237,4 +234,4 @@ def control_order_search(sender, request, **kwargs):
 except ImportError:
     pass
 
-settings_hierarkey.add_default('roomsharing__products', None, list)
\ No newline at end of file
+settings_hierarkey.add_default("roomsharing__products", None, list)
diff --git a/pretix_roomsharing/templates/pretix_roomsharing/settings.html b/pretix_roomsharing/templates/pretix_roomsharing/settings.html
index cb8eae6..0ec7ec2 100644
--- a/pretix_roomsharing/templates/pretix_roomsharing/settings.html
+++ b/pretix_roomsharing/templates/pretix_roomsharing/settings.html
@@ -1,6 +1,7 @@
 {% extends "pretixcontrol/event/settings_base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
+{% load room_tags %}
 {% block title %} {% trans "Roomsharing Settings" %} {% endblock %}
 {% block inside %}
   <h1>{% trans "Roomsharing Settings" %}</h1>
@@ -12,12 +13,13 @@ <h1>{% trans "Roomsharing Settings" %}</h1>
             <p>{% trans "Selecting a product here requires room shares to be the same product. You can get around this by using bundled products and selecting one of those here." %}</p>
             {% bootstrap_field form.roomsharing__products layout="control" %}
             {% for field in form %}
-                {% if field.name.startswith "roomsharing__max_people_" %}
-                    {% bootstrap_field field layout="control" %}
-                {% endif %}
-            {% endfor %}
-            {% bootstrap_field form.roomsharing__validation_options layout="control" %}
-        </fieldset>
+            {% if field.name|startswith:"roomsharing__max_people_" %}
+                {% bootstrap_field field layout="control" %}
+            {% endif %}
+        {% endfor %}
+        {% bootstrap_field form.roomsharing__check_max_people layout="control" %}
+        {% bootstrap_field form.roomsharing__check_ticket_type layout="control" %}
+    </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}
diff --git a/pretix_roomsharing/templatetags/room_tags.py b/pretix_roomsharing/templatetags/room_tags.py
index 4d28c29..9bc08dc 100644
--- a/pretix_roomsharing/templatetags/room_tags.py
+++ b/pretix_roomsharing/templatetags/room_tags.py
@@ -14,3 +14,8 @@ def sum_filter(value):
         )
 
     return sum(value)
+
+
+@register.filter(name="startswith")
+def startswith(value, prefix):
+    return value.startswith(prefix)
diff --git a/pretix_roomsharing/views.py b/pretix_roomsharing/views.py
index 274ccd1..40ae500 100644
--- a/pretix_roomsharing/views.py
+++ b/pretix_roomsharing/views.py
@@ -41,21 +41,23 @@ class RoomsharingSettingsForm(SettingsForm):
         widget=CheckboxSelectMultiple,
     )
 
-    roomsharing__validation_options = forms.MultipleChoiceField(
-        choices=[
-            ("check_max_people", _("Check if the room has the same maximum number of people")),
-            ("check_ticket_type", _("Check if the room type is the same ticket type")),
-        ],
-        label=_("Validation Options"),
+    roomsharing__check_max_people = forms.BooleanField(
+        label=_("Check if the room has the same maximum number of people"),
+        required=False,
+    )
+
+    roomsharing__check_ticket_type = forms.BooleanField(
+        label=_("Check if the room type is the same ticket type"),
         required=False,
-        widget=forms.CheckboxSelectMultiple,
     )
 
     def __init__(self, *args, **kwargs):
         event = kwargs.get("obj")
         super().__init__(*args, **kwargs)
 
-        choices = [(str(i["id"]), i["name"]) for i in event.items.values("name", "id").all()]
+        choices = [
+            (str(i["id"]), i["name"]) for i in event.items.values("name", "id").all()
+        ]
         self.fields["roomsharing__products"].choices = choices
 
         for item_id, item_name in choices:
@@ -76,7 +78,10 @@ def clean(self):
 
         if max_people is not None:
             if max_people <= 0:
-                self.add_error(field_name, "The maximum number of people must be a positive integer.")
+                self.add_error(
+                    field_name,
+                    "The maximum number of people must be a positive integer.",
+                )
 
         return cleaned_data
 
@@ -226,10 +231,12 @@ def change_form(self):
         return RoomChangePasswordForm(
             event=self.request.event,
             prefix="change",
-            data=self.request.POST
-            if self.request.method == "POST"
-            and self.request.POST.get("room_mode") == "change"
-            else None,
+            data=(
+                self.request.POST
+                if self.request.method == "POST"
+                and self.request.POST.get("room_mode") == "change"
+                else None
+            ),
         )
 
     @cached_property
@@ -237,10 +244,12 @@ def create_form(self):
         return RoomCreateForm(
             event=self.request.event,
             prefix="create",
-            data=self.request.POST
-            if self.request.method == "POST"
-            and self.request.POST.get("room_mode") == "create"
-            else None,
+            data=(
+                self.request.POST
+                if self.request.method == "POST"
+                and self.request.POST.get("room_mode") == "create"
+                else None
+            ),
         )
 
     @cached_property
@@ -248,10 +257,12 @@ def join_form(self):
         return RoomJoinForm(
             event=self.request.event,
             prefix="join",
-            data=self.request.POST
-            if self.request.method == "POST"
-            and self.request.POST.get("room_mode") == "join"
-            else None,
+            data=(
+                self.request.POST
+                if self.request.method == "POST"
+                and self.request.POST.get("room_mode") == "join"
+                else None
+            ),
         )
 
     def get_context_data(self, **kwargs):
@@ -424,7 +435,9 @@ def delete(self, request, *args, **kwargs):
 
 class StatsMixin:
     def get_ticket_stats(self, event):
-        qs = OrderPosition.objects.filter(order__event=event,).annotate(
+        qs = OrderPosition.objects.filter(
+            order__event=event,
+        ).annotate(
             has_room=Exists(OrderRoom.objects.filter(order_id=OuterRef("order_id")))
         )
         return [

From 75184093f95d1a1f4d1f11f24f3cb14ece9ab195 Mon Sep 17 00:00:00 2001
From: Christiaan de Die le Clercq <christiaanddlc@q42.nl>
Date: Sat, 19 Apr 2025 01:47:42 +0200
Subject: [PATCH 4/4] Cleanup

---
 pretix_roomsharing/checkoutflow.py | 16 ++++++++--------
 pretix_roomsharing/views.py        |  6 +-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pretix_roomsharing/checkoutflow.py b/pretix_roomsharing/checkoutflow.py
index bb9d4ec..e884506 100644
--- a/pretix_roomsharing/checkoutflow.py
+++ b/pretix_roomsharing/checkoutflow.py
@@ -273,14 +273,6 @@ def is_completed(self, request, warn=False):
                 room = Room.objects.get(
                     event=self.event, pk=cart_session(request)["room_join"]
                 )
-                room_subevents = set(
-                    c["order__all_positions__subevent"]
-                    for c in room.orderrooms.filter(
-                        order__all_positions__canceled=False
-                    )
-                    .values("order__all_positions__subevent")
-                    .distinct()
-                )
                 # Validation of max people
                 if self.request.event.settings.roomsharing__check_max_people:
                     max_people = None
@@ -339,6 +331,14 @@ def is_completed(self, request, warn=False):
                             )
                         return False
 
+                room_subevents = set(
+                    c["order__all_positions__subevent"]
+                    for c in room.orderrooms.filter(
+                        order__all_positions__canceled=False
+                    )
+                    .values("order__all_positions__subevent")
+                    .distinct()
+                )
                 if room_subevents:
                     cart_subevents = set(
                         c["subevent"]
diff --git a/pretix_roomsharing/views.py b/pretix_roomsharing/views.py
index 40ae500..7eeb335 100644
--- a/pretix_roomsharing/views.py
+++ b/pretix_roomsharing/views.py
@@ -113,6 +113,7 @@ class RoomChangePasswordForm(forms.Form):
         label=_("New room password"),
         help_text=_("Optional"),
         min_length=3,
+        widget=forms.PasswordInput,
         required=False,
     )
 
@@ -281,11 +282,6 @@ def get_context_data(self, **kwargs):
 
         return ctx
 
-    def dispatch(self, request, *args, **kwargs):
-        self.request = request
-
-        return super().dispatch(request, *args, **kwargs)
-
 
 class ControlRoomForm(forms.ModelForm):
     class Meta: