Skip to content

Commit 594a36d

Browse files
committed
Minor fix for logging issue
1 parent ceee691 commit 594a36d

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

filenameprocessor/src/audit_table.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def upsert_audit_table(
6464
return False
6565

6666
# If the file is not already processed, check whether there is a file ahead in the queue already processing
67-
if file_status not in (FileStatus.PROCESSED, FileStatus.DUPLICATE):
67+
if file_status not in (FileStatus.PROCESSED, FileStatus.DUPLICATE, FileStatus.EMPTY):
6868
files_in_processing = dynamodb_resource.Table(AUDIT_TABLE_NAME).query(
6969
IndexName=AUDIT_TABLE_QUEUE_NAME_GSI,
7070
KeyConditionExpression=Key(AuditTableKeys.QUEUE_NAME).eq(queue_name)

filenameprocessor/tests/test_audit_table.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,31 @@ def test_upsert_audit_table(self):
222222
is_existing_file=False,
223223
)
224224

225+
# Test case 8: new file with status of 'Not processed - empty file', and files ahead in the queue.
226+
# File should be added to the audit table, with status 'Not processed - empty file'. Return value should be
227+
# False.
228+
rsv_ravs_test_file_5 = FileDetails("RAVS", "RSV", "YGM41", file_number=5)
229+
230+
result = upsert_audit_table(
231+
message_id=rsv_ravs_test_file_5.message_id,
232+
file_key=rsv_ravs_test_file_5.file_key,
233+
created_at_formatted_str=rsv_ravs_test_file_5.created_at_formatted_string,
234+
queue_name=rsv_ravs_test_file_5.queue_name,
235+
file_status=FileStatus.EMPTY,
236+
is_existing_file=False,
237+
)
238+
239+
self.assertFalse(result)
240+
assert_audit_table_entry(rsv_ravs_test_file_5, FileStatus.EMPTY)
241+
225242
# Final reconciliation: ensure that all of the correct items are in the audit table
226243
table_items = self.get_table_items()
227-
assert len(table_items) == 7
244+
assert len(table_items) == 8
228245
assert_audit_table_entry(MockFileDetails.emis_flu, FileStatus.QUEUED)
229246
assert_audit_table_entry(MockFileDetails.emis_rsv, FileStatus.QUEUED)
230247
assert_audit_table_entry(MockFileDetails.ravs_flu, FileStatus.QUEUED)
231248
assert_audit_table_entry(ravs_rsv_test_file_1, FileStatus.PROCESSED)
232249
assert_audit_table_entry(ravs_rsv_test_file_2, FileStatus.DUPLICATE)
233250
assert_audit_table_entry(ravs_rsv_test_file_3, FileStatus.PROCESSING)
234251
assert_audit_table_entry(rsv_ravs_test_file_4, FileStatus.PROCESSED)
252+
assert_audit_table_entry(rsv_ravs_test_file_5, FileStatus.EMPTY)

0 commit comments

Comments
 (0)