Merge pull request #970 from ctti-clinicaltrials/dev

Hotfix

Author: micronix

app/models/search_result.rb

@@ -29,7 +29,7 @@ def self.make_tsv(condition = 'covid-19')
     filename = "#{name}.tsv"
     record = FileRecord.create(file_type: condition, filename: filename)
     record.file.attach(io: File.open(file),  filename: filename)
-    record.update(url: record.file.service_url(filename: filename))
+    record.update(url: record.file.service.send(:object_for, record.file.key).public_url)
   end
 
   def self.study_values(study)

app/models/util/db_manager.rb

@@ -40,11 +40,6 @@ def dump_database
       puts cmd
       run_command_line(cmd)
 
-      filename = File.basename(dump_file_location)
-      record = FileRecord.create(file_type: "snapshot", filename: filename )
-      record.file.attach(io: File.open(dump_file_location), filename: filename)
-      record.update(url: record.file.service_url(filename: filename))
-
       return dump_file_location
     end
 

app/models/util/file_manager.rb

@@ -219,7 +219,7 @@ def save_static_copy(schema='ctgov')
       filename = File.basename(zip_file_name)
       record = FileRecord.create(file_type: "snapshot", filename: "#{filename}") 
       record.file.attach(io: File.open(zip_file_name), filename: "#{filename}")
-      record.update(url: Rails.application.routes.url_helpers.rails_blob_path(record.file, only_path: true))
+      record.update(url: record.file.service.send(:object_for, record.file.key).public_url)
 
       zip_file_name
     end

app/models/util/table_exporter.rb

@@ -22,7 +22,7 @@ def run(delimiter: '|', should_archive: true)
         end
         record = FileRecord.create(file_type: "pipefiles", filename: @zipfile_name)
         record.file.attach(io: File.open(@zipfile_name), filename: @zipfile_name)
-        record.update(url: record.file.service_url(filename: @zipfile_name))
+        record.update(url: record.file.service.send(:object_for, record.file.key).public_url)
 
         if should_archive
           archive(delimiter)

config/storage.yml

@@ -13,4 +13,5 @@ digitalocean:
   secret_access_key: <%= ENV["DIGITALOCEAN_SECRET_ACCESS_KEY"] %>
   region: <%= ENV["DIGITALOCEAN_REGION"] %>
   bucket: <%= ENV["DIGITALOCEAN_BUCKET"] %>
-  public: true
+  upload:
+    acl: "public-read"