4nk/lecoffre-back
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into staging

Browse Source
This commit is contained in:
Vins 2023-09-25 11:39:40 +02:00
commit 902eb23556
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/entries/Cron.ts
View File

@ -13,6 +13,7 @@ import CronService from "@Services/common/CronService/CronService";
Container.get(CronService).archiveFiles(); Container.get(CronService).archiveFiles();
await Container.get(CronService).updateUsers(); await Container.get(CronService).updateUsers();
if(variables.ENV !== "dev"){ if(variables.ENV !== "dev"){
console.log("STG Good");
Container.get(CronService).sendMails(); Container.get(CronService).sendMails();
Container.get(CronService).sendRecapMails(); Container.get(CronService).sendRecapMails();
} }

8
src/services/common/MailchimpService/MailchimpService.ts
View File

@ -52,7 +52,9 @@ export default class MailchimpService extends BaseService {
* @throws {Error} If email cannot be sent * @throws {Error} If email cannot be sent
*/ */
public async sendEmails() { public async sendEmails() {
console.log("sendEmails");
const emailsToSend = await this.get({ where: { sentAt: null } }); const emailsToSend = await this.get({ where: { sentAt: null } });
console.log(emailsToSend);
const currentDate = new Date(); const currentDate = new Date();
let nextTrySendDate = null; let nextTrySendDate = null;
@ -72,12 +74,14 @@ export default class MailchimpService extends BaseService {
//If the next try send date is passed, we send the email //If the next try send date is passed, we send the email
if (currentDate >= nextTrySendDate) { if (currentDate >= nextTrySendDate) {
console.log("if currentDate > nextTrySendDate");
try { try {
await this.sendEmail(email); await this.sendEmail(email);
email.sentAt = currentDate; email.sentAt = currentDate;
} catch (error) { } catch (error) {
email.lastTrySendDate = currentDate; email.lastTrySendDate = currentDate;
email.nbTrySend = email.nbTrySend! + 1; email.nbTrySend = email.nbTrySend! + 1;
console.log(error);
} }
await this.update(email.uid, email); await this.update(email.uid, email);
} }
@ -85,7 +89,11 @@ export default class MailchimpService extends BaseService {
} }
private async sendEmail(email: Emails) { private async sendEmail(email: Emails) {
console.log("sendEmail");
const apiKey = this.variables.MAILCHIMP_API_KEY; const apiKey = this.variables.MAILCHIMP_API_KEY;
console.log(apiKey);
const mailchimpApiClient = MailchimpClient(apiKey!); const mailchimpApiClient = MailchimpClient(apiKey!);
await mailchimpApiClient.messages.sendTemplate({ await mailchimpApiClient.messages.sendTemplate({