style: フォーマット適用

This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-04-06 13:58:53 +09:00
parent 22d9f8ecb8
commit 54ac7c51d4
10 changed files with 36 additions and 16 deletions

View File

@ -14,5 +14,19 @@
"python.linting.flake8Enabled": true,
"python.linting.flake8Args": ["--max-line-length=120"],
"python.formatting.provider": "autopep8",
"python.formatting.autopep8Args": ["--max-line-length", "120"]
"python.formatting.autopep8Path": "autopep8",
"python.formatting.autopep8Args": [
"--max-line-length", "150",
"--ignore=F541"
],
"flake8.args": [
"--max-line-length", "150",
"--ignore=F541"
],
"python.testing.pytestArgs": [
"tests"
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
}

View File

@ -12,6 +12,7 @@ from src.logging.get_logger import get_logger
logger = get_logger('アルトマークデータ保管')
ultmarc_bucket = UltmarcBucket()
def dat_insert_control():
try:
logger.info('datInsert START')

View File

@ -6,12 +6,13 @@ class DatFileLine:
layout_class: str
record_id: str
record: list[str]
def __init__(self, dat_line: list[str]) -> None:
self.layout_class = dat_line[0]
self.record_id = dat_line[1]
self.record = dat_line
class DatFile:
lines: list[DatFileLine]
success_count: int = 0
@ -32,7 +33,7 @@ class DatFile:
def __init__(self, file: TextIOWrapper) -> None:
reader = csv.reader(file)
csv_rows = [DatFileLine(row) for row in reader]
self.lines = csv_rows
self.total_count = len(csv_rows)

View File

@ -37,7 +37,7 @@ class ComAlmaMapper(UltmarcTableMapper):
:program_name
)
"""
UPDATE_QUERY = """\
UPDATE
src05.com_alma
@ -70,7 +70,7 @@ class ComAlmaMapper(UltmarcTableMapper):
self.query_parameter['program_name'] = program_name
# 読み込んだレコード値もクエリパラメータに追加
self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()}
def make_query(self):
# 修正区分がC(削除)の場合、論理削除
if self.record.maint_flag == 'C':

View File

@ -61,7 +61,7 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
:program_name
)
"""
# 更新用SQL
UPDATE_QUERY = """\
UPDATE src05.com_dr_wrkplace
@ -155,7 +155,7 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
self.query_parameter['program_name'] = program_name
# 読み込んだレコード値もクエリパラメータに追加
self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()}
def make_query(self):
# 所属部科を取得し、所属部科カナと所属部科名を設定する
self.__set_sect_name_and_sect_name_kana()
@ -204,7 +204,7 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
if self.record.notdm_flg != '':
set_clauses.append('notdm_flg = :notdm_flg')
self.query_parameter['notdm_flg'] = self.record.sectname if self.record.sectcode != '@' else 'NULL'
make_history_query = self.TO_HISTORY_QUERY
update_columns = ','.join(set_clauses)
@ -215,7 +215,7 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
update_query = self.UPDATE_QUERY.format(
update_columns=update_columns
)
return [make_history_query, update_query]
def __make_update_columns_with_historical(self):
@ -244,5 +244,5 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
if len(set_clauses) != 0:
# 処理日はパラメータに設定済み
set_clauses.append("aply_start_ymd = DATE_FORMAT(:syor_date, '%Y%m%d')")
return set_clauses

View File

@ -39,7 +39,7 @@ class ComHamtecMapper(UltmarcTableMapper):
:program_name
)
"""
UPDATE_QUERY = """\
UPDATE
src05.com_hamtec
@ -73,7 +73,7 @@ class ComHamtecMapper(UltmarcTableMapper):
self.query_parameter['program_name'] = program_name
# 読み込んだレコード値もクエリパラメータに追加
self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()}
def make_query(self):
# 修正区分がC(削除)の場合、論理削除
if self.record.maint_flag == 'C':

View File

@ -3,5 +3,7 @@ from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \
class ComInstMapper(UltmarcTableMapper):
"""COM_施設 登録処理: TODO"""
def make_query(self):
self.queries.append(None)

View File

@ -3,6 +3,6 @@ from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \
class NullMapper(UltmarcTableMapper):
def make_query(self):
return super().make_query()

View File

@ -8,12 +8,13 @@ from src.db.database import Database
# 処理日を使用するために、configを使用
batch_config = BatchConfig.get_instance()
class UltmarcTableMapper(metaclass=ABCMeta):
record: UltmarcTable
db: Database
queries: list[str]
query_parameter: dict
def __init__(self, record: list[str], db: Database, table_class: type[UltmarcTable]) -> None:
self.record = table_class(record)
self.db = db
@ -31,7 +32,7 @@ class UltmarcTableMapper(metaclass=ABCMeta):
# バッチ共通設定から処理日を取得
'syor_date': batch_config.syor_date
}
@abstractmethod
def make_query(self):
pass
@ -43,5 +44,5 @@ class UltmarcTableMapper(metaclass=ABCMeta):
for query in self.queries:
if query is None:
continue
self.db.execute(query, self.query_parameter)

View File

@ -82,6 +82,7 @@ COM_TABLE_LIST = {
"124": null_mapper.NullMapper
}
class UltmarcTableMapperFactory:
def create(self, layout_class: str, record_id: str, records: list[str], db: Database) -> UltmarcTableMapper: