Merge branch 'main' into cherry-pick-ce-commit-b7d80ac968cebd7f1f33d2…

…853f6aacaff73d2ca8
Multiwoven · Nov 12, 2024 · 60f1f2c · 60f1f2c
2 parents 5296dab + a650350
commit 60f1f2c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/integrations/lib/multiwoven/integrations/destination/ais_data_store/icon.svg b/integrations/lib/multiwoven/integrations/destination/ais_data_store/icon.svg
diff --git a/integrations/lib/multiwoven/integrations/source/http_model/icon.svg b/integrations/lib/multiwoven/integrations/source/http_model/icon.svg
diff --git a/integrations/multiwoven-integrations.gemspec b/integrations/multiwoven-integrations.gemspec
@@ -52,6 +52,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "grpc"
   spec.add_runtime_dependency "hubspot-api-client"
   spec.add_runtime_dependency "iterable-api-client"
+  spec.add_runtime_dependency "MailchimpMarketing"
   spec.add_runtime_dependency "net-sftp"
   spec.add_runtime_dependency "pg"
   spec.add_runtime_dependency "rake"
@@ -67,7 +68,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "zendesk_api"
 
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "MailchimpMarketing"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "simplecov"

diff --git a/release-notes.md b/release-notes.md
@@ -2,14 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.32.0] - 2024-10-30
+## [0.33.0] - 2024-11-11
+
+### 🚀 Features
+
+- *(CE)* Added Mailchimp Destination Connector (#437)
 
 ### ⚙️ Miscellaneous Tasks
 
-- *(CE)* Add audit logs to report controller (#446)
-- *(CE)* Data app report model changes (#445)
-- *(CE)* Add audit logs to users controller (#449)
-- *(CE)* Add audit to sync records controller (#448)
-- *(CE)* Add audit logs to sync runs controller (#450)
+- *(CE)* Add additional_remarks in feedback model (#454)
 
 <!-- generated by git-cliff -->
diff --git a/server/app/models/data_app.rb b/server/app/models/data_app.rb
@@ -13,7 +13,7 @@ class DataApp < ApplicationRecord
   has_many :visual_components, dependent: :destroy
   has_many :models, through: :visual_components
   has_many :feedbacks, through: :visual_components
-  has_many :data_app_sessions, dependent: :nullify
+  has_many :data_app_sessions, dependent: :destroy
 
   after_initialize :set_default_status, if: :new_record?
 

diff --git a/server/app/serializers/feedback_serializer.rb b/server/app/serializers/feedback_serializer.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class FeedbackSerializer < ActiveModel::Serializer
+  attributes :id, :workspace_id, :data_app_id, :visual_component_id, :model_id, :reaction,
+             :feedback_content, :created_at, :updated_at, :feedback_type, :session_id, :additional_remarks
+end
diff --git a/server/spec/models/data_app_spec.rb b/server/spec/models/data_app_spec.rb
@@ -14,7 +14,7 @@
     it { should belong_to(:workspace) }
     it { should have_many(:visual_components).dependent(:destroy) }
     it { should have_many(:models).through(:visual_components) }
-    it { should have_many(:data_app_sessions).dependent(:nullify) }
+    it { should have_many(:data_app_sessions).dependent(:destroy) }
     it { should have_many(:feedbacks).through(:visual_components) }
   end