luca-jp 0.20.6 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd6af4ff40f3d2562f04f71b59e02c944fec0fbc66dc18ae72d868bda2c5b82
-  data.tar.gz: 42f779967ee6e22db9a488bebdfa1c123e8c1738532f78e3ed5201916d92ca8a
+  metadata.gz: 9b7d7394cf2864fb65e6b575cb233dbac9939ccaff36fcf27c78bc9feb1e6da7
+  data.tar.gz: 67663785b91e181476b8fa12209ba8bdd0cddae11916e58b7695729cf05c3ecd
 SHA512:
-  metadata.gz: 9b7f6ceb960f5dee8eea66435f631567123e7d98757fbb07f607b20fea1725516a87f054f1f48e7173b7fe4d343c644d51f0b5b11904ee681db7cde43e80a9be
-  data.tar.gz: 1e4929bef66fc8459ce622c75c590e49d1fdc5a96ac7d4d3e63543ba1971490f69bfd1fc62c469da03111a4973561579a11a76683f055c0b1ef749ce3e4fc9f8
+  metadata.gz: eccbca739cb53247f7e984ea6a84a87ec74cbf8796c0347dd763c8e61a83bd12bc3290968fae0d45a9e8633301e9f54057308dd0e1877c2190e467db11b64f47
+  data.tar.gz: 18e49a30a3a67b9fb2896a13d3f62fa75320c6f64a12654894f6f22ead17a13d1c9338c0902c92bd7370e2b648ed364292e28e220fe571c54058a47131dc4c26

data/exe/luca-jp

@@ -145,7 +145,7 @@ when 'k', 'kyuyo', 'salary'
   end
 when 'n', /nenmats?u/, /nenmats?u-?chou?sei/
   OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-jp nenmatsu <zip-file-path> <profile id>'
+    opt.banner = 'Usage: luca-jp nenmatsu <import-path> [profile id]'
     args = opt.parse(ARGV)
     LucaCmd.check_dir('profiles', ext_conf: EXT_CONF) do
       LucaSalaryCmd::Import.profiles(args, params)

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.20.6'
+    VERSION = '0.21.0'
   end
 end

data/lib/luca_salary/jp_adjustment.rb

@@ -1,38 +1,98 @@
 # frozen_string_literal: true
+require 'fileutils'
 require 'luca_salary'
 require 'luca_support/const'
 require 'luca/jp/util'
-require 'zip'
-
 require 'rexml/document'
+require 'zip'
 
 module LucaSalary
   class JpAdjustment < LucaSalary::Profile
 
     def self.import(path, id = nil, params = nil)
-      s_profile = profiles(id)
-      bulk_load(path).each do |o|
-        s_profile['spouse']['name'] ||= o['spouse']['name']
-        s_profile['spouse']['katakana'] ||= o['spouse']['kana']
-        s_profile['spouse']['income'].merge!(o['spouse']['income'])
-        if ! s_profile['family'].empty? || ! o['family'].empty?
-          s_profile['family'] = merge_family(s_profile['family'].concat(o['family']))
+      tax_ids, names, s_profiles = create_index
+      bulk_load(path).each do |o, path|
+        s_profile = if id
+                      find_profile(id).tap do |p|
+                        if p.nil?
+                          FileUtils.mkdir_p(path.parent / 'rejected')
+                          FileUtils.move(path, path.parent / 'rejected')
+                          raise "No entries found for ID: #{id}. abort..."
+                        end
+                      end
+                    else
+                      id = search_id(o, tax_ids, names)
+                      if id.nil?
+                        STDERR.puts "#{o['name']} record not found. skip..."
+                        FileUtils.mkdir_p(path.parent / 'rejected')
+                        FileUtils.move(path, path.parent / 'rejected')
+                        next
+                      end
+                      s_profiles[id]
+                    end
+        s_profile = update_profile(s_profile, o)
+        save(s_profile, 's_profiles')
+      end
+    end
+
+    def self.create_index
+      tax_ids = {}
+      names = {}
+      profiles = {}
+      all('profiles').each do |p|
+        profile = find_secure(p['id'], 'profiles')
+        if profile['tax_id']
+          tax_ids[profile['tax_id'].to_s] = p['id']
         end
+        key = [profile['name'].gsub("　", "").strip, profile['birth_date'].to_s]
+        names[key] = p['id']
+        s_profile = find(p['id'], 's_profiles')
+        profiles[profile['id']] = s_profile
       end
-      save(s_profile, 's_profiles')
+      [tax_ids, names, profiles]
     end
 
-    def self.profiles(id = nil)
-      if id
-        list = id_completion(id, basedir: 's_profiles')
-        id = if list.length > 1
-               raise "#{list.length} entries found for ID: #{id}. abort..."
-             else
-               list.first
-             end
-        #merged = find_secure(id, 'profiles') # NOTE for content match by name, birth_date
-        find(id, 's_profiles')
+    def self.find_profile(id_fragment)
+      list = id_completion(id_fragment, basedir: 's_profiles')
+      if list.length > 1
+        STDERR.puts "#{list.length} entries found for ID: #{id_fragment}. abort..."
+        return nil
       end
+
+      id = list.first
+      find(id, 's_profiles')
+    end
+
+    def self.update_profile(previous, imported)
+      previous['tax_id'] ||= imported['tax_id']
+        previous['name'] ||= imported['name']
+        previous['katakana'] ||= imported['kana']
+        previous['birth_date'] ||= imported['birth_date']
+
+        if imported['spouse'] && !imported['spouse'].empty?
+          if same_person?(previous['spouse'], imported['spouse'])
+            # NOTE imported['spouse']をベースにし、incomeだけマージ
+            income = (previous['spouse']['income'] || {}).merge(imported['spouse']['income'])
+            previous['spouse'] = imported['spouse']
+            previous['spouse']['income'] = income
+          else
+            previous['spouse'] = imported['spouse']
+          end
+        end
+
+        if !imported['family'].empty?
+          previous['family'] = imported['family'].map do |latest|
+            registered = previous['family'].find { |m| same_person?(m, latest) }
+            if registered
+              ['income', 'elderly', 'tokutei', 'nonresident', 'handicapped'].each do |k|
+                latest[k] = registered[k].merge(new_member[k]) if registered[k] && new_member[k]
+                latest[k] ||= registered[k]
+              end
+            end
+            latest
+          end
+        end
+      previous
     end
 
     # XMLタグ定義: https://www.nta.go.jp/users/gensen/oshirase/0019004-159.htm
@@ -40,8 +100,18 @@ module LucaSalary
     TAGS = {
       'NTAAPP001' => {
         year: 'xml001_B00020',
+        id: 'xml001_B00170',     # マイナンバー
+        kana: 'xml001_B00150',   # フリガナ
+        name: 'xml001_B00160',   # 氏名
+        birth_date: {
+          root: 'xml001_B00230', # 生年月日
+          year: 'xml001_B00240', # 西暦
+          month: 'xml001_B00270', # 月
+          day: 'xml001_B00280'   # 日
+        },
         family: {
           root: 'xml001_D00000',   # 扶養親族情報繰り返し
+          id: 'xml001_D00040',     # マイナンバー
           kana: 'xml001_D00020',   # フリガナ
           name: 'xml001_D00030',   # 氏名
           birth_date: {
@@ -64,6 +134,7 @@ module LucaSalary
         year: 'xml004_B00020',
         spouse: {
           root: 'xml004_D00000',
+          id: 'xml004_D00030',     # マイナンバー
           kana: 'xml004_D00010',   # フリガナ
           name: 'xml004_D00020',   # 氏名
           income: 'xml004_D00260', # 配偶者の本年中の合計所得金額の見積額
@@ -74,7 +145,7 @@ module LucaSalary
     }
 
     def self.parse_xml(xml_set)
-      h = { 'spouse' => { 'income' => {} }, 'family' => [] }
+      h = { 'spouse' => {}, 'family' => [] }
       xml_set.each do |xml|
         # ルート要素の属性から様式IDを取得
         form_id = xml.root.name
@@ -84,89 +155,143 @@ module LucaSalary
         year_node = xml.elements["//#{tags[:year]}"]
         year = year_node&.text&.to_i
 
-        # NTAAPP001: 扶養控除等申告書
         if form_id == 'NTAAPP001'
-          xml.elements.each("//#{tags[:family][:root]}") do |dep|
-            f = {}
-            f['name'] = dep.elements[tags[:family][:name]]&.text
-            f['kana'] = dep.elements[tags[:family][:kana]]&.text
-
-            bd_tags = tags[:family][:birth_date]
-            bd_node = dep.elements[bd_tags[:root]]
-            if bd_node
-              y = bd_node.elements[bd_tags[:year]]&.text
-              m = bd_node.elements[bd_tags[:month]]&.text
-              d = bd_node.elements[bd_tags[:day]]&.text
-              if y && m && d
-                f['birth_date'] = Date.new(y.to_i, m.to_i, d.to_i)
-              end
+          tags = TAGS[form_id]
+          h['tax_id'] ||= xml.elements["//#{tags[:id]}"]&.text
+          h['name'] ||= xml.elements["//#{tags[:name]}"]&.text
+          h['kana'] ||= xml.elements["//#{tags[:kana]}"]&.text
+          bd_tags = tags[:birth_date]
+          bd_node = xml.elements["//#{bd_tags[:root]}"]
+          if bd_node
+            y = bd_node.elements[bd_tags[:year]]&.text
+            m = bd_node.elements[bd_tags[:month]]&.text
+            d = bd_node.elements[bd_tags[:day]]&.text
+            if y && m && d
+              h['birth_date'] = Date.new(y.to_i, m.to_i, d.to_i)
             end
+          end
+          h['family'] << parse_family(xml, year)
+        end
 
-            if year
-              dep_income = dep.elements[tags[:family][:income]]&.text
-              if dep_income && !dep_income.empty?
-                f['income'] = { year => dep_income.to_i }
-              end
+        if form_id == 'NTAAPP004' && year
+          h['spouse'] = parse_spouse(xml, year)
+        end
+      end
 
-              elderly = dep.elements[tags[:family][:elderly]]&.text
-              if elderly && (elderly == '1' || elderly == '2')
-                f['elderly'] = { year => elderly.to_i }
-              end
+      h['family'] = merge_family(h['family']) # 翌年の扶養控除等申告書との重複
+      h
+    end
 
-              tokutei = dep.elements[tags[:family][:tokutei]]&.text
-              if tokutei && (tokutei == '1' || tokutei == '2')
-                f['tokutei'] = { year => tokutei.to_i }
-              end
+    def self.search_id(query, tax_ids, names)
+      id = tax_ids[query['tax_id']] if query['tax_id']
+      return id if id
 
-              nonresident = dep.elements[tags[:family][:nonresident]]&.text
-              f['nonresident'] = { year => nonresident.to_i } if nonresident == '1'
+      key = [query['name'].gsub("　", "").strip, query['birth_date'].to_s]
+      names[key]
+    end
 
-              hc_tags = tags[:family][:handicapped]
-              hc_node = dep.elements[hc_tags[:root]]
-              if hc_node
-                hc_type = hc_node.elements[hc_tags[:type]]&.text
-                if hc_type && !hc_type.empty? && hc_type != '0'
-                  f['handicapped'] = { year => hc_type.to_i }
-                end
-              end
-            end
+    def self.same_person?(p1, p2)
+      return false if p1.nil? || p2.nil? || p1.empty? || p2.empty?
+
+      if p1['tax_id'] && p2['tax_id']
+        return p1['tax_id'].to_s == p2['tax_id'].to_s
+      end
+
+      n1 = p1['name'].to_s.gsub('　', '').strip
+      n2 = p2['name'].to_s.gsub('　', '').strip
+      bd1 = p1['birth_date'].to_s
+      bd2 = p2['birth_date'].to_s
+
+      n1 == n2 && bd1 == bd2
+    end
+
+    # NTAAPP004: 配偶者控除等申告書
+    def self.parse_spouse(xml, year)
+      tags = TAGS['NTAAPP004']
+      spouse = xml.elements["//#{tags[:spouse][:root]}"]
+      return {} if ! spouse
+
+      { 'income' => {} }.tap do |h|
+        h['tax_id'] = spouse.elements[tags[:spouse][:id]]&.text
+        h['name'] = spouse.elements[tags[:spouse][:name]]&.text
+        h['kana'] = spouse.elements[tags[:spouse][:kana]]&.text
+
+        nonresident = spouse.elements[tags[:spouse][:nonresident]]&.text
+        if nonresident == '1'
+          h['nonresident'] = {} unless h['nonresident']
+          h['nonresident'][year] = nonresident.to_i
+        end
+
+        income = spouse.elements[tags[:spouse][:income]]&.text
+        h['income'][year] = income.to_i if income && !income.empty?
 
-            h['family'] << f
+        elderly = spouse.elements[tags[:spouse][:elderly]]&.text
+        h['elderly'] = '1' if elderly == '1'
+      end
+    end
+
+    # NTAAPP001: 扶養控除等申告書
+    def self.parse_family(xml, year)
+      tags = TAGS['NTAAPP001']
+      h = []
+      xml.elements.each("//#{tags[:family][:root]}") do |dep|
+        f = {}
+        f['tax_id'] = dep.elements[tags[:family][:id]]&.text
+        f['name'] = dep.elements[tags[:family][:name]]&.text
+        f['kana'] = dep.elements[tags[:family][:kana]]&.text
+
+        bd_tags = tags[:family][:birth_date]
+        bd_node = dep.elements[bd_tags[:root]]
+        if bd_node
+          y = bd_node.elements[bd_tags[:year]]&.text
+          m = bd_node.elements[bd_tags[:month]]&.text
+          d = bd_node.elements[bd_tags[:day]]&.text
+          if y && m && d
+            f['birth_date'] = Date.new(y.to_i, m.to_i, d.to_i)
           end
         end
 
-        # NTAAPP004: 配偶者控除等申告書
-        if form_id == 'NTAAPP004'
-          if year
-            spouse = xml.elements["//#{tags[:spouse][:root]}"]
-            if spouse
-              h['spouse']['name'] = spouse.elements[tags[:spouse][:name]]&.text
-              h['spouse']['kana'] = spouse.elements[tags[:spouse][:kana]]&.text
-
-              nonresident = spouse.elements[tags[:spouse][:nonresident]]&.text
-              if nonresident == '1'
-                h['spouse']['nonresident'] = {} unless h['spouse']['nonresident']
-                h['spouse']['nonresident'][year] = nonresident.to_i
-              end
+        if year
+          dep_income = dep.elements[tags[:family][:income]]&.text
+          if dep_income && !dep_income.empty?
+            f['income'] = { year => dep_income.to_i }
+          end
+
+          elderly = dep.elements[tags[:family][:elderly]]&.text
+          if elderly && (elderly == '1' || elderly == '2')
+            f['elderly'] = { year => elderly.to_i }
+          end
+
+          tokutei = dep.elements[tags[:family][:tokutei]]&.text
+          if tokutei && (tokutei == '1' || tokutei == '2')
+            f['tokutei'] = { year => tokutei.to_i }
+          end
 
-              income = spouse.elements[tags[:spouse][:income]]&.text
-              h['spouse']['income'][year] = income.to_i if income && !income.empty?
+          nonresident = dep.elements[tags[:family][:nonresident]]&.text
+          f['nonresident'] = { year => nonresident.to_i } if nonresident == '1'
 
-              elderly = spouse.elements[tags[:spouse][:elderly]]&.text
-              h['spouse']['elderly'] = '1' if elderly == '1'
+          hc_tags = tags[:family][:handicapped]
+          hc_node = dep.elements[hc_tags[:root]]
+          if hc_node
+            hc_type = hc_node.elements[hc_tags[:type]]&.text
+            if hc_type && !hc_type.empty? && hc_type != '0'
+              f['handicapped'] = { year => hc_type.to_i }
             end
           end
         end
+        h << f
       end
-
-      h['family'] = merge_family(h['family']) # 翌年の扶養控除等申告書との重複
       h
     end
 
     def self.merge_family(family_list)
       merged = {}
-      family_list.each do |f|
-        key = [f['name'].gsub("　", "").strip, f['birth_date']]
+      family_list.flatten.each do |f|
+        key = if f['tax_id']
+                f['tax_id']
+              else
+                [f['name'].gsub("　", "").strip, f['birth_date'].to_s]
+              end
         if merged.key?(key)
           target = merged[key]
 
@@ -203,21 +328,18 @@ module LucaSalary
                  end
 
       if has_many
-        # NOTE implement search by content logic
-        raise "Multiple import is not supported yet."
-
         Dir.children(path).sort.map do |child|
           full_path = File.join(path, child)
           if File.directory?(full_path) || (File.file?(full_path) && File.extname(full_path).downcase == '.zip')
             data = load_xml_export(full_path)
-            yield parse_xml(data) unless data.empty?
+            yield(parse_xml(data), Pathname(full_path)) unless data.empty?
           else
             nil
           end
         end.compact
       else
         data = load_xml_export(path)
-        yield parse_xml(data) unless data.empty?
+        yield(parse_xml(data), Pathname(path)) unless data.empty?
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.20.6
+  version: 0.21.0
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-29 00:00:00.000000000 Z
+date: 2026-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook