Merge branch 'develop' into feature/s3_storage

.env.template

@@ -87,6 +87,7 @@ IIIF_SEARCH_ENDPOINT=
 CONFIG_IIIF_IMAGE_ENDPOINT=
 # If the rails server is configured to serve requests in https, set this to true
 IIIF_TO_SERVE_SSL_URLS=false
+CRC_FOLDER_IMPORT_PATH=/mnt/rdms_data/RUB/testData
 
 # Browse Everything credentials
 GOOGLE_DRIVE_CLIENT_ID=

.env.template.development

@@ -90,6 +90,7 @@ IIIF_SEARCH_ENDPOINT=
 CONFIG_IIIF_IMAGE_ENDPOINT=
 # If the rails server is configured to serve requests in https, set this to true
 IIIF_TO_SERVE_SSL_URLS=false
+CRC_FOLDER_IMPORT_PATH=/mnt/rdms_data/RUB/testData
 
 # Browse Everything credentials
 GOOGLE_DRIVE_CLIENT_ID=

docker-compose.yml

@@ -103,6 +103,7 @@ services:
   web:
     <<: *app
     command: bash -c "/bin/docker-entrypoint.sh"
+    restart: unless-stopped
     environment:
       - VIRTUAL_HOST=rdms.docker
       - VIRTUAL_PORT=3000

hyrax/app/services/prepare_csv_from_crc_folder.rb

@@ -84,13 +84,24 @@ class PrepareCsvFromCrcFolder
     ]
   end
 
+  def crc_1280_collection_source_indentifier
+    collection_type = Hyrax::CollectionType.find_or_create_by(title: 'CRC 1280')
+    collection_type_gid = "gid://hyrax3-app/Hyrax::CollectionType/#{collection_type.id}"
+
+    crc_1280_collections = collection_type.collections.select{ |t| t.title == ["CRC 1280"] }
+
+    return "" unless crc_1280_collections.any?
+
+    crc_1280_collections.first.source.join
+  end
+
   def prepare_group_data(group_folder_path, csv)
     experiment_folders_path = Dir.glob("#{group_folder_path}/*").select { |item| Pathname(item).directory? }
 
     title = group_folder_path.split('/').last
     source_identifier = SecureRandom.uuid
 
-    csv << ['Collection', 'CRC 1280', '', source_identifier, '', title]
+    csv << ['Collection', 'CRC 1280', '', source_identifier, crc_1280_collection_source_indentifier, title]
 
     return unless experiment_folders_path.present?
 

hyrax/lib/tasks/create_crc_1280_collection.rake

+# frozen_string_literal: true
+namespace :rdms do
+  namespace :crc_1280_collection do
+    desc "Create CRC 1280 Collection Types and CRC 1280 Collection"
+    task create: :environment do
+      collection_type = Hyrax::CollectionType.find_or_create_by(title: 'CRC 1280')
+      collection_type_gid = "gid://hyrax3-app/Hyrax::CollectionType/#{collection_type.id}"
+
+      crc_1280_collections = collection_type.collections.select{ |t| t.title == ["CRC 1280"] }
+
+      unless crc_1280_collections.any?
+        collection = Hyrax.config.collection_class.create(title: ['CRC 1280'], source:[SecureRandom.uuid], collection_type_gid: collection_type_gid)
+
+        admin_user = User.find_by(email: 'admin@hyrax')
+        collection.apply_depositor_metadata(admin_user.user_key)
+        collection.save
+      end
+    end
+  end
+end
\ No newline at end of file

hyrax/lib/tasks/setup_hyrax.rake

@@ -39,6 +39,7 @@ namespace :rdms do
     Rake::Task['hyrax:default_admin_set:create'].invoke
     Rake::Task['hyrax:workflow:load'].invoke
     Rake::Task['hyrax:default_collection_types:create'].invoke
+    Rake::Task['rdms:crc_1280_collection:create'].invoke
 
     ##############################################
     # Create languages controlled vocabulary