Added new rubocop extensions

Author: tungleduyxyz

.github/workflows/ci.yml

@@ -112,61 +112,7 @@ jobs:
         if: ${{ matrix.docker-compose-file == 'docker-compose.ci.postgresql.yml' }}
         run: |
           curl https://raw.githubusercontent.com/killbill/killbill-email-notifications-plugin/master/src/main/resources/ddl.sql | psql -h 127.0.0.1 -U postgres -p 5432 -d killbill
-      - name: Install plugin
-        run: |
-          curl --connect-timeout 10 --max-time 30 -v \
-               -X POST \
-               -u admin:password \
-               -H 'Content-Type: application/json' \
-               -H 'X-Killbill-CreatedBy: GitHub' \
-               -d '{
-                   "nodeCommandProperties": [
-                       {
-                           "key": "pluginKey",
-                           "value": "email-notifications"
-                       }
-                   ],
-                   "nodeCommandType": "INSTALL_PLUGIN",
-                   "isSystemCommandType": "true"
-               }' \
-               "http://${KB_ADDRESS}:${KB_PORT}/1.0/kb/nodesInfo"
-
-          sudo snap install yq
-
-          count=0
-          until [[ "$(curl -s -uadmin:password http://${KB_ADDRESS}:${KB_PORT}/1.0/kb/nodesInfo | jq -r '.[].pluginsInfo[] | select(.pluginKey == "email-notifications").state')" == "STOPPED" ]]; do
-            if [[ "$count" == "180" ]]; then
-              exit 64
-            fi
-            count=$(( count + 1 ))
-            sleep 1
-          done
-
-          curl --connect-timeout 10 --max-time 30 -v \
-               -X POST \
-               -u admin:password \
-               -H 'Content-Type: application/json' \
-               -H 'X-Killbill-CreatedBy: GitHub' \
-               -d '{
-                   "nodeCommandProperties": [
-                       {
-                           "key": "pluginKey",
-                           "value": "email-notifications"
-                       }
-                   ],
-                   "nodeCommandType": "START_PLUGIN",
-                   "isSystemCommandType": "true"
-               }' \
-               "http://${KB_ADDRESS}:${KB_PORT}/1.0/kb/nodesInfo"
-
-          count=0
-          until [[ "$(curl -s -uadmin:password http://${KB_ADDRESS}:${KB_PORT}/1.0/kb/nodesInfo | jq -r '.[].pluginsInfo[] | select(.pluginKey == "email-notifications").state')" == "RUNNING" ]]; do
-            if [[ "$count" == "180" ]]; then
-              exit 65
-            fi
-            count=$(( count + 1 ))
-            sleep 1
-          done
+      
       - name: Run tests
         env:
           DB_ADAPTER: ${{ matrix.database-adapter }}

.rubocop.yml

@@ -1,3 +1,8 @@
+require:
+  - rubocop-performance
+  - rubocop-rails
+  - rubocop-thread_safety
+
 inherit_mode:
   merge:
     - Exclude
@@ -8,6 +13,7 @@ AllCops:
     - 'app/controllers/kenui/engine_controller.rb' # Too much magic going on
   NewCops: enable
   SuggestExtensions: false
+  TargetRubyVersion: 3.1
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
@@ -51,3 +57,24 @@ Style/Documentation:
 
 Style/EmptyElse:
   EnforcedStyle: empty
+
+# Rails cops
+Rails:
+  Enabled: true
+
+Rails/I18nLocaleTexts:
+  Enabled: false
+
+Rails/SkipsModelValidations:
+  Enabled: false
+
+# Performance cops
+Performance:
+  Enabled: true
+
+# Thread Safety cops
+ThreadSafety:
+  Enabled: true
+
+ThreadSafety/ClassAndModuleAttributes:
+  Enabled: false

Gemfile

@@ -24,6 +24,9 @@ group :development do
   gem 'puma'
   gem 'rake'
   gem 'rubocop'
+  gem 'rubocop-performance'
+  gem 'rubocop-rails'
+  gem 'rubocop-thread_safety'
   gem 'simplecov'
   gem 'sprockets-rails'
 end

app/controllers/kenui/email_notifications_controller.rb

@@ -27,7 +27,7 @@ def pagination
         events = ''
         unless email_notifications_configuration.first.is_a?(FalseClass)
           configuration = email_notifications_configuration.select { |event| event[:kbAccountId] == row.account_id }
-          events = configuration.map { |event| event[:eventType] }.join(', ')
+          events = configuration.pluck(:eventType).join(', ')
         end
 
         data << [
@@ -37,20 +37,20 @@ def pagination
           view_context.link_to('Edit'.html_safe,
                                '#configureEmailNotification',
                                data: { name: row.name, account_id: row.account_id,
-                                       events: events, bs_toggle: 'modal', target: '#configureEmailNotification' })
+                                       events:, bs_toggle: 'modal', target: '#configureEmailNotification' })
         ]
       end
 
       respond_to do |format|
-        format.json { render json: { data: data, recordsTotal: record_total, recordsFiltered: record_total } }
+        format.json { render json: { data:, recordsTotal: record_total, recordsFiltered: record_total } }
       end
     end
 
     def events_to_consider
       data = Kenui::EmailNotificationService.get_events_to_consider(options_for_klient)
 
       respond_to do |format|
-        format.json { render json: { data: data } }
+        format.json { render json: { data: } }
       end
     end
 
@@ -59,14 +59,14 @@ def configuration
       data = Kenui::EmailNotificationService.get_configuration_per_account(account_id, options_for_klient)
 
       respond_to do |format|
-        format.json { render json: { data: data } }
+        format.json { render json: { data: } }
       end
     end
 
     def set_configuration
       configuration = params.require(:configuration)
 
-      event_types = Array(configuration[:event_types]).reject(&:blank?)
+      event_types = Array(configuration[:event_types]).compact_blank
 
       is_success, message = Kenui::EmailNotificationService.set_configuration_per_account(configuration[:account_id],
                                                                                           event_types,

config/routes.rb

@@ -6,9 +6,9 @@
   resources :email_notifications, only: [:index]
 
   scope '/email_notifications' do
-    match '/pagination' => 'email_notifications#pagination', :via => :get, :as => 'email_notification_pagination'
-    match '/configuration' => 'email_notifications#configuration', :via => :get, :as => 'email_notifications_get_configuration'
-    match '/configuration' => 'email_notifications#set_configuration', :via => :post, :as => 'email_notifications_configuration'
-    match '/events_to_consider' => 'email_notifications#events_to_consider', :via => :get, :as => 'email_notification_events_to_consider'
+    get '/pagination' => 'email_notifications#pagination', :as => 'email_notification_pagination'
+    get '/configuration' => 'email_notifications#configuration', :as => 'email_notifications_get_configuration'
+    post '/configuration' => 'email_notifications#set_configuration', :as => 'email_notifications_configuration'
+    get '/events_to_consider' => 'email_notifications#events_to_consider', :as => 'email_notification_events_to_consider'
   end
 end

test/controllers/kenui/email_notifications_controller_test.rb

@@ -13,17 +13,17 @@ class EmailNotificationsControllerTest < ActionDispatch::IntegrationTest
 
     test 'should set configuration' do
       account_id = SecureRandom.uuid.to_s
-      configuration = { account_id: account_id,
+      configuration = { account_id:,
                         event_types: %w[INVOICE_NOTIFICATION INVOICE_CREATION] }
 
-      post email_notifications_configuration_path, params: { configuration: configuration }
+      post email_notifications_configuration_path, params: { configuration: }
       follow_redirect!
       assert_equal email_notifications_path, path
       assert_equal "Email notifications for account #{account_id} was successfully updated", flash[:notice]
 
-      get email_notifications_get_configuration_path, as: :json, params: { account_id: account_id }
+      get email_notifications_get_configuration_path, as: :json, params: { account_id: }
       assert_response :success
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       assert_equal(2, json['data'].size)
       assert_equal(account_id, json['data'][0]['kbAccountId'])
     end