Refactor Geo::RepositoryRenamedEventStore

app/services/geo/repository_renamed_event_store.rb

 module Geo
   class RepositoryRenamedEventStore
-    attr_reader :project, :old_repo_path, :old_wiki_path, :old_name
+    attr_reader :project, :old_path, :old_path_with_namespace
 
-    def initialize(project, old_repo_path:, old_wiki_path:, old_name:)
+    def initialize(project, old_path:, old_path_with_namespace:)
       @project = project
-      @old_repo_path = old_repo_path
-      @old_wiki_path = old_wiki_path
-      @old_name = old_name
+      @old_path = old_path
+      @old_path_with_namespace = old_path_with_namespace
     end
 
     def create
@@ -28,15 +27,23 @@ module Geo
         project: project,
         repository_storage_name: project.repository.storage,
         repository_storage_path: project.repository_storage_path,
+        old_path_with_namespace: old_path_with_namespace,
         new_path_with_namespace: project.full_path,
-        old_path_with_namespace: old_repo_path,
-        old_wiki_path_with_namespace: old_wiki_path,
-        new_wiki_path_with_namespace: project.wiki.path_with_namespace,
-        old_project_name: old_project_name,
-        new_project_name: project.name
+        old_wiki_path_with_namespace: old_wiki_path_with_namespace,
+        new_wiki_path_with_namespace: new_wiki_path_with_namespace,
+        old_path: old_path,
+        new_path: project.path
       )
     end
 
+    def old_wiki_path_with_namespace
+      "#{old_path_with_namespace}.wiki"
+    end
+
+    def new_wiki_path_with_namespace
+      project.wiki.path_with_namespace
+    end
+
     def log(message)
       Rails.logger.info("#{self.class.name}: #{message} for project #{project.path_with_namespace} (#{project.id})")
     end

spec/services/geo/repository_renamed_event_store_spec.rb

+require 'spec_helper'
+
+describe Geo::RepositoryRenamedEventStore, services: true do
+  let(:project) { create(:empty_project, path: 'bar') }
+  let(:old_path) { 'foo' }
+  let(:old_path_with_namespace) { "#{project.namespace.full_path}/foo" }
+
+  subject { described_class.new(project, old_path: old_path, old_path_with_namespace: old_path_with_namespace) }
+
+  describe '#create' do
+    it 'does not create an event when not running on a primary node' do
+      allow(Gitlab::Geo).to receive(:primary?) { false }
+
+      expect { subject.create }.not_to change(Geo::RepositoryRenamedEvent, :count)
+    end
+
+    context 'when running on a primary node' do
+      before do
+        allow(Gitlab::Geo).to receive(:primary?) { true }
+      end
+
+      it 'creates a renamed event' do
+        expect { subject.create }.to change(Geo::RepositoryRenamedEvent, :count).by(1)
+      end
+
+      it 'tracks old and new paths for project repositories' do
+        subject.create
+
+        event = Geo::RepositoryRenamedEvent.last
+
+        expect(event.repository_storage_name).to eq(project.repository_storage)
+        expect(event.repository_storage_path).to eq(project.repository_storage_path)
+        expect(event.old_path_with_namespace).to eq(old_path_with_namespace)
+        expect(event.new_path_with_namespace).to eq(project.full_path)
+        expect(event.old_wiki_path_with_namespace).to eq("#{old_path_with_namespace}.wiki")
+        expect(event.new_wiki_path_with_namespace).to eq("#{project.full_path}.wiki")
+        expect(event.old_path).to eq(old_path)
+        expect(event.new_path).to eq(project.path)
+      end
+    end
+  end
+end