ree_lib 1.0.59 → 1.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae96c3d6f51872601ad8c4a282cc8119e069a49a2942e624a3eed02817bbf450
-  data.tar.gz: 962693ff78a273ff60ab20f1e704759038e0402619c84ce2da5735f16cca28ad
+  metadata.gz: a16fe3f260e9c08dfa590a34ffeafce9413115416aaedc37bcb4ee50fbd5ae67
+  data.tar.gz: d93566783538e0ea2eb9aba94938a3eccdb34901197d5e38afa9f03da9e5f826
 SHA512:
-  metadata.gz: 562c425026b16d0389287831ea2da44c08e79818c4f238e52f8e3ee0bb62bf36bc8e4bbfc75e3dbe658706a0b735c4c3e0e572287048e9a3095055e7183bfa62
-  data.tar.gz: 54c6f30b6c62de9a43284fc76fcf432e9b0c70691de5d0aaf074c8b4cdb9b889f816ee8219c2ba4e660684899793db9a1c3cd7f502f5567fbe32d9df105b7a67
+  metadata.gz: d1b98f584c71eb035a29a411161a9556aef71ce4b2d9e292e219e767e335ba9cbfa3c8b7fa49e776d846732f84af7c7f6cc5ce91bcfe5a975bd7cf91a843ad83
+  data.tar.gz: b4106abe1f03951c28959f8b9edc4c5f66ff05dcc1788bd2c1e268dd02f0487350ba5074c62eafd73244435dd42a3e034d87e873aaf5c5e11f3791b4884a83f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.59)
+    ree_lib (1.0.61)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/association.rb

@@ -2,16 +2,15 @@ module ReeDao
   class Association
     include Ree::LinkDSL
 
-    link :demodulize, from: :ree_string
     link :group_by, from: :ree_array
     link :index_by, from: :ree_array
-    link :underscore, from: :ree_string
 
-    attr_reader :parent, :list, :global_opts
+    attr_reader :parent, :parent_dao_name, :list, :global_opts
 
-    contract(ReeDao::Associations, Array, Ksplat[RestKeys => Any] => Any)
-    def initialize(parent, list, **global_opts)
+    contract(ReeDao::Associations, Symbol, Array, Ksplat[RestKeys => Any] => Any)
+    def initialize(parent, parent_dao_name, list, **global_opts)
       @parent = parent
+      @parent_dao_name = parent_dao_name
       @list = list
       @global_opts = global_opts
     end
@@ -37,13 +36,18 @@ module ReeDao
       Optblock => Nilor[Array]
     )
     def load_association(assoc_type, assoc_name, **opts, &block)
+      opts[:autoload_children] ||= false
+
       assoc_index = load_association_by_type(
         assoc_type,
         assoc_name,
         **opts
       )
 
-      process_block(assoc_index, opts[:autoload_children] ||= false, &block) if block_given?
+      dao = find_dao(assoc_name, parent, opts[:scope])
+      dao_name = dao.first_source_table
+
+      process_block(assoc_index, opts[:autoload_children], opts[:to_dto], dao_name, &block) if block_given?
 
       list
     end
@@ -57,6 +61,7 @@ module ReeDao
       case type
       when :belongs_to
         one_to_one(
+          parent_dao_name,
           assoc_name,
           list,
           scope: opts[:scope],
@@ -67,44 +72,46 @@ module ReeDao
         )
       when :has_one
         one_to_one(
+          parent_dao_name,
           assoc_name,
           list,
           scope: opts[:scope],
           primary_key: opts[:primary_key],
           foreign_key: opts[:foreign_key],
+          to_dto: opts[:to_dto],
           setter: opts[:setter],
           reverse: true
         )
       when :has_many
         one_to_many(
+          parent_dao_name,
           assoc_name,
           list,
           scope: opts[:scope],
           primary_key: opts[:primary_key],
           foreign_key: opts[:foreign_key],
-          setter: opts[:setter]
-        )
-      else
-        one_to_many(
-          assoc_name,
-          list,
-          scope: opts[:scope],
-          primary_key: opts[:primary_key],
-          foreign_key: opts[:foreign_key],
+          to_dto: opts[:to_dto],
           setter: opts[:setter]
         )
       end
     end
 
-    contract(Or[Hash, Array], Bool, Block => Any)
-    def process_block(assoc, autoload_children, &block)
+    contract(Or[Hash, Array], Bool, Nilor[Proc], Symbol, Block => Any)
+    def process_block(assoc, autoload_children, to_dto, parent_dao_name, &block)
       assoc_list = assoc.is_a?(Array) ? assoc : assoc.values.flatten
 
+      if to_dto
+        assoc_list = assoc_list.map do |item|
+          to_dto.call(item)
+        end
+      end
+
       if ReeDao::Associations.sync_mode?
         ReeDao::Associations.new(
           parent.agg_caller,
           assoc_list,
           parent.local_vars,
+          parent_dao_name,
           autoload_children,
           **global_opts
         ).instance_exec(assoc_list, &block)
@@ -113,6 +120,7 @@ module ReeDao
           parent.agg_caller,
           assoc_list,
           parent.local_vars,
+          parent_dao_name,
           autoload_children,
           **global_opts
         ).instance_exec(assoc_list, &block)
@@ -131,6 +139,7 @@ module ReeDao
     end
 
     contract(
+      Symbol,
       Symbol,
       Array,      
       Kwargs[
@@ -138,10 +147,11 @@ module ReeDao
         foreign_key: Nilor[Symbol],
         scope: Nilor[Sequel::Dataset, Array],
         setter: Nilor[Or[Symbol, Proc]],
+        to_dto: Nilor[Proc],
         reverse: Bool
       ] => Or[Hash, Array]
     )
-    def one_to_one(assoc_name, list, scope: nil, primary_key: :id, foreign_key: nil, setter: nil, reverse: true)
+    def one_to_one(parent_assoc_name, assoc_name, list, scope: nil, primary_key: :id, foreign_key: nil, setter: nil, to_dto: nil, reverse: true)
       return {} if list.empty?
 
       primary_key ||= :id
@@ -153,39 +163,26 @@ module ReeDao
   
         if reverse
           if !foreign_key
-            name = underscore(demodulize(list.first.class.name))
-            foreign_key = "#{name}_id".to_sym
+            foreign_key = "#{parent_assoc_name.to_s.gsub(/e?s$/,'')}_id".to_sym
           end
   
           root_ids = list.map(&:id).uniq
         else
           if !foreign_key
-            dto_class = assoc_dao
-              .opts[:schema_mapper]
-              .dto(:db_load)
-    
-            name = underscore(demodulize(dto_class.name))
-            
-            root_ids = list.map(&:"#{"#{name}_id".to_sym}").uniq
-            foreign_key = :id
-          else
-            root_ids = list.map(&:"#{foreign_key}")
-            foreign_key = :id
+            foreign_key = :"#{assoc_name}_id"
           end
+
+          root_ids = list.map(&:"#{foreign_key}").compact
         end
   
-        default_scope = if !scope 
-          assoc_dao&.where(foreign_key => root_ids)
-        end
-  
-        items = add_scopes(default_scope, scope, global_opts[assoc_name])
+        scope ||= assoc_dao
+        scope = scope.where((reverse ? foreign_key : :id) => root_ids)
+        
+        items = add_scopes(scope, global_opts[assoc_name])
       end
 
-      assoc = if foreign_key
-        index_by(items) { _1.send(foreign_key) }
-      else
-        items
-      end 
+
+      assoc = index_by(items) { _1.send(reverse ? foreign_key : :id) }
 
       populate_association(
         list,
@@ -193,23 +190,26 @@ module ReeDao
         assoc_name,
         setter: setter,
         reverse: reverse,
-        primary_key: primary_key
+        primary_key: primary_key,
+        to_dto: to_dto
       )
 
       assoc
     end
 
     contract(
+      Symbol,
       Symbol,
       Array,
       Kwargs[
         foreign_key: Nilor[Symbol],
         primary_key: Nilor[Symbol],
         scope: Nilor[Sequel::Dataset, Array],
-        setter: Nilor[Or[Symbol, Proc]]
+        setter: Nilor[Or[Symbol, Proc]],
+        to_dto: Nilor[Proc]
       ] => Or[Hash, Array]
     )
-    def one_to_many(assoc_name, list, primary_key: nil, foreign_key: nil, scope: nil, setter: nil)
+    def one_to_many(parent_assoc_name, assoc_name, list, primary_key: nil, foreign_key: nil, scope: nil, setter: nil, to_dto: nil)
       return {} if list.empty?
 
       primary_key ||= :id
@@ -220,15 +220,14 @@ module ReeDao
         assoc_dao = nil
         assoc_dao = find_dao(assoc_name, parent, scope)
   
-        foreign_key ||= "#{underscore(demodulize(list.first.class.name))}_id".to_sym
+        foreign_key ||= "#{parent_assoc_name.to_s.gsub(/e?s$/,'')}_id".to_sym
   
         root_ids = list.map(&:"#{primary_key}")
   
-        default_scope = if !scope
-          assoc_dao&.where(foreign_key => root_ids)
-        end
+        scope ||= assoc_dao
+        scope = scope.where(foreign_key => root_ids)
   
-        items = add_scopes(default_scope, scope, global_opts[assoc_name])
+        items = add_scopes(scope, global_opts[assoc_name])
       end
 
       assoc = if foreign_key
@@ -243,6 +242,7 @@ module ReeDao
         assoc_name,
         setter: setter,
         primary_key: primary_key,
+        to_dto: to_dto,
         multiple: true
       )
 
@@ -257,10 +257,11 @@ module ReeDao
         primary_key: Nilor[Symbol],
         reverse: Nilor[Bool],
         setter: Nilor[Or[Symbol, Proc]],
+        to_dto: Nilor[Proc],
         multiple: Bool
       ] => Any
     )
-    def populate_association(list, association_index, assoc_name, primary_key: nil, reverse: nil, setter: nil, multiple: false)
+    def populate_association(list, association_index, assoc_name, primary_key: nil, reverse: nil, setter: nil, to_dto: nil, multiple: false)
       assoc_setter = if setter
         setter
       else
@@ -278,7 +279,17 @@ module ReeDao
           end
           value = association_index[item.send(key)]
 
-          value = [] if value.nil? && multiple
+          if to_dto && !value.nil?
+            if value.is_a?(Array)
+              value = value.map { to_dto.call(_1) }
+            else
+              value = to_dto.call(value)
+            end
+          end
+
+          if value.nil? && multiple
+            value = []
+          end
 
           begin
             item.send(assoc_setter, value)
@@ -289,12 +300,12 @@ module ReeDao
       end
     end
 
-    contract(Nilor[Sequel::Dataset], Nilor[Sequel::Dataset], Nilor[Proc] => Array)
-    def add_scopes(default_scope, scope, named_scope)
-      res = scope || default_scope
-
-      if named_scope
-        res = named_scope.call(res)
+    contract(Nilor[Sequel::Dataset], Nilor[Proc] => Array)
+    def add_scopes(scope, named_scope)
+      res = if named_scope
+        named_scope.call(scope)
+      else
+        scope
       end
 
       res.all

data/lib/ree_lib/packages/ree_dao/package/ree_dao/associations.rb

@@ -2,15 +2,16 @@ module ReeDao
   class Associations
     include Ree::LinkDSL
 
-    attr_reader :agg_caller, :list, :local_vars, :only, :except, :autoload_children, :global_opts
+    attr_reader :agg_caller, :list, :local_vars, :only, :except, :parent_dao_name, :autoload_children, :global_opts
 
-    def initialize(agg_caller, list, local_vars, autoload_children = false, **opts)
+    def initialize(agg_caller, list, local_vars, parent_dao_name, autoload_children = false, **opts)
       @agg_caller = agg_caller
       @list = list
       @local_vars = local_vars
       @global_opts = opts || {}
       @only = opts[:only] if opts[:only]
       @except = opts[:except] if opts[:except]
+      @parent_dao_name = parent_dao_name
       @autoload_children = autoload_children
 
       raise ArgumentError.new("you can't use both :only and :except arguments at the same time") if @only && @except
@@ -83,7 +84,7 @@ module ReeDao
       if self.class.sync_mode?
         return if association_is_not_included?(assoc_name) || list.empty?
         
-        association = Association.new(self, list, **global_opts)
+        association = Association.new(self, parent_dao_name, list, **global_opts)
         if assoc_type == :field
           association.handle_field(assoc_name, opts)
         else
@@ -94,7 +95,7 @@ module ReeDao
           return { association_threads: @assoc_threads, field_threads: @field_threads } 
         end
 
-        association = Association.new(self, list, **global_opts)
+        association = Association.new(self, parent_dao_name, list, **global_opts)
 
         if assoc_type == :field
           field_proc = opts

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/load_agg.rb

@@ -4,6 +4,8 @@ class ReeDao::LoadAgg
   include Ree::FnDSL
 
   fn :load_agg do
+    link :demodulize, from: :ree_string
+    link :underscore, from: :ree_string
     link "ree_dao/associations", -> { Associations }
     link "ree_dao/contract/dao_dataset_contract", -> { DaoDatasetContract }
     link "ree_dao/contract/entity_contract", -> { EntityContract }
@@ -34,6 +36,12 @@ class ReeDao::LoadAgg
       ids_or_scope
     end
 
+    if dao
+      dao_name = dao.first_source_table
+    else
+      dao_name = underscore(demodulize(scope.first.class.name)).to_sym
+    end
+
     list = scope.is_a?(Sequel::Dataset) ? scope.all : scope
 
     if opts[:to_dto]
@@ -42,7 +50,7 @@ class ReeDao::LoadAgg
       end
     end
 
-    load_associations(list, **opts, &block) if block_given?
+    load_associations(dao_name, list, **opts, &block) if block_given?
 
     if ids_or_scope.is_a?(Array)
       list.sort_by { ids_or_scope.index(_1.id) }
@@ -53,7 +61,7 @@ class ReeDao::LoadAgg
 
   private
 
-  def load_associations(list, **opts, &block)
+  def load_associations(dao_name, list, **opts, &block)
     return if list.empty?
 
     local_vars = block.binding.eval(<<-CODE, __FILE__, __LINE__ + 1)
@@ -63,7 +71,7 @@ class ReeDao::LoadAgg
 
     agg_caller = block.binding.eval("self")
 
-    associations = Associations.new(agg_caller, list, local_vars, **opts).instance_exec(list, &block)
+    associations = Associations.new(agg_caller, list, local_vars, dao_name, **opts).instance_exec(list, &block)
 
     if ReeDao.load_sync_associations_enabled?
       associations

data/lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/load_agg.schema.json

@@ -38,6 +38,21 @@
     }
   ],
   "links": [
+    {
+      "target": "demodulize",
+      "package_name": "ree_string",
+      "as": "demodulize",
+      "imports": [
+
+      ]
+    },
+    {
+      "target": "underscore",
+      "package_name": "ree_string",
+      "as": "underscore",
+      "imports": [
 
+      ]
+    }
   ]
 }

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/load_agg/load_agg_spec.rb

@@ -153,6 +153,9 @@ RSpec.describe :load_agg do
 
     aggregate :users_agg_with_dto do
       link :users, from: :ree_dao_load_agg_test
+      link :books, from: :ree_dao_load_agg_test
+      link :authors, from: :ree_dao_load_agg_test
+      link :chapters, from: :ree_dao_load_agg_test
       link :organizations, from: :ree_dao_load_agg_test
       link :load_agg, from: :ree_dao
     end
@@ -160,8 +163,27 @@ RSpec.describe :load_agg do
     def call(ids_or_scope, **opts)
       load_agg(users, ids_or_scope, **opts) do
         belongs_to :organization
+
+        has_many :books, -> { books_opts } do
+          has_one :author, -> { author_opts }
+          has_many :chapters, -> { chapters_opts } 
+        end
       end
     end
+
+    private
+
+    def books_opts
+      { to_dto: -> (book) { ReeDaoLoadAggTest::BookDto.new(book) }}
+    end
+
+    def author_opts
+      { to_dto: -> (author) { ReeDaoLoadAggTest::AuthorDto.new(author) }}
+    end
+
+    def chapters_opts
+      { to_dto: -> (chapter) { ReeDaoLoadAggTest::ChapterDto.new(chapter) }}
+    end
   end
 
   class ReeDaoLoadAggTest::UsersAggAutoloadBooksChildren
@@ -278,6 +300,7 @@ RSpec.describe :load_agg do
         belongs_to :organization
 
         has_many :books, -> { books_opts(title) }
+        has_many :active_books, books
       end
     end
 
@@ -369,6 +392,12 @@ RSpec.describe :load_agg do
     users.put(user_1)
     users.put(user_2)
 
+    book_1 = ReeDaoLoadAggTest::Book.new(user_id: user_1.id, title: "1984")
+    books.put(book_1)
+
+    authors.put(ReeDaoLoadAggTest::Author.new(book_id: book_1.id, name: "George Orwell"))
+    chapters.put(ReeDaoLoadAggTest::Chapter.new(book_id: book_1.id, title: "interlude"))
+
     res = users_agg_with_dto.call(
       users.all,
       to_dto: -> (user) {
@@ -381,7 +410,12 @@ RSpec.describe :load_agg do
       }
     )
 
+    book = res.first.books.first
+
     expect(res.first.class).to eq(ReeDaoLoadAggTest::UserDto)
+    expect(book.class).to eq(ReeDaoLoadAggTest::BookDto)
+    expect(book.author.class).to eq(ReeDaoLoadAggTest::AuthorDto)
+    expect(book.chapters.first.class).to eq(ReeDaoLoadAggTest::ChapterDto)
   }
 
   it {
@@ -508,6 +542,45 @@ RSpec.describe :load_agg do
     expect(res[0].books[1].author).to eq(nil)
   }
 
+  it {
+    organizations.delete_all
+    users.delete_all
+    user_passports.delete_all
+    books.delete_all
+    chapters.delete_all
+
+    organization = ReeDaoLoadAggTest::Organization.new(name: "Test Org")
+    organizations.put(organization)
+
+    user_1 = ReeDaoLoadAggTest::User.new(name: "John", age: 33, organization_id: organization.id)
+    user_2 = ReeDaoLoadAggTest::User.new(name: "Sam", age: 21, organization_id: organization.id)
+    users.put(user_1)
+    users.put(user_2)
+
+    book_1 = ReeDaoLoadAggTest::Book.new(user_id: user_1.id, title: "1984")
+    book_2 = ReeDaoLoadAggTest::Book.new(user_id: user_1.id, title: "1408")
+
+    books.put(book_1)
+    books.put(book_2)
+
+    res = users_agg.call(
+      users.all
+    )
+
+    expect(res[0].books).to_not eq([])
+    expect(res[1].books).to eq([])
+
+    books.delete(book_1)
+    books.delete(book_2)
+
+    res = users_agg.call(
+      users.all
+    )
+
+    expect(res[0].books).to eq([])
+    expect(res[1].books).to eq([])
+  }
+
   it {
     organizations.delete_all
     users.delete_all
@@ -533,6 +606,7 @@ RSpec.describe :load_agg do
     expect(res_user.id).to eq(user_1.id)
     expect(res_user.organization).to eq(organization)
     expect(res_user.books.count).to eq(1)
+    expect(res_user.active_books.count).to eq(2)
   }
 
   it {

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/load_agg/ree_dao_load_agg_test.rb

@@ -75,6 +75,9 @@ class ReeDaoLoadAggTest::Book
   attr_accessor :title, :user_id
 end
 
+class ReeDaoLoadAggTest::BookDto < SimpleDelegator
+end
+
 class ReeDaoLoadAggTest::User
   include ReeDto::EntityDSL
 
@@ -105,6 +108,14 @@ class ReeDaoLoadAggTest::User
     @books
   end
 
+  def set_active_books(books)
+    @active_books = books
+  end
+
+  def active_books
+    @active_books
+  end
+
   contract(ArrayOf[ReeDaoLoadAggTest::Book] => nil)
   def set_books(books)
     @books = books; nil
@@ -151,6 +162,14 @@ class ReeDaoLoadAggTest::UserDto
   def organization
     @organization
   end
+
+  def set_books(books)
+    @books = books; nil
+  end
+
+  def books
+    @books
+  end
 end
 
 class ReeDaoLoadAggTest::Organization
@@ -268,6 +287,9 @@ class ReeDaoLoadAggTest::Chapter
   attr_accessor :title, :book_id
 end
 
+class ReeDaoLoadAggTest::ChapterDto < SimpleDelegator
+end
+
 class ReeDaoLoadAggTest::Author
   include ReeDto::EntityDSL
 
@@ -280,6 +302,9 @@ class ReeDaoLoadAggTest::Author
   attr_accessor :name, :book_id
 end
 
+class ReeDaoLoadAggTest::AuthorDto < SimpleDelegator
+end
+
 class ReeDaoLoadAggTest::Review
   include ReeDto::EntityDSL
 

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.59"
+  VERSION = "1.0.61"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.59
+  version: 1.0.61
 platform: ruby
 authors:
 - Ruslan Gatiyatov