Merge pull request #121 from lishengbao/graduation

Fix the problem of uploading multiple pictures
oss-compass · Aug 16, 2024 · de7fb8d · de7fb8d
2 parents c217539 + 4f33418
commit de7fb8d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/app/graphql/mutations/tpc/create_tpc_software_graduation_report.rb b/app/graphql/mutations/tpc/create_tpc_software_graduation_report.rb
@@ -31,8 +31,14 @@ def resolve(label: nil, level: 'repo', software_report: nil)
           software_report_data["subject_id"] = subject.id
           software_report_data["short_code"] = TpcSoftwareGraduationReport.generate_short_code
           report = TpcSoftwareGraduationReport.create(software_report_data)
-          architecture_diagrams.each do |architecture_diagram|
-            report.architecture_diagrams.attach(data: architecture_diagram.base64, filename: architecture_diagram.filename)
+          if architecture_diagrams.length > 0
+            diagrams_to_attach = architecture_diagrams.map do |architecture_diagram|
+              {
+                data: architecture_diagram.base64,
+                filename: architecture_diagram.filename
+              }
+            end
+            report.architecture_diagrams.attach(diagrams_to_attach)
           end
           report.save!
 

diff --git a/app/graphql/mutations/tpc/create_tpc_software_selection_report.rb b/app/graphql/mutations/tpc/create_tpc_software_selection_report.rb
@@ -39,8 +39,14 @@ def resolve(label: nil,
           software_report_data["website_url"] = ""
           software_report_data["short_code"] = TpcSoftwareSelectionReport.generate_short_code
           report = TpcSoftwareSelectionReport.create(software_report_data)
-          architecture_diagrams.each do |architecture_diagram|
-            report.architecture_diagrams.attach(data: architecture_diagram.base64, filename: architecture_diagram.filename)
+          if architecture_diagrams.length > 0
+            diagrams_to_attach = architecture_diagrams.map do |architecture_diagram|
+              {
+                data: architecture_diagram.base64,
+                filename: architecture_diagram.filename
+              }
+            end
+            report.architecture_diagrams.attach(diagrams_to_attach)
           end
           report.save!
 

diff --git a/app/graphql/mutations/tpc/update_tpc_software_graduation_report.rb b/app/graphql/mutations/tpc/update_tpc_software_graduation_report.rb
@@ -36,9 +36,13 @@ def resolve(report_id: nil, software_report: nil)
           end
 
           if new_images.present?
-            new_images.each do |image|
-              graduation_report.architecture_diagrams.attach(data: image.base64, filename: image.filename)
+            diagrams_to_attach = new_images.map do |architecture_diagram|
+              {
+                data: architecture_diagram.base64,
+                filename: architecture_diagram.filename
+              }
             end
+            graduation_report.architecture_diagrams.attach(diagrams_to_attach)
           end
         end
 

diff --git a/app/graphql/mutations/tpc/update_tpc_software_selection_report.rb b/app/graphql/mutations/tpc/update_tpc_software_selection_report.rb
@@ -37,9 +37,13 @@ def resolve(report_id: nil, software_report: nil)
           end
 
           if new_images.present?
-            new_images.each do |image|
-              selection_report.architecture_diagrams.attach(data: image.base64, filename: image.filename)
+            diagrams_to_attach = new_images.map do |architecture_diagram|
+              {
+                data: architecture_diagram.base64,
+                filename: architecture_diagram.filename
+              }
             end
+            selection_report.architecture_diagrams.attach(diagrams_to_attach)
           end
         end