ree_lib 1.0.58 → 1.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdb25650f338b4be087e72a1ef04fff5b9e1bf47d0b22221ead03743c74de398
-  data.tar.gz: 333d7adc841964ddd5b50d690f6c016b096622ba327953ae5a5fa57d50f7bde1
+  metadata.gz: 77d773db4104deb076fe0ea9d9aa6b8e0fd1218d71731e6d51a70a50be09d569
+  data.tar.gz: ac943abd83280ff44db19e50991e1ca51aa92cd1f140ccaa9e82cf706fc9dc8e
 SHA512:
-  metadata.gz: 220bc20b778767ec025b5402e7f0fb5a32c2cd15b37373e26af20d5de11529a75b79c745fc9e062b5e27d0bf2c62e0438806aad79950498badebc5f980562825
-  data.tar.gz: 375223a38b2016acb6d3bf9f45a01b6e286b95b32dcd2ab39fa2f90e4d1758bc12e3409333b9370a1b4c653c0ee6d6e5d1249891d93fbff159e5d8d2ad2dcf66
+  metadata.gz: 6eb4b4567e977e12c59f5246f819dcba9702ccb77fb5e776584f193f6cff18c14d4e7e40d75c0377b0fc905720936f0feb888e2e953b288466f7d777ed7bd633
+  data.tar.gz: 26ee7d50cf9e346c4cb9614832282d586d0ac767dcd0b65bdb056511ed2e3058f5d1186003e6f30b89a9a661768c7b7153e4d2a3f079185b441f9b7ca5582485

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.58)
+    ree_lib (1.0.60)
       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

@@ -160,32 +160,19 @@ module ReeDao
           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,
@@ -224,11 +211,10 @@ module ReeDao
   
         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
@@ -242,7 +228,8 @@ module ReeDao
         assoc,
         assoc_name,
         setter: setter,
-        primary_key: primary_key
+        primary_key: primary_key,
+        multiple: true
       )
 
       assoc
@@ -255,10 +242,11 @@ module ReeDao
       Kwargs[
         primary_key: Nilor[Symbol],
         reverse: Nilor[Bool],
-        setter: Nilor[Or[Symbol, Proc]]
+        setter: Nilor[Or[Symbol, Proc]],
+        multiple: Bool
       ] => Any
     )
-    def populate_association(list, association_index, assoc_name, primary_key: nil, reverse: nil, setter: nil)
+    def populate_association(list, association_index, assoc_name, primary_key: nil, reverse: nil, setter: nil, multiple: false)
       assoc_setter = if setter
         setter
       else
@@ -275,7 +263,8 @@ module ReeDao
             reverse ? primary_key : "#{assoc_name}_id"
           end
           value = association_index[item.send(key)]
-          next if value.nil?
+
+          value = [] if value.nil? && multiple
 
           begin
             item.send(assoc_setter, value)
@@ -286,12 +275,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/spec/ree_dao/functions/load_agg/load_agg_spec.rb

@@ -278,6 +278,7 @@ RSpec.describe :load_agg do
         belongs_to :organization
 
         has_many :books, -> { books_opts(title) }
+        has_many :active_books, books
       end
     end
 
@@ -465,6 +466,88 @@ RSpec.describe :load_agg do
     expect(res_user.custom_field).to_not 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)
+
+    author_1 = ReeDaoLoadAggTest::Author.new(book_id: book_1.id, name: "George Orwell")
+    author_2 = ReeDaoLoadAggTest::Author.new(book_id: book_2.id, name: "Stephen King")
+    authors.put(author_1)
+    authors.put(author_2)
+
+    res = users_agg.call(
+      users.all
+    )
+
+    expect(res[0].books.first.author).to_not eq(nil)
+
+    authors.delete(author_1)
+    authors.delete(author_2)
+
+    res = users_agg.call(
+      users.all
+    )
+
+    expect(res[0].books[0].author).to eq(nil)
+    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
@@ -490,6 +573,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

@@ -105,6 +105,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

data/lib/ree_lib/version.rb

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

metadata

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