feat: Refactor ontologies report handling to use LinkedData::Jobs::OntologiesReportJob

Author: maboukerfa

app.rb

@@ -30,9 +30,8 @@
 require_relative 'lib/rack/request_lang'
 
 # sidekiq requirements
-require 'sidekiq/web'
 require 'sidekiq'
-
+require 'sidekiq/web'
 
 # Logging setup
 require_relative 'config/logging'

controllers/admin_controller.rb

@@ -41,7 +41,7 @@ class AdminController < ApplicationController
     end
 
     get "/ontologies/:acronym/log" do
-      ont_report = NcboCron::Models::OntologiesReport.new.ontologies_report(false)
+      ont_report = LinkedData::Jobs::OntologiesReportJob.ontologies_report(false)
       log_path = ont_report[:ontologies].has_key?(params["acronym"].to_sym) ? "#{LinkedData.settings.repository_folder}/#{ont_report[:ontologies][params["acronym"].to_sym][:logFilePath]}" : ''
       log_contents = ''
 
@@ -94,29 +94,27 @@ class AdminController < ApplicationController
 
     get "/ontologies_report" do
       suppress_error = params["suppress_error"].eql?('true') # default = false
-      reply NcboCron::Models::OntologiesReport.new.ontologies_report(suppress_error)
+      reply LinkedData::Jobs::OntologiesReportJob.ontologies_report(suppress_error)
     end
 
     post "/ontologies_report" do
       ontologies = ontologies_param_to_acronyms(params)
-      args = {name: "ontologies_report", message: "refreshing ontologies report"}
-      process_id = process_long_operation(900, args) do |args|
-        NcboCron::Models::OntologiesReport.new.refresh_report(ontologies)
-      end
+      process_id = LinkedData::Jobs::OntologiesReportJob.perform_async({ "acronyms" => ontologies })
+      redis.setex(process_id, 900, MultiJson.dump("processing"))
       reply(process_id: process_id)
     end
 
     get "/ontologies_report/:process_id" do
-      process_id = MultiJson.load(redis.get(params["process_id"]))
+      status = MultiJson.load(redis.get(params["process_id"]))
 
-      if process_id.nil?
+      if status.nil?
         error 404, "Process id #{params["process_id"]} does not exit"
       else
-        if process_id === "done"
-          reply NcboCron::Models::OntologiesReport.new.ontologies_report(false)
+        if status === "done"
+          reply LinkedData::Jobs::OntologiesReportJob.ontologies_report(false)
         else
           # either "processing" OR errors {errors: ["errorA", "errorB"]}
-          reply process_id
+          reply status
         end
       end
     end

controllers/ontologies_controller.rb

@@ -136,7 +136,7 @@ class OntologiesController < ApplicationController
       error 422, "You must provide an existing `acronym` to delete" if ont.nil?
       ont.delete
       # update ontologies report file, if exists
-      NcboCron::Models::OntologiesReport.new.delete_ontologies_from_report([params["acronym"]])
+      LinkedData::Jobs::OntologiesReportJob.delete_ontologies_from_report([params["acronym"]])
       halt 204
     end
 
@@ -232,7 +232,7 @@ def create_ontology
           latest_any = ont.latest_submission(status: :any)
 
           if latest_any
-            log_path = "#{LinkedData.settings.repository_folder}/#{NcboCron::Models::OntologiesReport.new.log_file(params["acronym"], latest_any.submissionId.to_s)}"
+            log_path = "#{LinkedData.settings.repository_folder}/#{LinkedData::Jobs::OntologiesReportJob.log_file(params["acronym"], latest_any.submissionId.to_s)}"
 
             if !log_path.empty? && File.file?(log_path)
               file = File.open(log_path, "rb")

jobs/submission_process_job.rb

@@ -76,7 +76,7 @@ def perform(options = {})
       multi_logger.error "Submission #{submission_id} parsing failed"
     end
 
-    NcboCron::Models::OntologiesReport.new(multi_logger).refresh_report([sub.ontology.acronym])
+    LinkedData::Jobs::OntologiesReportJob.perform_async({ "acronyms" => [sub.ontology.acronym] })
 
     clear_current_user
   end