Merge branch 'master' into ECO-277/find-upvs-urls-with-sparql

slovensko-digital · Jun 20, 2024 · bddc359 · bddc359
2 parents 8fa1adb + 07da3b3
commit bddc359
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/app/jobs/upvs/find_public_authority_active_edesks_list_job.rb b/app/jobs/upvs/find_public_authority_active_edesks_list_job.rb
@@ -27,10 +27,12 @@ def perform
     response = Faraday.get(BASE_URL, {query: query})
 
     if response.success?
-      csv_dataset_url = response.body.split("\n")[1..].map(&:strip)
+      dataset_url = response.body.split("\n")[1..].map(&:strip)
                                                       .find { |url| Faraday.get(url).headers['Content-Disposition']&.include?('.csv') }
 
-      Upvs::FetchPublicAuthorityActiveEdesksListJob.perform_now(csv_dataset_url) if csv_dataset_url
+      raise "Dataset URL not found in response. Job: Upvs::FindPublicAuthorityActiveEdesksListJob" if dataset_url.nil?
+
+      Upvs::FetchPublicAuthorityActiveEdesksListJob.perform_now(dataset_url)
     else
       raise "Request to find latest dataset URL for set: #{SET_URL} failed with status code #{response.status}"
     end

diff --git a/app/jobs/upvs/find_public_authority_edesks_list_job.rb b/app/jobs/upvs/find_public_authority_edesks_list_job.rb
@@ -30,7 +30,9 @@ def perform
       dataset_url = response.body.split("\n")[1..].map(&:strip)
                                                   .find { |url| Faraday.get(url).headers['Content-Disposition']&.include?('.csv') }
 
-      Upvs::FetchPublicAuthorityEdesksListJob.perform_now(dataset_url) if dataset_url
+      raise "Dataset URL not found in response. Job: Upvs::FindPublicAuthorityEdesksListJob" if dataset_url.nil?
+
+      Upvs::FetchPublicAuthorityEdesksListJob.perform_now(dataset_url)
     else
       raise "Request to find latest dataset URL for set: #{SET_URL} failed with status code #{response.status}"
     end

diff --git a/app/jobs/upvs/find_services_with_forms_list_job.rb b/app/jobs/upvs/find_services_with_forms_list_job.rb
@@ -30,7 +30,9 @@ def perform
       dataset_url = response.body.split("\n")[1..].map(&:strip)
                                                   .find { |url| Faraday.get(url).headers['Content-Disposition']&.include?('.zip') }
 
-      Upvs::FetchServicesWithFormsListJob.perform_now(dataset_url) if dataset_url
+      raise "Dataset URL not found in response. Job: Upvs::FindServicesWithFormsListJob" if dataset_url.nil?
+
+      Upvs::FetchServicesWithFormsListJob.perform_now(dataset_url)
     else
       raise "Request to find latest dataset URL for set: #{SET_URL} failed with status code #{response.status}"
     end