updates

Author: keegangeorge

lib/sentiment/sentiment_dashboard_report.rb

@@ -5,22 +5,21 @@ module Sentiment
     class SentimentDashboardReport
       def self.register!(plugin)
         plugin.add_report("overall_sentiment") do |report|
-          report.modes = [:chart]
+          report.modes = [:stacked_chart]
           threshold = 0.6
 
           sentiment_count_sql = Proc.new { |sentiment| <<~SQL }
             COUNT(
               CASE WHEN (cr.classification::jsonb->'#{sentiment}')::float > :threshold THEN 1 ELSE NULL END
-            ) AS #{sentiment}_count
+            )
           SQL
 
           grouped_sentiments =
             DB.query(
               <<~SQL,
             SELECT
               DATE_TRUNC('day', p.created_at)::DATE AS posted_at,
-              #{sentiment_count_sql.call("positive")},
-              -#{sentiment_count_sql.call("negative")}
+              #{sentiment_count_sql.call("positive")} - #{sentiment_count_sql.call("negative")} AS sentiment_count
             FROM
               classification_results AS cr
             INNER JOIN posts p ON p.id = cr.target_id AND cr.target_type = 'Post'
@@ -32,6 +31,7 @@ def self.register!(plugin)
               cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest' AND
               (p.created_at > :report_start AND p.created_at < :report_end)
             GROUP BY DATE_TRUNC('day', p.created_at)
+            ORDER BY 1 ASC
           SQL
               report_start: report.start_date,
               report_end: report.end_date,
@@ -40,17 +40,15 @@ def self.register!(plugin)
 
           return report if grouped_sentiments.empty?
 
-          report.data =
-            grouped_sentiments.map do |gs|
-              {
-                color: report.colors[:lime],
-                label: I18n.t("discourse_ai.sentiment.reports.overall_sentiment"),
-                data: {
-                  x: gs.posted_at,
-                  y: gs.public_send("positive_count") - gs.public_send("negative_count"),
-                },
-              }
-            end
+          report.data = {
+            req: "overall_sentiment",
+            color: report.colors[:lime],
+            label: I18n.t("discourse_ai.sentiment.reports.overall_sentiment"),
+            data:
+              grouped_sentiments.map do |gs|
+                { x: gs.posted_at, y: gs.public_send("sentiment_count") }
+              end,
+          }
         end
       end
     end

spec/lib/modules/sentiment/entry_point_spec.rb

@@ -77,8 +77,8 @@ def sentiment_classification(post, classification)
         sentiment_classification(pm, positive_classification)
 
         report = Report.find("overall_sentiment")
-        overall_sentiment = report.data[0][:data][:y].to_i
-        expect(overall_sentiment).to eq(2)
+        overall_sentiment = report.data[:data][0][:y].to_i
+        expect(overall_sentiment).to eq(0)
       end
     end