Skip to content

📝 CodeRabbit Chat: Implement requested code changes #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yash-pouranik merged 1 commit into from
May 8, 2026
Merged

📝 CodeRabbit Chat: Implement requested code changes #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions apps/public-api/src/__tests__/mail.controller.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,8 @@ describe('mail.controller', () => {
attemptsMade: 3
};

if (failedHandler) {
await failedHandler(mockJob, new Error("Terminal failure"));
}
expect(failedHandler).toBeDefined();
await failedHandler(mockJob, new Error("Terminal failure"));

expect(mockRedis.eval).toHaveBeenCalledWith(
expect.any(String), 1, 'project:mail:count:proj_1:2026-05'
Expand Down Expand Up @@ -222,9 +221,8 @@ describe('mail.controller', () => {
attemptsMade: 1 // Not terminal yet
};

if (failedHandler) {
await failedHandler(mockJob, new Error("Temporary failure"));
}
expect(failedHandler).toBeDefined();
await failedHandler(mockJob, new Error("Temporary failure"));

expect(mockRedis.eval).not.toHaveBeenCalled();
});
Expand Down
20 changes: 7 additions & 13 deletions packages/common/src/queues/publicEmailQueue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ const initPublicEmailWorker = () => {
// Initialize Worker with Rate Limiting (10 per second to respect Resend limits)
worker = new Worker('public-email-queue', async (job) => {
const { projectId, payload, usingByok, consumedQuotaKey } = job.data;

try {


let clientKey = process.env.RESEND_API_KEY_2 || process.env.RESEND_API_KEY;
let fromAddress = process.env.EMAIL_FROM || "urBackend <urbackend@apps.bitbros.in>";

Expand All @@ -31,8 +29,8 @@ const initPublicEmailWorker = () => {
const decrypted = decrypt(project.resendApiKey);
if (typeof decrypted === 'string' && decrypted.trim().length > 0) {
clientKey = decrypted.trim();
fromAddress = project.resendFromEmail && project.resendFromEmail.trim()
? project.resendFromEmail.trim()
fromAddress = project.resendFromEmail && project.resendFromEmail.trim()
? project.resendFromEmail.trim()
: "onboarding@resend.dev";
}
}
Expand Down Expand Up @@ -65,18 +63,15 @@ const initPublicEmailWorker = () => {
const maskedTo = toList.map(redact).join(', ');

console.log(`[Queue] Processing public email to: ${maskedTo}`);

const { data, error } = await resend.emails.send(finalPayload);

if (error) {
console.error(`[Queue] Failed to send public email to ${maskedTo}:`, error);
throw new Error(error.message || "Failed to send email");
}

return { data };
} catch (err) {
throw err;
}
}, {
connection,
limiter: {
Expand All @@ -94,8 +89,7 @@ const initPublicEmailWorker = () => {
if (job && job.data && job.data.consumedQuotaKey) {
const maxAttempts = job.opts?.attempts || 1;
if (job.attemptsMade >= maxAttempts) {
const luaScript = DECR_IF_EXISTS_SCRIPT;
await connection.eval(luaScript, 1, job.data.consumedQuotaKey).catch(() => {});
await connection.eval(DECR_IF_EXISTS_SCRIPT, 1, job.data.consumedQuotaKey).catch(() => {});
}
}
});
Expand Down