自動テスト実装 Ｖ施設マスタ

ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py

@@ -497,3 +497,70 @@ class TestImportFileToDb:
         assert result_src_count[0]['count(*)'] == 6
 
         # teardown
+
+    def test_load_07_fcl_mst_ok(self, mapper):
+        table_name_org = mapper.get_org_table(mapper.CONDKEY_FCL_MST)
+        table_name_src = mapper.get_src_table(mapper.CONDKEY_FCL_MST)
+
+        # setup
+        self.batch_context.is_vjsk_stock_import_day = True
+        self.db.execute(f"truncate table {table_name_src}")
+
+        # assertion1 (insert 4row)
+
+        # 処理実行
+        target_dict = {
+            "condkey": mapper.CONDKEY_FCL_MST,
+            "src_file_path": path.join(self.test_file_path_load_individual, "fcl_mst_202304280000.tsv")
+        }
+        VjskDataLoadManager.load(target_dict)
+
+        # 期待値データファイル読み込み
+        assert_list = create_vjsk_assertion_list(target_dict["src_file_path"])
+        # orgテーブル結果を取得
+        result_org = self.db.execute_select(f"select * from {table_name_org}")
+        # 突合から除外する項目
+        ignore_columns = ['dwh_upd_dt']
+        force_cast_to_str_columns = ['closed_dt']
+        # orgテーブル結果が期待値通りかを突合
+        assert_table_results(result_org, assert_list, ignore_columns, force_cast_to_str_columns)
+        # srcテーブル結果を取得
+        result_src = self.db.execute_select(f"select * from {table_name_src}")
+        # 突合から除外する項目
+        ignore_columns = ['dwh_upd_dt']
+        force_cast_to_str_columns = ['closed_dt']
+        # srcテーブル結果が期待値通りかを突合
+        assert_table_results(result_src, assert_list, ignore_columns, force_cast_to_str_columns)
+
+        # assertion2 (update 2row +insert 2row)
+
+        # 処理実行
+        target_dict = {
+            "condkey": mapper.CONDKEY_FCL_MST,
+            "src_file_path": path.join(self.test_file_path_load_individual, "fcl_mst_202304290000.tsv")
+        }
+        VjskDataLoadManager.load(target_dict)
+
+        # 期待値データファイル読み込み
+        assert_list = create_vjsk_assertion_list(target_dict["src_file_path"])
+        # orgテーブル結果を取得
+        result_org = self.db.execute_select(f"select * from {table_name_org}")
+        # 突合から除外する項目
+        ignore_columns = ['dwh_upd_dt']
+        force_cast_to_str_columns = ['closed_dt']
+        # orgテーブル結果が期待値通りかを突合
+        assert_table_results(result_org, assert_list, ignore_columns, force_cast_to_str_columns)
+        # srcテーブル結果(orgテーブル結果のPK値で一致するもの)を取得
+        result_src = self.db.execute_select(
+            f"select * from {table_name_src} s inner join {table_name_org} o on (s.v_inst_cd = o.v_inst_cd and s.sub_num = o.sub_num)")
+        # 突合から除外する項目
+        ignore_columns = ['dwh_upd_dt']
+        force_cast_to_str_columns = ['closed_dt']
+        # srcテーブル結果が期待値通りかを突合
+        assert_table_results(result_src, assert_list, ignore_columns, force_cast_to_str_columns)
+
+        # srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 6row)
+        result_src_count = self.db.execute_select(f"select count(*) from {table_name_src} ")
+        assert result_src_count[0]['count(*)'] == 6
+
+        # teardown

ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/fcl_mst_202304280000.tsv

@@ -0,0 +1,5 @@
+"fcl_cd"	"sub_no"	"start_dt"	"end_dt"	"closed_dt"	"nm"	"kn_nm"	"sht_nm"	"sht_kn_nm"	"mkr_cd"	"jsk_proc_kbn"	"fmt_addr"	"fmt_kn_addr"	"post_cd"	"prft_cd"	"prft_nm"	"city_nm"	"addr_line_1"	"tel_no"	"admin_kbn"	"fcl_type"	"rec_sts_kbn"	"ins_dt"	"upd_dt"
+"670229430760653825"	"0"	"20000101"	"99991231"	""	"駅前町歯科診療所"	"ｴｷﾏｴﾁｮｳｼｶｼﾝﾘｮｳｼﾞｮ"	"駅前町歯科診療所"	"ｴｷﾏｴﾁｮｳｼｶｼﾝﾘｮｳｼﾞｮ"	""	"0"	"700-0023 岡山県岡山市北区駅前町１−６−２０"	"ｵｶﾔﾏｹﾝ ｵｶﾔﾏｼｷﾀｸ ｴｷﾏｴﾁｮｳ1-6-20"	"700-0023"	"33"	"岡山県"	"岡山市北区"	"駅前町１−６−２０"	"0862236468"	"33101"	"30"	"1"	""	""
+"670229435466662922"	"0"	"20000101"	"99991231"	""	"医療法人社団仁卓会　ほりかわ歯科クリニック"	"ｲﾘｮｳﾎｳｼﾞﾝｼｬﾀﾞﾝｼﾞﾝﾀｸｶｲ ﾎﾘｶﾜｼｶｸﾘﾆｯｸ"	"ほりかわ歯科クリニック　（医社）"	"ﾎﾘｶﾜｼｶｸﾘﾆｯｸ (ｲｼｬ)"	""	"0"	"675-0101 兵庫県加古川市平岡町新在家１５７３−１−４Ｆ"	"ﾋｮｳｺﾞｹﾝ ｶｺｶﾞﾜｼ ﾋﾗｵｶﾁｮｳｼﾝｻﾞｲｹ1573-1-4F"	"675-0101"	"28"	"兵庫県"	"加古川市"	"平岡町新在家１５７３−１−４Ｆ"	"0794244617"	"28210"	"30"	"1"	""	""
+"670229435785430019"	"0"	"20000101"	"99991231"	""	"株式会社コミュニティメディカル　なつめ薬局　千歳船橋店"	"ｶﾌﾞｼｷｶﾞｲｼｬｺﾐｭﾆﾃｨﾒﾃﾞｨｶﾙ ﾅﾂﾒﾔｯｷｮｸ ﾁﾄｾﾌﾅﾊﾞｼﾃﾝ"	"なつめ薬局　千歳船橋店　（株）"	"ﾅﾂﾒﾔｯｷｮｸ ﾁﾄｾﾌﾅﾊﾞｼﾃﾝ (ｶ)"	""	"0"	"156-0054 東京都世田谷区桜丘２−２４−２"	"ﾄｳｷｮｳﾄ ｾﾀｶﾞﾔｸ ｻｸﾗｶﾞｵｶ2-24-2"	"156-0054"	"13"	"東京都"	"世田谷区"	"桜丘２−２４−２"	"0364136189"	"13112"	"20"	"1"	""	""
+"670229447437206529"	"0"	"20000101"	"20230407"	"2023-04-07"	"ヒカリ薬局"	"ﾋｶﾘﾔｯｷｮｸ"	"ヒカリ薬局"	"ﾋｶﾘﾔｯｷｮｸ"	""	"0"	"670-0955 兵庫県姫路市安田４−４７−８−１Ｆ"	"ﾋｮｳｺﾞｹﾝ ﾋﾒｼﾞｼ ﾔｽﾀﾞ4-47-8-1F"	"670-0955"	"28"	"兵庫県"	"姫路市"	"安田４−４７−８−１Ｆ"	"0792846396"	"28201"	"20"	"1"	""	""

ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/fcl_mst_202304290000.tsv

@@ -0,0 +1,5 @@
+"fcl_cd"	"sub_no"	"start_dt"	"end_dt"	"closed_dt"	"nm"	"kn_nm"	"sht_nm"	"sht_kn_nm"	"mkr_cd"	"jsk_proc_kbn"	"fmt_addr"	"fmt_kn_addr"	"post_cd"	"prft_cd"	"prft_nm"	"city_nm"	"addr_line_1"	"tel_no"	"admin_kbn"	"fcl_type"	"rec_sts_kbn"	"ins_dt"	"upd_dt"
+"670229435785430019"	"0"	"20000202"	"99991231"	""	"株式会社コミュニティメディカル　なつめ薬局　千歳船橋店"	"ｶﾌﾞｼｷｶﾞｲｼｬｺﾐｭﾆﾃｨﾒﾃﾞｨｶﾙ ﾅﾂﾒﾔｯｷｮｸ ﾁﾄｾﾌﾅﾊﾞｼﾃﾝ"	"なつめ薬局　千歳船橋店　（株）"	"ﾅﾂﾒﾔｯｷｮｸ ﾁﾄｾﾌﾅﾊﾞｼﾃﾝ (ｶ)"	""	"0"	"156-0054 東京都世田谷区桜丘２−２４−２"	"ﾄｳｷｮｳﾄ ｾﾀｶﾞﾔｸ ｻｸﾗｶﾞｵｶ2-24-2"	"156-0054"	"13"	"東京都"	"世田谷区"	"桜丘２−２４−２"	"0364136189"	"13112"	"20"	"1"	""	""
+"670229447437206529"	"0"	"20000202"	"20230407"	"2023-04-07"	"ヒカリ薬局"	"ﾋｶﾘﾔｯｷｮｸ"	"ヒカリ薬局"	"ﾋｶﾘﾔｯｷｮｸ"	""	"0"	"670-0955 兵庫県姫路市安田４−４７−８−１Ｆ"	"ﾋｮｳｺﾞｹﾝ ﾋﾒｼﾞｼ ﾔｽﾀﾞ4-47-8-1F"	"670-0955"	"28"	"兵庫県"	"姫路市"	"安田４−４７−８−１Ｆ"	"0792846396"	"28201"	"20"	"1"	""	""
+"670229463350395910"	"0"	"20000101"	"99991231"	""	"こうだ歯科"	"ｺｳﾀﾞｼｶ"	"こうだ歯科"	"ｺｳﾀﾞｼｶ"	""	"0"	"770-0831 徳島県徳島市寺島本町西１−１０"	"ﾄｸｼﾏｹﾝ ﾄｸｼﾏｼ ﾃﾗｼﾏﾎﾝﾁｮｳﾆｼ1-10"	"770-0831"	"36"	"徳島県"	"徳島市"	"寺島本町西１−１０"	"0886552625"	"36201"	"30"	"1"	""	""
+"670229489380246545"	"0"	"20020521"	"99991231"	""	"社会医療法人社団埼玉巨樹の会　狭山中央病院"	"ｼｬｶｲｲﾘｮｳﾎｳｼﾞﾝｼｬﾀﾞﾝｻｲﾀﾏｷｮｼﾞｭﾉｶｲ ｻﾔﾏﾁｭｳｵｳﾋﾞｮｳｲﾝ"	"狭山中央病院　（社社）"	"ｻﾔﾏﾁｭｳｵｳﾋﾞｮｳｲﾝ (ｼｬｼｬ)"	""	"0"	"350-1306 埼玉県狭山市富士見２−１９−３５"	"ｻｲﾀﾏｹﾝ ｻﾔﾏｼ ﾌｼﾞﾐ2-19-35"	"350-1306"	"11"	"埼玉県"	"狭山市"	"富士見２−１９−３５"	"0429597111"	"11215"	"10"	"1"	""	""

ecs/jskult-batch-daily/tests/testing_vjsk_utility.py

@@ -62,7 +62,7 @@ def is_valid_date_format(date_str: str, date_format):
         return False
 
 
-def assert_table_results(actual_rows: list[dict], expect_rows: list[dict], ignore_col_name: list = None) -> None:
+def assert_table_results(actual_rows: list[dict], expect_rows: list[dict], ignore_col_names: list = None, force_cast_to_str_columns: list = []) -> None:
     """テーブル同士の取得結果突き合わせ
 
     Args:
@@ -80,23 +80,28 @@ def assert_table_results(actual_rows: list[dict], expect_rows: list[dict], ignor
         # 1カラムずつ調査
         for actual_col_name, expect_col_name in zip(actual_row, expect_row):
             # テストメソッド側で個別に確認するものはスキップさせる
-            if ignore_col_name is not None and actual_col_name in ignore_col_name:
+            if ignore_col_names is not None and actual_col_name in ignore_col_names:
                 continue
             else:
                 actual_value = actual_row[actual_col_name]
                 expect_value = expect_row[expect_col_name]
 
                 # 期待値を、DBのデータ型(リフレクションされたpythonのデータ型)にキャストする
-                if isinstance(actual_value, (int)):
+                if actual_col_name in force_cast_to_str_columns:
+                    if type(expect_value).__name__ == 'date':
+                        expect_value = expect_value.strftime('%Y-%m-%d')
+                elif isinstance(actual_value, (int)):
                     expect_value = int(expect_value)
-                if isinstance(actual_value, (float)):
+                elif isinstance(actual_value, (float)):
                     expect_value = float(expect_value)
-                if isinstance(actual_value, (decimal.Decimal)):
+                elif isinstance(actual_value, (decimal.Decimal)):
                     expect_value = decimal.Decimal(expect_value)
                 # if type(actual_value) == datetime.date:
-                if type(actual_value).__name__ == "date":
+                elif type(actual_value).__name__ == "date":
                     if is_valid_date_format(expect_value, '%Y%m%d') is True:  # YYYYMMDD
                         expect_value = datetime.strptime(expect_value, '%Y%m%d').date()
+                elif actual_value is None and expect_value == "":
+                    expect_value = None
 
                 # 検証
                 assert actual_value == expect_value, f'{line_number}行目:"{actual_col_name}" : "{actual_value}" ({type(actual_value)})が、期待値 "{expect_value}" ({type(expect_value)}) と一致しませんでした'