master_data_tool 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ee8634a9d307fdaa7f6cae268d9955a029309dbd020755ecac87ba0f8f6c4a
-  data.tar.gz: 31c3397ccc5d219fe933b7a0aa856878578fa061c4ab620d4e1dab39312d446c
+  metadata.gz: '09f03f9ca56ad09dd1f511a53248da3ffe917a0e8be0dba68e3bfbb8f61f74bb'
+  data.tar.gz: 56d9f18f92c96ca4cf2f5bac42edc369d861cbf1cb3ba3e39cb6c8b19eccbdc0
 SHA512:
-  metadata.gz: 8409b81d4129b18b0fa489ca0fbaf8a73f5fac79726ee4fed5745bf9312ac24958c6908735fc7a0fc453184e17609348b68e741939b98105547a4de6e1e02315
-  data.tar.gz: f1648f8c1123911468988ea553c1fbe5ad38b81893c5bd376c5f29f983d325672ce8c762020e8f91c7b83cca7d30f3da71919d69e24c11b728cdac7ce044a827
+  metadata.gz: 229dc35b454ca6adafddc65125042649172d203a87554fbe161cade5ad6f17c9e645c40108cb37a937cbf1bfa496b06f0ad6406e904e706a7945b4a9ffe9bb2f
+  data.tar.gz: 285b4f485f23c1215b8029af39bac2808a85050506e02cb92e1662ddaf0ccf634f9a8de4b821663f297d78f6e8a74d61a0920af4e2570ebe19200a0d1ec2f121

data/README.md

@@ -35,17 +35,18 @@ Or install it yourself as:
 
 ### マスタデータの投入
 
-| option               | default | 内容                                |
-|----------------------| --- |-----------------------------------|
-| --dry-run            | true | dry-runモードで実行する（データ変更は行わない）       |
-| --verify             | true | データ投入後に全テーブル・全レコードのバリデーションチェックを行う |
-| --only-import-tables | [] | 指定したテーブルのみデータ投入を行う                |
-| --except-import-tables | [] | 指定したテーブルのデータ投入を行わない               |
-| --only-verify-tables | [] | 指定したテーブルのみ投入後のバリデーションチェックを行う      |
-| --except-verify-tables | [] | 指定したテーブルのバリデーションチェックを行わない         |
-| --skip-no-change     | true | CSVファイルに更新がないテーブルをスキップする          |
-| --silent | false | 結果の出力をやめる                         |
-| --delete-all-ignore-foreign-key | false | 外部キー制約を無視してレコードを消すかどうか |
+| option               | default | 内容                                                              |
+|----------------------| --- |-----------------------------------------------------------------|
+| --dry-run            | true | dry-runモードで実行する（データ変更は行わない）                                     |
+| --verify             | true | データ投入後に全テーブル・全レコードのバリデーションチェックを行う                               |
+| --only-import-tables | [] | 指定したテーブルのみデータ投入を行う                                              |
+| --except-import-tables | [] | 指定したテーブルのデータ投入を行わない                                             |
+| --only-verify-tables | [] | 指定したテーブルのみ投入後のバリデーションチェックを行う                                    |
+| --except-verify-tables | [] | 指定したテーブルのバリデーションチェックを行わない                                       |
+| --skip-no-change     | true | CSVファイルに更新がないテーブルをスキップする                                        |
+| --silent | false | 結果の出力をやめる                                                       |
+| --delete-all-ignore-foreign-key | false | 外部キー制約を無視してレコードを消すかどうか                                          |
+| --override_identifier | nil | fixtures/#{override_identifier} のディレクトリにある内容でfixturesを上書きして投入する |
 
 ```bash
 bundle exec master_data_tool import

data/exe/master_data_tool

@@ -17,6 +17,7 @@ module MasterDataTool
     option :except_verify_tables, default: nil, type: :array
     option :skip_no_change, default: nil, type: :boolean
     option :silent, default: nil, type: :boolean
+    option :override_identifier, default: nil, type: :string
     option :delete_all_ignore_foreign_key, default: nil, type: :boolean
     desc 'import', 'import'
     def import

data/lib/master_data_tool/import/executor.rb

@@ -12,6 +12,7 @@ module MasterDataTool
                      skip_no_change: true,
                      silent: false,
                      delete_all_ignore_foreign_key: false,
+                     override_identifier: nil,
                      report_printer: MasterDataTool::Report::DefaultPrinter.new)
 
         @dry_run = dry_run
@@ -23,6 +24,7 @@ module MasterDataTool
         @skip_no_change = skip_no_change
         @silent = silent
         @delete_all_ignore_foreign_key = delete_all_ignore_foreign_key
+        @override_identifier = override_identifier
         @report_printer = report_printer
         @report_printer.silent = silent
       end
@@ -61,17 +63,16 @@ module MasterDataTool
 
       def build_master_data_list
         [].tap do |master_data_list|
-          extract_master_data_csv_paths.each do |path|
-            table_name = MasterDataTool.resolve_table_name(path)
-            load_skip = load_skip_table?(table_name, path)
+          MasterDataTool::Import::MasterDataFileList.new(override_identifier: @override_identifier).build.each do |master_data_file|
+            load_skip = load_skip_table?(master_data_file)
 
-            model_klass = Object.const_get(table_name.classify)
-            master_data = MasterData.new(path, model_klass)
+            model_klass = Object.const_get(master_data_file.table_name.classify)
+            master_data = MasterData.new(master_data_file, model_klass)
             master_data.load unless load_skip
 
             master_data_list << master_data
           end
-        end.sort_by { |m| m.csv_path } # 外部キー制約などがある場合には先に入れておかないといけないデータなどがある。なので、プレフィックスを付けて順序を指定して貰う
+        end.sort_by { |m| m.basename } # 外部キー制約などがある場合には先に入れておかないといけないデータなどがある。なので、プレフィックスを付けて順序を指定して貰う
       end
 
       def import_all!(master_data_list)
@@ -98,7 +99,7 @@ module MasterDataTool
         master_data_list.each do |master_data|
           next unless master_data.loaded?
 
-          records << MasterDataTool::MasterDataStatus.build(master_data.csv_path)
+          records << MasterDataTool::MasterDataStatus.build(master_data.master_data_file)
         end
 
         MasterDataTool::MasterDataStatus.import_records!(records, dry_run: @dry_run)
@@ -114,11 +115,11 @@ module MasterDataTool
         end
       end
 
-      def load_skip_table?(table_name, csv_path)
-        return true if import_skip_table?(table_name)
+      def load_skip_table?(master_data_file)
+        return true if import_skip_table?(master_data_file.table_name)
         return false unless @skip_no_change
 
-        !MasterDataTool::MasterDataStatus.master_data_will_change?(csv_path)
+        !MasterDataTool::MasterDataStatus.master_data_will_change?(master_data_file)
       end
 
       def import_skip_table?(table_name)
@@ -148,6 +149,13 @@ module MasterDataTool
         pattern = Pathname.new(MasterDataTool.config.master_data_dir).join('*.csv').to_s
         Pathname.glob(pattern).select(&:file?)
       end
+
+      def overridden_master_data_csv_paths
+        return [] unless @override_identifier
+
+        pattern = Pathname.new(MasterDataTool.config.master_data_dir).join(@override_identifier).join('*.csv').to_s
+        Pathname.glob(pattern).select(&:file?)
+      end
     end
   end
 end

data/lib/master_data_tool/import/master_data_file_list.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module MasterDataTool
+  module Import
+    class MasterDataFileList
+      Result = Struct.new(:table_name, :path, :override_identifier)
+
+      def initialize(override_identifier: nil)
+        @override_identifier = override_identifier
+      end
+
+      def build
+        files = extract_master_data_csv_paths.presence&.index_by(&:table_name)
+        overridden_files = overridden_master_data_csv_paths.presence&.index_by(&:table_name) || {}
+
+        table_names = (files.keys + overridden_files.keys).uniq
+        table_names.map do |table_name|
+          overridden_files[table_name] || files[table_name]
+        end
+      end
+
+      private
+
+      def extract_master_data_csv_paths
+        pattern = Pathname.new(MasterDataTool.config.master_data_dir).join('*.csv').to_s
+        Pathname.glob(pattern).select(&:file?).map do |path|
+          table_name = MasterDataTool.resolve_table_name(path, nil)
+          MasterDataTool::MasterDataFile.new(table_name, path, nil)
+        end
+      end
+
+      def overridden_master_data_csv_paths
+        return [] if @override_identifier.blank?
+
+        pattern = Pathname.new(MasterDataTool.config.master_data_dir).join(@override_identifier).join('*.csv').to_s
+        Pathname.glob(pattern).select(&:file?).map do |path|
+          table_name = MasterDataTool.resolve_table_name(path, @override_identifier)
+          MasterDataTool::MasterDataFile.new(table_name, path, @override_identifier)
+        end
+      end
+    end
+  end
+end

data/lib/master_data_tool/import.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+require_relative 'import/master_data_file_list'
 require_relative "import/executor"

data/lib/master_data_tool/master_data.rb

@@ -2,11 +2,12 @@
 
 module MasterDataTool
   class MasterData
-    attr_reader :csv_path, :model_klass, :columns, :new_records, :updated_records, :no_change_records, :deleted_records
+    attr_reader :master_data_file, :model_klass, :columns, :new_records, :updated_records, :no_change_records, :deleted_records
     attr_reader :before_count, :after_count
 
-    def initialize(csv_path, model_klass)
-      @csv_path = csv_path
+    # @param [MasterDataTool::MasterDataFile] master_data_file
+    def initialize(master_data_file, model_klass)
+      @master_data_file = master_data_file
       @model_klass = model_klass
 
       @loaded = false
@@ -18,8 +19,12 @@ module MasterDataTool
       @deleted_records = []
     end
 
+    def basename
+      @master_data_file.basename
+    end
+
     def load
-      csv = CSV.read(@csv_path, headers: true, skip_blanks: true)
+      csv = CSV.read(@master_data_file.path, headers: true, skip_blanks: true)
       old_records_by_id = @model_klass.all.index_by(&:id)
 
       csv_records_by_id = build_records_from_csv(csv, old_records_by_id)

data/lib/master_data_tool/master_data_file.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module MasterDataTool
+  class MasterDataFile < Struct.new(:table_name, :path, :override_identifier)
+    def initialize(table_name, path, override_identifier)
+      super(table_name, path, override_identifier)
+      freeze
+    end
+
+    def basename
+      self.path.basename
+    end
+  end
+end

data/lib/master_data_tool/master_data_status.rb

@@ -15,9 +15,9 @@ module MasterDataTool
               presence: true
 
     class << self
-      def build(csv_path)
-        version = decide_version(csv_path)
-        new(name: MasterDataTool.resolve_table_name(csv_path), version: version)
+      def build(master_data_file)
+        version = decide_version(master_data_file.path)
+        new(name: MasterDataTool.resolve_table_name(master_data_file.path, master_data_file.override_identifier), version: version)
       end
 
       def import_records!(records, dry_run: true)
@@ -28,9 +28,10 @@ module MasterDataTool
         end
       end
 
-      def master_data_will_change?(csv_path)
-        new_version = decide_version(csv_path)
-        !where(name: MasterDataTool.resolve_table_name(csv_path), version: new_version).exists?
+      # @param [MasterDataTool::MasterDataFile] master_data_file
+      def master_data_will_change?(master_data_file)
+        new_version = decide_version(master_data_file.path)
+        !where(name: master_data_file.table_name, version: new_version).exists?
       end
 
       def decide_version(csv_path)

data/lib/master_data_tool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MasterDataTool
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

data/lib/master_data_tool.rb

@@ -4,6 +4,7 @@ require 'csv'
 require_relative "master_data_tool/version"
 require_relative "master_data_tool/config"
 require_relative "master_data_tool/master_data_status"
+require_relative "master_data_tool/master_data_file"
 require_relative "master_data_tool/master_data"
 require_relative "master_data_tool/report"
 require_relative "master_data_tool/dump/executor"
@@ -24,9 +25,11 @@ module MasterDataTool
       yield config
     end
 
-    def resolve_table_name(csv_path)
+    def resolve_table_name(csv_path, override_identifier)
       # 0001_table_nameのように投入順序を制御可能にする
-      csv_path.relative_path_from(config.master_data_dir).to_s.gsub(/^\d+_/, '').delete_suffix('.csv')
+      relative_path = config.master_data_dir
+      relative_path = "#{relative_path}/#{override_identifier}" if override_identifier.present?
+      csv_path.relative_path_from(relative_path).to_s.gsub(/^\d+_/, '').delete_suffix('.csv')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: master_data_tool
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -194,7 +194,9 @@ files:
 - lib/master_data_tool/dump/executor.rb
 - lib/master_data_tool/import.rb
 - lib/master_data_tool/import/executor.rb
+- lib/master_data_tool/import/master_data_file_list.rb
 - lib/master_data_tool/master_data.rb
+- lib/master_data_tool/master_data_file.rb
 - lib/master_data_tool/master_data_status.rb
 - lib/master_data_tool/report.rb
 - lib/master_data_tool/report/core.rb