plan_my_stuff 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c0f0590ab0ae66923b771acd03e238d78ed2b535a24efc1ad8047774874914
-  data.tar.gz: 991920b03d4f7b2417ed51c213c0b3a9368772dbc552d5d1f17d80a512207b94
+  metadata.gz: 1cf33c92cfa763f5ace87a1419cf8c7369f27e8adc10d1c092c044b99d151a4a
+  data.tar.gz: 3b2a482534b9f9094d550385c064f50f4dc37db3c2a6361e4aa899d4b4dc5713
 SHA512:
-  metadata.gz: 712c0847e85926474c0331211de128e1732e99672f79cf4cc56f6ec3313ab814b0bef15cfa3c51d360d78abac5f99825c20ec29be9aa274265a37ea271648293
-  data.tar.gz: 153ecbe20c5bcc2c9d5b25cf85ded6fbe27ca6ea6b881e9b1e62bf04e3c538e5baf50e604f97092ec9f741bfc9cc0cbb29ea72bc86f42fb879ac0d91fb7e5180
+  metadata.gz: ef36dbcfb77d4c3763d2165993c50fb9f4f7e8b0729a1efc1d63fb9155abb039bf9db92fb59a49d3302ebfec024bafc19dd15b54be84a2d7919040405a10803f
+  data.tar.gz: beae8f4926a95e4a47786c4ffefc886300f255466d7e08a7e607f444e91883e920b3bf60d666d33b539eed2dac7a1241f64cd23ae42ebe292a8a113ce150de8d

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 0.24.0
+
+### Added
+
+- `PlanMyStuff::Issue.list` and `PlanMyStuff::Issue.count` now accept `issue_type:` (String / Symbol) and
+  `issue_fields:` (Hash keyed by display name) filter kwargs. `issue_type:` resolves symbol nicknames through
+  `ISSUE_TYPE_NICKNAMES` and `config.issue_types`; Arrays raise `ArgumentError` since GitHub's REST `type` param
+  and Search `type:` qualifier each accept only one value. `issue_fields:` accepts scalar (equality) or `Range`
+  (date / numeric bounds -- inclusive
+  `..` -> `>=`/`<=`, exclusive `...` -> `>=`/`<`, beginless / endless ranges drop the unbounded side) values and ANDs
+  multiple constraints together. Composes with the existing `priority_list:` filter into the same
+  `issue_field_values` (REST) / `field.<slug>:` (Search) qualifier list. Search-API calls flip
+  `advanced_search=true` when any field qualifier is present. `issue_fields:` raises
+  `IssueFieldsNotEnabledError` when `config.issue_fields_enabled` is `false` (closes #54).
+
+## 0.23.1
+
+### Added
+
+- `PlanMyStuff::UserResolver.from_github_login(login)` - inverse of `config.github_login_for`. Returns the
+  resolved user object whose configured GitHub login matches `login`, or `nil` when `login` is blank or
+  unmapped.
+
+### Changed
+
+- `Webhooks::GithubController` now forwards the actor through to `Pipeline.take!`'s `user:` kwarg from
+  `handle_issue_assigned` (using `assignee.login`) and `handle_draft_opened` (using the PR author). The
+  resolved user lands on the `pipeline_started.plan_my_stuff` notification payload.
+- `Issues::TakesController#create` now forwards `pms_current_user` to `Pipeline.take!`'s `user:` kwarg.
+
 ## 0.23.0
 
 ### Added

data/app/controllers/plan_my_stuff/issues/takes_controller.rb

@@ -17,7 +17,7 @@ module PlanMyStuff
         project_item = PlanMyStuff::Pipeline::IssueLinker.find_project_item(issue.number)
         project_item ||= add_to_pipeline(issue)
 
-        PlanMyStuff::Pipeline.take!(project_item)
+        PlanMyStuff::Pipeline.take!(project_item, user: pms_current_user)
         assign_current_user(project_item)
 
         yield(project_item) if block_given?

data/app/controllers/plan_my_stuff/webhooks/github_controller.rb

@@ -119,7 +119,7 @@ module PlanMyStuff
 
           number = PlanMyStuff::Pipeline.resolve_pipeline_project_number!
           project_item = PlanMyStuff::ProjectItem.create!(issue, project_number: number)
-          PlanMyStuff::Pipeline.take!(project_item)
+          PlanMyStuff::Pipeline.take!(project_item, user: PlanMyStuff::UserResolver.from_github_login(assignee_login))
         end
 
         # Removes the issue from the pipeline project when the LAST assignee is removed. If any assignees remain,
@@ -253,7 +253,7 @@ module PlanMyStuff
             issue = PlanMyStuff::Issue.find(issue_number, repo: repo)
 
             if PlanMyStuff::Pipeline::IssueLinker.find_project_item(issue_number).nil?
-              ensure_in_pipeline_at_started(issue)
+              ensure_in_pipeline_at_started(issue, pr_author)
             end
 
             assign_pr_author(issue, pr_author) if pr_author.present? && issue.assignees.empty?
@@ -271,10 +271,11 @@ module PlanMyStuff
         # (Pipeline.take!'s guard would otherwise leave an orphan project item behind).
         #
         # @param issue [PlanMyStuff::Issue]
+        # @param actor_login [String, nil] GitHub login of the webhook actor, mapped to a user via +github_login_for+
         #
         # @return [void]
         #
-        def ensure_in_pipeline_at_started(issue)
+        def ensure_in_pipeline_at_started(issue, actor_login = nil)
           if issue.approvals_required? && !issue.fully_approved?
             Rails.logger.info("[PlanMyStuff] Issue ##{issue.number} has pending approvals, skipping pipeline add")
             return
@@ -282,7 +283,7 @@ module PlanMyStuff
 
           number = PlanMyStuff::Pipeline.resolve_pipeline_project_number!
           project_item = PlanMyStuff::ProjectItem.create!(issue, project_number: number)
-          PlanMyStuff::Pipeline.take!(project_item)
+          PlanMyStuff::Pipeline.take!(project_item, user: PlanMyStuff::UserResolver.from_github_login(actor_login))
         end
 
         # @param issue [PlanMyStuff::Issue]

data/lib/plan_my_stuff/issue.rb

@@ -296,11 +296,29 @@ module PlanMyStuff
 
       # Lists GitHub issues with optional filters and pagination.
       #
-      # @raise [ArgumentError] when +priority_list: false+ is passed
+      # +issue_fields:+ is a Hash keyed by GitHub Issue Field display name (String / Symbol). Each value is either
+      # a scalar (equality match -- Date / Time are emitted as ISO 8601, everything else as +to_s+) or a +Range+ for
+      # numeric / date bounds:
+      #
+      # - +Date.parse('2026-01-01')..Date.today+ -> +start-date:>=2026-01-01,start-date:<=2026-05-21+
+      # - +Date.parse('2026-01-01')...Date.today+ -> +start-date:>=2026-01-01,start-date:<2026-05-21+ (exclusive end)
+      # - +..Date.today+ (beginless) / +Date.parse('2026-01-01')..+ (endless) drop the unbounded side
+      #
+      # Multiple field constraints AND together. Composes with the existing +priority_list:+ filter: both feed the
+      # same +issue_field_values+ query param.
+      #
+      # @raise [ArgumentError] when +priority_list: false+ is passed, or when +issue_type:+ is an Array (GitHub's
+      #   REST +type+ param only accepts a single value)
+      # @raise [PlanMyStuff::IssueFieldsNotEnabledError] when +issue_fields:+ is passed and
+      #   +config.issue_fields_enabled+ is +false+
       #
       # @param repo [Symbol, String, nil] defaults to config.default_repo
       # @param state [Symbol] :open, :closed, or :all
       # @param labels [Array<String>]
+      # @param issue_type [String, Symbol, nil] a single GitHub issue type name. Symbols resolve through
+      #   +ISSUE_TYPE_NICKNAMES+ then +config.issue_types+ for org-specific renames.
+      # @param issue_fields [Hash{String,Symbol => Object,Range,nil}, nil] GitHub Issue Field equality / range
+      #   filters. See description for the value shapes the gem accepts.
       # @param priority_list [Boolean, nil] when +true+, restricts to issues whose +Priority List+ issue field is
       #   +Yes+ (server-side filter via the +issue_field_values+ query param). +false+ raises +ArgumentError+ -- GitHub
       #   has no negation qualifier. Silently dropped when +config.issue_fields_enabled+ is +false+.
@@ -309,19 +327,38 @@ module PlanMyStuff
       #
       # @return [Array<PlanMyStuff::Issue>]
       #
-      def list(repo: nil, state: :open, labels: [], priority_list: nil, page: 1, per_page: 25)
+      def list(
+        repo: nil,
+        state: :open,
+        labels: [],
+        issue_type: nil,
+        issue_fields: nil,
+        priority_list: nil,
+        page: 1,
+        per_page: 25
+      )
         if priority_list == false
           raise(ArgumentError, 'priority_list: false is not supported (no GitHub negation qualifier)')
         end
+        if issue_fields.present? && !PlanMyStuff.configuration.issue_fields_enabled
+          raise(PlanMyStuff::IssueFieldsNotEnabledError)
+        end
 
         client = PlanMyStuff.client
         resolved_repo = client.resolve_repo!(repo)
 
         params = { state: state.to_s, page: page, per_page: per_page }
         params[:labels] = labels.sort.join(',') if labels.present?
+
+        resolved_type = resolve_issue_types_filter(issue_type)
+        params[:type] = resolved_type if resolved_type.present?
+
+        field_pairs = []
+        field_pairs.concat(build_issue_field_filter_pairs(issue_fields)) if issue_fields.present?
         if priority_list && PlanMyStuff.configuration.issue_fields_enabled
-          params[:issue_field_values] = 'priority-list:Yes'
+          field_pairs << 'priority-list:Yes'
         end
+        params[:issue_field_values] = field_pairs.join(',') if field_pairs.present?
 
         github_issues = client.rest(:list_issues, resolved_repo, **params)
         filtered = github_issues.reject { |gi| gi.respond_to?(:pull_request) && gi.pull_request }
@@ -347,11 +384,18 @@ module PlanMyStuff
       # - The Search API has its own rate limit (30 req/min authenticated) separate from
       #   the core REST API.
       #
-      # @raise [ArgumentError] when +priority_list: false+ is passed
+      # @raise [ArgumentError] when +priority_list: false+ is passed, or when +issue_type:+ is an Array
+      # @raise [PlanMyStuff::IssueFieldsNotEnabledError] when +issue_fields:+ is passed and
+      #   +config.issue_fields_enabled+ is +false+
       #
       # @param repo [Symbol, String, nil] defaults to config.default_repo
       # @param state [Symbol] :open, :closed, or :all
       # @param labels [Array<String>]
+      # @param issue_type [String, Symbol, nil] a single GitHub issue type name. Symbols resolve through
+      #   +ISSUE_TYPE_NICKNAMES+ then +config.issue_types+.
+      # @param issue_fields [Hash{String,Symbol => Object,Range,nil}, nil] GitHub Issue Field equality / range
+      #   filters. See +.list+ for the value shapes the gem accepts. Each pair is emitted as a
+      #   +field.<slug>:<value>+ Search qualifier and triggers +advanced_search=true+.
       # @param priority_list [Boolean, nil] when +true+, restricts to issues whose +Priority List+ issue field is
       #   +Yes+ (server-side filter via the +field.priority-list:Yes+ Search qualifier). +false+ raises
       #   +ArgumentError+ -- GitHub has no negation qualifier. Silently dropped when
@@ -359,10 +403,13 @@ module PlanMyStuff
       #
       # @return [Integer]
       #
-      def count(repo: nil, state: :open, labels: [], priority_list: nil)
+      def count(repo: nil, state: :open, labels: [], issue_type: nil, issue_fields: nil, priority_list: nil)
         if priority_list == false
           raise(ArgumentError, 'priority_list: false is not supported (no GitHub negation qualifier)')
         end
+        if issue_fields.present? && !PlanMyStuff.configuration.issue_fields_enabled
+          raise(PlanMyStuff::IssueFieldsNotEnabledError)
+        end
 
         client = PlanMyStuff.client
         resolved_repo = client.resolve_repo!(repo)
@@ -374,11 +421,19 @@ module PlanMyStuff
         qualifiers += labels_to_use.map do |label|
           "label:\"#{label}\""
         end
-        search_options = { per_page: 1 }
+
+        resolved_type = resolve_issue_types_filter(issue_type)
+        qualifiers << "type:#{resolved_type}" if resolved_type.present?
+
+        field_pairs = []
+        field_pairs.concat(build_issue_field_filter_pairs(issue_fields)) if issue_fields.present?
         if priority_list && PlanMyStuff.configuration.issue_fields_enabled
-          qualifiers << 'field.priority-list:Yes'
-          search_options[:advanced_search] = true
+          field_pairs << 'priority-list:Yes'
         end
+        qualifiers += field_pairs.map { |pair| "field.#{pair}" }
+
+        search_options = { per_page: 1 }
+        search_options[:advanced_search] = true if field_pairs.present?
         client.rest(:search_issues, qualifiers.join(' '), **search_options).total_count
       end
 
@@ -528,6 +583,93 @@ module PlanMyStuff
           PlanMyStuff.configuration.issue_types[canonical] || canonical
         end
 
+        # Resolves an +issue_type:+ filter kwarg (used by +.list+ / +.count+) into a single canonical type name.
+        # Accepts a scalar (String / Symbol); +nil+ returns +nil+ so callers can skip the filter entirely. Runs
+        # through +resolve_issue_type!+ so symbol nicknames and +config.issue_types+ overrides apply consistently
+        # with +create!+ / +update!+. Arrays raise +ArgumentError+ -- GitHub's REST +type+ param and Search
+        # +type:+ qualifier each accept a single value at a time.
+        #
+        # @raise [ArgumentError] when +value+ is an Array
+        #
+        # @param value [String, Symbol, nil]
+        #
+        # @return [String, nil]
+        #
+        def resolve_issue_types_filter(value)
+          return if value.nil?
+          if value.is_a?(Array)
+            raise(ArgumentError, 'issue_type: must be a single String / Symbol; GitHub does not accept multiple types')
+          end
+
+          resolve_issue_type!(value)
+        end
+
+        # Slugifies a field name into the kebab-case form GitHub expects in +issue_field_values+ and the Search API's
+        # +field.<slug>:+ qualifier (e.g. +"Priority List"+ / +:priority_list+ -> +"priority-list"+). Lowercases and
+        # collapses runs of whitespace or underscores into a single hyphen.
+        #
+        # @param name [String, Symbol]
+        #
+        # @return [String]
+        #
+        def field_filter_slug(name)
+          name.to_s.downcase.gsub(/[\s_]+/, '-')
+        end
+
+        # Coerces an issue-field filter value to the literal string GitHub expects in the query (Date / Time -> ISO
+        # 8601, Numeric / scalar -> +to_s+). Range bounds are handled separately by
+        # +build_issue_field_filter_pairs+.
+        #
+        # @param value [Object]
+        #
+        # @return [String]
+        #
+        def format_field_filter_value(value)
+          case value
+          when Date, Time then value.iso8601
+          else value.to_s
+          end
+        end
+
+        # Expands an +issue_fields:+ kwarg hash into the flat +Array<String>+ of +slug:value+ pairs that both REST
+        # (+issue_field_values=...+) and Search (+field.slug:value...+) consume.
+        #
+        # Scalars become a single equality pair. +Range+ values expand into one or two comparison pairs:
+        # +>=+/+<=+ for inclusive bounds, +<+ for an exclusive end (+...+). Beginless / endless ranges emit only
+        # the bounded side. +nil+ values are skipped.
+        #
+        # @param hash [Hash{String,Symbol => Object,Range,nil}]
+        #
+        # @return [Array<String>]
+        #
+        def build_issue_field_filter_pairs(hash)
+          hash.flat_map do |name, value|
+            slug = field_filter_slug(name)
+            case value
+            when nil then []
+            when Range then range_field_filter_pairs(slug, value)
+            else ["#{slug}:#{format_field_filter_value(value)}"]
+            end
+          end
+        end
+
+        # Expands a +Range+ value into the +slug:>=begin+ / +slug:<=end+ (or +<end+ for +...+) pair(s) GitHub expects.
+        #
+        # @param slug [String]
+        # @param range [Range]
+        #
+        # @return [Array<String>]
+        #
+        def range_field_filter_pairs(slug, range)
+          pairs = []
+          pairs << "#{slug}:>=#{format_field_filter_value(range.begin)}" if range.begin.present?
+          if range.end.present?
+            end_op = range.exclude_end? ? '<' : '<='
+            pairs << "#{slug}:#{end_op}#{format_field_filter_value(range.end)}"
+          end
+          pairs
+        end
+
         # @raise [PlanMyStuff::APIError] when the GitHub API call fails
         #
         # @return [Hash]

data/lib/plan_my_stuff/user_resolver.rb

@@ -43,6 +43,22 @@ module PlanMyStuff
         user.public_send(PlanMyStuff.configuration.user_id_method)
       end
 
+      # Inverse lookup of +config.github_login_for+. Returns the user object whose configured GitHub login matches
+      # +login+, or +nil+ if +login+ is blank or unmapped.
+      #
+      # @param login [String, nil] GitHub login (e.g. from a webhook payload)
+      #
+      # @return [Object, nil]
+      #
+      def from_github_login(login)
+        return if login.blank?
+
+        user_id, _login = PlanMyStuff.configuration.github_login_for.key(login)
+        return if user_id.nil?
+
+        resolve(user_id)
+      end
+
       # Checks whether a user is support staff.
       # Anonymous users (nil) are never support.
       #

data/lib/plan_my_stuff/version.rb

@@ -3,7 +3,7 @@
 module PlanMyStuff
   module VERSION
     MAJOR = 0
-    MINOR = 23
+    MINOR = 24
     TINY = 0
 
     # Set PRE to nil unless it's a pre-release (beta, rc, etc.)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plan_my_stuff
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Brands Insurance