insights-api-common 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27c2d8f13f5a3be044e999f5eede282412bdd00e258b21760f34c154609fa622
-  data.tar.gz: 46afb339ae074b46703fb268b1bbd8b76f1375ba80196632c8a803f408fcd73e
+  metadata.gz: b8a770535b65f1da98fa3196078052c5048bd13dcd4253145aa04afa5d6c1bf9
+  data.tar.gz: 13f54d55fe5343eaec0116095014e3782232e836e8e1d610a1e1120ea59b68b8
 SHA512:
-  metadata.gz: 3449d374a193f78d3d314156042ef4956a76aebd82ad9fed5481f8932bb103faf19f1f67d9bac0adf61fd4a3570f743f1625a3f37bc095cd6f31499e30117f96
-  data.tar.gz: 562dc832ad9d50ca6e9f3790ed989cc0a2953e0450eaa11587012e9a96383df4b29491c7cab9b2f650ced30a71ef274d4a46f34e641ac7baf8f0bce7eeb74235
+  metadata.gz: d329437271a364dc4d03b31b484400c2ab496b91a17f2e39c80fd57c249a992b7e6764b69724677120fe1de219c315472835809df5001a348fd264bb66a8961c
+  data.tar.gz: 93510825434809fde1d60e46b73a8f80f61535d41d77f8ebe2df716e26212d1903a0f9d9911f328bf4e6607c6aaa5a64aea46617ad39a763819f6325cab851d7

data/lib/insights/api/common/filter.rb

@@ -177,6 +177,20 @@ module Insights
           end
         end
 
+        def self.build_filtered_scope(scope, api_version, klass_name, filter)
+          return scope unless filter
+
+          openapi_doc = ::Insights::API::Common::OpenApi::Docs.instance[api_version]
+          openapi_schema_name, = ::Insights::API::Common::GraphQL::Generator.openapi_schema(openapi_doc, klass_name)
+
+          action_parameters = ActionController::Parameters.new(filter)
+          definitions = openapi_doc.definitions
+
+          association_attribute_properties = association_attribute_properties(definitions, action_parameters)
+
+          new(scope, action_parameters, definitions[openapi_schema_name], association_attribute_properties).apply
+        end
+
         def timestamp(k, val)
           if val.kind_of?(Hash)
             val.each do |comparator, value|

data/lib/insights/api/common/graphql/generator.rb

@@ -164,8 +164,16 @@ module Insights
 
               graphql_model_type_template = ERB.new(template("model_type"), nil, '<>').result(binding)
               graphql_namespace.module_eval(graphql_model_type_template)
+
+              unless graphql_namespace.const_defined?("#{klass_name}AggregateType", false)
+                graphql_aggregate_model_type_template = ERB.new(template("aggregate_model_type"), nil, '<>').result(binding)
+                graphql_namespace.module_eval(graphql_aggregate_model_type_template)
+              end
             end
 
+            graphql_aggregate_type_template = ERB.new(template("aggregate_type"), nil, '<>').result(binding)
+            graphql_namespace.module_eval(graphql_aggregate_type_template)
+
             graphql_query_type_template = ERB.new(template("query_type"), nil, '<>').result(binding)
             graphql_namespace.module_eval(graphql_query_type_template)
 

data/lib/insights/api/common/graphql/templates/aggregate_model_type.erb

@@ -0,0 +1,8 @@
+<%= klass_name %>AggregateType = ::GraphQL::ObjectType.define do
+  name "<%= klass_name %>AggregateType"
+  description "A <%= klass_name %>AggregateType to wrap metrics aggregation"
+
+  field :aggregate, AggregateType do
+    resolve ->(object, _args, _ctx) { object }
+  end
+end

data/lib/insights/api/common/graphql/templates/aggregate_type.erb

@@ -0,0 +1,14 @@
+AggregateType = ::GraphQL::ObjectType.define do
+  name "AggregateType"
+  description "A AggregateType type for aggregation metrics"
+
+  field :total_count, !types.Int do
+    resolve ->(object, _args, _ctx) {
+      if object.kind_of?(QueryRelation) # from nested aggregation
+        object.count # count is array operation
+      else
+        object
+      end
+    }
+  end
+end

data/lib/insights/api/common/graphql/templates/model_type.erb

@@ -30,6 +30,19 @@
       ::Insights::API::Common::GraphQL::AssociationLoader.new(<%= klass_name.constantize %>, "<%= associations %>", args, graphql_options).load(obj)
     }
   end
+
+  field :<%= associations %>_aggregate do
+    description "Aggregation of <%= associations %> associated with <%= klass_name %> model."
+    type <%= "#{association_class_name}AggregateType" %>
+
+    associations_name = "<%= associations %>"
+    preload :<%= associations %>
+
+    resolve lambda { |obj, args, _ctx|
+      ::Insights::API::Common::GraphQL::AssociationLoader.new(<%= klass_name.constantize %>, "<%= associations %>", args, graphql_options).load(obj)
+    }
+  end
+
 <%   end %>
 <% end %>
 end

data/lib/insights/api/common/graphql/templates/query_type.erb

@@ -31,18 +31,9 @@ QueryType = ::GraphQL::ObjectType.define do
           scope = model_class
         end
 
-        if args[:filter]
-          openapi_doc = ::Insights::API::Common::OpenApi::Docs.instance["<%= api_version %>"]
-          openapi_schema_name, _schema = ::Insights::API::Common::GraphQL::Generator.openapi_schema(openapi_doc, klass_name)
-          association_attribute_properties =
-            Insights::API::Common::Filter.association_attribute_properties(openapi_doc.definitions, ActionController::Parameters.new(args[:filter]))
-          scope = ::Insights::API::Common::Filter.new(
-            scope,
-            ActionController::Parameters.new(args[:filter]),
-            openapi_doc.definitions[openapi_schema_name],
-            association_attribute_properties).apply
-        end
+        scope = ::Insights::API::Common::Filter.build_filtered_scope(scope, "<%= api_version %>", klass_name, args[:filter])
         scope = ::Insights::API::Common::GraphQL.search_options(scope, args)
+
         if <%= graphql_options[:use_pagination_v2] %> == true
           ::Insights::API::Common::PaginatedResponseV2.new(
             base_query: scope, request: nil, limit: args[:limit], offset: args[:offset], sort_by: args[:sort_by]
@@ -54,5 +45,24 @@ QueryType = ::GraphQL::ObjectType.define do
         end
       }
     end
+
+    field_aggregate = "#{collection}_aggregate"
+    field field_aggregate do
+      description "The #{collection} aggregation associated with this #{klass_name}"
+      klass_name_type = "::Insights::API::Common::GraphQL::Api::#{version_namespace}::#{klass_name}AggregateType".constantize
+      argument :filter, ::Insights::API::Common::GraphQL::Types::QueryFilter, "The Query Filter for querying the #{collection}"
+
+      type klass_name_type
+
+      resolve lambda { |_obj, args, _ctx|
+        if base_query.present?
+          scope = base_query.call(model_class, args, ctx)
+        else
+          scope = model_class
+        end
+
+        ::Insights::API::Common::Filter.build_filtered_scope(scope, "<%= api_version %>", klass_name, args[:filter]).count
+      }
+    end
   end
 end

data/lib/insights/api/common/version.rb

@@ -1,7 +1,7 @@
 module Insights
   module API
     module Common
-      VERSION = "5.0.4".freeze
+      VERSION = "5.0.5".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights-api-common
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Insights Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -396,6 +396,8 @@ files:
 - lib/insights/api/common/graphql/associated_records.rb
 - lib/insights/api/common/graphql/association_loader.rb
 - lib/insights/api/common/graphql/generator.rb
+- lib/insights/api/common/graphql/templates/aggregate_model_type.erb
+- lib/insights/api/common/graphql/templates/aggregate_type.erb
 - lib/insights/api/common/graphql/templates/model_type.erb
 - lib/insights/api/common/graphql/templates/query_type.erb
 - lib/insights/api/common/graphql/templates/schema.erb