ecoportal-api-graphql 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e148fcd6c75c8724f75b4797859146f245d9809a7e0c14330e70b0f0eeaecbbe
-  data.tar.gz: 819b4b7a1c61ad24a186688d45dc1a094dc7e09ea5b13b520837fa8fd0913b2e
+  metadata.gz: 5cc6136dc79d157acebf842f4b451e86a0f0266a5d239ad11dfa1f1db2f27ae7
+  data.tar.gz: 0a484624cc89b965ecb36e33beeb24470041288167deb2d48f52933a2f5f1d46
 SHA512:
-  metadata.gz: d51e9a2180bab176ec59881c3a4f0096254c668d81cf7e728ae3cba97b6c6eab0804a94947894f1eb0f5d00b4e4aeefa51feb9fa486a02a1694891d67819c5c7
-  data.tar.gz: 6ffde82c2a3bd6434dd93e3ed305fa9d0c36af846aa4b4556ab47409fe032a56a27d4d7e8632c61772bd271e7c956a7712660ae5719c4c65341132ce25c482b7
+  metadata.gz: aa8a69f025ff59c272b9b4285d76740d680e4a1757936ccc88383b9cda0335b1142842469cce72a330bc58bec970ca29ef1151b88761407f7938feeb4dbed220
+  data.tar.gz: 5da6da6b51a4795ba03f148a7b50d73f2465aa1c424be3f5accaebcd8eae3e599c022132458eabc0448d66df31f990d9f66b8efb5886b51bdbb061351afda4e5

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.3.4] - 2025-08-xx
+## [1.3.5] - 2025-09-xx
 
 ### Added
 
@@ -10,6 +10,27 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+## [1.3.4] - 2025-09-04
+
+### Added
+
+- Command execution result: **added** command doc when there's a `results` error.
+- Payload improvements:
+  - On `LocationsError.validationErrors`: fetch `property` property.
+  - On **results**, `Command` always fetch `__typename` and the other properties.
+
+### Changed
+
+- Changed base `error_doc`: **consistent property name**
+
+### Fixed
+
+- Correct fetch on `ok` (sometimes it is `null`: that doesn't mean failed).
+- **Consistent order** on `error?` and `error_doc`.
+- `Draft`
+  - **Overlapping** name `ConflictingIds` (vs `LocationsError.conflictingIds`)
+  - **Wrong** include on `FetchNested`
+
 ## [1.3.3] - 2025-08-29
 
 ### Added

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

@@ -11,46 +11,50 @@ module Ecoportal
             passkey :id
 
             passthrough :name, :notes
-            passboolean :commited, :ok
+
+            passboolean :commited
             alias_method :commited?, :commited
-            alias_method :ok?, :ok
 
             embeds_one :createdAt, klass: Base::DateTime
 
+            embeds_one :structure, klass: :structure_class
+
             passarray :conflictingIds
             embeds_many :commands, klass: Interface::LocationStructure::Command
             embeds_many :results, read_only: true, klass: "Ecoportal::API::GraphQL::Payload::LocationStructure::CommandExecutionResult"
 
-            embeds_one :structure, klass: :structure_class
+            passboolean :ok
 
-            include Error::LocationsError::FetchNested
+            def ok?
+              ok != false
+            end
+
+            def success?
+              !error?
+            end
 
             def error?
-              !ok?               ||
+              conflictingIds?    ||
                 result_errors?   ||
-                conflictingIds?
+                !ok?
             end
 
             def error_doc
-              if result_errors?
+              if conflictingIds?
                 {
-                  results: [result_errors.first&.error_doc]
+                  conflictingIds: conflictingIds.doc
                 }
-              elsif conflictingIds?
+              elsif result_errors?
                 {
-                  conflictingIds: conflictingIds.doc
+                  results: [result_errors.first&.error_doc]
                 }
               elsif !ok?
                 {
-                  ok: false
+                  ok: ok
                 }
               end
             end
 
-            def success?
-              !error?
-            end
-
             def structure_id
               parent_structure&.id
             end
@@ -68,6 +72,10 @@ module Ecoportal
               _parent._parent
             end
 
+            def conflictingIds?
+              (conflictingIds || []).any?
+            end
+
             def result_errors?
               result_errors.any?
             end
@@ -75,10 +83,6 @@ module Ecoportal
             def result_errors
               results.select(&:error?)
             end
-
-            def conflictingIds?
-              (conflictingIds || []).any?
-            end
           end
         end
       end # GraphQL

data/lib/ecoportal/api/graphql/error/locations_error/fetch_nested.rb

@@ -7,9 +7,9 @@ module Ecoportal
             def locations_error_doc
               return unless locations_error?
 
-              if conflictingIds?
+              if loc_err_conflicting_ids?
                 {
-                  conflictingIds: conflictingIds.doc
+                  conflictingIds: loc_err_conflicting_ids.doc
                 }
               elsif validationErrors?
                 {
@@ -19,18 +19,20 @@ module Ecoportal
             end
 
             def locations_error?
-              !error.nil? && !error.empty?
+              return false if error.nil?
+
+              !error.empty?
             end
 
-            def conflictingIds?
-              conflictingIds.any?
+            def loc_err_conflicting_ids?
+              loc_err_conflicting_ids.any?
             end
 
             def validationErrors?
               validationErrors.any?
             end
 
-            def conflictingIds
+            def loc_err_conflicting_ids
               return [] unless (err = error)
 
               err.conflictingIds || []

data/lib/ecoportal/api/graphql/error/locations_error.rb

@@ -10,7 +10,9 @@ module Ecoportal
           embeds_many :validationErrors, klass: LocationsValidationError
 
           def empty?
-            conflictingIds.empty? && validationErrors.empty?
+            return false unless conflictingIds.empty?
+
+            validationErrors.empty?
           end
 
           def any?

data/lib/ecoportal/api/graphql/error/locations_validation_error.rb

@@ -8,7 +8,10 @@ module Ecoportal
           passthrough :error, :message, :property
 
           def empty?
-            error.nil? && message.nil? && property.nil?
+            return false unless error.nil?
+            return false unless message.nil?
+
+            property.nil?
           end
         end
       end

data/lib/ecoportal/api/graphql/fragment/location_draft.rb

@@ -17,11 +17,24 @@ module Ecoportal
                 id
                 state
                 __typename
+                ... on LocationInsertCommand    {
+                  nodeId name parentId insertBefore classificationIds
+                }
+                ... on LocationUpdateCommand    {
+                  nodeId newId
+                  newName: name
+                  newClassificationIds: classificationIds
+                }
+                ... on LocationArchiveCommand   { nodeId }
+                ... on LocationUnarchiveCommand { nodeId }
+                ... on LocationMoveCommand      { nodeId parentId insertBefore }
+                ... on LocationReorderCommand   { parentId orderedIds }
               }
               error {
                 message
                 conflictingIds
                 validationErrors {
+                  property
                   error
                   message
                 }
@@ -30,6 +43,7 @@ module Ecoportal
             commands {
               id
               state
+              __typename
             }
           }
         GRAPHQL

data/lib/ecoportal/api/graphql/fragment/locations_error.rb

@@ -7,6 +7,7 @@ module Ecoportal
             message
             conflictingIds
             validationErrors {
+              property
               error
               message
             }

data/lib/ecoportal/api/graphql/input/location_structure/update_command.rb

@@ -5,7 +5,20 @@ module Ecoportal
         module LocationStructure
           class UpdateCommand < Interface::LocationStructure::Command
             passthrough :nodeId, :newId
-            passthrough :name, :classificationIds
+            passthrough :name, :newName
+            passthrough :classificationIds, :newClassificationIds
+
+            def name
+              super if newName.nil?
+
+              newName
+            end
+
+            def classificationIds
+              super if newClassificationIds.empty?
+
+              newClassificationIds
+            end
           end
         end
       end

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

@@ -18,19 +18,21 @@ module Ecoportal
           embeds_one :item, klass: :item_class
           embeds_one :errors, klass: Error::ValidationErrors, nullable: true
 
-          def error?
-            errors && !errors.empty?
-          end
-
           def success?
             !error?
           end
 
+          def error?
+            return false if errors.nil?
+
+            !errors.empty?
+          end
+
           def error_doc
             return unless (err_doc = errors&.doc)
 
             {
-              validationErrors: err_doc
+              errors: err_doc
             }
           end
         end

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

@@ -8,11 +8,12 @@ module Ecoportal
 
             passthrough :clientMutationId
             embeds_one :structure, klass: Model::LocationStructure
-            embeds_one :error, klass: Error::LocationsError, nullable: true
-            embeds_many :results, read_only: true, klass: Payload::LocationStructure::CommandExecutionResult
 
+            embeds_one :error, klass: Error::LocationsError, nullable: true
             include Error::LocationsError::FetchNested
 
+            embeds_many :results, read_only: true, klass: Payload::LocationStructure::CommandExecutionResult
+
             def error?
               super || result_errors? || locations_error?
             end

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

@@ -7,14 +7,23 @@ module Ecoportal
             read_only!
 
             embeds_one :command, klass: Interface::LocationStructure::Command
-            embeds_one :error, nullable: true, klass: Error::LocationsError
-            passboolean :ok
-            alias_method :ok?, :ok
 
+            embeds_one :error, klass: Error::LocationsError, nullable: true
             include Error::LocationsError::FetchNested
 
+            passboolean :ok
+
+            def ok?
+              ok != false
+            end
+
+            def success?
+              !error?
+            end
+
             def error?
-              !ok? || locations_error?
+              locations_error? ||
+                !ok?
             end
 
             def error_doc
@@ -24,13 +33,14 @@ module Ecoportal
                 }
               elsif !ok?
                 {
-                  ok: false
+                  ok: ok
                 }
-              end
-            end
+              end.tap do |err_doc|
+                next unless err_doc.is_a?(Hash)
+                next if err_doc.empty?
 
-            def success?
-              !error?
+                err_doc[:command] = command.doc
+              end
             end
           end
         end

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

@@ -6,7 +6,10 @@ module Ecoportal
           module Draft
             class AddCommands < Create
               passboolean :ok
-              alias_method :ok?, :ok
+
+              def ok?
+                ok != false
+              end
 
               def error?
                 super || !ok?
@@ -16,7 +19,7 @@ module Ecoportal
                 err_doc = super
                 return err_doc if err_doc
 
-                { ok: false } unless ok?
+                { ok: ok } unless ok?
               end
             end
           end

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

@@ -6,7 +6,10 @@ module Ecoportal
           module Draft
             class Delete < Logic::Payload
               passboolean :ok
-              alias_method :ok?, :ok
+
+              def ok?
+                ok != false
+              end
 
               def error?
                 super || !ok?
@@ -16,7 +19,7 @@ module Ecoportal
                 err_doc = super
                 return err_doc if err_doc
 
-                { ok: false } unless ok?
+                { ok: ok } unless ok?
               end
             end
           end

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

@@ -5,17 +5,19 @@ module Ecoportal
         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
 
+              passboolean :ok
+
+              def ok?
+                ok != false
+              end
+
               def error?
                 super              ||
-                  !ok?             ||
-                  locations_error?
+                  locations_error? ||
+                  !ok?
               end
 
               def error_doc
@@ -28,7 +30,7 @@ module Ecoportal
                   }
                 elsif !ok?
                   {
-                    ok: false
+                    ok: ok
                   }
                 end
               end

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

@@ -10,19 +10,22 @@ module Ecoportal
               embeds_one :structure, klass: :item_class
               alias_method :item, :structure
 
-              passboolean :ok
-              alias_method :ok?, :ok
-
               embeds_one :error, klass: Error::LocationsError, nullable: true
+              include Error::LocationsError::FetchNested
+
               embeds_many :results, read_only: true, klass: Payload::LocationStructure::CommandExecutionResult
 
-              include Error::LocationsError::FetchNested
+              passboolean :ok
+
+              def ok?
+                ok != false
+              end
 
               def error?
                 super              ||
-                  !ok?             ||
                   locations_error? ||
-                  result_errors?
+                  result_errors?   ||
+                  !ok?
               end
 
               def error_doc
@@ -37,6 +40,10 @@ module Ecoportal
                   {
                     results: [result_errors.first&.error_doc]
                   }
+                elsif !ok?
+                  {
+                    ok: ok
+                  }
                 end
               end
 

data/lib/ecoportal/api/graphql_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GRAPQL_VERSION = '1.3.3'.freeze
+    GRAPQL_VERSION = '1.3.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-graphql
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-28 00:00:00.000000000 Z
+date: 2025-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry