project-search: add identifer to search field

Author: vellip

meinberlin/apps/kiezradar/models.py

@@ -197,6 +197,9 @@ def get_search_profiles_for_project(project: Project) -> QuerySet[SearchProfile]
     )
     if project.administrative_district:
         search_term += " " + project.administrative_district.name
+    if hasattr(project, "externalproject"):
+        if hasattr(project.externalproject, "bplan"):
+            search_term += " " + project.externalproject.bplan.identifier
     for topic in project.topic_names:
         search_term += " " + topic
     if connection.vendor == "postgresql":

meinberlin/apps/projects/api.py

@@ -29,7 +29,9 @@ def get_public_projects() -> QuerySet[Project]:
             is_archived=False,
         )
         .order_by("created")
-        .select_related("administrative_district", "organisation")
+        .select_related(
+            "administrative_district", "organisation", "externalproject__bplan"
+        )
         .prefetch_related(
             "moderators",
             "plans",

meinberlin/apps/projects/serializers.py

@@ -65,6 +65,7 @@ class ProjectSerializer(
     type = serializers.SerializerMethodField()
     url = serializers.SerializerMethodField()
     topics = serializers.SerializerMethodField()
+    identifier = serializers.SerializerMethodField()
 
     def __init__(self, *args, **kwargs):
         self.now = kwargs.pop("now")
@@ -84,6 +85,7 @@ class Meta:
             "description",
             "district",
             "future_phase",
+            "identifier",
             "organisation",
             "participation",
             "participation_active",
@@ -248,6 +250,11 @@ def get_point_label(self, instance):
     def get_cost(self, instance):
         return ""
 
+    def get_identifier(self, instance):
+        if hasattr(instance, "externalproject"):
+            if hasattr(instance.externalproject, "bplan"):
+                return instance.externalproject.bplan.identifier
+
 
 class ActiveProjectSerializer(ProjectSerializer):
     def seconds_in_units(self, seconds):

meinberlin/react/projects/filter-projects.js

@@ -21,7 +21,6 @@ const statusNames = ['active', 'future', 'past']
 
 export const filterProjects = (items, appliedFilters, kiezradars, topics, projectState) => {
   const { search, topics: activeTopics, districts, organisation, participations, plansOnly, kiezradars: activeKiezradars } = appliedFilters
-
   return items.filter((item) => {
     const isWithinAnyRadius =
       item.point && kiezradars.some(kiezradar =>
@@ -37,6 +36,7 @@ export const filterProjects = (items, appliedFilters, kiezradars, topics, projec
              isInTitle(item.district, search) ||
              isInTitle(item.organisation, search) ||
              isInTitle(item.description, search) ||
+             isInTitle(item.identifier, search) ||
              isInTopic(topics, item.topics, search)) &&
            (projectState.includes(statusNames[item.status])) &&
            (!plansOnly || item.type === 'plan') &&

tests/kiezradar/test_search_profile.py

@@ -315,6 +315,21 @@ def test_searchprofile_filter_query(
         assert list(result) == expected_profiles
 
 
+@pytest.mark.django_db
+def test_searchprofile_filter_query_bplan(
+    search_profile_factory,
+    kiezradar_query_factory,
+    bplan_factory,
+):
+    bplan = bplan_factory(identifier="B30-1 A30-bplan 2024")
+    bplan_profile = search_profile_factory(
+        query=kiezradar_query_factory(text="A30-bplan")
+    )
+
+    result = get_search_profiles_for_project(bplan).order_by("pk")
+    assert list(result) == [bplan_profile]
+
+
 @pytest.mark.django_db
 def test_searchprofile_filter_kiezradar(
     user, phase_factory, search_profile_factory, kiez_radar_factory

tests/projects/test_serializer.py

@@ -35,7 +35,7 @@ def test_project_serializer(
         tile_image_alt_text="img_alt",
     )
     external_project_factory()
-    bplan_factory()
+    bplan_factory(identifier="bplan 2013-01-01")
 
     now = parse("2013-01-01 18:00:00+01:00")
     yesterday = now - timezone.timedelta(days=1)
@@ -165,3 +165,5 @@ def test_project_serializer(
         assert not project_data[5]["tile_image_alt_text"]
 
         assert project_data[0]["point"] == geojson_point
+
+        assert project_data[5]["identifier"] == "bplan 2013-01-01"