#414

backend/spec/services/counts_export_spec.rb

@@ -143,7 +143,9 @@ RSpec.describe 'Counts export contracts' do
     expect(CountsExportDownload.find(token, 'owner')).not_to be_nil
     expect(CountsExportDownload.find(token, 'other')).to be_nil
     post = create(:post)
-    PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
+    PostVersion.create!(
+        event_id: create_event!(event_type: 'unknown').id,
+        post:, version_no: 1, event_type: 'discard', url: post.url,
         title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
     expect(CountsExportDownload.find(token, 'owner')).to be_nil
   end

backend/spec/services/counts_pivot_security_spec.rb

@@ -13,7 +13,9 @@ RSpec.describe 'Counts masked pivot contracts' do
   let!(:tags) do
     ['A', 'B', 'C'].map do |name|
       tag = create(:tag, primary_name: name)
-      TagVersion.create!(tag:, version_no: 1, event_type: 'create', name:,
+      TagVersion.create!(
+          event_id: create_event!(event_type: 'unknown').id,
+          tag:, version_no: 1, event_type: 'create', name:,
           category: 'general', aliases: '', parent_tag_ids: '',
           names: { ja: { name:, script_code: 'Jpan', auto_generated: false, aliases: [] } },
           created_at: Time.utc(2023))
@@ -25,12 +27,16 @@ RSpec.describe 'Counts masked pivot contracts' do
     [[0, 1], [0], [1, 2]].each_with_index do |indexes, index|
       post = create(:post)
       snapshot = indexes.map { { tag_id: tags[_1].id, version_no: 1, sections: [] } }
-      PostVersion.create!(post:, version_no: 1, event_type: 'create',
+      PostVersion.create!(
+          event_id: create_event!(event_type: 'unknown').id,
+          post:, version_no: 1, event_type: 'create',
           title: "hidden-title-#{ index }", url: post.url, tags: '', tags_json: snapshot,
           parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 1))
       next if index == 2
 
-      PostVersion.create!(post:, version_no: 2, event_type: 'discard',
+      PostVersion.create!(
+          event_id: create_event!(event_type: 'unknown').id,
+          post:, version_no: 2, event_type: 'discard',
           title: "private-discard-#{ index }", url: post.url, tags: '', tags_json: [],
           parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 2))
     end
@@ -98,12 +104,16 @@ RSpec.describe 'Counts masked pivot contracts' do
 
   it 'uses changed-record membership for totals and hides changes to private predecessors' do
     post = PostVersion.order(:id).last.post
-    PostVersion.create!(post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
+    PostVersion.create!(
+        event_id: create_event!(event_type: 'unknown').id,
+        post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
         url: post.url, tags: '',
         tags_json: [{ tag_id: tags.last.id, version_no: 1, sections: [] }],
         parent_post_ids: '', created_at: Time.utc(2024, 3))
     restored = PostVersion.order(:id).first.post
-    PostVersion.create!(post: restored, version_no: 3, event_type: 'restore',
+    PostVersion.create!(
+        event_id: create_event!(event_type: 'unknown').id,
+        post: restored, version_no: 3, event_type: 'restore',
         title: 'restored-public-title', url: restored.url, tags: '',
         tags_json: [{ tag_id: tags.first.id, version_no: 1, sections: [] }], parent_post_ids: '',
         created_at: Time.utc(2024, 4))
@@ -134,7 +144,9 @@ RSpec.describe 'Counts masked pivot contracts' do
 
   it 'keeps NULL as a public data value rather than treating it as a rollup' do
     post = create(:post)
-    PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'public bot',
+    PostVersion.create!(
+        event_id: create_event!(event_type: 'unknown').id,
+        post:, version_no: 1, event_type: 'create', title: 'public bot',
         url: post.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 5))
     page = result(nil, 'rows' => 'user', 'cols' => 'event_type')
     expect(page[:cells].select { _1[:values].first.nil? }.sum { _1[:count] }).to eq(1)
@@ -145,7 +157,9 @@ RSpec.describe 'Counts masked pivot contracts' do
   it 'sorts public numeric values numerically alongside a masked group' do
     post = PostVersion.order(:id).last.post
     [2, 10].each do |number|
-      PostVersion.create!(post:, version_no: number, event_type: 'update',
+      PostVersion.create!(
+          event_id: create_event!(event_type: 'unknown').id,
+          post:, version_no: number, event_type: 'update',
           title: 'public numeric sort', url: post.url, tags: '', tags_json: [],
           parent_post_ids: '', created_at: Time.utc(2024, 5))
     end

backend/spec/services/material_sync_importer_spec.rb

@@ -56,6 +56,7 @@ RSpec.describe MaterialSyncImporter do
                                profile: 'legacy_drive',
                                export_path: '素材/a.png',
                                created_by_user: user)
+    events = event_rows
 
     result =
         described_class.import!(
@@ -73,6 +74,7 @@ RSpec.describe MaterialSyncImporter do
     expect(result.action).to eq(:unchanged)
     expect(material.reload.tag).to eq(tag)
     expect(material.url).to eq('https://example.com/human')
+    expect(event_rows).to eq(events)
   end
 
   it 'suppresses a Google Drive candidate by relative path prefix' do

backend/spec/services/material_sync_runner_spec.rb

@@ -14,6 +14,47 @@ RSpec.describe MaterialSyncRunner do
   let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
 
   describe '#sync!' do
+    it 'groups created and updated materials across sync sources into one event' do
+      existing = Material.create!(
+          source_kind: 'google_drive_file', source_file_id: 'existing-file',
+          source_path: 'old.png', url: 'https://example.com/existing',
+          created_by_user: user, updated_by_user: user)
+      source
+      MaterialSyncSource.create!(
+          name: 'Second Drive source', source_kind: 'google_drive_path',
+          source_file_id: 'folder-456', profile: 'legacy_drive',
+          created_by_user: user, updated_by_user: user)
+      allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
+      allow(drive_client).to receive(:each_material_file_under_folder) do |folder_id, &block|
+        id = folder_id == 'folder-123' ? 'existing-file' : 'new-file'
+        block.call(id:, name: "#{ id }.png", mime_type: 'image/png',
+                   relative_path: "素材/#{ id }.png", sha256_checksum: nil,
+                   web_view_link: "https://drive.google.com/file/d/#{ id }/view")
+      end
+      allow(drive_client).to receive(:download_to_tempfile) do |id, **|
+        Tempfile.new(['sync-event', '.png']).tap do |file|
+          file.binmode
+          file.write(id)
+          file.rewind
+        end
+      end
+      allow(MaterialThumbnailGenerator).to receive(:generate!)
+      previous_ids = MaterialVersion.pluck(:id)
+
+      result = nil
+      expect { result = described_class.sync_enabled! }
+          .to change { event_rows.length }.by(1)
+
+      expect(result).to have_attributes(imported: 1, updated: 1, failed: 0)
+      event = event_rows.last
+      expect(event.fetch('event_type')).to eq('materials.sync')
+      created = Material.find_by!(source_file_id: 'new-file')
+      versions = MaterialVersion.where.not(id: previous_ids)
+      expect(versions.pluck(:material_id).uniq).to contain_exactly(existing.id, created.id)
+      expect(versions.pluck(:event_type)).to include('create', 'update')
+      expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
+    end
+
     it 'imports google drive path candidates as they are yielded' do
       first_entry = { id: 'file-1',
                       name: 'a.png',

backend/spec/services/post_bulk_creator_spec.rb

@@ -88,3 +88,86 @@ RSpec.describe PostBulkCreator do
     expect(creator).to have_received(:create!).with(locale).once
   end
 end
+
+RSpec.describe 'PostBulkCreator event grouping', type: :model do
+  self.use_transactional_tests = false
+
+  before do
+    expect(Rails.env.test?).to be(true)
+    expect(ApplicationRecord.connection.open_transactions).to eq(0)
+    @prefix = "bulk_event_#{ SecureRandom.hex(8) }"
+    @actor = create(:user, :member)
+    allow(PostCreatePreflight).to receive(:new) do |attributes:, **|
+      specs = [{ name: attributes.fetch(:title), category: :general }]
+      instance_double(PostCreatePreflight, run: attributes.merge(
+          existing_post_id: nil, snapshot_tag_specs: specs, post_tag_specs: specs,
+          normalised_parent_post_ids: [], tag_sections: { }, video_ms: nil))
+    end
+  end
+
+  after do
+    if @actor
+      posts = Post.where(uploaded_user: @actor)
+      PostTagSection.where(post_id: posts.select(:id)).delete_all
+      PostTag.where(post_id: posts.select(:id)).delete_all
+      PostVersion.where(post_id: posts.select(:id)).delete_all
+      posts.delete_all
+      tag_ids = TagName.where(name: ["#{ @prefix }_1", "#{ @prefix }_2"]).pluck(:tag_id)
+      TagVersion.where(tag_id: tag_ids).delete_all
+      TagName.where(tag_id: tag_ids).delete_all
+      Tag.where(id: tag_ids).delete_all
+      EventRecords::EventRow.where(created_by_user_id: @actor.id).delete_all
+      @actor.delete
+    end
+  end
+
+  it 'shares one creation event between real workers and their tag histories' do
+    posts = [1, 2].map do |number|
+      { title: "#{ @prefix }_#{ number }",
+        url: "https://example.com/#{ @prefix }/#{ number }" }
+    end
+
+    result = nil
+    expect {
+      result = PostBulkCreator.new(actor: @actor, posts:, thumbnails: { })
+          .run(Locale.nipponese)
+    }.to change { event_rows.length }.by(1)
+
+    expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['created', 'created'])
+    event = event_rows.last
+    expect(event).to include(
+        'event_type' => 'posts.create', 'created_by_user_id' => @actor.id)
+    versions = PostVersion.where(created_by_user_id: @actor.id)
+    expect(versions.count).to eq(2)
+    expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
+    tag_versions = TagVersion.where(created_by_user_id: @actor.id)
+    expect(tag_versions.count).to eq(2)
+    expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
+  end
+
+  it 'does not leave an event when every row fails validation' do
+    preflight = instance_double(PostCreatePreflight)
+    allow(PostCreatePreflight).to receive(:new).and_return(preflight)
+    allow(preflight).to receive(:run).and_raise(
+        PostCreatePreflight::ValidationFailed.new(fields: { url: ['invalid'] }))
+    events = event_rows
+
+    result = PostBulkCreator.new(
+        actor: @actor, posts: [{ title: 'invalid' }], thumbnails: { }).run(Locale.nipponese)
+
+    expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['failed'])
+    expect(event_rows).to eq(events)
+  end
+
+  it 'does not leave an event when every row is skipped' do
+    preflight = instance_double(PostCreatePreflight, run: { existing_post_id: 123 })
+    allow(PostCreatePreflight).to receive(:new).and_return(preflight)
+    events = event_rows
+
+    result = PostBulkCreator.new(
+        actor: @actor, posts: [{ title: 'existing' }], thumbnails: { }).run(Locale.nipponese)
+
+    expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['skipped'])
+    expect(event_rows).to eq(events)
+  end
+end

backend/spec/services/shared_resource_id_allocator_mysql_spec.rb

@@ -16,6 +16,7 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
     @tag = create(:tag, primary_name: "#{ @prefix }_owner")
     @group = TagGroup.create!(name: "#{ @prefix }_owner", version_no: 1)
     @tag_ids = Queue.new
+    @event_ids = Queue.new
     @threads = []
     @release = Queue.new
   end
@@ -42,6 +43,9 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
       ids << @tag.id if @tag
       TagName.where(tag_id: ids).delete_all
       Tag.where(id: ids).delete_all
+      event_ids = []
+      event_ids << @event_ids.pop until @event_ids.empty? if @event_ids
+      EventRecords::EventRow.where(id: event_ids).delete_all
     end
   end
 
@@ -72,11 +76,17 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
     when :description
       TagDescription.create!(tag: @tag, language_code: 'ja', body: '', version_no: 1)
     when :description_version
+      event = create_event!(event_type: 'unknown')
+      @event_ids << event.id
       TagDescriptionVersion.create!(
+          event_id: event.id,
           tag_id: @tag.id, language_code: 'ja', body: 'body', version_no: 1,
           event_type: 'create', created_at: Time.current)
     when :group_version
+      event = create_event!(event_type: 'unknown')
+      @event_ids << event.id
       TagGroupVersion.create!(
+          event_id: event.id,
           tag_group: @group, name: @group.name, version_no: 1, event_type: 'create',
           members: [], placements: [], created_at: Time.current)
     when :group

backend/spec/services/shared_resource_id_allocator_spec.rb

@@ -15,10 +15,12 @@ RSpec.describe SharedResourceIdAllocator do
       TagGroup.new(id:, name: "group #{ number }", version_no: number)
     when 'tag_description_versions'
       TagDescriptionVersion.new(
+          event_id: create_event!(event_type: 'unknown').id,
           id:, tag_id: tag.id, language_code: 'ja', body: 'body', version_no: number,
           event_type: 'create', created_at: Time.current)
     when 'tag_group_versions'
       TagGroupVersion.new(
+          event_id: create_event!(event_type: 'unknown').id,
           id:, tag_group_id: group.id, name: group.name, version_no: number,
           event_type: 'create', members: [], placements: [], created_at: Time.current)
     end
@@ -82,6 +84,7 @@ RSpec.describe SharedResourceIdAllocator do
   it 'reserves a Tag ID referenced only by remaining description history' do
     high = [Tag.maximum(:id).to_i, ExternalTag.maximum(:id).to_i].max + 1000
     TagDescriptionVersion.create!(
+        event_id: create_event!(event_type: 'unknown').id,
         tag_id: high, language_code: 'ja', version_no: 1, body: 'history',
         event_type: 'create', created_at: Time.current)
     expect(create(:tag).id).to be > high

backend/spec/services/youtube/sync_spec.rb

@@ -42,6 +42,41 @@ RSpec.describe Youtube::Sync do
   end
 
   describe '#sync!' do
+    it 'groups created and updated post histories into one sync event' do
+      allow(PostVersionRecorder).to receive(:record!).and_call_original
+      allow(PostVersionRecorder).to receive(:ensure_snapshot!).and_call_original
+      existing = create(:post, url: 'https://youtu.be/video-1', title: 'old title')
+      allow(sync).to receive(:query_terms).and_return([])
+      allow(sync).to receive(:playlist_ids).and_return(['PL123'])
+      allow(client).to receive(:playlist_items).with(playlist_id: 'PL123', page_token: nil)
+          .and_return('items' => [
+              { 'contentDetails' => { 'videoId' => 'video-1' } },
+              { 'contentDetails' => { 'videoId' => 'video-2' } }])
+      allow(client).to receive(:videos).with(['video-1', 'video-2'])
+          .and_return('items' => [
+              youtube_video_item(id: 'video-1', title: 'updated', channel_id: 'UC_NONE'),
+              youtube_video_item(id: 'video-2', title: 'created', channel_id: 'UC_NONE')])
+      previous_post_ids = PostVersion.pluck(:id)
+      previous_tag_ids = TagVersion.pluck(:id)
+
+      expect { sync.sync! }.to change { event_rows.length }.by(1)
+
+      event = event_rows.last
+      expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
+      versions = PostVersion.where.not(id: previous_post_ids)
+      created = Post.find_by!(url: 'https://www.youtube.com/watch?v=video-2')
+      expect(versions.pluck(:post_id).uniq).to contain_exactly(existing.id, created.id)
+      expect(versions.pluck(:event_type)).to include('create', 'update')
+      expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
+      tag_versions = TagVersion.where.not(id: previous_tag_ids)
+      expect(tag_versions).not_to be_empty
+      expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
+
+      events = event_rows
+      expect { sync.sync! }.not_to change(PostVersion, :count)
+      expect(event_rows).to eq(events)
+    end
+
     it 'returns without fetching video details when no video ids are discovered' do
       allow(sync).to receive(:query_terms).and_return([])
       allow(sync).to receive(:playlist_ids).and_return([])