mercury_banking 0.5.38 → 0.7.0

data/lib/mercury_banking/cli/financials.rb

@@ -1,297 +1,222 @@
+# frozen_string_literal: true
+
 require 'mercury_banking/cli/base'
 require 'mercury_banking/formatters/export_formatter'
-require 'mercury_banking/reports/balance_sheet'
 
 module MercuryBanking
   module CLI
+    # Module for balance check related functionality
+    module BalanceSheetHelper
+      # Get current balances for all Mercury accounts
+      def get_mercury_balances(accounts)
+        mercury_balances = {}
+        accounts.each do |account|
+          # Use the simplified account name for easier matching with ledger accounts
+          account_name = account['name'].gsub(/•+\d+/, '').strip
+          mercury_balances[account_name] = account['currentBalance'].to_f
+        end
+        
+        if options[:verbose]
+          puts "\nMercury account balances:"
+          mercury_balances.each do |name, balance|
+            puts "  #{name}: $#{format('%.2f', balance)}"
+          end
+        end
+        
+        mercury_balances
+      end
+
+      # Display cross-check between Mercury and ledger balances
+      def display_balance_cross_check(mercury_balances, ledger_balances, verbose)
+        puts "\n=== Balance Sheet Cross-Check ==="
+        puts "#{'Mercury Account'.ljust(30)}#{'Mercury Balance'.ljust(15)}#{'Ledger Balance'.ljust(15)}Difference"
+        puts "-" * 75
+
+        total_diff = 0
+        
+        if verbose
+          puts "\nMatching accounts:"
+          puts "Mercury accounts: #{mercury_balances.keys.join(', ')}"
+          puts "Ledger accounts: #{ledger_balances.keys.join(', ')}"
+        end
+        
+        mercury_balances.each do |account_name, mercury_balance|
+          # Find the corresponding ledger account 
+          ledger_account_key = nil
+          ledger_balance = 0
+          
+          # Try different matching strategies
+          if ledger_balances.key?("Assets:Mercury:#{account_name.split.first}")
+            # Direct match with first word (e.g., "Checking" or "Savings")
+            ledger_account_key = "Assets:Mercury:#{account_name.split.first}"
+            ledger_balance = ledger_balances[ledger_account_key]
+          elsif account_name.include?("Checking") && ledger_balances.keys.any? { |k| k.include?("Checking") }
+            # Match by account type
+            ledger_account_key = ledger_balances.keys.find { |k| k.include?("Checking") }
+            ledger_balance = ledger_balances[ledger_account_key]
+          elsif account_name.include?("Savings") && ledger_balances.keys.any? { |k| k.include?("Savings") }
+            # Match by account type
+            ledger_account_key = ledger_balances.keys.find { |k| k.include?("Savings") }
+            ledger_balance = ledger_balances[ledger_account_key]
+          end
+          
+          # Debug information
+          if verbose
+            puts "\nMatching for Mercury account '#{account_name}':"
+            puts "  Found match: #{ledger_account_key || 'None'}"
+            puts "  Mercury balance: $#{format('%.2f', mercury_balance)}"
+            puts "  Ledger balance: $#{format('%.2f', ledger_balance)}"
+          end
+          
+          # Skip zero-balance accounts unless in verbose mode
+          if mercury_balance == 0 && ledger_balance == 0
+            next unless verbose
+          end
+
+          # Calculate difference
+          diff = mercury_balance - ledger_balance
+          total_diff += diff.abs
+
+          # Format for display
+          mercury_balance_str = format("$%.2f", mercury_balance)
+          ledger_balance_str = format("$%.2f", ledger_balance)
+          diff_str = format("$%.2f", diff)
+
+          # Add warning marker for differences
+          diff_marker = diff.abs > 0.01 ? " ⚠️" : ""
+
+          puts account_name.ljust(30) + mercury_balance_str.ljust(15) + ledger_balance_str.ljust(15) + diff_str + diff_marker
+        end
+
+        puts "-" * 75
+        puts "Total Discrepancy: #{format('$%.2f', total_diff)}"
+
+        if total_diff > 0.01
+          puts "\n⚠️ Warning: There are discrepancies between Mercury account balances and the ledger balance sheet."
+          puts "This could be due to:"
+          puts "  - Transactions not yet recorded in the ledger"
+          puts "  - Incorrect categorization of transactions"
+          puts "  - Timing differences between when transactions were recorded"
+        else
+          puts "\n✓ Balance sheet matches Mercury account balances."
+        end
+      end
+    end
+
     # Module for financial report commands
     module Financials
       # Define the financials command class
       class FinancialsCommand < Thor
         include MercuryBanking::CLI::Base
         include MercuryBanking::Formatters::ExportFormatter
-        include MercuryBanking::Reports::BalanceSheet
-        
-        desc "balancesheet", "Generate a balance sheet report and cross-check with Mercury account balances"
+        include MercuryBanking::CLI::BalanceSheetHelper
+
+        desc "balancecheck", "Check that transactions match the bank balance shown in Mercury"
         method_option :format, type: :string, default: 'ledger', desc: 'Accounting format to use (ledger or beancount)'
-        method_option :start, type: :string, default: '2020-01-01', desc: 'Start date for transactions (YYYY-MM-DD)'
-        method_option :end, type: :string, desc: 'End date for transactions (YYYY-MM-DD)'
-        method_option :save_report, type: :string, desc: 'Save report output to specified file'
+        method_option :ledger_file, type: :string, desc: 'Ledger file to check against Mercury balances'
         method_option :verbose, type: :boolean, default: false, desc: 'Show detailed debug information'
-        method_option :ledger_file, type: :string, desc: 'Use an existing ledger file instead of fetching transactions from Mercury'
-        def balancesheet
-          # Call the balance_sheet method directly
-          balance_sheet
-        end
-        
-        # Methods that should not be exposed as commands
-        no_commands do
-          # Implementation of the balance sheet functionality
-          def balance_sheet
-            # If a ledger file is provided, use it directly
-            if options[:ledger_file]
-              ledger_file = options[:ledger_file]
-              format = options[:format]
-              end_date = options[:end]
-              verbose = options[:verbose]
-              
-              puts "Using existing ledger file: #{ledger_file}"
-              
-              if !File.exist?(ledger_file)
-                puts "Error: Ledger file not found at #{ledger_file}"
-                return
-              end
-              
-              # Generate balance sheet from the ledger file
-              case format
-              when 'ledger'
-                balance_sheet_output = generate_ledger_balance_sheet(ledger_file, end_date)
-                if balance_sheet_output
-                  puts "\n=== Balance Sheet ===\n"
-                  puts balance_sheet_output
-                  
-                  # Save report to file if requested
-                  if options[:save_report]
-                    File.write(options[:save_report], balance_sheet_output)
-                    puts "\nReport saved to #{options[:save_report]}"
-                  end
-                else
-                  puts "Failed to generate balance sheet from ledger file."
-                end
-              when 'beancount'
-                balance_sheet_output = generate_beancount_balance_sheet(ledger_file, end_date)
-                if balance_sheet_output
-                  puts "\n=== Balance Sheet ===\n"
-                  puts balance_sheet_output
-                  
-                  # Save report to file if requested
-                  if options[:save_report]
-                    File.write(options[:save_report], balance_sheet_output)
-                    puts "\nReport saved to #{options[:save_report]}"
-                  end
-                else
-                  puts "Failed to generate balance sheet from beancount file."
-                end
-              else
-                puts "Unsupported format: #{format}. Please use 'ledger' or 'beancount'."
-              end
-              
+        def balancecheck
+          with_api_client do |client|
+            accounts = client.accounts
+
+            unless options[:ledger_file] && File.exist?(options[:ledger_file])
+              puts "Error: You must provide a valid ledger file to check. Use --ledger-file option."
               return
             end
+
+            # Get balances from the ledger file
+            ledger_file = options[:ledger_file]
+            format = options[:format] || File.extname(ledger_file).delete('.').downcase
             
-            # Otherwise, fetch data from Mercury API
-            with_api_client do |client|
-              # Get current account balances from Mercury
-              accounts = client.accounts
-              
-              # Create a mapping of account names to balances
-              mercury_balances = {}
-              accounts.each do |account|
-                mercury_balances[account['name']] = account['currentBalance']
-              end
-              
-              # Get all transactions for the balance sheet
-              start_date = options[:start]
-              end_date = options[:end]
-              format = options[:format]
-              verbose = options[:verbose]
-              
-              date_range = "since #{start_date}"
-              date_range += " until #{end_date}" if end_date
-              
-              puts "Fetching transactions for all accounts #{date_range}..."
-              
-              transactions = client.get_all_transactions(start_date)
-              
-              # Filter by end date if specified
-              if end_date
-                end_date_obj = Date.parse(end_date)
-                transactions = transactions.select do |t|
-                  transaction_date = t["postedAt"] ? Date.parse(t["postedAt"]) : Date.parse(t["createdAt"])
-                  transaction_date <= end_date_obj
-                end
-              end
-              
-              if transactions.empty?
-                puts "No transactions found to generate balance sheet."
-                return
-              end
-              
-              # Create a temporary file
-              require 'tempfile'
-              temp_file = Tempfile.new(['mercury_transactions', ".#{format}"])
-              output_file = temp_file.path
-              
-              # Export transactions in the specified format
-              case format
-              when 'ledger'
-                export_to_ledger(transactions, output_file, [], verbose)
-                balance_sheet_output = generate_ledger_balance_sheet(output_file, end_date)
-              when 'beancount'
-                export_to_beancount(transactions, output_file, [], verbose)
-                balance_sheet_output = generate_beancount_balance_sheet(output_file, end_date)
-              else
-                puts "Unsupported format: #{format}. Please use 'ledger' or 'beancount'."
-                temp_file.unlink
-                return
-              end
-              
-              # Parse the balance sheet output to extract account balances
-              ledger_balances = parse_balance_sheet_output(balance_sheet_output, format, verbose)
-              
-              # Cross-check Mercury balances with ledger balances
-              puts "\n=== Balance Sheet Cross-Check ==="
-              puts "Mercury Account".ljust(30) + "Mercury Balance".ljust(15) + "Ledger Balance".ljust(15) + "Difference"
-              puts "-" * 75
-              
-              total_diff = 0
-              mercury_balances.each do |account_name, mercury_balance|
-                # Find the corresponding ledger account (might be prefixed with Assets:)
-                ledger_account_key = ledger_balances.keys.find { |k| k.include?(account_name) }
-                
-                # Debug information
-                if verbose
-                  puts "Looking for Mercury account '#{account_name}' in ledger accounts:"
-                  ledger_balances.keys.each do |k|
-                    puts "  - #{k} (match: #{k.include?(account_name) ? 'Yes' : 'No'})"
-                  end
-                end
-                
-                ledger_balance = ledger_account_key ? ledger_balances[ledger_account_key] : 0
-                
-                # Calculate difference
-                diff = mercury_balance - ledger_balance
-                total_diff += diff.abs
-                
-                # Format for display
-                mercury_balance_str = format("$%.2f", mercury_balance)
-                ledger_balance_str = format("$%.2f", ledger_balance)
-                diff_str = format("$%.2f", diff)
-                
-                # Add warning marker for differences
-                diff_marker = diff.abs > 0.01 ? " ⚠️" : ""
-                
-                puts account_name.ljust(30) + mercury_balance_str.ljust(15) + ledger_balance_str.ljust(15) + diff_str + diff_marker
-              end
-              
-              puts "-" * 75
-              puts "Total Discrepancy: #{format("$%.2f", total_diff)}"
-              
-              if total_diff > 0.01
-                puts "\n⚠️ Warning: There are discrepancies between Mercury account balances and the ledger balance sheet."
-                puts "This could be due to:"
-                puts "  - Transactions not yet recorded in the ledger"
-                puts "  - Incorrect categorization of transactions"
-                puts "  - Timing differences between when transactions were recorded"
-              else
-                puts "\n✓ Balance sheet matches Mercury account balances."
-              end
-              
-              # Save report to file if requested
-              if options[:save_report] && balance_sheet_output
-                full_report = balance_sheet_output + "\n\n" + "=== Balance Sheet Cross-Check ===\n"
-                mercury_balances.each do |account_name, mercury_balance|
-                  ledger_account_key = ledger_balances.keys.find { |k| k.include?(account_name) }
-                  ledger_balance = ledger_account_key ? ledger_balances[ledger_account_key] : 0
-                  diff = mercury_balance - ledger_balance
-                  full_report += "#{account_name}: Mercury $#{format("%.2f", mercury_balance)} vs Ledger $#{format("%.2f", ledger_balance)} (Diff: $#{format("%.2f", diff)})\n"
-                end
-                
-                File.write(options[:save_report], full_report)
-                puts "\nReport saved to #{options[:save_report]}"
-              end
-              
-              # Clean up temporary file
-              temp_file.unlink
+            # Get ledger balances
+            ledger_balances = get_ledger_balances(ledger_file, format)
+            
+            if ledger_balances.empty?
+              puts "No account balances found in the ledger file."
+              return
             end
+
+            # Get current balances for all Mercury accounts
+            mercury_balances = get_mercury_balances(accounts)
+
+            # Display cross-check between Mercury and ledger balances
+            display_balance_cross_check(mercury_balances, ledger_balances, options[:verbose])
           end
         end
-        
-        desc "incomestatement", "Generate an income statement report"
-        method_option :format, type: :string, default: 'ledger', desc: 'Accounting format to use (ledger or beancount)'
-        method_option :start, type: :string, default: '2020-01-01', desc: 'Start date for transactions (YYYY-MM-DD)'
-        method_option :end, type: :string, desc: 'End date for transactions (YYYY-MM-DD)'
-        method_option :save_report, type: :string, desc: 'Save report output to specified file'
-        method_option :verbose, type: :boolean, default: false, desc: 'Show detailed debug information'
-        def incomestatement
-          # Access the parent class to call with_api_client
-          parent_class = self.class.parent_class
-          parent_instance = parent_class.new
-          
-          parent_instance.with_api_client do |client|
-            # Get all transactions for the income statement
-            start_date = options[:start]
-            end_date = options[:end]
-            format = options[:format]
-            verbose = options[:verbose]
-            
-            date_range = "since #{start_date}"
-            date_range += " until #{end_date}" if end_date
+
+        # Methods that should not be exposed as commands
+        no_commands do
+          # Get balances from ledger file
+          def get_ledger_balances(ledger_file, format)
+            ledger_balances = {}
             
-            puts "Fetching transactions for all accounts #{date_range}..."
+            # Get balance sheet output from the ledger file
+            balance_sheet_output = case format
+                                   when 'ledger'
+                                     `ledger -f #{ledger_file} balance Assets:Mercury`
+                                   when 'beancount'
+                                     `bean-report #{ledger_file} balances`
+                                   else
+                                     puts "Unsupported format: #{format}. Please use 'ledger' or 'beancount'."
+                                     return {}
+                                   end
             
-            transactions = client.get_all_transactions(start_date)
+            puts "Raw ledger output:" if options[:verbose]
+            puts balance_sheet_output if options[:verbose]
             
-            # Filter by end date if specified
-            if end_date
-              end_date_obj = Date.parse(end_date)
-              transactions = transactions.select do |t|
-                transaction_date = t["postedAt"] ? Date.parse(t["postedAt"]) : Date.parse(t["createdAt"])
-                transaction_date <= end_date_obj
+            # Directly parse the specific format we know ledger outputs
+            balance_sheet_output.each_line do |line|
+              line = line.strip
+              # Skip empty lines
+              next if line.empty?
+              
+              # Split the line on whitespace but preserve the account path
+              parts = line.split(/\s+/, 2) # Split on first whitespace
+              if parts.length == 2
+                amount_part = parts[0]
+                account_part = parts[1]
+                
+                # Parse amount - remove $ and , characters
+                amount = amount_part.gsub(/[$,]/, '').to_f
+                
+                # Store in the hash
+                ledger_balances[account_part] = amount
+                
+                puts "Matched: #{account_part} = $#{amount}" if options[:verbose]
               end
             end
             
-            # Create a temporary file
-            require 'tempfile'
-            temp_file = Tempfile.new(['mercury_transactions', ".#{format}"])
-            output_file = temp_file.path
-            
-            # Export transactions in the specified format
-            case format
-            when 'ledger'
-              parent_instance.export_to_ledger(transactions, output_file, [], verbose)
-              income_statement_output = parent_instance.generate_ledger_reports(output_file, 'income', nil, end_date)
-            when 'beancount'
-              parent_instance.export_to_beancount(transactions, output_file, [], verbose)
-              income_statement_output = parent_instance.generate_beancount_reports(output_file, 'income', nil, end_date)
-            else
-              puts "Unsupported format: #{format}. Please use 'ledger' or 'beancount'."
-              temp_file.unlink
-              return
-            end
-            
-            # Display the income statement
-            puts income_statement_output
-            
-            # Save the report to a file if requested
-            if options[:save_report]
-              File.open(options[:save_report], 'w') do |file|
-                file.puts income_statement_output
+            if options[:verbose]
+              puts "Parsed ledger balances:"
+              if ledger_balances.empty?
+                puts "  No account balances found in the ledger file."
+              else
+                ledger_balances.each do |account, amount|
+                  puts "  #{account}: $#{format('%.2f', amount)}"
+                end
               end
-              puts "\nReport saved to #{options[:save_report]}"
             end
             
-            # Clean up the temporary file
-            temp_file.unlink
+            ledger_balances
           end
         end
-        
+
         # Store reference to parent class
         class << self
           attr_accessor :parent_class
         end
       end
-      
+
       # Add financial report commands to the CLI class
       def self.included(base)
         base.class_eval do
           # Register the financials command
           desc "financials SUBCOMMAND", "Financial reporting commands"
           subcommand "financials", FinancialsCommand
-          
+
           # Set the parent class for the subcommand
           FinancialsCommand.parent_class = base
-          
+
           # Remove the old methods with underscores if they exist
           remove_method :financials_balancesheet if method_defined?(:financials_balancesheet)
           remove_method :financials_incomestatement if method_defined?(:financials_incomestatement)
@@ -299,4 +224,4 @@ module MercuryBanking
       end
     end
   end
-end 
+end