Merge pull request #940 from ctti-clinicaltrials/dev

Release 6.2.2

Author: micronix

.gitignore

@@ -19,4 +19,5 @@ server.env
 .byebug_history
 /config/connections.yml
 data
-/public/static/documentation/schema.dot
+/public/static/documentation/schema.dot
+/storage

app/models/search_result.rb

@@ -28,7 +28,7 @@ def self.make_tsv(condition = 'covid-19')
     end
     filename = "#{name}.tsv"
     record = FileRecord.create(file_type: condition, filename: filename)
-    record.file.attach(io: File.open(file_path),  filename: "#{name}.tsv")
+    record.file.attach(io: File.open(file),  filename: "#{name}.tsv")
   end
 
   def self.study_values(study)

app/models/util/file_manager.rb

@@ -219,6 +219,8 @@ 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(file.file, only_path: true))
+
       zip_file_name
     end
 

db/migrate/20220329173304_add_url_to_file_record.rb

@@ -0,0 +1,5 @@
+class AddUrlToFileRecord < ActiveRecord::Migration[6.0]
+  def change
+    add_column :file_records, :url, :string
+  end
+end

db/structure.sql

@@ -282,6 +282,74 @@ SET default_tablespace = '';
 
 SET default_table_access_method = heap;
 
+--
+-- Name: active_storage_attachments; Type: TABLE; Schema: ctgov; Owner: -
+--
+
+CREATE TABLE ctgov.active_storage_attachments (
+    id bigint NOT NULL,
+    name character varying NOT NULL,
+    record_type character varying NOT NULL,
+    record_id bigint NOT NULL,
+    blob_id bigint NOT NULL,
+    created_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: active_storage_attachments_id_seq; Type: SEQUENCE; Schema: ctgov; Owner: -
+--
+
+CREATE SEQUENCE ctgov.active_storage_attachments_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: active_storage_attachments_id_seq; Type: SEQUENCE OWNED BY; Schema: ctgov; Owner: -
+--
+
+ALTER SEQUENCE ctgov.active_storage_attachments_id_seq OWNED BY ctgov.active_storage_attachments.id;
+
+
+--
+-- Name: active_storage_blobs; Type: TABLE; Schema: ctgov; Owner: -
+--
+
+CREATE TABLE ctgov.active_storage_blobs (
+    id bigint NOT NULL,
+    key character varying NOT NULL,
+    filename character varying NOT NULL,
+    content_type character varying,
+    metadata text,
+    byte_size bigint NOT NULL,
+    checksum character varying NOT NULL,
+    created_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: active_storage_blobs_id_seq; Type: SEQUENCE; Schema: ctgov; Owner: -
+--
+
+CREATE SEQUENCE ctgov.active_storage_blobs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: active_storage_blobs_id_seq; Type: SEQUENCE OWNED BY; Schema: ctgov; Owner: -
+--
+
+ALTER SEQUENCE ctgov.active_storage_blobs_id_seq OWNED BY ctgov.active_storage_blobs.id;
+
+
 --
 -- Name: browse_conditions; Type: TABLE; Schema: ctgov; Owner: -
 --
@@ -1462,7 +1530,8 @@ CREATE TABLE ctgov.file_records (
     file_size bigint,
     file_type character varying,
     created_at timestamp(6) without time zone NOT NULL,
-    updated_at timestamp(6) without time zone NOT NULL
+    updated_at timestamp(6) without time zone NOT NULL,
+    url character varying
 );
 
 
@@ -2590,6 +2659,20 @@ CREATE SEQUENCE support.study_xml_records_id_seq
 ALTER SEQUENCE support.study_xml_records_id_seq OWNED BY support.study_xml_records.id;
 
 
+--
+-- Name: active_storage_attachments id; Type: DEFAULT; Schema: ctgov; Owner: -
+--
+
+ALTER TABLE ONLY ctgov.active_storage_attachments ALTER COLUMN id SET DEFAULT nextval('ctgov.active_storage_attachments_id_seq'::regclass);
+
+
+--
+-- Name: active_storage_blobs id; Type: DEFAULT; Schema: ctgov; Owner: -
+--
+
+ALTER TABLE ONLY ctgov.active_storage_blobs ALTER COLUMN id SET DEFAULT nextval('ctgov.active_storage_blobs_id_seq'::regclass);
+
+
 --
 -- Name: baseline_counts id; Type: DEFAULT; Schema: ctgov; Owner: -
 --
@@ -2968,6 +3051,22 @@ ALTER TABLE ONLY support.study_json_records ALTER COLUMN id SET DEFAULT nextval(
 ALTER TABLE ONLY support.study_xml_records ALTER COLUMN id SET DEFAULT nextval('support.study_xml_records_id_seq'::regclass);
 
 
+--
+-- Name: active_storage_attachments active_storage_attachments_pkey; Type: CONSTRAINT; Schema: ctgov; Owner: -
+--
+
+ALTER TABLE ONLY ctgov.active_storage_attachments
+    ADD CONSTRAINT active_storage_attachments_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: active_storage_blobs active_storage_blobs_pkey; Type: CONSTRAINT; Schema: ctgov; Owner: -
+--
+
+ALTER TABLE ONLY ctgov.active_storage_blobs
+    ADD CONSTRAINT active_storage_blobs_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: ar_internal_metadata ar_internal_metadata_pkey; Type: CONSTRAINT; Schema: ctgov; Owner: -
 --
@@ -3416,6 +3515,27 @@ ALTER TABLE ONLY support.study_xml_records
     ADD CONSTRAINT study_xml_records_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: index_active_storage_attachments_on_blob_id; Type: INDEX; Schema: ctgov; Owner: -
+--
+
+CREATE INDEX index_active_storage_attachments_on_blob_id ON ctgov.active_storage_attachments USING btree (blob_id);
+
+
+--
+-- Name: index_active_storage_attachments_uniqueness; Type: INDEX; Schema: ctgov; Owner: -
+--
+
+CREATE UNIQUE INDEX index_active_storage_attachments_uniqueness ON ctgov.active_storage_attachments USING btree (record_type, record_id, name, blob_id);
+
+
+--
+-- Name: index_active_storage_blobs_on_key; Type: INDEX; Schema: ctgov; Owner: -
+--
+
+CREATE UNIQUE INDEX index_active_storage_blobs_on_key ON ctgov.active_storage_blobs USING btree (key);
+
+
 --
 -- Name: index_baseline_measurements_on_category; Type: INDEX; Schema: ctgov; Owner: -
 --
@@ -4095,6 +4215,14 @@ CREATE INDEX "index_support.study_xml_records_on_nct_id" ON support.study_xml_re
 CREATE TRIGGER category_insert_trigger INSTEAD OF INSERT ON ctgov.categories FOR EACH ROW EXECUTE FUNCTION ctgov.category_insert_function();
 
 
+--
+-- Name: active_storage_attachments fk_rails_c3b3935057; Type: FK CONSTRAINT; Schema: ctgov; Owner: -
+--
+
+ALTER TABLE ONLY ctgov.active_storage_attachments
+    ADD CONSTRAINT fk_rails_c3b3935057 FOREIGN KEY (blob_id) REFERENCES ctgov.active_storage_blobs(id);
+
+
 --
 -- Name: sanity_checks fk_rails_9d86ec7e91; Type: FK CONSTRAINT; Schema: support; Owner: -
 --
@@ -4139,6 +4267,8 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20210601063550'),
 ('20211027133828'),
 ('20220202152642'),
-('20220212033048');
+('20220212033048'),
+('20220308030627'),
+('20220329173304');