ecoportal-api-graphql 0.3.8 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 954a7b6f24cb89c28f8a6b02503353e9bc9453e07ca862a3862a9b2c371c9f07
-  data.tar.gz: 6ef1faafa1dc3d93752c4c241d362266c7314a2db1ea3ab03b7aad8f81fef4d7
+  metadata.gz: b5e8efdf475cb3aeaf0ab102675bbfc20ebae438fccbf05d07f5d650deffbd3e
+  data.tar.gz: a46e510f42b77e8b83739b66ef4e6a563c4251835c3aa843d9a4623fa80e3b56
 SHA512:
-  metadata.gz: a22aad41024397365cccf44321c72bfdf702e56729691b5d7e4a7169e076c1b1ed11ab5c14f0e379fff65d35ff35220c34d2238db5ec47ad01a4f7c553767901
-  data.tar.gz: afd2b3bbeabcafcba32ad6769fa5551c463689e0a5e0d9d0f34b3684eca5732f300c7300b935c70e7e490e2b960b6dd848e87cf3b1f9bf27058e723fa52de9eb
+  metadata.gz: 70936ba8c2442dd8250565c9fc73be01403ed3f043cb8ec9c0058576ab48f557132145a55bb71b8a1be53c1818e8b9ced8e1cb2739e73edb785ba3af8c8ee7c5
+  data.tar.gz: e9708d5c7cf2e5366dd426e0cab18b6811241da023b471f93887f3cda41300ee7bd2115427d62441e7b95c8a8321b528e213014a8bcfa8cfcf69171ce8fc95d7

data/CHANGELOG.md

@@ -1,11 +1,6 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [0.3.9] - 2023-06-xx
-
-### Added
-### Changed
-### Fixed
 
 ### ToDo
   - Add update operation for `ContractorEntity`
@@ -13,7 +8,26 @@ All notable changes to this project will be documented in this file.
     - Analyse how to "DSL" currentOrganization.action.activities
       - review `path` tracking
 
-## [0.3.8] - 2023-07-xx
+
+## [0.3.11] - 2023-08-xx
+
+### Added
+### Changed
+### Fixed
+
+## [0.3.10] - 2023-08-12
+
+### Fixed
+  - `Ecopotal::API::GraphQL::Query::LocationStructure`
+    - `query` in basic_block missed an explicitly declared parameter.
+
+## [0.3.9] - 2023-08-03
+
+### Added
+  - `Ecoportal::API::GraphQL::Logic::BaseQuery`
+    - Added support for **default** values.
+
+## [0.3.8] - 2023-07-18
 
 ### Added
   - Integration for archiving actions.

data/lib/ecoportal/api/graphql/logic/base_query.rb

@@ -4,16 +4,27 @@ module Ecoportal
       module Logic
         class BaseQuery
           include Ecoportal::API::Common::GraphQL::ClassHelpers
-          inheritable_attrs :accepted_params
+          inheritable_attrs :accepted_params, :param_defaults
 
           class << self
-            def accepted_params(*keys)
+            def param_defaults
+              @param_defaults ||= {}
+            end
+
+            def accepted_params(*keys, default: :unused)
               @accepted_params ||= []
               return @accepted_params if keys.empty?
+              keys.map(&:to_sym).uniq.each do |key|
+                @accepted_params   |= [key]
+                param_defaults[key] = default unless default == :unused
+              end
+
               @accepted_params.push(*keys).tap {|ks| ks.uniq!}
+              @accepted_params
             end
 
             def clear_accepted_params
+              @param_defaults  = {}
               @accepted_params = []
             end
 
@@ -68,7 +79,8 @@ module Ecoportal
           end
 
           def graphql_query(path: self.path, **kargs, &block)
-            query_params = self.class.slice_params(kargs)
+            default_params = self.class.param_defaults.dup
+            query_params   = self.class.slice_params(default_params.merge(kargs))
             request(*path) do
               client.query(query_params, &block)
             end

data/lib/ecoportal/api/graphql/logic/query_array.rb

@@ -21,12 +21,6 @@ module Ecoportal
               klass.klass = item_class
             end
           end
-
-          private
-
-          def basic_block
-            raise "Missuse. You have to implement 'basic_block' private method in the child class"
-          end
         end
       end
     end

data/lib/ecoportal/api/graphql/query/location_structure.rb

@@ -4,6 +4,8 @@ module Ecoportal
       module Query
         class LocationStructure < Ecoportal::API::GraphQL::Logic::Query
           accepted_params :id
+          accepted_params :includeArchivedNodes, default: true
+
           field_name :structure
 
           class_resolver :item_class, Ecoportal::API::GraphQL::Model::LocationStructure
@@ -13,7 +15,7 @@ module Ecoportal
           def basic_block(&block)
             final_block = block || default_query_block
             Proc.new {
-              query(id: :id!) {
+              query(id: :id!, includeArchivedNodes: :boolean) {
                 currentOrganization {
                   locations {
                     structure(id: :id, &final_block)
@@ -34,7 +36,7 @@ module Ecoportal
               weight
               updatedAt
               visitorManagementEnabled
-              nodes(includeArchived: true) {
+              nodes(includeArchived: :includeArchivedNodes) {
                 ___Ecoportal__API__GraphQL__Fragment__LocationNode
               }
             }

data/lib/ecoportal/api/graphql/query/location_structures.rb

@@ -3,7 +3,9 @@ module Ecoportal
     class GraphQL
       module Query
         class LocationStructures < Ecoportal::API::GraphQL::Logic::QueryArray
-          accepted_params :includeArchived, :includeUnpublished
+          accepted_params :includeArchived, :includeUnpublished, default: false
+          accepted_params :includeArchivedNodes, default: true
+          
           field_name :structures
 
           class_resolver :item_class, Ecoportal::API::GraphQL::Model::LocationStructure
@@ -13,7 +15,10 @@ module Ecoportal
           def basic_block(&block)
             final_block = block || default_query_block
             Proc.new {
-              query(includeArchived: :boolean, includeUnpublished: :boolean) {
+              query(includeArchived: :boolean,
+                    includeUnpublished: :boolean,
+                    includeArchivedNodes: :boolean
+              ) {
                 currentOrganization {
                   locations {
                     structures(
@@ -37,7 +42,7 @@ module Ecoportal
               archived
               weight
               visitorManagementEnabled
-              nodes(includeArchived: true) {
+              nodes(includeArchived: :includeArchivedNodes) {
                 ___Ecoportal__API__GraphQL__Fragment__LocationNode
               }
             }

data/lib/ecoportal/api/graphql_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GRAPQL_VERSION = "0.3.8"
+    GRAPQL_VERSION = "0.3.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-graphql
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.10
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-17 00:00:00.000000000 Z
+date: 2023-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler