sorare-rewards 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 253e18e26532e141a2fa48969f8484d6c7f92f399cf4eecc248b5017978e6747
-  data.tar.gz: c7ed9fd27b8a78240a492eb0d75df26e5fb34b55a5a96b3a46b4cc74cc845d59
+  metadata.gz: 8cc85589244de6f453ed70184da06e8c679ec19b4b2c5fe86ee1ea4936c2c402
+  data.tar.gz: 521385c5b0b1e917d7be61eaef02d2284c24082fb18eeec561f9da6160ea650f
 SHA512:
-  metadata.gz: d3ef4eae789a0f616c270f8d08eb16d87d5964cd4b8c99a0501fe78ed02347942cb205baea2cc0b299822d9f158e6e2548915bd9d13917cf392ec8ebb4ff9be6
-  data.tar.gz: bbb905bf57270350136d28946ef963e841efc5acd780db50d90d0bcef4bfdee11fd7488df00d1bddcb5ce96981bbab64bad8177e3e699dd8b09d816518445cd6
+  metadata.gz: 4b998f1b6bca4cbb8ca9fc9fcab6b2d9f2f32b7f4384e4b736ec2dcd3b51b9e1e17d62daf7f85b715e21a060445abd5e495342a01bc725994847ca028a991733
+  data.tar.gz: fff45a44fc25d684adeb45985aac4fde3b876977feca1f9fd3b4f9cd7b3e60f82b3f3f0294df25cc28aead951ee16f0b287192d4bb44fb1cd823602067f3ac42

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.0.0)
+    sorare-rewards (1.0.1)
       activesupport (~> 6.1)
       interactor (~> 3.0)
       json (~> 2)

data/lib/sorare/rewards/interactors/cards/pick_for_division_rarity_and_quality.rb

@@ -32,7 +32,7 @@ module Sorare
 
         def pick_if_available!
           player = picker.pick
-          return if picker.player_counter[player] > game_week.player(player).supply(league, rarity).ceil
+          return if picker.player_counter[player] > game_week.player(player).pickable_supply(league, rarity)
 
           cards_picked.push(player)
         end

data/lib/sorare/rewards/interactors/supply/compute_for_rarity.rb

@@ -44,7 +44,7 @@ module Sorare
         end
 
         def player_supply(slug)
-          game_week.player(slug).supply(league, rarity)
+          game_week.player(slug).reward_pool_supply_contribution(league, rarity)
         end
 
         def rounded_supply(float_supply)

data/lib/sorare/rewards/player.rb

@@ -25,11 +25,18 @@ module Sorare
         @game_data.present?
       end
 
-      def supply(league, rarity)
+      def reward_pool_supply_contribution(league, rarity)
         return 0 unless playing? && remaining_games_for_supply.positive?
 
         [
-          uncapped_supply_for_game_week(league, rarity), # Remaining supply
+          uncapped_supply_for_game_week(league, rarity),
+          pickable_supply(league, rarity)
+        ].min
+      end
+
+      def pickable_supply(league, rarity)
+        [
+          overall_supply(league, rarity), # Remaining supply
           available_during_cooldown(league, rarity), # Cooldown limit
           @config.distribution_limit(rarity) # Hard limit
         ].min
@@ -52,10 +59,12 @@ module Sorare
       end
 
       def rewarded_during_cooldown(league, rarity)
-        (rewards&.dig(league) || []).count { |at| (Time.parse(at) + @config.cooldown_since(rarity)) < Time.now }
+        (@game_data&.dig(league.name, rarity) || []).count do |at|
+          (Time.parse(at) + @config.cooldown_since(rarity)) > Time.now
+        end
       end
 
-      %w[rewards remaining_games_for_supply remaining_games].each do |key|
+      %w[remaining_games_for_supply remaining_games].each do |key|
         define_method(key) do
           @game_data&.dig(key)
         end

data/lib/sorare/rewards/version.rb

@@ -2,6 +2,6 @@
 
 module Sorare
   module Rewards
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorare-rewards
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - pierre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport