From fd39c85c1aea29bc396836ea7a9626a5b1793cb0 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 6 Apr 2020 20:43:38 +0530
Subject: [PATCH] FIX: add category hashtags support for sub-sub categories.

Hashtags will include last two levels only (ex: "parent:child").
---
 .../javascripts/discourse/lib/category-tag-search.js |  2 +-
 app/assets/javascripts/discourse/models/category.js  |  7 ++++---
 app/models/concerns/category_hashtag.rb              |  8 ++++----
 spec/components/concern/category_hashtag_spec.rb     | 12 ++++++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js b/app/assets/javascripts/discourse/lib/category-tag-search.js
index ca1ddcc85ec..c258ddb6ae8 100644
--- a/app/assets/javascripts/discourse/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/lib/category-tag-search.js
@@ -76,7 +76,7 @@ export function search(term, siteSettings) {
   var numOfCategories = categories.length;
 
   categories = categories.map(category => {
-    return { model: category, text: Category.slugFor(category, SEPARATOR) };
+    return { model: category, text: Category.slugFor(category, SEPARATOR, 2) };
   });
 
   if (numOfCategories !== limit && siteSettings.tagging_enabled) {
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index bbbe590d0b6..f264248f520 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -264,14 +264,15 @@ Category.reopenClass({
     return _uncategorized;
   },
 
-  slugFor(category, separator = "/") {
+  slugFor(category, separator = "/", depth = 3) {
     if (!category) return "";
 
     const parentCategory = get(category, "parentCategory");
     let result = "";
 
-    if (parentCategory) {
-      result = Category.slugFor(parentCategory) + separator;
+    if (parentCategory && depth > 1) {
+      result =
+        Category.slugFor(parentCategory, separator, depth - 1) + separator;
     }
 
     const id = get(category, "id"),
diff --git a/app/models/concerns/category_hashtag.rb b/app/models/concerns/category_hashtag.rb
index 5a8c92f92c7..95b1521c251 100644
--- a/app/models/concerns/category_hashtag.rb
+++ b/app/models/concerns/category_hashtag.rb
@@ -9,17 +9,17 @@ module CategoryHashtag
     def query_from_hashtag_slug(category_slug)
       parent_slug, child_slug = category_slug.split(SEPARATOR, 2)
 
-      category = Category.where(slug: parent_slug, parent_category_id: nil)
+      categories = Category.where(slug: parent_slug)
 
       if child_slug
-        Category.where(slug: child_slug, parent_category_id: category.select(:id)).first
+        Category.where(slug: child_slug, parent_category_id: categories.select(:id)).first
       else
-        category.first
+        categories.where(parent_category_id: nil).first
       end
     end
   end
 
   def hashtag_slug
-    full_slug(SEPARATOR)
+    full_slug.split("-").last(2).join(SEPARATOR)
   end
 end
diff --git a/spec/components/concern/category_hashtag_spec.rb b/spec/components/concern/category_hashtag_spec.rb
index 3d59995babf..81f437efae3 100644
--- a/spec/components/concern/category_hashtag_spec.rb
+++ b/spec/components/concern/category_hashtag_spec.rb
@@ -36,5 +36,17 @@ describe CategoryHashtag do
       expect(Category.query_from_hashtag_slug("apple")).to eq(nil)
       expect(Category.query_from_hashtag_slug("apple#{CategoryHashtag::SEPARATOR}orange")).to eq(nil)
     end
+
+    context "multi-level categories" do
+      before do
+        SiteSetting.max_category_nesting = 3
+      end
+
+      it "should return the right result for a grand child category slug" do
+        category = Fabricate(:category, parent_category: child_category)
+        expect(Category.query_from_hashtag_slug("#{child_category.slug}#{CategoryHashtag::SEPARATOR}#{category.slug}"))
+          .to eq(category)
+      end
+    end
   end
 end