Merge branch 'main' of https://github.com/breatheco-de/apiv2

breatheco-de · Oct 28, 2024 · 5cc9603 · 5cc9603
2 parents 78d73e0 + 049deec
commit 5cc9603
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/breathecode/admissions/urls.py b/breathecode/admissions/urls.py
@@ -110,7 +110,7 @@
     path("syllabus/<int:syllabus_id>/version", SyllabusVersionView.as_view(), name="syllabus_id_version"),
     path("syllabus/version", AllSyllabusVersionsView.as_view(), name="syllabus_version"),
     path(
-        "syllabus/<str:syllabus_id>/version/<int:version>.csv",
+        "syllabus/<str:syllabus_id>/version/<str:version>.csv",
         SyllabusVersionCSVView.as_view(),
         name="syllabus_id_version_csv",
     ),

diff --git a/breathecode/admissions/views.py b/breathecode/admissions/views.py
@@ -1790,7 +1790,7 @@ def get(self, request, syllabus_id, version, academy_id):
                         f"Día {day['id']}: {day['label']}",
                         ", ".join([lesson["title"] for lesson in day["lessons"]]),
                         day.get("description", ""),
-                        ", ".join([tech["title"] for tech in day["technologies"]]),
+                        ", ".join([tech["title"] if isinstance(tech, dict) else tech for tech in day["technologies"]]),
                         day.get("teacher_instructions", ""),
                     ]
                 )
@@ -1801,7 +1801,7 @@ def get(self, request, syllabus_id, version, academy_id):
                         f"Day {day['id']}: {day['label']}",
                         ", ".join([lesson["title"] for lesson in day["lessons"]]),
                         day.get("description", ""),
-                        ", ".join([tech["title"] for tech in day["technologies"]]),
+                        ", ".join([tech["title"] if isinstance(tech, dict) else tech for tech in day["technologies"]]),
                         day.get("teacher_instructions", ""),
                     ]
                 )

diff --git a/breathecode/registry/views.py b/breathecode/registry/views.py
@@ -194,6 +194,10 @@ def get_technologies(request):
     if "is_deprecated" not in request.GET or request.GET.get("is_deprecated").lower() == "false":
         items = items.filter(is_deprecated=False)
 
+    like = request.GET.get("like", None)
+    if like is not None and like != "undefined" and like != "":
+        items = items.filter(Q(slug__icontains=slugify(like)) | Q(title__icontains=like))
+
     items = items.order_by("sort_priority")
 
     serializer = AssetTechnologySerializer(items, many=True)