#399

backend/app/services/post_create_preflight.rb

@@ -18,24 +18,54 @@ class PostCreatePreflight
     preview = PostImportPreviewer.new.preview_rows(
         rows: [preview_row],
         fetch_metadata: false).first
-
-    validate_thumbnail_upload!
+    if preview[:existing_post_id].present?
+      return {
+          url: preview[:url],
+          title: preview[:attributes]['title'],
+          thumbnail_base: preview[:attributes]['thumbnail_base'],
+          tags: preview[:attributes]['tags'],
+          parent_post_ids: preview[:attributes]['parent_post_ids'],
+          original_created_from: preview[:attributes]['original_created_from'],
+          original_created_before: preview[:attributes]['original_created_before'],
+          duration: preview[:attributes]['duration'],
+          video_ms: preview[:attributes]['video_ms'],
+          field_warnings: final_field_warnings(preview[:field_warnings] || { }),
+          base_warnings: preview[:base_warnings],
+          existing_post: existing_post_compact(preview[:existing_post_id]) }
+    end
 
     if preview[:validation_errors].present?
       raise ValidationFailed.new(fields: preview[:validation_errors])
     end
 
+    validate_thumbnail_upload!
+
+    plan = PostCreatePlan.new(
+        attributes: {
+            url: preview[:url],
+            title: preview[:attributes]['title'],
+            thumbnail_base: preview[:attributes]['thumbnail_base'],
+            tags: preview[:attributes]['tags'],
+            parent_post_ids: preview[:attributes]['parent_post_ids'],
+            original_created_from: preview[:attributes]['original_created_from'],
+            original_created_before: preview[:attributes]['original_created_before'],
+            duration: preview[:attributes]['duration'],
+            video_ms: preview[:attributes]['video_ms'] }).build!
+
     {
-        url: preview[:url],
-        title: preview[:attributes]['title'],
-        thumbnail_base: preview[:attributes]['thumbnail_base'],
-        tags: preview[:attributes]['tags'],
-        parent_post_ids: preview[:attributes]['parent_post_ids'],
-        original_created_from: preview[:attributes]['original_created_from'],
-        original_created_before: preview[:attributes]['original_created_before'],
-        duration: preview[:attributes]['duration'],
-        video_ms: preview[:attributes]['video_ms'],
-        field_warnings: preview[:field_warnings],
+        url: plan[:url],
+        title: plan[:title],
+        thumbnail_base: plan[:thumbnail_base],
+        tags: plan[:tags],
+        parent_post_ids: plan[:parent_post_ids],
+        original_created_from: plan[:original_created_from],
+        original_created_before: plan[:original_created_before],
+        duration: plan[:duration],
+        video_ms: plan[:video_ms],
+        normalised_tags: plan[:normalised_tags],
+        tag_sections: plan[:tag_sections],
+        normalised_parent_post_ids: plan[:normalised_parent_post_ids],
+        field_warnings: final_field_warnings(preview[:field_warnings] || { }),
         base_warnings: preview[:base_warnings],
         existing_post: existing_post_compact(preview[:existing_post_id]) }
   end
@@ -78,10 +108,9 @@ class PostCreatePreflight
     return if @attributes[:thumbnail_base].present?
     return if @thumbnail.blank?
 
-    attachment = Post.resized_thumbnail_attachment(@thumbnail)
-    attachment[:io].close if attachment[:io].respond_to?(:close)
-  rescue MiniMagick::Error
-    raise ValidationFailed.new(fields: { thumbnail: ['サムネイル画像の変換に失敗しました．'] })
+    PostThumbnailUploadValidator.validate!(@thumbnail)
+  rescue PostThumbnailUploadValidator::InvalidUpload => e
+    raise ValidationFailed.new(fields: { thumbnail: [e.message] })
   end
 
   def existing_post_compact post_id
@@ -90,4 +119,15 @@ class PostCreatePreflight
     post = Post.with_attached_thumbnail.find_by(id: post_id)
     PostCompactRepr.base(post)
   end
+
+  def final_field_warnings field_warnings
+    thumbnail_warnings = (field_warnings['thumbnail_base'] || []).reject { _1 == 'サムネールなし' }
+    if @attributes[:thumbnail_base].blank? && @thumbnail.blank?
+      thumbnail_warnings = (thumbnail_warnings + ['サムネールなし']).uniq
+    end
+
+    {
+        **field_warnings,
+        'thumbnail_base' => thumbnail_warnings }
+  end
 end