Merge branch 'develop' into fix/CW-3183

Makefile

@@ -17,6 +17,9 @@ db_migrate:
 db_seed:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:seed
 
+db_reset:
+	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:reset
+
 db:
 	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:chatwoot_prepare
 
@@ -49,4 +52,4 @@ debug_worker:
 docker: 
 	docker build -t $(APP_NAME) -f ./docker/Dockerfile .
 
-.PHONY: setup db_create db_migrate db_seed db console server burn docker run force_run debug debug_worker
+.PHONY: setup db_create db_migrate db_seed db_reset db console server burn docker run force_run debug debug_worker

lib/filters/filter_keys.yml

@@ -44,6 +44,12 @@ conversations:
       - "not_equal_to"
       - "is_present"
       - "is_not_present"
+  priority:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
   display_id:
     attribute_type: "standard"
     data_type: "Number"

spec/listeners/automation_rule_listener_old_spec.rb

@@ -23,7 +23,7 @@ describe AutomationRuleListener do
            attribute_display_type: 'list',
            attribute_values: %w[regular platinum gold])
     create(:custom_attribute_definition,
-           attribute_key: 'priority',
+           attribute_key: 'priority_level',
            account: account,
            attribute_model: 'conversation_attribute',
            attribute_display_type: 'list',
@@ -267,7 +267,7 @@ describe AutomationRuleListener do
 
     context 'when rule matches based on custom_attributes' do
       before do
-        conversation.update!(custom_attributes: { priority: 'P2' })
+        conversation.update!(custom_attributes: { priority_level: 'P2' })
         conversation.contact.update!(custom_attributes: { cloud_customer: false })
 
         automation_rule.update!(
@@ -276,7 +276,7 @@ describe AutomationRuleListener do
           description: 'Add labels, assign team after conversation updated',
           conditions: [
             {
-              attribute_key: 'priority',
+              attribute_key: 'priority_level',
               filter_operator: 'equal_to',
               values: ['P2'],
               custom_attribute_type: 'conversation_attribute',