Merge branch '470888-cablett-elastic-work-item-serialisation-bug' into 'master'

Fix elastic work item serialisation specs

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158408



Merged-by: Dylan Griffith <dyl.griffith@gmail.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Co-authored-by: charlieablett <cablett@gitlab.com>

ee/spec/lib/search/elastic/references/work_item_spec.rb

@@ -16,89 +16,98 @@
 
     let(:result) { subject.as_indexed_json.with_indifferent_access }
 
-    it 'serializes the project_namespace work_item as a hash' do
-      result = described_class.new(project_work_item.id,
-        project_work_item.es_parent).as_indexed_json.with_indifferent_access
-      expect(result).to match(
-        project_id: project_work_item.reload.project_id,
-        id: project_work_item.id,
-        iid: project_work_item.iid,
-        created_at: project_work_item.created_at,
-        updated_at: project_work_item.updated_at,
-        title: project_work_item.title,
-        description: project_work_item.description,
-        state: project_work_item.state,
-        upvotes: project_work_item.upvotes_count,
-        hidden: project_work_item.hidden?,
-        work_item_type_id: project_work_item.work_item_type_id,
-        confidential: project_work_item.confidential,
-        author_id: project_work_item.author_id,
-        label_ids: [label.id.to_s],
-        assignee_id: project_work_item.issue_assignee_user_ids,
-        due_date: project_work_item.due_date,
-        traversal_ids: project_work_item.namespace.elastic_namespace_ancestry,
-        hashed_root_namespace_id: project_work_item.namespace.hashed_root_namespace_id,
-        namespace_visibility_level: project_work_item.namespace.visibility_level,
-        schema_version: described_class::SCHEMA_VERSION,
-        archived: project.archived?,
-        project_visibility_level: project.visibility_level,
-        work_item_access_level: project.issues_access_level,
-        type: 'work_item'
-      )
-    end
+    context 'when add_root_namespace_id_to_work_item migration is not complete' do
+      before do
+        allow(::Elastic::DataMigrationService).to receive(:migration_has_finished?)
+          .with(:add_root_namespace_id_to_work_item)
+          .and_return(false)
+      end
 
-    it 'serializes the user_namespace work_item as a hash' do
-      result = described_class.new(user_work_item.id, user_work_item.es_parent).as_indexed_json.with_indifferent_access
-      expect(result).to match(
-        project_id: user_work_item.reload.project_id,
-        id: user_work_item.id,
-        iid: user_work_item.iid,
-        created_at: user_work_item.created_at,
-        updated_at: user_work_item.updated_at,
-        title: user_work_item.title,
-        description: user_work_item.description,
-        state: user_work_item.state,
-        upvotes: user_work_item.upvotes_count,
-        hidden: user_work_item.hidden?,
-        work_item_type_id: user_work_item.work_item_type_id,
-        confidential: user_work_item.confidential,
-        author_id: user_work_item.author_id,
-        label_ids: [label.id.to_s],
-        assignee_id: user_work_item.issue_assignee_user_ids,
-        due_date: user_work_item.due_date,
-        traversal_ids: "#{user_work_item.namespace.id}-",
-        hashed_root_namespace_id: user_work_item.namespace.hashed_root_namespace_id,
-        namespace_visibility_level: user_work_item.namespace.visibility_level,
-        schema_version: described_class::SCHEMA_VERSION,
-        type: 'work_item'
-      )
-    end
+      it 'serializes the project_namespace work_item as a hash' do
+        result = described_class.new(project_work_item.id,
+          project_work_item.es_parent).as_indexed_json.with_indifferent_access
+        expect(result).to match(
+          project_id: project_work_item.reload.project_id,
+          id: project_work_item.id,
+          iid: project_work_item.iid,
+          created_at: project_work_item.created_at,
+          updated_at: project_work_item.updated_at,
+          title: project_work_item.title,
+          description: project_work_item.description,
+          state: project_work_item.state,
+          upvotes: project_work_item.upvotes_count,
+          hidden: project_work_item.hidden?,
+          work_item_type_id: project_work_item.work_item_type_id,
+          confidential: project_work_item.confidential,
+          author_id: project_work_item.author_id,
+          label_ids: [label.id.to_s],
+          assignee_id: project_work_item.issue_assignee_user_ids,
+          due_date: project_work_item.due_date,
+          traversal_ids: project_work_item.namespace.elastic_namespace_ancestry,
+          hashed_root_namespace_id: project_work_item.namespace.hashed_root_namespace_id,
+          namespace_visibility_level: project_work_item.namespace.visibility_level,
+          schema_version: described_class::SCHEMA_VERSION,
+          archived: project.archived?,
+          project_visibility_level: project.visibility_level,
+          work_item_access_level: project.issues_access_level,
+          type: 'work_item'
+        )
+      end
+
+      it 'serializes the user_namespace work_item as a hash' do
+        result = described_class.new(user_work_item.id, user_work_item.es_parent)
+                   .as_indexed_json.with_indifferent_access
+        expect(result).to match(
+          project_id: user_work_item.reload.project_id,
+          id: user_work_item.id,
+          iid: user_work_item.iid,
+          created_at: user_work_item.created_at,
+          updated_at: user_work_item.updated_at,
+          title: user_work_item.title,
+          description: user_work_item.description,
+          state: user_work_item.state,
+          upvotes: user_work_item.upvotes_count,
+          hidden: user_work_item.hidden?,
+          work_item_type_id: user_work_item.work_item_type_id,
+          confidential: user_work_item.confidential,
+          author_id: user_work_item.author_id,
+          label_ids: [label.id.to_s],
+          assignee_id: user_work_item.issue_assignee_user_ids,
+          due_date: user_work_item.due_date,
+          traversal_ids: "#{user_work_item.namespace.id}-",
+          hashed_root_namespace_id: user_work_item.namespace.hashed_root_namespace_id,
+          namespace_visibility_level: user_work_item.namespace.visibility_level,
+          schema_version: described_class::SCHEMA_VERSION,
+          type: 'work_item'
+        )
+      end
 
-    it 'serializes the object as a hash' do
-      expect(result).to match(
-        project_id: work_item.reload.project_id,
-        id: work_item.id,
-        iid: work_item.iid,
-        namespace_id: group.id,
-        created_at: work_item.created_at,
-        updated_at: work_item.updated_at,
-        title: work_item.title,
-        description: work_item.description,
-        state: work_item.state,
-        upvotes: work_item.upvotes_count,
-        hidden: work_item.hidden?,
-        work_item_type_id: work_item.work_item_type_id,
-        confidential: work_item.confidential,
-        author_id: work_item.author_id,
-        label_ids: [label.id.to_s],
-        assignee_id: work_item.issue_assignee_user_ids,
-        due_date: work_item.due_date,
-        traversal_ids: "#{parent_group.id}-#{group.id}-",
-        hashed_root_namespace_id: ::Search.hash_namespace_id(parent_group.id),
-        namespace_visibility_level: group.visibility_level,
-        schema_version: described_class::SCHEMA_VERSION,
-        type: 'work_item'
-      )
+      it 'serializes the object as a hash' do
+        expect(result).to match(
+          project_id: work_item.reload.project_id,
+          id: work_item.id,
+          iid: work_item.iid,
+          namespace_id: group.id,
+          created_at: work_item.created_at,
+          updated_at: work_item.updated_at,
+          title: work_item.title,
+          description: work_item.description,
+          state: work_item.state,
+          upvotes: work_item.upvotes_count,
+          hidden: work_item.hidden?,
+          work_item_type_id: work_item.work_item_type_id,
+          confidential: work_item.confidential,
+          author_id: work_item.author_id,
+          label_ids: [label.id.to_s],
+          assignee_id: work_item.issue_assignee_user_ids,
+          due_date: work_item.due_date,
+          traversal_ids: "#{parent_group.id}-#{group.id}-",
+          hashed_root_namespace_id: ::Search.hash_namespace_id(parent_group.id),
+          namespace_visibility_level: group.visibility_level,
+          schema_version: described_class::SCHEMA_VERSION,
+          type: 'work_item'
+        )
+      end
     end
 
     context 'when add_root_namespace_id_to_work_item migration is complete' do