cryptum 0.0.456 → 0.0.458

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e3f976fdd41eb06a0f31c77a0f98052dd3b75b816cfd4a7ada3109c046f33f4
-  data.tar.gz: 986148e3bae656c4d32420c2b4d9dcc9e36d6680eb32242012bdfad73bb6d1eb
+  metadata.gz: 3c04633f954adc6a1d46177ffad69796738a01be430071efc785226f8f1fd116
+  data.tar.gz: 804989be187108d606c9784aae5149dea03a302b0bd937e5115810a0714d74a7
 SHA512:
-  metadata.gz: 27280b8e5c51c90a3d46452dd5c449f3558c31306c3afd7411a7ac38db0accc2a3e70721b37892fe2e3ab839c2816215cda28220db3f611d5b1249b52dd7ba47
-  data.tar.gz: 919f242f11f071e1e5a5f211e509b85759ef3f3696c1073c67896a6c90efa01f8f671c353dc10b3a92771435e90159da81dc8e6d58026248bef388a57d230014
+  metadata.gz: 1a86babcb3ee6fdfedf5f218ead23f74bc449c8bb8f8bb9eb7afb6b7b716458aab16cda47dc524d1af447116b04346722e9e2d7f7b453140bf1afb2b91379bb6
+  data.tar.gz: ce866cc620947b3a575a9b4124bf076002818ba6457cfc46f479baad6b7014ecf4a489ca73dec0f5fcbb986d3db813cdde5d33bcbc03ee1214cfe77157784b56

data/.rubocop.yml

@@ -6,7 +6,7 @@ Layout/LineLength:
 Lint/UselessRescue:
   Enabled: false
 Metrics/AbcSize:
-  Max: 486.2
+  Max: 537.6
 Metrics/BlockLength:
   Max: 138
 Metrics/BlockNesting:
@@ -14,13 +14,13 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Max: 134
 Metrics/CyclomaticComplexity:
-  Max: 93
+  Max: 102
 Metrics/MethodLength:
-  Max: 457
+  Max: 485
 Metrics/ModuleLength:
-  Max: 467
+  Max: 495
 Metrics/PerceivedComplexity:
-  Max: 91
+  Max: 100
 Style/HashSyntax:
   EnforcedShorthandSyntax: never
 

data/lib/cryptum/ui/order/execute.rb

@@ -239,13 +239,30 @@ module Cryptum
             end
           end
 
-          # Snad all orders sold YTD
+          # Snag all orders bought YTD
+          oh_buy_ytd_arr = order_history.select do |oh|
+            oh[:side] == 'buy' &&
+              oh.key?(:done_at) &&
+              Time.now.strftime('%Y') == Time.parse(oh[:done_at]).strftime('%Y')
+          end
+          order_hist_buy_usd_tot = oh_buy_ytd_arr.map do |oh|
+            oh[:executed_value].to_f
+          end.sum
+
+          # Snag all orders sold YTD
           oh_sold_ytd_arr = order_history.select do |oh|
             oh[:side] == 'sell' &&
               oh.key?(:done_at) &&
               Time.now.strftime('%Y') == Time.parse(oh[:done_at]).strftime('%Y')
           end
+          # TODO: ensure oh_buy_ytd_arr && oh_sold_ytd_arr are same length
+          # otherwise it throws off the profit calculations
           order_hist_sold_ytd = oh_sold_ytd_arr.length
+          order_hist_sold_usd_tot = oh_sold_ytd_arr.map do |oh|
+            oh[:executed_value].to_f
+          end.sum
+          order_hist_profit_usd_ytd = order_hist_sold_usd_tot - order_hist_buy_usd_tot
+          order_hist_profit_usd_ytd_out = format('%0.2f', order_hist_profit_usd_ytd)
 
           # Snag all session orders sold YTD
           oh_meta_sold_arr = order_history_meta.select do |ohm|
@@ -314,6 +331,15 @@ module Cryptum
           # OK, now let's tally up everything...
           twenty_four_hrs_ago = Time.now - 86_400
 
+          # Snag all orders bought within past 24 hrs
+          oh_buy_twenty_four_arr = []
+          unless oh_buy_ytd_arr.empty?
+            oh_buy_twenty_four_arr = oh_buy_ytd_arr.select do |o|
+              Time.parse(o[:done_at]) >= twenty_four_hrs_ago
+            end
+          end
+          # order_hist_buy_twenty_four = oh_buy_twenty_four_arr.length
+
           # Snag all orders sold within past 24 hrs
           oh_sold_twenty_four_arr = []
           unless oh_sold_ytd_arr.empty?
@@ -323,6 +349,17 @@ module Cryptum
           end
           order_hist_sold_twenty_four = oh_sold_twenty_four_arr.length
 
+          # Calculate 24h gain
+          order_hist_buy_usd_24h = oh_buy_twenty_four_arr.map do |oh|
+            oh[:excuted_value].to_f
+          end.sum
+
+          order_hist_sold_usd_24h = oh_sold_twenty_four_arr.map do |oh|
+            oh[:executed_value].to_f
+          end.sum
+          order_hist_profit_usd_24h = order_hist_sold_usd_24h - order_hist_buy_usd_24h
+          order_hist_profit_usd_24h_out = format('%0.2f', order_hist_profit_usd_24h)
+
           # Snag all session orders sold within past 24 hrs
           ohm_sold_twenty_four_arr = []
           unless oh_meta_sold_arr.empty?
@@ -606,10 +643,9 @@ module Cryptum
             string: ''.ljust(col_just1, ' ')
           )
 
-          tot_header_str = "TOTAL OPEN: #{total_to_sell} TPMD: $TBD | "
+          tot_header_str = "TOTAL OPEN: #{total_to_sell} | "
           tot_header_str += "SOLD 24h: #{order_hist_sold_twenty_four} YTD: #{order_hist_sold_ytd} | "
-          tot_header_str += 'PROF 24h: $TBD Y: $TBD | '
-          tot_header_str += 'AvgRndT DAYS: TBD'
+          tot_header_str += "PROF 24h: $#{order_hist_profit_usd_24h_out} YTD: $#{order_hist_profit_usd_ytd_out}"
           order_execute_win.setpos(
             out_line_no,
             Cryptum::UI.col_center(str: tot_header_str)

data/lib/cryptum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptum
-  VERSION = '0.0.456'
+  VERSION = '0.0.458'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.456
+  version: 0.0.458
 platform: ruby
 authors:
 - 0day Inc.