From b9835cc3927dc19ca2505f07767c676d97d51448 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 4 Jul 2018 12:40:56 +0530
Subject: [PATCH] FIX: do not use scheduler for uploading csv file for invite
Since the bulk invite process already happens in a dedicated Sidekiq job
---
app/controllers/invites_controller.rb | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index c2c51ddf1e2..87d66fd66d9 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -165,20 +165,18 @@ class InvitesController < ApplicationController
name = params[:name] || File.basename(file.original_filename, ".*")
extension = File.extname(file.original_filename)
- Scheduler::Defer.later("Upload CSV") do
- begin
- data = if extension.downcase == ".csv"
- path = Invite.create_csv(file, name)
- Jobs.enqueue(:bulk_invite, filename: "#{name}#{extension}", current_user_id: current_user.id)
- { url: path }
- else
- failed_json.merge(errors: [I18n.t("bulk_invite.file_should_be_csv")])
- end
- rescue
- failed_json.merge(errors: [I18n.t("bulk_invite.error")])
+ begin
+ data = if extension.downcase == ".csv"
+ path = Invite.create_csv(file, name)
+ Jobs.enqueue(:bulk_invite, filename: "#{name}#{extension}", current_user_id: current_user.id)
+ { url: path }
+ else
+ failed_json.merge(errors: [I18n.t("bulk_invite.file_should_be_csv")])
end
- MessageBus.publish("/uploads/csv", data.as_json, user_ids: [current_user.id])
+ rescue
+ failed_json.merge(errors: [I18n.t("bulk_invite.error")])
end
+ MessageBus.publish("/uploads/csv", data.as_json, user_ids: [current_user.id])
render json: success_json
end