- fix tag ci/cd

- improve search query matching

Author: Bhupesh-V

app/views.py

@@ -20,7 +20,7 @@ def search_query(request):
 
     if category is not None:
         object_list = tutorial.objects.filter(
-            (Q(title__icontains=query) & Q(tags__name__in=list_query)) & Q(category__icontains=category)
+            (Q(title__icontains=query) | Q(tags__name__in=list_query)) & Q(category__icontains=category)
         ).order_by('id').distinct()
     else:
         object_list = tutorial.objects.filter(

taggie/parser.py

@@ -37,6 +37,9 @@ def tokenizeTutorial(title, description, generated_tags):
 
     #[generated_tags.append(tag) for elem in generated_tags if elem not in generated_tags]
     generated_tags = ' '.join(generated_tags).split()
+
+    
+
     return list(set(generated_tags))
 
 
@@ -97,4 +100,7 @@ def generateTags(link):
     tutorialTags = tokenizeTutorial(
         tutorialTitle, tutorialDescription, temporaryTags)
 
+    if 'ci/cd' in tutorialTags:
+        tutorialTags[tutorialTags.index('ci/cd')] = 'ci-cd'
+
     return tutorialTags, tutorialTitle