feat: add link to original content

Add script to upload data of animal shelters

.coveragerc

@@ -0,0 +1,4 @@
+[run]
+omit =
+    */migrations/*
+    */tests/*

README.md

@@ -77,6 +77,26 @@ docker push moanos/notfellchen:latest
 docker run -p8000:7345 moanos/notfellchen:latest
 ```
 
+## Testing
+
+Tests can be run with
+
+```zsh
+nf test src
+```
+
+If you want to report on code coverage run
+
+```zsh
+coverage run --source='.' src/manage.py test src
+```
+
+and
+
+```
+coverage report
+```
+
 ## Geocoding
 
 Geocoding services (search map data by name, address or postcode) are provided via the

docs/API/index.rst

@@ -36,6 +36,11 @@ An application can then send this token in the request header for authorization.
 Endpoints
 ---------
 
+All Endpoints are documented at  https://notfellchen.org/api/schema/swagger-ui/ or at https://notfellchen.org/api/schema/redoc/ if you prefer redoc.
+The OpenAI schema can be downloaded at https://notfellchen.org/api/schema/
+
+Examples are documented here.
+
 Get Adoption Notices
 ++++++++++++++++++++
 

docs/dev/contributing.rst

@@ -5,7 +5,7 @@ Report a bug
 ^^^^^^^^^^^^
 
 To report a bug, file an issue on `Github
-<https://codeberg.org/moanos/notfellchen/issues>`_
+<https://github.com/moan0s/notfellchen/issues>`_
 
 Try to include the following information:
 
@@ -29,7 +29,7 @@ To contribute simply clone the directory, make your changes and file a
 pull request.
 
 If you want to know what can be done, have a look at the current `Github
-<https://codeberg.org/moanos/notfellchen/issues>`_.
+<https://github.com/moan0s/notfellchen/issues>`_.
 
 Get in touch!
 ^^^^^^^^^^^^^

docs/dev/release.rst

@@ -5,8 +5,7 @@ What qualifies as release?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 A new release should be announced when a significant number functions, bugfixes or other improvements to the software
-is made. Usually this indicates a minor release.
-Major releases are yet to be determined.
+is made. Notfellchen follows `Semantic Versioning <https://semver.org/>`_.
 
 What should be done before a release?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -14,7 +13,7 @@ What should be done before a release?
 Tested basic functions
 ######################
 
-Run :command:`pytest`
+Run :command:`nf test src`
 
 Test upgrade on a copy of a production database
 ###############################################
@@ -38,4 +37,4 @@ Do a final commit on this change, and tag the commit as release with appropriate
     git tag -a v1.0.0 -m "Releasing version v1.0.0"
     git push origin v1.0.0
 
-Make sure the tag is visible on Codeberg and celebrate 🥳
+Make sure the tag is visible on GitHub/Codeberg and celebrate 🥳

pyproject.toml

@@ -24,14 +24,12 @@ classifiers = [
 ]
 dependencies = [
     "Django",
-    "coverage",
     "codecov",
     "sphinx",
     "sphinx-rtd-theme",
     "gunicorn",
     "fontawesomefree",
     "whitenoise",
-    "model_bakery",
     "markdown",
     "Pillow",
     "django-registration",
@@ -48,6 +46,8 @@ dynamic = ["version", "readme"]
 [project.optional-dependencies]
 develop = [
     "pytest",
+    "coverage",
+    "model_bakery",
 ]
 
 [project.urls]

scripts/upload_animal_shelters.py

@@ -0,0 +1,97 @@
+import argparse
+import json
+import os
+
+import requests
+
+DEFAULT_OSM_DATA_FILE = "osm_data.geojson"
+
+
+def parse_args():
+    """Parse command-line arguments."""
+    parser = argparse.ArgumentParser(description="Upload animal shelter data to the Notfellchen API.")
+    parser.add_argument("--api-token", type=str, help="API token for authentication.")
+    parser.add_argument("--instance", type=str, help="API instance URL.")
+    parser.add_argument("--data-file", type=str, help="Path to the GeoJSON file containing (only) animal shelters.")
+    return parser.parse_args()
+
+
+def get_config():
+    """Get configuration from environment variables or command-line arguments."""
+    args = parse_args()
+
+    api_token = args.api_token or os.getenv("NOTFELLCHEN_API_TOKEN")
+    instance = args.instance or os.getenv("NOTFELLCHEN_INSTANCE")
+    data_file = args.data_file or os.getenv("NOTFELLCHEN_DATA_FILE", DEFAULT_OSM_DATA_FILE)
+
+    if not api_token or not instance:
+        raise ValueError("API token and instance URL must be provided via environment variables or CLI arguments.")
+
+    return api_token, instance, data_file
+
+
+def load_osm_data(file_path):
+    """Load OSM data from a GeoJSON file."""
+    with open(file_path, "r", encoding="utf-8") as file:
+        data = json.load(file)
+    return data
+
+
+def load_osm_data(file_path):
+    #Load OSM data from a GeoJSON file.
+    with open(file_path, "r", encoding="utf-8") as file:
+        data = json.load(file)
+    return data
+
+
+def transform_osm_data(feature):
+    #Transform a single OSM feature into the API payload format
+    prop = feature.get("properties", {})
+    geometry = feature.get("geometry", {})
+
+    return {
+        "name": prop.get("name", "Unnamed Shelter"),
+        "phone": prop.get("phone"),
+        "website": prop.get("website"),
+        "opening_hours": prop.get("opening_hours"),
+        "email": prop.get("email"),
+        "location_string": f'{prop.get("addr:street", "")} {prop.get("addr:housenumber", "")} {prop.get("addr:postcode", "")} {prop.get("addr:city", "")}',
+        "external_object_id": prop.get("@id"),
+        "external_source_id": "OSM"
+    }
+
+
+def send_to_api(data, endpoint, headers):
+    # Send transformed data to the Notfellchen API.
+    response = requests.post(endpoint, headers=headers, json=data)
+    if response.status_code == 201:
+        print(f"Success: Shelter '{data['name']}' uploaded.")
+    elif response.status_code == 400:
+        print(f"Error: Shelter '{data['name']}' already exists or invalid data. {response.text}")
+    else:
+        print(f"Unexpected Error: {response.status_code} - {response.text}")
+        raise ConnectionError
+
+
+def main():
+    # Get configuration
+    api_token, instance, data_file = get_config()
+
+    # Set headers and endpoint
+    endpoint = f"{instance}/api/organizations/"
+    headers = {
+        "Authorization": f"Token {api_token}",
+        "Content-Type": "application/json"
+    }
+
+    # Step 1: Load OSM data
+    osm_data = load_osm_data(data_file)
+
+    # Step 2: Process each shelter and send it to the API
+    for feature in osm_data.get("features", []):
+        shelter_data = transform_osm_data(feature)
+        send_to_api(shelter_data, endpoint, headers)
+
+
+if __name__ == "__main__":
+    main()

src/fellchensammlung/api/views.py

@@ -16,6 +16,7 @@ from .serializers import (
 from fellchensammlung.models import Animal, RescueOrganization, AdoptionNotice, Species, Image
 from drf_spectacular.utils import extend_schema
 
+
 class AdoptionNoticeApiView(APIView):
     permission_classes = [IsAuthenticated]
 
@@ -84,7 +85,6 @@ class AdoptionNoticeApiView(APIView):
         )
 
 
-
 class AnimalApiView(APIView):
     permission_classes = [IsAuthenticated]
 
@@ -118,6 +118,7 @@ class AnimalApiView(APIView):
             )
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
+
 class RescueOrganizationApiView(APIView):
     permission_classes = [IsAuthenticated]
 
@@ -159,13 +160,14 @@ class RescueOrganizationApiView(APIView):
         """
         serializer = RescueOrgSerializer(data=request.data, context={"request": request})
         if serializer.is_valid():
-            rescue_org = serializer.save(owner=request.user)
+            rescue_org = serializer.save()
             return Response(
                 {"message": "Rescue organization created/updated successfully!", "id": rescue_org.id},
                 status=status.HTTP_201_CREATED,
             )
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
+
 class AddImageApiView(APIView):
     permission_classes = [IsAuthenticated]
 

src/fellchensammlung/migrations/0036_basenotification_read_at.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2025-01-14 06:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fellchensammlung', '0035_alter_image_alt_text_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='basenotification',
+            name='read_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Gelesen am'),
+        ),
+    ]

src/fellchensammlung/migrations/0037_alter_basenotification_title.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2025-01-14 06:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fellchensammlung', '0036_basenotification_read_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='basenotification',
+            name='title',
+            field=models.CharField(max_length=100, verbose_name='Titel'),
+        ),
+    ]

src/fellchensammlung/migrations/0038_rescueorganization_last_checked.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.4 on 2025-03-09 08:31
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fellchensammlung', '0037_alter_basenotification_title'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rescueorganization',
+            name='last_checked',
+            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Datum der letzten Prüfung'),
+            preserve_default=False,
+        ),
+    ]

src/fellchensammlung/migrations/0039_alter_rescueorganization_last_checked.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2025-03-09 16:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fellchensammlung', '0038_rescueorganization_last_checked'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rescueorganization',
+            name='last_checked',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Datum der letzten Prüfung'),
+        ),
+    ]

src/fellchensammlung/models.py

@@ -122,6 +122,7 @@ class RescueOrganization(models.Model):
     website = models.URLField(null=True, blank=True, verbose_name=_('Website'))
     updated_at = models.DateTimeField(auto_now=True)
     created_at = models.DateTimeField(auto_now_add=True)
+    last_checked = models.DateTimeField(auto_now_add=True, verbose_name=_('Datum der letzten Prüfung'))
     internal_comment = models.TextField(verbose_name=_("Interner Kommentar"), null=True, blank=True, )
     description = models.TextField(null=True, blank=True, verbose_name=_('Beschreibung'))  # Markdown allowed
     external_object_identifier = models.CharField(max_length=200, null=True, blank=True,
@@ -149,7 +150,20 @@ class RescueOrganization(models.Model):
         if self.description is None:
             return ""
         if len(self.description) > 200:
-            return self.description[:200] + f" ... [weiterlesen]({self.get_absolute_url()})"
+            return self.description[:200] + _(f" ... [weiterlesen]({self.get_absolute_url()})")
+
+    def set_checked(self):
+        self.last_checked = timezone.now()
+        self.save()
+
+    @property
+    def last_checked_hr(self):
+        time_since_last_checked = timezone.now() - self.last_checked
+        return time_since_as_hr_string(time_since_last_checked)
+
+    @property
+    def species_urls(self):
+        return SpeciesSpecificURL.objects.filter(organization=self)
 
 
 # Admins can perform all actions and have the highest trust associated with them
@@ -666,6 +680,30 @@ class Report(models.Model):
     def get_moderation_actions(self):
         return ModerationAction.objects.filter(report=self)
 
+    @property
+    def reported_content(self):
+        """
+        Dynamically fetch the reported content based on subclass.
+        The alternative would be to use the ContentType framework:
+        https://docs.djangoproject.com/en/5.1/ref/contrib/contenttypes/
+        """
+        if hasattr(self, "reportadoptionnotice"):
+            return self.reportadoptionnotice.adoption_notice
+        elif hasattr(self, "reportcomment"):
+            return self.reportcomment.reported_comment
+        return None
+
+    @property
+    def reported_content_url(self):
+        """
+        Same as reported_content, just for url
+        """
+        if hasattr(self, "reportadoptionnotice"):
+            print(self.reportadoptionnotice.adoption_notice.get_absolute_url)
+            return self.reportadoptionnotice.adoption_notice.get_absolute_url
+        elif hasattr(self, "reportcomment"):
+            return self.reportcomment.reported_comment.get_absolute_url
+        return None
 
 class ReportAdoptionNotice(Report):
     adoption_notice = models.ForeignKey("AdoptionNotice", on_delete=models.CASCADE)
@@ -674,6 +712,9 @@ class ReportAdoptionNotice(Report):
     def reported_content(self):
         return self.adoption_notice
 
+    def __str__(self):
+        return f"Report der Vermittlung {self.adoption_notice}"
+
 
 class ReportComment(Report):
     reported_comment = models.ForeignKey("Comment", on_delete=models.CASCADE)
@@ -818,7 +859,8 @@ class Comment(models.Model):
 class BaseNotification(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    title = models.CharField(max_length=100)
+    read_at = models.DateTimeField(blank=True, null=True, verbose_name=_("Gelesen am"))
+    title = models.CharField(max_length=100, verbose_name=_("Titel"))
     text = models.TextField(verbose_name="Inhalt")
     user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_('Nutzer*in'))
     read = models.BooleanField(default=False)
@@ -829,6 +871,11 @@ class BaseNotification(models.Model):
     def get_absolute_url(self):
         self.user.get_notifications_url()
 
+    def mark_read(self):
+        self.read = True
+        self.read_at = timezone.now()
+        self.save()
+
 
 class CommentNotification(BaseNotification):
     comment = models.ForeignKey(Comment, on_delete=models.CASCADE, verbose_name=_('Antwort'))

src/fellchensammlung/sitemap.py

@@ -0,0 +1,47 @@
+from django.contrib.sitemaps import Sitemap
+from django.urls import reverse
+from .models import AdoptionNotice, RescueOrganization
+
+
+class StaticViewSitemap(Sitemap):
+    priority = 0.8
+    changefreq = "weekly"
+
+    def items(self):
+        return ["index", "search", "map", "about", "rescue-organizations"]
+
+    def location(self, item):
+        return reverse(item)
+
+
+class AdoptionNoticeSitemap(Sitemap):
+    priority = 0.5
+    changefreq = "daily"
+
+    def items(self):
+        return AdoptionNotice.get_active_ANs()
+
+    def lastmod(self, obj):
+        return obj.updated_at
+
+
+class AnimalSitemap(Sitemap):
+    priority = 0.2
+    changefreq = "daily"
+
+    def items(self):
+        return AdoptionNotice.objects.all()
+
+    def lastmod(self, obj):
+        return obj.updated_at
+
+
+class RescueOrganizationSitemap(Sitemap):
+    priority = 0.3
+    changefreq = "weekly"
+
+    def items(self):
+        return RescueOrganization.objects.all()
+
+    def lastmod(self, obj):
+        return obj.updated_at

src/fellchensammlung/static/fellchensammlung/css/styles.css

@@ -259,6 +259,11 @@ a.btn, a.btn2, a.nav-link {
     border: 1px solid black;
 }
 
+.btn-small {
+    font-size: medium;
+    padding: 6px;
+}
+
 .checkmark {
     display: inline-block;
     position: relative;

src/fellchensammlung/static/robots.txt

@@ -0,0 +1,7 @@
+User-agent: *
+Disallow: /admin/
+
+User-agent: OpenAI
+Disallow: /
+
+Sitemap: https://notfellchen.org/sitemap.xml

src/fellchensammlung/tasks.py

@@ -7,7 +7,7 @@ from .mail import send_notification_email
 from .tools.admin import clean_locations, deactivate_unchecked_adoption_notices, deactivate_404_adoption_notices
 from .tools.misc import healthcheck_ok
 from .models import Location, AdoptionNotice, Timestamp
-from .tools.notifications import notify_moderators_of_AN_to_be_checked
+from .tools.notifications import notify_of_AN_to_be_checked
 from .tools.search import notify_search_subscribers
 
 
@@ -46,7 +46,7 @@ def post_adoption_notice_save(pk):
     logging.info(f"Location was added to Adoption notice {pk}")
 
     notify_search_subscribers(instance, only_if_active=True)
-    notify_moderators_of_AN_to_be_checked(instance)
+    notify_of_AN_to_be_checked(instance)
 
 @celery_app.task(name="tools.healthcheck")
 def task_healthcheck():

src/fellchensammlung/templates/fellchensammlung/partials/partial-check-rescue-org.html

@@ -0,0 +1,21 @@
+{% load i18n %}
+{% load custom_tags %}
+<div class="card">
+    <h1>
+        <a href="{{ rescue_org.get_absolute_url }}">{{ rescue_org.name }}</a>
+    </h1>
+    <i>{% translate 'Zuletzt geprüft:' %} {{ rescue_org.last_checked_hr }}</i>
+    {% if rescue_org.website %}
+        <p>{% translate "Website" %}: {{ rescue_org.website | safe }}</p>
+    {% endif %}
+    <div class="container-edit-buttons">
+        <form method="post">
+            {% csrf_token %}
+            <input type="hidden"
+                   name="rescue_organization_id"
+                   value="{{ rescue_org.pk }}">
+            <input type="hidden" name="action" value="checked">
+            <button class="btn" type="submit">{% translate "Organisation geprüft" %}</button>
+        </form>
+    </div>
+</div>

src/fellchensammlung/templates/fellchensammlung/partials/partial-report.html

@@ -1,9 +1,7 @@
 {% load i18n %}
 <div class="report card">
     <h2>
-        {% blocktranslate %}
-            Meldung von {{ report.reported_content }}
-        {% endblocktranslate %}
+        {% translate 'Meldung von ' %} <a href="{{ report.reported_content_url }}"><i>{{ report.reported_content }}</i></a>
     </h2>
     {% if report.reported_broken_rules %}
         {% translate "Regeln gegen die Verstoßen wurde" %}
@@ -13,9 +11,14 @@
             {% endfor %}
         </ul>
     {% endif %}
-    <p><b>{% translate "Kommentar zur Meldung" %}:</b>
-        {{ report.user_comment }}
+    <p>
+        {% if report.user_comment %}
+            <b>{% translate "Kommentar zur Meldung" %}:</b> {{ report.user_comment }}
+        {% else %}
+            <i>{% translate 'Es wurde kein Kommentar zur Meldung hinzugefügt.' %}</i>
+        {% endif %}
     </p>
+    {% if is_mod_or_above %}
         <div class="container-edit-buttons">
             <form action="allow" class="">
                 {% csrf_token %}
@@ -28,4 +31,5 @@
                 <button class="btn allow" type="submit">{% translate "Inhalt als gesperrt kennzeichnen" %}</button>
             </form>
         </div>
+    {% endif %}
 </div>

src/fellchensammlung/templates/fellchensammlung/rescue-organization-check.html

@@ -0,0 +1,12 @@
+{% extends "fellchensammlung/base_generic.html" %}
+{% load i18n %}
+{% block content %}
+    <h1>{% translate "Aktualitätscheck" %}</h1>
+    <p>{% translate "Überprüfe ob im Tierheim neue Vermittlungen ein Zuhause suchen" %}</p>
+    <div class="container-cards spaced">
+        <h1>{% translate 'Organisation zur Überprüfung' %}</h1>
+        {% for rescue_org in rescue_orgs %}
+            {% include "fellchensammlung/partials/partial-check-rescue-org.html" %}
+        {% endfor %}
+    </div>
+{% endblock %}

src/fellchensammlung/templates/fellchensammlung/styleguide.html

@@ -0,0 +1,102 @@
+{% extends "fellchensammlung/base_generic.html" %}
+{% load i18n %}
+{% load static %}
+{% block title %}<title>{% translate "Styleguide" %}</title>{% endblock %}
+
+{% block content %}
+    <h1>This is a heading</h1>
+    <p>And this is a short paragraph below</p>
+    <div class="container-cards">
+        <h2>Card Containers</h2>
+        <div class="card">
+            <h3>I am a card</h3>
+            <p>Cards are responsive. Use them to display multiple items of the same category</p>
+        </div>
+        <div class="card">
+            <h3>Photos</h3>
+            <p>Cards are responsive. Use them to display multiple items of the same category</p>
+            <img src="{% static 'fellchensammlung/img/example_rat_single.png' %}" alt="A rat sitting on a wooden house">
+        </div>
+    </div>
+    <div class="container-cards">
+        <form class="form-search card half" method="post">
+            <label for="inputA">Input Alpha</label>
+            <input name="inputA" maxlength="200" id="inputA">
+            <label for="inputB">Beta</label>
+            <input name="inputB" maxlength="200" id="inputB">
+            <label for="id_location_string">Ort</label>
+            <input name="location_string" id="id_location_string">
+            <ul id="results"></ul>
+            <div class="container-edit-buttons">
+                <button class="btn" type="submit" value="search" name="search">
+                    <i class="fas fa-search"></i> {% trans 'Suchen' %}
+                </button>
+                {% if searched %}
+                    {% if subscribed_search %}
+                        <button class="btn" type="submit" value="{{ subscribed_search.pk }}"
+                                name="unsubscribe_to_search">
+                            <i class="fas fa-bell-slash"></i> {% trans 'Suche nicht mehr abonnieren' %}
+                        </button>
+                    {% else %}
+                        <button class="btn" type="submit" name="subscribe_to_search">
+                            <i class="fas fa-bell"></i> {% trans 'Suche abonnieren' %}
+                        </button>
+                    {% endif %}
+                {% endif %}
+            </div>
+            {% if place_not_found %}
+                <p class="error">
+                    {% trans 'Ort nicht gefunden' %}
+                </p>
+            {% endif %}
+        </form>
+        <div class="card half">
+            {% include "fellchensammlung/partials/partial-map.html" %}
+        </div>
+    </div>
+    {% include "fellchensammlung/lists/list-adoption-notices.html" %}
+
+    <script>
+        const locationInput = document.getElementById('id_location_string');
+        const resultsList = document.getElementById('results');
+        const placeIdInput = document.getElementById('place_id');
+
+        locationInput.addEventListener('input', async function () {
+            const query = locationInput.value.trim();
+
+            if (query.length < 3) {
+                resultsList.innerHTML = ''; // Don't search for or show results if input is less than 3 characters
+                return;
+            }
+
+            try {
+                const response = await fetch(`{{ geocoding_api_url }}/?q=${encodeURIComponent(query)}&limit=5&lang=de`);
+                const data = await response.json();
+
+                if (data && data.features) {
+                    resultsList.innerHTML = ''; // Clear previous results
+
+                    const locations = data.features.slice(0, 5); // Show only the first 5 results
+
+                    locations.forEach(location => {
+                        const listItem = document.createElement('li');
+                        listItem.classList.add('result-item');
+                        listItem.textContent = geojson_to_summary(location);
+
+                        // Add event when user clicks on a result location
+                        listItem.addEventListener('click', () => {
+
+                            locationInput.value = geojson_to_searchable_string(location); // Set input field to selected location
+                            resultsList.innerHTML = ''; // Clear the results after selecting a location
+                        });
+
+                        resultsList.appendChild(listItem);
+                    });
+                }
+            } catch (error) {
+                console.error('Error fetching location data:', error);
+                resultsList.innerHTML = '<li class="result-item">Error fetching data. Please try again.</li>';
+            }
+        });
+    </script>
+{% endblock %}

src/fellchensammlung/tools/geo.py

@@ -137,7 +137,6 @@ class GeoAPI:
                 result = self.requests.get(self.api_url,
                                            {"q": location_string, "lang": language},
                                            headers=self.headers).json()
-                logging.warning(result)
                 geofeatures = GeoFeature.geofeatures_from_photon_result(result)
             else:
                 raise NotImplementedError

src/fellchensammlung/tools/notifications.py

@@ -1,11 +1,13 @@
 from fellchensammlung.models import User, AdoptionNoticeNotification, TrustLevel
 
 
-def notify_moderators_of_AN_to_be_checked(adoption_notice):
+def notify_of_AN_to_be_checked(adoption_notice):
     if adoption_notice.is_disabled_unchecked:
-        for moderator in User.objects.filter(trust_level__gt=TrustLevel.MODERATOR):
+        users_to_notify = set(User.objects.filter(trust_level__gt=TrustLevel.MODERATOR))
+        users_to_notify.add(adoption_notice.owner)
+        for user in users_to_notify:
             AdoptionNoticeNotification.objects.create(adoption_notice=adoption_notice,
-                                                      user=moderator,
+                                                      user=user,
                                                       title=f" Prüfe Vermittlung {adoption_notice}",
                                                       text=f"{adoption_notice} muss geprüft werden bevor sie veröffentlicht wird.",
                                                       )

src/fellchensammlung/urls.py

@@ -7,6 +7,15 @@ from .feeds import LatestAdoptionNoticesFeed
 from . import views
 from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView, SpectacularSwaggerView
 
+from django.contrib.sitemaps.views import sitemap
+from .sitemap import StaticViewSitemap, AdoptionNoticeSitemap, AnimalSitemap
+
+sitemaps = {
+    "static": StaticViewSitemap,
+    "vermittlungen": AdoptionNoticeSitemap,
+    "tiere": AnimalSitemap,
+}
+
 urlpatterns = [
     path("", views.index, name="index"),
     path("rss/", LatestAdoptionNoticesFeed(), name="rss"),
@@ -22,9 +31,11 @@ urlpatterns = [
     # ex: /adoption_notice/7/edit
     path("vermittlung/<int:adoption_notice_id>/edit", views.adoption_notice_edit, name="adoption-notice-edit"),
     # ex: /vermittlung/5/add-photo
-    path("vermittlung/<int:adoption_notice_id>/add-photo", views.add_photo_to_adoption_notice, name="adoption-notice-add-photo"),
+    path("vermittlung/<int:adoption_notice_id>/add-photo", views.add_photo_to_adoption_notice,
+         name="adoption-notice-add-photo"),
     # ex: /adoption_notice/2/add-animal
-    path("vermittlung/<int:adoption_notice_id>/add-animal", views.adoption_notice_add_animal, name="adoption-notice-add-animal"),
+    path("vermittlung/<int:adoption_notice_id>/add-animal", views.adoption_notice_add_animal,
+         name="adoption-notice-add-animal"),
 
     path("tierschutzorganisationen/", views.list_rescue_organizations, name="rescue-organizations"),
     path("organisation/<int:rescue_organization_id>/", views.detail_view_rescue_organization,
@@ -51,6 +62,8 @@ urlpatterns = [
 
     path("updatequeue/", views.updatequeue, name="updatequeue"),
 
+    path("organization-check/", views.rescue_organization_check, name="organization-check"),
+
     ###########
     ## USERS ##
     ###########
@@ -95,4 +108,10 @@ urlpatterns = [
     ###################
     path('external-site/', views.external_site_warning, name="external-site"),
 
+    ###############
+    ## TECHNICAL ##
+    ###############
+    path("sitemap.xml", sitemap, {"sitemaps": sitemaps}, name="django.contrib.sitemaps.views.sitemap"),
+    path("styleguide", views.styleguide, name="styleguide"),
+
 ]

src/fellchensammlung/views.py

@@ -2,6 +2,7 @@ import logging
 
 from django.contrib.auth.views import redirect_to_login
 from django.http import HttpResponseRedirect, JsonResponse, HttpResponse
+from django.http.response import HttpResponseForbidden
 from django.shortcuts import render, redirect
 from django.urls import reverse
 from django.contrib.auth.decorators import login_required
@@ -130,8 +131,10 @@ def adoption_notice_detail(request, adoption_notice_id):
             if action == "unsubscribe":
                 subscription.delete()
                 is_subscribed = False
+        elif action == "subscribe":
+            return redirect_to_login(next=request.path)
         else:
-            raise PermissionDenied
+            return HttpResponseForbidden()
     else:
         comment_form = CommentForm(instance=adoption_notice)
     context = {"adoption_notice": adoption_notice, "comment_form": comment_form, "user": request.user,
@@ -426,10 +429,13 @@ def report_detail(request, report_id, form_complete=False):
     """
     Detailed view of a report, including moderation actions
     """
-    report = Report.objects.get(pk=report_id)
+    # Prefetching reduces the number of queries to the database that are needed (see reported_content)
+    report = Report.objects.select_related("reportadoptionnotice", "reportcomment").get(pk=report_id)
     moderation_actions = ModerationAction.objects.filter(report_id=report_id)
+    is_mod_or_above = user_is_trust_level_or_above(request.user, TrustLevel.MODERATOR)
 
-    context = {"report": report, "moderation_actions": moderation_actions, "form_complete": form_complete}
+    context = {"report": report, "moderation_actions": moderation_actions,
+               "form_complete": form_complete, "is_mod_or_above": is_mod_or_above}
 
     return render(request, 'fellchensammlung/details/detail-report.html', context)
 
@@ -481,13 +487,11 @@ def my_profile(request):
                 notification = CommentNotification.objects.get(pk=notification_id)
             except CommentNotification.DoesNotExist:
                 notification = BaseNotification.objects.get(pk=notification_id)
-            notification.read = True
-            notification.save()
+            notification.mark_read()
         elif action == "notification_mark_all_read":
             notifications = CommentNotification.objects.filter(user=request.user, mark_read=False)
             for notification in notifications:
-                notification.read = True
-                notification.save()
+                notification.mark_read()
         elif action == "search_subscription_delete":
             search_subscription_id = request.POST.get("search_subscription_id")
             SearchSubscription.objects.get(pk=search_subscription_id).delete()
@@ -502,7 +506,7 @@ def my_profile(request):
 
 @user_passes_test(user_is_trust_level_or_above)
 def modqueue(request):
-    open_reports = Report.objects.filter(status=Report.WAITING)
+    open_reports = Report.objects.select_related("reportadoptionnotice", "reportcomment").filter(status=Report.WAITING)
     context = {"reports": open_reports}
     return render(request, 'fellchensammlung/modqueue.html', context=context)
 
@@ -632,3 +636,24 @@ def export_own_profile(request):
     ANs_as_json = serialize('json', ANs)
     full_json = f"{user_as_json}, {ANs_as_json}"
     return HttpResponse(full_json, content_type="application/json")
+
+
+def styleguide(request):
+
+    context = {"geocoding_api_url": settings.GEOCODING_API_URL, }
+    return render(request, 'fellchensammlung/styleguide.html', context=context)
+
+@login_required
+def rescue_organization_check(request):
+    if request.method == "POST":
+        rescue_org = RescueOrganization.objects.get(id=request.POST.get("rescue_organization_id"))
+        edit_permission = user_is_trust_level_or_above(request.user, TrustLevel.MODERATOR)
+        if not edit_permission:
+            return render(request, "fellchensammlung/errors/403.html", status=403)
+        action = request.POST.get("action")
+        if action == "checked":
+            rescue_org.set_checked()
+
+    last_checked_rescue_orgs = RescueOrganization.objects.order_by("last_checked")
+    context = {"rescue_orgs": last_checked_rescue_orgs,}
+    return render(request, 'fellchensammlung/rescue-organization-check.html', context=context)

src/notfellchen/settings.py

@@ -89,9 +89,9 @@ CELERY_RESULT_BACKEND = config.get("celery", "backend", fallback="redis://localh
 HEALTHCHECKS_URL = config.get("monitoring", "healthchecks_url", fallback=None)
 
 """ GEOCODING """
-GEOCODING_API_URL = config.get("geocoding", "api_url", fallback="https://nominatim.hyteck.de/search")
+GEOCODING_API_URL = config.get("geocoding", "api_url", fallback="https://photon.hyteck.de/api")
 # GEOCODING_API_FORMAT is allowed to be one of ['nominatim', 'photon']
-GEOCODING_API_FORMAT = config.get("geocoding", "api_format", fallback="nominatim")
+GEOCODING_API_FORMAT = config.get("geocoding", "api_format", fallback="photon")
 
 """ Tile Server """
 MAP_TILE_SERVER = config.get("map", "tile_server", fallback="https://tiles.hyteck.de")
@@ -168,6 +168,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    "django.contrib.sitemaps",
     'fontawesomefree',
     'crispy_forms',
     "crispy_bootstrap4",

src/templates/registration/login.html

@@ -10,18 +10,25 @@
     {% if user.is_authenticated %}
         <p>{% translate "Du bist bereits eingeloggt." %}</p>
     {% else %} {% if next %}
-    <p>{% translate "Bitte log dich ein um diese Seite sehen zu können." %}</p>
+        <p class="card">{% translate "Bitte log dich ein um diese Seite sehen zu können." %}</p>
     {% endif %}
     {% endif %}
 
     {% if not user.is_authenticated %}
-  <form class="card" method="post" action="{% url 'login' %}">
+        <div class="card">
+        <div class="container-edit-buttons">
+            <form method="post" action="{% url 'login' %}">
                 {% csrf_token %}
                 {{ form.as_p }}
-    <input class="btn" type="submit" value={% translate "Einloggen" %} />
+                <input class="btn" type="submit" value="{% translate 'Einloggen' %}"/>
                 <input type="hidden" name="next" value="{{ next }}"/>
             </form>
+            </div>
 
-  <p><a class="btn2" href="{% url 'password_reset' %}">{% translate "Passwort vergessen?" %}</a></p>
+            <div class="container-edit-buttons">
+                <a class="btn btn-small" href="{% url 'password_reset' %}">{% translate "Passwort vergessen?" %}</a>
+                <a class="btn btn-small" href="{% url 'django_registration_register' %}">{% translate "Registrieren" %}</a>
+            </div>
+        </div>
     {% endif %}
 {% endblock %}

src/tests/test_geo.py

@@ -27,7 +27,6 @@ class DistanceTest(TestCase):
         l_stuttgart = LocationProxy("Stuttgart")
         l_tue = LocationProxy("Tübingen")
         # Should be 30km
-        print(f"{l_stuttgart.position} -> {l_tue.position}")
         distance_tue_stuttgart = calculate_distance_between_coordinates(l_stuttgart.position, l_tue.position)
         self.assertLess(distance_tue_stuttgart, 50)
         self.assertGreater(distance_tue_stuttgart, 20)

src/tests/test_models.py

@@ -4,7 +4,7 @@ from django.utils import timezone
 from django.test import TestCase
 from model_bakery import baker
 
-from fellchensammlung.models import Announcement, Language, User, TrustLevel
+from fellchensammlung.models import Announcement, Language, User, TrustLevel, BaseNotification
 
 
 class UserTest(TestCase):
@@ -77,3 +77,21 @@ class AnnouncementTest(TestCase):
         self.assertTrue(self.announcement2 not in active_announcements)
         self.assertTrue(self.announcement4 not in active_announcements)
         self.assertTrue(self.announcement5 in active_announcements)
+
+
+class TestNotifications(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.test_user_1 = User.objects.create(username="Testuser1", password="SUPERSECRET", email="test@example.org")
+
+    def test_mark_read(self):
+        not1 = BaseNotification.objects.create(user=self.test_user_1, text="New rats to adopt", title="🔔 New Rat alert")
+        not2 = BaseNotification.objects.create(user=self.test_user_1,
+                                               text="New wombat to adopt", title="🔔 New Wombat alert")
+        not1.mark_read()
+
+        self.assertTrue(not1.read)
+        self.assertFalse(not2.read)
+        self.assertTrue((timezone.now() - timedelta(hours=1)) < not1.read_at < timezone.now())
+        self.assertIsNone(not2.read_at)
+

src/tests/test_tools_notifications.py

@@ -0,0 +1,34 @@
+from django.test import TestCase
+from model_bakery import baker
+
+from fellchensammlung.models import User, TrustLevel, Species, Location, AdoptionNotice, AdoptionNoticeNotification
+from fellchensammlung.tools.notifications import notify_of_AN_to_be_checked
+
+
+class TestNotifications(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.test_user0 = User.objects.create_user(username='testuser0',
+                                                  first_name="Admin",
+                                                  last_name="BOFH",
+                                                  password='12345')
+
+        cls.test_user1 = User.objects.create_user(username='testuser1',
+                                                  first_name="Max",
+                                                  last_name="Müller",
+                                                  password='12345')
+        cls.test_user2 = User.objects.create_user(username='testuser2',
+                                                  first_name="Miriam",
+                                                  last_name="Müller",
+                                                  password='12345')
+        cls.test_user0.trust_level = TrustLevel.ADMIN
+        cls.test_user0.save()
+
+        cls.adoption1 = baker.make(AdoptionNotice, name="TestAdoption1", owner=cls.test_user1,)
+        cls.adoption1.set_unchecked() # Could also emit notification
+
+    def test_notify_of_AN_to_be_checked(self):
+        notify_of_AN_to_be_checked(self.adoption1)
+        self.assertTrue(AdoptionNoticeNotification.objects.filter(user=self.test_user0).exists())
+        self.assertTrue(AdoptionNoticeNotification.objects.filter(user=self.test_user1).exists())
+        self.assertFalse(AdoptionNoticeNotification.objects.filter(user=self.test_user2).exists())

src/tests/test_views.py

@@ -1,198 +0,0 @@
-from django.test import TestCase
-from django.contrib.auth.models import Permission
-from django.urls import reverse
-
-from model_bakery import baker
-
-from fellchensammlung.models import Animal, Species, AdoptionNotice, User, Location, AdoptionNoticeStatus, TrustLevel
-from fellchensammlung.views import add_adoption_notice
-
-
-class AnimalAndAdoptionTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        test_user0 = User.objects.create_user(username='testuser0',
-                                              first_name="Admin",
-                                              last_name="BOFH",
-                                              password='12345')
-
-        test_user1 = User.objects.create_user(username='testuser1',
-                                              first_name="Max",
-                                              last_name="Müller",
-                                              password='12345')
-        test_user0.trust_level = TrustLevel.ADMIN
-        test_user0.save()
-
-        adoption1 = baker.make(AdoptionNotice, name="TestAdoption1", owner=test_user0)
-        rat = baker.make(Species, name="Farbratte")
-
-        rat1 = baker.make(Animal,
-                          name="Rat1",
-                          adoption_notice=adoption1,
-                          species=rat,
-                          description="Eine unglaublich süße Ratte")
-
-    def test_detail_animal(self):
-        self.client.login(username='testuser0', password='12345')
-
-        response = self.client.post(reverse('animal-detail', args="1"))
-        self.assertEqual(response.status_code, 200)
-        # Check our user is logged in
-        self.assertEqual(str(response.context['user']), 'testuser0')
-        self.assertContains(response, "Rat1")
-
-    def test_detail_animal_notice(self):
-        self.client.login(username='testuser0', password='12345')
-
-        response = self.client.post(reverse('adoption-notice-detail', args="1"))
-        self.assertEqual(response.status_code, 200)
-        # Check our user is logged in
-        self.assertEqual(str(response.context['user']), 'testuser0')
-        self.assertContains(response, "TestAdoption1")
-        self.assertContains(response, "Rat1")
-
-    def test_creating_AN_as_admin(self):
-        self.client.login(username='testuser0', password='12345')
-
-        form_data = {"name": "TestAdoption4",
-                     "species": Species.objects.first().pk,
-                     "num_animals": "2",
-                     "date_of_birth": "2024-11-04",
-                     "sex": "M",
-                     "group_only": "on",
-                     "searching_since": "2024-11-10",
-                     "location_string": "Mannheim",
-                     "description": "Blaaaa",
-                     "further_information": "https://notfellchen.org",
-                     "save-and-add-another-animal": "Speichern"}
-
-        response = self.client.post(reverse('add-adoption'), data=form_data)
-
-        self.assertTrue(response.status_code < 400)
-        self.assertTrue(AdoptionNotice.objects.get(name="TestAdoption4").is_active)
-
-
-
-class SearchTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        test_user0 = User.objects.create_user(username='testuser0',
-                                              first_name="Admin",
-                                              last_name="BOFH",
-                                              password='12345')
-        test_user0.save()
-
-        # Location of Berlin: lat 52.5170365 lon 13.3888599 PLZ 10115 (Mitte)
-
-        adoption1 = baker.make(AdoptionNotice, name="TestAdoption1")
-        adoption2 = baker.make(AdoptionNotice, name="TestAdoption2")
-        adoption3 = baker.make(AdoptionNotice, name="TestAdoption3")
-
-        berlin = Location.get_location_from_string("Berlin")
-        adoption1.location = berlin
-        adoption1.save()
-
-        stuttgart = Location.get_location_from_string("Stuttgart")
-        adoption3.location = stuttgart
-        adoption3.save()
-
-        adoption1.set_active()
-        adoption3.set_active()
-        adoption2.set_unchecked()
-
-    def test_basic_view(self):
-        response = self.client.get(reverse('search'))
-        self.assertEqual(response.status_code, 200)
-
-        self.assertContains(response, "TestAdoption1")
-        self.assertNotContains(response, "TestAdoption2")
-        self.assertContains(response, "TestAdoption3")
-
-    def test_basic_view_logged_in(self):
-        self.client.login(username='testuser0', password='12345')
-        response = self.client.get(reverse('search'))
-        self.assertEqual(response.status_code, 200)
-        # Check our user is logged in
-        self.assertEqual(str(response.context['user']), 'testuser0')
-
-        self.assertContains(response, "TestAdoption1")
-        self.assertContains(response, "TestAdoption3")
-        self.assertNotContains(response, "TestAdoption2")
-
-    def test_location_search(self):
-        response = self.client.post(reverse('search'), {"max_distance": 50, "location_string": "Berlin", "sex": "A"})
-        self.assertEqual(response.status_code, 200)
-        # We can't use assertContains because TestAdoption3 will always be in response at is included in map
-        # In order to test properly, we need to only care for the context that influences the list display
-        an_names = [a.name for a in response.context["adoption_notices"]]
-        self.assertTrue("TestAdoption1" in an_names) # Adoption in Berlin
-        self.assertFalse("TestAdoption3" in an_names) # Adoption in Stuttgart
-
-
-class UpdateQueueTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        test_user0 = User.objects.create_user(username='testuser0',
-                                              first_name="Admin",
-                                              last_name="BOFH",
-                                              password='12345',
-                                              trust_level=TrustLevel.MODERATOR)
-        test_user0.is_superuser = True
-        test_user0.save()
-
-        # Location of Berlin: lat 52.5170365 lon 13.3888599 PLZ 10115 (Mitte)
-
-        cls.adoption1 = baker.make(AdoptionNotice, name="TestAdoption1")
-        adoption2 = baker.make(AdoptionNotice, name="TestAdoption2")
-        cls.adoption3 = baker.make(AdoptionNotice, name="TestAdoption3")
-
-        cls.adoption1.set_unchecked()
-        cls.adoption3.set_unchecked()
-
-    def test_login_required(self):
-        response = self.client.get(reverse('updatequeue'))
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, "/accounts/login/?next=/updatequeue/")
-
-    def test_set_updated(self):
-        self.client.login(username='testuser0', password='12345')
-
-        # First get the list
-        response = self.client.get(reverse('updatequeue'))
-        self.assertEqual(response.status_code, 200)
-        # Make sure Adoption1 is in response
-        self.assertContains(response, "TestAdoption1")
-        self.assertNotContains(response, "TestAdoption2")
-
-        self.assertFalse(self.adoption1.is_active)
-
-        # Mark as checked
-        response = self.client.post(reverse('updatequeue'), {"adoption_notice_id": self.adoption1.pk,
-                                                             "action": "checked_active"})
-        self.assertEqual(response.status_code, 200)
-        self.adoption1.refresh_from_db()
-        self.assertTrue(self.adoption1.is_active)
-
-    def test_set_checked_inactive(self):
-        self.client.login(username='testuser0', password='12345')
-        # First get the list
-        response = self.client.get(reverse('updatequeue'))
-        self.assertEqual(response.status_code, 200)
-
-        # Make sure Adoption3 is in response
-        self.assertContains(response, "TestAdoption3")
-        self.assertNotContains(response, "TestAdoption2")
-
-        self.assertFalse(self.adoption3.is_active)
-
-        # Mark as checked
-        response = self.client.post(reverse('updatequeue'),
-                                    {"adoption_notice_id": self.adoption3.id, "action": "checked_inactive"})
-        self.assertEqual(response.status_code, 200)
-        self.adoption3.refresh_from_db()
-
-        # Make sure correct status is set and AN is not shown anymore
-        self.assertNotContains(response, "TestAdoption3")
-        self.assertFalse(self.adoption3.is_active)
-        self.assertEqual(self.adoption3.adoptionnoticestatus.major_status, AdoptionNoticeStatus.CLOSED)
-

src/tests/test_views/test_advanced_views.py

@@ -0,0 +1,395 @@
+from django.test import TestCase
+from django.contrib.auth.models import Permission
+from django.urls import reverse
+
+from model_bakery import baker
+
+from fellchensammlung.models import Animal, Species, AdoptionNotice, User, Location, AdoptionNoticeStatus, TrustLevel, \
+    Animal, Subscriptions, Comment, CommentNotification, SearchSubscription
+from fellchensammlung.tools.geo import LocationProxy
+from fellchensammlung.views import add_adoption_notice
+
+
+class AnimalAndAdoptionTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        test_user0 = User.objects.create_user(username='testuser0',
+                                              first_name="Admin",
+                                              last_name="BOFH",
+                                              password='12345')
+
+        test_user1 = User.objects.create_user(username='testuser1',
+                                              first_name="Max",
+                                              last_name="Müller",
+                                              password='12345')
+        test_user0.trust_level = TrustLevel.ADMIN
+        test_user0.save()
+
+        adoption1 = baker.make(AdoptionNotice, name="TestAdoption1", owner=test_user0)
+        rat = baker.make(Species, name="Farbratte")
+
+        rat1 = baker.make(Animal,
+                          name="Rat1",
+                          adoption_notice=adoption1,
+                          species=rat,
+                          description="Eine unglaublich süße Ratte")
+
+    def test_detail_animal(self):
+        self.client.login(username='testuser0', password='12345')
+
+        response = self.client.post(reverse('animal-detail', args="1"))
+        self.assertEqual(response.status_code, 200)
+        # Check our user is logged in
+        self.assertEqual(str(response.context['user']), 'testuser0')
+        self.assertContains(response, "Rat1")
+
+    def test_detail_animal_notice(self):
+        self.client.login(username='testuser0', password='12345')
+
+        response = self.client.post(reverse('adoption-notice-detail', args="1"))
+        self.assertEqual(response.status_code, 200)
+        # Check our user is logged in
+        self.assertEqual(str(response.context['user']), 'testuser0')
+        self.assertContains(response, "TestAdoption1")
+        self.assertContains(response, "Rat1")
+
+    def test_creating_AN_as_admin(self):
+        self.client.login(username='testuser0', password='12345')
+
+        form_data = {"name": "TestAdoption4",
+                     "species": Species.objects.first().pk,
+                     "num_animals": "2",
+                     "date_of_birth": "2024-11-04",
+                     "sex": "M",
+                     "group_only": "on",
+                     "searching_since": "2024-11-10",
+                     "location_string": "Mannheim",
+                     "description": "Blaaaa",
+                     "further_information": "https://notfellchen.org",
+                     "save-and-add-another-animal": "Speichern"}
+
+        response = self.client.post(reverse('add-adoption'), data=form_data)
+
+        self.assertTrue(response.status_code < 400)
+        self.assertTrue(AdoptionNotice.objects.get(name="TestAdoption4").is_active)
+        an = AdoptionNotice.objects.get(name="TestAdoption4")
+        animals = Animal.objects.filter(adoption_notice=an)
+        self.assertTrue(len(animals) == 2)
+
+    def test_creating_AN_as_user(self):
+        self.client.login(username='testuser1', password='12345')
+
+        form_data = {"name": "TestAdoption5",
+                     "species": Species.objects.first().pk,
+                     "num_animals": "3",
+                     "date_of_birth": "2024-12-04",
+                     "sex": "M",
+                     "group_only": "on",
+                     "searching_since": "2024-11-10",
+                     "location_string": "München",
+                     "description": "Blaaaa",
+                     "further_information": "https://notfellchen.org/",
+                     "save-and-add-another-animal": "Speichern"}
+
+        response = self.client.post(reverse('add-adoption'), data=form_data)
+
+        self.assertTrue(response.status_code < 400)
+        self.assertFalse(AdoptionNotice.objects.get(name="TestAdoption5").is_active)
+        an = AdoptionNotice.objects.get(name="TestAdoption5")
+        animals = Animal.objects.filter(adoption_notice=an)
+        self.assertTrue(len(animals) == 3)
+        self.assertTrue(an.sexes == set("M", ))
+
+
+class SearchTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        test_user0 = User.objects.create_user(username='testuser0',
+                                              first_name="Admin",
+                                              last_name="BOFH",
+                                              password='12345')
+        test_user0.save()
+
+        # Location of Berlin: lat 52.5170365 lon 13.3888599 PLZ 10115 (Mitte)
+
+        adoption1 = baker.make(AdoptionNotice, name="TestAdoption1")
+        adoption2 = baker.make(AdoptionNotice, name="TestAdoption2")
+        adoption3 = baker.make(AdoptionNotice, name="TestAdoption3")
+
+        berlin = Location.get_location_from_string("Berlin")
+        adoption1.location = berlin
+        adoption1.save()
+
+        stuttgart = Location.get_location_from_string("Stuttgart")
+        adoption3.location = stuttgart
+        adoption3.save()
+
+        adoption1.set_active()
+        adoption3.set_active()
+        adoption2.set_unchecked()
+
+    def test_basic_view(self):
+        response = self.client.get(reverse('search'))
+        self.assertEqual(response.status_code, 200)
+
+        self.assertContains(response, "TestAdoption1")
+        self.assertNotContains(response, "TestAdoption2")
+        self.assertContains(response, "TestAdoption3")
+
+    def test_basic_view_logged_in(self):
+        self.client.login(username='testuser0', password='12345')
+        response = self.client.get(reverse('search'))
+        self.assertEqual(response.status_code, 200)
+        # Check our user is logged in
+        self.assertEqual(str(response.context['user']), 'testuser0')
+
+        self.assertContains(response, "TestAdoption1")
+        self.assertContains(response, "TestAdoption3")
+        self.assertNotContains(response, "TestAdoption2")
+
+    def test_unauthenticated_subscribe(self):
+        response = self.client.post(reverse('search'), {"subscribe_to_search": ""})
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/accounts/login/?next=/suchen/")
+
+    def test_unauthenticated_unsubscribe(self):
+        response = self.client.post(reverse('search'), {"unsubscribe_to_search": 1})
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/accounts/login/?next=/suchen/")
+
+    def test_subscribe(self):
+        self.client.login(username='testuser0', password='12345')
+        response = self.client.post(reverse('search'), {"max_distance": 50, "location_string": "Berlin", "sex": "A",
+                                                        "subscribe_to_search": ""})
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(SearchSubscription.objects.filter(owner=User.objects.get(username='testuser0'),
+                                                          max_distance=50).exists())
+
+    def test_unsubscribe(self):
+        user0 = User.objects.get(username='testuser0')
+        self.client.login(username='testuser0', password='12345')
+        location = Location.get_location_from_string("München")
+        subscription = SearchSubscription.objects.create(owner=user0, max_distance=200, location=location, sex="A")
+        response = self.client.post(reverse('search'), {"max_distance": 200, "location_string": "München", "sex": "A",
+                                                        "unsubscribe_to_search": subscription.pk})
+        self.assertEqual(response.status_code, 200)
+        self.assertFalse(SearchSubscription.objects.filter(owner=User.objects.get(username='testuser0'),
+                                                           max_distance=200).exists())
+
+    def test_location_search(self):
+        response = self.client.post(reverse('search'), {"max_distance": 50, "location_string": "Berlin", "sex": "A"})
+        self.assertEqual(response.status_code, 200)
+        # We can't use assertContains because TestAdoption3 will always be in response at is included in map
+        # In order to test properly, we need to only care for the context that influences the list display
+        an_names = [a.name for a in response.context["adoption_notices"]]
+        self.assertTrue("TestAdoption1" in an_names)  # Adoption in Berlin
+        self.assertFalse("TestAdoption3" in an_names)  # Adoption in Stuttgart
+
+
+class UpdateQueueTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        test_user0 = User.objects.create_user(username='testuser0',
+                                              first_name="Admin",
+                                              last_name="BOFH",
+                                              password='12345',
+                                              trust_level=TrustLevel.MODERATOR)
+        test_user0.is_superuser = True
+        test_user0.save()
+
+        # Location of Berlin: lat 52.5170365 lon 13.3888599 PLZ 10115 (Mitte)
+
+        cls.adoption1 = baker.make(AdoptionNotice, name="TestAdoption1")
+        adoption2 = baker.make(AdoptionNotice, name="TestAdoption2")
+        cls.adoption3 = baker.make(AdoptionNotice, name="TestAdoption3")
+
+        cls.adoption1.set_unchecked()
+        cls.adoption3.set_unchecked()
+
+    def test_login_required(self):
+        response = self.client.get(reverse('updatequeue'))
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/accounts/login/?next=/updatequeue/")
+
+    def test_set_updated(self):
+        self.client.login(username='testuser0', password='12345')
+
+        # First get the list
+        response = self.client.get(reverse('updatequeue'))
+        self.assertEqual(response.status_code, 200)
+        # Make sure Adoption1 is in response
+        self.assertContains(response, "TestAdoption1")
+        self.assertNotContains(response, "TestAdoption2")
+
+        self.assertFalse(self.adoption1.is_active)
+
+        # Mark as checked
+        response = self.client.post(reverse('updatequeue'), {"adoption_notice_id": self.adoption1.pk,
+                                                             "action": "checked_active"})
+        self.assertEqual(response.status_code, 200)
+        self.adoption1.refresh_from_db()
+        self.assertTrue(self.adoption1.is_active)
+
+    def test_set_checked_inactive(self):
+        self.client.login(username='testuser0', password='12345')
+        # First get the list
+        response = self.client.get(reverse('updatequeue'))
+        self.assertEqual(response.status_code, 200)
+
+        # Make sure Adoption3 is in response
+        self.assertContains(response, "TestAdoption3")
+        self.assertNotContains(response, "TestAdoption2")
+
+        self.assertFalse(self.adoption3.is_active)
+
+        # Mark as checked
+        response = self.client.post(reverse('updatequeue'),
+                                    {"adoption_notice_id": self.adoption3.id, "action": "checked_inactive"})
+        self.assertEqual(response.status_code, 200)
+        self.adoption3.refresh_from_db()
+
+        # Make sure correct status is set and AN is not shown anymore
+        self.assertNotContains(response, "TestAdoption3")
+        self.assertFalse(self.adoption3.is_active)
+        self.assertEqual(self.adoption3.adoptionnoticestatus.major_status, AdoptionNoticeStatus.CLOSED)
+
+
+class AdoptionDetailTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        test_user0 = User.objects.create_user(username='testuser0',
+                                              first_name="Admin",
+                                              last_name="BOFH",
+                                              password='12345')
+        test_user0.save()
+
+        cls.test_user1 = User.objects.create_user(username='testuser1',
+                                                  first_name="Max",
+                                                  last_name="Müller",
+                                                  password='12345')
+        test_user0.trust_level = TrustLevel.ADMIN
+        test_user0.save()
+
+        adoption1 = baker.make(AdoptionNotice, name="TestAdoption1")
+        adoption2 = baker.make(AdoptionNotice, name="TestAdoption2")
+        adoption3 = baker.make(AdoptionNotice, name="TestAdoption3")
+
+        berlin = Location.get_location_from_string("Berlin")
+        adoption1.location = berlin
+        adoption1.save()
+
+        stuttgart = Location.get_location_from_string("Stuttgart")
+        adoption3.location = stuttgart
+        adoption3.save()
+
+        adoption1.set_active()
+        adoption3.set_active()
+        adoption2.set_unchecked()
+
+    def test_basic_view(self):
+        response = self.client.get(
+            reverse('adoption-notice-detail', args=str(AdoptionNotice.objects.get(name="TestAdoption1").pk)), )
+        self.assertEqual(response.status_code, 200)
+
+    def test_basic_view_logged_in(self):
+        self.client.login(username='testuser0', password='12345')
+        response = self.client.get(
+            reverse('adoption-notice-detail', args=str(AdoptionNotice.objects.get(name="TestAdoption1").pk)), )
+        self.assertEqual(response.status_code, 200)
+
+    def test_subscribe(self):
+        self.client.login(username='testuser0', password='12345')
+        response = self.client.post(
+            reverse('adoption-notice-detail', args=str(AdoptionNotice.objects.get(name="TestAdoption1").pk)),
+            data={"action": "subscribe"})
+        self.assertTrue(Subscriptions.objects.filter(owner__username="testuser0").exists())
+
+    def test_unsubscribe(self):
+        # Make sure subscription exists
+        an = AdoptionNotice.objects.get(name="TestAdoption1")
+        user = User.objects.get(username="testuser0")
+        subscription = Subscriptions.objects.get_or_create(owner=user, adoption_notice=an)
+
+        # Unsubscribe
+        self.client.login(username='testuser0', password='12345')
+        response = self.client.post(
+            reverse('adoption-notice-detail', args=str(an.pk)),
+            data={"action": "unsubscribe"})
+        self.assertFalse(Subscriptions.objects.filter(owner__username="testuser0").exists())
+
+    def test_login_required(self):
+        response = self.client.post(
+            reverse('adoption-notice-detail', args=str(AdoptionNotice.objects.get(name="TestAdoption1").pk)),
+            data={"action": "subscribe"})
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/accounts/login/?next=/vermittlung/1/")
+
+    def test_unauthenticated_comment(self):
+        response = self.client.post(
+            reverse('adoption-notice-detail', args=str(AdoptionNotice.objects.get(name="TestAdoption1").pk)),
+            data={"action": "comment"})
+        self.assertEqual(response.status_code, 403)
+
+    def test_comment(self):
+        an1 = AdoptionNotice.objects.get(name="TestAdoption1")
+        # Set up subscription
+        Subscriptions.objects.create(owner=self.test_user1, adoption_notice=an1)
+        self.client.login(username='testuser0', password='12345')
+        response = self.client.post(
+            reverse('adoption-notice-detail', args=str(an1.pk)),
+            data={"action": "comment", "text": "Test"})
+        self.assertTrue(Comment.objects.filter(user__username="testuser0").exists())
+        self.assertFalse(CommentNotification.objects.filter(user__username="testuser0").exists())
+        self.assertTrue(CommentNotification.objects.filter(user__username="testuser1").exists())
+
+
+class AdoptionEditTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        test_user0 = User.objects.create_user(username='testuser0',
+                                              first_name="Admin",
+                                              last_name="BOFH",
+                                              password='12345')
+        test_user0.save()
+
+        cls.test_user1 = User.objects.create_user(username='testuser1',
+                                                  first_name="Max",
+                                                  last_name="Müller",
+                                                  password='12345')
+
+        adoption1 = baker.make(AdoptionNotice, name="TestAdoption1", description="Test1", owner=test_user0)
+        adoption2 = baker.make(AdoptionNotice, name="TestAdoption2", description="Test2")
+
+    def test_basic_view(self):
+        response = self.client.get(
+            reverse('adoption-notice-edit', args=str(AdoptionNotice.objects.get(name="TestAdoption1").pk)), )
+        self.assertEqual(response.status_code, 302)
+
+    def test_basic_view_logged_in_unauthorized(self):
+        self.client.login(username='testuser1', password='12345')
+        response = self.client.get(
+            reverse('adoption-notice-edit', args=str(AdoptionNotice.objects.get(name="TestAdoption1").pk)), )
+        self.assertEqual(response.status_code, 403)
+
+    def test_basic_view_logged_in(self):
+        self.client.login(username='testuser0', password='12345')
+        response = self.client.get(
+            reverse('adoption-notice-edit', args=str(AdoptionNotice.objects.get(name="TestAdoption1").pk)), )
+        self.assertEqual(response.status_code, 200)
+
+    def test_edit(self):
+        data = {"name": "Mia",
+                "searching_since": "01.01.2025",
+                "location_string": "Paderborn",
+                "organization": "",
+                "description": "Test3",
+                "further_information": ""}
+        an = AdoptionNotice.objects.get(name="TestAdoption1")
+        assert self.client.login(username='testuser0', password='12345')
+        response = self.client.post(reverse("adoption-notice-edit", args=str(an.pk)), data=data, follow=True)
+        self.assertEqual(response.redirect_chain[0][1],
+                         302)  # See https://docs.djangoproject.com/en/5.1/topics/testing/tools/
+        self.assertEqual(response.status_code, 200)  # Redirects to AN page
+        self.assertContains(response, "Test3")
+        self.assertContains(response, "Mia")
+        self.assertNotContains(response, "Test1")

src/tests/test_views/test_basic_views.py

@@ -0,0 +1,136 @@
+from django.test import TestCase
+from django.urls import reverse
+
+from docs.conf import language
+from fellchensammlung.models import User, TrustLevel, AdoptionNotice, Species, Rule, Language, Comment, ReportComment
+from model_bakery import baker
+
+
+class BasicViewTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        test_user0 = User.objects.create_user(username='testuser0',
+                                              first_name="Admin",
+                                              last_name="BOFH",
+                                              password='12345')
+
+        test_user1 = User.objects.create_user(username='testuser1',
+                                              first_name="Max",
+                                              last_name="Müller",
+                                              password='12345')
+        test_user0.trust_level = TrustLevel.ADMIN
+        test_user0.save()
+
+        ans = []
+        for i in range(0, 8):
+            ans.append(baker.make(AdoptionNotice, name=f"TestAdoption{i}"))
+        for i in range(0, 4):
+            AdoptionNotice.objects.get(name=f"TestAdoption{i}").set_active()
+
+        rule1 = Rule.objects.create(title="Rule 1", rule_text="Description of r1", rule_identifier="rule1",
+                                    language=Language.objects.get(name="English"))
+
+        an1 = AdoptionNotice.objects.get(name="TestAdoption0")
+        comment1 = Comment.objects.create(adoption_notice=an1, text="Comment1", user=test_user1)
+        comment2 = Comment.objects.create(adoption_notice=an1, text="Comment2", user=test_user1)
+        comment3 = Comment.objects.create(adoption_notice=an1, text="Comment3", user=test_user1)
+
+        report_comment1 = ReportComment.objects.create(reported_comment=comment1,
+                                                       user_comment="ReportComment1")
+        report_comment1.save()
+        report_comment1.reported_broken_rules.set({rule1,})
+
+    def test_index_logged_in(self):
+        self.client.login(username='testuser0', password='12345')
+
+        response = self.client.get(reverse('index'))
+        self.assertEqual(response.status_code, 200)
+        # Check our user is logged in
+        self.assertEqual(str(response.context['user']), 'testuser0')
+        self.assertContains(response, "TestAdoption0")
+        self.assertNotContains(response, "TestAdoption5")  # Should not be active, therefore not shown
+
+    def test_index_anonymous(self):
+        response = self.client.get(reverse('index'))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "TestAdoption1")
+        self.assertNotContains(response, "TestAdoption4")  # Should not be active, therefore not shown
+
+    def test_about_logged_in(self):
+        self.client.login(username='testuser0', password='12345')
+        response = self.client.get(reverse('about'))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Rule 1")
+
+    def test_about_anonymous(self):
+        response = self.client.get(reverse('about'))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Rule 1")
+
+    def test_report_adoption_logged_in(self):
+        self.client.login(username='testuser0', password='12345')
+        an = AdoptionNotice.objects.get(name="TestAdoption0")
+        response = self.client.get(reverse('report-adoption-notice', args=str(an.pk)))
+        self.assertEqual(response.status_code, 200)
+
+        data = {"reported_broken_rules": 1, "user_comment": "animal cruelty"}
+        response = self.client.post(reverse('report-adoption-notice', args=str(an.pk)), data=data)
+        self.assertEqual(response.status_code, 302)
+
+    def test_report_adoption_anonymous(self):
+        an = AdoptionNotice.objects.get(name="TestAdoption0")
+        response = self.client.get(reverse('report-adoption-notice', args=str(an.pk)))
+        self.assertEqual(response.status_code, 200)
+
+        data = {"reported_broken_rules": 1, "user_comment": "animal cruelty"}
+        response = self.client.post(reverse('report-adoption-notice', args=str(an.pk)), data=data)
+        self.assertEqual(response.status_code, 302)
+
+    def test_report_comment_logged_in(self):
+        self.client.login(username='testuser0', password='12345')
+        c = Comment.objects.get(text="Comment1")
+        response = self.client.get(reverse('report-comment', args=str(c.pk)))
+        self.assertEqual(response.status_code, 200)
+
+        data = {"reported_broken_rules": 1, "user_comment": "animal cruelty"}
+        response = self.client.post(reverse('report-comment', args=str(c.pk)), data=data)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(ReportComment.objects.filter(reported_comment=c.pk).exists())
+
+    def test_report_comment_anonymous(self):
+        c = Comment.objects.get(text="Comment2")
+        response = self.client.get(reverse('report-comment', args=str(c.pk)))
+        self.assertEqual(response.status_code, 200)
+
+        data = {"reported_broken_rules": 1, "user_comment": "animal cruelty"}
+        response = self.client.post(reverse('report-comment', args=str(c.pk)), data=data)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(ReportComment.objects.filter(reported_comment=c.pk).exists())
+
+    def test_show_report_details_logged_in(self):
+        self.client.login(username='testuser1', password='12345')
+        report = ReportComment.objects.get(user_comment="ReportComment1")
+        response = self.client.get(reverse('report-detail', args=(report.pk,)))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Rule 1")
+        self.assertContains(response, "ReportComment1")
+        self.assertNotContains(response, '<form action="allow" class="">')
+
+    def test_show_report_details_anonymous(self):
+        report = ReportComment.objects.get(user_comment="ReportComment1")
+        response = self.client.get(reverse('report-detail', args=(report.pk,)))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Rule 1")
+        self.assertContains(response, "ReportComment1")
+        self.assertNotContains(response, '<form action="allow" class="">')
+
+    def test_show_report_details_admin(self):
+        self.client.login(username='testuser0', password='12345')
+        report = ReportComment.objects.get(user_comment="ReportComment1")
+        response = self.client.get(reverse('report-detail', args=(report.pk,)))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Rule 1")
+        self.assertContains(response, "ReportComment1")
+        self.assertContains(response, '<form action="allow" class="">')
+
+