lucasalary 0.1.24 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f2002c8bc5ec17d605422ee282c0b7cb6053f88aa2fa3dce308e9dbbbdc5c5
-  data.tar.gz: e993bd468b91510ad9dc68e55b58c54be562b0dcb76f9a757d4f88b6392d860d
+  metadata.gz: 21cf8c51a5487b6c97376fe3ce9093dca20a7dc00943101f023ddf883bb20bf3
+  data.tar.gz: 427756bed92e1878f48763decf1924a475e3f70163f0a68fd48efd767c224a8b
 SHA512:
-  metadata.gz: 3847524b19036ca598ae119613fd49a9983ce54cdcd37f233b02fead3c636de0f4dfb2c5f80c459c1bc9d8eda82aa8ac22ddc12326fbbcb3cc13e21f9b159804
-  data.tar.gz: 15758df4fb112cf71614d11315a6477ebc5506a9176c4c29867dfc7776ea549d7a15ffe38ca1b3edab2c7993c09ae3d89ef82ef0fea01fde89538854ae4a984c
+  metadata.gz: 12943976db746cb20edb83d007efdd94a4ed69f11f05dd5fc3970e778955c199a1c713223e16106df5e58deea659e91630525144d40215f9aa731750147bd4c5
+  data.tar.gz: de251e1584866528cecde0dc2c76fd5da91c344622cb63f3d281fb9516a75958d2d5d1ab2ee7770c97452572c6847c1064cc5febc0be7f81f7dc55691fac72b8

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## LucaSalary 0.1.27
+
+* Implement LucaSalary::Total for Year totaling.
+
+## LucaSalary 0.1.26
+
+* Add `luca-salary payments report`: monthly statement by code.
+
+## LucaSalary 0.1.25
+
+* Add `luca-salary payments total --adjust`: applying yearly tax refund.
+
 ## LucaSalary 0.1.24
 
 * Fix: remove null record from `luca-salary export` JSON

data/exe/luca-salary

@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 # frozen_string_literal: true
 
+require 'json'
 require 'optparse'
 require 'luca_salary'
 require 'luca_salary/monthly'
@@ -40,8 +41,27 @@ module LucaCmd
       end
     end
 
-    def self.total(args = nil, _params = nil)
-      LucaSalary::Payment.year_total(args.first.to_i)
+    def self.report(args = nil, params = nil)
+        render(LucaSalary::State.range(*args).report(), params)
+    end
+
+    def self.total(args = nil, params = nil)
+      if params['mode'] == 'adjust'
+        LucaSalary::Payment.year_adjust(args[0].to_i, args[1].to_i)
+      else
+        LucaSalary::Payment.year_total(args.first.to_i)
+      end
+    end
+
+    def self.render(dat, params)
+      case params[:output]
+      when 'json'
+        puts JSON.dump(dat)
+      when 'nu'
+        LucaSupport::View.nushell(YAML.dump(dat))
+      else
+        puts YAML.dump(dat)
+      end
     end
   end
 end
@@ -84,11 +104,19 @@ when /payments?/
       args = opt.parse(ARGV)
       LucaCmd::Payment.list(args, params)
     end
+  when 'report'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-salary payments report [--nu] year month [year month]'
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      args = opt.parse(ARGV)
+      LucaCmd::Payment.report(args, params)
+    end
   when 'total'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-salary payments total year'
+      opt.banner = 'Usage: luca-salary payments total [--adjust] year [month]'
+      opt.on('--adjust', 'Apply year total adjustment to payslip of year/month') { |_v| params['mode'] = 'adjust' }
       args = opt.parse(ARGV)
-      LucaCmd::Payment.total(args)
+      LucaCmd::Payment.total(args, params)
     end
   else
     puts 'Proper subcommand needed.'

data/lib/luca_salary/accumulator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module LucaSalary
+  module Accumulator
+    def self.included(klass) #:nodoc:
+      klass.extend ClassMethods
+    end
+
+    module ClassMethods
+      def accumulate(records)
+        count = 0
+        result = records.each_with_object({}) do |record, result|
+          count += 1
+          record
+            .select { |k, _v| /^[1-4][0-9A-Fa-f]{,3}$/.match(k) }
+            .each do |k, v|
+            next if v.nil?
+
+            result[k] = result[k] ? result[k] + v : v
+          end
+        end
+        [result, count]
+      end
+    end
+  end
+end

data/lib/luca_salary/base.rb

@@ -45,7 +45,9 @@ module LucaSalary
 
     def self.sum_code(obj, code, exclude = nil)
       target = obj.select { |k, _v| /^#{code}[0-9A-Fa-f]{,3}$/.match(k) }
-      target = target.reject { |k, _v| exclude.include?(k) } if exclude
+      target = target
+                 .reject { |_k, v| v.nil? }
+                 .reject { |k, _v| exclude&.include?(k) }
       target.values.inject(:+) || 0
     end
 

data/lib/luca_salary/payment.rb

@@ -9,6 +9,8 @@ require 'luca_record'
 
 module LucaSalary
   class Payment < LucaRecord::Base
+    include Accumulator
+
     @dirname = 'payments'
 
     def initialize(date = nil)
@@ -47,21 +49,9 @@ module LucaSalary
     def self.year_total(year)
       Profile.all do |profile|
         id = profile.dig('id')
-        payment = { 'profile_id' => id }
-        # payment = {}
-        (1..12).each do |month|
-          search(year, month, nil, id).each do |origin|
-            # TODO: to be updated null check
-            if origin == {}
-              month
-            else
-              origin.select { |k, _v| /^[1-4][0-9A-Fa-f]{,3}$/.match(k) }.each do |k, v|
-                payment[k] = payment[k] ? payment[k] + v : v
-              end
-              nil
-            end
-          end
-        end
+        slips = term(year, 1, year, 12, id)
+        payment, _count = accumulate(slips)
+        payment['profile_id'] = id
         date = Date.new(year, 12, 31)
         payment = local_convert(payment, date)
         create(payment, date: date, codes: [id], basedir: 'payments/total')
@@ -78,6 +68,31 @@ module LucaSalary
       return payment
     end
 
+    # Apply adjustment for yearly refund.
+    # Search Year Total records 6 months before specified payslip month.
+    #
+    def self.year_adjust(year, month)
+      target_month = Date.new(year, month, 1)
+      total_st = target_month.prev_month(6)
+      search(year, month).each do |slip, path|
+        term(total_st.year, total_st.month, year, month, slip['profile_id'], "#{@dirname}/total/") do |total|
+          slip['3A1'] = total['3A1']
+          slip['4A1'] = total['4A1']
+        end
+        # Recalculate sum
+        ['3', '4'].each do |key|
+          slip[key] = 0
+          slip[key] = LucaSalary::Base.sum_code(slip, key)
+          slip['5'] = slip['1'] - slip['2'] - slip['3'] + slip['4']
+        end
+        update_record(
+          @dirname,
+          path,
+          YAML.dump(LucaSupport::Code.readable(slip.sort.to_h))
+        )
+      end
+    end
+
     # Export json for LucaBook.
     # Accrual_date can be change with `payment_term` on config.yml. Default value is 0.
     # `payment_term: 1` means payment on the next month of calculation target.

data/lib/luca_salary/state.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'luca_support'
+require 'luca_record'
+
+module LucaSalary
+  class State < LucaRecord::Base
+    include Accumulator
+
+    @dirname = 'payments'
+
+    def initialize(data, count = nil, start_d: nil, end_d: nil)
+      @monthly = data
+      @count = count
+      @start_date = start_d
+      @end_date = end_d
+      @dict = LucaRecord::Dict.load_tsv_dict(Pathname(LucaSupport::PJDIR) / 'dict' / 'code.tsv')
+    end
+
+    def self.range(from_year, from_month, to_year = from_year, to_month = from_month)
+      date = Date.new(from_year.to_i, from_month.to_i, -1)
+      last_date = Date.new(to_year.to_i, to_month.to_i, -1)
+      raise 'invalid term specified' if date > last_date
+
+      counts = []
+      reports = [].tap do |r|
+        while date <= last_date do
+          slips = term(date.year, date.month, date.year, date.month)
+          record, count = accumulate(slips)
+          r << record.tap { |c| c['_d'] = date.to_s }
+          counts << count
+          date = Date.new(date.next_month.year, date.next_month.month, -1)
+        end
+      end
+      new(reports, counts,
+          start_d: Date.new(from_year.to_i, from_month.to_i, 1),
+          end_d: Date.new(to_year.to_i, to_month.to_i, -1)
+         )
+    end
+
+    def report()
+      total, _count = LucaSalary::State.accumulate(@monthly)
+      total['_d'] = 'total'
+      [@monthly, total].flatten.map do |m|
+        {}.tap do |r|
+          m.sort.to_h.each do |k, v|
+            r["#{@dict.dig(k, :label) || k}"] = readable(v)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/luca_salary/total.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'luca_support'
+require 'luca_record'
+
+module LucaSalary
+  class Total < LucaRecord::Base
+    @dirname = 'payments/total'
+
+    attr_reader :slips
+
+    def initialize(year)
+      @date = Date.new(year.to_i, 12, -1)
+      @slips = Total.term(year, 1, year, 12).map do |slip, _path|
+        slip['profile'] = parse_current(Profile.find_secure(slip['profile_id']))
+        slip
+      end
+      @dict = LucaRecord::Dict.load_tsv_dict(Pathname(LucaSupport::PJDIR) / 'dict' / 'code.tsv')
+    end
+  end
+end

data/lib/luca_salary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaSalary
-  VERSION = '0.1.24'
+  VERSION = '0.1.27'
 end

data/lib/luca_salary.rb

@@ -4,7 +4,10 @@ require 'luca_record'
 require 'luca_salary/version'
 
 module LucaSalary
+  autoload :Accumulator, 'luca_salary/accumulator'
   autoload :Base, 'luca_salary/base'
   autoload :Payment, 'luca_salary/payment'
   autoload :Profile, 'luca_salary/profile'
+  autoload :State, 'luca_salary/state'
+  autoload :Total, 'luca_salary/total'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucasalary
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.27
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -81,10 +81,13 @@ files:
 - README.md
 - exe/luca-salary
 - lib/luca_salary.rb
+- lib/luca_salary/accumulator.rb
 - lib/luca_salary/base.rb
 - lib/luca_salary/monthly.rb
 - lib/luca_salary/payment.rb
 - lib/luca_salary/profile.rb
+- lib/luca_salary/state.rb
+- lib/luca_salary/total.rb
 - lib/luca_salary/version.rb
 homepage: https://github.com/chumaltd/luca/tree/master/lucasalary
 licenses:
@@ -108,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Salary calculation framework