Feriennet: Fix problem with selecting user for manual booking

- The dropdown for the users now pre-selects the correct user again.
- The users are now displayed correctly again and can be selected

TYPE: Bugfix
LINK: PRO-1481

Author: BreathingFlesh

src/onegov/feriennet/forms/billing.py

@@ -19,7 +19,6 @@
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from decimal import Decimal
-    from sqlalchemy.orm import Query
 
 
 class BillingForm(Form):
@@ -108,14 +107,14 @@ def text(self) -> str | None:
         return self.booking_text.data
 
     @property
-    def available_usernames(self) -> Query[tuple[str, str]]:
-        return (
-            self.usercollection.query()
+    def available_usernames(self) -> list[tuple[str, str]]:
+        query = (self.usercollection.query()
             .with_entities(User.username, User.realname)
             .filter(func.trim(func.coalesce(User.realname, '')) != '')
             .filter(User.active == True)
-            .order_by(func.unaccent(func.lower(User.realname)))
-        )
+            .order_by(func.unaccent(func.lower(User.realname))))
+
+        return [(value, title) for value, title in query]
 
     @property
     def users(self) -> tuple[str, ...]:

tests/onegov/activity/conftest.py

@@ -255,8 +255,9 @@ def add_user(
         user.data['email'] = email if email else ''
 
         if complete_profile:
-            user.realname = (
-                f'{self.faker.first_name()}\u00A0{self.faker.last_name()}')
+            if user.realname is None:
+                user.realname = (f'{self.faker.first_name()}'
+                                f'\u00A0{self.faker.last_name()}')
             user.data = user.data or {}
             user.data['salutation'] = self.faker.random_element(('mr', 'ms'))
             user.data['address'] = self.faker.address()

tests/onegov/feriennet/test_views.py

@@ -3789,3 +3789,45 @@ def test_admin_user_no_delete_button(
 
     # Check that delete button is not present for admin users
     assert page.pyquery('a.delete-link').length == 0
+
+
+def test_add_manual_booking(client: Client, scenario: Scenario) -> None:
+    scenario.add_period(title="2019", confirmed=True, finalized=False)
+    scenario.add_activity(title="Fishing", state='accepted')
+    scenario.add_occasion(cost=100)
+    scenario.add_user(username='tom@example.org', role='member',
+                      realname="Tom",
+    phone="000 000 00 11", email="tom@example.org")
+    scenario.add_attendee(name="Dustin")
+    scenario.add_booking(state='accepted', cost=100)
+    scenario.commit()
+
+    client.login_admin()
+
+    settings = client.get('/feriennet-settings')
+    settings.form['bank_account'] = 'CH6309000000250097798'
+    settings.form['bank_beneficiary'] = 'Initech'
+    settings.form.submit()
+
+    page = client.get('/billing')
+    page.form['confirm'] = 'yes'
+    page.form['sure'] = 'yes'
+    page.form.submit()
+
+    page = client.get('/billing')
+
+    form = page.click('Manuelle Buchung hinzufügen')
+    form.form['username'] = 'tom@example.org'
+    form.form['booking_text'] = 'Discount for being nice to the admin'
+    form.form['discount'] = '20'
+    form.form.submit()
+
+    page_url = (
+        client.get('/billing')
+        .pyquery('.item-header + div')
+        .attr('ic-get-from')
+    )
+
+    page = client.get(page_url)
+    assert 'Tom' in page
+    assert 'Discount for being nice to the admin' in page