chore(CE): feedback model changes (#862)

Author: afthab vp

server/app/models/feedback.rb

@@ -5,14 +5,12 @@ class Feedback < ApplicationRecord
 
   validates :data_app_id, presence: true
   validates :visual_component_id, presence: true
-  validates :model_id, presence: true
   validates :feedback_type, presence: true
 
   counter_culture %i[visual_component data_app]
 
   belongs_to :data_app
   belongs_to :visual_component
-  belongs_to :model
   belongs_to :workspace
 
   enum feedback_type: { thumbs: 0, scale_input: 1, text_input: 2, dropdown: 3, multiple_choice: 4 }

server/app/models/message_feedback.rb

@@ -5,15 +5,13 @@ class MessageFeedback < ApplicationRecord
 
   validates :data_app_id, presence: true
   validates :visual_component_id, presence: true
-  validates :model_id, presence: true
   validates :feedback_type, presence: true
   validates :chatbot_interaction, presence: true
 
   counter_culture %i[visual_component data_app]
 
   belongs_to :data_app
   belongs_to :visual_component
-  belongs_to :model
   belongs_to :workspace
 
   enum feedback_type: { thumbs: 0, scale_input: 1, text_input: 2, dropdown: 3, multiple_choice: 4 }

server/app/serializers/feedback_serializer.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
 class FeedbackSerializer < ActiveModel::Serializer
-  attributes :id, :workspace_id, :data_app_id, :visual_component_id, :model_id, :reaction,
+  attributes :id, :workspace_id, :data_app_id, :visual_component_id, :model_id, :workflow_id, :reaction,
              :feedback_content, :created_at, :updated_at, :feedback_type, :session_id,
              :additional_remarks, :tags
+
+  def model_id
+    object.visual_component.model&.id
+  end
+
+  def workflow_id
+    object.visual_component.workflow&.id
+  end
 end

server/app/serializers/message_feedback_serializer.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
 class MessageFeedbackSerializer < ActiveModel::Serializer
-  attributes :id, :workspace_id, :data_app_id, :visual_component_id, :model_id, :reaction,
+  attributes :id, :workspace_id, :data_app_id, :visual_component_id, :model_id, :workflow_id, :reaction,
              :feedback_content, :created_at, :updated_at, :feedback_type, :chatbot_interaction,
              :additional_remarks, :tags
+
+  def model_id
+    object.visual_component.model&.id
+  end
+
+  def workflow_id
+    object.visual_component.workflow&.id
+  end
 end

server/db/migrate/20250918110212_remove_model_id_from_feedbacks_and_message_feedbacks.rb.rb

@@ -0,0 +1,8 @@
+class RemoveModelIdFromFeedbacksAndMessageFeedbacks < ActiveRecord::Migration[7.1]
+  def change
+    safety_assured do
+      remove_reference :feedbacks, :model, index: true
+      remove_reference :message_feedbacks, :model, index: true
+    end
+  end
+end

server/db/schema.rb

@@ -4,7 +4,6 @@
   factory :feedback do
     data_app { create(:data_app) }
     visual_component { create(:visual_component) }
-    model { create(:model) }
     association :workspace
     session_id { SecureRandom.hex(10) }
     feedback_type { "thumbs" }

server/spec/factories/feedback.rb

@@ -5,7 +5,6 @@
     association :data_app
     association :visual_component
     association :workspace
-    association :model
     feedback_type { "thumbs" }
     reaction { "positive" }
     chatbot_interaction { { user_query: "Hello", chatbot_reply: "Hi! How can I assist you!" } }

server/spec/factories/message_feedbacks.rb

@@ -43,18 +43,18 @@
         )
         sync_run_triggered = workspace_activity[:data][:sync_run_triggered]
 
-        expect(sync_run_triggered.count).to eq(slice_size)
-        expect(sync_run_triggered[slice_size - 1]["time_slice"]).not_to be_nil
-        expect(sync_run_triggered[slice_size - 1]["total_count"]).to eq(2)
-        expect(sync_run_triggered[slice_size - 1]["success_count"]).to eq(1)
-        expect(sync_run_triggered[slice_size - 1]["failed_count"]).to eq(1)
+        expect(sync_run_triggered.count).to be_within(1).of(slice_size)
+        expect(sync_run_triggered.last["time_slice"]).not_to be_nil
+        expect(sync_run_triggered.last["total_count"]).to eq(2)
+        expect(sync_run_triggered.last["success_count"]).to eq(1)
+        expect(sync_run_triggered.last["failed_count"]).to eq(1)
 
         total_sync_run_rows = workspace_activity[:data][:total_sync_run_rows]
-        expect(total_sync_run_rows.count).to eq(slice_size)
-        expect(total_sync_run_rows[slice_size - 1]["time_slice"]).not_to be_nil
-        expect(total_sync_run_rows[slice_size - 1]["total_count"]).to eq(4)
-        expect(total_sync_run_rows[slice_size - 1]["success_count"]).to eq(3)
-        expect(total_sync_run_rows[slice_size - 1]["failed_count"]).to eq(1)
+        expect(total_sync_run_rows.count).to be_within(1).of(slice_size)
+        expect(total_sync_run_rows.last["time_slice"]).not_to be_nil
+        expect(total_sync_run_rows.last["total_count"]).to eq(4)
+        expect(total_sync_run_rows.last["success_count"]).to eq(3)
+        expect(total_sync_run_rows.last["failed_count"]).to eq(1)
       end
     end
 

server/spec/interactors/reports/activity_report_spec.rb

@@ -6,14 +6,12 @@
   describe "associations" do
     it { should belong_to(:data_app) }
     it { should belong_to(:visual_component) }
-    it { should belong_to(:model) }
     it { should belong_to(:workspace) }
   end
 
   describe "validations" do
     it { should validate_presence_of(:data_app_id) }
     it { should validate_presence_of(:visual_component_id) }
-    it { should validate_presence_of(:model_id) }
     it { should validate_presence_of(:feedback_type) }
   end