DEV: Complete specs

Author: keegangeorge

app/controllers/discourse_ai/sentiment/sentiment_controller.rb

@@ -9,8 +9,8 @@ class SentimentController < ::Admin::StaffController
 
       def posts
         group_by = params[:group_by]&.to_sym
-        group_value = params[:group_value]
-        start_date = params[:start_date]
+        group_value = params[:group_value].presence
+        start_date = params[:start_date].presence
         end_date = params[:end_date]
         threshold = SENTIMENT_THRESHOLD
 
@@ -58,7 +58,7 @@ def posts
             t.archetype = 'regular' AND
             p.user_id > 0 AND
             cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest' AND
-            (p.created_at > :start_date AND p.created_at < :end_date)
+            ((:start_date IS NULL OR p.created_at > :start_date) AND (:end_date IS NULL OR p.created_at < :end_date))
           ORDER BY p.created_at DESC
         SQL
             group_value: group_value,

assets/javascripts/initializers/admin-reports.js

@@ -11,7 +11,7 @@ export default {
     }
 
     // We need to import dynamically with CommonJS require because
-    // using ESM import would cause the component to be imported globally
+    // using ESM import in an initializer would cause the component to be imported globally
     // and cause errors for non-admin users since the component is only available to admins
     const AdminReportSentimentAnalysis =
       require("discourse/plugins/discourse-ai/discourse/components/admin-report-sentiment-analysis").default;

spec/reports/sentiment_analysis_spec.rb

@@ -1,18 +1,22 @@
 # frozen_string_literal: true
 
 RSpec.describe DiscourseAi::Sentiment::SentimentAnalysisReport do
-  fab!(:user_1) { Fabricate(:user) }
-  fab!(:user_2) { Fabricate(:user) }
-  fab!(:post_1) { Fabricate(:post, user: user_1) }
-  fab!(:post_2) { Fabricate(:post, user: user_2) }
+  fab!(:admin)
+  fab!(:category)
+  fab!(:topic) { Fabricate(:topic, category: category) }
+  fab!(:post) { Fabricate(:post, user: admin, topic: topic) }
+  fab!(:post_2) { Fabricate(:post, user: admin, topic: topic) }
+  fab!(:classification_result) { Fabricate(:classification_result, target: post) }
 
-  before do
-    SiteSetting.discourse_ai_enabled = true
-    SiteSetting.ai_embeddings_enabled = false
-  end
+  before { SiteSetting.ai_sentiment_enabled = true }
 
   it "contains the correct filters" do
     report = Report.find("sentiment_analysis")
-    pp report.availble_filters.keys
+    expect(report.available_filters).to include("group_by", "sort_by", "category", "tag")
+  end
+
+  it "contains the correct labels" do
+    report = Report.find("sentiment_analysis")
+    expect(report.labels).to eq(%w[Positive Neutral Negative])
   end
 end

spec/requests/sentiment/sentiment_controller_spec.rb

@@ -2,29 +2,36 @@
 
 RSpec.describe DiscourseAi::Sentiment::SentimentController do
   describe "#posts" do
-    fab!(:user)
+    fab!(:admin)
     fab!(:category)
-    fab!(:post) { Fabricate(:post, user: user) }
-    fab!(:embedding_definition)
+    fab!(:topic) { Fabricate(:topic, category: category) }
+    fab!(:post) { Fabricate(:post, user: admin, topic: topic) }
+    fab!(:post_2) { Fabricate(:post, user: admin, topic: topic) }
+    fab!(:classification_result) { Fabricate(:classification_result, target: post) }
 
-    # before do
-    # SiteSetting.ai_embeddings_enabled = false
-    # SiteSetting.ai_embeddings_selected_model = ""
-    # sign_in(user)
-    # end
+    before do
+      SiteSetting.ai_sentiment_enabled = true
+      sign_in(admin)
+    end
 
     it "returns a posts based on params" do
-      get "/discourse-ai/sentiment/posts.json",
+      post.reload
+      classification_result.reload
+
+      get "/discourse-ai/sentiment/posts",
           params: {
             group_by: "category",
             group_value: category.name,
-            start_date: 1.month.ago.to_s,
-            end_date: 0.days.ago.to_s,
-            threshold: 0.6,
+            threshold: 0.0,
           }
 
-      pp response.inspect
       expect(response).to be_successful
+
+      posts = JSON.parse(response.body)
+      posts.each do |post|
+        expect(post).to have_key("sentiment")
+        expect(post["sentiment"]).to match(/positive|negative|neutral/)
+      end
     end
   end
 end