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

指摘事項修正

Browse Source
This commit is contained in:
野間 2023-07-19 15:58:31 +09:00
parent 87e45dca66
commit 7a15f4a2b9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,9 +60,6 @@ async def download_bio_data(
logger.info('検索結果が0件です')
return {'status': 'ok', 'download_url': None}
# ファイルに打ち出すカラムを抽出
# extract_df = search_result_df[constants.BIO_EXTRACT_COLUMNS]
# ファイルを書き出し(Excel or CSV)
local_file_path = _write_bio_data_to_file(bio_service, download_param, search_result_df, download_file_name)

18
ecs/jskult-webapp/src/services/bio_view_service.py
View File

@ -162,8 +162,10 @@ class BioViewService(BaseService):
def upload_bio_data_file(self, local_file_path: str) -> None:
bucket_name = environment.BIO_ACCESS_LOG_BUCKET
# TODO: ファイルパスにYYYY/MM/DDを加える
file_key = f'data/{os.path.basename(local_file_path)}'
dt_now = datetime.now()
ymd = f'{dt_now.year}/{dt_now.strftime("%m")}/{dt_now.strftime("%d")}'
file_key = f'data/{ymd}/{os.path.basename(local_file_path)}'
self.s3_client.upload_file(local_file_path, bucket_name, file_key)
# アップロード後、ローカルからは削除する
@ -171,8 +173,10 @@ class BioViewService(BaseService):
def upload_bio_access_log_file(self, local_file_path: str) -> None:
bucket_name = environment.BIO_ACCESS_LOG_BUCKET
# TODO: ファイルパスにYYYY/MM/DDを加える
file_key = f'log/{os.path.basename(local_file_path)}'
dt_now = datetime.now()
ymd = f'{dt_now.year}/{dt_now.strftime("%m")}/{dt_now.strftime("%d")}'
file_key = f'log/{ymd}/{os.path.basename(local_file_path)}'
self.s3_client.upload_file(local_file_path, bucket_name, file_key)
# アップロード後、ローカルからは削除する
@ -180,8 +184,10 @@ class BioViewService(BaseService):
def generate_download_file_url(self, local_file_path: str, user_id: str, kind: str) -> str:
bucket_name = environment.BIO_ACCESS_LOG_BUCKET
# TODO: ファイルパスにYYYY/MM/DDを加える
file_key = f'data/{os.path.basename(local_file_path)}'
dt_now = datetime.now()
ymd = f'{dt_now.year}/{dt_now.strftime("%m")}/{dt_now.strftime("%d")}'
file_key = f'data/{ymd}/{os.path.basename(local_file_path)}'
download_filename = f'{user_id}_生物由来卸販売データ.{kind}'
return self.s3_client.generate_presigned_url(bucket_name, file_key, download_filename)