apadmi_grout 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b05dbffa45a449751c8ce0eb6a0b8f66e2bf4ef5b9aeaa41617b3af4ea0fde
-  data.tar.gz: b0b6bd5fbaa0459f2e76f285a521bdafc8e3317e492cd0ea7c4c58f7d5bfb8bb
+  metadata.gz: fe89f35f8c3b54c1f9e69bd1f0fe9d18c38ccab135960467d5df0753a4eb1fdc
+  data.tar.gz: '0982cf4af81f777753799820e9a0cad205f5e052f8e7ae48765b2366c61f23b3'
 SHA512:
-  metadata.gz: 596f948aa2b574e36f3cba0ed4a596332f95f7c24d23c1f817ac1baa851e392ecb67222a7e18e871d1ab2fcd666d4f626944224bc843c576595581db68ef5281
-  data.tar.gz: a1e727a0b3d8786525a0102cf736a9f50b04f9459edc58c81e418776b83ca913753e575152a92ac91040b98c6e920ed86140edfa43ceaaab24b42a28ec948d72
+  metadata.gz: ee076a7a629461753bf73c84ea78698ff7430afba999ff5c3695c80d9013dd36a4af3c1033198de37d9f610b2f0e6d1f1adab774f4c7fabd001124c3bb78be78
+  data.tar.gz: 28a4867d73f83d8ab6e0ab4d28c63cdbd8f166237edb28ae305325e7b029dbe6a126526f1f388ac8fc877fe298250b6a11e54bb7ecf2623cc21bcb6ffef09049

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Core Changelog
 
+## [2.5.0] - 2023-09-20
+* Added more options to the ADO queries for more in granular filtering.
+
 ## [2.4.0] - 2023-09-04
 * No change - keeping version in sync with fastlane plugin.
 

data/lib/apadmi/grout/models/find_tickets_options.rb

@@ -25,11 +25,12 @@ module Apadmi
 
     # Ado specific find tickets options
     class AdoFindTicketsOptions < FindTicketsOptions
-      attr_reader :required_tags, :not_tags
+      attr_reader :required_tags, :not_tags, :additional_fields
 
-      def initialize(required_tags: [], not_tags: [])
+      def initialize(required_tags: [], not_tags: [], additional_fields: {})
         @required_tags = required_tags
         @not_tags = not_tags
+        @additional_fields = additional_fields
       end
 
       def ==(other)
@@ -37,7 +38,7 @@ module Apadmi
       end
 
       def state
-        [@required_tags, @not_tags]
+        [@required_tags, @not_tags, @additional_fields]
       end
     end
   end

data/lib/apadmi/grout/service/board_service/ado_board_service.rb

@@ -40,24 +40,16 @@ module Apadmi
 
       # @return [Array<Apadmi::Grout::Issue>]
       def search_unblocked_issues(component, status, ticket_types = [], options = nil)
-        tags = (options&.required_tags || []).push(*component).filter { |it| !it.blank? }
-        not_tags = (options&.not_tags || []).filter { |it| !it.blank? }
-
-        raise "Tags can either be required or not required, not both" unless (tags & not_tags).empty?
-
-        tags_filter = tags.map { |tag| " AND [System.Tags] CONTAINS '#{tag}' " }.join(" ")
-        not_tags_filter = not_tags.map { |tag| " AND [System.Tags] NOT CONTAINS '#{tag}'" }.join(" ")
-
         status_filter = ("AND [System.State]='#{status}' " unless status.blank?) || ""
         type_filter = ("AND [System.WorkItemType] IN (#{ticket_types.map { |t| "'#{t}'" }.join(", ")})" unless ticket_types.empty?) || ""
+        options_filter = get_options_filter(component, options)
         wiql = %(
           Select [System.Id]
           From WorkItems
           Where [System.Id] >= 1
           #{status_filter}
-          #{tags_filter}
-          #{not_tags_filter}
           #{type_filter}
+          #{options_filter}
         )
 
         get_issues_by_wiql(wiql)
@@ -194,6 +186,28 @@ module Apadmi
         ids = items.map { |item| item["id"] } || []
         find_issues_by_keys(ids)
       end
+
+      # @param component [String] Included to be consistent with JIRA, this will boil down to a tag in ADO
+      # @param options [Apadmi::Grout::AdoFindTicketsOptions] options as defined to query
+
+      # @return [String]
+      def get_options_filter(component, options = nil)
+        tags = (options&.required_tags || []).push(*component).filter { |it| !it.blank? }
+        not_tags = (options&.not_tags || []).filter { |it| !it.blank? }
+        additional_fields = (options&.additional_fields || {}).reject { |k, _v| k.blank? }
+
+        raise "Tags can either be required or not required, not both" unless (tags & not_tags).empty?
+
+        tags_filter = tags.map { |tag| " AND [System.Tags] CONTAINS '#{tag}' " }.join(" ")
+        not_tags_filter = not_tags.map { |tag| " AND [System.Tags] NOT CONTAINS '#{tag}'" }.join(" ")
+        additional_fields_filter = additional_fields.collect { |k, v| "AND [#{k}]='#{v}'" }.join(" ")
+
+        %(
+          #{tags_filter}
+          #{not_tags_filter}
+          #{additional_fields_filter}
+        )
+      end
     end
   end
 end

data/lib/apadmi/grout/version.rb

@@ -2,6 +2,6 @@
 
 module Apadmi
   module Grout
-    VERSION = "2.4.0"
+    VERSION = "2.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apadmi_grout
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Apadmi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday