moved logic to calculation

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-08-30 13:55:21 +0200 using RuboCop version 0.46.0.
+# on 2017-09-14 13:32:45 +0200 using RuboCop version 0.46.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -18,7 +18,7 @@ Metrics/BlockLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 207
+  Max: 208
 
 # Offense count: 2
 Metrics/CyclomaticComplexity:

lib/bill_recognizer.rb

@@ -242,6 +242,7 @@ def calculate_attributes(version)
   end
 
   def calculate_amounts
+    PriceCalculation.remove_false_positives
     amounts = []
     prices = PriceCalculation.new
     return amounts if prices.net_amount.nil?

lib/calculations/price_calculation.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 require 'bigdecimal'
+require_relative '../models/dimensionable'
 
 class PriceCalculation
+  include Dimensionable
   def net_amount
     return nil if PriceTerm.empty?
     calculate unless @net_amount
@@ -14,6 +16,27 @@ def vat_amount
     @vat_amount * 100
   end
 
+  def self.remove_false_positives
+    remove_quantities
+    remove_dates
+  end
+
+  def self.remove_quantities
+    %w(Menge Anz.).each do |quantity_text|
+      quantity = Word.first(text: quantity_text)
+      next unless quantity
+      PriceTerm.each do |term|
+        term.destroy if in_same_column(quantity, term)
+      end
+    end
+  end
+
+  def self.remove_dates
+    PriceTerm.each do |term|
+      term.destroy if Word.two_words_after_matches?(term, /\./, /^\d{2}$/)
+    end
+  end
+
   private
 
   def calculate

lib/detectors/price_detector.rb

@@ -34,8 +34,6 @@ def self.filter_out_dates
 
   def self.filter
     find_prices(DECIMAL_PRICE_REGEX, max_words: 3)
-    filter_out_quantity_column
-    filter_out_dates
 
     end_word_with_space = ->(term) { term.text += ' ' }
     unless Word.where(text: CurrencyDetector::HUF_SYMBOLS).empty?

spec/calculations/price_calculation_spec.rb

@@ -308,6 +308,203 @@
     expect(prices.vat_amount).to eq BigDecimal('0')
   end
 
+  it 'removes detected pieces as prices' do
+    # From 29pwjsKx88nhnQKm9.pdf
+    # Dummy dimension values for the bill
+    BillDimension.create_image_dimensions(width: 3056, height: 4324)
+
+    create(
+      :word,
+      text: 'Menge',
+      left: 0.5791884816753927,
+      right: 0.6292539267015707,
+      top: 0.42298797409805733,
+      bottom: 0.4338575393154487
+    )
+
+    PriceTerm.create(
+      text: '1,00',
+      left: 0.5978403141361257,
+      right: 0.6243455497382199,
+      top: 0.4551341350601295,
+      bottom: 0.4641535615171138
+    )
+
+    PriceTerm.create(
+      text: '8,50',
+      left: 0.6861910994764397,
+      right: 0.7143324607329843,
+      top: 0.4551341350601295,
+      bottom: 0.4641535615171138
+    )
+
+    PriceTerm.create(
+      text: '2,00',
+      left: 0.5965314136125655,
+      right: 0.6243455497382199,
+      top: 0.48149861239592967,
+      bottom: 0.49051803885291395
+    )
+
+    PriceTerm.create(
+      text: '12,00',
+      left: 0.8900523560209425,
+      right: 0.925392670157068,
+      top: 0.48149861239592967,
+      bottom: 0.49051803885291395
+    )
+
+    PriceTerm.create(
+      text: '1,00',
+      left: 0.5978403141361257,
+      right: 0.6243455497382199,
+      top: 0.5212765957446809,
+      bottom: 0.5302960222016652
+    )
+
+    PriceTerm.create(
+      text: '4,00',
+      left: 0.6858638743455497,
+      right: 0.7143324607329843,
+      top: 0.5212765957446809,
+      bottom: 0.5302960222016652
+    )
+
+    PriceCalculation.remove_false_positives
+    expect(price_strings).to eq ['8,50', '12,00', '4,00']
+  end
+
+  it 'removes numbers below Anz.' do
+    # From ihfDXTa64yYbFLa6Y.pdf
+    # Dummy dimension values for the bill
+    BillDimension.create_image_dimensions(width: 3056, height: 4324)
+
+    create(
+      :word,
+      text: 'Anz.',
+      left: 0.1197252208047105,
+      right: 0.1573438011122015,
+      top: 0.475937066173068,
+      bottom: 0.4854234150856085
+    )
+
+    PriceTerm.create(
+      text: '32,00',
+      left: 0.1122015047432123,
+      right: 0.1573438011122015,
+      top: 0.5016196205460435,
+      bottom: 0.512494215640907
+    )
+
+    PriceCalculation.remove_false_positives
+    expect(price_strings).to be_empty
+  end
+
+  it 'deletes prices which are not in part of a quantity' do
+    # From rDxLnivxoXQw9nWa7.pdf
+    # Dummy dimension values for the bill
+    BillDimension.create_image_dimensions(width: 3056, height: 4324)
+
+    create(
+      :word,
+      text: 'Menge',
+      left: 0.5785340314136126,
+      right: 0.6285994764397905,
+      top: 0.4225254394079556,
+      bottom: 0.4333950046253469
+    )
+
+    PriceTerm.create(
+      text: '1,00',
+      left: 0.5971858638743456,
+      right: 0.6236910994764397,
+      top: 0.5074005550416282,
+      bottom: 0.5164199814986123
+    )
+
+    PriceTerm.create(
+      text: '1,00',
+      left: 0.5971858638743456,
+      right: 0.6236910994764397,
+      top: 0.5208140610545791,
+      bottom: 0.5298334875115633
+    )
+
+    PriceTerm.create(
+      text: '5,00',
+      left: 0.6855366492146597,
+      right: 0.7136780104712042,
+      top: 0.5208140610545791,
+      bottom: 0.5298334875115633
+    )
+
+    PriceTerm.create(
+      text: '431,25',
+      left: 0.09325916230366492,
+      right: 0.1387434554973822,
+      top: 0.8237742830712304,
+      bottom: 0.8327937095282146
+    )
+
+    PriceTerm.create(
+      text: '86,25',
+      left: 0.21171465968586387,
+      right: 0.24803664921465968,
+      top: 0.8237742830712304,
+      bottom: 0.8327937095282146
+    )
+
+    PriceTerm.create(
+      text: '517,50',
+      left: 0.837696335078534,
+      right: 0.8828534031413613,
+      top: 0.8237742830712304,
+      bottom: 0.8327937095282146
+    )
+
+    PriceCalculation.remove_false_positives
+    expect(price_strings).to eq ['5,00', '431,25', '86,25', '517,50']
+  end
+
+  it 'deletes detected date as price' do
+    # From C5sri9hxpbDhha68D.png
+    # Dummy dimension values for the bill
+    BillDimension.create_image_dimensions(width: 3056, height: 4324)
+
+    PriceTerm.create(
+      text: '10.05',
+      left: 0.521978021978022,
+      right: 0.6131868131868132,
+      top: 0.724,
+      bottom: 0.737
+    )
+
+    create(
+      :word,
+      text: '.',
+      left: 0.6230769230769231,
+      right: 0.6263736263736264,
+      top: 0.735,
+      bottom: 0.737
+    )
+
+    create(
+      :word,
+      text: '17',
+      left: 0.6373626373626373,
+      right: 0.6703296703296703,
+      top: 0.724,
+      bottom: 0.7375
+    )
+
+    PriceCalculation.remove_false_positives
+    expect(price_strings).to be_empty
+  end
+
+  def price_strings
+    PriceTerm.map(&:to_s)
+  end
+
   def word(attributes = {})
     double(:word,
            text: attributes[:text],