ree_lib 1.0.55 → 1.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d792b73d0f067a0fc7e935ca257f79f4334afbbb811a060e94cb6de6f2f283c
-  data.tar.gz: 34fb81648b66cfb4e031650d6145556c05b454c0ca1f66f82ded0c3c774d97d6
+  metadata.gz: 23c4603ab3ab820869ca4478b42b3d350c5484c8da7b21c99b469449f45764a1
+  data.tar.gz: 4293f4d083185f09f6098e11698b5f35981a748b00ff84e486389bab19445751
 SHA512:
-  metadata.gz: 595ed040ab09ad6ff32283152de27cd85e4c4ec09c70777177817e5bc9fd2a19d178cc1caf3d1db35738331e71a3620dd81f3242c7c8d628e2cc36e073d6c47e
-  data.tar.gz: f2f4ce7c621d154d1e71b0a6cb7426f5c152c0cb2d396b15b859b9fa3df38a979164e091f827279f2d187668e8b53cd181b7adc937b0b6d810bd35186e302945
+  metadata.gz: fe885988996c1f0b9aeba40c9f61e119ab4ffc02aa471afe3774b470192fc5601093c1b13673febebad76bf348baa0be61cb2e19a5abf81b1970b518d86ddc9d
+  data.tar.gz: acbdf84eacfa6c46c6997999af1e0eb5dc03eedc95b95d954927a3907048c9c28d924328041203d02db1bd5c9dc78310c2cc234db826c74e585a8701b7982ed9

data/Gemfile.lock

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

@@ -26,8 +26,12 @@ module ReeDao
       load_association(assoc_type, assoc_name, **opts, &block)
     end
 
+    def handle_field(assoc_name, proc)
+      proc.call
+    end
+
     contract(
-      Or[:belongs_to, :has_one, :has_many, :field],
+      Or[:belongs_to, :has_one, :has_many],
       Symbol,
       Ksplat[RestKeys => Any],
       Optblock => Nilor[Array]
@@ -87,8 +91,7 @@ module ReeDao
           scope: opts[:scope],
           primary_key: opts[:primary_key],
           foreign_key: opts[:foreign_key],
-          setter: opts[:setter],
-          skip_dao: true
+          setter: opts[:setter]
         )
       end
     end
@@ -112,7 +115,7 @@ module ReeDao
           parent.local_vars,
           autoload_children,
           **global_opts
-        ).instance_exec(assoc_list, &block).map(&:join)
+        ).instance_exec(assoc_list, &block)[:association_threads].map(&:join)
       end
     end
 
@@ -127,20 +130,11 @@ module ReeDao
         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(assoc_name, list, scope: nil, primary_key: :id, foreign_key: nil, setter: nil, reverse: true)
       return {} if list.empty?
 
       primary_key ||= :id
 
-      # TODO: refactor
       if scope.is_a?(Array)
         items = scope
       else
@@ -169,7 +163,9 @@ module ReeDao
           end
         end
   
-        default_scope = assoc_dao&.where(foreign_key => root_ids)
+        default_scope = if !scope 
+          assoc_dao&.where(foreign_key => root_ids)
+        end
   
         items = add_scopes(default_scope, scope, global_opts[assoc_name])
       end
@@ -199,35 +195,27 @@ module ReeDao
         foreign_key: Nilor[Symbol],
         primary_key: Nilor[Symbol],
         scope: Nilor[Sequel::Dataset, Array],
-        setter: Nilor[Or[Symbol, Proc]],
-        skip_dao: Bool
+        setter: Nilor[Or[Symbol, Proc]]
       ] => Or[Hash, Array]
     )
-    def one_to_many(
-      assoc_name,
-      list,
-      primary_key: nil,
-      foreign_key: nil,
-      scope: nil,
-      setter: nil,
-      skip_dao: false
-    )
+    def one_to_many(assoc_name, list, primary_key: nil, foreign_key: nil, scope: nil, setter: nil)
       return {} if list.empty?
 
       primary_key ||= :id
 
-      # TODO: refactor
       if scope.is_a?(Array)
         items = scope
       else
         assoc_dao = nil
-        assoc_dao = find_dao(assoc_name, parent, scope) if !skip_dao
+        assoc_dao = find_dao(assoc_name, parent, scope)
   
         foreign_key ||= "#{underscore(demodulize(list.first.class.name))}_id".to_sym
   
         root_ids = list.map(&:"#{primary_key}")
   
-        default_scope = assoc_dao&.where(foreign_key => root_ids)
+        default_scope = if !scope
+          assoc_dao&.where(foreign_key => root_ids)
+        end
   
         items = add_scopes(default_scope, scope, global_opts[assoc_name])
       end
@@ -259,14 +247,7 @@ module ReeDao
         setter: Nilor[Or[Symbol, Proc]]
       ] => 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)
       assoc_setter = if setter
         setter
       else
@@ -296,23 +277,7 @@ module ReeDao
 
     contract(Nilor[Sequel::Dataset], Nilor[Sequel::Dataset], Nilor[Proc] => Array)
     def add_scopes(default_scope, scope, named_scope)
-      if default_scope && !scope
-        res = default_scope
-      end
-
-      if default_scope && scope
-        if scope == []
-          res = default_scope
-        else
-          res = merge_scopes(default_scope, scope)
-        end
-      end
-
-      if !default_scope && scope
-        return [] if scope.empty?
-
-        res = scope
-      end
+      res = scope || default_scope
 
       if named_scope
         res = named_scope.call(res)
@@ -321,22 +286,6 @@ module ReeDao
       res.all
     end
 
-    def merge_scopes(s1, s2)
-      if s2.opts[:where]
-        s1 = s1.where(s2.opts[:where])
-      end
-
-      if s2.opts[:order]
-        s1 = s1.order(*s2.opts[:order])
-      end
-
-      if s1.opts[:schema_mapper] != s2.opts[:schema_mapper]
-        s1 = s1.with_mapper(s2.opts[:schema_mapper])
-      end
-
-      s1
-    end
-
     def find_dao(assoc_name, parent, scope)
       dao_from_name = parent.instance_variable_get("@#{assoc_name}") || parent.instance_variable_get("@#{assoc_name}s")
       return dao_from_name if dao_from_name

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

@@ -8,14 +8,19 @@ module ReeDao
       @agg_caller = agg_caller
       @list = list
       @local_vars = local_vars
-      @threads = [] if !self.class.sync_mode?
-      @global_opts = opts
+      @global_opts = opts || {}
       @only = opts[:only] if opts[:only]
       @except = opts[:except] if opts[:except]
       @autoload_children = autoload_children
 
       raise ArgumentError.new("you can't use both :only and :except arguments at the same time") if @only && @except
 
+
+      if !self.class.sync_mode?
+        @assoc_threads = []
+        @field_threads = []
+      end
+
       local_vars.each do |k, v|
         instance_variable_set(k, v)
 
@@ -31,62 +36,34 @@ module ReeDao
 
     contract(
       Symbol,
-      Ksplat[
-        scope?: Or[Sequel::Dataset, Array],
-        setter?: Or[Symbol, Proc],
-        primary_key?: Symbol,
-        foreign_key?: Symbol,
-        autoload_children?: Bool
-      ],
+      Nilor[Proc, Sequel::Dataset],
       Optblock => Any
     )
-    def belongs_to(assoc_name, **opts, &block)
-      association(__method__, assoc_name, **opts, &block)
+    def belongs_to(assoc_name, opts = nil, &block)
+      association(__method__, assoc_name, opts, &block)
     end
   
     contract(
       Symbol,
-      Ksplat[
-        scope?: Or[Sequel::Dataset, Array],
-        setter?: Or[Symbol, Proc],
-        primary_key?: Symbol,
-        foreign_key?: Symbol,
-        autoload_children?: Bool
-      ],
+      Nilor[Proc, Sequel::Dataset],
       Optblock => Any
     )
-    def has_one(assoc_name, **opts, &block)
-      association(__method__, assoc_name, **opts, &block)
+    def has_one(assoc_name, opts = nil, &block)
+      association(__method__, assoc_name, opts, &block)
     end
   
     contract(
       Symbol,
-      Ksplat[
-        scope?: Or[Sequel::Dataset, Array],
-        setter?: Or[Symbol, Proc],
-        primary_key?: Symbol,
-        foreign_key?: Symbol,
-        autoload_children?: Bool
-      ],
+      Nilor[Proc, Sequel::Dataset],
       Optblock => Any
     )
-    def has_many(assoc_name, **opts, &block)
-      association(__method__, assoc_name, **opts, &block)
+    def has_many(assoc_name, opts = nil, &block)
+      association(__method__, assoc_name, opts, &block)
     end
   
-    contract(
-      Symbol,
-      Ksplat[
-        scope?: Or[Sequel::Dataset, Array],
-        setter?: Or[Symbol, Proc],
-        primary_key?: Symbol,
-        foreign_key?: Symbol,
-        autoload_children?: Bool
-      ],
-      Optblock => Any
-    )
-    def field(assoc_name, **opts, &block)
-      association(__method__, assoc_name, **opts, &block)
+    contract(Symbol, Proc => Any)
+    def field(assoc_name, proc)
+      association(__method__, assoc_name, proc)
     end
 
     private
@@ -99,27 +76,40 @@ module ReeDao
         :field
       ],
       Symbol,
-      Ksplat[
-        scope?: Or[Sequel::Dataset, Array],
-        setter?: Or[Symbol, Proc],
-        primary_key?: Symbol,
-        foreign_key?: Symbol,
-        autoload_children?: Bool
-      ],
+      Nilor[Proc, Sequel::Dataset],
       Optblock => Any
     )
-    def association(assoc_type, assoc_name, **assoc_opts, &block)
+    def association(assoc_type, assoc_name, opts, &block)
       if self.class.sync_mode?
         return if association_is_not_included?(assoc_name) || list.empty?
-
+        
         association = Association.new(self, list, **global_opts)
-        association.load(assoc_type, assoc_name, **assoc_opts, &block)
+        if assoc_type == :field
+          association.handle_field(assoc_name, opts)
+        else
+          association.load(assoc_type, assoc_name, **get_assoc_opts(opts), &block)
+        end
       else
-        return @threads if association_is_not_included?(assoc_name) || list.empty?
+        if association_is_not_included?(assoc_name) || list.empty?
+          return { association_threads: @assoc_threads, field_threads: @field_threads } 
+        end
+
+        association = Association.new(self, list, **global_opts)
 
-        @threads << Thread.new do
-          association = Association.new(self, list, **global_opts)
-          association.load(assoc_type, assoc_name, **assoc_opts, &block)
+        if assoc_type == :field
+          { 
+            association_threads: @assoc_threads,
+            field_threads: @field_threads << Thread.new do
+              association.handle_field(assoc_name, opts)
+            end
+          }
+        else
+          {
+            association_threads: @assoc_threads << Thread.new do
+              association.load(assoc_type, assoc_name, **get_assoc_opts(opts), &block)
+            end,
+            field_threads: @field_threads
+          }
         end
       end
     end
@@ -149,5 +139,13 @@ module ReeDao
 
       agg_caller.send(method, *args, &block)
     end
+
+    def get_assoc_opts(opts)
+      if opts.is_a?(Proc)
+        opts.call
+      else
+        {}
+      end
+    end
   end
 end

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

@@ -10,16 +10,17 @@ class ReeDao::LoadAgg
   end
 
   contract(
-    Or[Sequel::Dataset, ArrayOf[Integer], ArrayOf[EntityContract], Integer],
     Nilor[DaoDatasetContract],
+    Or[Sequel::Dataset, ArrayOf[Integer], ArrayOf[EntityContract], Integer],
     Ksplat[
       only?: ArrayOf[Symbol],
       except?: ArrayOf[Symbol],
+      to_dto?: Proc,
       RestKeys => Any
     ],
     Optblock => ArrayOf[Any]
   )
-  def call(ids_or_scope, dao = nil, **opts, &block)
+  def call(dao = nil, ids_or_scope, **opts, &block)
     scope = if ids_or_scope.is_a?(Array) && ids_or_scope.any? { _1.is_a?(Integer) }
       raise ArgumentError.new("Dao should be provided") if dao.nil?
       return [] if ids_or_scope.empty?
@@ -35,6 +36,10 @@ class ReeDao::LoadAgg
 
     list = scope.is_a?(Sequel::Dataset) ? scope.all : scope
 
+    if opts[:to_dto]
+      list = opts[:to_dto].call(list)
+    end
+
     load_associations(list, **opts, &block) if block_given?
 
     if ids_or_scope.is_a?(Array)
@@ -61,7 +66,8 @@ class ReeDao::LoadAgg
     if ReeDao.load_sync_associations_enabled?
       associations
     else
-      associations.map(&:join)
+      associations[:association_threads].map(&:join)
+      associations[:field_threads].map(&:join)
     end
   end
 end

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

@@ -14,20 +14,20 @@
       ],
       "return": "ArrayOf[Any]",
       "args": [
-        {
-          "arg": "ids_or_scope",
-          "arg_type": "req",
-          "type": "Or[Sequel::Dataset, ArrayOf[Integer], ArrayOf[PackageName::Entity], Integer]"
-        },
         {
           "arg": "dao",
           "arg_type": "opt",
           "type": "Nilor[PackageName::DaoName::Dao: \"SELECT * FROM `table`\"]"
         },
+        {
+          "arg": "ids_or_scope",
+          "arg_type": "req",
+          "type": "Or[Sequel::Dataset, ArrayOf[Integer], ArrayOf[PackageName::Entity], Integer]"
+        },
         {
           "arg": "opts",
           "arg_type": "keyrest",
-          "type": "Ksplat[:only? => ArrayOf[Symbol], :except? => ArrayOf[Symbol], \"RestKeys\" => Any]"
+          "type": "Ksplat[:only? => ArrayOf[Symbol], :except? => ArrayOf[Symbol], :to_dto? => Proc, \"RestKeys\" => Any]"
         },
         {
           "arg": "block",

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

@@ -99,19 +99,67 @@ RSpec.describe :load_agg do
     end
 
     def call(ids_or_scope, **opts)
-      load_agg(ids_or_scope, users, **opts) do
+      load_agg(users, ids_or_scope, **opts) do |users_list|
         belongs_to :organization
-        has_many :books do
+        has_many :books do |books_list|
           has_one :author
           has_many :chapters
         
-          has_many :reviews do
+          has_many :reviews do |reviews_list|
             has_one :review_author
+
+            field :review_calculatetable_field, -> { some_method(reviews_list) }
           end
+
+          field :book_calculatetable_field, -> { change_book_titles(books_list) }
         end
         
-        has_one :passport, foreign_key: :user_id, scope: user_passports
-        has_one :custom_field, scope: books.where(title: "1984")
+        has_one :passport, -> { passport_opts }
+        has_one :custom_field, -> { custom_field_opts }
+
+        field :user_calculatetable_field, -> { some_method(users_list) }
+      end
+    end
+
+    private
+
+    def change_book_titles(books_list)
+      books_list.each do |book|
+        book.title = "#{book.title.upcase} changed"
+      end
+    end
+
+    def some_method(list)
+      puts list.map(&:id)
+      puts list.map { _1.class.name }
+    end
+
+    def passport_opts
+      {
+        foreign_key: :user_id,
+        scope: user_passports
+      }
+    end
+
+    def custom_field_opts
+      {
+        scope: books.where(title: "1984")
+      }
+    end
+  end
+
+  class ReeDaoLoadAggTest::UsersAggWithDto
+    include ReeDao::AggregateDSL
+
+    aggregate :users_agg_with_dto do
+      link :users, from: :ree_dao_load_agg_test
+      link :organizations, from: :ree_dao_load_agg_test
+      link :load_agg, from: :ree_dao
+    end
+
+    def call(ids_or_scope, **opts)
+      load_agg(users, ids_or_scope, **opts) do
+        belongs_to :organization
       end
     end
   end
@@ -130,9 +178,9 @@ RSpec.describe :load_agg do
     end
 
     def call(ids_or_scope, **opts)
-      load_agg(ids_or_scope, users, **opts) do
+      load_agg(users, ids_or_scope, **opts) do
         belongs_to :organization
-        has_many :books, autoload_children: true do
+        has_many :books, -> { books_opts } do
           has_one :author
           has_many :chapters
         
@@ -142,6 +190,12 @@ RSpec.describe :load_agg do
         end
       end
     end
+
+    private
+    
+    def books_opts
+      { autoload_children: true }
+    end
   end
 
   class ReeDaoLoadAggTest::UsersAggAutoloadReviewsChildren
@@ -158,18 +212,24 @@ RSpec.describe :load_agg do
     end
 
     def call(ids_or_scope, **opts)
-      load_agg(ids_or_scope, users, **opts) do
+      load_agg(users, ids_or_scope, **opts) do
         belongs_to :organization
         has_many :books do
           has_one :author
           has_many :chapters
         
-          has_many :reviews, autoload_children: true do
+          has_many :reviews, -> { { autoload_children: true } } do
             has_one :review_author
           end
         end
       end
     end
+
+    private
+
+    def reviews_opts
+      { autoload_children: true }
+    end
   end
 
   class ReeDaoLoadAggTest::UsersAggBlockTest
@@ -183,13 +243,21 @@ RSpec.describe :load_agg do
     end
 
     def call(ids_or_scope, **opts)
-      load_agg(ids_or_scope, users, **opts) do
+      load_agg(users, ids_or_scope, **opts) do
         belongs_to :organization
-        has_many :books, setter: -> (item, items_index) {
+        has_many :books, -> { books_opts }
+      end
+    end
+
+    private
+
+    def books_opts
+      {
+        setter: -> (item, items_index) {
           b = items_index[item.id].each { |b| b.title = "Changed" }
           item.set_books(b)
         }
-      end
+      }
     end
   end
 
@@ -204,17 +272,21 @@ RSpec.describe :load_agg do
     end
 
     def call(ids_or_scope, **opts)
-      load_agg(ids_or_scope, users, **opts) do |agg_list|
+      load_agg(users, ids_or_scope, **opts) do |agg_list|
         some_id = agg_list.first.id
         title = "1984"
         belongs_to :organization
 
-        has_many :books, scope: books_scope(title)
+        has_many :books, -> { books_opts(title) }
       end
     end
 
     private
 
+    def books_opts(title)
+      { scope: books_scope(title) }
+    end
+
     def books_scope(title)
       books.where(title: title)
     end
@@ -231,7 +303,7 @@ RSpec.describe :load_agg do
     end
 
     def call(ids_or_scope, **opts)
-      load_agg(ids_or_scope, users, **opts) do
+      load_agg(users, ids_or_scope, **opts) do
         has_many :something
       end
     end
@@ -243,6 +315,7 @@ RSpec.describe :load_agg do
   let(:users_agg_autoload_books_children) { ReeDaoLoadAggTest::UsersAggAutoloadBooksChildren.new }
   let(:users_agg_autoload_reviews_children) { ReeDaoLoadAggTest::UsersAggAutoloadReviewsChildren.new }
   let(:users_agg_without_dao) { ReeDaoLoadAggTest::UsersAggWithoutDao.new }
+  let(:users_agg_with_dto) { ReeDaoLoadAggTest::UsersAggWithDto.new }
   let(:organizations) { ReeDaoLoadAggTest::Organizations.new }
   let(:users) { ReeDaoLoadAggTest::Users.new }
   let(:user_passports) { ReeDaoLoadAggTest::UserPassports.new }
@@ -267,6 +340,37 @@ RSpec.describe :load_agg do
     }.to raise_error(ArgumentError)
   }
 
+  it {
+    organizations.delete_all
+    users.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)
+
+    res = users_agg_with_dto.call(
+      users.all,
+      to_dto: -> (users) {
+        users.map do |user|
+          ReeDaoLoadAggTest::UserDto.new(
+            id: user.id,
+            name: user.name,
+            organization_id: user.organization_id,
+            full_name: user.name
+          )
+        end
+      }
+    )
+
+    res_user = res[0]
+
+    expect(res_user.class).to eq(ReeDaoLoadAggTest::UserDto)
+  }
+
   it {
     organizations.delete_all
     users.delete_all
@@ -317,6 +421,7 @@ RSpec.describe :load_agg do
     expect(res_user.passport).to eq(passport_1)
     expect(res_user.passport.info).to eq("some info")
     expect(res_user.books.count).to eq(2)
+    expect(res_user.books.map(&:title)).to eq(["1984 changed", "1408 changed"])
     expect(res_user.books[0].author.name).to eq("George Orwell")
     expect(res_user.books[0].chapters.map(&:title)).to eq(["beginning"])
     expect(res_user.books[0].reviews[0].review_author.name).to eq("John Review")
@@ -595,7 +700,7 @@ RSpec.describe :load_agg do
 
     ids = [user_1, user_2].map(&:id)
 
-    res = load_agg(ids, users)
+    res = load_agg(users, ids)
     expect(res.count).to eq(2)
   }
 
@@ -609,7 +714,7 @@ RSpec.describe :load_agg do
     user_1 = ReeDaoLoadAggTest::User.new(name: "John", age: 33, organization_id: organization.id)
     users.put(user_1)
 
-    res = load_agg(user_1.id, users)
+    res = load_agg(users, user_1.id)
     expect(res.count).to eq(1)
   }
 
@@ -625,7 +730,7 @@ RSpec.describe :load_agg do
     users.put(user_1)
     users.put(user_2)
 
-    res = load_agg(users.where(organization_id: organization.id), users)
+    res = load_agg(users, users.where(organization_id: organization.id))
     expect(res.count).to eq(2)
   }
 end

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

@@ -134,6 +134,25 @@ class ReeDaoLoadAggTest::User
   attr_accessor :name, :age, :organization_id
 end
 
+class ReeDaoLoadAggTest::UserDto
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Integer,
+    organization_id: Integer,
+    name: String,
+    full_name: String,
+  )
+
+  def set_organization(org)
+    @organization = org; nil
+  end
+
+  def organization
+    @organization
+  end
+end
+
 class ReeDaoLoadAggTest::Organization
   include ReeDto::EntityDSL
 

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.55
+  version: 1.0.56
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree