istox 0.1.119 → 0.1.120.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d369f69df949441ab14c3fac0c794b92d17d5fe3a6c5a54859fddecf530eb6c8
-  data.tar.gz: 0c588144bc9be77609880360723f28e7db90764d46eb12063ad57c0d8c497649
+  metadata.gz: d7115c09fd48a24d96b6a7018f3cfc0cd1f83ea98ba6eae8515f935148fa39cb
+  data.tar.gz: 77b3be7bc1d761ba51141dabc8677793b001c4fedde9b1c7b11900aa724938ed
 SHA512:
-  metadata.gz: f152ebf349268814c9a1dcd73fd9a59475b22d2f55d014afd3e5917c99ac59eb5346129c205ed9d2aecc315cd7ae897caf58a1dd4fa7bf81fbb1e565effda6e4
-  data.tar.gz: 57d185c7104b0a6b7eebc2155c226e8ff3fcc786f19ce99c236b8417db76a9f77e8dd4b846a084b89676313f963661f30f560960c552d9efb75999b3e074c6a8
+  metadata.gz: fddbc0a6b9471fea4bd53ceb9ce9878e070fddd715b567bbde9e33e9661ce8b1763e9f4c6e75f7d031d784fb96938e6cc539d38a72e14193f8ec22cece7b5a22
+  data.tar.gz: 47afe434053f98ce27cea5088b15522df50ecdbbf12e230845b62d8d1ceda67fb52f1d24e9f86fa972d65cb52b00db6cf59b5e104fe4716d7357659434bc4fda

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.115)
+    istox (0.1.119)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -95,7 +95,7 @@ GEM
     ffi (1.11.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.2)
+    google-protobuf (3.11.2-universal-darwin)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     graphlient (0.3.7)
@@ -106,7 +106,7 @@ GEM
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.26.0)
+    grpc (1.26.0-universal-darwin)
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.26.0)

data/lib/istox/helpers/messaging.rb

@@ -37,8 +37,9 @@ module Istox
       #    <more other sample template attributes>: <other sample template data>,
       # }]
       def sms_template(template_name, template_data_arr)
-        raise ArgumentError, 'Template name and template data arr cannot be empty' if template_name.blank? || template_data_arr.nil? ||
-                                                                                      template_data_arr.empty?
+        raise ArgumentError, 'Template name and template data arr cannot be empty' if template_name.blank? || template_data_arr.nil?
+
+        return log.info 'Template data is empty, skipping this request' if template_data_arr.empty?
 
         ::Istox::Publisher.manual_publish(
           exchange: 'message',
@@ -101,8 +102,9 @@ module Istox
       #    base64: "<Base64 of the file>"
       #  }]
       def email_template(template_name, template_data_arr, attachments: nil)
-        raise ArgumentError, 'Template name and template data arr cannot be empty' if template_name.blank? || template_data_arr.nil? ||
-                                                                                      template_data_arr.empty?
+        raise ArgumentError, 'Template name and template data arr cannot be empty' if template_name.blank? || template_data_arr.nil?
+
+        return log.info 'Template data is empty, skipping this request' if template_data_arr.empty?
 
         ::Istox::Publisher.manual_publish(
           exchange: 'message',

data/lib/istox/helpers/order_book_prorate.rb

@@ -1,8 +1,29 @@
 module Istox
   class OrderBookProrate
     class << self
-      def allocation(token_price:, min_investment:, bid_block:,
-                     invest_step:, hard_cap:, investments:)
+      def allocation(token_price:, min_investment:, bid_block:, # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity
+                     invest_step:, hard_cap:, investments:, whitelists: [], include_refund_amount: false)
+
+        # make sure is hashes
+        original_investments = investments.as_json.map(&:symbolize_keys)
+        whitelists = whitelists.as_json.map(&:symbolize_keys)
+        investments = investments.as_json.map(&:symbolize_keys)
+
+        # process whitelist
+        whitelists.each do |whitelist|
+          investment = investments.find { |investment1| investment1[:account_id] == whitelist[:account_id] }
+
+          next unless investment.present?
+
+          granted_amount = [::BigDecimal.new(investment[:fiat_amount].to_s), ::BigDecimal.new(whitelist[:guaranteed_allocation].to_s)].min
+
+          next unless granted_amount.positive?
+
+          hard_cap = ::Istox::FMath.sub(hard_cap, granted_amount)
+          investment[:fiat_amount] = Istox::FMath.sub(investment[:fiat_amount], granted_amount)
+          investment[:is_vip] = true
+          investment[:granted_amount] = granted_amount.to_s
+        end
 
         # sort by id asc
         interests = investments.sort do |a, b|
@@ -26,7 +47,8 @@ module Istox
                                                                                  hard_cap), 0)
                            result = result.to_d - result.to_d.modulo(invest_step.to_s.to_d)
 
-                           result = min_investment.to_d if result < min_investment.to_d
+                           # only set to min investment if is not vip
+                           result = min_investment.to_d if result < min_investment.to_d && interest[:is_vip].blank?
 
                            result
                          else
@@ -35,6 +57,8 @@ module Istox
 
             {
               id: interest[:id],
+              is_vip: interest[:is_vip],
+              granted_amount: interest[:granted_amount],
               investment: investment.to_s
             }
           end
@@ -48,9 +72,14 @@ module Istox
           if new_total_interests.to_d > hard_cap.to_s.to_d
             total_deducting = ::Istox::FMath.sub(new_total_interests, hard_cap)
             interests.reverse_each do |interest|
-              next unless interest[:investment].to_d > min_investment.to_d
+              next unless interest[:investment].to_d > min_investment.to_d || interest[:is_vip]
 
-              deductable = ::Istox::FMath.sub(interest[:investment], min_investment)
+              # allow to deduct to zero if is vip
+              deductable = if interest[:is_vip]
+                             interest[:investment]
+                           else
+                             ::Istox::FMath.sub(interest[:investment], min_investment)
+                           end
 
               if deductable.to_d > total_deducting.to_d
                 interest[:investment] = ::Istox::FMath.sub(interest[:investment], total_deducting)
@@ -62,14 +91,41 @@ module Istox
             end
           end
 
-          final_interests = interests
+          final_interests = interests.map do |interest|
+            interest[:investment] = ::Istox::FMath.add(interest[:investment], interest[:granted_amount]) if interest[:granted_amount].present? &&
+                                                                                                            interest[:granted_amount].to_d.positive?
+            interest.delete(:is_vip)
+            interest.delete(:granted_amount)
+
+            if include_refund_amount
+              original_investment = original_investments.find { |original_investment1| original_investment1[:id] == interest[:id] }
+              interest[:refund_amount] = ::Istox::FMath.sub(original_investment[:fiat_amount], interest[:investment])
+            end
+            interest
+          end
 
         else
-          final_interests = interests.each_with_index.map do |interest, i|
-            {
+          final_interests = interests.each_with_index.map do |interest|
+            final_amount = if interest[:is_vip]
+                             ::Istox::FMath.add(interest[:fiat_amount], interest[:granted_amount])
+                           else
+                             max_allowed_investor.positive? ? interest[:fiat_amount] : '0'
+                           end
+
+            max_allowed_investor -= 1
+            result = {
               id: interest[:id],
-              investment: i < max_allowed_investor ? ::BigDecimal.new(interest[:fiat_amount].to_s).to_s : ::BigDecimal.new('0').to_s
+              investment: ::BigDecimal.new(final_amount.to_s).to_s
+
             }
+
+            if include_refund_amount
+              original_investment = original_investments.find { |original_investment1| original_investment1[:id] == interest[:id] }
+              refund_amount = ::Istox::FMath.sub(original_investment[:fiat_amount], final_amount)
+              result[:refund_amount] = refund_amount
+            end
+
+            result
           end
         end
 

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.119'.freeze
+  VERSION = '0.1.120-1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.119
+  version: 0.1.120.pre.1
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -411,9 +411,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: