Compare commits

..

5 Commits

Author SHA1 Message Date
Dave
043471fdbc feature/IO-3385-Remove-CASL-From-Rome - Remove CASL Report from Rome Customers. 2025-10-15 11:46:51 -04:00
Dave Richer
13a44b9a59 Merged in hotfix/2025-10-10 (pull request #2628)
Hotfix/2025 10 10 - Change BullMQ Key Delimiters based on system logs.

Approved-by: Patrick Fic
2025-10-11 01:35:51 +00:00
Dave
8e6c809fc6 Update 2025-10-10 16:02:56 -04:00
Dave
41afedd02c Change Delemiters in BullMQ, was using an invalid : 2025-10-10 15:58:32 -04:00
Allan Carr
11e0c3e507 Merged in hotfix/2025-10-09 (pull request #2624)
Hotfix/2025 10 09
2025-10-09 17:57:20 +00:00
3 changed files with 23 additions and 15 deletions

View File

@@ -15,21 +15,29 @@ export const EmailSettings = {
export const TemplateList = (type, context) => { export const TemplateList = (type, context) => {
//const { bodyshop } = store.getState().user; //const { bodyshop } = store.getState().user;
const casl = InstanceRenderManager({
imex: {
casl_authorization: {
title: i18n.t("printcenter.jobs.casl_authorization"),
description: "",
subject: i18n.t("printcenter.jobs.casl_authorization"),
key: "casl_authorization",
disabled: false,
group: "authorization",
regions: {
CA: true
}
}
},
rome: {}
});
return { return {
//If there's no type or the type is job, send it back. //If there's no type or the type is job, send it back.
...(!type || type === "job" ...(!type || type === "job"
? { ? {
casl_authorization: { ...casl,
title: i18n.t("printcenter.jobs.casl_authorization"),
description: "",
subject: i18n.t("printcenter.jobs.casl_authorization"),
key: "casl_authorization",
disabled: false,
group: "authorization",
regions: {
CA: true
}
},
fippa_authorization: { fippa_authorization: {
title: i18n.t("printcenter.jobs.fippa_authorization"), title: i18n.t("printcenter.jobs.fippa_authorization"),
description: "", description: "",

View File

@@ -92,7 +92,7 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
"consolidate-notifications", "consolidate-notifications",
{ jobId, recipients }, { jobId, recipients },
{ {
jobId: `consolidate:${jobId}`, jobId: `consolidate-${jobId}`,
delay: APP_CONSOLIDATION_DELAY, delay: APP_CONSOLIDATION_DELAY,
attempts: 3, attempts: 3,
backoff: LOCK_EXPIRATION backoff: LOCK_EXPIRATION
@@ -288,7 +288,7 @@ const dispatchAppsToQueue = async ({ appsToDispatch }) => {
await appQueue.add( await appQueue.add(
"add-notification", "add-notification",
{ jobId, bodyShopId, key, variables, recipients, body, jobRoNumber }, { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber },
{ jobId: `${jobId}:${Date.now()}` } { jobId: `${jobId}-${Date.now()}` }
); );
devDebugLogger(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`); devDebugLogger(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
} }

View File

@@ -86,7 +86,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
"consolidate-emails", "consolidate-emails",
{ jobId, jobRoNumber, bodyShopName, bodyShopTimezone }, { jobId, jobRoNumber, bodyShopName, bodyShopTimezone },
{ {
jobId: `consolidate:${jobId}`, jobId: `consolidate-${jobId}`,
delay: EMAIL_CONSOLIDATION_DELAY, delay: EMAIL_CONSOLIDATION_DELAY,
attempts: 3, attempts: 3,
backoff: LOCK_EXPIRATION backoff: LOCK_EXPIRATION
@@ -252,7 +252,7 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
await emailAddQueue.add( await emailAddQueue.add(
"add-email-notification", "add-email-notification",
{ jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients }, { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients },
{ jobId: `${jobId}:${Date.now()}` } { jobId: `${jobId}-${Date.now()}` }
); );
devDebugLogger(`Added email notification to queue for jobId ${jobId} with ${recipients.length} recipients`); devDebugLogger(`Added email notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
} }