From 441805ad0f6565ffd72cca3f374d01b9d4e91cdf Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 1 Aug 2023 09:53:06 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=89=E6=99=82=E3=81=AE=E4=B8=8D=E5=82=99=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=80=82=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=B5?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E5=88=B6=E9=99=90100MB=E2=86=9220MB,=20?= =?UTF-8?q?=E6=8B=A1=E5=BC=B5=E5=AD=90CSV=E3=81=AE=E3=81=BF=E3=81=AE?= =?UTF-8?q?=E6=A5=BD=E8=A6=B3=E6=A4=9C=E6=9F=BB=E3=81=AB=E5=A4=89=E6=9B=B4?= =?UTF-8?q?(NEWDWH2021-1160)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/controller/master_mainte.py | 14 +++++++------- ecs/jskult-webapp/src/system_var/constants.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py index 046fc4ab..06556f7d 100644 --- a/ecs/jskult-webapp/src/controller/master_mainte.py +++ b/ecs/jskult-webapp/src/controller/master_mainte.py @@ -4,9 +4,12 @@ from typing import Optional from fastapi import APIRouter, Depends, HTTPException, Request from fastapi.responses import HTMLResponse from starlette import status + from src.depends.services import get_service from src.logging.get_logger import get_logger from src.model.internal.session import UserSession +from src.model.request.master_mainte_csvdl import MasterMainteCsvDlModel +from src.model.request.master_mainte_csvup import MasterMainteCsvUpModel from src.model.view.inst_emp_csv_download_view_model import \ InstEmpCsvDownloadViewModel from src.model.view.inst_emp_csv_upload_view_model import \ @@ -20,9 +23,6 @@ from src.services.master_mainte_service import MasterMainteService from src.services.session_service import set_session from src.system_var import constants from src.templates import templates -from src.model.request.master_mainte_csvup import MasterMainteCsvUpModel -from src.model.request.master_mainte_csvdl import MasterMainteCsvDlModel - logger = get_logger('マスターメンテ') @@ -117,7 +117,7 @@ def inst_emp_csv_upload_view( @router.post('/instEmpCsvUL', response_class=HTMLResponse) async def inst_emp_csv_upload( request: Request, - csv_upload_form: Optional[MasterMainteCsvUpModel] = Depends(MasterMainteCsvUpModel.as_form), + csv_upload_form: MasterMainteCsvUpModel = Depends(MasterMainteCsvUpModel.as_form), master_mainte_service: MasterMainteService = Depends(get_service(MasterMainteService)), batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)) ): @@ -137,12 +137,12 @@ async def inst_emp_csv_upload( # 画面表示用のモデル error_message_list = [] - content_type: str = csv_upload_form.csv_file.content_type.strip() + csv_filename: str = csv_upload_form.csv_file.filename if csv_upload_form.csv_file.size == 0: error_message_list.append('選択されたファイルが見つかりませんでした。') - elif content_type != 'text/csv' and content_type != 'application/vnd.ms-excel' and content_type != 'application/octet-stream': + elif not csv_filename.endswith('.csv'): error_message_list.append('選択されたファイル形式が"csv"ではありません。') - elif csv_upload_form.csv_file.size >= constants.MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE: + elif csv_upload_form.csv_file.size >= constants.MAINTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE: error_message_list.append('選択されたCSVファイルサイズが大きいです。100MB未満にしてください。') else: mainte_csv_up = master_mainte_service.prepare_mainte_csv_up_view( diff --git a/ecs/jskult-webapp/src/system_var/constants.py b/ecs/jskult-webapp/src/system_var/constants.py index 7be637b9..b480e536 100644 --- a/ecs/jskult-webapp/src/system_var/constants.py +++ b/ecs/jskult-webapp/src/system_var/constants.py @@ -212,5 +212,5 @@ MENTE_CSV_DOWNLOAD_HEADER = [ MENTE_CSV_DOWNLOAD_FILE_NAME = 'instEmpData.csv' -# CSVアップロードの制限サイズ＝100MB -MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE = 104857600 +# CSVアップロードの制限サイズ＝20MB +MAINTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE = 20971520 From 40eb6cdc2e529cb58edcc6110a1afa74682ef82b Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 1 Aug 2023 09:54:38 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E6=9C=AA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=AE=E5=AE=9A=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/controller/master_mainte.py | 2 +- ecs/jskult-webapp/src/system_var/constants.py | 27 +------------------ 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py index 06556f7d..e36bd08e 100644 --- a/ecs/jskult-webapp/src/controller/master_mainte.py +++ b/ecs/jskult-webapp/src/controller/master_mainte.py @@ -142,7 +142,7 @@ async def inst_emp_csv_upload( error_message_list.append('選択されたファイルが見つかりませんでした。') elif not csv_filename.endswith('.csv'): error_message_list.append('選択されたファイル形式が"csv"ではありません。') - elif csv_upload_form.csv_file.size >= constants.MAINTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE: + elif csv_upload_form.csv_file.size >= constants.MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE: error_message_list.append('選択されたCSVファイルサイズが大きいです。100MB未満にしてください。') else: mainte_csv_up = master_mainte_service.prepare_mainte_csv_up_view( diff --git a/ecs/jskult-webapp/src/system_var/constants.py b/ecs/jskult-webapp/src/system_var/constants.py index b480e536..276556b0 100644 --- a/ecs/jskult-webapp/src/system_var/constants.py +++ b/ecs/jskult-webapp/src/system_var/constants.py @@ -50,31 +50,6 @@ BIO_CSV_HEADER = [ '2017年11月以前データ' ] -SLIP_ORG_KBN_FULL_NAME = { - 'J': 'JD-NET', - 'N': 'NHI', - 'H': '手入力' -} -DATA_KBN_JP_NAME = { - '0': '正常', - '1': 'ロットエラー', - '2': '除外', - '3': 'ロット不明', - '9': 'エラー（解消済）', -} -LOT_NO_ERR_FLG_JP_NAME = { - '0': '正常', - '1': 'ロットエラー', - '2': '日付エラー', - '3': 'ロットエラー（解消済）', - '4': 'ロットエラー（調査不能）', - '5': '日付エラー（解消済）', - '6': '日付エラー（調査不能）', - '7': '除外（卸都合）', - '8': '除外（再送信）', - 'Z': '過去データ' -} - LOGOUT_REASON_DO_LOGOUT = 'do_logout' LOGOUT_REASON_LOGIN_ERROR = 'login_error' LOGOUT_REASON_BATCH_PROCESSING = 'batch_processing' @@ -213,4 +188,4 @@ MENTE_CSV_DOWNLOAD_HEADER = [ MENTE_CSV_DOWNLOAD_FILE_NAME = 'instEmpData.csv' # CSVアップロードの制限サイズ＝20MB -MAINTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE = 20971520 +MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE = 20971520 From 1163951aad18c122ef91e03bcdecd6ebcc20a226 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 1 Aug 2023 09:55:17 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20gunicorn=E3=81=AE=E3=83=AF=E3=83=BC?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88=E3=82=92=E5=BB=B6=E9=95=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-webapp/Dockerfile b/ecs/jskult-webapp/Dockerfile index ef14f718..d7590655 100644 --- a/ecs/jskult-webapp/Dockerfile +++ b/ecs/jskult-webapp/Dockerfile @@ -16,4 +16,4 @@ RUN \ COPY src ./src -CMD ["gunicorn", "src.main:app", "-w", "4", "-k" ,"uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:80"] +CMD ["gunicorn", "src.main:app", "-w", "4", "-k" ,"uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:80", "--timeout", "300"] From ea649be647a331612c88931209fdf75f76c0c991 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 1 Aug 2023 10:14:02 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=A1?= =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/controller/master_mainte.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py index e36bd08e..e2a54928 100644 --- a/ecs/jskult-webapp/src/controller/master_mainte.py +++ b/ecs/jskult-webapp/src/controller/master_mainte.py @@ -143,7 +143,7 @@ async def inst_emp_csv_upload( elif not csv_filename.endswith('.csv'): 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未満にしてください。') + error_message_list.append('選択されたCSVファイルサイズが大きいです。20MB未満にしてください。') else: mainte_csv_up = master_mainte_service.prepare_mainte_csv_up_view( TextIOWrapper(BytesIO(await csv_upload_form.csv_file.read()), encoding='utf-8'),