fix: select columns and join tables manually for all providers xml file (#396)

Author: dcollie2

Gemfile

@@ -5,7 +5,7 @@ ruby "3.4.1"
 gem "active_storage_validations"
 gem "acts-as-taggable-on"
 gem "aws-sdk-s3", require: false
-gem "azure_file_shares", github: "dmitrytrager/azure_file_shares"
+gem "azure_file_shares"
 gem "bcrypt", "~> 3.1.7"
 gem "bootsnap", require: false
 gem "csv"

Gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: https://github.com/dmitrytrager/azure_file_shares.git
-  revision: 1df11d8f198e726e8eb8a2a9cc6826cc1c6707a6
-  specs:
-    azure_file_shares (0.1.5)
-      faraday (~> 2.7)
-      faraday-retry (~> 2.0)
-      jwt (~> 2.7)
-      nokogiri (~> 1.15)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -116,6 +106,11 @@ GEM
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
+    azure_file_shares (0.1.5)
+      faraday (~> 2.7)
+      faraday-retry (~> 2.0)
+      jwt (~> 2.7)
+      nokogiri (~> 1.15)
     base64 (0.3.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.1)
@@ -594,7 +589,7 @@ DEPENDENCIES
   acts-as-taggable-on
   annotaterb
   aws-sdk-s3
-  azure_file_shares!
+  azure_file_shares
   bcrypt (~> 3.1.7)
   bootsnap
   brakeman

app/services/csv_generator/tag_details.rb

@@ -14,9 +14,7 @@ def headers
 
   def scope
     language.topics.active.includes(:tags)
-      .flat_map do |topic|
-        topic.tags_on(language.code.to_sym)
-      end
+      .flat_map { |topic| topic.tags_on(language.code.to_sym) }
       .uniq
       .map do |tag|
         [

app/services/xml_generator/all_providers.rb

@@ -7,7 +7,10 @@ def initialize(language, **args)
   attr_reader :language, :args
 
   def xml_content(xml)
-    language.providers.includes(:topics)
+    language.providers
+      .select("providers.id, providers.name, topics.id AS topic_id, topics.title AS topic_title, topics.created_at AS topic_created_at")
+      .joins(:topics)
+      .merge(Topic.with_attached_documents)
       .each do |provider|
         xml << provider_xml(provider)
       end

spec/services/xml_generator/all_providers_spec.rb

@@ -7,7 +7,7 @@
   let(:provider1) { create(:provider) }
   let(:provider2) { create(:provider) }
   let!(:topic1) { create(:topic, :tagged, language:, provider: provider1) }
-  let!(:topic2) { create(:topic, :tagged, language:, provider: provider2) }
+  let!(:topic2) { create(:topic, :with_documents, :tagged, language:, provider: provider2) }
   let(:tag_topic1) { create(:tag, name: "flu") }
   let(:tag_topic2) { create(:tag, name: "diabetes") }
 
@@ -39,7 +39,9 @@
               <topic_month month="#{topic2.created_at.strftime("%m_%B")}">
                 <title name="#{topic2.title}">
                   <topic_id>#{topic2.id}</topic_id>
-                  <topic_files files="Files"/>
+                  <topic_files files="Files">
+                    <file_name_1 file_size="494323">test_image.png</file_name_1>
+                  </topic_files>
                   <topic_tags>#{topic2.current_tags_list.join(", ")}</topic_tags>
                 </title>
               </topic_month>