gitlab-triage 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17d4b0574943a4b6dc8419c28fe0d8d09577adebe135e6aafe6cdd06a2ebd12
-  data.tar.gz: 7e937ca82cec7feec0e7223d7a6e4a967cd0d0a65d54a26b807f32cad3bf8669
+  metadata.gz: 9ac5f595e5dffde9a3135eec982d931510615517b7512168291944252cd6f2ed
+  data.tar.gz: 3336902a5864b878ad60091442fd2047eeef620981ae4d8e40c73c0ca2394cb1
 SHA512:
-  metadata.gz: 7041a271066e0b933dfc3d3fa47b7150592746c3a0f25352b363cfc4f6de9c48556ede940394e72c5054e7076244e3e87cc4c2e068755a43e66bbf3d1934f5ed
-  data.tar.gz: bf26c4395bc081ac3930f001448f33d4342dcb2f3a0aac8f74cff84aabe2f665675be8adf5578a2ef3a39d573c5d6f7dbcfeafa7a88339b389ab839a5c7918aa
+  metadata.gz: a5669015087540e47ea682b07a3282a7fbb49e3206cb635e71086fa180f82084908dc964c659d7faeca8e0a8cabe83a0b296e7835ea161f43c26887aa5066ec6
+  data.tar.gz: b6f348f4d5adf7e7685f97d10fdaf0545e0952a91ee74b0997cdcba10b7a0c0a9823ed14dde92188f749731fd7b870cc8700d3fbc7733128b219a51287504517

data/.gitlab/merge_request_templates/Release.md

@@ -32,4 +32,4 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-triage/commits/
 - Checklist after merging:
   - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
 
-/label ~"Engineering Productivity" ~"ep::triage"
+/label ~"Engineering Productivity" ~"ep::triage" ~"tooling::workflow"

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

@@ -0,0 +1,78 @@
+require_relative '../validators/params_validator'
+
+module Gitlab
+  module Triage
+    module APIQueryBuilders
+      class DateQueryParamBuilder
+        ATTRIBUTES = %w[updated_at created_at].freeze
+        CONDITIONS = %w[older_than newer_than].freeze
+        INTERVAL_TYPES = %w[days weeks months years].freeze
+
+        def self.filter_parameters
+          [
+            {
+              name: :attribute,
+              type: String,
+              values: ATTRIBUTES
+            },
+            {
+              name: :condition,
+              type: String,
+              values: CONDITIONS
+            },
+            {
+              name: :interval_type,
+              type: String,
+              values: INTERVAL_TYPES
+            },
+            {
+              name: :interval,
+              type: Numeric
+            }
+          ]
+        end
+
+        def self.applicable?(condition)
+          ATTRIBUTES.include?(condition[:attribute].to_s)
+        end
+
+        def initialize(condition_hash)
+          @attribute = condition_hash[:attribute].to_s
+          @interval_condition = condition_hash[:condition].to_sym
+          @interval_type = condition_hash[:interval_type]
+          @interval = condition_hash[:interval]
+          validate_condition(condition_hash)
+        end
+
+        def validate_condition(condition)
+          ParamsValidator.new(self.class.filter_parameters, condition).validate!
+        end
+
+        def param_name
+          prefix = attribute.delete_suffix('_at')
+          suffix =
+            case interval_condition
+            when :older_than
+              'before'
+            when :newer_than
+              'after'
+            end
+
+          "#{prefix}_#{suffix}"
+        end
+
+        def param_content
+          interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+        end
+
+        def build_param
+          "&#{param_name}=#{param_content.strip}"
+        end
+
+        private
+
+        attr_reader :condition_hash, :attribute, :interval_condition, :interval_type, :interval
+      end
+    end
+  end
+end

data/lib/gitlab/triage/engine.rb

@@ -2,7 +2,6 @@ require 'active_support/all'
 require 'active_support/inflector'
 
 require_relative 'expand_condition'
-require_relative 'filters/issuable_date_conditions_filter'
 require_relative 'filters/merge_request_date_conditions_filter'
 require_relative 'filters/votes_conditions_filter'
 require_relative 'filters/forbidden_labels_conditions_filter'
@@ -16,6 +15,7 @@ require_relative 'policies/rule_policy'
 require_relative 'policies/summary_policy'
 require_relative 'policies_resources/rule_resources'
 require_relative 'policies_resources/summary_resources'
+require_relative 'api_query_builders/date_query_param_builder'
 require_relative 'api_query_builders/single_query_param_builder'
 require_relative 'api_query_builders/multi_query_param_builder'
 require_relative 'url_builders/url_builder'
@@ -153,7 +153,7 @@ module Gitlab
       end
 
       def resources_for_rule(resource_type, rule)
-        puts Gitlab::Triage::UI.header("Processing rule: **#{rule[:name]}**", char: '-')
+        puts Gitlab::Triage::UI.header("Gathering resources for rule: **#{rule[:name]}**", char: '-')
 
         ExpandCondition.perform(rule_conditions(rule)) do |conditions|
           # retrieving the resources for every rule is inefficient
@@ -193,18 +193,11 @@ module Gitlab
         resources.select do |resource|
           results = []
 
+          # rubocop:disable Style/IfUnlessModifier
           if conditions[:date]
-            results << case resource[:type]
-                       when 'issues'
-                         Filters::IssuableDateConditionsFilter.new(resource, conditions[:date]).calculate
-                       when 'merge_requests'
-                         Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
-                       else
-                         raise "Unknown resource type: #{resource[:type]}"
-                       end
+            results << Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
           end
 
-          # rubocop:disable Style/IfUnlessModifier
           if conditions[:upvotes]
             results << Filters::VotesConditionsFilter.new(resource, conditions[:upvotes]).calculate
           end
@@ -256,6 +249,10 @@ module Gitlab
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('source_branch', conditions[:source_branch]) if conditions[:source_branch]
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('target_branch', conditions[:target_branch]) if conditions[:target_branch]
 
+        if conditions[:date] && APIQueryBuilders::DateQueryParamBuilder.applicable?(conditions[:date])
+          condition_builders << APIQueryBuilders::DateQueryParamBuilder.new(conditions.delete(:date))
+        end
+
         condition_builders.each do |condition_builder|
           params[condition_builder.param_name] = condition_builder.param_content
         end

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

@@ -1,21 +1,67 @@
-require_relative 'issuable_date_conditions_filter'
+require_relative 'base_conditions_filter'
 
 module Gitlab
   module Triage
     module Filters
-      class MergeRequestDateConditionsFilter < IssuableDateConditionsFilter
-        ATTRIBUTES = %w[updated_at created_at merged_at].freeze
+      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
-          super if @resource[@attribute]
+          @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
 
-          super
+          case @condition
+          when :older_than
+            resource_value < condition_value
+          when :newer_than
+            resource_value > condition_value
+          end
         end
       end
     end

data/lib/gitlab/triage/policies/rule_policy.rb

@@ -15,7 +15,7 @@ module Gitlab
             type: type,
             policy_spec: policy_spec,
             action: action,
-            resources: resources.resources,
+            resources: resources,
             network: network)
         end
       end

data/lib/gitlab/triage/policies/summary_policy.rb

@@ -10,7 +10,7 @@ module Gitlab
         # Build an issue from several rules policies
         def build_issue
           action = actions[:summarize]
-          issues = resources.build_issues do |inner_policy_spec, inner_resources|
+          issues = resources.map do |inner_policy_spec, inner_resources|
             Policies::RulePolicy.new(
               type, inner_policy_spec, inner_resources, network)
               .build_issue

data/lib/gitlab/triage/policies_resources/rule_resources.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module Gitlab
   module Triage
     module PoliciesResources
       class RuleResources
-        attr_reader :resources
+        include Enumerable
+        extend Forwardable
 
         def initialize(new_resources)
           @resources = new_resources
         end
 
-        def each
-          resources.each do |resource|
-            yield(resource)
-          end
-        end
+        def_delegator :@resources, :each
       end
     end
   end

data/lib/gitlab/triage/policies_resources/summary_resources.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module Gitlab
   module Triage
     module PoliciesResources
       class SummaryResources
-        attr_reader :rule_to_resources
+        include Enumerable
+        extend Forwardable
 
         def initialize(new_rule_to_resources)
           @rule_to_resources = new_rule_to_resources
         end
 
-        def build_issues
-          rule_to_resources.map do |inner_policy_spec, inner_resources|
-            yield(inner_policy_spec, inner_resources)
-          end
-        end
+        def_delegator :@rule_to_resources, :each
       end
     end
   end

data/lib/gitlab/triage/validators/params_validator.rb

@@ -1,6 +1,8 @@
 module Gitlab
   module Triage
     class ParamsValidator
+      InvalidParameter = Class.new(ArgumentError)
+
       def initialize(parameter_definitions, value)
         @parameter_definitions = parameter_definitions
         @value = value
@@ -16,7 +18,7 @@ module Gitlab
 
       def validate_required_parameters(value)
         @parameter_definitions.each do |param|
-          raise ArgumentError, "#{param[:name]} is a required parameter" unless value[param[:name]]
+          raise InvalidParameter, "#{param[:name]} is a required parameter" unless value[param[:name]]
         end
       end
 
@@ -24,7 +26,7 @@ module Gitlab
         @parameter_definitions.each do |param|
           if value.has_key?(param[:name])
             param_types = Array(param[:type]).flatten
-            raise ArgumentError, "#{param[:name]} must be of type #{param[:type]}" unless param_types.any? { |type| value[param[:name]].is_a?(type) }
+            raise InvalidParameter, "#{param[:name]} must be of type #{param[:type]}" unless param_types.any? { |type| value[param[:name]].is_a?(type) }
           end
         end
       end
@@ -32,7 +34,7 @@ module Gitlab
       def validate_parameter_content(value)
         @parameter_definitions.each do |param|
           if param[:values]
-            raise ArgumentError, "#{param[:name]} must be of one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
+            raise InvalidParameter, "#{param[:name]} must be of one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
           end
         end
       end

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.9.0'
+    VERSION = '1.10.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,7 @@ files:
 - lib/gitlab/triage/action/comment.rb
 - lib/gitlab/triage/action/summarize.rb
 - lib/gitlab/triage/api_query_builders/base_query_param_builder.rb
+- lib/gitlab/triage/api_query_builders/date_query_param_builder.rb
 - lib/gitlab/triage/api_query_builders/multi_query_param_builder.rb
 - lib/gitlab/triage/api_query_builders/single_query_param_builder.rb
 - lib/gitlab/triage/command_builders/base_command_builder.rb
@@ -158,7 +159,6 @@ files:
 - lib/gitlab/triage/filters/author_member_conditions_filter.rb
 - lib/gitlab/triage/filters/base_conditions_filter.rb
 - lib/gitlab/triage/filters/forbidden_labels_conditions_filter.rb
-- lib/gitlab/triage/filters/issuable_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

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

@@ -1,65 +0,0 @@
-require_relative 'base_conditions_filter'
-
-module Gitlab
-  module Triage
-    module Filters
-      class IssuableDateConditionsFilter < BaseConditionsFilter
-        ATTRIBUTES = %w[updated_at created_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
-
-        def resource_value
-          @resource[@attribute].to_date
-        end
-
-        def condition_value
-          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
-        end
-
-        def calculate
-          case @condition
-          when :older_than
-            resource_value < condition_value
-          when :newer_than
-            resource_value > condition_value
-          end
-        end
-      end
-    end
-  end
-end