From 565808fd95b0103e7282c68eaee5837e7e96d192 Mon Sep 17 00:00:00 2001
From: Jannis Portmann <jannisp@student.ethz.ch>
Date: Sun, 15 Oct 2023 01:04:59 +0200
Subject: [PATCH 1/4] Use first entry if multiple PLZs returned

---
 pflaenzli/pflaenzli/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pflaenzli/pflaenzli/views.py b/pflaenzli/pflaenzli/views.py
index beb492c..c4c2973 100644
--- a/pflaenzli/pflaenzli/views.py
+++ b/pflaenzli/pflaenzli/views.py
@@ -59,7 +59,8 @@ def offer_detail(request, offer_id):
             if offer.zipcode == request.user.zipcode:
                 dist = 0
             else:
-                dist = calculate_distance(Plz.objects.get(plz=offer.zipcode), Plz.objects.get(plz=request.user.zipcode))
+                dist = calculate_distance(Plz.objects.filter(plz=offer.zipcode)[
+                                          0], Plz.objects.filter(plz=request.user.zipcode)[0])
         else:
             dist = None
     else:

From 5040d139b57c201cbf5e4b450361013e6b70c62b Mon Sep 17 00:00:00 2001
From: Jannis Portmann <jannisp@student.ethz.ch>
Date: Sun, 15 Oct 2023 17:28:16 +0200
Subject: [PATCH 2/4] Handle multiple locations with same PLZ

---
 pflaenzli/pflaenzli/utils/distance.py |  5 ++++-
 pflaenzli/pflaenzli/views.py          | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pflaenzli/pflaenzli/utils/distance.py b/pflaenzli/pflaenzli/utils/distance.py
index df0dea7..9e83b74 100644
--- a/pflaenzli/pflaenzli/utils/distance.py
+++ b/pflaenzli/pflaenzli/utils/distance.py
@@ -7,7 +7,10 @@ def calculate_distance(plz_1: Plz, plz_2: Plz):
     if plz_1 == plz_2:
         return 0
 
-    dist = round(distance((plz_1.lat, plz_1.lon), (plz_2.lat, plz_2.lon)).kilometers)
+    try:
+        dist = round(distance((plz_1.lat, plz_1.lon), (plz_2.lat, plz_2.lon)).kilometers)
+    except AttributeError:
+        return None
 
     return None if dist > 400 else dist
 
diff --git a/pflaenzli/pflaenzli/views.py b/pflaenzli/pflaenzli/views.py
index c4c2973..766c188 100644
--- a/pflaenzli/pflaenzli/views.py
+++ b/pflaenzli/pflaenzli/views.py
@@ -59,8 +59,10 @@ def offer_detail(request, offer_id):
             if offer.zipcode == request.user.zipcode:
                 dist = 0
             else:
-                dist = calculate_distance(Plz.objects.filter(plz=offer.zipcode)[
-                                          0], Plz.objects.filter(plz=request.user.zipcode)[0])
+                user_plz = get_single_plz(request.user.zipcode)
+                offer_plz = get_single_plz(offer.zipcode)
+
+                dist = calculate_distance(offer_plz, user_plz)
         else:
             dist = None
     else:
@@ -194,6 +196,11 @@ def register_user(request):
     return render(request, "basic_form.html", {"form": form, "button_label": _("Register"), "title": _("Registeration"), "umami_event": "User registration", "form_note": mark_safe(_('Please note the <a href="/imprint">privacy policy</a>'))})
 
 
+def get_single_plz(plz):
+    p = Plz.objects.filter(plz=plz)
+    return p[0] if len(p) >= 1 else None
+
+
 def save_language(request):
     referer_url = request.META.get('HTTP_REFERER')
     response = redirect(referer_url)

From ac2403bfb80fae01636bf4550c1ca8a9dac5bfe4 Mon Sep 17 00:00:00 2001
From: Jannis Portmann <jannisp@student.ethz.ch>
Date: Sun, 15 Oct 2023 17:29:10 +0200
Subject: [PATCH 3/4] Display information in rows instead of columns

---
 pflaenzli/pflaenzli/templates/offer/detail.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pflaenzli/pflaenzli/templates/offer/detail.html b/pflaenzli/pflaenzli/templates/offer/detail.html
index d4dba70..218d7ef 100644
--- a/pflaenzli/pflaenzli/templates/offer/detail.html
+++ b/pflaenzli/pflaenzli/templates/offer/detail.html
@@ -21,21 +21,21 @@
             <h1 class="mb-3">
                 {{ offer.title }}<span class="ms-2 badge text-bg-secondary">{{ offer.get_category_display }}</span>
             </h1>
-            <div class="mb-3 d-flex column-gap-2">
-                <p class="mr-3">
-                    <i class="fas fa-user"></i>
+            <div class="mb-3 d-flex flex-column">
+                <p class="mb-1">
+                    <i class="fas fa-user me-1"></i>
                     {% if offer.user == user %}
                         {% trans "You" %}
                     {% else %}
                         {{ offer.user.username }}
                     {% endif %}
                 </p>
-                <p class="mr-3">
-                    {% with plz=offer|get_plz %}<i class="fas fa-map-marker-alt"></i> {{ offer.zipcode }} {{ plz.name }}{% endwith %}
+                <p class="mb-1">
+                    {% with plz=offer|get_plz %}<i class="fas fa-map-marker-alt me-1"></i> {{ offer.zipcode }} {{ plz.name }}{% endwith %}
                 </p>
                 {% if dist %}
-                    <p class="pr-3">
-                        <i class="fas fa-map-signs mr-1"></i> ca. {{ dist }} km
+                    <p class="mb-1">
+                        <i class="fas fa-map-signs me-1"></i> ca. {{ dist }} km
                     </p>
                 {% endif %}
             </div>

From 2707916d2f1d2d2d646a849e47efc5ec2f1f4226 Mon Sep 17 00:00:00 2001
From: Jannis Portmann <jannisp@student.ethz.ch>
Date: Sun, 15 Oct 2023 17:29:26 +0200
Subject: [PATCH 4/4] Add reminder for plzindex

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 88cd6e9..48f68d7 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,12 @@ Searching with filters such as:
 | Name         | `string`      | textfield  |
 | Category     | `Category`    | dropdown   |
 
+## Setup
+When deploying, don't forget to pull the PLZ index and save it to the database using
+```
+python manage.py getplzindex --force
+```
+
 ## Development
 To get started with development, see [DEVELOPMENT.md](DEVELOPMENT.md)