fix: RVI20 incorrectly shows optional extension multiple times (#774)

fixes: #773

Author: james-ball-qualcomm

lib/arch_obj_models/extension.rb

@@ -469,6 +469,7 @@ def extension
   # @param requirements [String] Single requirement
   # @param requirements [Array<String>] List of requirements, all of which must hold
   # @param arch [Architecture]
+  # @param presence [String or Presence or nil]
   def initialize(name, *requirements, arch: nil, note: nil, req_id: nil, presence: nil)
     raise ArgumentError, "For #{name}, got class #{arch.class} but need Architecture" unless arch.is_a?(Architecture)
 

lib/arch_obj_models/portfolio.rb

@@ -522,10 +522,10 @@ def in_scope_ext_reqs(desired_presence = nil)
 
     # Convert desired_present argument to Presence object if not nil.
     desired_presence_converted =
-      desired_presence.nil?                     ? nil :
-      desired_presence.is_a?(String)            ? desired_presence :
+      desired_presence.nil?            ? nil :
+      desired_presence.is_a?(String)   ? desired_presence :
       desired_presence.is_a?(Presence) ? desired_presence :
-      Presence.new(desired_presence)
+                                         Presence.new(desired_presence)
 
     missing_ext = false
 
@@ -665,10 +665,8 @@ def uses_optional_types?
 
     @uses_optional_types = false
 
-    # Iterate through different kinds of optional using the "object" version (not the string version).
-    Presence.optional_types_obj.each do |optional_type_obj|
-      # See if any extension reqs have this type of optional.
-      unless in_scope_ext_reqs(optional_type_obj).empty?
+    in_scope_ext_reqs(Presence.optional)&.each do |ext_req|
+      if ext_req.presence.uses_optional_types?
         @uses_optional_types = true
       end
     end

lib/presence.rb

@@ -81,6 +81,9 @@ def self.optional_types_obj
     @optional_types_obj
   end
 
+  # @return [Boolean] True if Presence object differentiates between optional types.
+  def uses_optional_types? = !@optional_type.nil?
+
   def to_s
     @optional_type.nil? ? "#{presence}" : "#{presence} (#{optional_type})"
   end