From 22b8566f7d9c265ee0d02f2ff54750a9f0a3d62e Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Wed, 8 Jul 2026 13:56:06 +0200 Subject: [PATCH 1/2] Update folio-export-common with email format on EDI email fields Pin the submodule to the MODEXPW-642 branch and advance it to the commit that adds email format validation to the ediEmail address fields. --- .gitmodules | 1 + folio-export-common | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 214ef69b3..2074469d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "folio-export-common"] path = folio-export-common url = https://github.com/folio-org/folio-export-common.git + branch = MODEXPW-642 diff --git a/folio-export-common b/folio-export-common index 982ad7a55..fcb5d256d 160000 --- a/folio-export-common +++ b/folio-export-common @@ -1 +1 @@ -Subproject commit 982ad7a5552f27a3e836c435b47ac8da1991196a +Subproject commit fcb5d256d1b76cda95b667066313fd6773261cb9 From 5861573182f15a51cb1b367a36da109b908fb222 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Wed, 8 Jul 2026 16:04:09 +0200 Subject: [PATCH 2/2] Support bcc recipients in EDIFACT email export Set the email BCC from the EDI email config in SendToEmailTasklet and bump the required email interface version to 1.2 for the new bcc field. --- descriptors/ModuleDescriptor-template.json | 2 +- folio-export-common | 2 +- .../folio/dew/batch/acquisitions/jobs/SendToEmailTasklet.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index b08b304e9..1172f52bd 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -166,7 +166,7 @@ }, { "id": "email", - "version": "1.1" + "version": "1.2" }, { "id": "template-engine", diff --git a/folio-export-common b/folio-export-common index fcb5d256d..64b758eed 160000 --- a/folio-export-common +++ b/folio-export-common @@ -1 +1 @@ -Subproject commit fcb5d256d1b76cda95b667066313fd6773261cb9 +Subproject commit 64b758eedf25d0942e55a154b3e41ffda39eb577 diff --git a/src/main/java/org/folio/dew/batch/acquisitions/jobs/SendToEmailTasklet.java b/src/main/java/org/folio/dew/batch/acquisitions/jobs/SendToEmailTasklet.java index 83b9a6e9e..becb5642d 100644 --- a/src/main/java/org/folio/dew/batch/acquisitions/jobs/SendToEmailTasklet.java +++ b/src/main/java/org/folio/dew/batch/acquisitions/jobs/SendToEmailTasklet.java @@ -73,6 +73,7 @@ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkCon emailEntity.setNotificationId(jobId); emailEntity.setFrom(ediEmail.getEmailFrom()); emailEntity.setTo(ediEmail.getEmailTo()); + emailEntity.setBcc(ediEmail.getEmailBcc()); var templateResult = resolveTemplate(ediEmail, orders); emailEntity.setHeader(templateResult[0]);