ecoportal-api-graphql 1.3.11 → 1.3.12

data/lib/ecoportal/api/graphql/compat/filter_translator.rb

@@ -9,9 +9,12 @@ module Ecoportal
         # callers may also pass already-translated hashes or SearchConf instances directly.
         #
         # v2 → GraphQL translation table:
-        #   date_filter     lbound/ubound → gte/lte (ES date range)
+        #   date_filter     lbound/ubound → gte/lte; Date FIELD (key 'date.zXXXX') →
+        #                   range_date_filter + membranes.date path; system date → date_filter
         #   text_filter     {query, key} → match_filter {key, value} (partial text)
-        #   options_filter  {chosen, key, mode} → one_of_filter {key, values} (or none_of_filter)
+        #   options_filter  Select FIELD (key 'select_str.zXXXX') → has_any_filter
+        #                   {key, path, field_key: 'selected', values} (doesnt_have_any_filter to
+        #                   exclude); system option key → one_of_filter/none_of_filter {key, values}
         #   tag_filter      passed through (same ES backend, same format)
         #   register_filter passed through
         #   and_filter / or_filter  passed through
@@ -43,12 +46,18 @@ module Ecoportal
             # exact one: it matches the field's `.exact` keyword subfield (backend
             # NewEp::Es::Filters::Pages::IsFilter → ExactFilter on `membranes.<type>.exact`),
             # whereas match_filter/contains_filter hit the analyzed `.value` and miss exact SKUs.
-            # Requires `path` (membranes.<type>) — derived from the key prefix when not given.
+            # A register FIELD key ('plain_text.zXXXX') needs the nested membranes.<type> path;
+            # a SYSTEM key (external_id/id/state/creator_id/source) must NOT carry a path — the
+            # backend routes it to Global::ExactFilter which joins [@path,@key] into the term key,
+            # so a spurious 'membranes.external_id' yields term 'membranes.external_id.external_id'
+            # → 0 results (proof: pages/is_filter.rb:36-55 passes path: @path to Global::ExactFilter;
+            # global/exact_filter.rb:18 builds the term as [@path, @key].compact.join(".")).
             # CAVEAT: case-insensitive and only the first 64 chars are significant (values are
             # lowercased + truncated at index time). No case-sensitive/>64-char exact exists.
             def translate_exact_filter(filter)
               key   = filter['key']   || filter[:key]
-              path  = filter['path']  || filter[:path] || membrane_path_for(key)
+              path  = filter['path']  || filter[:path]
+              path  ||= membrane_path_for(key) if membrane_field?(key)
               value = filter['value'] || filter[:value] || filter['query'] || filter[:query]
               { operation: 'is_filter', params: { key: key, path: path, value: value }.compact }
             end
@@ -59,6 +68,14 @@ module Ecoportal
               prefix.empty? ? nil : "membranes.#{prefix}"
             end
 
+            # A register FIELD key carries a `<type>.<hash>` shape (e.g. 'date.zab1bddc3',
+            # 'select_str.z223beb6d'); system/top-level keys (created_at, id, external_id) have
+            # no field-type prefix. Field filters need the nested membranes.<type> path (and,
+            # for options, a field_key), which system filters do not.
+            def membrane_field?(key)
+              key.to_s.include?('.')
+            end
+
             # v2 text_filter {query, key} → GraphQL match_filter (partial/full-text on key).
             def translate_text_filter(filter)
               {
@@ -70,34 +87,52 @@ module Ecoportal
               }
             end
 
-            # v2 options_filter {chosen, key, mode} → one_of_filter (match any chosen) or
-            # none_of_filter (exclude) — both take {key, values}.
+            # v2 options_filter {chosen, key, mode} → GraphQL.
+            # A register Select FIELD (key like 'select_str.zXXXX') filters via
+            # has_any_filter / doesnt_have_any_filter over its nested path
+            # (membranes.select_str) with field_key 'selected' and the chosen option ids as
+            # `values` (backend NewEp::Es::Filters::Pages::*::HasAnyFilter). A system/top-level
+            # option key (e.g. 'id') keeps one_of_filter / none_of_filter with {key, values}.
             def translate_options_filter(filter)
-              mode = (filter['mode'] || filter[:mode]).to_s.downcase
-              op   = %w[none exclude not not_in].include?(mode) ? 'none_of_filter' : 'one_of_filter'
-              {
-                operation: op,
-                params:    {
-                  key:    filter['key'] || filter[:key],
-                  values: Array(filter['chosen'] || filter[:chosen])
-                }
-              }
+              key     = filter['key'] || filter[:key]
+              values  = Array(filter['chosen'] || filter[:chosen])
+              exclude = exclude_mode?(filter)
+
+              unless membrane_field?(key)
+                op = exclude ? 'none_of_filter' : 'one_of_filter'
+                return { operation: op, params: { key: key, values: values } }
+              end
+
+              op        = exclude ? 'doesnt_have_any_filter' : 'has_any_filter'
+              path      = filter['path']      || filter[:path]      || membrane_path_for(key)
+              field_key = filter['field_key'] || filter[:field_key] || 'selected'
+              { operation: op, params: { key: key, path: path, field_key: field_key, values: values } }
             end
 
+            # v2 date_filter → GraphQL. A register Date FIELD (key like 'date.zXXXX') filters
+            # via range_date_filter on its nested path (membranes.date); a system/top-level date
+            # (created_at/updated_at) uses date_filter. Both share range params (gte/lte/time_zone)
+            # — range_date_filter additionally carries `path` (backend BaseRangeDateFilter < DateFilter).
             def translate_date_filter(filter)
-              key = filter['key'] || filter[:key]
-              {
-                operation: 'date_filter',
-                params:    {
-                  key:       key,
-                  time_zone: filter['time_zone'] || filter[:time_zone] || 'UTC'
-                }.tap do |params|
-                  lbound = filter['lbound'] || filter[:lbound]
-                  ubound = filter['ubound'] || filter[:ubound]
-                  params[:gte] = lbound if lbound
-                  params[:lte] = ubound if ubound
-                end
-              }
+              key   = filter['key'] || filter[:key]
+              field = membrane_field?(key)
+              path  = filter['path'] || filter[:path]
+              path  ||= membrane_path_for(key) if field
+
+              params = { key: key, time_zone: filter['time_zone'] || filter[:time_zone] || 'UTC' }
+              params[:path] = path if path
+              lbound = filter['lbound'] || filter[:lbound]
+              ubound = filter['ubound'] || filter[:ubound]
+              params[:gte] = lbound if lbound
+              params[:lte] = ubound if ubound
+
+              { operation: field ? 'range_date_filter' : 'date_filter', params: params }
+            end
+
+            # "exclude" style modes map to the negative filter operation.
+            def exclude_mode?(filter)
+              mode = (filter['mode'] || filter[:mode]).to_s.downcase
+              %w[none exclude not not_in].include?(mode)
             end
           end
         end

data/lib/ecoportal/api/graphql/concerns/page_compat.rb

@@ -1,51 +1,51 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Concerns
-        # v2-compatibility accessors for page model objects.
-        # Include in Interface::BasePage so all concrete page classes inherit them.
-        # These aliases allow eco-helpers scripts to work against GraphQL page models
-        # using the same method names they used with ecoportal-api-v2.
-        module PageCompat
-          # v2 called this externalId (camelCase) or external_id (snake_case)
-          def external_id
-            externalId
-          end
-
-          # v2 called sourceTemplateId "template_id"
-          def template_id
-            sourceTemplateId
-          end
-
-          # v2 compatibility: dataFields were called "components" in APIv2
-          def components
-            respond_to?(:dataFields) ? dataFields : []
-          end
-
-          # Whether the page has any stages (PhasedPage check)
-          def stages?
-            respond_to?(:stages) && !stages.nil? && !stages.empty?
-          end
-
-          # Clears dirty tracking — call after a successful update.
-          # Mirrors v2's ooze.consolidate! which resets the change baseline.
-          def consolidate!
-            @original_doc = doc.dup if respond_to?(:doc)
-            self
-          end
-
-          # v2 validate stub — always returns nil (no client-side validation in GraphQL path).
-          # Server-side errors are returned in the mutation payload's errors field.
-          def validate
-            nil
-          end
-
-          # Dirty check — returns true if there are pending changes.
-          def dirty?
-            !as_update.nil?
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Concerns
+        # v2-compatibility accessors for page model objects.
+        # Include in Interface::BasePage so all concrete page classes inherit them.
+        # These aliases allow eco-helpers scripts to work against GraphQL page models
+        # using the same method names they used with ecoportal-api-v2.
+        module PageCompat
+          # v2 called this externalId (camelCase) or external_id (snake_case)
+          def external_id
+            externalId
+          end
+
+          # v2 called sourceTemplateId "template_id"
+          def template_id
+            sourceTemplateId
+          end
+
+          # v2 compatibility: dataFields were called "components" in APIv2
+          def components
+            respond_to?(:dataFields) ? dataFields : []
+          end
+
+          # Whether the page has any stages (PhasedPage check)
+          def stages?
+            respond_to?(:stages) && !stages.nil? && !stages.empty?
+          end
+
+          # Clears dirty tracking — call after a successful update.
+          # Mirrors v2's ooze.consolidate! which resets the change baseline.
+          def consolidate!
+            @original_doc = doc.dup if respond_to?(:doc)
+            self
+          end
+
+          # v2 validate stub — always returns nil (no client-side validation in GraphQL path).
+          # Server-side errors are returned in the mutation payload's errors field.
+          def validate
+            nil
+          end
+
+          # Dirty check — returns true if there are pending changes.
+          def dirty?
+            !as_update.nil?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Concerns
-      end
-    end
-  end
-end
-
-require_relative 'concerns/deprecation'
-require_relative 'concerns/fragment_definitions'
-require_relative 'concerns/snake_camel_access'
-require_relative 'concerns/page_compat'
-require_relative 'concerns/data_field_access'
+module Ecoportal
+  module API
+    class GraphQL
+      module Concerns
+      end
+    end
+  end
+end
+
+require_relative 'concerns/deprecation'
+require_relative 'concerns/fragment_definitions'
+require_relative 'concerns/snake_camel_access'
+require_relative 'concerns/page_compat'
+require_relative 'concerns/data_field_access'

data/lib/ecoportal/api/graphql/file_upload/client.rb

@@ -1,181 +1,181 @@
-require 'net/http'
-require 'uri'
-require 'json'
-require 'mime/types'
-
-module Ecoportal
-  module API
-    class GraphQL
-      module FileUpload
-        # Orchestrates the full file upload workflow:
-        #
-        #   Step 1 — Get S3 pre-signed credentials via GraphQL
-        #   Step 2 — Upload file directly to S3 (multipart form POST)
-        #   Step 3 — Register the upload with EcoPortal (REST POST /v2/s3/files)
-        #   Step 4 — Poll until the FileContainer is created
-        #
-        # Returns a fileContainerId string on success, suitable for use in
-        # DataField::FileField#file_container_ids= or DataField::ImageGallery#file_container_ids=
-        #
-        # Usage:
-        #   container_id = api.file_upload.upload('/path/to/report.pdf')
-        #   page.components.get_by_name('Attachment').file_container_ids = [container_id]
-        #   api.pages.update(page)
-        #
-        # Requires the gem to have been initialised with email/pass (OAuth Bearer token).
-        class Client
-          POLL_INTERVAL = 2      # seconds between poll attempts
-          POLL_MAX_WAIT = 120    # seconds before giving up
-
-          def initialize(graphql_client)
-            @graphql_client  = graphql_client
-            @http_client     = graphql_client.client.http_client
-            @org_id          = @http_client.org_id
-            @host            = @http_client.host
-          end
-
-          # Upload a file and return the fileContainerId.
-          # Raises RuntimeError on failure.
-          def upload(file_path)
-            raise ArgumentError, "File not found: #{file_path}" unless File.exist?(file_path)
-
-            creds    = fetch_s3_credentials
-            s3_key   = direct_upload_to_storage(file_path, creds)
-            poll_id  = register_upload(file_path, s3_key)
-            poll_for_container_id(poll_id)
-          end
-
-          private
-
-          # Step 1: GraphQL query → S3 presigned credentials
-          def fetch_s3_credentials
-            Query::FileUploadSignature.new(@graphql_client.client).query
-          end
-
-          # Step 2: Direct multipart POST to S3
-          def direct_upload_to_storage(file_path, creds)
-            filename  = File.basename(file_path)
-            s3_key    = "#{creds.upload_prefix}#{filename}"
-            mime_type = detect_mime_type(file_path)
-            endpoint  = URI(creds.endpoint)
-
-            File.open(file_path, 'rb') do |file|
-              Net::HTTP.start(endpoint.host, endpoint.port,
-                              use_ssl: endpoint.scheme == 'https') do |http|
-                boundary = "EcoPortalUpload#{SecureRandom.hex(8)}"
-                body     = build_multipart(boundary, {
-                  s3_key: s3_key, access_key: creds.access_key,
-                  policy: creds.policy, signature: creds.signature,
-                  mime_type: mime_type, filename: filename
-                }, file)
-                request = Net::HTTP::Post.new(endpoint.path.empty? ? '/' : endpoint.path)
-                request['Content-Type'] = "multipart/form-data; boundary=#{boundary}"
-                request.body = body
-                response = http.request(request)
-                raise "S3 upload failed (#{response.code}): #{response.body}" unless response.code.to_i < 300
-              end
-            end
-
-            s3_key
-          end
-
-          # Step 3: Register with EcoPortal backend (REST v2)
-          def register_upload(file_path, s3_key)
-            filename  = File.basename(file_path)
-            mime_type = detect_mime_type(file_path)
-            filesize  = File.size(file_path)
-
-            body     = { filename: filename, filetype: mime_type, filesize: filesize, path: s3_key }
-            response = upload_post('/s3/files', body)
-            raise "File registration failed: #{response.body}" unless response.code.to_i < 300
-
-            JSON.parse(response.body)['id']
-          end
-
-          # Step 4: Poll until FileContainer is created; return fileContainerId
-          def poll_for_container_id(poll_id)
-            deadline = Time.now + POLL_MAX_WAIT
-            loop do
-              raise 'File upload timed out' if Time.now > deadline
-
-              response = upload_get("/s3/files/poll/#{poll_id}")
-              raise "Poll failed: #{response.body}" unless response.code.to_i < 300
-
-              data   = JSON.parse(response.body)
-              status = data['status'] || data.dig('file', 'status')
-
-              return data.dig('file', 'file_container_id') if data['status'] == 'success'
-              raise "File upload failed: #{data.inspect}"  if status == 'failed'
-
-              sleep POLL_INTERVAL
-            end
-          end
-
-          # --- REST helpers (v2 endpoints, Bearer token auth) ---
-
-          def bearer_token
-            @bearer_token ||= @http_client.send(:key_token)
-          end
-
-          def upload_base_url
-            "https://#{@host}/api/v2/#{@org_id}"
-          end
-
-          def upload_get(path)
-            uri     = URI("#{upload_base_url}#{path}")
-            request = Net::HTTP::Get.new(uri)
-            request['Authorization'] = "Bearer #{bearer_token}"
-            request['Accept']        = 'application/json'
-            Net::HTTP.start(uri.host, uri.port, use_ssl: true) { |http| http.request(request) }
-          end
-
-          def upload_post(path, body)
-            uri     = URI("#{upload_base_url}#{path}")
-            request = Net::HTTP::Post.new(uri)
-            request['Authorization'] = "Bearer #{bearer_token}"
-            request['Content-Type']  = 'application/json'
-            request['Accept']        = 'application/json'
-            request.body             = JSON.generate(body)
-            Net::HTTP.start(uri.host, uri.port, use_ssl: true) { |http| http.request(request) }
-          end
-
-          # --- Multipart builder ---
-
-          def build_multipart(boundary, opts, file_io)
-            parts = {
-              'key'                          => opts[:s3_key],
-              'AWSAccessKeyId'               => opts[:access_key],
-              'policy'                       => opts[:policy],
-              'signature'                    => opts[:signature],
-              'x-amz-server-side-encryption' => 'AES256',
-              'Content-Type'                 => opts[:mime_type]
-            }
-            filename  = opts[:filename]
-            mime_type = opts[:mime_type]
-
-            body = +''
-            parts.each do |name, value|
-              body << "--#{boundary}\r\n"
-              body << "Content-Disposition: form-data; name=\"#{name}\"\r\n\r\n"
-              body << "#{value}\r\n"
-            end
-            # File field last
-            body << "--#{boundary}\r\n"
-            body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{filename}\"\r\n"
-            body << "Content-Type: #{mime_type}\r\n\r\n"
-            body << file_io.read
-            body << "\r\n--#{boundary}--\r\n"
-            body
-          end
-
-          def detect_mime_type(file_path)
-            types = MIME::Types.type_for(file_path)
-            types.first&.to_s || 'application/octet-stream'
-          rescue StandardError
-            'application/octet-stream'
-          end
-        end
-      end
-    end
-  end
-end
+require 'net/http'
+require 'uri'
+require 'json'
+require 'mime/types'
+
+module Ecoportal
+  module API
+    class GraphQL
+      module FileUpload
+        # Orchestrates the full file upload workflow:
+        #
+        #   Step 1 — Get S3 pre-signed credentials via GraphQL
+        #   Step 2 — Upload file directly to S3 (multipart form POST)
+        #   Step 3 — Register the upload with EcoPortal (REST POST /v2/s3/files)
+        #   Step 4 — Poll until the FileContainer is created
+        #
+        # Returns a fileContainerId string on success, suitable for use in
+        # DataField::FileField#file_container_ids= or DataField::ImageGallery#file_container_ids=
+        #
+        # Usage:
+        #   container_id = api.file_upload.upload('/path/to/report.pdf')
+        #   page.components.get_by_name('Attachment').file_container_ids = [container_id]
+        #   api.pages.update(page)
+        #
+        # Requires the gem to have been initialised with email/pass (OAuth Bearer token).
+        class Client
+          POLL_INTERVAL = 2      # seconds between poll attempts
+          POLL_MAX_WAIT = 120    # seconds before giving up
+
+          def initialize(graphql_client)
+            @graphql_client  = graphql_client
+            @http_client     = graphql_client.client.http_client
+            @org_id          = @http_client.org_id
+            @host            = @http_client.host
+          end
+
+          # Upload a file and return the fileContainerId.
+          # Raises RuntimeError on failure.
+          def upload(file_path)
+            raise ArgumentError, "File not found: #{file_path}" unless File.exist?(file_path)
+
+            creds    = fetch_s3_credentials
+            s3_key   = direct_upload_to_storage(file_path, creds)
+            poll_id  = register_upload(file_path, s3_key)
+            poll_for_container_id(poll_id)
+          end
+
+          private
+
+          # Step 1: GraphQL query → S3 presigned credentials
+          def fetch_s3_credentials
+            Query::FileUploadSignature.new(@graphql_client.client).query
+          end
+
+          # Step 2: Direct multipart POST to S3
+          def direct_upload_to_storage(file_path, creds)
+            filename  = File.basename(file_path)
+            s3_key    = "#{creds.upload_prefix}#{filename}"
+            mime_type = detect_mime_type(file_path)
+            endpoint  = URI(creds.endpoint)
+
+            File.open(file_path, 'rb') do |file|
+              Net::HTTP.start(endpoint.host, endpoint.port,
+                              use_ssl: endpoint.scheme == 'https') do |http|
+                boundary = "EcoPortalUpload#{SecureRandom.hex(8)}"
+                body     = build_multipart(boundary, {
+                  s3_key: s3_key, access_key: creds.access_key,
+                  policy: creds.policy, signature: creds.signature,
+                  mime_type: mime_type, filename: filename
+                }, file)
+                request = Net::HTTP::Post.new(endpoint.path.empty? ? '/' : endpoint.path)
+                request['Content-Type'] = "multipart/form-data; boundary=#{boundary}"
+                request.body = body
+                response = http.request(request)
+                raise "S3 upload failed (#{response.code}): #{response.body}" unless response.code.to_i < 300
+              end
+            end
+
+            s3_key
+          end
+
+          # Step 3: Register with EcoPortal backend (REST v2)
+          def register_upload(file_path, s3_key)
+            filename  = File.basename(file_path)
+            mime_type = detect_mime_type(file_path)
+            filesize  = File.size(file_path)
+
+            body     = { filename: filename, filetype: mime_type, filesize: filesize, path: s3_key }
+            response = upload_post('/s3/files', body)
+            raise "File registration failed: #{response.body}" unless response.code.to_i < 300
+
+            JSON.parse(response.body)['id']
+          end
+
+          # Step 4: Poll until FileContainer is created; return fileContainerId
+          def poll_for_container_id(poll_id)
+            deadline = Time.now + POLL_MAX_WAIT
+            loop do
+              raise 'File upload timed out' if Time.now > deadline
+
+              response = upload_get("/s3/files/poll/#{poll_id}")
+              raise "Poll failed: #{response.body}" unless response.code.to_i < 300
+
+              data   = JSON.parse(response.body)
+              status = data['status'] || data.dig('file', 'status')
+
+              return data.dig('file', 'file_container_id') if data['status'] == 'success'
+              raise "File upload failed: #{data.inspect}"  if status == 'failed'
+
+              sleep POLL_INTERVAL
+            end
+          end
+
+          # --- REST helpers (v2 endpoints, Bearer token auth) ---
+
+          def bearer_token
+            @bearer_token ||= @http_client.send(:key_token)
+          end
+
+          def upload_base_url
+            "https://#{@host}/api/v2/#{@org_id}"
+          end
+
+          def upload_get(path)
+            uri     = URI("#{upload_base_url}#{path}")
+            request = Net::HTTP::Get.new(uri)
+            request['Authorization'] = "Bearer #{bearer_token}"
+            request['Accept']        = 'application/json'
+            Net::HTTP.start(uri.host, uri.port, use_ssl: true) { |http| http.request(request) }
+          end
+
+          def upload_post(path, body)
+            uri     = URI("#{upload_base_url}#{path}")
+            request = Net::HTTP::Post.new(uri)
+            request['Authorization'] = "Bearer #{bearer_token}"
+            request['Content-Type']  = 'application/json'
+            request['Accept']        = 'application/json'
+            request.body             = JSON.generate(body)
+            Net::HTTP.start(uri.host, uri.port, use_ssl: true) { |http| http.request(request) }
+          end
+
+          # --- Multipart builder ---
+
+          def build_multipart(boundary, opts, file_io)
+            parts = {
+              'key'                          => opts[:s3_key],
+              'AWSAccessKeyId'               => opts[:access_key],
+              'policy'                       => opts[:policy],
+              'signature'                    => opts[:signature],
+              'x-amz-server-side-encryption' => 'AES256',
+              'Content-Type'                 => opts[:mime_type]
+            }
+            filename  = opts[:filename]
+            mime_type = opts[:mime_type]
+
+            body = +''
+            parts.each do |name, value|
+              body << "--#{boundary}\r\n"
+              body << "Content-Disposition: form-data; name=\"#{name}\"\r\n\r\n"
+              body << "#{value}\r\n"
+            end
+            # File field last
+            body << "--#{boundary}\r\n"
+            body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{filename}\"\r\n"
+            body << "Content-Type: #{mime_type}\r\n\r\n"
+            body << file_io.read
+            body << "\r\n--#{boundary}--\r\n"
+            body
+          end
+
+          def detect_mime_type(file_path)
+            types = MIME::Types.type_for(file_path)
+            types.first&.to_s || 'application/octet-stream'
+          rescue StandardError
+            'application/octet-stream'
+          end
+        end
+      end
+    end
+  end
+end