ecoportal-api-graphql 1.2.1 → 1.3.2

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

@@ -0,0 +1,41 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+          module Draft
+            class DropBadCommands < AddCommands
+              passboolean :ok
+              alias_method :ok?, :ok
+
+              embeds_one :error, klass: Error::LocationsError, nullable: true
+
+              include Error::LocationsError::FetchNested
+
+              def error?
+                super              ||
+                  !ok?             ||
+                  locations_error?
+              end
+
+              def error_doc
+                err_doc = super
+                return err_doc if err_doc
+
+                if locations_error?
+                  {
+                    locationsError: locations_error_doc
+                  }
+                elsif !ok?
+                  {
+                    ok: false
+                  }
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        module LocationStructure
+          module Draft
+            class Publish < Logic::Payload
+              class_resolver :item_class, "Ecoportal::API::GraphQL::Model::LocationStructure::Draft::Structure"
+
+              embeds_one :structure, klass: :item_class
+              alias_method :item, :structure
+
+              passboolean :ok
+              alias_method :ok?, :ok
+
+              embeds_one :error, klass: Error::LocationsError, nullable: true
+              embeds_many :results, read_only: true, klass: Payload::LocationStructure::CommandExecutionResult
+
+              include Error::LocationsError::FetchNested
+
+              def error?
+                super              ||
+                  !ok?             ||
+                  locations_error? ||
+                  result_errors?
+              end
+
+              def error_doc
+                err_doc = super
+                return err_doc if err_doc
+
+                if locations_error?
+                  {
+                    locationsError: locations_error_doc
+                  }
+                elsif result_errors?
+                  {
+                    results: [result_errors.first&.error_doc]
+                  }
+                end
+              end
+
+              def result_errors?
+                result_errors.any?
+              end
+
+              def result_errors
+                results.select(&:error?)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Payload
+        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/payload/location_structure.rb

@@ -9,6 +9,6 @@ module Ecoportal
   end
 end
 
-require_relative 'location_structure/command_interface'
 require_relative 'location_structure/command_execution_result'
 require_relative 'location_structure/apply_commands'
+require_relative 'location_structure/draft'

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

@@ -2,11 +2,11 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class Action < Ecoportal::API::GraphQL::Logic::Query
+        class Action < Logic::Query
           field_name :action
 
           accepted_params :id
-          class_resolver :item_class, Ecoportal::API::GraphQL::Model::Action
+          class_resolver :item_class, Model::Action
 
           private
 

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

@@ -2,11 +2,11 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class ActionCategories < Ecoportal::API::GraphQL::Logic::QueryConnection
+        class ActionCategories < Logic::QueryConnection
           field_name :actionCategories
 
-          class_resolver :item_class, Ecoportal::API::GraphQL::Base::ActionCategory
-          class_resolver :connection_class, Ecoportal::API::GraphQL::Connection::ActionCategory
+          class_resolver :item_class, Base::ActionCategory
+          class_resolver :connection_class, Connection::ActionCategory
 
           private
 

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

@@ -2,11 +2,11 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class Actions < Ecoportal::API::GraphQL::Logic::QueryConnection
+        class Actions < Logic::QueryConnection
           field_name :actions
 
-          class_resolver :item_class, Ecoportal::API::GraphQL::Model::Action
-          class_resolver :connection_class, Ecoportal::API::GraphQL::Connection::Action
+          class_resolver :item_class, Model::Action
+          class_resolver :connection_class, Connection::Action
 
           private
 

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

@@ -2,11 +2,11 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class ContractorEntities < Ecoportal::API::GraphQL::Logic::QueryConnection
+        class ContractorEntities < Logic::QueryConnection
           field_name :contractorEntities
 
-          class_resolver :item_class, Ecoportal::API::GraphQL::Model::ContractorEntity
-          class_resolver :connection_class, Ecoportal::API::GraphQL::Connection::ContractorEntity
+          class_resolver :item_class, Model::ContractorEntity
+          class_resolver :connection_class, Connection::ContractorEntity
 
           private
 

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

@@ -2,13 +2,13 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class LocationClassifications < Ecoportal::API::GraphQL::Logic::QueryArray
+        class LocationClassifications < Logic::QueryArray
           accepted_params :active, default: true
 
           base_path 'currentOrganization.locations'
           field_name :classifications
 
-          class_resolver :item_class, Ecoportal::API::GraphQL::Base::LocationClassificationType
+          class_resolver :item_class, Base::LocationClassificationType
 
           private
 

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

@@ -0,0 +1,62 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Query
+        class LocationStructure
+          class Draft < Logic::Query
+            accepted_params :id
+            accepted_params :structureId
+            accepted_params :includeArchivedNodes, default: true
+
+            field_name :draft
+
+            class_resolver :item_class, Model::LocationStructure::Draft
+
+            private
+
+            def basic_block(&block)
+              final_block = block || default_query_block
+              proc {
+                query(
+                  id:                   :id!,
+                  structureId:          :id!,
+                  includeArchivedNodes: :boolean
+                ) {
+                  currentOrganization {
+                    locations {
+                      structure(
+                        id: :structureId
+                      ) {
+                        id
+                        name
+                        archived
+                        updatedAt
+                        draft(
+                          id: :id,
+                          &final_block
+                        )
+                      }
+                    }
+                  }
+                }
+              }
+            end
+
+            def default_query_block
+              proc {
+                ___Ecoportal__API__GraphQL__Fragment__LocationDraft
+                structure {
+                  nodes(
+                    includeArchived: :includeArchivedNodes
+                  ) {
+                    ___Ecoportal__API__GraphQL__Fragment__LocationNode
+                  }
+                }
+              }
+            end
+          end
+        end
+      end # Query
+    end # GraphQL
+  end # API
+end # Ecoportal

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

@@ -2,20 +2,23 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class LocationStructure < Ecoportal::API::GraphQL::Logic::Query
+        class LocationStructure < Logic::Query
           accepted_params :id
           accepted_params :includeArchivedNodes, default: true
 
           field_name :structure
 
-          class_resolver :item_class, Ecoportal::API::GraphQL::Model::LocationStructure
+          class_resolver :item_class, Model::LocationStructure
 
           private
 
           def basic_block(&block)
             final_block = block || default_query_block
             proc {
-              query(id: :id!, includeArchivedNodes: :boolean) {
+              query(
+                id:                   :id!,
+                includeArchivedNodes: :boolean
+              ) {
                 currentOrganization {
                   locations {
                     structure(id: :id, &final_block)
@@ -36,9 +39,17 @@ module Ecoportal
               weight
               updatedAt
               visitorManagementEnabled
-              nodes(includeArchived: :includeArchivedNodes) {
+              nodes(
+                includeArchived: :includeArchivedNodes
+              ) {
                 ___Ecoportal__API__GraphQL__Fragment__LocationNode
               }
+              drafts {
+                id
+                createdAt
+                name
+                notes
+              }
             }
           end
         end
@@ -46,3 +57,5 @@ module Ecoportal
     end
   end
 end
+
+require_relative 'location_structure/draft'

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

@@ -2,13 +2,13 @@ module Ecoportal
   module API
     class GraphQL
       module Query
-        class LocationStructures < Ecoportal::API::GraphQL::Logic::QueryArray
+        class LocationStructures < Logic::QueryArray
           accepted_params :includeArchived, :includeUnpublished, default: false
           accepted_params :includeArchivedNodes, default: true
 
           field_name :structures
 
-          class_resolver :item_class, Ecoportal::API::GraphQL::Model::LocationStructure
+          class_resolver :item_class, Model::LocationStructure
 
           private
 
@@ -43,7 +43,9 @@ module Ecoportal
               archived
               weight
               visitorManagementEnabled
-              nodes(includeArchived: :includeArchivedNodes) {
+              nodes(
+                includeArchived: :includeArchivedNodes
+              ) {
                 ___Ecoportal__API__GraphQL__Fragment__LocationNode
               }
             }

data/lib/ecoportal/api/graphql.rb

@@ -54,15 +54,17 @@ module Ecoportal
   end
 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'
+require_relative 'graphql/helpers'
+require_relative 'graphql/logic/base_model'
+require_relative 'graphql/error'
+require_relative 'graphql/interface'
+require_relative 'graphql/base'
+require_relative 'graphql/model'
+require_relative 'graphql/logic'
+require_relative 'graphql/connection'
+require_relative 'graphql/payload'
+require_relative 'graphql/input'
+require_relative 'graphql/fragment'
+require_relative 'graphql/query'
+require_relative 'graphql/mutation'
+require_relative 'graphql/builder'

data/lib/ecoportal/api/graphql_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GRAPQL_VERSION = '1.2.1'.freeze
+    GRAPQL_VERSION = '1.3.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-graphql
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-16 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -141,7 +141,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: 0.10.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -151,27 +151,27 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: 0.10.14
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-v2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: graphlient
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +244,8 @@ files:
 - lib/ecoportal/api/graphql/base/location_classification_type.rb
 - lib/ecoportal/api/graphql/base/location_node.rb
 - lib/ecoportal/api/graphql/base/location_structure.rb
-- lib/ecoportal/api/graphql/base/model.rb
+- lib/ecoportal/api/graphql/base/location_structure/draft.rb
+- lib/ecoportal/api/graphql/base/location_structure/draft/structure.rb
 - lib/ecoportal/api/graphql/base/organization.rb
 - lib/ecoportal/api/graphql/base/page.rb
 - lib/ecoportal/api/graphql/base/page_info.rb
@@ -254,6 +255,7 @@ files:
 - lib/ecoportal/api/graphql/builder/action.rb
 - lib/ecoportal/api/graphql/builder/contractor_entity.rb
 - lib/ecoportal/api/graphql/builder/location_structure.rb
+- lib/ecoportal/api/graphql/builder/location_structure/draft.rb
 - lib/ecoportal/api/graphql/connection.rb
 - lib/ecoportal/api/graphql/connection/action.rb
 - lib/ecoportal/api/graphql/connection/action_category.rb
@@ -261,13 +263,16 @@ files:
 - lib/ecoportal/api/graphql/connection/person_member.rb
 - lib/ecoportal/api/graphql/error.rb
 - lib/ecoportal/api/graphql/error/locations_error.rb
+- lib/ecoportal/api/graphql/error/locations_error/fetch_nested.rb
 - lib/ecoportal/api/graphql/error/locations_validation_error.rb
 - lib/ecoportal/api/graphql/error/validation_errors.rb
 - lib/ecoportal/api/graphql/fragment.rb
 - lib/ecoportal/api/graphql/fragment/action.rb
 - lib/ecoportal/api/graphql/fragment/action_category.rb
 - lib/ecoportal/api/graphql/fragment/contractor_entity.rb
+- lib/ecoportal/api/graphql/fragment/location_draft.rb
 - lib/ecoportal/api/graphql/fragment/location_node.rb
+- lib/ecoportal/api/graphql/fragment/locations_error.rb
 - lib/ecoportal/api/graphql/fragment/pagination.rb
 - lib/ecoportal/api/graphql/helpers.rb
 - lib/ecoportal/api/graphql/helpers/locations_tree.rb
@@ -284,8 +289,13 @@ files:
 - lib/ecoportal/api/graphql/input/location_structure.rb
 - lib/ecoportal/api/graphql/input/location_structure/apply_commands.rb
 - lib/ecoportal/api/graphql/input/location_structure/archive_command.rb
-- lib/ecoportal/api/graphql/input/location_structure/command_interface.rb
 - lib/ecoportal/api/graphql/input/location_structure/delete_command.rb
+- lib/ecoportal/api/graphql/input/location_structure/draft.rb
+- lib/ecoportal/api/graphql/input/location_structure/draft/add_commands.rb
+- lib/ecoportal/api/graphql/input/location_structure/draft/create.rb
+- lib/ecoportal/api/graphql/input/location_structure/draft/delete.rb
+- lib/ecoportal/api/graphql/input/location_structure/draft/drop_bad_commands.rb
+- lib/ecoportal/api/graphql/input/location_structure/draft/publish.rb
 - lib/ecoportal/api/graphql/input/location_structure/insert_command.rb
 - lib/ecoportal/api/graphql/input/location_structure/move_command.rb
 - lib/ecoportal/api/graphql/input/location_structure/reorder_command.rb
@@ -294,9 +304,17 @@ files:
 - lib/ecoportal/api/graphql/input/search.rb
 - lib/ecoportal/api/graphql/input/search_filter.rb
 - lib/ecoportal/api/graphql/input/search_sorter.rb
+- lib/ecoportal/api/graphql/interface.rb
+- lib/ecoportal/api/graphql/interface/base_page.rb
+- lib/ecoportal/api/graphql/interface/location_structure.rb
+- lib/ecoportal/api/graphql/interface/location_structure/command.rb
+- lib/ecoportal/api/graphql/interface/location_structure/node.rb
+- lib/ecoportal/api/graphql/interface/location_structure/nodes.rb
 - lib/ecoportal/api/graphql/logic.rb
+- lib/ecoportal/api/graphql/logic/base_model.rb
 - lib/ecoportal/api/graphql/logic/base_query.rb
 - lib/ecoportal/api/graphql/logic/connection.rb
+- lib/ecoportal/api/graphql/logic/input.rb
 - lib/ecoportal/api/graphql/logic/mutation.rb
 - lib/ecoportal/api/graphql/logic/payload.rb
 - lib/ecoportal/api/graphql/logic/query.rb
@@ -311,6 +329,8 @@ files:
 - lib/ecoportal/api/graphql/model/file_container.rb
 - lib/ecoportal/api/graphql/model/location_node.rb
 - lib/ecoportal/api/graphql/model/location_structure.rb
+- lib/ecoportal/api/graphql/model/location_structure/draft.rb
+- lib/ecoportal/api/graphql/model/location_structure/draft/structure.rb
 - lib/ecoportal/api/graphql/model/organization.rb
 - lib/ecoportal/api/graphql/model/page.rb
 - lib/ecoportal/api/graphql/model/person_member.rb
@@ -327,6 +347,12 @@ files:
 - lib/ecoportal/api/graphql/mutation/contractor_entity/update.rb
 - lib/ecoportal/api/graphql/mutation/location_structure.rb
 - lib/ecoportal/api/graphql/mutation/location_structure/apply_commands.rb
+- lib/ecoportal/api/graphql/mutation/location_structure/draft.rb
+- lib/ecoportal/api/graphql/mutation/location_structure/draft/add_commands.rb
+- lib/ecoportal/api/graphql/mutation/location_structure/draft/create.rb
+- lib/ecoportal/api/graphql/mutation/location_structure/draft/delete.rb
+- lib/ecoportal/api/graphql/mutation/location_structure/draft/drop_bad_commands.rb
+- lib/ecoportal/api/graphql/mutation/location_structure/draft/publish.rb
 - lib/ecoportal/api/graphql/payload.rb
 - lib/ecoportal/api/graphql/payload/action.rb
 - lib/ecoportal/api/graphql/payload/action/archive.rb
@@ -339,7 +365,12 @@ files:
 - lib/ecoportal/api/graphql/payload/location_structure.rb
 - lib/ecoportal/api/graphql/payload/location_structure/apply_commands.rb
 - lib/ecoportal/api/graphql/payload/location_structure/command_execution_result.rb
-- lib/ecoportal/api/graphql/payload/location_structure/command_interface.rb
+- lib/ecoportal/api/graphql/payload/location_structure/draft.rb
+- lib/ecoportal/api/graphql/payload/location_structure/draft/add_commands.rb
+- lib/ecoportal/api/graphql/payload/location_structure/draft/create.rb
+- lib/ecoportal/api/graphql/payload/location_structure/draft/delete.rb
+- lib/ecoportal/api/graphql/payload/location_structure/draft/drop_bad_commands.rb
+- lib/ecoportal/api/graphql/payload/location_structure/draft/publish.rb
 - lib/ecoportal/api/graphql/query.rb
 - lib/ecoportal/api/graphql/query/action.rb
 - lib/ecoportal/api/graphql/query/action_categories.rb
@@ -347,6 +378,7 @@ files:
 - lib/ecoportal/api/graphql/query/contractor_entities.rb
 - lib/ecoportal/api/graphql/query/location_classifications.rb
 - lib/ecoportal/api/graphql/query/location_structure.rb
+- lib/ecoportal/api/graphql/query/location_structure/draft.rb
 - lib/ecoportal/api/graphql/query/location_structures.rb
 - lib/ecoportal/api/graphql_version.rb
 - tests/actions_get.rb

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

@@ -1,14 +0,0 @@
-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