Skip to content

Commit bb847bf

Browse files
committed
fix: select columns and join tables manually for all providers xml file
1 parent 55cf7e3 commit bb847bf

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

app/services/csv_generator/tag_details.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ def headers
1414

1515
def scope
1616
language.topics.active.includes(:tags)
17-
.flat_map do |topic|
18-
topic.tags_on(language.code.to_sym)
19-
end
17+
.flat_map { |topic| topic.tags_on(language.code.to_sym) }
2018
.uniq
2119
.map do |tag|
2220
[

app/services/xml_generator/all_providers.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ def initialize(language, **args)
77
attr_reader :language, :args
88

99
def xml_content(xml)
10-
language.providers.includes(:topics)
10+
language.providers
11+
.select("providers.id, providers.name, topics.id AS topic_id, topics.title AS topic_title, topics.created_at AS topic_created_at")
12+
.joins(:topics)
13+
.merge(Topic.with_attached_documents)
1114
.each do |provider|
1215
xml << provider_xml(provider)
1316
end

spec/services/xml_generator/all_providers_spec.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
let(:provider1) { create(:provider) }
88
let(:provider2) { create(:provider) }
99
let!(:topic1) { create(:topic, :tagged, language:, provider: provider1) }
10-
let!(:topic2) { create(:topic, :tagged, language:, provider: provider2) }
10+
let!(:topic2) { create(:topic, :with_documents, :tagged, language:, provider: provider2) }
1111
let(:tag_topic1) { create(:tag, name: "flu") }
1212
let(:tag_topic2) { create(:tag, name: "diabetes") }
1313

@@ -39,7 +39,9 @@
3939
<topic_month month="#{topic2.created_at.strftime("%m_%B")}">
4040
<title name="#{topic2.title}">
4141
<topic_id>#{topic2.id}</topic_id>
42-
<topic_files files="Files"/>
42+
<topic_files files="Files">
43+
<file_name_1 file_size="494323">test_image.png</file_name_1>
44+
</topic_files>
4345
<topic_tags>#{topic2.current_tags_list.join(", ")}</topic_tags>
4446
</title>
4547
</topic_month>

0 commit comments

Comments
 (0)