@stamhoofd/models 2.91.0 → 2.93.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/dist/src/factories/RegistrationPeriodFactory.d.ts +2 -1
  2. package/dist/src/factories/RegistrationPeriodFactory.d.ts.map +1 -1
  3. package/dist/src/factories/RegistrationPeriodFactory.js +2 -1
  4. package/dist/src/factories/RegistrationPeriodFactory.js.map +1 -1
  5. package/dist/src/helpers/EmailBuilder.d.ts +1 -2
  6. package/dist/src/helpers/EmailBuilder.d.ts.map +1 -1
  7. package/dist/src/helpers/EmailBuilder.js +7 -21
  8. package/dist/src/helpers/EmailBuilder.js.map +1 -1
  9. package/dist/src/helpers/MemberMerger.d.ts.map +1 -1
  10. package/dist/src/helpers/MemberMerger.js +6 -0
  11. package/dist/src/helpers/MemberMerger.js.map +1 -1
  12. package/dist/src/migrations/1755529026-email-sender-id.sql +2 -0
  13. package/dist/src/migrations/1755789797-email-counts-errors.sql +7 -0
  14. package/dist/src/migrations/1755789798-email-recipient-errors.sql +2 -0
  15. package/dist/src/migrations/1756115313-email-recipient-ids-and-errors.sql +10 -0
  16. package/dist/src/migrations/1756115314-email-recipient-email-optional.sql +2 -0
  17. package/dist/src/migrations/1756115315-email-recipients-count.sql +3 -0
  18. package/dist/src/migrations/1756115316-email-cached-counts.sql +4 -0
  19. package/dist/src/models/Email.d.ts +63 -2
  20. package/dist/src/models/Email.d.ts.map +1 -1
  21. package/dist/src/models/Email.js +559 -194
  22. package/dist/src/models/Email.js.map +1 -1
  23. package/dist/src/models/Email.test.js +151 -43
  24. package/dist/src/models/Email.test.js.map +1 -1
  25. package/dist/src/models/EmailRecipient.d.ts +31 -1
  26. package/dist/src/models/EmailRecipient.d.ts.map +1 -1
  27. package/dist/src/models/EmailRecipient.js +53 -2
  28. package/dist/src/models/EmailRecipient.js.map +1 -1
  29. package/dist/src/models/WebshopUitpasNumber.d.ts +2 -1
  30. package/dist/src/models/WebshopUitpasNumber.d.ts.map +1 -1
  31. package/dist/src/models/WebshopUitpasNumber.js +20 -3
  32. package/dist/src/models/WebshopUitpasNumber.js.map +1 -1
  33. package/package.json +2 -2
  34. package/src/factories/RegistrationPeriodFactory.ts +3 -2
  35. package/src/helpers/EmailBuilder.ts +9 -24
  36. package/src/helpers/MemberMerger.ts +7 -0
  37. package/src/migrations/1755529026-email-sender-id.sql +2 -0
  38. package/src/migrations/1755789797-email-counts-errors.sql +7 -0
  39. package/src/migrations/1755789798-email-recipient-errors.sql +2 -0
  40. package/src/migrations/1756115313-email-recipient-ids-and-errors.sql +10 -0
  41. package/src/migrations/1756115314-email-recipient-email-optional.sql +2 -0
  42. package/src/migrations/1756115315-email-recipients-count.sql +3 -0
  43. package/src/migrations/1756115316-email-cached-counts.sql +4 -0
  44. package/src/models/Email.test.ts +165 -44
  45. package/src/models/Email.ts +639 -207
  46. package/src/models/EmailRecipient.ts +46 -2
  47. package/src/models/WebshopUitpasNumber.ts +23 -3
@@ -1,10 +1,11 @@
1
1
  import { Factory } from '@simonbackx/simple-database';
2
- import { RegistrationPeriod } from '../models';
2
+ import { Organization, RegistrationPeriod } from '../models';
3
3
  declare class Options {
4
4
  startDate?: Date;
5
5
  endDate?: Date;
6
6
  previousPeriodId?: string;
7
7
  locked?: boolean;
8
+ organization?: Organization;
8
9
  }
9
10
  export declare class RegistrationPeriodFactory extends Factory<Options, RegistrationPeriod> {
10
11
  create(): Promise<RegistrationPeriod>;
@@ -1 +1 @@
1
- {"version":3,"file":"RegistrationPeriodFactory.d.ts","sourceRoot":"","sources":["../../../src/factories/RegistrationPeriodFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,cAAM,OAAO;IACT,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,qBAAa,yBAA0B,SAAQ,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC;IACzE,MAAM,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAe9C"}
1
+ {"version":3,"file":"RegistrationPeriodFactory.d.ts","sourceRoot":"","sources":["../../../src/factories/RegistrationPeriodFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE7D,cAAM,OAAO;IACT,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,qBAAa,yBAA0B,SAAQ,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC;IACzE,MAAM,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAe9C"}
@@ -9,11 +9,12 @@ class Options {
9
9
  endDate;
10
10
  previousPeriodId;
11
11
  locked;
12
+ organization;
12
13
  }
13
14
  class RegistrationPeriodFactory extends simple_database_1.Factory {
14
15
  async create() {
15
16
  const period = new models_1.RegistrationPeriod();
16
- period.organizationId = null;
17
+ period.organizationId = this.options.organization ? this.options.organization.id : null;
17
18
  period.startDate = this.options.startDate ?? new Date(2024, 0, 1, 0, 0, 0, 0);
18
19
  period.endDate = this.options.endDate ?? new Date(2024, 11, 31, 59, 59, 59, 999);
19
20
  if (this.options.previousPeriodId) {
@@ -1 +1 @@
1
- {"version":3,"file":"RegistrationPeriodFactory.js","sourceRoot":"","sources":["../../../src/factories/RegistrationPeriodFactory.ts"],"names":[],"mappings":";;;AAAA,iEAAsD;AACtD,sDAAmE;AAEnE,sCAA+C;AAE/C,MAAM,OAAO;IACT,SAAS,CAAQ;IACjB,OAAO,CAAQ;IACf,gBAAgB,CAAU;IAC1B,MAAM,CAAW;CACpB;AAED,MAAa,yBAA0B,SAAQ,yBAAoC;IAC/E,KAAK,CAAC,MAAM;QACR,MAAM,MAAM,GAAG,IAAI,2BAAkB,EAAE,CAAC;QAExC,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9E,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjF,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAChC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC5D,CAAC;QACD,MAAM,CAAC,QAAQ,GAAG,uCAA0B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;QAE7C,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAhBD,8DAgBC"}
1
+ {"version":3,"file":"RegistrationPeriodFactory.js","sourceRoot":"","sources":["../../../src/factories/RegistrationPeriodFactory.ts"],"names":[],"mappings":";;;AAAA,iEAAsD;AACtD,sDAAmE;AAEnE,sCAA6D;AAE7D,MAAM,OAAO;IACT,SAAS,CAAQ;IACjB,OAAO,CAAQ;IACf,gBAAgB,CAAU;IAC1B,MAAM,CAAW;IACjB,YAAY,CAAgB;CAC/B;AAED,MAAa,yBAA0B,SAAQ,yBAAoC;IAC/E,KAAK,CAAC,MAAM;QACR,MAAM,MAAM,GAAG,IAAI,2BAAkB,EAAE,CAAC;QAExC,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACxF,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9E,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjF,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAChC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC5D,CAAC;QACD,MAAM,CAAC,QAAQ,GAAG,uCAA0B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;QAE7C,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAhBD,8DAgBC"}
@@ -42,9 +42,8 @@ export type EmailBuilderOptions = {
42
42
  to: string;
43
43
  }[];
44
44
  callback?: (error: Error | null) => void;
45
+ headers?: Record<string, string>;
45
46
  };
46
- export declare function replaceHtml(html: string, replacements: Replacement[]): string;
47
- export declare function replaceText(text: string, replacements: Replacement[]): string;
48
47
  /**
49
48
  * @param organization defines replacements and unsubsribe behaviour
50
49
  */
@@ -1 +1 @@
1
- {"version":3,"file":"EmailBuilder.d.ts","sourceRoot":"","sources":["../../../src/helpers/EmailBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EmailBuilder.d.ts","sourceRoot":"","sources":["../../../src/helpers/EmailBuilder.ts"],"names":[],"mappings":"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"}
@@ -4,8 +4,6 @@ exports.getEmailTemplate = getEmailTemplate;
4
4
  exports.canSendFromEmail = canSendFromEmail;
5
5
  exports.getDefaultEmailFrom = getDefaultEmailFrom;
6
6
  exports.sendEmailTemplate = sendEmailTemplate;
7
- exports.replaceHtml = replaceHtml;
8
- exports.replaceText = replaceText;
9
7
  exports.getEmailBuilder = getEmailBuilder;
10
8
  exports.fillRecipientReplacements = fillRecipientReplacements;
11
9
  const email_1 = require("@stamhoofd/email");
@@ -187,20 +185,6 @@ async function getEmailBuilderForTemplate(organization, options) {
187
185
  html: template.html,
188
186
  });
189
187
  }
190
- function replaceHtml(html, replacements) {
191
- let replacedHtml = html;
192
- for (const replacement of replacements) {
193
- replacedHtml = replacedHtml.replaceAll('{{' + replacement.token + '}}', replacement.html || utility_1.Formatter.escapeHtml(replacement.value));
194
- }
195
- return replacedHtml;
196
- }
197
- function replaceText(text, replacements) {
198
- let replacedText = text;
199
- for (const replacement of replacements) {
200
- replacedText = replacedText.replaceAll('{{' + replacement.token + '}}', replacement.value);
201
- }
202
- return replacedText;
203
- }
204
188
  /**
205
189
  * @param organization defines replacements and unsubsribe behaviour
206
190
  */
@@ -215,7 +199,7 @@ async function getEmailBuilder(organization, email) {
215
199
  // Ignore
216
200
  if (email.callback) {
217
201
  email.callback(new simple_errors_1.SimpleError({
218
- code: 'email_hard_bounce',
202
+ code: 'email_skipped_hard_bounce',
219
203
  message: 'Recipient has hard bounced',
220
204
  human: $t(`af49a569-ce88-48d9-ac37-81e594e16c03`),
221
205
  }));
@@ -226,7 +210,7 @@ async function getEmailBuilder(organization, email) {
226
210
  // Ignore
227
211
  if (email.callback) {
228
212
  email.callback(new simple_errors_1.SimpleError({
229
- code: 'email_spam',
213
+ code: 'email_skipped_spam',
230
214
  message: 'Recipient has marked as spam',
231
215
  human: $t(`e6523f56-397e-4127-8bf7-8396f6f25a62`),
232
216
  }));
@@ -238,8 +222,9 @@ async function getEmailBuilder(organization, email) {
238
222
  // Ignore
239
223
  if (email.callback) {
240
224
  email.callback(new simple_errors_1.SimpleError({
241
- code: 'email_unsubscribed',
225
+ code: 'email_skipped_unsubscribed',
242
226
  message: unsubscribe.unsubscribedAll ? 'Recipient has unsubscribed' : (unsubscribe.hardBounce ? 'Recipient has hard bounced' : (unsubscribe.markedAsSpam ? 'Recipient has marked as spam' : 'Recipient has unsubscribed from marketing')),
227
+ human: $t('De ontvanger heeft zich afgemeld voor e-mails'),
243
228
  }));
244
229
  }
245
230
  continue;
@@ -251,6 +236,7 @@ async function getEmailBuilder(organization, email) {
251
236
  }));
252
237
  // Override headers
253
238
  recipient.headers = {
239
+ ...email.headers,
254
240
  'List-Unsubscribe': STAMHOOFD.domains.defaultBroadcastEmail !== undefined ? '<mailto:unsubscribe+' + unsubscribe.id + '@' + STAMHOOFD.domains.defaultBroadcastEmail[''] + `>, <${unsubscribeUrl}>` : `<${unsubscribeUrl}>`,
255
241
  'List-Unsubscribe-Post': 'List-Unsubscribe=One-Click',
256
242
  };
@@ -293,8 +279,8 @@ async function getEmailBuilder(organization, email) {
293
279
  if (!recipient) {
294
280
  return undefined;
295
281
  }
296
- const replacedHtml = replaceHtml(email.html, recipient.replacements);
297
- const replacedSubject = replaceText(email.subject, recipient.replacements);
282
+ const replacedHtml = (0, structures_1.replaceEmailHtml)(email.html, recipient.replacements);
283
+ const replacedSubject = (0, structures_1.replaceEmailText)(email.subject, recipient.replacements);
298
284
  emailIndex += 1;
299
285
  return {
300
286
  from: email.from,
@@ -1 +1 @@
1
- {"version":3,"file":"EmailBuilder.js","sourceRoot":"","sources":["../../../src/helpers/EmailBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EmailBuilder.js","sourceRoot":"","sources":["../../../src/helpers/EmailBuilder.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"MemberMerger.d.ts","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"AAWA,OAAO,EAGH,MAAM,EAMT,MAAM,WAAW,CAAC;AAEnB,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAU3D;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAS,EACT,QAAQ,EACR,QAAQ,GACX,EAAE;IACC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAMpB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoChF;AA8HD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAgGpE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB,CASA"}
1
+ {"version":3,"file":"MemberMerger.d.ts","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"AAWA,OAAO,EAGH,MAAM,EAMT,MAAM,WAAW,CAAC;AAEnB,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAU3D;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAS,EACT,QAAQ,EACR,QAAQ,GACX,EAAE;IACC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAMpB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2ChF;AA8HD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAgGpE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB,CASA"}
@@ -44,6 +44,12 @@ async function mergeTwoMembers(base, other) {
44
44
  }
45
45
  // Force review of all details
46
46
  base.details.reviewTimes.clearAll();
47
+ base.details.cleanData();
48
+ if (other.existsInDatabase && other.details.memberNumber && other.details.memberNumber === base.details.memberNumber) {
49
+ // Clear member number first, because that will cause duplicate member number mysql errors
50
+ other.details.memberNumber = null;
51
+ await other.save();
52
+ }
47
53
  await base.save();
48
54
  if (other.existsInDatabase) {
49
55
  console.log('Deleting duplicate member', other.id, other.details.name);
@@ -1 +1 @@
1
- {"version":3,"file":"MemberMerger.js","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MemberMerger.js","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":";;AAsBA,oDAUC;AAED,4CAcC;AAED,0CA2CC;AA8HD,gDAgGC;AAED,4CAYC;AAzUD,wCAAqD;AACrD,sDAQ+B;AAC/B,gDAA+C;AAC/C,sCASmB;AAEZ,KAAK,UAAU,oBAAoB,CAAC,OAAiB;IACxD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzB,MAAM,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,EACnC,SAAS,EACT,QAAQ,EACR,QAAQ,GAKX;IACG,OAAO,MAAM,eAAM,CAAC,KAAK,CAAC;QACtB,SAAS;QACT,QAAQ;QACR,QAAQ;KACX,CAAC,CAAC;AACP,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,KAAa;IAC7D,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5F,IAAI,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;IAED,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEhC,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,MAAM,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtC,MAAM,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzC,MAAM,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClC,MAAM,8BAA8B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;IACpC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAEzB,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QACnH,0FAA0F;QAC1F,KAAK,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;QAClC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAElB,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEvE,4CAA4C;QAC5C,MAAM,YAAY,GAAG,qBAAY,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7D,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;QAE1B,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;AACL,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,IAAY,EAAE,KAAa;IACzD,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAY,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAY,EAAE,KAAa;IACjD,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,aAAI,CAAC,CAAC;AACzC,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,IAAY,EAAE,KAAa;IAC5D,KAAK,UAAU,mBAAmB,CAAC,QAAgB;QAC/C,MAAM,IAAI,GAAG,MAAM,SAAG,CAAC,MAAM,EAAE;aAC1B,IAAI,CAAC,SAAG,CAAC,KAAK,CAAC,mCAA0B,CAAC,KAAK,CAAC,CAAC;aACjD,KAAK,CAAC,SAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC;aACvC,KAAK,EAAE,CAAC;QAEb,OAAO,mCAA0B,CAAC,QAAQ,CACtC,IAAI,EACJ,mCAA0B,CAAC,KAAK,CACnC,CAAC;IACN,CAAC;IAED,MAAM,qBAAqB,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClE,MAAM,oBAAoB,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhE,wGAAwG;IACxG,KAAK,MAAM,mBAAmB,IAAI,qBAAqB,EAAE,CAAC;QACtD,wCAAwC;QACxC,MAAM,mCAAmC,GACnC,qBAAqB,CAAC,MAAM,CAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,mBAAmB,CAAC,EAAE,CACvC,CAAC;QACN,MAAM,qBAAqB,GAAG,oBAAoB;aAC7C,MAAM,CAAC,mCAAmC,CAAC;aAC3C,MAAM,CAAC,CAAC,kBAAkB,EAAE,EAAE;YAC3B,OAAO,CACH,kBAAkB,CAAC,gBAAgB;oBAC/B,mBAAmB,CAAC,gBAAgB;mBACrC,kBAAkB,CAAC,cAAc;wBAChC,mBAAmB,CAAC,cAAc;mBACnC,kBAAkB,CAAC,OAAO;wBACzB,mBAAmB,CAAC,OAAO;mBAC5B,kBAAkB,CAAC,OAAO,KAAK,IAAI;mBACnC,mBAAmB,CAAC,OAAO,KAAK,IAAI,CAC1C,CAAC;QACN,CAAC,CAAC,CAAC;QAEP,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,wBAAwB,GAAG;gBAC7B,GAAG,qBAAqB;gBACxB,mBAAmB;aACtB;gBACG,oBAAoB;iBACnB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAEnE,MAAM,iCAAiC,GACjC,wBAAwB,CAAC,CAAC,CAAC,CAAC;YAElC,MAAM,wBAAwB,GAAG,wBAAwB,CAAC,KAAK,CAC3D,CAAC,EACD,SAAS,CACZ,CAAC;YAEF,KAAK,MAAM,sBAAsB,IAAI,wBAAwB,EAAE,CAAC;gBAC5D,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAC1C,sBAAsB,CACzB,CAAC;gBACF,IAAI,SAAS,KAAK,CAAC,CAAC;oBAAE,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;qBAC3D,CAAC;oBACF,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAC5C,sBAAsB,CACzB,CAAC;oBACF,IAAI,UAAU,KAAK,CAAC,CAAC;wBACjB,qBAAqB,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBACpD,CAAC;gBAED,IAAI,sBAAsB,CAAC,gBAAgB,EAAE,CAAC;oBAC1C,MAAM,sBAAsB,CAAC,MAAM,EAAE,CAAC;gBAC1C,CAAC;YACL,CAAC;YAED,IAAI,iCAAiC,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;gBACzD,iCAAiC,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;gBACrD,MAAM,iCAAiC,CAAC,IAAI,EAAE,CAAC;YACnD,CAAC;QACL,CAAC;aACI,CAAC;YACF,mBAAmB,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;YACvC,MAAM,mBAAmB,CAAC,IAAI,EAAE,CAAC;QACrC,CAAC;IACL,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAY,EAAE,KAAa;IACxD,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,oBAAW,CAAC,CAAC;AAChD,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,KAAa;IACrD,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAQ,CAAC,CAAC;AAC7C,CAAC;AAED,KAAK,UAAU,8BAA8B,CAAC,IAAY,EAAE,KAAa;IACrE,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,iCAAwB,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,iBAAkB,SAAQ,oBAAc;IAC1C,QAAQ,CAAgB;CAC3B;AAED,KAAK,UAAU,WAAW,CACtB,IAAY,EACZ,KAAa,EACb,KAAQ;IAER,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IACvB,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QAClC,QAAQ,EAAE,KAAK,CAAC,EAAE;KACrB,CAAC,CAAC;IAEH,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACnC,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC;QAC7B,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;AACL,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAY,EAAE,KAAa;IAC1D,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC;IACjC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;IACnC,WAAW,CAAC,SAAS,EAAE,CAAC;IACxB,YAAY,CAAC,SAAS,EAAE,CAAC;IAEzB,iBAAiB;IACjB,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAChE,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAE/D,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IACnE,WAAW,CAAC,WAAW,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IAEvD,QAAQ;IACR,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAEtC,QAAQ;IACR,UAAU,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAEnD,SAAS;IACT,IAAI,YAAY,CAAC,MAAM,KAAK,mBAAM,CAAC,KAAK,EAAE,CAAC;QACvC,WAAW,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IAC7C,CAAC;IAED,QAAQ;IACR,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAEtC,OAAO;IACP,KAAK,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAE7C,iBAAiB;IACjB,8BAA8B,CAC1B,WAAW,EACX,YAAY,EACZ,0BAA0B,CAC7B,CAAC;IAEF,8BAA8B,CAC1B,WAAW,EACX,YAAY,EACZ,iBAAiB,CACpB,CAAC;IAEF,UAAU;IACV,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAErD,UAAU;IACV,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAExC,qBAAqB;IACrB,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM;IAChE,4CAA4C;IAC5C,YAAY,CAAC,iBAAiB,CAAC,MAAM,CACjC,YAAY,CAAC,EAAE,CACX,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAC9C,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CACpC,CACR,CACJ,CAAC;IAEF,eAAe;IACf,yBAAyB;IACzB,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAExD,UAAU;IACV,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAExC,kBAAkB;IAClB,WAAW,CAAC,gBAAgB,GAAG,mBAAS,CAAC,WAAW,CAChD,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAC/B,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAChC,KAAK,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CACjC,CACJ,CACJ,CAAC;IACF,WAAW,CAAC,gBAAgB,GAAG,mBAAS,CAAC,WAAW,CAChD,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAC/B,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAChC,KAAK,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CACjC,CACJ,CACJ,CAAC;IAEF,uBAAuB;IACvB,KAAK,MAAM,OAAO,IAAI,YAAY,CAAC,mBAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAClE,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;IACL,CAAC;IAED,MAAM;IACN,WAAW,CAAC,MAAM,GAAG,mBAAS,CAAC,WAAW,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;IAEvH,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;QACX,WAAW,CAAC,MAAM,GAAG,mBAAS,CAAC,WAAW,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAClF,CAAC;AACL,CAAC;AAED,SAAgB,gBAAgB,CAAC,OAAiB;IAI9C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CACvB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CACtH,CAAC;IAEF,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,SAAS,YAAY,CAAC,IAAmB,EAAE,KAAoB;IAC3D,MAAM,UAAU,GAA8B,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1E,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE3C,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACzC,CAAC;aACI,IAAI,WAAW,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YAC3C,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACzC,CAAC;aACI,CAAC;YACF,yEAAyE;QAC7E,CAAC;IACL,CAAC;IACD,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC;AACpC,CAAC;AAED,SAAS,UAAU,CAAC,IAAmB,EAAE,KAAoB;IACzD,IAAI,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;QAC1D,IAAI,CAAC,KAAK,GAAG,GAAG,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;IACjD,CAAC;SACI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QACzB,OAAO;IACX,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,IAAmB,EAAE,KAAoB;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC;IACjC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;IACnC,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACrC,oCAAoC;QACpC,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,CACpC,UAAU,CAAC,EAAE,CACT,mBAAmB,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC;eACtD,mBAAmB,CAAC,UAAU,EAAE,WAAW,EAAE,UAAU,CAAC,CAClE,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC/B,SAAS;QACb,CAAC;QAED,WAAW,CAAC,eAAe,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,WAAW,CAAC,IAAY,EAAE,KAAa,EAAE,WAA0B;IACxE,IAAI,KAAK,CAAC,IAAI,KAAK,uBAAU,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;IACD,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IACtC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACrC,yCAAyC;IACzC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxB,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IACrC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,UAAU,CACf,IAA2D,EAC3D,KAA4D;IAE5D,MAAM,SAAS,GAAG,mBAAS,CAAC,WAAW,CACnC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC;SAC3E,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;SACvB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CACtC,CAAC;IACF,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC;IACvC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CACf,IAA0C,EAC1C,KAA2C,EAC3C,WAA0B;IAE1B,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC;IACjC,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACxD,IAAI,aAAa,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QACjD,IACI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,aAAa,CAAC,EACtE,CAAC;YACC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAc,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CACjB,IAA6C,EAC7C,KAA8C,EAC9C,WAA0B;IAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC;IACjC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;IAEnC,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,OAAO;IACX,CAAC;IAED,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC;IAE5B,IAAI,WAAW,IAAI,WAAW,CAAC,EAAE,KAAK,YAAY,CAAC,EAAE,EAAE,CAAC;QACpD,2CAA2C;QAC3C,IACI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CACjC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,WAAW,CAAC,EAAE,CAC3C,EACH,CAAC;YACC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAChB,IAAO,EACP,KAAQ,EACR,GAA6D;IAE7D,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAA8B,CAAC;IAC3D,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IAEA,IAAI,CAAC,GAAG,CAA+B,GAAG,UAAU,CAAC;IAEtD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,uBAAuB,CAC5B,IAAO,EACP,KAAQ,EACR,GAA6D;IAE7D,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAA8B,CAAC;IAC3D,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAA8B,CAAC,EAAE,CAAC;QACzD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEA,IAAI,CAAC,GAAG,CAA+B,GAAG,UAAU,CAAC;IAEtD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,KAAK,CACV,IAAO,EACP,KAAQ,EACR,GACyE;IAEzE,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAA+C,CAAC;IAC5E,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,CAAC,GAAG,CAAgD,GAAG,UAAU,CAAC;IACvE,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,8BAA8B,CACnC,IAAO,EACP,KAAQ,EACR,GAAoE;IAEpE,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAqC,CAAC;IAClE,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAElE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAqC,CAAC;IAChE,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QAC/C,IAAI,CAAC,GAAG,CAAsC,GAAG,UAAU,CAAC;QAC7D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,SAAS,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QAClC,IAAI,CAAC,GAAG,CAAsC,GAAG,UAAU,CAAC;QAC7D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,mBAAmB,CACxB,CAAI,EACJ,CAAI,EACJ,GAA6D;IAE7D,OAAO,kBAAkB,CACrB,CAAC,CAAC,GAAG,CAA8B,EACnC,CAAC,CAAC,GAAG,CAA8B,CACtC,CAAC;AACN,CAAC;AAED,SAAS,kBAAkB,CACvB,CAA4B,EAC5B,CAA4B;IAE5B,IAAI,aAAa,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACvD,OAAO,aAAa,CAAC,CAAW,EAAE,CAAW,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,aAAa,CAAC,CAAS,EAAE,CAAS;IACvC,OAAO,WAAW,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;AACrC,CAAC;AAED,SAAS,aAAa,CAAC,KAAgC;IACnD,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;AACxE,CAAC"}
@@ -0,0 +1,2 @@
1
+ ALTER TABLE `emails`
2
+ ADD COLUMN `senderId` varchar(36) NULL AFTER `organizationId`;
@@ -0,0 +1,7 @@
1
+ ALTER TABLE `emails`
2
+ ADD COLUMN `succeededCount` int NOT NULL DEFAULT '0' AFTER `recipientCount`,
3
+ ADD COLUMN `softFailedCount` int NOT NULL DEFAULT '0' AFTER `recipientCount`,
4
+ ADD COLUMN `failedCount` int NOT NULL DEFAULT '0' AFTER `recipientCount`,
5
+ ADD COLUMN `membersCount` int NOT NULL DEFAULT '0' AFTER `recipientCount`,
6
+ ADD COLUMN `recipientsErrors` json NULL AFTER `recipientsStatus`,
7
+ ADD COLUMN `emailErrors` json NULL AFTER `status`;
@@ -0,0 +1,2 @@
1
+ ALTER TABLE `email_recipients`
2
+ ADD COLUMN `failError` json NULL AFTER `failErrorMessage`;
@@ -0,0 +1,10 @@
1
+ ALTER TABLE `email_recipients`
2
+ ADD COLUMN `spamComplaintError` text NULL AFTER `objectId`,
3
+ ADD COLUMN `softBounceError` text NULL AFTER `objectId`,
4
+ ADD COLUMN `hardBounceError` text NULL AFTER `objectId`,
5
+ ADD COLUMN `organizationId` varchar(36) NULL AFTER `objectId`,
6
+ ADD COLUMN `memberId` varchar(36) NULL AFTER `objectId`,
7
+ ADD COLUMN `userId` varchar(36) NULL AFTER `objectId`,
8
+ ADD FOREIGN KEY (`organizationId`) REFERENCES `organizations` (`id`) ON UPDATE CASCADE ON DELETE SET NULL,
9
+ ADD FOREIGN KEY (`memberId`) REFERENCES `members` (`id`) ON UPDATE CASCADE ON DELETE SET NULL,
10
+ ADD FOREIGN KEY (`userId`) REFERENCES `users` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;
@@ -0,0 +1,2 @@
1
+ ALTER TABLE `email_recipients`
2
+ CHANGE `email` `email` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL;
@@ -0,0 +1,3 @@
1
+ ALTER TABLE `emails`
2
+ CHANGE `recipientCount` `emailRecipientsCount` int NULL,
3
+ ADD COLUMN `otherRecipientsCount` int NULL AFTER `emailRecipientsCount`;
@@ -0,0 +1,4 @@
1
+ ALTER TABLE `emails`
2
+ ADD COLUMN `spamComplaintsCount` int NOT NULL DEFAULT '0' AFTER `softFailedCount`,
3
+ ADD COLUMN `softBouncesCount` int NOT NULL DEFAULT '0' AFTER `softFailedCount`,
4
+ ADD COLUMN `hardBouncesCount` int NOT NULL DEFAULT '0' AFTER `softFailedCount`;
@@ -1,11 +1,15 @@
1
1
  import { EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailStatus, Email as EmailStruct, EmailTemplateType, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter } from '@stamhoofd/structures';
2
+ import { SimpleErrors } from '@simonbackx/simple-errors';
2
3
  import { EmailInterfaceRecipient } from '@stamhoofd/email';
4
+ import { QueueHandlerOptions } from '@stamhoofd/queues';
3
5
  import { QueryableModel } from '@stamhoofd/sql';
4
6
  import { Organization } from './Organization';
7
+ export declare function isSoftEmailRecipientError(error: SimpleErrors): boolean;
5
8
  export declare class Email extends QueryableModel {
6
9
  static table: string;
7
10
  id: string;
8
11
  organizationId: string | null;
12
+ senderId: string | null;
9
13
  userId: string | null;
10
14
  recipientFilter: EmailRecipientFilter;
11
15
  /**
@@ -20,9 +24,57 @@ export declare class Email extends QueryableModel {
20
24
  text: string | null;
21
25
  fromAddress: string | null;
22
26
  fromName: string | null;
23
- recipientCount: number | null;
27
+ /**
28
+ * Amount of recipients with an email address
29
+ */
30
+ emailRecipientsCount: number | null;
31
+ /**
32
+ * Amount of recipients without an email address
33
+ */
34
+ otherRecipientsCount: number | null;
35
+ /**
36
+ * Amount of recipients that have successfully received the email.
37
+ */
38
+ succeededCount: number;
39
+ /**
40
+ * Amount of recipients that somehow failed to receive the email,
41
+ * but with a soft error that doesn't require action.
42
+ * - Duplicate email in recipient list
43
+ * - Unsubscribed
44
+ */
45
+ softFailedCount: number;
46
+ /**
47
+ * Amount of recipients that somehow failed to receive the email:
48
+ * - Invalid email address
49
+ * - Full email inbox
50
+ */
51
+ failedCount: number;
52
+ /**
53
+ * Unique amount of members that are in the recipients list.
54
+ */
55
+ membersCount: number;
56
+ /**
57
+ * Does only include bounces AFTER sending the email
58
+ */
59
+ hardBouncesCount: number;
60
+ /**
61
+ * Does only include bounces AFTER sending the email
62
+ */
63
+ softBouncesCount: number;
64
+ /**
65
+ * Does only include bounces AFTER sending the email
66
+ */
67
+ spamComplaintsCount: number;
24
68
  status: EmailStatus;
25
69
  recipientsStatus: EmailRecipientsStatus;
70
+ /**
71
+ * Errors related to creating the recipients.
72
+ */
73
+ recipientsErrors: SimpleErrors | null;
74
+ /**
75
+ * Errors related to sending the email.
76
+ */
77
+ emailErrors: SimpleErrors | null;
26
78
  /**
27
79
  * todo: ignore automatically
28
80
  */
@@ -34,6 +86,10 @@ export declare class Email extends QueryableModel {
34
86
  fetch(request: LimitedFilteredRequest, subfilter: StamhoofdFilter | null): Promise<PaginatedResponse<EmailRecipientStruct[], LimitedFilteredRequest>>;
35
87
  count(request: LimitedFilteredRequest, subfilter: StamhoofdFilter | null): Promise<number>;
36
88
  }>;
89
+ static pendingNotificationCountUpdates: Map<string, {
90
+ timer: NodeJS.Timeout | null;
91
+ lastUpdate: Date | null;
92
+ }>;
37
93
  throwIfNotReadyToSend(): void;
38
94
  validateAttachments(): void;
39
95
  getFromAddress(): {
@@ -45,7 +101,12 @@ export declare class Email extends QueryableModel {
45
101
  };
46
102
  getDefaultFromAddress(organization?: Organization | null): EmailInterfaceRecipient;
47
103
  setFromTemplate(type: EmailTemplateType): Promise<boolean>;
48
- send(): Promise<Email | null>;
104
+ lock<T>(callback: (upToDate: Email, options: QueueHandlerOptions) => Promise<T> | T): Promise<T>;
105
+ static bumpNotificationCount(emailId: string, type: 'hard-bounce' | 'soft-bounce' | 'complaint'): Promise<void>;
106
+ static checkNeedsNotificationCountUpdate(emailId: string, didUpdate?: boolean): Promise<void>;
107
+ static updateNotificationsCounts(emailId: string): Promise<void>;
108
+ queueForSending(waitForSending?: boolean): Promise<Email | null>;
109
+ resumeSending(): Promise<Email | null>;
49
110
  updateCount(): void;
50
111
  buildRecipients(): Promise<void>;
51
112
  buildExampleRecipient(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"Email.d.ts","sourceRoot":"","sources":["../../../src/models/Email.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,cAAc,IAAI,oBAAoB,EAAE,WAAW,EAAE,KAAK,IAAI,WAAW,EAAE,iBAAiB,EAAuB,sBAAsB,EAAE,iBAAiB,EAAqB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAM/U,OAAO,EAAuB,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;AAInE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,KAAM,SAAQ,cAAc;IACrC,MAAM,CAAC,KAAK,SAAY;IAOxB,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGrC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG7B,eAAe,EAAE,oBAAoB,CAAmC;IAExE;;;OAGG;IAEH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGhC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB,8CAA8C;IAE9C,IAAI,EAAE,GAAG,CAAM;IAGf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGlC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGrC,MAAM,cAAqB;IAG3B,gBAAgB,wBAAoC;IAEpD;;OAEG;IAEH,WAAW,EAAE,eAAe,EAAE,CAAM;IAMpC,MAAM,EAAE,IAAI,GAAG,IAAI,CAAQ;IAY3B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAEhB,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,wBAAwB,EAAE;QACnD,KAAK,CAAC,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,eAAe,GAAG,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACtJ,KAAK,CAAC,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,eAAe,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;KAC9F,CAAC,CAAa;IAEf,qBAAqB;IAoCrB,mBAAmB;IAgEnB,cAAc;;;;;;;IAad,qBAAqB,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,GAAG,uBAAuB;IAoB5E,eAAe,CAAC,IAAI,EAAE,iBAAiB;IAsBvC,IAAI,IAAI,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAuQnC,WAAW;IAuDL,eAAe;IA0Ff,qBAAqB;IAmE3B,YAAY;IAIN,mBAAmB;CA8B5B"}
1
+ {"version":3,"file":"Email.d.ts","sourceRoot":"","sources":["../../../src/models/Email.ts"],"names":[],"mappings":"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"}