add refactoring fixes

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Added `allow list` to perform call on duty person [#153](/../../issues/153)
 - Added Jira integration to create tasks from threads [#13](/../../issues/13)
 - Added option to set 2 custom answers, working and non working time [#154](/../../issues/154)
+- Added tagging threads by label for future statistics
 - Added release notes announces
 - Updated dependencies 
 - Removed vagrant files

bot/commands/answer_set_custom_text.rb

@@ -9,14 +9,12 @@ def self.call(client:,data:,match:)
         answer.channel_id = data.channel
 
         if answer.save
-
           client.web_client.chat_postMessage(
             channel: data.channel,
             text: I18n.t('commands.answer.created.text'),
             thread_ts: data.thread_ts || data.ts,
             as_user: true
           )
-
           client.web_client.chat_postMessage(
             channel: data.channel,
             text: custom_text,

bot/commands/create_duty_for_user.rb

@@ -61,7 +61,6 @@ def self.set_user_on_duty(data:, client:, slack_user_id:)
           thread_ts: data.thread_ts || data.ts
         )
       end
-
     end
   end
 end

bot/commands/duty_create.rb

@@ -1,6 +1,16 @@
 module WhoIsOnDutyTodaySlackBotModule
   module Commands
     class DutyCreate
+      def self.i_am_on_duty(data:, client:)
+        Duty.where(channel_id: data.channel).where(user_id: data.user).update_all(enabled: true)
+        Duty.where(channel_id: data.channel).where.not(user_id: data.user).update_all(enabled: false)
+        client.say(
+          channel: data.channel,
+          text: I18n.t('commands.duty.enabled.text'),
+          thread_ts: data.thread_ts || data.ts
+        )
+      end
+
       def self.call(client:,data:,match:)
         message_processor = MessageProcessor.new
         slack_web_client = Slack::Web::Client.new

bot/commands/duty_update.rb

@@ -23,7 +23,7 @@ def self.call(client:,data:,match:)
             text: I18n.t('commands.duty.updated.text', fH: duty.duty_from.hour, fM: duty.duty_from.min, tH: duty.duty_to.hour, tM: duty.duty_to.min, status: duty.enabled),
             thread_ts: data.thread_ts || data.ts
           )
-          i_am_on_duty(data: data, client: client)
+          DutyCreate::i_am_on_duty(data: data, client: client)
         end
       end
     end

bot/commands/other.rb

@@ -21,7 +21,7 @@ def self.call(client:,data:,match:)
           end
 
           # don't reply on duty person messages
-          #return if data.user == duty.user.slack_user_id
+          return if data.user == duty.user.slack_user_id
 
           # Answer if it is known problem
           if data != nil and match != nil
@@ -52,7 +52,6 @@ def self.call(client:,data:,match:)
       end
 
       def self.reply_in_not_working_time (client, reason, data, answer)
-
         if answer.nil?
           text = I18n.t('reply.non-working-time.text', name: client.self.name)
         else

bot/whoisondutytodayslackbot.rb

@@ -1,5 +1,9 @@
 require 'date'
+require 'json'
 require_relative 'commands/main'
+require_relative 'notify'
+require_relative 'message_processor'
+
 
 class WhoIsOnDutyTodaySlackBot < SlackRubyBot::Bot
   SlackRubyBot::Client.logger.level = Logger::WARN