@stamhoofd/models 2.13.0 → 2.17.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.
- package/dist/src/factories/GroupFactory.js +13 -6
- package/dist/src/factories/GroupFactory.js.map +1 -1
- package/dist/src/factories/MemberFactory.js +10 -4
- package/dist/src/factories/MemberFactory.js.map +1 -1
- package/dist/src/factories/OrganizationFactory.js +11 -6
- package/dist/src/factories/OrganizationFactory.js.map +1 -1
- package/dist/src/factories/ParentFactory.js +2 -3
- package/dist/src/factories/ParentFactory.js.map +1 -1
- package/dist/src/factories/RecordFactory.js +1 -0
- package/dist/src/factories/RecordFactory.js.map +1 -1
- package/dist/src/factories/RegisterCodeFactory.js +2 -3
- package/dist/src/factories/RegisterCodeFactory.js.map +1 -1
- package/dist/src/factories/RegistrationFactory.js +2 -0
- package/dist/src/factories/RegistrationFactory.js.map +1 -1
- package/dist/src/factories/UserFactory.js +15 -5
- package/dist/src/factories/UserFactory.js.map +1 -1
- package/dist/src/factories/WebshopFactory.js +7 -3
- package/dist/src/factories/WebshopFactory.js.map +1 -1
- package/dist/src/helpers/DNSValidator.js +1 -2
- package/dist/src/helpers/DNSValidator.js.map +1 -1
- package/dist/src/helpers/EmailBuilder.d.ts +23 -5
- package/dist/src/helpers/EmailBuilder.d.ts.map +1 -1
- package/dist/src/helpers/EmailBuilder.js +73 -21
- package/dist/src/helpers/EmailBuilder.js.map +1 -1
- package/dist/src/helpers/GroupBuilder.js +2 -2
- package/dist/src/helpers/GroupBuilder.js.map +1 -1
- package/dist/src/helpers/Handlebars.js +3 -5
- package/dist/src/helpers/Handlebars.js.map +1 -1
- package/dist/src/helpers/InvoiceBuilder.js +11 -10
- package/dist/src/helpers/InvoiceBuilder.js.map +1 -1
- package/dist/src/helpers/MemberMerger.js +5 -5
- package/dist/src/helpers/MemberMerger.js.map +1 -1
- package/dist/src/helpers/MemberMerger.test.js +14 -27
- package/dist/src/helpers/MemberMerger.test.js.map +1 -1
- package/dist/src/helpers/RateLimiter.d.ts.map +1 -1
- package/dist/src/helpers/RateLimiter.js +10 -5
- package/dist/src/helpers/RateLimiter.js.map +1 -1
- package/dist/src/helpers/WebshopCounter.js +2 -2
- package/dist/src/helpers/WebshopCounter.js.map +1 -1
- package/dist/src/migrations/1605262045-import-postcodes.js +10 -2
- package/dist/src/models/BalanceItem.js +41 -35
- package/dist/src/models/BalanceItem.js.map +1 -1
- package/dist/src/models/BalanceItemPayment.js +14 -11
- package/dist/src/models/BalanceItemPayment.js.map +1 -1
- package/dist/src/models/BuckarooPayment.js +5 -2
- package/dist/src/models/BuckarooPayment.js.map +1 -1
- package/dist/src/models/Document.js +24 -23
- package/dist/src/models/Document.js.map +1 -1
- package/dist/src/models/DocumentTemplate.js +36 -25
- package/dist/src/models/DocumentTemplate.js.map +1 -1
- package/dist/src/models/Email.d.ts.map +1 -1
- package/dist/src/models/Email.js +36 -38
- package/dist/src/models/Email.js.map +1 -1
- package/dist/src/models/EmailRecipient.js +15 -13
- package/dist/src/models/EmailRecipient.js.map +1 -1
- package/dist/src/models/EmailTemplate.d.ts +5 -0
- package/dist/src/models/EmailTemplate.d.ts.map +1 -1
- package/dist/src/models/EmailTemplate.js +30 -7
- package/dist/src/models/EmailTemplate.js.map +1 -1
- package/dist/src/models/EmailVerificationCode.js +32 -25
- package/dist/src/models/EmailVerificationCode.js.map +1 -1
- package/dist/src/models/Event.js +15 -12
- package/dist/src/models/Event.js.map +1 -1
- package/dist/src/models/Group.js +24 -21
- package/dist/src/models/Group.js.map +1 -1
- package/dist/src/models/Image.d.ts +0 -1
- package/dist/src/models/Image.d.ts.map +1 -1
- package/dist/src/models/Image.js +12 -14
- package/dist/src/models/Image.js.map +1 -1
- package/dist/src/models/Member.d.ts.map +1 -1
- package/dist/src/models/Member.js +34 -33
- package/dist/src/models/Member.js.map +1 -1
- package/dist/src/models/MemberPlatformMembership.js +22 -16
- package/dist/src/models/MemberPlatformMembership.js.map +1 -1
- package/dist/src/models/MemberResponsibilityRecord.js +10 -8
- package/dist/src/models/MemberResponsibilityRecord.js.map +1 -1
- package/dist/src/models/MergedMember.js +19 -14
- package/dist/src/models/MergedMember.js.map +1 -1
- package/dist/src/models/MolliePayment.js +5 -2
- package/dist/src/models/MolliePayment.js.map +1 -1
- package/dist/src/models/MollieToken.js +14 -14
- package/dist/src/models/MollieToken.js.map +1 -1
- package/dist/src/models/OneTimeToken.js +15 -13
- package/dist/src/models/OneTimeToken.js.map +1 -1
- package/dist/src/models/Order.d.ts +1 -1
- package/dist/src/models/Order.d.ts.map +1 -1
- package/dist/src/models/Order.js +42 -52
- package/dist/src/models/Order.js.map +1 -1
- package/dist/src/models/Organization.d.ts.map +1 -1
- package/dist/src/models/Organization.js +64 -66
- package/dist/src/models/Organization.js.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.js +8 -7
- package/dist/src/models/OrganizationRegistrationPeriod.js.map +1 -1
- package/dist/src/models/PasswordToken.js +9 -5
- package/dist/src/models/PasswordToken.js.map +1 -1
- package/dist/src/models/PayconiqPayment.js +12 -14
- package/dist/src/models/PayconiqPayment.js.map +1 -1
- package/dist/src/models/Payment.d.ts.map +1 -1
- package/dist/src/models/Payment.js +41 -35
- package/dist/src/models/Payment.js.map +1 -1
- package/dist/src/models/Platform.js +8 -10
- package/dist/src/models/Platform.js.map +1 -1
- package/dist/src/models/RegisterCode.js +12 -9
- package/dist/src/models/RegisterCode.js.map +1 -1
- package/dist/src/models/Registration.d.ts.map +1 -1
- package/dist/src/models/Registration.js +65 -80
- package/dist/src/models/Registration.js.map +1 -1
- package/dist/src/models/RegistrationPeriod.js +11 -9
- package/dist/src/models/RegistrationPeriod.js.map +1 -1
- package/dist/src/models/STCredit.js +11 -7
- package/dist/src/models/STCredit.js.map +1 -1
- package/dist/src/models/STInvoice.js +45 -45
- package/dist/src/models/STInvoice.js.map +1 -1
- package/dist/src/models/STPackage.d.ts.map +1 -1
- package/dist/src/models/STPackage.js +58 -62
- package/dist/src/models/STPackage.js.map +1 -1
- package/dist/src/models/STPendingInvoice.js +17 -16
- package/dist/src/models/STPendingInvoice.js.map +1 -1
- package/dist/src/models/StripeAccount.js +15 -14
- package/dist/src/models/StripeAccount.js.map +1 -1
- package/dist/src/models/StripeCheckoutSession.js +10 -10
- package/dist/src/models/StripeCheckoutSession.js.map +1 -1
- package/dist/src/models/StripePaymentIntent.js +10 -10
- package/dist/src/models/StripePaymentIntent.js.map +1 -1
- package/dist/src/models/Ticket.js +46 -32
- package/dist/src/models/Ticket.js.map +1 -1
- package/dist/src/models/Token.js +12 -5
- package/dist/src/models/Token.js.map +1 -1
- package/dist/src/models/UsedRegisterCode.js +15 -11
- package/dist/src/models/UsedRegisterCode.js.map +1 -1
- package/dist/src/models/User.d.ts +2 -1
- package/dist/src/models/User.d.ts.map +1 -1
- package/dist/src/models/User.js +51 -29
- package/dist/src/models/User.js.map +1 -1
- package/dist/src/models/UserPermissions.js +11 -8
- package/dist/src/models/UserPermissions.js.map +1 -1
- package/dist/src/models/Webshop.js +41 -37
- package/dist/src/models/Webshop.js.map +1 -1
- package/dist/src/models/WebshopDiscountCode.js +13 -9
- package/dist/src/models/WebshopDiscountCode.js.map +1 -1
- package/dist/src/models/addresses/City.js +9 -8
- package/dist/src/models/addresses/City.js.map +1 -1
- package/dist/src/models/addresses/PostalCode.js +7 -3
- package/dist/src/models/addresses/PostalCode.js.map +1 -1
- package/dist/src/models/addresses/Province.js +5 -2
- package/dist/src/models/addresses/Province.js.map +1 -1
- package/dist/src/models/addresses/Street.js +6 -3
- package/dist/src/models/addresses/Street.js.map +1 -1
- package/dist/src/structures/OrganizationServerMetaData.js +30 -27
- package/dist/src/structures/OrganizationServerMetaData.js.map +1 -1
- package/package.json +6 -3
- package/src/helpers/EmailBuilder.ts +95 -17
- package/src/helpers/RateLimiter.ts +1 -0
- package/src/index.ts +1 -1
- package/src/models/Email.ts +9 -11
- package/src/models/EmailTemplate.ts +20 -1
- package/src/models/Member.ts +5 -7
- package/src/models/Order.ts +11 -21
- package/src/models/Organization.ts +17 -26
- package/src/models/Payment.ts +1 -0
- package/src/models/Registration.ts +17 -45
- package/src/models/STPackage.ts +8 -16
- package/src/models/User.ts +24 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailTemplate.js","sourceRoot":"","sources":["../../../src/models/EmailTemplate.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"EmailTemplate.js","sourceRoot":"","sources":["../../../src/models/EmailTemplate.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,23 +36,35 @@ async function randomInt(max) {
|
|
|
36
36
|
* Holds the verificationCodes for a given email (not a user, since a user can switch email addresses and might avoid verification that way)
|
|
37
37
|
*/
|
|
38
38
|
class EmailVerificationCode extends simple_database_1.Model {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
39
|
+
static table = "email_verification_codes";
|
|
40
|
+
id;
|
|
41
|
+
organizationId = null;
|
|
42
|
+
userId;
|
|
43
|
+
/**
|
|
44
|
+
* The e-mail that will get verified. If on verification, the user e-mail differs from this one,
|
|
45
|
+
* we'll set the user email to this email address
|
|
46
|
+
*/
|
|
47
|
+
email;
|
|
48
|
+
/**
|
|
49
|
+
* This one is send to the sender. Allows for polling + extra length + sender authentication
|
|
50
|
+
*/
|
|
51
|
+
token = "";
|
|
52
|
+
code = "";
|
|
53
|
+
/**
|
|
54
|
+
* The amount of times this code has been generated for the same e-mail address
|
|
55
|
+
*/
|
|
56
|
+
generatedCount = 0;
|
|
57
|
+
/**
|
|
58
|
+
* The amount of times this unique code has been tried.
|
|
59
|
+
*/
|
|
60
|
+
tries = 0;
|
|
61
|
+
expiresAt;
|
|
62
|
+
/**
|
|
63
|
+
* createdAt behaves more like createdAt for verificationCode. Since every save is considered to have a new verificationCode
|
|
64
|
+
*/
|
|
65
|
+
createdAt;
|
|
66
|
+
static CODE_LENGTH = 6;
|
|
67
|
+
static MAX_TRIES = 9; // minus 0..MAX_TRIES_VARY
|
|
56
68
|
async generateCode() {
|
|
57
69
|
this.code = ((await randomInt(Math.pow(10, EmailVerificationCode.CODE_LENGTH))) + "").padStart(EmailVerificationCode.CODE_LENGTH, "0");
|
|
58
70
|
this.token = bs58.encode(await randomBytes(100)).toLowerCase();
|
|
@@ -67,10 +79,9 @@ class EmailVerificationCode extends simple_database_1.Model {
|
|
|
67
79
|
this.expiresAt = new Date(new Date().getTime() + 1000 * 60 * 60 * 12);
|
|
68
80
|
}
|
|
69
81
|
getEmailVerificationUrl(user, organization, i18n) {
|
|
70
|
-
var _a;
|
|
71
82
|
let host;
|
|
72
83
|
if (user.permissions || !organization || STAMHOOFD.userMode === 'platform') {
|
|
73
|
-
host = "https://" + (
|
|
84
|
+
host = "https://" + (STAMHOOFD.domains.dashboard ?? "stamhoofd.app") + "/" + i18n.locale;
|
|
74
85
|
}
|
|
75
86
|
else {
|
|
76
87
|
// Add language if different than default
|
|
@@ -173,7 +184,6 @@ class EmailVerificationCode extends simple_database_1.Model {
|
|
|
173
184
|
}
|
|
174
185
|
}
|
|
175
186
|
send(user, organization, i18n, withCode = true) {
|
|
176
|
-
var _a;
|
|
177
187
|
const { from, replyTo } = {
|
|
178
188
|
from: (user.organizationPermissions || !organization ? email_1.Email.getInternalEmailFor(i18n) : organization.getStrongEmail(i18n)),
|
|
179
189
|
replyTo: undefined // Don't use replyTo because it affects deliverability rates due to spam filters
|
|
@@ -181,7 +191,7 @@ class EmailVerificationCode extends simple_database_1.Model {
|
|
|
181
191
|
const url = this.getEmailVerificationUrl(user, organization, i18n);
|
|
182
192
|
const footer = (!user.organizationPermissions && organization ? "\n\n—\n\nOnze ledenadministratie werkt via het Stamhoofd platform, op maat van verenigingen. Probeer het ook via https://" + i18n.$t("shared.domains.marketing") + "/ledenadministratie\n\n" : '');
|
|
183
193
|
const footerHTML = (!user.organizationPermissions && organization ? "<br><br>—<br><br>Onze ledenadministratie werkt via het Stamhoofd platform, op maat van verenigingen. Probeer het ook via <a href=\"https://" + i18n.$t("shared.domains.marketing") + "/ledenadministratie\">Stamhoofd</a><br><br>" : '');
|
|
184
|
-
const name =
|
|
194
|
+
const name = organization?.name ?? 'Stamhoofd';
|
|
185
195
|
if (withCode) {
|
|
186
196
|
const formattedCode = this.code.substr(0, 3) + " " + this.code.substr(3);
|
|
187
197
|
email_1.Email.send({
|
|
@@ -268,13 +278,10 @@ class EmailVerificationCode extends simple_database_1.Model {
|
|
|
268
278
|
}
|
|
269
279
|
}
|
|
270
280
|
exports.EmailVerificationCode = EmailVerificationCode;
|
|
271
|
-
EmailVerificationCode.table = "email_verification_codes";
|
|
272
|
-
EmailVerificationCode.CODE_LENGTH = 6;
|
|
273
|
-
EmailVerificationCode.MAX_TRIES = 9; // minus 0..MAX_TRIES_VARY
|
|
274
281
|
tslib_1.__decorate([
|
|
275
282
|
(0, simple_database_1.column)({
|
|
276
283
|
primary: true, type: "string", beforeSave(value) {
|
|
277
|
-
return value
|
|
284
|
+
return value ?? (0, uuid_1.v4)();
|
|
278
285
|
}
|
|
279
286
|
})
|
|
280
287
|
], EmailVerificationCode.prototype, "id", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailVerificationCode.js","sourceRoot":"","sources":["../../../src/models/EmailVerificationCode.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,6DAAwD;AAExD,4CAAyC;AACzC,4DAA2B;AAC3B,4DAA4B;AAC5B,+BAAoC;AAEpC,MAAM,QAAQ,GAAG,4DAA4D,CAAA;AAC7E,MAAM,IAAI,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAA;AAE5B,KAAK,UAAU,WAAW,CAAC,IAAY;IACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,gBAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,GAAiB,EAAE,GAAW,EAAE,EAAE;YACxD,IAAI,GAAG,EAAE,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACX,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,GAAW;IAChC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,gBAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,GAAiB,EAAE,CAAS,EAAE,EAAE;YACnD,IAAI,GAAG,EAAE,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACX,CAAC;YACD,OAAO,CAAC,CAAC,CAAC,CAAA;QACd,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC;AAGD;;GAEG;AACH,MAAa,qBAAsB,SAAQ,uBAAK;
|
|
1
|
+
{"version":3,"file":"EmailVerificationCode.js","sourceRoot":"","sources":["../../../src/models/EmailVerificationCode.ts"],"names":[],"mappings":"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"}
|
package/dist/src/models/Event.js
CHANGED
|
@@ -7,12 +7,17 @@ const structures_1 = require("@stamhoofd/structures");
|
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
8
|
const Group_1 = require("./Group");
|
|
9
9
|
class Event extends simple_database_1.Model {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
10
|
+
static table = "events";
|
|
11
|
+
id;
|
|
12
|
+
name;
|
|
13
|
+
typeId;
|
|
14
|
+
organizationId = null;
|
|
15
|
+
groupId = null;
|
|
16
|
+
startDate;
|
|
17
|
+
endDate;
|
|
18
|
+
meta = structures_1.EventMeta.create({});
|
|
19
|
+
createdAt;
|
|
20
|
+
updatedAt;
|
|
16
21
|
/**
|
|
17
22
|
* @deprecated
|
|
18
23
|
*/
|
|
@@ -32,12 +37,11 @@ class Event extends simple_database_1.Model {
|
|
|
32
37
|
});
|
|
33
38
|
}
|
|
34
39
|
async syncGroupRequirements(group) {
|
|
35
|
-
var _a, _b, _c, _d;
|
|
36
40
|
if (!group) {
|
|
37
41
|
return;
|
|
38
42
|
}
|
|
39
|
-
group.settings.requireDefaultAgeGroupIds =
|
|
40
|
-
group.settings.requireGroupIds =
|
|
43
|
+
group.settings.requireDefaultAgeGroupIds = this.meta.defaultAgeGroupIds ?? [];
|
|
44
|
+
group.settings.requireGroupIds = this.meta.groups?.map(g => g.id) ?? [];
|
|
41
45
|
if (group.type === structures_1.GroupType.EventRegistration) {
|
|
42
46
|
// Don't change the name of the waiting list
|
|
43
47
|
group.settings.name = this.name;
|
|
@@ -49,7 +53,7 @@ class Event extends simple_database_1.Model {
|
|
|
49
53
|
group.settings.requirePlatformMembershipOn = null;
|
|
50
54
|
}
|
|
51
55
|
else {
|
|
52
|
-
group.settings.requireOrganizationTags =
|
|
56
|
+
group.settings.requireOrganizationTags = this.meta.organizationTagIds ?? [];
|
|
53
57
|
// Everyone can register
|
|
54
58
|
group.settings.requireOrganizationIds = [];
|
|
55
59
|
// But they need a valid platform membership
|
|
@@ -68,10 +72,9 @@ class Event extends simple_database_1.Model {
|
|
|
68
72
|
}
|
|
69
73
|
}
|
|
70
74
|
exports.Event = Event;
|
|
71
|
-
Event.table = "events";
|
|
72
75
|
tslib_1.__decorate([
|
|
73
76
|
(0, simple_database_1.column)({ primary: true, type: "string", beforeSave(value) {
|
|
74
|
-
return value
|
|
77
|
+
return value ?? (0, uuid_1.v4)();
|
|
75
78
|
} })
|
|
76
79
|
], Event.prototype, "id", void 0);
|
|
77
80
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Event.js","sourceRoot":"","sources":["../../../src/models/Event.ts"],"names":[],"mappings":";;;;AACA,iEAA4D;AAC5D,sDAAmF;AACnF,+BAAoC;AACpC,mCAAgC;AAEhC,MAAa,KAAM,SAAQ,uBAAK;
|
|
1
|
+
{"version":3,"file":"Event.js","sourceRoot":"","sources":["../../../src/models/Event.ts"],"names":[],"mappings":"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"}
|
package/dist/src/models/Group.js
CHANGED
|
@@ -22,23 +22,27 @@ if (_1.Registration === undefined) {
|
|
|
22
22
|
throw new Error("Import Registration is undefined");
|
|
23
23
|
}
|
|
24
24
|
class Group extends simple_database_1.Model {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
25
|
+
static table = "groups";
|
|
26
|
+
id;
|
|
27
|
+
type = structures_1.GroupType.Membership;
|
|
28
|
+
settings;
|
|
29
|
+
privateSettings = structures_1.GroupPrivateSettings.create({});
|
|
30
|
+
organizationId;
|
|
31
|
+
waitingListId = null;
|
|
32
|
+
periodId;
|
|
33
|
+
defaultAgeGroupId = null;
|
|
34
|
+
/**
|
|
35
|
+
* Every time a new registration period starts, this number increases. This is used to mark all older registrations as 'out of date' automatically
|
|
36
|
+
*/
|
|
37
|
+
cycle = 0;
|
|
38
|
+
createdAt;
|
|
39
|
+
updatedAt;
|
|
40
|
+
deletedAt = null;
|
|
41
|
+
status = structures_1.GroupStatus.Open;
|
|
42
|
+
/**
|
|
43
|
+
* Editing this field is only allowed when running inside the QueueHandler
|
|
44
|
+
*/
|
|
45
|
+
stockReservations = [];
|
|
42
46
|
static async getAll(organizationId, periodId, active = true) {
|
|
43
47
|
const w = periodId ? { periodId } : {};
|
|
44
48
|
if (active) {
|
|
@@ -82,7 +86,7 @@ class Group extends simple_database_1.Model {
|
|
|
82
86
|
query += `where reg_filter.\`groupId\` = ? AND reg_filter.\`cycle\` = ?`;
|
|
83
87
|
const [results] = await simple_database_1.Database.select(query, [this.id, this.cycle - cycleOffset]);
|
|
84
88
|
const members = [];
|
|
85
|
-
const groupIds = results.map(r =>
|
|
89
|
+
const groupIds = results.map(r => r[_1.Registration.table]?.groupId).filter(id => id);
|
|
86
90
|
const groups = await Group.getByIDs(...utility_1.Formatter.uniqueArray(groupIds));
|
|
87
91
|
for (const row of results) {
|
|
88
92
|
const foundMember = _1.Member.fromRow(row[_1.Member.table]);
|
|
@@ -92,7 +96,7 @@ class Group extends simple_database_1.Model {
|
|
|
92
96
|
const _f = foundMember.setManyRelation(_1.Member.registrations, []).setManyRelation(_1.Member.users, []);
|
|
93
97
|
// Seach if we already got this member?
|
|
94
98
|
const existingMember = members.find(m => m.id == _f.id);
|
|
95
|
-
const member = (existingMember
|
|
99
|
+
const member = (existingMember ?? _f);
|
|
96
100
|
if (!existingMember) {
|
|
97
101
|
members.push(member);
|
|
98
102
|
}
|
|
@@ -203,11 +207,10 @@ class Group extends simple_database_1.Model {
|
|
|
203
207
|
}
|
|
204
208
|
}
|
|
205
209
|
exports.Group = Group;
|
|
206
|
-
Group.table = "groups";
|
|
207
210
|
tslib_1.__decorate([
|
|
208
211
|
(0, simple_database_1.column)({
|
|
209
212
|
primary: true, type: "string", beforeSave(value) {
|
|
210
|
-
return value
|
|
213
|
+
return value ?? (0, uuid_1.v4)();
|
|
211
214
|
}
|
|
212
215
|
})
|
|
213
216
|
], Group.prototype, "id", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../src/models/Group.ts"],"names":[],"mappings":";;;;AAAA,iEAA4G;AAC5G,sDAA2J;AAC3J,+BAAoC;AAEpC,gDAA+C;AAC/C,yBAAkH;AAClH,8CAAiD;AACjD,iEAA2D;AAE3D,IAAI,SAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;AACjD,CAAC;AACD,IAAI,OAAI,KAAK,SAAS,EAAE,CAAC;IACrB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;AAC/C,CAAC;AACD,IAAI,UAAO,KAAK,SAAS,EAAE,CAAC;IACxB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;AAClD,CAAC;AACD,IAAI,eAAY,KAAK,SAAS,EAAE,CAAC;IAC7B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;AACvD,CAAC;AAED,MAAa,KAAM,SAAQ,uBAAK;
|
|
1
|
+
{"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../src/models/Group.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAK5E,qBAAa,KAAM,SAAQ,KAAK;IAC5B,MAAM,CAAC,KAAK,SAAY;IAKxB,EAAE,EAAG,MAAM,CAAC;IAGZ,MAAM,EAAE,IAAI,CAAA;IAGZ,WAAW,EAAE,UAAU,EAAE,CAAK;IAG9B,SAAS,EAAE,IAAI,CAAa;WAEf,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;CA0HhI"}
|
package/dist/src/models/Image.js
CHANGED
|
@@ -10,13 +10,12 @@ const aws_sdk_1 = tslib_1.__importDefault(require("aws-sdk"));
|
|
|
10
10
|
const sharp_1 = tslib_1.__importDefault(require("sharp"));
|
|
11
11
|
const uuid_1 = require("uuid");
|
|
12
12
|
class Image extends simple_database_1.Model {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
static table = "images";
|
|
14
|
+
id;
|
|
15
|
+
source;
|
|
16
|
+
resolutions = [];
|
|
17
|
+
createdAt = new Date();
|
|
18
18
|
static async create(fileContent, type, resolutions) {
|
|
19
|
-
var _a, _b, _c, _d, _e;
|
|
20
19
|
if (!STAMHOOFD.SPACES_BUCKET || !STAMHOOFD.SPACES_ENDPOINT || !STAMHOOFD.SPACES_KEY || !STAMHOOFD.SPACES_SECRET) {
|
|
21
20
|
throw new simple_errors_1.SimpleError({
|
|
22
21
|
code: "not_available",
|
|
@@ -41,8 +40,8 @@ class Image extends simple_database_1.Model {
|
|
|
41
40
|
}
|
|
42
41
|
for (const r of resolutions) {
|
|
43
42
|
const size = {
|
|
44
|
-
width:
|
|
45
|
-
height:
|
|
43
|
+
width: r.width ?? undefined,
|
|
44
|
+
height: r.height ?? undefined,
|
|
46
45
|
fit: r.fit,
|
|
47
46
|
withoutEnlargement: type !== "image/svg+xml"
|
|
48
47
|
};
|
|
@@ -65,7 +64,7 @@ class Image extends simple_database_1.Model {
|
|
|
65
64
|
accessKeyId: STAMHOOFD.SPACES_KEY,
|
|
66
65
|
secretAccessKey: STAMHOOFD.SPACES_SECRET
|
|
67
66
|
});
|
|
68
|
-
let prefix = (
|
|
67
|
+
let prefix = (STAMHOOFD.SPACES_PREFIX ?? "");
|
|
69
68
|
if (prefix.length > 0) {
|
|
70
69
|
prefix += "/";
|
|
71
70
|
}
|
|
@@ -74,7 +73,7 @@ class Image extends simple_database_1.Model {
|
|
|
74
73
|
image.id = (0, uuid_1.v4)();
|
|
75
74
|
for (const f of files) {
|
|
76
75
|
const fileId = (0, uuid_1.v4)();
|
|
77
|
-
const key = prefix + (
|
|
76
|
+
const key = prefix + (STAMHOOFD.environment ?? "development") + "/" + image.id + "/" + fileId + (!supportsTransparency ? '.jpg' : '.png');
|
|
78
77
|
const params = {
|
|
79
78
|
Bucket: STAMHOOFD.SPACES_BUCKET,
|
|
80
79
|
Key: key,
|
|
@@ -99,12 +98,12 @@ class Image extends simple_database_1.Model {
|
|
|
99
98
|
// Also include the source, in private mode
|
|
100
99
|
const fileId = (0, uuid_1.v4)();
|
|
101
100
|
const uploadExt = fileType;
|
|
102
|
-
const key = prefix + (
|
|
101
|
+
const key = prefix + (STAMHOOFD.environment ?? "development") + "/" + image.id + "/" + fileId + "." + uploadExt;
|
|
103
102
|
const params = {
|
|
104
103
|
Bucket: STAMHOOFD.SPACES_BUCKET,
|
|
105
104
|
Key: key,
|
|
106
105
|
Body: fileContent,
|
|
107
|
-
ContentType: type
|
|
106
|
+
ContentType: type ?? "image/jpeg",
|
|
108
107
|
ACL: "private"
|
|
109
108
|
};
|
|
110
109
|
image.source = new structures_1.File({
|
|
@@ -120,10 +119,9 @@ class Image extends simple_database_1.Model {
|
|
|
120
119
|
}
|
|
121
120
|
}
|
|
122
121
|
exports.Image = Image;
|
|
123
|
-
Image.table = "images";
|
|
124
122
|
tslib_1.__decorate([
|
|
125
123
|
(0, simple_database_1.column)({ primary: true, type: "string", beforeSave(value) {
|
|
126
|
-
return value
|
|
124
|
+
return value ?? (0, uuid_1.v4)();
|
|
127
125
|
} })
|
|
128
126
|
], Image.prototype, "id", void 0);
|
|
129
127
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":";;;;AACA,iEAA4D;AAC5D,iEAA2D;AAC3D,6DAAwD;AACxD,sDAA4E;AAC5E,8DAA0B;AAC1B,0DAA0B;AAC1B,+BAAoC;AAEpC,MAAa,KAAM,SAAQ,uBAAK;
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Member.d.ts","sourceRoot":"","sources":["../../../src/models/Member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,kBAAkB,EAAqB,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhI,OAAO,EAAE,aAAa,EAAE,2BAA2B,EAAE,sBAAsB,IAAI,4BAA4B,EAAc,MAAM,uBAAuB,CAAC;AAMvJ,OAAO,EAAE,KAAK,EAAE,wBAAwB,EAAmC,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1G,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG;IAC3C,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,CAAC,YAAY,GAAG;QAAC,KAAK,EAAE,KAAK,CAAA;KAAC,CAAC,EAAE,CAAA;CACnD,CAAA;AAGD,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAEtE,qBAAa,MAAO,SAAQ,KAAK;IAC7B,MAAM,CAAC,KAAK,SAAY;IAQxB,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,GAAC,IAAI,CAAQ;IAQnC,SAAS,EAAE,MAAM,CAAA;IAMjB,QAAQ,EAAE,MAAM,CAAA;IAShB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IASvB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAG3B,OAAO,EAAE,aAAa,CAAA;IAEtB;;OAEG;IAEH,kBAAkB,SAAI;IAYtB,SAAS,EAAE,IAAI,CAAA;IAUf,SAAS,EAAE,IAAI,CAAA;IAGf,MAAM,CAAC,aAAa,2DAA2E;IAG/F,MAAM,CAAC,KAAK,uDAAiD;IAE7D;;OAEG;WACU,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC;IAItF;;OAEG;WACU,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,KAAK;IAmCjE;;OAEG;WACU,+BAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAoC9F;;OAEG;WACU,kCAAkC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAiClG;;MAEE;WACU,oCAAoC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAwCtG;;MAEE;WACU,YAAY,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAgE/E;;OAEG;WACU,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAmBtF;;MAEE;WACU,iCAAiC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Member.d.ts","sourceRoot":"","sources":["../../../src/models/Member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,kBAAkB,EAAqB,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhI,OAAO,EAAE,aAAa,EAAE,2BAA2B,EAAE,sBAAsB,IAAI,4BAA4B,EAAc,MAAM,uBAAuB,CAAC;AAMvJ,OAAO,EAAE,KAAK,EAAE,wBAAwB,EAAmC,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1G,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG;IAC3C,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,CAAC,YAAY,GAAG;QAAC,KAAK,EAAE,KAAK,CAAA;KAAC,CAAC,EAAE,CAAA;CACnD,CAAA;AAGD,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAEtE,qBAAa,MAAO,SAAQ,KAAK;IAC7B,MAAM,CAAC,KAAK,SAAY;IAQxB,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,GAAC,IAAI,CAAQ;IAQnC,SAAS,EAAE,MAAM,CAAA;IAMjB,QAAQ,EAAE,MAAM,CAAA;IAShB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IASvB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAG3B,OAAO,EAAE,aAAa,CAAA;IAEtB;;OAEG;IAEH,kBAAkB,SAAI;IAYtB,SAAS,EAAE,IAAI,CAAA;IAUf,SAAS,EAAE,IAAI,CAAA;IAGf,MAAM,CAAC,aAAa,2DAA2E;IAG/F,MAAM,CAAC,KAAK,uDAAiD;IAE7D;;OAEG;WACU,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC;IAItF;;OAEG;WACU,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,KAAK;IAmCjE;;OAEG;WACU,+BAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAoC9F;;OAEG;WACU,kCAAkC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAiClG;;MAEE;WACU,oCAAoC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAwCtG;;MAEE;WACU,YAAY,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAgE/E;;OAEG;WACU,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAmBtF;;MAEE;WACU,iCAAiC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAoB9F,6BAA6B,CAAC,IAAI,EAAE,uBAAuB,EAAE,eAAe,GAAE,IAAI,GAAG,OAAc;IASnG,MAAM,CAAC,kCAAkC,CAAC,YAAY,EAAE,sBAAsB,GAAG;QAAC,KAAK,EAAE,OAAO,SAAS,EAAE,KAAK,CAAA;KAAC,GAAG,4BAA4B;IAYhJ,MAAM,CAAC,2BAA2B,CAAC,EAAE,EAAE,MAAM;WA6BhC,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,UAAQ;YAoIhD,kBAAkB;IA4B1B,kBAAkB,CAAC,UAAU,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;IAqFzE,iBAAiB;CAG1B"}
|