Discource-C
/
discourse-ai
mirror of https://github.com/discourse/discourse-ai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: when excluding categories also exclude children (#583) 

This allows you to exclude trees of categories in a simple way

It also means you can no longer exclude "just the parent" but
this is a fair compromise.
This commit is contained in:
Sam 2024-04-22 16:05:24 +10:00 committed by GitHub
parent bd6f5caeac
commit 5ab86923ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/automation/report_context_generator.rb
View File

@ -45,8 +45,8 @@ module DiscourseAi
@posts = @posts.where("categories.id IN (?)", @category_ids) if @category_ids.present? @posts = @posts.where("categories.id IN (?)", @category_ids) if @category_ids.present?
@posts = @posts =
@posts.where( @posts.where(
"categories.id NOT IN (?)", "categories.id NOT IN (:ids) AND parent_category_id NOT IN (:ids)",
exclude_category_ids, ids: exclude_category_ids,
) if exclude_category_ids.present? ) if exclude_category_ids.present?
if exclude_tags.present? if exclude_tags.present?

8
spec/lib/modules/automation/report_runner_spec.rb
View File

@ -52,7 +52,12 @@ module DiscourseAi
) )
end end
it "can exclude categories" do it "can exclude categories (including sub categories)" do
subcategory = Fabricate(:category, parent_category_id: category.id)
topic_in_subcategory = Fabricate(:topic, category: subcategory)
post_in_subcategory =
Fabricate(:post, raw: "I am in a subcategory abcd", topic: topic_in_subcategory)
freeze_time freeze_time
DiscourseAi::Completions::Llm.with_prepared_responses(["magical report"]) do DiscourseAi::Completions::Llm.with_prepared_responses(["magical report"]) do
@ -79,6 +84,7 @@ module DiscourseAi
debugging = report.ordered_posts.last.raw debugging = report.ordered_posts.last.raw
expect(debugging).not_to include(post_in_category.raw) expect(debugging).not_to include(post_in_category.raw)
expect(debugging).not_to include(post_in_subcategory.raw)
end end
it "can suppress notifications by remapping content" do it "can suppress notifications by remapping content" do