From 3ceee5826009a7bc5ee8cf228d81e4b809d62691 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 27 May 2025 21:47:33 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E4=BB=98=E3=83=86=E3=83=BC?= =?UTF-8?q?=E3=83=96=E3=83=AB=E6=93=8D=E4=BD=9C=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E3=81=AE=E4=BE=8B=E5=A4=96=E7=B3=BB=E3=81=AE=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=82=92=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/manager/jskult_hdke_tbl_manager.py | 3 ++- .../manager/test_jskult_hdke_tbl_manager.py | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ecs/jskult-batch/src/manager/jskult_hdke_tbl_manager.py b/ecs/jskult-batch/src/manager/jskult_hdke_tbl_manager.py index f6c8a9f0..f17abfb3 100644 --- a/ecs/jskult-batch/src/manager/jskult_hdke_tbl_manager.py +++ b/ecs/jskult-batch/src/manager/jskult_hdke_tbl_manager.py @@ -108,10 +108,11 @@ class JskultHdkeTblManager: try: # 日次バッチ処置中フラグ、dump処理状態区分を取得 batch_processing_flag, dump_status_kbn, _ = self.get_batch_statuses() - except DBException as e: + except Exception as e: raise BatchOperationException(e) finally: self._db.disconnect() + # 日次バッチ処理中ではない場合、後続の処理は行わない if batch_processing_flag != constants.BATCH_ACTF_BATCH_START: return False diff --git a/ecs/jskult-batch/tests/manager/test_jskult_hdke_tbl_manager.py b/ecs/jskult-batch/tests/manager/test_jskult_hdke_tbl_manager.py index 68f13943..52abe68a 100644 --- a/ecs/jskult-batch/tests/manager/test_jskult_hdke_tbl_manager.py +++ b/ecs/jskult-batch/tests/manager/test_jskult_hdke_tbl_manager.py @@ -1,6 +1,7 @@ import pytest from src.db.database import Database +from src.error.exceptions import BatchOperationException from src.manager.jskult_hdke_tbl_manager import JskultHdkeTblManager @@ -60,6 +61,17 @@ class TestJskultHdkeTblManager: assert dump_sts_kbn == '2' assert syor_date == '2025/05/30' + def test_get_batch_statuses_raise_exception(self): + """ + 日付テーブルのレコードがない場合、例外が送出されること + """ + # Arrange + # 日付テーブルを作成しない + # Act + sut = JskultHdkeTblManager() + with pytest.raises(BatchOperationException): + sut.get_batch_statuses() + def test_update_batch_process_start(self): """ 日付テーブルの日次バッチ処理中フラグを1(処理中)に更新できること @@ -172,3 +184,14 @@ class TestJskultHdkeTblManager: # Assert assert actual is False + + def test_can_run_process_raise_exception(self): + """ + 日付テーブルのレコードがない場合、例外が送出されること + """ + # Arrange + # 日付テーブルを作成しない + # Act + sut = JskultHdkeTblManager() + with pytest.raises(BatchOperationException): + sut.can_run_process()