#399

backend/app/services/post_bulk_creator.rb

@@ -12,30 +12,32 @@ class PostBulkCreator
 
     workers = Array.new(2) do
       Thread.new do
-        ActiveRecord::Base.connection_pool.with_connection do
-          actor = User.find(@actor_id)
-          loop do
-            index = nil
-            begin
-              index = mutex.synchronize do
-                current = next_index
-                next_index += 1
-                current
-              end
-              break if index >= @posts.length
+        Rails.application.executor.wrap do
+          ActiveRecord::Base.connection_pool.with_connection do
+            actor = User.find(@actor_id)
+            loop do
+              index = nil
+              begin
+                index = mutex.synchronize do
+                  current = next_index
+                  next_index += 1
+                  current
+                end
+                break if index >= @posts.length
 
-              attributes = @posts[index]
-              results[index] = create_row(actor, attributes, index)
-            rescue StandardError => e
-              Rails.logger.error(
-                  "post_bulk_creator_worker_failure #{ { error: e.class.name,
-                                                        message: e.message,
-                                                        index: }.to_json }")
-              results[index] = {
-                  status: 'failed',
-                  recoverable: false,
-                  errors: { base: ['登録中にエラーが発生しました．'] },
-                  base_errors: [] }
+                attributes = @posts[index]
+                results[index] = create_row(actor, attributes, index)
+              rescue StandardError => e
+                Rails.logger.error(
+                    "post_bulk_creator_worker_failure #{ { error: e.class.name,
+                                                          message: e.message,
+                                                          index: }.to_json }")
+                results[index] = {
+                    status: 'failed',
+                    recoverable: false,
+                    errors: { base: ['登録中にエラーが発生しました．'] },
+                    base_errors: [] }
+              end
             end
           end
         end
@@ -43,6 +45,16 @@ class PostBulkCreator
     end
     workers.each(&:join)
 
+    results.each_index do |index|
+      next if results[index].present?
+
+      results[index] = {
+          status: 'failed',
+          recoverable: false,
+          errors: { base: ['登録中にエラーが発生しました．'] },
+          base_errors: [] }
+    end
+
     { results: }
   end
 
@@ -156,7 +168,10 @@ class PostBulkCreator
         original_created_before: preflight[:original_created_before],
         duration: preflight[:duration],
         video_ms: preflight[:video_ms],
-        normalised_tags: preflight[:normalised_tags],
+        direct_tag_specs: preflight[:direct_tag_specs],
+        default_tag_specs: preflight[:default_tag_specs],
+        snapshot_tag_specs: preflight[:snapshot_tag_specs],
+        post_tag_specs: preflight[:post_tag_specs],
         tag_sections: preflight[:tag_sections],
         normalised_parent_post_ids: preflight[:normalised_parent_post_ids] }
   end