From 72f719528b1ea0ab072c66aad1968351b6202eb1 Mon Sep 17 00:00:00 2001 From: Michael Hnat Date: Fri, 22 May 2026 13:27:20 +0200 Subject: [PATCH 1/3] PRESIDECMS-3289 corrected the field name from opener_count to open_count --- .vscode/settings.json | 3 +++ system/services/email/EmailLoggingService.cfc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..d3bc18aab6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "gitflow.disableOnRepo": true +} \ No newline at end of file diff --git a/system/services/email/EmailLoggingService.cfc b/system/services/email/EmailLoggingService.cfc index d3f9302307..6e58955033 100644 --- a/system/services/email/EmailLoggingService.cfc +++ b/system/services/email/EmailLoggingService.cfc @@ -351,7 +351,7 @@ component { , string ipAddress = cgi.remote_addr , date eventDate = Now() ) { - var data = { opened = true, opened_count=1 }; + var data = { opened = true, open_count=1 }; if ( !arguments.softMark ) { data.opened_date = _getNow(); From 50ad29c65d0242b50901d63a8c1be3b15eef55af Mon Sep 17 00:00:00 2001 From: Michael Hnat Date: Fri, 22 May 2026 13:28:20 +0200 Subject: [PATCH 2/3] removed settings.json for vscode --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index d3bc18aab6..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "gitflow.disableOnRepo": true -} \ No newline at end of file From b09d5e1986e0636d0589a19fb46180a513aefeaf Mon Sep 17 00:00:00 2001 From: Michael Hnat Date: Mon, 1 Jun 2026 13:01:05 +0200 Subject: [PATCH 3/3] PRESIDECMS-3289 Due too the typo the test also needs to be modified. --- tests/unit/api/email/EmailLoggingServiceTest.cfc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/api/email/EmailLoggingServiceTest.cfc b/tests/unit/api/email/EmailLoggingServiceTest.cfc index 80d1438102..253278abd7 100644 --- a/tests/unit/api/email/EmailLoggingServiceTest.cfc +++ b/tests/unit/api/email/EmailLoggingServiceTest.cfc @@ -332,7 +332,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" { expect( mockLogDao.$callLog().updateData[ 1 ] ).toBe( { filter = "id = :id and ( opened is null or opened = :opened )" , filterParams = { id=logId, opened=false } - , data = { opened=true, opened_date=nowish, opened_count=1 } + , data = { opened=true, opened_date=nowish, open_count=1 } } ); expect( service.$callLog().markAsDelivered.len() ).toBe( 1 ); expect( service.$callLog().markAsDelivered[1] ).toBe( [ logId, true ] ); @@ -356,7 +356,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" { expect( mockLogDao.$callLog().updateData[ 1 ] ).toBe( { filter = "id = :id and ( opened is null or opened = :opened )" , filterParams = { id=logId, opened=false } - , data = { opened=true, opened_count=1 } + , data = { opened=true, open_count=1 } } ); expect( service.$callLog().markAsDelivered.len() ).toBe( 1 ); expect( service.$callLog().markAsDelivered[1] ).toBe( [ logId, true ] );