Merge branch '10741-time-tracking-report-per-person-in-a-given-group' into 'master'

Add endpoint for tracking report per person in a given group

See merge request gitlab-org/gitlab!18689

ee/spec/policies/group_policy_spec.rb

@@ -61,6 +61,64 @@ describe GroupPolicy do
     it { is_expected.not_to be_allowed(:read_group_contribution_analytics) }
   end
+  context 'when timelogs report feature is enabled' do
+    before do
+      stub_licensed_features(group_timelogs: true)
+    end
+
+    context 'admin' do
+      let(:current_user) { admin }
+
+      it { is_expected.to be_allowed(:read_group_timelogs) }
+    end
+
+    context 'with owner' do
+      let(:current_user) { owner }
+
+      it { is_expected.to be_allowed(:read_group_timelogs) }
+    end
+
+    context 'with maintainer' do
+      let(:current_user) { maintainer }
+
+      it { is_expected.to be_allowed(:read_group_timelogs) }
+    end
+
+    context 'with reporter' do
+      let(:current_user) { reporter }
+
+      it { is_expected.to be_allowed(:read_group_timelogs) }
+    end
+
+    context 'with guest' do
+      let(:current_user) { guest }
+
+      it { is_expected.to be_disallowed(:read_group_timelogs) }
+    end
+
+    context 'with non member' do
+      let(:current_user) { create(:user) }
+
+      it { is_expected.to be_disallowed(:read_group_timelogs) }
+    end
+
+    context 'with anonymous' do
+      let(:current_user) { nil }
+
+      it { is_expected.to be_disallowed(:read_group_timelogs) }
+    end
+  end
+
+  context 'when timelogs report feature is disabled' do
+    let(:current_user) { admin }
+
+    before do
+      stub_licensed_features(group_timelogs: false)
+    end
+
+    it { is_expected.to be_disallowed(:read_group_timelogs) }
+  end
+
   describe 'per group SAML' do
     let(:current_user) { maintainer }

ee/spec/policies/project_policy_spec.rb

@@ -1119,4 +1119,62 @@ describe ProjectPolicy do
       it { is_expected.to be_allowed(:read_reject_unsigned_commits) }
     end
   end
+
+  context 'when timelogs report feature is enabled' do
+    before do
+      stub_licensed_features(group_timelogs: true)
+    end
+
+    context 'admin' do
+      let(:current_user) { admin }
+
+      it { is_expected.to be_allowed(:read_group_timelogs) }
+    end
+
+    context 'with owner' do
+      let(:current_user) { owner }
+
+      it { is_expected.to be_allowed(:read_group_timelogs) }
+    end
+
+    context 'with maintainer' do
+      let(:current_user) { maintainer }
+
+      it { is_expected.to be_allowed(:read_group_timelogs) }
+    end
+
+    context 'with reporter' do
+      let(:current_user) { reporter }
+
+      it { is_expected.to be_allowed(:read_group_timelogs) }
+    end
+
+    context 'with guest' do
+      let(:current_user) { guest }
+
+      it { is_expected.to be_disallowed(:read_group_timelogs) }
+    end
+
+    context 'with non member' do
+      let(:current_user) { create(:user) }
+
+      it { is_expected.to be_disallowed(:read_group_timelogs) }
+    end
+
+    context 'with anonymous' do
+      let(:current_user) { nil }
+
+      it { is_expected.to be_disallowed(:read_group_timelogs) }
+    end
+  end
+
+  context 'when timelogs report feature is disabled' do
+    let(:current_user) { admin }
+
+    before do
+      stub_licensed_features(group_timelogs: false)
+    end
+
+    it { is_expected.to be_disallowed(:read_group_timelogs) }
+  end
 end

ee/spec/requests/api/graphql/group/timelogs_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Timelogs through GroupQuery' do
+  include GraphqlHelpers
+
+  describe 'Get list of timelogs from a group issues' do
+    let(:user)          { create(:user) }
+    let(:group)         { create(:group) }
+    let(:project)       { create(:project, :public, group: group) }
+    let(:milestone)     { create(:milestone, group: group) }
+    let(:epic)          { create(:epic, group: group) }
+    let(:issue)         { create(:issue, project: project, milestone: milestone, epic: epic) }
+    let!(:timelog1)     { create(:timelog, issue: issue, user: user, spent_at: 10.days.ago) }
+    let!(:timelog2)     { create(:timelog, spent_at: 15.days.ago) }
+    let(:timelogs_data) { graphql_data['group']['timelogs']['edges'] }
+    let(:query) do
+      timelog_node = <<~NODE
+      edges {
+        node {
+          date
+          timeSpent
+          user {
+            username
+          }
+          issue {
+            title
+            milestone {
+              title
+            }
+            epic {
+              title
+            }
+          }
+        }
+      }
+      NODE
+
+      graphql_query_for("group", { "fullPath" => group.full_path },
+        ['groupTimelogsEnabled', query_graphql_field(
+          "timelogs",
+          { startDate: "#{13.days.ago.to_date}", endDate: "#{2.days.ago.to_date}" },
+          timelog_node
+        )]
+      )
+    end
+
+    before do
+      group.add_developer(user)
+      stub_licensed_features(group_timelogs: true, epics: true)
+    end
+
+    context 'when the request is correct' do
+      before do
+        post_graphql(query, current_user: user)
+      end
+
+      it_behaves_like 'a working graphql query'
+
+      it 'returns timelogs successfully' do
+        expect(response).to have_gitlab_http_status(200)
+        expect(graphql_errors).to be_nil
+        expect(node_array.size).to eq 1
+        expect(graphql_data['group']['groupTimelogsEnabled']).to be_truthy
+      end
+
+      it 'contains correct data' do
+        username = node_array.map {|data| data['user']['username'] }
+        date = node_array.map { |data| data['date'].to_date.to_s }
+        time_spent = node_array.map { |data| data['timeSpent'] }
+        issue_title = node_array.map {|data| data['issue']['title'] }
+        milestone_title = node_array.map {|data| data['issue']['milestone']['title'] }
+        epic_title = node_array.map {|data| data['issue']['epic']['title'] }
+
+        expect(username).to eq([user.username])
+        expect(date).to eq([timelog1.spent_at.to_date.to_s])
+        expect(time_spent).to eq([timelog1.time_spent])
+        expect(issue_title).to eq([issue.title])
+        expect(milestone_title).to eq([milestone.title])
+        expect(epic_title).to eq([epic.title])
+      end
+    end
+
+    context 'when requests has errors' do
+      let(:error_message) do
+        "The resource is not available or you don't have permission to perform this action"
+      end
+
+      context 'when group_timelogs feature is disabled' do
+        before do
+          stub_licensed_features(group_timelogs: false)
+        end
+
+        it 'returns empty' do
+          post_graphql(query, current_user: user)
+
+          expect(response).to have_gitlab_http_status(:success)
+          expect(graphql_errors).to include(a_hash_including('message' => error_message))
+          expect(graphql_data['group']).to be_nil
+        end
+      end
+
+      context 'when there are no timelogs present' do
+        before do
+          Timelog.delete_all
+        end
+
+        it 'returns empty result' do
+          post_graphql(query, current_user: user)
+
+          expect(response).to have_gitlab_http_status(:success)
+          expect(graphql_errors).to be_nil
+          expect(timelogs_data).to be_empty
+          expect(graphql_data['group']['groupTimelogsEnabled']).to be_truthy
+        end
+      end
+
+      context 'when user has no permission to read group timelogs' do
+        it 'returns empty result' do
+          guest = create(:user)
+          group.add_guest(guest)
+          post_graphql(query, current_user: guest)
+
+          expect(response).to have_gitlab_http_status(:success)
+          expect(graphql_errors).to include(a_hash_including('message' => error_message))
+          expect(graphql_data['group']).to be_nil
+        end
+      end
+    end
+  end
+
+  def node_array(extract_attribute = nil)
+    timelogs_data.map do |item|
+      extract_attribute ? item['node'][extract_attribute] : item['node']
+    end
+  end
+end

spec/models/timelog_spec.rb

@@ -41,4 +41,30 @@ RSpec.describe Timelog do
       expect(subject).to be_valid
     end
   end
+
+  describe 'scopes' do
+    describe 'for_issues_in_group' do
+      it 'return timelogs created for group issues' do
+        group = create(:group)
+        subgroup = create(:group, parent: group)
+
+        create(:timelog, issue: create(:issue, project: create(:project)))
+        timelog1 = create(:timelog, issue: create(:issue, project: create(:project, group: group)))
+        timelog2 = create(:timelog, issue: create(:issue, project: create(:project, group: subgroup)))
+
+        expect(described_class.for_issues_in_group(group)).to contain_exactly(timelog1, timelog2)
+      end
+    end
+
+    describe 'between_dates' do
+      it 'returns collection of timelogs within given dates' do
+        create(:timelog, spent_at: 65.days.ago)
+        timelog1 = create(:timelog, spent_at: 15.days.ago)
+        timelog2 = create(:timelog, spent_at: 5.days.ago)
+        timelogs = described_class.between_dates(20.days.ago, 1.day.ago)
+
+        expect(timelogs).to contain_exactly(timelog1, timelog2)
+      end
+    end
+  end
 end

spec/support/matchers/graphql_matchers.rb

@@ -64,6 +64,12 @@ RSpec::Matchers.define :have_graphql_type do |expected|
   end
 end
+RSpec::Matchers.define :have_non_null_graphql_type do |expected|
+  match do |field|
+    expect(field.type).to eq(!expected.to_graphql)
+  end
+end
+
 RSpec::Matchers.define :have_graphql_resolver do |expected|
   match do |field|
     case expected