From 23524711946da96e057c4aa2d40983d8adebe994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 12 May 2023 13:08:30 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E5=90=8D=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_snd_med_sphe_mapper.py | 8 ++++---- .../ultmarc/utmp_tables/tables/com_snd_med_sphe.py | 2 +- .../utmp_tables/ultmarc_table_mapper_factory.py | 4 ++-- .../test_com_snd_med_sphe_mapper.py | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_snd_med_sphe_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_snd_med_sphe_mapper.py index e8007319..c1c50269 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_snd_med_sphe_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_snd_med_sphe_mapper.py @@ -1,9 +1,9 @@ from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper -from src.batch.ultmarc.utmp_tables.tables.com_snd_med_sphe import ComSenMedSphe +from src.batch.ultmarc.utmp_tables.tables.com_snd_med_sphe import ComSndMedSphe -class ComSenMedSpheMapper(UltmarcTableMapper): +class ComSndMedSpheMapper(UltmarcTableMapper): """レイアウト区分123: COM_医療圏二次医療圏 登録処理""" # レコード存在確認SQL @@ -82,10 +82,10 @@ class ComSenMedSpheMapper(UltmarcTableMapper): med_sphe_cd = :med_sphe_cd """ - record: ComSenMedSphe + record: ComSndMedSphe def __init__(self, record: list[str], db) -> None: - super().__init__(record, db, ComSenMedSphe) + super().__init__(record, db, ComSndMedSphe) program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) # モジュール名をクエリパラメータに設定 self.query_parameter['program_name'] = program_name diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_snd_med_sphe.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_snd_med_sphe.py index c5e241db..b1b33e66 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_snd_med_sphe.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_snd_med_sphe.py @@ -1,7 +1,7 @@ from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable -class ComSenMedSphe(UltmarcTable): +class ComSndMedSphe(UltmarcTable): """レイアウト区分123: COM_医療圏二次医療圏""" prefc_cd: str # 県コード med_sphe_cd: str # 医療圏コード diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index 335e2538..6ff9bf70 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -49,7 +49,7 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_med_prefc_mapper im from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_thrd_med_mapper import \ ComThrdMedMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_snd_med_sphe_mapper import \ - ComSenMedSpheMapper + ComSndMedSpheMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_med_area_city_mapper import \ ComMedAreaCityMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ @@ -125,7 +125,7 @@ COM_TABLE_LIST = { # COM_医療圏３次マスタ "122": ComThrdMedMapper, # COM_二次医療圏 - "123": ComSenMedSpheMapper, + "123": ComSndMedSpheMapper, # COM_医療圏都道府県市町村対照表 "124": ComMedAreaCityMapper } diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_snd_med_sphe/test_com_snd_med_sphe_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_snd_med_sphe/test_com_snd_med_sphe_mapper.py index 60378f4e..78ff4708 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_snd_med_sphe/test_com_snd_med_sphe_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_snd_med_sphe/test_com_snd_med_sphe_mapper.py @@ -15,7 +15,7 @@ from tests.testing_utility import (assert_table_results, create_ultmarc_test_data_from_csv) -class TestComSenMedSphe: +class TestComSndMedSphe: """レイアウト区分123: COM_医療圏二次医療圏""" db: Database @@ -66,8 +66,8 @@ class TestComSenMedSphe: # Act for line_number, line in enumerate(test_dat_file, start=1): - sut: com_snd_med_sphe_mapper.ComSenMedSphe = create_ultmarc_table_mapper_sut(line, self.db) - assert type(sut) is com_snd_med_sphe_mapper.ComSenMedSpheMapper, f'{line_number}行目:マッパークラスが期通りか' + sut: com_snd_med_sphe_mapper.ComSndMedSphe = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_snd_med_sphe_mapper.ComSndMedSpheMapper, f'{line_number}行目:マッパークラスが期通りか' sut.make_query() sut.execute_queries() @@ -138,8 +138,8 @@ class TestComSenMedSphe: # Act for line_number, line in enumerate(test_dat_file, start=1): - sut: com_snd_med_sphe_mapper.ComSenMedSphe = create_ultmarc_table_mapper_sut(line, self.db) - assert type(sut) is com_snd_med_sphe_mapper.ComSenMedSpheMapper, f'{line_number}行目:マッパークラスが期通りか' + sut: com_snd_med_sphe_mapper.ComSndMedSphe = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_snd_med_sphe_mapper.ComSndMedSpheMapper, f'{line_number}行目:マッパークラスが期通りか' sut.make_query() sut.execute_queries() @@ -212,8 +212,8 @@ class TestComSenMedSphe: # Act for line_number, line in enumerate(test_dat_file, start=1): - sut: com_snd_med_sphe_mapper.ComSenMedSphe = create_ultmarc_table_mapper_sut(line, self.db) - assert type(sut) is com_snd_med_sphe_mapper.ComSenMedSpheMapper, f'{line_number}行目:マッパークラスが期通りか' + sut: com_snd_med_sphe_mapper.ComSndMedSphe = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_snd_med_sphe_mapper.ComSndMedSpheMapper, f'{line_number}行目:マッパークラスが期通りか' sut.make_query() sut.execute_queries()