ecoportal-api-graphql 0.1.11 → 0.2.2

data/lib/ecoportal/api/graphql/{base → logic}/mutation.rb

@@ -1,13 +1,18 @@
 module Ecoportal
   module API
     class GraphQL
-      module Base
+      module Logic
         class Mutation
           class GenericPayload
             def initialize(*args, **kargs)
               raise "Missuse error. You should define a payload_class for a class that inherits from Mutation class."
             end
           end
+          class GenericInput
+            def initialize(*args, **kargs)
+              raise "Missuse error. You should define a input_class for a class that inherits from Mutation class."
+            end
+          end
 
           include Ecoportal::API::Common::GraphQL::ClassHelpers
 
@@ -22,6 +27,8 @@ module Ecoportal
           end
 
           class_resolver :payload_class, GenericPayload
+          class_resolver :input_class, GenericInput
+
           attr_reader :client
           attr_reader :base_path
 
@@ -67,6 +74,8 @@ module Ecoportal
 
           def as_input(value)
             case value
+            when input_class
+              value.as_input
             when Hash
               value
             when Ecoportal::API::GraphQL::Base::Model

data/lib/ecoportal/api/graphql/{base → logic}/payload.rb

@@ -1,7 +1,7 @@
 module Ecoportal
   module API
     class GraphQL
-      module Base
+      module Logic
         class Payload < Ecoportal::API::GraphQL::Base::Model
           class GenericItem
             def initialize(*args, **kargs)
@@ -13,7 +13,7 @@ module Ecoportal
 
           class_resolver :item_class, GenericItem
           embeds_one :item, klass: :item_class
-          embeds_one :errors, klass: Ecoportal::API::GraphQL::Base::ValidationErrors, nullable: true
+          embeds_one :errors, klass: Ecoportal::API::GraphQL::Error::ValidationErrors, nullable: true
 
           def success?
             !errors || errors.empty?

data/lib/ecoportal/api/graphql/{base → logic}/query.rb

@@ -1,7 +1,7 @@
 module Ecoportal
   module API
     class GraphQL
-      module Base
+      module Logic
         class Query
           class GenericItem
             def initialize(*args, **kargs)
@@ -80,9 +80,10 @@ module Ecoportal
             request(*path) do
               client.query(query_params, &block)
             end
-          rescue Faraday::ParsingError => e
+          rescue Faraday::ParsingError, Graphlient::Errors::GraphQLError => e
             puts "Internal Error with these params:"
             pp kargs
+            pp block
             raise
           end
 

data/lib/ecoportal/api/graphql/{base → logic}/query_array.rb

@@ -1,8 +1,8 @@
 module Ecoportal
   module API
     class GraphQL
-      module Base
-        class QueryArray < Ecoportal::API::GraphQL::Base::Query
+      module Logic
+        class QueryArray < Ecoportal::API::GraphQL::Logic::Query
           include Enumerable
 
           def each(item_block: nil, **kargs, &block)

data/lib/ecoportal/api/graphql/{base → logic}/query_connection.rb

@@ -1,8 +1,8 @@
 module Ecoportal
   module API
     class GraphQL
-      module Base
-        class QueryConnection < Ecoportal::API::GraphQL::Base::Query
+      module Logic
+        class QueryConnection < Ecoportal::API::GraphQL::Logic::Query
           accepted_params :searchConf, :after, :before, :first, :last
           include Enumerable
 
@@ -25,7 +25,7 @@ module Ecoportal
             return connection_class if respond_to?(:connection_class)
             @response_class ||= self.class.new_class(
               item_class,
-              inherits: Ecoportal::API::GraphQL::Base::Connection,
+              inherits: Ecoportal::API::GraphQL::Logic::Connection,
               namespace: "Ecoportal::API::GraphQL::Connection"
             ) do |klass|
               klass.item_class = item_class

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

@@ -0,0 +1,15 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Logic
+      end
+    end
+  end
+end
+
+require 'ecoportal/api/graphql/logic/query'
+require 'ecoportal/api/graphql/logic/mutation'
+require 'ecoportal/api/graphql/logic/connection'
+require 'ecoportal/api/graphql/logic/query_array'
+require 'ecoportal/api/graphql/logic/query_connection'
+require 'ecoportal/api/graphql/logic/payload'

data/lib/ecoportal/api/graphql/model/location_node.rb

@@ -0,0 +1,11 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Model
+        class LocationNode < Ecoportal::API::GraphQL::Base::LocationNode
+          embeds_one :parent, klass: Model::LocationNode, nullable: true
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/model/{tag_tree.rb → location_structure.rb}

@@ -2,8 +2,8 @@ module Ecoportal
   module API
     class GraphQL
       module Model
-        class TagTree < Ecoportal::API::GraphQL::Base::TagTree
-          embeds_many :nodes, klass: Ecoportal::API::GraphQL::Model::TagTreeNode, order_key: :weight
+        class LocationStructure < Ecoportal::API::GraphQL::Base::LocationStructure
+          embeds_many :nodes, klass: Ecoportal::API::GraphQL::Model::LocationNode, order_key: :weight
         end
       end
     end

data/lib/ecoportal/api/graphql/model/organization.rb

@@ -12,8 +12,8 @@ module Ecoportal
               DEFAULT_PATH.dup.push(*add)
             end
 
-            query :tagTree, query_klass: "Ecoportal::API::GraphQL::Query::TagTree"
-            query :tagTrees, query_klass: "Ecoportal::API::GraphQL::Query::TagTrees"
+            query :LocationStructure, subpath: "locations", query_klass: "Ecoportal::API::GraphQL::Query::LocationStructure"
+            query :LocationStructures, subpath: "locations", query_klass: "Ecoportal::API::GraphQL::Query::LocationStructures"
             query :contractorEntities, query_klass: "Ecoportal::API::GraphQL::Query::ContractorEntities"
             #contractorEntity,
             query :actions, query_klass: "Ecoportal::API::GraphQL::Query::Actions"

data/lib/ecoportal/api/graphql/model.rb

@@ -7,8 +7,8 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/model/tag_tree_node'
-require 'ecoportal/api/graphql/model/tag_tree'
+require 'ecoportal/api/graphql/model/location_node'
+require 'ecoportal/api/graphql/model/location_structure'
 require 'ecoportal/api/graphql/model/account'
 require 'ecoportal/api/graphql/model/user'
 require 'ecoportal/api/graphql/model/person_member'

data/lib/ecoportal/api/graphql/mutation/contractor_entity/create.rb

@@ -0,0 +1,40 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module ContractorEntity
+          class Create < Ecoportal::API::GraphQL::Logic::Mutation
+            field_name :createContractorEntity
+
+            class_resolver :payload_class, Ecoportal::API::GraphQL::Payload::ContractorEntity::Create
+            class_resolver :input_class, Ecoportal::API::GraphQL::Model::ContractorEntity
+
+            private
+
+            def basic_block(&block)
+              payload_block = block || default_payload_block
+              Proc.new {
+                mutation(input: :CreateContractorEntityInput!) {
+                  createContractorEntity(input: :input, &payload_block)
+                }
+              }
+            end
+
+            def default_payload_block
+              Proc.new {
+                clientMutationId
+                errors {
+                  details
+                  fullMessages
+                }
+                item {
+                  ___Fragment__ContractorEntity
+                }
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/mutation/contractor_entity.rb

@@ -0,0 +1,14 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module ContractorEntity
+        end
+      end
+    end
+  end
+end
+
+require_relative 'contractor_entity/create'
+# require_relative 'contractor_entity/destroy'
+# require_relative 'contractor_entity/update'

data/lib/ecoportal/api/graphql/mutation/location_structure/apply_commands.rb

@@ -0,0 +1,61 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module LocationStructure
+          class ApplyCommands < Ecoportal::API::GraphQL::Logic::Mutation
+            field_name :applyCommandsToLocationStructure
+            class_resolver :payload_class, Ecoportal::API::GraphQL::Payload::LocationStructure::ApplyCommands
+            class_resolver :input_class, Ecoportal::API::GraphQL::Input::LocationStructure::ApplyCommands
+
+            private
+
+            def basic_block(&block)
+              payload_block = block || default_payload_block
+              Proc.new {
+                mutation(input: :ApplyCommandsToLocationStructureInput!) {
+                  applyCommandsToLocationStructure(input: :input, &payload_block)
+                }
+              }
+            end
+
+            def default_payload_block
+              Proc.new {
+                clientMutationId
+                error {
+            			message
+            			conflictingIds
+            			validationErrors {
+            				error
+            				message
+            			}
+            		}
+            		results {
+            			command {
+            				id
+            				state
+                    __typename
+            			}
+            			ok
+            			error {
+            				conflictingIds
+            				message
+            				validationErrors {
+            					error
+            					message
+            				}
+            			}
+            		}
+                structure {
+                  nodes(includeArchived: true) {
+                    ___Ecoportal__API__GraphQL__Fragment__LocationNode
+                  }
+                }
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module LocationStructure
+        end
+      end
+    end
+  end
+end
+
+require_relative 'location_structure/apply_commands'

data/lib/ecoportal/api/graphql/mutation.rb

@@ -7,4 +7,5 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/mutation/create_contractor_entity'
+require 'ecoportal/api/graphql/mutation/location_structure'
+require 'ecoportal/api/graphql/mutation/contractor_entity'

data/lib/ecoportal/api/graphql/payload/contractor_entity/create.rb

@@ -0,0 +1,13 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module ContractorEntity
+          class Create < Ecoportal::API::GraphQL::Logic::Payload
+            class_resolver :item_class, "Ecoportal::API::GraphQL::Model::ContractorEntity"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/payload/contractor_entity/destroy.rb

@@ -0,0 +1,12 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module ContractorEntity
+          class Destroy < Ecoportal::API::GraphQL::Payload::ContractorEntity::Create
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/payload/contractor_entity/update.rb

@@ -0,0 +1,12 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module ContractorEntity
+          class Update < Ecoportal::API::GraphQL::Payload::ContractorEntity::Create
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/payload/contractor_entity.rb

@@ -0,0 +1,14 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module ContractorEntity
+        end
+      end
+    end
+  end
+end
+
+require_relative 'contractor_entity/create'
+require_relative 'contractor_entity/destroy'
+require_relative 'contractor_entity/update'

data/lib/ecoportal/api/graphql/payload/location_structure/apply_commands.rb

@@ -0,0 +1,25 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+          class ApplyCommands < Ecoportal::API::GraphQL::Base::Model
+            passthrough :clientMutationId
+            embeds_one :structure, klass: Ecoportal::API::GraphQL::Model::LocationStructure
+            embeds_one :errors, klass: Ecoportal::API::GraphQL::Error::ValidationErrors, nullable: true
+            embeds_one :error, klass: Ecoportal::API::GraphQL::Error::LocationsError, nullable: true
+            embeds_many :results, read_only: true, klass: Ecoportal::API::GraphQL::Payload::LocationStructure::CommandExecutionResult
+
+            def success?
+              !errors?
+            end
+
+            def errors?
+              errors && !errors.empty?
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/payload/location_structure/command_execution_result.rb

@@ -0,0 +1,15 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+          class CommandExecutionResult < Ecoportal::API::GraphQL::Base::Model
+            embeds_one :command, klass: Ecoportal::API::GraphQL::Payload::LocationStructure::CommandInterface
+            embeds_one :error, klass: Ecoportal::API::GraphQL::Error::LocationsError
+            passboolean :ok
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/payload/location_structure/command_interface.rb

@@ -0,0 +1,14 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+          class CommandInterface < Ecoportal::API::GraphQL::Base::Model
+            passkey :id
+            passthrough :state
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+        end
+      end
+    end
+  end
+end
+
+require_relative 'location_structure/command_interface'
+require_relative 'location_structure/command_execution_result'
+require_relative 'location_structure/apply_commands'

data/lib/ecoportal/api/graphql/payload.rb

@@ -7,6 +7,5 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/payload/create_contractor_entity'
-require 'ecoportal/api/graphql/payload/update_contractor_entity'
-require 'ecoportal/api/graphql/payload/destroy_contractor_entity'
+require 'ecoportal/api/graphql/payload/location_structure'
+require 'ecoportal/api/graphql/payload/contractor_entity'

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

@@ -2,7 +2,7 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class Actions < Ecoportal::API::GraphQL::Base::QueryConnection
+        class Actions < Ecoportal::API::GraphQL::Logic::QueryConnection
           field_name :actions
 
           class_resolver :item_class, Ecoportal::API::GraphQL::Model::Action

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

@@ -2,7 +2,7 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class ContractorEntities < Ecoportal::API::GraphQL::Base::QueryConnection
+        class ContractorEntities < Ecoportal::API::GraphQL::Logic::QueryConnection
           field_name :contractorEntities
 
           class_resolver :item_class, Ecoportal::API::GraphQL::Model::ContractorEntity

data/lib/ecoportal/api/graphql/query/{tag_tree.rb → location_structure.rb}

@@ -2,32 +2,36 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class TagTree < Ecoportal::API::GraphQL::Base::Query
+        class LocationStructure < Ecoportal::API::GraphQL::Logic::Query
           accepted_params :id
-          field_name :tagTree
+          field_name :structure
 
-          class_resolver :item_class, Ecoportal::API::GraphQL::Model::TagTree
+          class_resolver :item_class, Ecoportal::API::GraphQL::Model::LocationStructure
 
           private
 
           def basic_block(&block)
-            final_block = block || default_tree_block
+            final_block = block || default_query_block
             Proc.new {
               query(id: :id!) {
                 currentOrganization {
-                  tagTree(id: :id, &final_block)
+                  locations {
+                    structure(id: :id, &final_block)
+                  }
                 }
               }
             }
           end
 
-          def default_tree_block
+          def default_query_block
             Proc.new {
               id
               name
+              archived
+              weight
               visitorManagementEnabled
-              nodes {
-                ___Ecoportal__API__GraphQL__Fragment__TagTreeNode
+              nodes(includeArchived: true) {
+                ___Ecoportal__API__GraphQL__Fragment__LocationNode
               }
             }
           end

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

@@ -0,0 +1,46 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Query
+        class LocationStructures < Ecoportal::API::GraphQL::Logic::QueryArray
+          accepted_params :includeArchived, :includeUnpublished
+          field_name :structures
+
+          class_resolver :item_class, Ecoportal::API::GraphQL::Model::LocationStructure
+
+          private
+
+          def basic_block(&block)
+            final_block = block || default_query_block
+            Proc.new {
+              query(includeArchived: :boolean, includeUnpublished: :boolean) {
+                currentOrganization {
+                  locations {
+                    structures(
+                      includeArchived: :includeArchived,
+                      includeUnpublished: :includeUnpublished,
+                      &final_block
+                    )
+                  }
+                }
+              }
+            }
+          end
+
+          def default_query_block
+            Proc.new {
+              id
+              name
+              archived
+              weight
+              visitorManagementEnabled
+              nodes(includeArchived: true) {
+                ___Ecoportal__API__GraphQL__Fragment__LocationNode
+              }
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/query/tag_tree'
-require 'ecoportal/api/graphql/query/tag_trees'
+require 'ecoportal/api/graphql/query/location_structure'
+require 'ecoportal/api/graphql/query/location_structures'
 require 'ecoportal/api/graphql/query/actions'
 require 'ecoportal/api/graphql/query/contractor_entities'

data/lib/ecoportal/api/graphql.rb

@@ -30,12 +30,16 @@ module Ecoportal
         createContractorEntityMutation.query(input: input, &block)
       end
 
+      # Gives a builder to use different options to modify a reporting structure
+      def locationStructure
+        Ecoportal::API::GraphQL::Builder::LocationStructure.new(client)
+      end
+
       private
 
       def createContractorEntityMutation
-        Ecoportal::API::GraphQL::Mutation::CreateContractorEntity.new(client)
+        Ecoportal::API::GraphQL::Mutation::ContractorEntity::Create.new(client)
       end
-
     end
   end
 end
@@ -43,9 +47,12 @@ end
 require 'ecoportal/api/graphql/helpers'
 require 'ecoportal/api/graphql/base'
 require 'ecoportal/api/graphql/model'
+require 'ecoportal/api/graphql/error'
+require 'ecoportal/api/graphql/logic'
 require 'ecoportal/api/graphql/connection'
 require 'ecoportal/api/graphql/payload'
 require 'ecoportal/api/graphql/input'
 require 'ecoportal/api/graphql/fragment'
 require 'ecoportal/api/graphql/query'
 require 'ecoportal/api/graphql/mutation'
+require 'ecoportal/api/graphql/builder'

data/lib/ecoportal/api/graphql_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GRAPQL_VERSION = "0.1.11"
+    GRAPQL_VERSION = "0.2.2"
   end
 end

data/tests/loc_structure_get.rb

@@ -0,0 +1,11 @@
+require_relative 'local_libs'
+
+STRUCT_ID = "592642a4ae0c6a00236b110d" # mini test
+# STRUCT_ID = "626745bcba616a001f7e5011" # wcc
+
+
+api = Ecoportal::API::GraphQL.new
+api.currentOrganization.LocationStructure(id: STRUCT_ID).tap do |tree|
+  puts "'#{tree.name}' Structure (#{tree.id})"
+  pp tree.treeify
+end