Move CentralUserCommands to commands folder

app/commands/central_user_commands.rb

@@ -0,0 +1,69 @@
+require './lib/carto/user_creator'
+require './lib/carto/user_updater'
+
+class CentralUserCommands
+
+  attr_reader :notifications_topic,
+              :logger
+
+  def initialize(notifications_topic:, logger:)
+    @notifications_topic = notifications_topic
+    @logger = logger
+  end
+
+  def update_user(message)
+    payload = message.payload
+    Carto::Common::CurrentRequest.with_request_id(message.request_id) do
+      logger.info(message: 'Processing :update_user', class_name: self.class.name)
+
+      user_id = payload.delete('remote_user_id')
+
+      return unless user_id.present? && payload.any?
+
+      user = ::User.where(id: user_id).first
+      Carto::UserUpdater.new(user).update(payload)
+
+      logger.info(message: 'User updated', current_user: user, class_name: self.class.name)
+    end
+  end
+
+  def create_user(message)
+    Carto::Common::CurrentRequest.with_request_id(message.request_id) do
+      logger.info(message: 'Processing :create_user', class_name: self.class.name)
+
+      user = Carto::UserCreator.new.create(message.payload)
+      notifications_topic.publish(:user_created, {
+                                    username: user.username,
+                                    id: user.id
+                                  })
+
+      logger.info(message: 'User created', current_user: user, class_name: self.class.name)
+    end
+  end
+
+  def delete_user(message)
+    payload = message.payload
+    Carto::Common::CurrentRequest.with_request_id(message.request_id) do
+      logger.info(message: 'Processing :delete_user', class_name: self.class.name)
+
+      user = ::User.where(id: payload[:id]).first
+      user.set_force_destroy if payload[:force] == 'true'
+      user.destroy
+      notifications_topic.publish(:user_deleted, { username: user.username })
+      logger.info(message: 'User deleted', current_user: user.username, class_name: self.class.name)
+    end
+  rescue CartoDB::SharedEntitiesError
+    Carto::Common::CurrentRequest.with_request_id(message.request_id) do
+      notifications_topic.publish(:user_could_not_be_deleted, {
+                                    username: user.username,
+                                    reason: 'user has shared entities'
+                                  })
+      logger.info(
+        message: 'User could not be deleted because it has shared entities',
+        class_name: self.class.name,
+        current_user: user.username
+      )
+    end
+  end
+
+end

lib/carto/subscribers/central_user_commands.rb

@@ -1,73 +0,0 @@
-require './lib/carto/user_creator'
-require './lib/carto/user_updater'
-
-module Carto
-  module Subscribers
-    class CentralUserCommands
-
-      attr_reader :notifications_topic,
-                  :logger
-
-      def initialize(notifications_topic:, logger:)
-        @notifications_topic = notifications_topic
-        @logger = logger
-      end
-
-      def update_user(message)
-        payload = message.payload
-        Carto::Common::CurrentRequest.with_request_id(message.request_id) do
-          logger.info(message: 'Processing :update_user', class_name: self.class.name)
-
-          user_id = payload.delete('remote_user_id')
-
-          return unless user_id.present? && payload.any?
-
-          user = ::User.where(id: user_id).first
-          Carto::UserUpdater.new(user).update(payload)
-
-          logger.info(message: 'User updated', current_user: user, class_name: self.class.name)
-        end
-      end
-
-      def create_user(message)
-        Carto::Common::CurrentRequest.with_request_id(message.request_id) do
-          logger.info(message: 'Processing :create_user', class_name: self.class.name)
-
-          user = Carto::UserCreator.new.create(message.payload)
-          notifications_topic.publish(:user_created, {
-                                        username: user.username,
-                                        id: user.id
-                                      })
-
-          logger.info(message: 'User created', current_user: user, class_name: self.class.name)
-        end
-      end
-
-      def delete_user(message)
-        payload = message.payload
-        Carto::Common::CurrentRequest.with_request_id(message.request_id) do
-          logger.info(message: 'Processing :delete_user', class_name: self.class.name)
-
-          user = ::User.where(id: payload[:id]).first
-          user.set_force_destroy if payload[:force] == 'true'
-          user.destroy
-          notifications_topic.publish(:user_deleted, { username: user.username })
-          logger.info(message: 'User deleted', current_user: user.username, class_name: self.class.name)
-        end
-      rescue CartoDB::SharedEntitiesError
-        Carto::Common::CurrentRequest.with_request_id(message.request_id) do
-          notifications_topic.publish(:user_could_not_be_deleted, {
-                                        username: user.username,
-                                        reason: 'user has shared entities'
-                                      })
-          logger.info(
-            message: 'User could not be deleted because it has shared entities',
-            class_name: self.class.name,
-            current_user: user.username
-          )
-        end
-      end
-
-    end
-  end
-end

lib/tasks/central_updates_subscriber.rake

@@ -1,5 +1,3 @@
-require './lib/carto/subscribers/central_user_commands'
-
 def process_exists?(pid)
   Process.getpgid(pid)
   true
@@ -31,7 +29,7 @@ namespace :message_broker do
       subscription_name = Carto::Common::MessageBroker::Config.instance.central_subscription_name
       subscription = message_broker.get_subscription(subscription_name)
       notifications_topic = message_broker.get_topic(:cartodb_central)
-      central_user_commands = Carto::Subscribers::CentralUserCommands.new(
+      central_user_commands = CentralUserCommands.new(
         notifications_topic: notifications_topic,
         logger: logger
       )