nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 単体試験不具合対応

Browse Source
This commit is contained in:
高木要 2023-07-24 14:21:49 +09:00
parent 60976d4117
commit f4a5a653a6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ecs/jskult-webapp/src/controller/master_mainte.py
View File

@ -137,9 +137,10 @@ async def inst_emp_csv_upload(
# 画面表示用のモデル
error_message_list = []
content_type: str = csv_upload_form.csv_file.content_type.strip()
if csv_upload_form.csv_file.size == 0:
error_message_list.append('選択されたファイルが見つかりませんでした。')
elif csv_upload_form.csv_file.content_type != 'text/csv':
elif content_type != 'text/csv' and content_type != 'application/vnd.ms-excel' and content_type != 'application/octet-stream':
error_message_list.append('選択されたファイル形式が"csv"ではありません。')
elif csv_upload_form.csv_file.size >= constants.MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE:
error_message_list.append('選択されたCSVファイルサイズが大きいです。100MB未満にしてください。')

14
ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py
View File

@ -73,7 +73,7 @@ class EmpChgInstRepository(BaseRepository):
'update_user_name': create_user_name
})
except Exception as e:
logger.exception(f"DB Error : Exception={e.args}")
logger.exception(f'DB Error : Exception={e.args}')
raise e
UPDATE_END_DATE_SQL = """\
@ -101,7 +101,7 @@ class EmpChgInstRepository(BaseRepository):
'update_user_name': update_user_name
})
except Exception as e:
logger.exception(f"DB Error : Exception={e.args}")
logger.exception(f'DB Error : Exception={e.args}')
raise e
UPDATE_EMP_CD_SQL = """\
@ -128,7 +128,7 @@ class EmpChgInstRepository(BaseRepository):
'update_user_name': update_user_name
})
except Exception as e:
logger.exception(f"DB Error : Exception={e.args}")
logger.exception(f'DB Error : Exception={e.args}')
raise e
FETCH_COUNT_SQL = """\
@ -153,7 +153,7 @@ class EmpChgInstRepository(BaseRepository):
return 0
return models[0].count
except Exception as e:
logger.exception(f"DB Error : Exception={e.args}")
logger.exception(f'DB Error : Exception={e.args}')
raise e
finally:
self._database.disconnect()
@ -195,7 +195,7 @@ class EmpChgInstRepository(BaseRepository):
logger.debug(f'count= {df.shape[0]}')
return df
except Exception as e:
logger.exception(f"DB Error : Exception={e.args}")
logger.exception(f'DB Error : Exception={e.args}')
raise e
finally:
self._database.disconnect()
@ -286,7 +286,7 @@ class EmpChgInstRepository(BaseRepository):
query = self.DELETE_SQL
self._database.execute(query)
except Exception as e:
logger.exception(f"DB Error : Exception={e.args}")
logger.exception(f'DB Error : Exception={e.args}')
raise e
COPY_TABLE_SQL = "INSERT INTO emp_chg_inst_wrk SELECT * FROM emp_chg_inst"
@ -296,5 +296,5 @@ class EmpChgInstRepository(BaseRepository):
query = self.COPY_TABLE_SQL
self._database.execute(query)
except Exception as e:
logger.exception(f"DB Error : Exception={e.args}")
logger.exception(f'DB Error : Exception={e.args}')
raise e