Merge pull request #15498 from jntullo/euwe_correct_field_names

[EUWE] correct field names in reports

lib/miq_expression.rb

@@ -352,6 +352,10 @@ def initialize(exp, ctype = nil)
     @context_type = ctype
   end
 
+  def self.parse_field_or_tag(str)
+    MiqExpression::Field.parse(str) || MiqExpression::CountField.parse(str) || MiqExpression::Tag.parse(str)
+  end
+
   def self.proto?
     return @proto if defined?(@proto)
     @proto = VMDB::Config.new("vmdb").config.fetch_path(:product, :proto)

lib/miq_expression/field.rb

@@ -12,7 +12,7 @@ class MiqExpression::Field
   ParseError = Class.new(StandardError)
 
   def self.parse(field)
-    match = FIELD_REGEX.match(field) or raise ParseError, field
+    (match = FIELD_REGEX.match(field)) || raise(ParseError, field)
     new(match[:model_name].constantize, match[:associations].to_s.split("."), match[:virtual_custom_column] ||
         match[:column])
   end
@@ -95,6 +95,10 @@ def column_type
     end
   end
 
+  def report_column
+    (associations + [column]).join('.')
+  end
+
   private
 
   def custom_attribute_column_name

lib/miq_expression/tag.rb

@@ -1,20 +1,45 @@
 class MiqExpression::Tag
-  def self.parse(tag)
-    klass, ns = tag.split(".")
-    ns = "/" + ns.split("-").join("/")
-    ns = ns.sub(/(\/user_tag\/)/, "/user/") # replace with correct namespace for user tags
-    new(klass.constantize, ns)
+  REGEX = /
+(?<model_name>([[:alnum:]]*(::)?)+)
+\.(?<associations>([a-z_]+\.)*)
+(?<namespace>\bmanaged|user_tag\b)
+-(?<column>[a-z]+[_[:alnum:]]+)
+/x
+
+  def self.parse(field)
+    parsed_params = parse_params(field) || return
+    managed = parsed_params[:namespace] == self::MANAGED_NAMESPACE
+    new(parsed_params[:model_name], parsed_params[:associations], parsed_params[:column], managed)
   end
 
-  attr_reader :model, :namespace
+  MANAGED_NAMESPACE      = 'managed'.freeze
+  USER_NAMESPACE         = 'user'.freeze
+
+  attr_reader :model, :namespace, :column
 
-  def initialize(model, namespace)
+  def initialize(model, _associations, column, managed = true)
     @model = model
-    @namespace = namespace
+    @column = column
+    @base_namespace = managed ? MANAGED_NAMESPACE : USER_NAMESPACE
+    @namespace = "/#{@base_namespace}/#{column}"
   end
 
   def contains(value)
     ids = model.find_tagged_with(:any => value, :ns => namespace).pluck(:id)
     model.arel_attribute(:id).in(ids)
   end
+
+  def report_column
+    "#{@base_namespace}.#{column}"
+  end
+
+  def self.parse_params(field)
+    match = self::REGEX.match(field) || return
+    # convert matches to hash to format
+    # {:model_name => 'User', :associations => ...}
+    parsed_params = Hash[match.names.map(&:to_sym).zip(match.to_a[1..-1])]
+    parsed_params[:model_name] = parsed_params[:model_name].classify.safe_constantize || return
+    parsed_params[:associations] = parsed_params[:associations].to_s.split(".")
+    parsed_params
+  end
 end

spec/lib/miq_expression/field_spec.rb

@@ -91,6 +91,13 @@
     end
   end
 
+  describe '#report_column' do
+    it 'returns the correct format for a field' do
+      field = MiqExpression::Field.parse('Vm.miq_provision.miq_request-requester_name')
+      expect(field.report_column).to eq('miq_provision.miq_request.requester_name')
+    end
+  end
+
   describe "#date?" do
     it "returns false for fields of column type other than :date" do
       field = described_class.new(Vm, [], "name")

spec/lib/miq_expression/tag_spec.rb

@@ -0,0 +1,8 @@
+RSpec.describe MiqExpression::Tag do
+  describe '#report_column' do
+    it 'returns the correct format for a tag' do
+      tag = MiqExpression::Tag.parse('Vm.managed-environment')
+      expect(tag.report_column).to eq('managed.environment')
+    end
+  end
+end