Merge pull request #3 from Plant-for-the-Planet-org/master

Update

.codeclimate.yml

@@ -22,6 +22,9 @@ checks:
     enabled: true
     config:
       threshold: 300
+  method-lines:
+    config:
+      threshold: 50
 exclude_patterns:
   - 'spec/'
   - '**/specs/'
@@ -44,3 +47,6 @@ exclude_patterns:
   - 'app/javascript/shared/constants/countries.js'
   - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js'
   - 'app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js'
+  - 'app/javascript/dashboard/routes/dashboard/settings/automation/constants.js'
+  - 'app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js'
+  - 'app/javascript/dashboard/routes/dashboard/settings/reports/constants.js'

Gemfile

@@ -102,7 +102,7 @@ gem 'sentry-ruby'
 gem 'sentry-sidekiq'
 
 ##-- background job processing --##
-gem 'sidekiq'
+gem 'sidekiq', '~> 6.4.0'
 # We want cron jobs
 gem 'sidekiq-cron'
 

Gemfile.lock

@@ -9,63 +9,63 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actioncable (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activejob (= 6.1.4.3)
-      activerecord (= 6.1.4.3)
-      activestorage (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actionmailbox (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      actionview (= 6.1.4.3)
-      activejob (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actionmailer (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      actionview (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.3)
-      actionview (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actionpack (6.1.4.6)
+      actionview (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activerecord (= 6.1.4.3)
-      activestorage (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actiontext (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actionview (6.1.4.6)
+      activesupport (= 6.1.4.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_query_trace (1.8)
-    activejob (6.1.4.3)
-      activesupport (= 6.1.4.3)
+    activejob (6.1.4.6)
+      activesupport (= 6.1.4.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.3)
-      activesupport (= 6.1.4.3)
-    activerecord (6.1.4.3)
-      activemodel (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    activemodel (6.1.4.6)
+      activesupport (= 6.1.4.6)
+    activerecord (6.1.4.6)
+      activemodel (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
     activerecord-import (1.2.0)
       activerecord (>= 3.2)
-    activestorage (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activejob (= 6.1.4.3)
-      activerecord (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    activestorage (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.3)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -300,7 +300,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -346,7 +346,7 @@ GEM
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.13.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -400,7 +400,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.5.2)
+    puma (5.6.2)
       nio4r (~> 2.0)
     pundit (2.1.1)
       activesupport (>= 3.0.0)
@@ -416,29 +416,29 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-timeout (0.6.0)
-    rails (6.1.4.3)
-      actioncable (= 6.1.4.3)
-      actionmailbox (= 6.1.4.3)
-      actionmailer (= 6.1.4.3)
-      actionpack (= 6.1.4.3)
-      actiontext (= 6.1.4.3)
-      actionview (= 6.1.4.3)
-      activejob (= 6.1.4.3)
-      activemodel (= 6.1.4.3)
-      activerecord (= 6.1.4.3)
-      activestorage (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    rails (6.1.4.6)
+      actioncable (= 6.1.4.6)
+      actionmailbox (= 6.1.4.6)
+      actionmailer (= 6.1.4.6)
+      actionpack (= 6.1.4.6)
+      actiontext (= 6.1.4.6)
+      actionview (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activemodel (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.3)
+      railties (= 6.1.4.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    railties (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -447,7 +447,7 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.4.0)
+    redis (4.5.1)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
     regexp_parser (2.1.1)
@@ -546,7 +546,7 @@ GEM
     sexp_processor (4.15.3)
     shoulda-matchers (5.0.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.2.2)
+    sidekiq (6.4.0)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -583,7 +583,7 @@ GEM
     squasher (0.6.2)
     statsd-ruby (1.5.0)
     telephone_number (1.4.12)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     time_diff (0.3.0)
       activesupport
@@ -635,7 +635,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.0)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   arm64-darwin-20
@@ -726,7 +726,7 @@ DEPENDENCIES
   sentry-ruby
   sentry-sidekiq
   shoulda-matchers
-  sidekiq
+  sidekiq (~> 6.4.0)
   sidekiq-cron
   simplecov (= 0.17.1)
   slack-ruby-client

app/builders/account_builder.rb

@@ -2,7 +2,7 @@
 
 class AccountBuilder
   include CustomExceptions::Account
-  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password]
+  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password, :super_admin]
 
   def perform
     if @user.nil?
@@ -65,6 +65,7 @@ def create_user
                      password: user_password,
                      password_confirmation: user_password,
                      name: @user_full_name)
+    @user.type = 'SuperAdmin' if @super_admin
     @user.confirm if @confirmed
     @user.save!
   end

app/builders/contact_inbox_builder.rb

@@ -4,7 +4,7 @@ class ContactInboxBuilder
   def perform
     @contact = Contact.find(contact_id)
     @inbox = @contact.account.inboxes.find(inbox_id)
-    return unless ['Channel::TwilioSms', 'Channel::Email', 'Channel::Api', 'Channel::Whatsapp'].include? @inbox.channel_type
+    return unless ['Channel::TwilioSms', 'Channel::Sms', 'Channel::Email', 'Channel::Api', 'Channel::Whatsapp'].include? @inbox.channel_type
 
     source_id = @source_id || generate_source_id
     create_contact_inbox(source_id) if source_id.present?
@@ -13,12 +13,18 @@ def perform
   private
 
   def generate_source_id
-    return twilio_source_id if @inbox.channel_type == 'Channel::TwilioSms'
-    return wa_source_id if @inbox.channel_type == 'Channel::Whatsapp'
-    return @contact.email if @inbox.channel_type == 'Channel::Email'
-    return SecureRandom.uuid if @inbox.channel_type == 'Channel::Api'
-
-    nil
+    case @inbox.channel_type
+    when 'Channel::TwilioSms'
+      twilio_source_id
+    when 'Channel::Whatsapp'
+      wa_source_id
+    when 'Channel::Email'
+      @contact.email
+    when 'Channel::Sms'
+      @contact.phone_number
+    when 'Channel::Api'
+      SecureRandom.uuid
+    end
   end
 
   def wa_source_id

app/builders/messages/message_builder.rb

@@ -29,11 +29,12 @@ def process_attachments
     return if @attachments.blank?
 
     @attachments.each do |uploaded_attachment|
-      @message.attachments.build(
+      attachment = @message.attachments.build(
         account_id: @message.account_id,
-        file_type: file_type(uploaded_attachment&.content_type),
         file: uploaded_attachment
       )
+
+      attachment.file_type = file_type(uploaded_attachment&.content_type) if uploaded_attachment.is_a?(ActionDispatch::Http::UploadedFile)
     end
   end
 

app/builders/v2/report_builder.rb

@@ -2,6 +2,8 @@ class V2::ReportBuilder
   include DateRangeHelper
   attr_reader :account, :params
 
+  DEFAULT_GROUP_BY = 'day'.freeze
+
   def initialize(account, params)
     @account = account
     @params = params
@@ -64,26 +66,30 @@ def team
 
   def conversations_count
     scope.conversations
-         .group_by_day(:created_at, range: range, default_value: 0)
+         .group_by_period(params[:group_by] || DEFAULT_GROUP_BY,
+                          :created_at, range: range, default_value: 0, permit: %w[day week month year])
          .count
   end
 
   def incoming_messages_count
     scope.messages.incoming.unscope(:order)
-         .group_by_day(:created_at, range: range, default_value: 0)
+         .group_by_period(params[:group_by] || DEFAULT_GROUP_BY,
+                          :created_at, range: range, default_value: 0, permit: %w[day week month year])
          .count
   end
 
   def outgoing_messages_count
     scope.messages.outgoing.unscope(:order)
-         .group_by_day(:created_at, range: range, default_value: 0)
+         .group_by_period(params[:group_by] || DEFAULT_GROUP_BY,
+                          :created_at, range: range, default_value: 0, permit: %w[day week month year])
          .count
   end
 
   def resolutions_count
     scope.conversations
          .resolved
-         .group_by_day(:created_at, range: range, default_value: 0)
+         .group_by_period(params[:group_by] || DEFAULT_GROUP_BY,
+                          :created_at, range: range, default_value: 0, permit: %w[day week month year])
          .count
   end