istox 0.1.158.2 → 0.2.3.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f303881190d40e32795203028cfc7e21c68a5e34f4240c63f09cacbc116ee5
-  data.tar.gz: '01196f2df3a75a91f969d04585b0683176d3624e5bb14894be61074025f33fbe'
+  metadata.gz: 6d1176bd57c3e5f7c3cf169446b6aec6c51d101fe1db516fa33a492319bcfd1f
+  data.tar.gz: e6a8027c9e9f1ab224af5643209bb78165fd3686d384561a3cde9ae441fe40d7
 SHA512:
-  metadata.gz: 349210e9975fde52b911856fae0602bd92d55a2350a809bc6e6f8bf59f2fa9d47b43b5a9f88ddc2c0e57b4cea7eb5bc4be90b9a817155cd606b72b37e4bdbf5d
-  data.tar.gz: b4c3249825bf6eb114ce7d8d40ed3265b422b258722c449991b2eecc2b30e1b6ac98de6035730294f0c328465f4c640dafa7e6b7426a7e2652a256246927f11e
+  metadata.gz: 00f2d9c5ed2399e76cab9b940f733e862eae42b79e4de1a7bec5ba301d1240ae95d9487d6a6b68163625da306b69620f2dd926e3ba7a3b67d65a5ad2415a315c
+  data.tar.gz: 742bd4f7b1bccc45dbf031704b1476d68fa52fc9ce68bb1d8445345d177911f9033c0d00807f9408a1cbe5b8a3ca080d529ad9b050ef76a9aeb0658682017c1a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.157.9)
+    istox (0.2.3.pre.2)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)
@@ -64,10 +64,10 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amazing_print (1.2.1)
+    amazing_print (1.3.0)
     amq-protocol (2.3.2)
     arel (9.0.0)
-    awesome_print (1.8.0)
+    awesome_print (1.9.2)
     aws-eventstream (1.1.0)
     aws-partitions (1.318.0)
     aws-sdk-core (3.96.1)
@@ -86,7 +86,7 @@ GEM
     aws-xray-sdk (0.11.4)
       aws-sdk-xray (~> 1.4.0)
       multi_json (~> 1)
-    binding_of_caller (0.8.0)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     bullet (5.7.6)
@@ -99,8 +99,9 @@ GEM
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     database_cleaner (1.6.2)
-    debug_inspector (0.0.3)
+    debug_inspector (1.1.0)
     diff-lcs (1.3)
+    e2mmap (0.1.0)
     erubi (1.9.0)
     exponential-backoff (0.0.4)
     factory_bot (4.8.2)
@@ -112,34 +113,40 @@ GEM
       i18n (~> 0.5)
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (1.0.1)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    ffi (1.13.1)
+    ffi (1.15.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.13.0-universal-darwin)
-    googleapis-common-protos-types (1.0.5)
-      google-protobuf (~> 3.11)
-    graphlient (0.4.0)
+    google-protobuf (3.15.6-universal-darwin)
+    googleapis-common-protos-types (1.0.6)
+      google-protobuf (~> 3.14)
+    graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.11.4)
+    graphql (1.12.6)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.32.0-universal-darwin)
-      google-protobuf (~> 3.13)
+    grpc (1.36.0-universal-darwin)
+      google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.32.0)
-    gruf (2.8.1)
+    grpc-tools (1.36.0)
+    gruf (2.9.1)
       activesupport (> 4)
       concurrent-ruby (> 1)
+      e2mmap (~> 0.1)
       grpc (~> 1.10)
       grpc-tools (~> 1.10)
+      json (>= 2.3)
       slop (~> 4.6)
+      thwait (~> 0.1)
     hashie (3.5.7)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -150,6 +157,7 @@ GEM
       grpc-tools (~> 1.10)
       slop (~> 4.6)
     jmespath (1.4.0)
+    json (2.5.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -170,11 +178,11 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.14)
-    ougai (1.8.5)
+    oj (3.11.3)
+    ougai (2.0.0)
       oj (~> 3.10)
-    paranoia (2.4.2)
-      activerecord (>= 4.0, < 6.1)
+    paranoia (2.4.3)
+      activerecord (>= 4.0, < 6.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -222,7 +230,7 @@ GEM
     redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.8.0)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
     redis-rack (2.1.3)
       rack (>= 2.0.8, < 3)
@@ -254,6 +262,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    ruby2_keywords (0.0.4)
     slop (4.8.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -265,11 +274,13 @@ GEM
     sqlite3 (1.3.13)
     thor (0.20.3)
     thread_safe (0.3.6)
+    thwait (0.2.0)
+      e2mmap
     timecop (0.9.1)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uniform_notifier (1.11.0)
-    vault (0.15.0)
+    vault (0.16.0)
       aws-sigv4
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)

data/lib/istox.rb

@@ -45,12 +45,6 @@ module Istox
   require 'istox/helpers/xray/rabbitmq_consumer_interceptor'
   require 'istox/helpers/xray/xray_initializer'
 
-  require 'istox/helpers/integration_test/grpc_client_interceptor'
-  require 'istox/helpers/integration_test/grpc_server_interceptor'
-  require 'istox/helpers/integration_test/rabbitmq_publisher_interceptor'
-  require 'istox/helpers/integration_test/rabbitmq_consumer_interceptor'
-  require 'istox/helpers/integration_test/settings'
-
   require 'istox/models/blockchain_receipt'
   require 'istox/models/concerns/blockchain_receipt_query'
   require 'istox/consumers/blockchain_status_handler'

data/lib/istox/helpers/common_helper.rb

@@ -58,5 +58,11 @@ module Istox
         obj
       end
     end
+
+    def self.get_currency_decimal(currency)
+      return 0 if currency&.downcase == 'jpy'
+
+      2
+    end
   end
 end

data/lib/istox/helpers/formatter.rb

@@ -17,8 +17,18 @@ module Istox
       end
 
       # format a money, eg. 20000.134 > SGD 20,000.14, position can be :front or :behind, abs_num: whether to absolute the number
-      def money(input, round_mode: :half_up, precision: 2, currency:, position: :front, abs_num: false)
-        result = number(input, round_mode: round_mode, precision: precision, abs_num: abs_num)
+      def money(input, round_mode: :half_up, precision: nil, currency:, position: :front, abs_num: false, hide_currency: false)
+        # precision = ::Istox::CommonHelper.get_currency_decimal(currency, precision)
+
+        decimal_place = if precision.present?
+                          precision
+                        else
+                          ::Istox::CommonHelper.get_currency_decimal(currency)
+                        end
+
+        result = number(input, round_mode: round_mode, precision: decimal_place, abs_num: abs_num)
+
+        return result if hide_currency
 
         return currency + ' ' + result if position == :front
 

data/lib/istox/helpers/messaging.rb

@@ -93,6 +93,7 @@ module Istox
       # sample template data, it should be an array
       # [{
       #    email: email,
+      #    sid: xxxxx,
       #    istoxP1: auth.first_name,
       #    <more other sample template attributes>: <other sample template data>,
       # }]
@@ -137,7 +138,8 @@ module Istox
             else
               # if it is a object hash
               # {
-              #     email: xxxx
+              #     email: xxxx,
+              #     sid: xxxx,
               #     params: {
               #       istoxP1: xxxx,
               #       istoxP2: xxxx
@@ -146,7 +148,8 @@ module Istox
               next unless ce[:email].present?
 
               copy_email_data[:email] = ce[:email]
-              copy_email_data = copy_email_data.merge(ce[:params])
+              copy_email_data[:sid] = ce[:sid]
+              copy_email_data = copy_email_data.merge(ce[:params]) if ce[:params].present?
             end
 
             copy_email_data.delete(:copy_emails)

data/lib/istox/helpers/order_book_price_time.rb

@@ -1,7 +1,7 @@
 module Istox
   class OrderBookPriceTime
     class << self
-      def allocation(soft_cap, total_supply, investments)
+      def allocation(soft_cap, total_supply, investments, decimal_place: 2)
         # sort by token price desc, and id asc
         investments = investments.sort do |a, b|
           [b[:token_price], a[:id]] <=> [a[:token_price], b[:id]]
@@ -15,7 +15,7 @@ module Istox
         total_allocated = 0.0
         total_unallocated = 0.0
         total_investment = 0.0
-        cutoff_price = ::Istox::FMath.round_up(::Istox::FMath.div(soft_cap, total_supply), 2)
+        cutoff_price = ::Istox::FMath.round_up(::Istox::FMath.div(soft_cap, total_supply), decimal_place)
         is_cutoff = false
 
         # return result immediately if no interest

data/lib/istox/helpers/sns_publisher.rb

@@ -14,7 +14,7 @@ module Istox
 
         message = JSON.generate(message) unless message.is_a? String
 
-        sns_client.publish({ topic_arn: topic_arn || ENV.fetch('PUSHER_TOPIC_ARN', ''), message: message })
+        sns_client.publish(topic_arn: topic_arn || ENV.fetch('SNS_CLIENT_TOPIC', ''), message: message)
 
         log.info('Publish to SNS successfully.')
       rescue StandardError => e
@@ -28,8 +28,15 @@ module Istox
       def sns_client
         return @sns_client if @sns_client.present?
 
-        Aws.config.update({ region: ENV.fetch('AWS_REGION', 'ap-southeast-1'),
-                            credentials: Aws::Credentials.new(ENV.fetch('AWS_STS_ACCESS_KEY_ID'), ENV.fetch('AWS_STS_SECRET_ACCESS_KEY')) })
+        access_key = ENV.fetch('AWS_STS_ACCESS_KEY_ID', nil)
+
+        if access_key.present?
+          credentials = Aws::Credentials.new(ENV.fetch('AWS_STS_ACCESS_KEY_ID', nil), ENV.fetch('AWS_STS_SECRET_ACCESS_KEY', nil))
+          Aws.config.update(region: ENV.fetch('AWS_REGION', 'ap-southeast-1'),
+                            credentials: credentials)
+        else
+          Aws.config.update(region: ENV.fetch('AWS_REGION', 'ap-southeast-1'))
+        end
 
         @sns_client = Aws::SNS::Client.new(region: ENV.fetch('AWS_REGION', 'ap-southeast-1'))
       end

data/lib/istox/helpers/xray/grpc_client_xray_interceptor.rb

@@ -22,6 +22,7 @@ module Istox
 
         request_context.metadata[:xray_trace_id] = XRay.recorder.current_segment.trace_id
         request_context.metadata[:xray_parent_id] = XRay.recorder.current_segment.id
+        Thread.current[:tracer_id] = XRay.recorder.current_segment.trace_id
 
         result = yield
 

data/lib/istox/helpers/xray/grpc_server_xray_interceptor.rb

@@ -7,6 +7,7 @@ module Istox
         meta = request.active_call.metadata
         trace_id = (meta['xray_trace_id'] if meta.present? && meta.key?('xray_trace_id'))
         parent_id = (meta['xray_parent_id'] if meta.present? && meta.key?('xray_parent_id'))
+        Thread.current[:tracer_id] = trace_id
 
         XRay.recorder.begin_segment("#{::Istox::Xray::XrayInitializer.service_name}.grpc.#{request.method_key}",
                                     trace_id: trace_id, parent_id: parent_id)

data/lib/istox/helpers/xray/rabbitmq_consumer_interceptor.rb

@@ -8,6 +8,7 @@ module Istox
 
         trace_id = (payload_hash[:xray_trace_id] if payload_hash.key?(:xray_trace_id))
         parent_id = (payload_hash[:xray_parent_id] if payload_hash.key?(:xray_parent_id))
+        Thread.current[:tracer_id] = trace_id
 
         arr = [delivery_info[:exchange]&.downcase, delivery_info[:routing_key]&.downcase, payload_hash[:type]&.downcase].compact
 

data/lib/istox/helpers/xray/rabbitmq_publisher_interceptor.rb

@@ -22,6 +22,7 @@ module Istox
 
         message[:xray_trace_id] = XRay.recorder.current_segment.trace_id
         message[:xray_parent_id] = XRay.recorder.current_segment.id
+        Thread.current[:tracer_id] = XRay.recorder.current_segment.trace_id
 
         XRay.recorder.end_subsegment
 

data/lib/istox/quant/bond.rb

@@ -12,45 +12,82 @@ module Istox
 
       DEFAULT_APPROXIMATION_ERROR = 0.00001
 
-      def initialize(coupon: nil, maturity_date: nil, years: nil, coupon_frequency: nil, coupon_payment_dates: nil, face_value: 100, days_of_year: 365)
-        raise "Invalid coupon #{coupon}" if (coupon.nil? || !is_number?(coupon))
+      def initialize(coupon: nil, maturity_date: nil, start_date: nil, coupon_frequency: nil, coupon_payment_dates: nil, face_value: 100, days_of_year: 365)
+        raise "Invalid coupon #{coupon}" if (coupon.nil? || !is_number?(coupon)) || coupon < 0
         raise "Invalid maturity_date #{maturity_date}" if (maturity_date.nil? || maturity_date.methods.include?("strftime"))
-        raise "Invalid years #{years}" if (years.nil? || !is_number?(years))
-        raise "Invalid coupon_frequency #{days_of_year}" if (coupon_frequency.nil? || !is_number?(coupon))
-        raise "Invalid coupon_payment_dates #{coupon_payment_dates}" if (coupon_payment_dates.nil? || coupon_payment_dates.count == 0 || coupon_payment_dates.any? { |date| date > maturity_date.to_date })
+        raise "Invalid start_date #{start_date}" if (start_date.nil? || start_date.methods.include?("strftime"))
+        raise "Invalid coupon_frequency #{coupon_frequency}" if (coupon_frequency.nil? || !coupon_frequency.is_a?(Integer) || coupon_frequency < 0)
+        raise "Invalid coupon_payment_dates #{coupon_payment_dates}" if (coupon_payment_dates.nil? || (coupon_payment_dates.count == 0 && coupon_frequency != 0) || coupon_payment_dates.any? { |date| date > maturity_date.to_date })
         raise "Invalid days_of_year #{days_of_year}" if (days_of_year != 365 && days_of_year != 360)
+        raise "start_date is not before maturity_date" if start_date>=maturity_date
 
         @coupon               = coupon.to_d
         @maturity_date        = maturity_date.to_date
-        @years                = years
-        @coupon_frequency     = coupon_frequency.to_d
+        @coupon_frequency     = coupon_frequency.to_i # if this is 0, it means zero coupon
         @days_of_year         = days_of_year.to_d
-        @face_value           = face_value
-        @coupon_payment_dates = coupon_payment_dates.map(&:to_date).sort
-        @start_date           = (@maturity_date-(years*12).to_i.months)
+        @face_value           = face_value.to_d
+        @coupon_payment_dates = coupon_payment_dates.map(&:to_date).uniq.sort
+        # note here we work out the start date based on maturity date and nunber of years
+        @start_date           = start_date.to_date
+
+        @pay_accrued_interest = false
+        @coupon_payment_dates_include_accrued_interest = false
+        if !is_zero_coupon?
+          if @coupon_payment_dates.include?(@maturity_date)
+            # maturity date is a coupon payment date, check if this should
+            # be accrued interest or last normal coupon
+            if @coupon_payment_dates.count > 1
+              previous_coupon_date = @coupon_payment_dates[@coupon_payment_dates.count-2]
+              next_coupon_date = add_month(previous_coupon_date, -(12/@coupon_frequency).to_i)
+              # If maturity date is a normal coupon payment, the theorecical next_coupon_date
+              # calculated from previous coupon payment should be the maturity date, to be safe,
+              # we allow 3 days difference
+              if (next_coupon_date - @maturity_date).abs <= 3
+                @pay_accrued_interest = false
+                @coupon_payment_dates_include_accrued_interest = false
+              else
+                @pay_accrued_interest = true
+                @coupon_payment_dates_include_accrued_interest = true
+              end
+            else
+              # maturity date is only coupon payment date, shouldn't be accrued interest!
+              @pay_accrued_interest = false
+              @coupon_payment_dates_include_accrued_interest = false
+            end
+          else
+            # maturity date is not included in coupon payment date, consider 
+            # this needs to pay accrued interest
+            @pay_accrued_interest = true
+            @coupon_payment_dates_include_accrued_interest = false
+          end
+        end
+
+        log.info "Bond info: start_date=#{@start_date} maturity_date=#{@maturity_date} days_of_years=#{days_of_year} coupon=#{@coupon} coupon_frequency=#{coupon_frequency} face_value=#{@face_value} coupon_payment_dates=#{@coupon_payment_dates} pay_accrued_interest=#{@pay_accrued_interest} coupon_payment_dates_include_accrued_interest=#{@coupon_payment_dates_include_accrued_interest}"
       end
 
       def price(ytm, date, ex_coupon_date: nil, fees: 0)
-        # price_for_irr(irr_from_ytm(ytm), date, fees: fees)
-        price = price_for_irr(ytm/@coupon_frequency, date, ex_coupon_date: ex_coupon_date, fees: fees)
+        irr = ytm
+        irr = ytm/@coupon_frequency if !is_zero_coupon?
+        price = price_for_irr(irr, date, ex_coupon_date: ex_coupon_date, fees: fees)
         price
       end
 
-      # def interest_payments(from_date)
-      #   payments = []
-      #   date = @maturity_date
-      #   while date >= from_date
-      #     payments << date
-      #     date = date.prev_month(12/@coupon_frequency)
-      #   end
-      #   payments.sort
-      # end
+      def ytm(date, ex_coupon_date: nil, price: 100, fees: 0, approximation_error: DEFAULT_APPROXIMATION_ERROR)
+        ytm_down, ytm_up = ytm_limits(price, date, ex_coupon_date: ex_coupon_date, fees: fees)
+        approximate_ytm(ytm_down, ytm_up, price, date, ex_coupon_date: ex_coupon_date, fees: fees, approximation_error: approximation_error)
+      end
+
+
+      private
 
       def coupon_payments(from_date)
         payments = []
 
         @coupon_payment_dates.each do |payment_date|
-          if payment_date > from_date
+          # if from_date falls on coupon payment date or maturity date, we 
+          # still add them to make it easy for calculation later
+          # just that the first coupon will not pay actually (i.e. 0)
+          if payment_date >= from_date && payment_date <= @maturity_date
             payments << payment_date
           end
         end
@@ -58,29 +95,25 @@ module Istox
         payments.sort
       end
 
-      def ytm(date, ex_coupon_date: nil, price: 100, fees: 0, approximation_error: DEFAULT_APPROXIMATION_ERROR)
-        ytm_down, ytm_up = ytm_limits(price, date, ex_coupon_date: ex_coupon_date, fees: fees)
-        approximate_ytm(ytm_down, ytm_up, price, date, ex_coupon_date: ex_coupon_date, fees: fees, approximation_error: approximation_error)
-      end
-
-
-      private
-
       def is_365?
         @days_of_year == 365.to_d
       end
 
-      def add_month(mydate, n)
-        if mydate.month != mydate.next_day.month 
+      def is_zero_coupon?
+        @coupon == 0
+      end
+
+      def add_month(my_date, n)
+        if is_month_end?(my_date)
           # month end
-          (mydate.next_day + n.month).prev_day
+          (my_date.next_day + n.month).prev_day
         else
-          mydate.next_day + n.month
+          my_date.next_day + n.month
         end
       end
 
-      def is_month_end?(mydate)
-        mydate.month != mydate.next_day.month 
+      def is_month_end?(my_date)
+        my_date.month != my_date.next_day.month 
       end
 
       def is_number?(val)
@@ -107,111 +140,158 @@ module Istox
         [ytm_down, ytm_up]
       end
 
-      # def price_for_irr(irr, date, fees: 0)
-      #   raise "Date is after maturity_date!" if date > @maturity_date
-      #   last = date
-      #   interest_payments(date).map do |payday|
-      #     interest = @coupon * @face_value * ((payday-last)/@days_of_year)
-      #     interest += @face_value if payday == @maturity_date
-      #     last = payday
-      #     interest / ((1+irr) ** ((payday-date)/@days_of_year))
-      #   end.inject(:+) / (1+fees)
-      # end
-
       def price_for_irr(irr, date, ex_coupon_date: nil, fees: 0)
         date = date.to_date
         raise "Date is after maturity_date!" if date > @maturity_date
+        # if today is maturity, price is face value (without including any coupon/accrued interest)
+        # BizOps said we will always have an ex_coupon_date when it's close
+        # to coupon payment date but not too early, so the fomula needs to 
+        # accept nil value. Even if we have ex_coupon_date as maturity date,
+        # buyer is not eligible to receive the coupon, so no need to check ex_coupon_date here
+        if date == @maturity_date
+          return @face_value
+        end
+
         if date <= @start_date
           date = @start_date
         end
-        last_coupon_payday = @coupon_payment_dates.last
-        payment_dates = coupon_payments(date)
         
-        if payment_dates.count == 0
-          # no more coupon payments, we do only 1 discount of accrued interest and face value to the current date
+        # it's supporting 365 actual days only at the moment
+        if is_zero_coupon?
+          total_days = @maturity_date - date
+          no_of_years = total_days / 365
+          remainder_days = total_days % 365
+
+          return @face_value/(1+irr)**no_of_years/(1+irr*remainder_days/365)
+        end
+
+        payment_dates = coupon_payments(date)
+
+        no_regular_coupon_before_maturity = false
+        if payment_dates.count == 0 || (payment_dates.count == 1 && payment_dates.first == @maturity_date)
+          no_regular_coupon_before_maturity = true
+        end
+
+        if no_regular_coupon_before_maturity
+          discount_factor = nil
           if is_365?
-            discount_factor = 1.0/(1+irr*(@maturity_date-date)/accrued_interest_discount_days)
+            previous_coupon_date = previous_coupon_date_before_maturity
+            next_coupon_date = add_month(previous_coupon_date, (12/@coupon_frequency).to_i)
+            discount_factor = 1.0/(1+irr*(@maturity_date-date)/(next_coupon_date-previous_coupon_date))
           else
             discount_factor = 1.0/(1+irr*@coupon_frequency*day_count_factor(date, @maturity_date, nil))
           end
-          discounted_accrued_interest = @coupon*@face_value*accrued_interest_factor*discount_factor
-          discounted_face_value = @face_value*discount_factor
-          price = discounted_accrued_interest + discounted_face_value
+
+          if @pay_accrued_interest
+            # accrued interest + face value discounted to the current date
+            discounted_accrued_interest = 0
+            if ex_coupon_date.nil? || ex_coupon_date == @maturity_date
+              discounted_accrued_interest = @coupon*@face_value*accrued_interest_factor*discount_factor
+            end
+            discounted_face_value = @face_value*discount_factor
+            price = discounted_accrued_interest + discounted_face_value
+            return price
+          else
+            discounted_last_coupon = 0
+            if ex_coupon_date.nil? || ex_coupon_date == @maturity_date
+              discounted_last_coupon = @coupon*@face_value/@coupon_frequency*discount_factor
+            end
+            discounted_face_value = @face_value*discount_factor
+            price = discounted_last_coupon + discounted_face_value
+            return price
+          end
         else
-          # we discount face value and coupons and accrued interest (coupon) at maturity (if any)
-          # to the first coupon payment left, and then discount the total to current date
+          # there are at least 1 more regular coupon payment before maturity
+          # we discount face value and coupons or accrued interest if any
+          # to the first coupon payment date left, and then discount the total to current date
           value_at_first_coupon = 0.to_d
-          if payment_dates.include?(@maturity)
-            # last coupon payment is at maturity
-            discount_factor = 1.0/(1+irr)**(payment_dates.count-1)
-            value_at_first_coupon = @face_value*discount_factor
-          else
-            period = @coupon_payment_dates.include?(date) ? payment_dates.count : payment_dates.count-1
-            # last coupon is not at maturity, need to add accrued interest (coupon)
-            discount_factor = 1.0/((1+irr)**period)/(1+irr*@coupon_frequency*accrued_interest_factor)
+          # this is the discount period excluding the one at maturity date
+          # e.g. payment_dates has date1, date2, maturity, we need to discount 
+          # to date1, excluding the period from date2 to maturity, period = 1 (i.e. from date2 to date1)
+          no_of_discount_period = 0 
+          if @pay_accrued_interest
+            if @coupon_payment_dates_include_accrued_interest
+              no_of_discount_period = payment_dates.count-2
+            else
+              no_of_discount_period = payment_dates.count-1
+            end
+            
+            discount_factor = 1.0/((1+irr)**no_of_discount_period)/(1+irr*@coupon_frequency*accrued_interest_factor)
             discounted_accrued_interest = @coupon*@face_value*accrued_interest_factor*discount_factor
             discounted_face_value = @face_value*discount_factor
             value_at_first_coupon = discounted_accrued_interest + discounted_face_value
-          end  
+          else
+            # last coupon payment is at maturity
+            no_of_discount_period = payment_dates.count-1
+            discount_factor = 1.0/(1+irr)**(no_of_discount_period+1)
+            discounted_last_coupon = @coupon*@face_value/@coupon_frequency*discount_factor
+            discounted_face_value = @face_value*discount_factor
+            value_at_first_coupon = discounted_last_coupon + discounted_face_value
+          end
 
-          # first coupon can be pro-rata
-          value_at_first_coupon += first_coupon(date, ex_coupon_date)
-          if payment_dates.count >= 1
-            if @coupon_payment_dates.include?(date)
-              # today is on one of the coupon payment date, the coupon will not be payed today
-              # discount all coupon payments to first coupon date
-              for n in 1..payment_dates.count do
-                value_at_first_coupon += @coupon*@face_value/@coupon_frequency/(1+irr)**n    
-              end
-            else
-              # discount all coupon payments excluding first one to first coupon date
-              for n in 1..payment_dates.count-1 do
-                value_at_first_coupon += @coupon*@face_value/@coupon_frequency/(1+irr)**n    
-              end
-            end
+          if no_of_discount_period >= 1
+            # discount all coupon payments excluding first one to first coupon date
+            for n in 1..no_of_discount_period do
+              value_at_first_coupon += @coupon*@face_value/@coupon_frequency/(1+irr)**n    
+            end  
           end
 
+          # first coupon, can be pro-rated, check the logic in first_coupon
+          value_at_first_coupon += first_coupon(date, ex_coupon_date)
+
           if @coupon_payment_dates.include?(date)
             # today is one of the coupon payment, no need to discount
             price = value_at_first_coupon
           else
             # discount value at first coupon date to present value
             if is_365?
-              price = value_at_first_coupon/(1+irr*(payment_dates.first-date)/first_coupon_discount_days(date))/(1+fees)
+              previous_coupon_date = add_month(payment_dates.first, -(12/@coupon_frequency).to_i)
+              price = value_at_first_coupon/(1+irr*(payment_dates.first-date)/(payment_dates.first-previous_coupon_date))/(1+fees)
             else
               price = value_at_first_coupon/(1+irr*@coupon_frequency*day_count_factor(date, payment_dates.first, nil))/(1+fees)
             end   
           end
+          return price
         end
-
       end
 
       def first_coupon(date, ex_coupon_date)
-        if @coupon_payment_dates.include?(date) || (!ex_coupon_date.nil? && date > ex_coupon_date.to_date)
-          # if today is on coupon payment date, we won't include the coupon 
-          # as by default it's passing ex_coupon_date in our calculation
-          # after ex coupon date, buyer won't receive next coupon
+        # BizOps said we will always have an ex_coupon_date when it's close
+        # to coupon payment date but not too early, so the fomula needs to 
+        # accept nil value. 
+        if !ex_coupon_date.nil? && date >= ex_coupon_date.to_date
+          # on or after ex coupon date, buyer won't receive next coupon
+          return 0.to_d
+        elsif @coupon_payment_dates.include?(date)
+          # if today is a coupon payment date, for sure it will pass ex_coupon_date
+          # and buyer won't receive this coupon. In case ex_coupon_date is nil,
+          # that's the same assumption, so first_coupon will be 0
           return 0.to_d
         end
         
         coupon = @coupon*@face_value/@coupon_frequency
-        if date <= @coupon_payment_dates.first
+        # For the very first coupon, we need to check if it needs to be pro-rated 
+        if date <= @coupon_payment_dates.first && @pay_accrued_interest
           coupon = @coupon*@face_value*first_coupon_factor
         end
         coupon
       end
 
-      def accrued_interest_discount_days
-        # the days between last coupon payment date and the next coupon payment date if maturity was longer
-        last_coupon_payday = @coupon_payment_dates.last
-        (add_month(last_coupon_payday, (12/@coupon_frequency).to_i) - last_coupon_payday).to_i
-      end
-
-      def first_coupon_discount_days(date)
-        # first coupon date is based on current date
-        payment_dates = coupon_payments(date)
-        first_coupon_date = payment_dates.first
-        (first_coupon_date - add_month(first_coupon_date, -(12/@coupon_frequency).to_i)).to_i
+      def previous_coupon_date_before_maturity
+        previous_coupon_date = @start_date
+        if @coupon_payment_dates.include?(@maturity_date)
+          # maturity date is in coupon payment dates, get the previous coupon date
+          # if there is no more date, use the default start date
+          if @coupon_payment_dates.count > 1
+            previous_coupon_date = @coupon_payment_dates[@coupon_payment_dates.count-2]
+          end
+        else
+          # maturity date is not in coupon payment dates, get the last coupon date
+          # if there is no more date, use the default start date
+          if @coupon_payment_dates.count > 0
+            previous_coupon_date = @coupon_payment_dates.last
+          end
+        end
       end
 
       def first_coupon_factor
@@ -227,6 +307,13 @@ module Istox
 
       def accrued_interest_factor
         date1 = @coupon_payment_dates.last
+        if @coupon_payment_dates_include_accrued_interest
+          if @coupon_payment_dates.count > 1
+            date1 = @coupon_payment_dates[@coupon_payment_dates.count-2]
+          else
+            raise "coupon_payment_dates count < 2 and we have accrued interest payment date included!!!"
+          end
+        end
         date2 = @maturity_date
         date3 = add_month(date1, (12/@coupon_frequency).to_i)
         day_count_factor(date1, date2, date3)
@@ -234,8 +321,10 @@ module Istox
 
       def day_count_factor(date1, date2, date3)
         if is_365?
+          # Actual/365
           (date2 - date1)/(date3 - date1)/@coupon_frequency
         else
+          # 30/360
           d1 = [date1.day, 30].min
           d2 = date2.day
           if d1 == 30 

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.158.2'.freeze
+  VERSION = '0.2.3-2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.158.2
+  version: 0.2.3.pre.2
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -480,14 +480,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".idea/.rakeTasks"
-- ".idea/encodings.xml"
-- ".idea/inspectionProfiles/Project_Default.xml"
-- ".idea/istox-gem.iml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/vcs.xml"
-- ".idea/workspace.xml"
 - ".rubocop.yml"
 - ".solargraph.yml"
 - CODE_OF_CONDUCT.md
@@ -511,11 +503,6 @@ files:
 - lib/istox/helpers/graphql_client.rb
 - lib/istox/helpers/grpc_client.rb
 - lib/istox/helpers/gruf_listener_hook.rb
-- lib/istox/helpers/integration_test/grpc_client_interceptor.rb
-- lib/istox/helpers/integration_test/grpc_server_interceptor.rb
-- lib/istox/helpers/integration_test/rabbitmq_consumer_interceptor.rb
-- lib/istox/helpers/integration_test/rabbitmq_publisher_interceptor.rb
-- lib/istox/helpers/integration_test/settings.rb
 - lib/istox/helpers/logger.rb
 - lib/istox/helpers/messaging.rb
 - lib/istox/helpers/my_open_struct.rb
@@ -555,9 +542,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: 

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>

data/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

data/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

data/.idea/istox-gem.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="ModuleRunConfigurationManager">
-    <shared />
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.6, RVM: ruby-2.5.3 [global]) [gem]" level="application" />
-  </component>
-</module>

data/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.5.3 [global]" project-jdk-type="RUBY_SDK" />
-</project>

data/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/istox-gem.iml" filepath="$PROJECT_DIR$/.idea/istox-gem.iml" />
-    </modules>
-  </component>
-</project>

data/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

data/lib/istox/helpers/integration_test/grpc_client_interceptor.rb

@@ -1,22 +0,0 @@
-require 'istox/helpers/logger'
-
-module Istox
-  module IntegrationTest
-    class GrpcClientInterceptor < ::Gruf::Interceptors::ClientInterceptor
-      def call(request_context:)
-        request_context.metadata[:integration_test] = if ::Istox::IntegrationTest::Settings.enable
-                                                        '1'
-                                                      else
-                                                        '0'
-                                                      end
-
-        result = yield
-
-        result
-      rescue StandardError => e
-        log.error e
-        raise e
-      end
-    end
-  end
-end

data/lib/istox/helpers/integration_test/grpc_server_interceptor.rb

@@ -1,31 +0,0 @@
-require 'istox/helpers/logger'
-
-module Istox
-  module IntegrationTest
-    class GrpcServerInterceptor < ::Gruf::Interceptors::ServerInterceptor
-      def call
-        meta = request.active_call.metadata
-        enable_integration = (meta['integration_test'] if meta.present? && meta.key?('integration_test'))
-
-        if enable_integration == '1'
-          ::Istox::IntegrationTest::Settings.enable = true
-          if ActiveRecord::Base.connection.current_database != Rails.configuration.database_configuration['integration']['database']
-            ActiveRecord::Base.establish_connection(:integration)
-          end
-        else
-          ::Istox::IntegrationTest::Settings.enable = false
-          if ActiveRecord::Base.connection.current_database != Rails.configuration.database_configuration['development']['database']
-            ActiveRecord::Base.establish_connection(:development)
-          end
-        end
-
-        result = yield # this returns the protobuf message
-
-        result
-      rescue StandardError => e
-        log.error e
-        raise e
-      end
-    end
-  end
-end

data/lib/istox/helpers/integration_test/rabbitmq_consumer_interceptor.rb

@@ -1,32 +0,0 @@
-require 'istox/helpers/logger'
-
-module Istox
-  module IntegrationTest
-    class RabbitmqConsumerInterceptor
-      def call(payload, _metadata, _delivery_info)
-        payload_hash = payload.to_h
-
-        enable_integration_test = (payload_hash[:istox_integration_test] if payload_hash.key?(:istox_integration_test))
-
-        if enable_integration_test == '1'
-          ::Istox::IntegrationTest::Settings.enable = true
-          if ActiveRecord::Base.connection.current_database != Rails.configuration.database_configuration['integration']['database']
-            ActiveRecord::Base.establish_connection(:integration)
-          end
-        else
-          ::Istox::IntegrationTest::Settings.enable = false
-          if ActiveRecord::Base.connection.current_database != Rails.configuration.database_configuration['development']['database']
-            ActiveRecord::Base.establish_connection(:development)
-          end
-        end
-
-        result = yield # this returns consumer handler message
-
-        result
-      rescue StandardError => e
-        log.error e
-        raise e
-      end
-    end
-  end
-end

data/lib/istox/helpers/integration_test/rabbitmq_publisher_interceptor.rb

@@ -1,14 +0,0 @@
-require 'istox/helpers/logger'
-
-module Istox
-  module IntegrationTest
-    class RabbitmqPublisherInterceptor
-      def call(message, _options)
-        message[:istox_integration_test] = '1'
-      rescue StandardError => e
-        log.error e
-        raise e
-      end
-    end
-  end
-end

data/lib/istox/helpers/integration_test/settings.rb

@@ -1,11 +0,0 @@
-require 'istox/helpers/logger'
-
-module Istox
-  module IntegrationTest
-    class Settings
-      class << self
-        attr_accessor :enable
-      end
-    end
-  end
-end