ecoportal-api-graphql 1.2.1 → 1.3.2

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

@@ -3,11 +3,11 @@ module Ecoportal
     class GraphQL
       module Mutation
         module ContractorEntity
-          class Create < Ecoportal::API::GraphQL::Logic::Mutation
+          class Create < Logic::Mutation
             field_name :createContractorEntity
 
-            class_resolver :payload_class, Ecoportal::API::GraphQL::Payload::ContractorEntity::Create
-            class_resolver :input_class, Ecoportal::API::GraphQL::Input::ContractorEntity::Create
+            class_resolver :payload_class, Payload::ContractorEntity::Create
+            class_resolver :input_class, Input::ContractorEntity::Create
 
             private
 

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

@@ -3,11 +3,11 @@ module Ecoportal
     class GraphQL
       module Mutation
         module ContractorEntity
-          class Destroy < Ecoportal::API::GraphQL::Logic::Mutation
+          class Destroy < Logic::Mutation
             field_name :destroyContractorEntity
 
-            class_resolver :payload_class, Ecoportal::API::GraphQL::Payload::ContractorEntity::Destroy
-            class_resolver :input_class, Ecoportal::API::GraphQL::Input::ContractorEntity::Destroy
+            class_resolver :payload_class, Payload::ContractorEntity::Destroy
+            class_resolver :input_class, Input::ContractorEntity::Destroy
 
             private
 

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

@@ -3,10 +3,10 @@ module Ecoportal
     class GraphQL
       module Mutation
         module LocationStructure
-          class ApplyCommands < Ecoportal::API::GraphQL::Logic::Mutation
+          class ApplyCommands < 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
+            class_resolver :payload_class, Payload::LocationStructure::ApplyCommands
+            class_resolver :input_class, Input::LocationStructure::ApplyCommands
 
             private
 
@@ -14,7 +14,10 @@ module Ecoportal
               payload_block = block || default_payload_block
               proc {
                 mutation(input: :ApplyCommandsToLocationStructureInput!) {
-                  applyCommandsToLocationStructure(input: :input, &payload_block)
+                  applyCommandsToLocationStructure(
+                    input: :input,
+                    &payload_block
+                  )
                 }
               }
             end
@@ -23,12 +26,7 @@ module Ecoportal
               proc {
                 clientMutationId
                 error {
-                  message
-                  conflictingIds
-                  validationErrors {
-                    error
-                    message
-                  }
+                  ___Ecoportal__API__GraphQL__Fragment__LocationsError
                 }
                 results {
                   ok
@@ -38,12 +36,7 @@ module Ecoportal
                     __typename
                   }
                   error {
-                    conflictingIds
-                    message
-                    validationErrors {
-                      error
-                      message
-                    }
+                    ___Ecoportal__API__GraphQL__Fragment__LocationsError
                   }
                 }
                 structure {

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

@@ -0,0 +1,57 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module LocationStructure
+          module Draft
+            class AddCommands < Logic::Mutation
+              field_name :addCommandsToLocationDraft
+              accepted_params :includeArchivedNodes, default: true
+
+              class_resolver :payload_class, Payload::LocationStructure::Draft::AddCommands
+              class_resolver :input_class, Input::LocationStructure::Draft::AddCommands
+
+              private
+
+              def basic_block(&block)
+                payload_block = block || default_payload_block
+                proc {
+                  mutation(
+                    input:                :AddCommandsToLocationDraftInput!,
+                    includeArchivedNodes: :boolean
+                  ) {
+                    addCommandsToLocationDraft(
+                      input: :input,
+                      &payload_block
+                    )
+                  }
+                }
+              end
+
+              def default_payload_block
+                proc {
+                  clientMutationId
+                  draft {
+                    ___Ecoportal__API__GraphQL__Fragment__LocationDraft
+                    structure {
+                      nodes(
+                        includeArchived: :includeArchivedNodes
+                      ) {
+                        ___Ecoportal__API__GraphQL__Fragment__LocationNode
+                      }
+                    }
+                  }
+                  ok
+                  errors {
+                    details
+                    fullMessages
+                  }
+                }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module LocationStructure
+          module Draft
+            class Create < Logic::Mutation
+              field_name :createLocationDraft
+
+              accepted_params :includeArchivedNodes, default: true
+
+              class_resolver :payload_class, Payload::LocationStructure::Draft::Create
+              class_resolver :input_class, Input::LocationStructure::Draft::Create
+
+              private
+
+              def basic_block(&block)
+                payload_block = block || default_payload_block
+                proc {
+                  mutation(
+                    input:                :CreateLocationDraftInput!,
+                    includeArchivedNodes: :boolean
+                  ) {
+                    createLocationDraft(
+                      input: :input,
+                      &payload_block
+                    )
+                  }
+                }
+              end
+
+              def default_payload_block
+                proc {
+                  clientMutationId
+                  draft {
+                    ___Ecoportal__API__GraphQL__Fragment__LocationDraft
+                    structure {
+                      nodes(
+                        includeArchived: :includeArchivedNodes
+                      ) {
+                        ___Ecoportal__API__GraphQL__Fragment__LocationNode
+                      }
+                    }
+                  }
+                  errors {
+                    details
+                    fullMessages
+                  }
+                }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module LocationStructure
+          module Draft
+            class Delete < Logic::Mutation
+              field_name :deleteLocationDraft
+
+              class_resolver :payload_class, Payload::LocationStructure::Draft::Delete
+              class_resolver :input_class, Input::LocationStructure::Draft::Delete
+
+              private
+
+              def basic_block(&block)
+                payload_block = block || default_payload_block
+                proc {
+                  mutation(input: :DeleteLocationDraftInput!) {
+                    deleteLocationDraft(
+                      input: :input,
+                      &payload_block
+                    )
+                  }
+                }
+              end
+
+              def default_payload_block
+                proc {
+                  clientMutationId
+                  ok
+                  errors {
+                    details
+                    fullMessages
+                  }
+                }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module LocationStructure
+          class DropBadCommands < Logic::Mutation
+            field_name :dropBadCommandsFromLocationDraft
+
+            accepted_params :includeArchivedNodes, default: true
+
+            class_resolver :payload_class, Payload::LocationStructure::Draft::DropBadCommands
+            class_resolver :input_class, Input::LocationStructure::Draft::DropBadCommands
+
+            private
+
+            def basic_block(&block)
+              payload_block = block || default_payload_block
+              proc {
+                mutation(
+                  input:                :DropBadCommandsFromLocationDraftInput!,
+                  includeArchivedNodes: :boolean
+                ) {
+                  dropBadCommandsFromLocationDraft(
+                    input: :input,
+                    &payload_block
+                  )
+                }
+              }
+            end
+
+            def default_payload_block
+              proc {
+                clientMutationId
+                draft {
+                  ___Ecoportal__API__GraphQL__Fragment__LocationDraft
+                  structure {
+                    nodes(
+                      includeArchived: :includeArchivedNodes
+                    ) {
+                      ___Ecoportal__API__GraphQL__Fragment__LocationNode
+                    }
+                  }
+                }
+                ok
+                error {
+                  ___Ecoportal__API__GraphQL__Fragment__LocationsError
+                }
+                errors {
+                  details
+                  fullMessages
+                }
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module LocationStructure
+          module Draft
+            class Publish < Logic::Mutation
+              field_name :applyLocationDraft
+
+              accepted_params :includeArchivedNodes, default: true
+
+              class_resolver :payload_class, Payload::LocationStructure::Draft::Publish
+              class_resolver :input_class, Input::LocationStructure::Draft::Publish
+
+              private
+
+              def basic_block(&block)
+                payload_block = block || default_payload_block
+                proc {
+                  mutation(
+                    input:                :ApplyLocationDraftInput!,
+                    includeArchivedNodes: :boolean
+                  ) {
+                    applyLocationDraft(
+                      input: :input,
+                      &payload_block
+                    )
+                  }
+                }
+              end
+
+              def default_payload_block
+                proc {
+                  clientMutationId
+                  structure {
+                    nodes(
+                      includeArchived: :includeArchivedNodes
+                    ) {
+                      ___Ecoportal__API__GraphQL__Fragment__LocationNode
+                    }
+                  }
+                  ok
+                  error {
+                    ___Ecoportal__API__GraphQL__Fragment__LocationsError
+                  }
+                  errors {
+                    details
+                    fullMessages
+                  }
+                  results {
+                    ok
+                    command {
+                      id
+                      state
+                      __typename
+                    }
+                    error {
+                      ___Ecoportal__API__GraphQL__Fragment__LocationsError
+                    }
+                  }
+                }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Mutation
+        module LocationStructure
+          module Draft
+          end
+        end
+      end
+    end
+  end
+end
+
+require_relative 'draft/create'
+require_relative 'draft/publish'
+require_relative 'draft/delete'
+require_relative 'draft/add_commands'
+require_relative 'draft/drop_bad_commands'

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

@@ -10,3 +10,4 @@ module Ecoportal
 end
 
 require_relative 'location_structure/apply_commands'
+require_relative 'location_structure/draft'

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

@@ -3,7 +3,7 @@ module Ecoportal
     class GraphQL
       module Payload
         module Action
-          class Archive < Ecoportal::API::GraphQL::Logic::Payload
+          class Archive < Logic::Payload
             class_resolver :item_class, "Ecoportal::API::GraphQL::Model::Action"
           end
         end

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

@@ -3,7 +3,7 @@ module Ecoportal
     class GraphQL
       module Payload
         module Action
-          class Create < Ecoportal::API::GraphQL::Logic::Payload
+          class Create < Logic::Payload
             class_resolver :item_class, "Ecoportal::API::GraphQL::Model::Action"
           end
         end

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

@@ -3,7 +3,7 @@ module Ecoportal
     class GraphQL
       module Payload
         module Action
-          class Update < Ecoportal::API::GraphQL::Logic::Payload
+          class Update < Logic::Payload
             class_resolver :item_class, "Ecoportal::API::GraphQL::Model::Action"
           end
         end

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

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

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

@@ -3,7 +3,7 @@ module Ecoportal
     class GraphQL
       module Payload
         module ContractorEntity
-          class Destroy < Ecoportal::API::GraphQL::Payload::ContractorEntity::Create
+          class Destroy < Payload::ContractorEntity::Create
           end
         end
       end

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

@@ -3,7 +3,7 @@ module Ecoportal
     class GraphQL
       module Payload
         module ContractorEntity
-          class Update < Ecoportal::API::GraphQL::Payload::ContractorEntity::Create
+          class Update < Payload::ContractorEntity::Create
           end
         end
       end

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

@@ -3,21 +3,44 @@ module Ecoportal
     class GraphQL
       module Payload
         module LocationStructure
-          class ApplyCommands < Ecoportal::API::GraphQL::Base::Model
+          class ApplyCommands < Logic::Payload
             read_only!
 
             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
+            embeds_one :structure, klass: Model::LocationStructure
+            embeds_one :error, klass: Error::LocationsError, nullable: true
+            embeds_many :results, read_only: true, klass: Payload::LocationStructure::CommandExecutionResult
 
-            def success?
-              !errors?
+            include Error::LocationsError::FetchNested
+
+            def error?
+              super || result_errors? || locations_error?
+            end
+            alias_method :errors?, :error? # backward compatibility
+
+            def error_doc
+              err_doc = super
+              return err_doc if err_doc
+
+              if result_errors?
+                {
+                  results: [
+                    result_errors.first&.error_doc
+                  ]
+                }
+              elsif locations_error?
+                {
+                  locationsError: locations_error_doc
+                }
+              end
+            end
+
+            def result_errors?
+              result_errors.any?
             end
 
-            def errors?
-              errors && !errors.empty?
+            def result_errors
+              results.select(&:error?)
             end
           end
         end

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

@@ -3,12 +3,35 @@ module Ecoportal
     class GraphQL
       module Payload
         module LocationStructure
-          class CommandExecutionResult < Ecoportal::API::GraphQL::Base::Model
+          class CommandExecutionResult < Logic::BaseModel
             read_only!
 
-            embeds_one :command, klass: Ecoportal::API::GraphQL::Payload::LocationStructure::CommandInterface
-            embeds_one :error, nullable: true, klass: Ecoportal::API::GraphQL::Error::LocationsError
+            embeds_one :command, klass: Interface::LocationStructure::Command
+            embeds_one :error, nullable: true, klass: Error::LocationsError
             passboolean :ok
+            alias_method :ok?, :ok
+
+            include Error::LocationsError::FetchNested
+
+            def error?
+              !ok? || locations_error?
+            end
+
+            def error_doc
+              if locations_error?
+                {
+                  locationsError: locations_error_doc
+                }
+              elsif !ok?
+                {
+                  ok: false
+                }
+              end
+            end
+
+            def success?
+              !error?
+            end
           end
         end
       end

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

@@ -0,0 +1,27 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+          module Draft
+            class AddCommands < Create
+              passboolean :ok
+              alias_method :ok?, :ok
+
+              def error?
+                super || !ok?
+              end
+
+              def error_doc
+                err_doc = super
+                return err_doc if err_doc
+
+                { ok: false } unless ok?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+          module Draft
+            class Create < Logic::Payload
+              class_resolver :item_class, "Ecoportal::API::GraphQL::Model::LocationStructure::Draft"
+
+              embeds_one :draft, klass: :item_class
+              alias_method :item, :draft
+
+              def error?
+                super ||
+                  draft.error?
+              end
+
+              def error_doc
+                err_doc = super
+                return err_doc if err_doc
+
+                if draft.error? && draft.respond_to?(:error_doc)
+                  {
+                    draft: draft.error_doc
+                  }
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+          module Draft
+            class Delete < Logic::Payload
+              passboolean :ok
+              alias_method :ok?, :ok
+
+              def error?
+                super || !ok?
+              end
+
+              def error_doc
+                err_doc = super
+                return err_doc if err_doc
+
+                { ok: false } unless ok?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end