gitlab-triage 1.27.0 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6668ca8a79611f5e39d317807cb604d7fb32320120283c9996a9784515523bf5
-  data.tar.gz: d6211b78036d039e89a75da4f93bbfa07c44b73ffd16f331ae1bfb5cc901cc9d
+  metadata.gz: f6db21779b13563c1dd43ffbe571507967c53dc22f4a75b61d84f2c2e5181a06
+  data.tar.gz: 07141e346ff6ab3eca520ed37648b5431dd4ba54307d40358331323cc46b4ddc
 SHA512:
-  metadata.gz: bf0a6406e2a2b6f6cc6b7436831b3b95be04bbf1174c70d3fc5d4a0e24d4e8ccddcd1837864bc8e336fb1c5a0dc947c8a37716d74b31f35e025c4a21bcdb2fda
-  data.tar.gz: 0aa64137299f30fe4f83db4b50475c2b9a15e9730eebbcf5b98d5ce17150a70379f5ae629a87b5d399ce4c74a1712063e222c224ef2e6da29d3016ca48faa35f
+  metadata.gz: 2acf8bcde530de9eb4365393431266f1acd824cdf48b95b8a557744503ed1af1b0a968256f8756ef337cbd7ad4b54aa330efbac2fa0632fadf628616adf3abdc
+  data.tar.gz: 386c9a45639c9e8603409d573e6b16e42c3cbc8d281e7af5c5faac1fac882be40c38679d9c35dccf424bb5edd284e614287426ba8e0ac1344e6b42009458fd7a

data/.gitlab/CODEOWNERS

@@ -1,2 +1,2 @@
 # The official maintainers
-* @rymai @godfat-gitlab @markglenfletcher
+* @gitlab-org/quality/engineering-productivity 

data/README.md

@@ -178,6 +178,7 @@ Available condition types:
 - [`draft` condition](#draft-condition)
 - [`source_branch` condition](#source-branch-condition)
 - [`target_branch` condition](#target-branch-condition)
+- [`health_status` condition](#health-status-condition)
 - [`weight` condition](#weight-condition)
 - [`discussions` condition](#discussions-condition)
 - [`protected` condition](#protected-condition)
@@ -188,12 +189,12 @@ Available condition types:
 
 Accepts a hash of fields.
 
-| Field           | Type    | Values                                                                   | Required  |
-| ---------       | ----    |--------------------------------------------------------------------------| --------  |
+| Field           | Type    | Values                                                                     | Required  |
+| ---------       | ----    |----------------------------------------------------------------------------| --------  |
 | `attribute`     | string  | `created_at`, `updated_at`, `merged_at`, `authored_date`, `committed_date` | yes       |
-| `condition`     | string  | `older_than`, `newer_than`                                               | yes       |
-| `interval_type` | string  | `days`, `weeks`, `months`, `years`                                       | yes       |
-| `interval`      | integer | integer                                                                  | yes       |
+| `condition`     | string  | `older_than`, `newer_than`                                                 | yes       |
+| `interval_type` | string  | `minutes`, `hours`, `days`, `weeks`, `months`, `years`                     | yes       |
+| `interval`      | integer | integer                                                                    | yes       |
 > **Note:**
 >   - `merged_at` only works on merge requests.
 >   - `closed_at` is not supported in the GitLab API, but can be used in a [`ruby` condition](#ruby-condition).
@@ -210,6 +211,21 @@ conditions:
     interval: 12
 ```
 
+> **Note:** If the GitLab server is giving 500 error with this option, it
+> can mean that it's taking too much time to query this, and it's timing out.
+> A workaround for this is that we can filter in Ruby. If you need this
+> workaround, specify this with `filter_in_ruby: true`
+>
+> ```yaml
+> conditions:
+> date:
+>   attribute: updated_at
+>   condition: older_than
+>   interval_type: months
+>   interval: 12
+>   filter_in_ruby: true
+> ```
+
 ##### Milestone condition
 
 Accepts the name of a milestone to filter upon. Also accepts the following timebox values:
@@ -553,6 +569,26 @@ conditions:
   target_branch: 'master'
 ```
 
+##### Health Status condition
+
+**This condition is only applicable for issues.**
+
+Accepts a string per the [API documentation](https://docs.gitlab.com/ee/api/issues.html#list-issues).
+
+| State                  | Type    | Value     |
+| ---------              | ----    | ------    |
+| Any health status      | string  | `Any`  |
+| No health status       | string  | `None`  |
+| Specific health status | string  | One of `on_track`, `needs_attention` or `at_risk` |
+
+Example:
+
+```yml
+conditions:
+  health_status: Any
+
+> **Note:** This query is not supported using GraphQL yet.
+
 ##### Weight condition
 
 **This condition is only applicable for issues.**

data/lib/gitlab/triage/api_query_builders/date_query_param_builder.rb

@@ -8,7 +8,8 @@ module Gitlab
         ATTRIBUTES = %w[updated_at created_at].freeze
 
         def self.applicable?(condition)
-          ATTRIBUTES.include?(condition[:attribute].to_s)
+          ATTRIBUTES.include?(condition[:attribute].to_s) &&
+            condition[:filter_in_ruby] != true
         end
 
         def initialize(condition_hash)

data/lib/gitlab/triage/engine.rb

@@ -2,6 +2,7 @@ require 'active_support/all'
 require 'active_support/inflector'
 
 require_relative 'expand_condition'
+require_relative 'filters/issue_date_conditions_filter'
 require_relative 'filters/merge_request_date_conditions_filter'
 require_relative 'filters/branch_date_filter'
 require_relative 'filters/branch_protected_filter'
@@ -328,7 +329,7 @@ module Gitlab
         puts
       end
 
-      def filter_resources(resources, conditions) # rubocop:disable Metrics/CyclomaticComplexity
+      def filter_resources(resources, conditions) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
         resources.select do |resource|
           results = []
 
@@ -337,8 +338,17 @@ module Gitlab
             case resource[:type]
             when 'branches'
               results << Filters::BranchDateFilter.new(resource, conditions[:date]).calculate
+            when 'issues'
+              if conditions.dig(:date, :filter_in_ruby)
+                results << Filters::IssueDateConditionsFilter.new(resource, conditions[:date]).calculate
+              end
             when 'merge_requests'
-              results << Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
+              if conditions.dig(:date, :filter_in_ruby) ||
+                  # REST API does not support filtering with merged_at,
+                  # so we have to filter it in Ruby
+                  conditions.dig(:date, :attribute) == 'merged_at'
+                results << Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
+              end
             end
           end
 
@@ -464,6 +474,7 @@ module Gitlab
         [].tap do |condition_builders|
           condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('weight', conditions[:weight]) if conditions[:weight]
           condition_builders << iteration_condition_builder(conditions[:iteration]) if conditions[:iteration]
+          condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('health_status', conditions[:health_status]) if conditions[:health_status]
         end
       end
 

data/lib/gitlab/triage/filters/branch_date_filter.rb

@@ -6,7 +6,9 @@ module Gitlab
       class BranchDateFilter < BaseConditionsFilter
         ATTRIBUTES = %w[committed_date authored_date].freeze
         CONDITIONS = %w[older_than newer_than].freeze
-        INTERVAL_TYPES = %w[days weeks months years].freeze
+        TIME_BASED_INTERVALS = %w[minutes hours].freeze
+        DATE_BASED_INTERVALS = %w[days weeks months years].freeze
+        INTERVAL_TYPES = TIME_BASED_INTERVALS + DATE_BASED_INTERVALS
 
         def self.allowed_attributes
           self::ATTRIBUTES
@@ -48,7 +50,11 @@ module Gitlab
         end
 
         def condition_value
-          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          if TIME_BASED_INTERVALS.include?(@interval_type.to_s)
+            @interval.public_send(@interval_type).ago.to_datetime # rubocop:disable GitlabSecurity/PublicSend
+          else
+            @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          end
         end
 
         def calculate

data/lib/gitlab/triage/filters/issue_date_conditions_filter.rb

@@ -0,0 +1,78 @@
+require_relative 'base_conditions_filter'
+
+module Gitlab
+  module Triage
+    module Filters
+      class IssueDateConditionsFilter < BaseConditionsFilter
+        CONDITIONS = %w[older_than newer_than].freeze
+        TIME_BASED_INTERVALS = %w[minutes hours].freeze
+        DATE_BASED_INTERVALS = %w[days weeks months years].freeze
+        INTERVAL_TYPES = TIME_BASED_INTERVALS + DATE_BASED_INTERVALS
+
+        def self.generate_allowed_attributes
+          %w[updated_at created_at]
+        end
+
+        def self.allowed_attributes
+          @allowed_attributes ||= generate_allowed_attributes.freeze
+        end
+
+        def self.filter_parameters
+          [
+            {
+              name: :attribute,
+              type: String,
+              values: allowed_attributes
+            },
+            {
+              name: :condition,
+              type: String,
+              values: CONDITIONS
+            },
+            {
+              name: :interval_type,
+              type: String,
+              values: INTERVAL_TYPES
+            },
+            {
+              name: :interval,
+              type: Numeric
+            }
+          ]
+        end
+
+        def initialize_variables(condition)
+          @attribute = condition[:attribute].to_sym
+          @condition = condition[:condition].to_sym
+          @interval_type = condition[:interval_type].to_sym
+          @interval = condition[:interval]
+        end
+
+        # Guard against merge requests with no merged_at values
+        def resource_value
+          @resource[@attribute]&.to_date
+        end
+
+        def condition_value
+          if TIME_BASED_INTERVALS.include?(@interval_type.to_s)
+            @interval.public_send(@interval_type).ago.to_datetime # rubocop:disable GitlabSecurity/PublicSend
+          else
+            @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          end
+        end
+
+        # Guard against merge requests with no merged_at values
+        def calculate
+          return false unless resource_value
+
+          case @condition
+          when :older_than
+            resource_value < condition_value
+          when :newer_than
+            resource_value > condition_value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/filters/merge_request_date_conditions_filter.rb

@@ -3,65 +3,9 @@ require_relative 'base_conditions_filter'
 module Gitlab
   module Triage
     module Filters
-      class MergeRequestDateConditionsFilter < BaseConditionsFilter
-        ATTRIBUTES = %w[merged_at].freeze
-        CONDITIONS = %w[older_than newer_than].freeze
-        INTERVAL_TYPES = %w[days weeks months years].freeze
-
-        def self.allowed_attributes
-          self::ATTRIBUTES
-        end
-
-        def self.filter_parameters
-          [
-            {
-              name: :attribute,
-              type: String,
-              values: allowed_attributes
-            },
-            {
-              name: :condition,
-              type: String,
-              values: CONDITIONS
-            },
-            {
-              name: :interval_type,
-              type: String,
-              values: INTERVAL_TYPES
-            },
-            {
-              name: :interval,
-              type: Numeric
-            }
-          ]
-        end
-
-        def initialize_variables(condition)
-          @attribute = condition[:attribute].to_sym
-          @condition = condition[:condition].to_sym
-          @interval_type = condition[:interval_type].to_sym
-          @interval = condition[:interval]
-        end
-
-        # Guard against merge requests with no merged_at values
-        def resource_value
-          @resource[@attribute]&.to_date
-        end
-
-        def condition_value
-          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
-        end
-
-        # Guard against merge requests with no merged_at values
-        def calculate
-          return false unless resource_value
-
-          case @condition
-          when :older_than
-            resource_value < condition_value
-          when :newer_than
-            resource_value > condition_value
-          end
+      class MergeRequestDateConditionsFilter < IssueDateConditionsFilter
+        def self.generate_allowed_attributes
+          super << 'merged_at'
         end
       end
     end

data/lib/gitlab/triage/param_builders/date_param_builder.rb

@@ -5,7 +5,9 @@ module Gitlab
     module ParamBuilders
       class DateParamBuilder
         CONDITIONS = %w[older_than newer_than].freeze
-        INTERVAL_TYPES = %w[days weeks months years].freeze
+        TIME_BASED_INTERVALS = %w[minutes hours].freeze
+        DATE_BASED_INTERVALS = %w[days weeks months years].freeze
+        INTERVAL_TYPES = TIME_BASED_INTERVALS + DATE_BASED_INTERVALS
 
         def initialize(allowed_attributes, condition_hash)
           @allowed_attributes = allowed_attributes
@@ -18,7 +20,11 @@ module Gitlab
         end
 
         def param_content
-          interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          if TIME_BASED_INTERVALS.include?(interval_type)
+            interval.public_send(interval_type).ago.to_datetime # rubocop:disable GitlabSecurity/PublicSend
+          else
+            interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          end
         end
 
         private

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.27.0'
+    VERSION = '1.28.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.28.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2022-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -201,6 +201,7 @@ files:
 - lib/gitlab/triage/filters/branch_date_filter.rb
 - lib/gitlab/triage/filters/branch_protected_filter.rb
 - lib/gitlab/triage/filters/discussions_conditions_filter.rb
+- lib/gitlab/triage/filters/issue_date_conditions_filter.rb
 - lib/gitlab/triage/filters/member_conditions_filter.rb
 - lib/gitlab/triage/filters/merge_request_date_conditions_filter.rb
 - lib/gitlab/triage/filters/name_conditions_filter.rb