#399

backend/app/services/post_creator.rb

@@ -21,12 +21,13 @@ class PostCreator
     ApplicationRecord.transaction do
       post.save!
       post.thumbnail.attach(thumbnail_attachment) if thumbnail_attachment.present?
-      tags = planned_tags
+      snapshot_tags = planned_snapshot_tags
+      post_tags = planned_post_tags
       sections = planned_sections
-      TagVersioning.record_tag_snapshots!(tags, created_by_user: @actor)
+      TagVersioning.record_tag_snapshots!(snapshot_tags, created_by_user: @actor)
       post.video_ms = planned_video_ms
       post.save!
-      sync_post_tags!(post, tags, sections)
+      sync_post_tags!(post, post_tags, sections)
       sync_parent_posts!(post, planned_parent_post_ids)
       PostVersionRecorder.record!(post:, event_type: :create, created_by_user: @actor)
     end
@@ -44,7 +45,9 @@ class PostCreator
         thumbnail_base: @attributes[:thumbnail_base].presence)
   end
 
-  def planned_tags = planned_create_attributes[:normalised_tags]
+  def planned_snapshot_tags = planned_create_attributes[:snapshot_tags]
+
+  def planned_post_tags = planned_create_attributes[:post_tags]
 
   def planned_sections = planned_create_attributes[:tag_sections]
 
@@ -56,18 +59,65 @@ class PostCreator
 
   def planned_create_attributes
     @planned_create_attributes ||= begin
-      if @attributes.key?(:normalised_tags)
+      if @attributes.key?(:snapshot_tag_specs)
+        snapshot_tags = materialise_tags(@attributes[:snapshot_tag_specs] || [])
+        post_tags = materialise_tags(@attributes[:post_tag_specs] || [])
         {
-            normalised_tags: @attributes[:normalised_tags],
-            tag_sections: @attributes[:tag_sections] || { },
+            snapshot_tags: snapshot_tags,
+            post_tags: post_tags,
+            tag_sections: materialise_sections(
+                @attributes[:tag_sections] || { },
+                snapshot_tags,
+                post_tags),
             normalised_parent_post_ids: @attributes[:normalised_parent_post_ids] || [],
             video_ms: @attributes[:video_ms] }
       else
-        PostCreatePlan.new(attributes: @attributes).build!
+        build_materialised_plan
       end
     end
   end
 
+  def build_materialised_plan
+    plan = PostCreatePlan.new(attributes: @attributes).build!
+    snapshot_tags = materialise_tags(plan[:snapshot_tag_specs] || [])
+    post_tags = materialise_tags(plan[:post_tag_specs] || [])
+    {
+        snapshot_tags: snapshot_tags,
+        post_tags: post_tags,
+        tag_sections: materialise_sections(
+            plan[:tag_sections] || { },
+            snapshot_tags,
+            post_tags),
+        normalised_parent_post_ids: plan[:normalised_parent_post_ids] || [],
+        video_ms: plan[:video_ms] }
+  end
+
+  def materialise_tags specs
+    Array(specs).each_with_object({ }) do |spec, tags|
+      name = spec[:name] || spec['name']
+      category = spec[:category] || spec['category']
+      next if name.blank? || category.blank?
+
+      tag = Tag.find_or_create_by_tag_name!(name, category:)
+      tag.update!(category:) if tag.category.to_sym != category.to_sym
+      tags[name] ||= tag
+    end.values
+  end
+
+  def materialise_sections sections_by_name, snapshot_tags, post_tags
+    tags_by_name = post_tags.index_by(&:name)
+    snapshot_tags.each do |tag|
+      tags_by_name[tag.name] ||= tag
+    end
+
+    sections_by_name.each_with_object({ }) do |(tag_name, ranges), sections|
+      tag = tags_by_name[tag_name.to_s]
+      next if tag.nil?
+
+      sections[tag.id] = Array(ranges).map { |range| [range[0], range[1]] }
+    end
+  end
+
   def sync_post_tags! post, desired_tags, sections
     desired_ids = desired_tags.map(&:id).to_set
     current_ids = post.tags.pluck(:id).to_set