foobara 0.0.131 → 0.0.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c95217bebc01ab27c28cdf572b5e19eb2902fd68b1bb4d7328c093b02cfe8dbf
-  data.tar.gz: 76d32046c22f96ebf9e73d738aa4154fea3edb740e66fab71954abbd8594a35c
+  metadata.gz: 267e71a64eccb434c34233c30b65e56d1c69109667c4ba806645324cf53d9581
+  data.tar.gz: b870b83c02edd0bb5e117a57f769c1adf6c73abbfae68660688d82cdc91b3b1a
 SHA512:
-  metadata.gz: 148fe1548cc4731673ffa299fe1d5ef96a8377cdbc613e3aeff989b16efbc250beea9b58f1b3b1727d0b399b5f1925186c1ac97908c8e2bf6113f4ff0cba1835
-  data.tar.gz: e49bad06d6f305b4e1716fd56fa47298028c6b699977e95417e9013c95f3a25a90ca8a9b2d96b8a11c9fb5989b56587ee87d7b719d2397b90d95210168a594ce
+  metadata.gz: f1226974494886a43bdcf51e00ec0061453d6307e5e031836824747f4b583775edf5b1529fad4280a1520c173e1d3a94253a5bf2885b996d5e7814d426eaac10
+  data.tar.gz: e44c33f5c39c9e32c01c5057ad1a747fa95e07bc47e7e5bdf57b896fdc78bfea18e9f2f09661dc6bfb47da325a452108942c99d7e9d789aae3e4b5c945e57aa3

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [0.0.133] - 2025-06-26
+
+- Add StateMachine.states_that_can_perform
+- Add TransformedCommand#raw_inputs
+- Fix several TransactionTable#find_by* bugs that incorrectly match/don't match in-memory changed records
+- Fix bug that looked for associations in generic :attributes types
+
+# [0.0.132] - 2025-06-19
+
+- Add/improve the description for primary key types in EntityToPrimaryKeyInputsTransformer
+- Support model and tuple types in .has_associations?
+- Move EntityToPrimaryKeyInputsTransformer over from foobara-agent gem
+- Make sure EntitiesToPrimaryKeysSerializer recurses into models/detached entities
+- Fix bugs impacting use of multiple inputs transformers at a time and other issues with typed transformers
+
 # [0.0.131] - 2025-06-16
 
 - Extract InMemoryMinimal crud driver specs to foobara-crud-driver-spec-helpers gem

data/projects/command_connectors/src/serializers/entities_to_primary_keys_serializer.rb

@@ -14,10 +14,10 @@ module Foobara
             if detached_to_primary_key?
               object.primary_key
             else
-              object.attributes_with_delegates
+              serialize(object.attributes_with_delegates)
             end
           when Model
-            object.attributes_with_delegates
+            serialize(object.attributes_with_delegates)
           when ::Array
             object.map { |element| serialize(element) }
           when ::Hash

data/projects/command_connectors/src/transformed_command.rb

@@ -114,7 +114,9 @@ module Foobara
         inputs_type = command_class.inputs_type
 
         @inputs_transformers = transformers_to_processors(@inputs_transformers, inputs_type, direction: :to)
+        @inputs_transformers = @inputs_transformers.reverse
 
+        # TODO: this block looks pointless...
         @inputs_transformers.each do |transformer|
           if transformer.is_a?(TypeDeclarations::TypedTransformer)
             new_type = transformer.from_type
@@ -442,21 +444,18 @@ module Foobara
       def inputs_transformer
         return @inputs_transformer if defined?(@inputs_transformer)
 
-        if inputs_transformers.empty?
+        transformers = inputs_transformers
+
+        if transformers.empty?
           @inputs_transformer = nil
           return
         end
 
-        @inputs_transformer = begin
-          transformers = transformers_to_processors(inputs_transformers,
-                                                    command_class.inputs_type, direction: :to)
-
-          if transformers.size == 1
-            transformers.first
-          else
-            Value::Processor::Pipeline.new(processors: transformers)
-          end
-        end
+        @inputs_transformer = if transformers.size == 1
+                                transformers.first
+                              else
+                                Value::Processor::Pipeline.new(processors: transformers)
+                              end
       end
 
       def response_mutator
@@ -792,6 +791,10 @@ module Foobara
       end
     end
 
+    def raw_inputs
+      untransformed_inputs
+    end
+
     def method_missing(method_name, ...)
       if command.respond_to?(method_name)
         command.send(method_name, ...)

data/projects/command_connectors/src/transformers/entity_to_primary_key_inputs_transformer.rb

@@ -0,0 +1,88 @@
+module Foobara
+  module CommandConnectors
+    module Transformers
+      class EntityToPrimaryKeyInputsTransformer < TypeDeclarations::TypedTransformer
+        def from_type_declaration
+          return nil unless to_type
+
+          if contains_associations_or_is_entity?(to_type)
+            if to_type.extends?(Foobara::BuiltinTypes[:attributes])
+              to_fix = {}
+
+              to_type.element_types.each_pair do |attribute_name, attribute_type|
+                if contains_associations_or_is_entity?(attribute_type)
+                  to_fix[attribute_name] = attribute_type
+                end
+              end
+
+              element_type_declarations = to_type.declaration_data[:element_type_declarations].dup
+
+              to_fix.each_pair do |attribute_name, attribute_type|
+                transformer = EntityToPrimaryKeyInputsTransformer.new(to: attribute_type)
+                element_type_declarations[attribute_name] = transformer.from_type_declaration
+              end
+
+              to_type.declaration_data.merge(element_type_declarations:)
+            elsif to_type.extends?(Foobara::BuiltinTypes[:tuple])
+              indexes_to_fix = []
+
+              to_type.element_types.each.with_index do |element_type, index|
+                if contains_associations_or_is_entity?(element_type)
+                  indexes_to_fix << index
+                end
+              end
+
+              element_type_declarations = to_type.declaration_data[:element_type_declarations].dup
+
+              indexes_to_fix.each do |index|
+                transformer = EntityToPrimaryKeyInputsTransformer.new(to: to_type.element_types[index])
+                element_type_declarations[index] = transformer.from_type_declaration
+              end
+
+              to_type.declaration_data.merge(element_type_declarations:)
+            elsif to_type.extends?(Foobara::BuiltinTypes[:array])
+              transformer = EntityToPrimaryKeyInputsTransformer.new(to: to_type.element_type)
+              element_type_declaration = transformer.from_type_declaration
+
+              to_type.declaration_data.merge(element_type_declaration:)
+            elsif to_type.extends?(Foobara::BuiltinTypes[:detached_entity])
+              declaration = to_type.target_class.primary_key_type.reference_or_declaration_data
+
+              description = "#{to_type.target_class.model_name} #{to_type.target_class.primary_key_attribute}"
+
+              unless to_type.extends_directly?(Foobara::BuiltinTypes[:detached_entity]) ||
+                     to_type.extends_directly?(Foobara::BuiltinTypes[:entity])
+                description = [
+                  description,
+                  to_type.description
+                ].join(" : ")
+              end
+              declaration[:description] = description
+
+              declaration
+            elsif to_type.extends?(Foobara::BuiltinTypes[:model])
+              attributes_type = to_type.target_class.attributes_type
+              EntityToPrimaryKeyInputsTransformer.new(to: attributes_type).from_type_declaration
+            else
+              # :nocov:
+              raise "Not sure how to handle #{to_type}"
+              # :nocov:
+            end
+          else
+            to_type
+          end
+        end
+
+        def transform(inputs)
+          inputs
+        end
+
+        private
+
+        def contains_associations_or_is_entity?(type)
+          DetachedEntity.contains_associations?(type) || type.extends?(Foobara::BuiltinTypes[:detached_entity])
+        end
+      end
+    end
+  end
+end

data/projects/detached_entity/src/concerns/associations.rb

@@ -221,19 +221,29 @@ module Foobara
 
             if type.extends?(BuiltinTypes[:detached_entity])
               if initial
-                element_types = type.element_types
-
-                if remove_sensitive
-                  # TODO: test this code path
-                  # :nocov:
-                  element_types = element_types&.reject(&:sensitive?)
-                  # :nocov:
-                end
-
-                contains_associations?(element_types, false)
+                contains_associations?(type.element_types, false)
               else
                 true
               end
+            elsif type.extends?(BuiltinTypes[:model])
+              element_types = type.element_types
+
+              if remove_sensitive
+                # TODO: test this code path
+                # :nocov:
+                element_types = element_types&.reject(&:sensitive?)
+                # :nocov:
+              end
+
+              contains_associations?(element_types, false)
+            elsif type.extends?(BuiltinTypes[:tuple])
+              element_types = type.element_types
+
+              element_types&.any? do |element_type|
+                if !remove_sensitive || !element_type.sensitive?
+                  contains_associations?(element_type, false)
+                end
+              end
             elsif type.extends?(BuiltinTypes[:array])
               # TODO: what to do about an associative array type?? Unclear how to make a key from that...
               # TODO: raise if associative array contains a non-persisted record to handle this edge case for now.
@@ -243,11 +253,13 @@ module Foobara
                 contains_associations?(element_type, false)
               end
             elsif type.extends?(BuiltinTypes[:attributes])
-              type.element_types.values.any? do |element_type|
+
+              type.element_types&.values&.any? do |element_type|
                 if !remove_sensitive || !element_type.sensitive?
                   contains_associations?(element_type, false)
                 end
               end
+
             elsif type.extends?(BuiltinTypes[:associative_array])
               element_types = type.element_types
 

data/projects/entity/src/concerns/initialization.rb

@@ -57,7 +57,7 @@ module Foobara
 
             record = current_transaction_table.find_tracked(record_id)
 
-            if record
+            if record&.loaded?
               # :nocov:
               raise "Already loaded for #{attributes}. Bug maybe?"
               # :nocov:

data/projects/model/src/extensions/builtin_types/model/validators/model_instance_is_valid.rb

@@ -14,7 +14,7 @@ module Foobara
           end
 
           def applicable?(model_instance)
-            !model_instance.skip_validations
+            model_instance && !model_instance.skip_validations
           end
 
           def process_value(model_instance)

data/projects/persistence/src/entity_attributes_crud_driver.rb

@@ -130,8 +130,20 @@ module Foobara
         end
 
         def find_by_attribute_containing(attribute_name, value)
+          found_type = entity_class.attributes_type.type_at_path("#{attribute_name}.#")
+
+          if value
+            value = restore_attributes(value, found_type)
+          end
+
           all.find do |found_attributes|
-            found_attributes[attribute_name]&.include?(value)
+            found_attributes[attribute_name].any? do |found_value|
+              if found_value
+                found_value = restore_attributes(found_value, found_type)
+              end
+
+              found_value == value
+            end
           end
         end
 
@@ -291,7 +303,10 @@ module Foobara
             if outcome.success?
               outcome.result
             else
+              # TODO: figure out how to test this code path
+              # :nocov:
               object
+              # :nocov:
             end
           end
         end

data/projects/persistence/src/entity_base/transaction_table.rb

@@ -260,6 +260,7 @@ module Foobara
           value = entity_class.attributes_type.element_types[attribute_name].element_type.process_value!(value)
 
           tracked_records.each do |record|
+            next unless record.loaded? || record.created?
             next if hard_deleted?(record)
 
             # TODO: what if there are multiple??
@@ -274,7 +275,22 @@ module Foobara
           )
 
           if found_attributes
-            entity_class.loaded(normalize_attributes(found_attributes))
+            found_attributes = normalize_attributes(found_attributes)
+            record_id = primary_key_for_attributes(found_attributes)
+
+            record = find_tracked(record_id)
+
+            if record
+              # was already considered among tracked records if loaded? is true so do not return it as
+              # it has changed and no longer matches
+              unless record.loaded?
+                loading(record) do
+                  record.successfully_loaded(found_attributes)
+                end
+              end
+            else
+              entity_class.loaded(found_attributes)
+            end
           end
         end
 
@@ -286,6 +302,7 @@ module Foobara
           end
 
           tracked_records.each do |record|
+            next unless record.loaded? || record.created?
             next if hard_deleted?(record)
 
             if entity_attributes_crud_driver_table.matches_attributes_filter?(record.attributes, attributes_filter)
@@ -293,17 +310,37 @@ module Foobara
             end
           end
 
-          found_attributes = entity_attributes_crud_driver_table.find_by(attributes_filter)
+          found_attributes_enumerator = entity_attributes_crud_driver_table.find_many_by(attributes_filter)
 
-          if found_attributes
+          found_attributes_enumerator.each do |found_attributes|
             found_attributes = normalize_attributes(found_attributes)
             record_id = primary_key_for_attributes(found_attributes)
 
             record = find_tracked(record_id)
-            return record if record
 
-            entity_class.loaded(found_attributes)
+            if record
+              if record.loaded?
+                # was already considered among tracked records if loaded? is true so do not return it as
+                # it has changed and no longer matches
+                # TODO: figure out how to test this code path
+                # :nocov:
+                record = nil
+                # :nocov:
+              else
+                loading(record) do
+                  record.successfully_loaded(found_attributes)
+                end
+              end
+            else
+              record = entity_class.loaded(found_attributes)
+            end
+
+            if record
+              return record
+            end
           end
+
+          nil
         end
 
         def find_many_by(attributes_filter)
@@ -353,9 +390,28 @@ module Foobara
 
               next if yielded_ids.include?(record_id)
 
-              record = find_tracked(record_id) || entity_class.loaded(found_attributes)
+              record = find_tracked(record_id)
+
+              if record
+                if record.loaded?
+                  # was already considered among tracked records if loaded? is true so do not return it as
+                  # it has changed and no longer matches
+                  # TODO: figure out how to test this code path
+                  # :nocov:
+                  record = nil
+                  # :nocov:
+                else
+                  loading(record) do
+                    record.successfully_loaded(found_attributes)
+                  end
+                end
+              else
+                record = entity_class.loaded(found_attributes)
+              end
 
-              yielder << record
+              if record
+                yielder << record
+              end
             end
           end
         end
@@ -374,6 +430,7 @@ module Foobara
 
           Enumerator.new do |yielder|
             tracked_records.each do |record|
+              next unless record.loaded? || record.created?
               next if hard_deleted?(record)
 
               record_values = record.read_attribute(attribute_name)
@@ -401,9 +458,28 @@ module Foobara
 
               next if yielded_ids.include?(record_id)
 
-              record = find_tracked(record_id) || entity_class.loaded(found_attributes)
+              record = find_tracked(record_id)
+
+              if record
+                # TODO: test this code path
+                # :nocov:
+                if record.loaded?
+                  # was already considered among tracked records if loaded? is true so do not return it as
+                  # it has changed and no longer matches
+                  record = nil
+                else
+                  loading(record) do
+                    record.successfully_loaded(found_attributes)
+                  end
+                end
+                # :nocov:
+              else
+                record = entity_class.loaded(found_attributes)
+              end
 
-              yielder << record
+              if record
+                yielder << record
+              end
             end
           end
         end
@@ -422,6 +498,7 @@ module Foobara
 
           Enumerator.new do |yielder|
             tracked_records.each do |record|
+              next unless record.loaded? || record.created?
               next if hard_deleted?(record)
 
               record_value = record.read_attribute(attribute_name)
@@ -445,9 +522,28 @@ module Foobara
 
               next if yielded_ids.include?(record_id)
 
-              record = find_tracked(record_id) || entity_class.loaded(found_attributes)
+              record = find_tracked(record_id)
+
+              if record
+                # TODO: test this code path
+                # :nocov:
+                if record.loaded?
+                  # was already considered among tracked records if loaded? is true so do not return it as
+                  # it has changed and no longer matches
+                  record = nil
+                else
+                  loading(record) do
+                    record.successfully_loaded(found_attributes)
+                  end
+                end
+                # :nocov:
+              else
+                record = entity_class.loaded(found_attributes)
+              end
 
-              yielder << record
+              if record
+                yielder << record
+              end
             end
           end
         end

data/projects/state_machine/src/state_machine.rb

@@ -2,6 +2,7 @@ module Foobara
   require_project_file("state_machine", "sugar")
   require_project_file("state_machine", "callbacks")
   require_project_file("state_machine", "validations")
+  require_project_file("state_machine", "transitions")
 
   # TODO: allow quick creation of a statemachine either through better options to #initialize or a
   # .for method.
@@ -10,6 +11,7 @@ module Foobara
     include Callbacks
     include Validations
     include TransitionLog
+    include Transitions
 
     class InvalidTransition < StandardError; end
 

data/projects/state_machine/src/transitions.rb

@@ -0,0 +1,22 @@
+module Foobara
+  class StateMachine
+    module Transitions
+      include Concern
+
+      module ClassMethods
+        def states_that_can_perform(transition)
+          states = []
+          transition = transition.to_sym
+
+          transition_map.each_pair do |from, transitions|
+            if transitions.key?(transition)
+              states << from
+            end
+          end
+
+          states
+        end
+      end
+    end
+  end
+end

data/projects/type_declarations/src/typed_transformer.rb

@@ -22,6 +22,10 @@ module Foobara
         attr_reader :from_type, :to_type
       end
 
+      def always_applicable?
+        true
+      end
+
       def from_type_declaration
         nil
       end

data/projects/types/src/type.rb

@@ -232,6 +232,27 @@ module Foobara
         end
       end
 
+      def extends_directly?(type)
+        case type
+        when Type
+          base_type == type
+        when Symbol, String
+          concrete_type = created_in_namespace.foobara_lookup_type(type)
+
+          if concrete_type.nil?
+            # :nocov:
+            raise "No type found for #{type}"
+            # :nocov:
+          end
+
+          extends_directly?(concrete_type)
+        else
+          # :nocov:
+          raise ArgumentError, "Expected a Type or a Symbol/String, but got #{type.inspect}"
+          # :nocov:
+        end
+      end
+
       def extends_type?(type)
         return true if self == type
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara
 version: !ruby/object:Gem::Version
-  version: 0.0.131
+  version: 0.0.133
 platform: ruby
 authors:
 - Miles Georgi
@@ -229,6 +229,7 @@ files:
 - projects/command_connectors/src/serializers/yaml_serializer.rb
 - projects/command_connectors/src/transformed_command.rb
 - projects/command_connectors/src/transformers/auth_errors_transformer.rb
+- projects/command_connectors/src/transformers/entity_to_primary_key_inputs_transformer.rb
 - projects/command_connectors/src/transformers/load_aggregates_pre_commit_transformer.rb
 - projects/command_connectors/src/transformers/load_delegated_attributes_entities_pre_commit_transformer.rb
 - projects/common/lib/foobara/common.rb
@@ -405,6 +406,7 @@ files:
 - projects/state_machine/src/state_machine.rb
 - projects/state_machine/src/sugar.rb
 - projects/state_machine/src/transition_log.rb
+- projects/state_machine/src/transitions.rb
 - projects/state_machine/src/validations.rb
 - projects/type_declarations/lib/foobara/type_declarations.rb
 - projects/type_declarations/src/attributes.rb