@stamhoofd/models 2.39.0 → 2.40.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/AddressFactory.d.ts +3 -4
- package/dist/src/factories/AddressFactory.d.ts.map +1 -1
- package/dist/src/factories/AddressFactory.js +13 -13
- package/dist/src/factories/EmergencyContactFactory.d.ts +3 -4
- package/dist/src/factories/EmergencyContactFactory.d.ts.map +1 -1
- package/dist/src/factories/EmergencyContactFactory.js +27 -27
- package/dist/src/factories/EmergencyContactFactory.js.map +1 -1
- package/dist/src/factories/GroupFactory.d.ts +4 -4
- package/dist/src/factories/GroupFactory.d.ts.map +1 -1
- package/dist/src/factories/GroupFactory.js +8 -8
- package/dist/src/factories/GroupFactory.js.map +1 -1
- package/dist/src/factories/MemberFactory.d.ts +4 -4
- package/dist/src/factories/MemberFactory.d.ts.map +1 -1
- package/dist/src/factories/MemberFactory.js +17 -17
- package/dist/src/factories/MemberFactory.js.map +1 -1
- package/dist/src/factories/OrganizationFactory.d.ts +4 -4
- package/dist/src/factories/OrganizationFactory.js +8 -8
- package/dist/src/factories/OrganizationFactory.js.map +1 -1
- package/dist/src/factories/ParentFactory.d.ts +1 -1
- package/dist/src/factories/ParentFactory.js +19 -19
- package/dist/src/factories/ParentFactory.js.map +1 -1
- package/dist/src/factories/RecordFactory.d.ts +2 -3
- package/dist/src/factories/RecordFactory.d.ts.map +1 -1
- package/dist/src/factories/RecordFactory.js +1 -1
- package/dist/src/factories/RecordFactory.js.map +1 -1
- package/dist/src/factories/RegisterCodeFactory.d.ts +2 -2
- package/dist/src/factories/RegisterCodeFactory.d.ts.map +1 -1
- package/dist/src/factories/RegisterCodeFactory.js +2 -2
- package/dist/src/factories/RegistrationFactory.d.ts +3 -3
- package/dist/src/factories/RegistrationFactory.d.ts.map +1 -1
- package/dist/src/factories/RegistrationFactory.js.map +1 -1
- package/dist/src/factories/RegistrationPeriodFactory.d.ts +2 -2
- package/dist/src/factories/RegistrationPeriodFactory.js.map +1 -1
- package/dist/src/factories/UserFactory.d.ts +3 -3
- package/dist/src/factories/UserFactory.d.ts.map +1 -1
- package/dist/src/factories/UserFactory.js +3 -3
- package/dist/src/factories/UserFactory.js.map +1 -1
- package/dist/src/factories/WebshopFactory.d.ts +4 -4
- package/dist/src/factories/WebshopFactory.d.ts.map +1 -1
- package/dist/src/factories/WebshopFactory.js +1 -1
- package/dist/src/factories/WebshopFactory.js.map +1 -1
- package/dist/src/helpers/DNSValidator.d.ts +1 -1
- package/dist/src/helpers/DNSValidator.d.ts.map +1 -1
- package/dist/src/helpers/DNSValidator.js +33 -33
- package/dist/src/helpers/DNSValidator.js.map +1 -1
- package/dist/src/helpers/EmailBuilder.d.ts +10 -10
- package/dist/src/helpers/EmailBuilder.d.ts.map +1 -1
- package/dist/src/helpers/EmailBuilder.js +34 -34
- package/dist/src/helpers/EmailBuilder.js.map +1 -1
- package/dist/src/helpers/GroupBuilder.d.ts.map +1 -1
- package/dist/src/helpers/GroupBuilder.js +57 -57
- package/dist/src/helpers/GroupBuilder.js.map +1 -1
- package/dist/src/helpers/Handlebars.d.ts.map +1 -1
- package/dist/src/helpers/Handlebars.js +29 -29
- package/dist/src/helpers/Handlebars.js.map +1 -1
- package/dist/src/helpers/MemberMerger.d.ts +1 -1
- package/dist/src/helpers/MemberMerger.d.ts.map +1 -1
- package/dist/src/helpers/MemberMerger.js +33 -33
- package/dist/src/helpers/MemberMerger.js.map +1 -1
- package/dist/src/helpers/MemberMerger.test.js +194 -194
- 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 +2 -2
- package/dist/src/helpers/RateLimiter.js.map +1 -1
- package/dist/src/helpers/SetupStepsUpdater.d.ts +22 -0
- package/dist/src/helpers/SetupStepsUpdater.d.ts.map +1 -0
- package/dist/src/helpers/SetupStepsUpdater.js +255 -0
- package/dist/src/helpers/SetupStepsUpdater.js.map +1 -0
- package/dist/src/helpers/WebshopCounter.d.ts +1 -1
- package/dist/src/helpers/WebshopCounter.d.ts.map +1 -1
- package/dist/src/helpers/WebshopCounter.js +1 -1
- package/dist/src/helpers/WebshopCounter.js.map +1 -1
- package/dist/src/helpers/WebshopCounter.test.js +6 -6
- package/dist/src/helpers/WebshopCounter.test.js.map +1 -1
- package/dist/src/index.d.ts +20 -19
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/migrations/1605262045-import-postcodes.js +12 -12
- package/dist/src/migrations/1605262046-import-postcodes-nl.js +10 -10
- package/dist/src/models/BalanceItem.d.ts.map +1 -1
- package/dist/src/models/BalanceItem.js +37 -37
- package/dist/src/models/BalanceItem.js.map +1 -1
- package/dist/src/models/BalanceItemPayment.d.ts.map +1 -1
- package/dist/src/models/BalanceItemPayment.js +13 -13
- package/dist/src/models/BalanceItemPayment.js.map +1 -1
- package/dist/src/models/BuckarooPayment.d.ts +1 -1
- package/dist/src/models/BuckarooPayment.d.ts.map +1 -1
- package/dist/src/models/BuckarooPayment.js +5 -5
- package/dist/src/models/BuckarooPayment.js.map +1 -1
- package/dist/src/models/CachedOutstandingBalance.d.ts.map +1 -1
- package/dist/src/models/CachedOutstandingBalance.js +37 -37
- package/dist/src/models/CachedOutstandingBalance.js.map +1 -1
- package/dist/src/models/Document.d.ts +4 -4
- package/dist/src/models/Document.d.ts.map +1 -1
- package/dist/src/models/Document.js +27 -27
- package/dist/src/models/Document.js.map +1 -1
- package/dist/src/models/DocumentTemplate.d.ts +4 -4
- package/dist/src/models/DocumentTemplate.d.ts.map +1 -1
- package/dist/src/models/DocumentTemplate.js +72 -72
- 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 +63 -64
- package/dist/src/models/Email.js.map +1 -1
- package/dist/src/models/EmailRecipient.d.ts.map +1 -1
- package/dist/src/models/EmailRecipient.js +20 -20
- package/dist/src/models/EmailRecipient.js.map +1 -1
- package/dist/src/models/EmailTemplate.d.ts +3 -3
- package/dist/src/models/EmailTemplate.d.ts.map +1 -1
- package/dist/src/models/EmailTemplate.js +16 -16
- package/dist/src/models/EmailTemplate.js.map +1 -1
- package/dist/src/models/EmailVerificationCode.d.ts +2 -2
- package/dist/src/models/EmailVerificationCode.d.ts.map +1 -1
- package/dist/src/models/EmailVerificationCode.js +57 -55
- package/dist/src/models/EmailVerificationCode.js.map +1 -1
- package/dist/src/models/Event.d.ts +2 -2
- package/dist/src/models/Event.d.ts.map +1 -1
- package/dist/src/models/Event.js +15 -15
- package/dist/src/models/Event.js.map +1 -1
- package/dist/src/models/Group.d.ts +3 -1
- package/dist/src/models/Group.d.ts.map +1 -1
- package/dist/src/models/Group.js +46 -35
- package/dist/src/models/Group.js.map +1 -1
- package/dist/src/models/Image.d.ts +1 -1
- package/dist/src/models/Image.d.ts.map +1 -1
- package/dist/src/models/Image.js +26 -26
- package/dist/src/models/Image.js.map +1 -1
- package/dist/src/models/Member.d.ts +8 -8
- package/dist/src/models/Member.d.ts.map +1 -1
- package/dist/src/models/Member.js +60 -60
- package/dist/src/models/Member.js.map +1 -1
- package/dist/src/models/MemberPlatformMembership.d.ts +3 -3
- package/dist/src/models/MemberPlatformMembership.d.ts.map +1 -1
- package/dist/src/models/MemberPlatformMembership.js +26 -26
- package/dist/src/models/MemberPlatformMembership.js.map +1 -1
- package/dist/src/models/MemberResponsibilityRecord.d.ts.map +1 -1
- package/dist/src/models/MemberResponsibilityRecord.js +13 -13
- package/dist/src/models/MemberResponsibilityRecord.js.map +1 -1
- package/dist/src/models/MergedMember.d.ts +3 -3
- package/dist/src/models/MergedMember.d.ts.map +1 -1
- package/dist/src/models/MergedMember.js +19 -19
- package/dist/src/models/MergedMember.js.map +1 -1
- package/dist/src/models/MolliePayment.d.ts +1 -1
- package/dist/src/models/MolliePayment.d.ts.map +1 -1
- package/dist/src/models/MolliePayment.js +5 -5
- package/dist/src/models/MolliePayment.js.map +1 -1
- package/dist/src/models/MollieToken.d.ts.map +1 -1
- package/dist/src/models/MollieToken.js +60 -60
- package/dist/src/models/MollieToken.js.map +1 -1
- package/dist/src/models/OneTimeToken.d.ts +2 -2
- package/dist/src/models/OneTimeToken.d.ts.map +1 -1
- package/dist/src/models/OneTimeToken.js +13 -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 +70 -70
- package/dist/src/models/Order.js.map +1 -1
- package/dist/src/models/Organization.d.ts +5 -5
- package/dist/src/models/Organization.d.ts.map +1 -1
- package/dist/src/models/Organization.js +127 -127
- package/dist/src/models/Organization.js.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.d.ts.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.js +15 -15
- package/dist/src/models/OrganizationRegistrationPeriod.js.map +1 -1
- package/dist/src/models/PasswordToken.d.ts +3 -3
- package/dist/src/models/PasswordToken.d.ts.map +1 -1
- package/dist/src/models/PasswordToken.js +17 -17
- package/dist/src/models/PasswordToken.js.map +1 -1
- package/dist/src/models/PayconiqPayment.d.ts +1 -1
- package/dist/src/models/PayconiqPayment.d.ts.map +1 -1
- package/dist/src/models/PayconiqPayment.js +49 -49
- package/dist/src/models/PayconiqPayment.js.map +1 -1
- package/dist/src/models/Payment.d.ts +3 -3
- package/dist/src/models/Payment.d.ts.map +1 -1
- package/dist/src/models/Payment.js +36 -36
- package/dist/src/models/Payment.js.map +1 -1
- package/dist/src/models/Platform.d.ts +2 -2
- package/dist/src/models/Platform.d.ts.map +1 -1
- package/dist/src/models/Platform.js +8 -8
- package/dist/src/models/Platform.js.map +1 -1
- package/dist/src/models/RegisterCode.d.ts +1 -1
- package/dist/src/models/RegisterCode.d.ts.map +1 -1
- package/dist/src/models/RegisterCode.js +11 -11
- package/dist/src/models/RegisterCode.js.map +1 -1
- package/dist/src/models/Registration.d.ts +1 -1
- package/dist/src/models/Registration.d.ts.map +1 -1
- package/dist/src/models/Registration.js +88 -88
- package/dist/src/models/Registration.js.map +1 -1
- package/dist/src/models/RegistrationPeriod.d.ts.map +1 -1
- package/dist/src/models/RegistrationPeriod.js +12 -12
- package/dist/src/models/RegistrationPeriod.js.map +1 -1
- package/dist/src/models/STCredit.d.ts +1 -1
- package/dist/src/models/STCredit.d.ts.map +1 -1
- package/dist/src/models/STCredit.js +12 -12
- package/dist/src/models/STCredit.js.map +1 -1
- package/dist/src/models/STInvoice.d.ts +1 -1
- package/dist/src/models/STInvoice.d.ts.map +1 -1
- package/dist/src/models/STInvoice.js +16 -16
- package/dist/src/models/STInvoice.js.map +1 -1
- package/dist/src/models/STPackage.d.ts +1 -1
- package/dist/src/models/STPackage.d.ts.map +1 -1
- package/dist/src/models/STPackage.js +39 -39
- package/dist/src/models/STPackage.js.map +1 -1
- package/dist/src/models/STPendingInvoice.d.ts +1 -1
- package/dist/src/models/STPendingInvoice.d.ts.map +1 -1
- package/dist/src/models/STPendingInvoice.js +11 -11
- package/dist/src/models/STPendingInvoice.js.map +1 -1
- package/dist/src/models/StripeAccount.d.ts.map +1 -1
- package/dist/src/models/StripeAccount.js +13 -13
- package/dist/src/models/StripeAccount.js.map +1 -1
- package/dist/src/models/StripeCheckoutSession.d.ts +1 -1
- package/dist/src/models/StripeCheckoutSession.d.ts.map +1 -1
- package/dist/src/models/StripeCheckoutSession.js +7 -7
- package/dist/src/models/StripeCheckoutSession.js.map +1 -1
- package/dist/src/models/StripePaymentIntent.d.ts +1 -1
- package/dist/src/models/StripePaymentIntent.d.ts.map +1 -1
- package/dist/src/models/StripePaymentIntent.js +7 -7
- package/dist/src/models/StripePaymentIntent.js.map +1 -1
- package/dist/src/models/Ticket.d.ts +2 -2
- package/dist/src/models/Ticket.d.ts.map +1 -1
- package/dist/src/models/Ticket.js +23 -23
- package/dist/src/models/Ticket.js.map +1 -1
- package/dist/src/models/Token.d.ts +3 -3
- package/dist/src/models/Token.d.ts.map +1 -1
- package/dist/src/models/Token.js +27 -27
- package/dist/src/models/Token.js.map +1 -1
- package/dist/src/models/Token.test.js +11 -11
- package/dist/src/models/UsedRegisterCode.d.ts +1 -1
- package/dist/src/models/UsedRegisterCode.d.ts.map +1 -1
- package/dist/src/models/UsedRegisterCode.js +10 -10
- package/dist/src/models/UsedRegisterCode.js.map +1 -1
- package/dist/src/models/User.d.ts +4 -4
- package/dist/src/models/User.d.ts.map +1 -1
- package/dist/src/models/User.js +53 -51
- package/dist/src/models/User.js.map +1 -1
- package/dist/src/models/UserPermissions.d.ts +3 -3
- package/dist/src/models/UserPermissions.d.ts.map +1 -1
- package/dist/src/models/UserPermissions.js +12 -12
- package/dist/src/models/UserPermissions.js.map +1 -1
- package/dist/src/models/Webshop.d.ts +1 -1
- package/dist/src/models/Webshop.d.ts.map +1 -1
- package/dist/src/models/Webshop.js +23 -23
- package/dist/src/models/Webshop.js.map +1 -1
- package/dist/src/models/WebshopDiscountCode.d.ts +1 -1
- package/dist/src/models/WebshopDiscountCode.d.ts.map +1 -1
- package/dist/src/models/WebshopDiscountCode.js +16 -16
- package/dist/src/models/WebshopDiscountCode.js.map +1 -1
- package/dist/src/models/addresses/City.d.ts.map +1 -1
- package/dist/src/models/addresses/City.js +9 -9
- package/dist/src/models/addresses/City.js.map +1 -1
- package/dist/src/models/addresses/PostalCode.d.ts.map +1 -1
- package/dist/src/models/addresses/PostalCode.js +11 -11
- package/dist/src/models/addresses/PostalCode.js.map +1 -1
- package/dist/src/models/addresses/PostalCode.test.js +22 -22
- package/dist/src/models/addresses/PostalCode.test.js.map +1 -1
- package/dist/src/models/addresses/Province.d.ts.map +1 -1
- package/dist/src/models/addresses/Province.js +5 -5
- package/dist/src/models/addresses/Province.js.map +1 -1
- package/dist/src/models/addresses/Street.d.ts.map +1 -1
- package/dist/src/models/addresses/Street.js +6 -6
- package/dist/src/models/addresses/Street.js.map +1 -1
- package/dist/src/models/index.d.ts +46 -46
- package/dist/src/models/index.d.ts.map +1 -1
- package/dist/src/models/index.js +0 -1
- package/dist/src/models/index.js.map +1 -1
- package/dist/src/structures/OrganizationServerMetaData.d.ts.map +1 -1
- package/dist/src/structures/OrganizationServerMetaData.js +4 -4
- package/dist/src/structures/OrganizationServerMetaData.js.map +1 -1
- package/dist/tests/jest.global.setup.d.ts.map +1 -1
- package/dist/tests/jest.global.setup.js +15 -13
- package/dist/tests/jest.global.setup.js.map +1 -1
- package/dist/tests/jest.setup.js +3 -1
- package/dist/tests/jest.setup.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/package.json +3 -3
- package/src/factories/AddressFactory.ts +17 -17
- package/src/factories/EmergencyContactFactory.ts +30 -31
- package/src/factories/GroupFactory.ts +30 -30
- package/src/factories/MemberFactory.ts +41 -38
- package/src/factories/OrganizationFactory.ts +15 -15
- package/src/factories/ParentFactory.ts +24 -24
- package/src/factories/RecordFactory.ts +5 -4
- package/src/factories/RegisterCodeFactory.ts +7 -7
- package/src/factories/RegistrationFactory.ts +16 -16
- package/src/factories/RegistrationPeriodFactory.ts +5 -5
- package/src/factories/UserFactory.ts +20 -19
- package/src/factories/WebshopFactory.ts +14 -14
- package/src/helpers/DNSValidator.ts +89 -84
- package/src/helpers/EmailBuilder.ts +141 -135
- package/src/helpers/GroupBuilder.ts +181 -181
- package/src/helpers/Handlebars.ts +57 -54
- package/src/helpers/MemberMerger.test.ts +702 -702
- package/src/helpers/MemberMerger.ts +83 -77
- package/src/helpers/RateLimiter.ts +25 -27
- package/src/helpers/SetupStepsUpdater.ts +402 -0
- package/src/helpers/WebshopCounter.test.ts +12 -12
- package/src/helpers/WebshopCounter.ts +20 -19
- package/src/index.ts +20 -19
- package/src/migrations/1605262045-import-postcodes.ts +59 -63
- package/src/migrations/1605262046-import-postcodes-nl.ts +41 -43
- package/src/models/BalanceItem.ts +173 -172
- package/src/models/BalanceItemPayment.ts +32 -33
- package/src/models/BuckarooPayment.ts +7 -7
- package/src/models/CachedOutstandingBalance.ts +98 -99
- package/src/models/Document.ts +90 -87
- package/src/models/DocumentTemplate.ts +207 -198
- package/src/models/Email.ts +198 -200
- package/src/models/EmailRecipient.ts +38 -39
- package/src/models/EmailTemplate.ts +36 -37
- package/src/models/EmailVerificationCode.ts +146 -142
- package/src/models/Event.ts +53 -53
- package/src/models/Group.ts +136 -123
- package/src/models/Image.ts +48 -48
- package/src/models/Member.ts +277 -275
- package/src/models/MemberPlatformMembership.ts +71 -71
- package/src/models/MemberResponsibilityRecord.ts +32 -32
- package/src/models/MergedMember.ts +77 -77
- package/src/models/MolliePayment.ts +7 -7
- package/src/models/MollieToken.ts +131 -126
- package/src/models/OneTimeToken.ts +40 -39
- package/src/models/Order.ts +379 -372
- package/src/models/Organization.ts +332 -325
- package/src/models/OrganizationRegistrationPeriod.ts +50 -50
- package/src/models/PasswordToken.ts +42 -42
- package/src/models/PayconiqPayment.ts +80 -76
- package/src/models/Payment.ts +86 -86
- package/src/models/Platform.ts +21 -22
- package/src/models/RegisterCode.ts +26 -26
- package/src/models/Registration.ts +167 -168
- package/src/models/RegistrationPeriod.ts +29 -29
- package/src/models/STCredit.ts +24 -25
- package/src/models/STInvoice.ts +34 -34
- package/src/models/STPackage.ts +143 -136
- package/src/models/STPendingInvoice.ts +26 -26
- package/src/models/StripeAccount.ts +27 -27
- package/src/models/StripeCheckoutSession.ts +10 -10
- package/src/models/StripePaymentIntent.ts +10 -10
- package/src/models/Ticket.ts +51 -52
- package/src/models/Token.test.ts +13 -13
- package/src/models/Token.ts +64 -63
- package/src/models/UsedRegisterCode.ts +20 -21
- package/src/models/User.ts +148 -144
- package/src/models/UserPermissions.ts +25 -28
- package/src/models/Webshop.ts +53 -53
- package/src/models/WebshopDiscountCode.ts +33 -33
- package/src/models/addresses/City.ts +12 -12
- package/src/models/addresses/PostalCode.test.ts +68 -69
- package/src/models/addresses/PostalCode.ts +57 -57
- package/src/models/addresses/Province.ts +8 -8
- package/src/models/addresses/Street.ts +10 -12
- package/src/models/index.ts +54 -55
- package/src/structures/OrganizationServerMetaData.ts +36 -36
package/dist/src/models/Group.js
CHANGED
|
@@ -5,24 +5,25 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const simple_database_1 = require("@simonbackx/simple-database");
|
|
6
6
|
const structures_1 = require("@stamhoofd/structures");
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
|
+
const simple_encoding_1 = require("@simonbackx/simple-encoding");
|
|
9
|
+
const queues_1 = require("@stamhoofd/queues");
|
|
8
10
|
const utility_1 = require("@stamhoofd/utility");
|
|
11
|
+
const SetupStepsUpdater_1 = require("../helpers/SetupStepsUpdater");
|
|
9
12
|
const _1 = require("./");
|
|
10
|
-
const queues_1 = require("@stamhoofd/queues");
|
|
11
|
-
const simple_encoding_1 = require("@simonbackx/simple-encoding");
|
|
12
13
|
if (_1.Member === undefined) {
|
|
13
|
-
throw new Error(
|
|
14
|
+
throw new Error('Import Member is undefined');
|
|
14
15
|
}
|
|
15
16
|
if (_1.User === undefined) {
|
|
16
|
-
throw new Error(
|
|
17
|
+
throw new Error('Import User is undefined');
|
|
17
18
|
}
|
|
18
19
|
if (_1.Payment === undefined) {
|
|
19
|
-
throw new Error(
|
|
20
|
+
throw new Error('Import Payment is undefined');
|
|
20
21
|
}
|
|
21
22
|
if (_1.Registration === undefined) {
|
|
22
|
-
throw new Error(
|
|
23
|
+
throw new Error('Import Registration is undefined');
|
|
23
24
|
}
|
|
24
25
|
class Group extends simple_database_1.Model {
|
|
25
|
-
static table =
|
|
26
|
+
static table = 'groups';
|
|
26
27
|
id;
|
|
27
28
|
type = structures_1.GroupType.Membership;
|
|
28
29
|
settings;
|
|
@@ -81,7 +82,7 @@ class Group extends simple_database_1.Model {
|
|
|
81
82
|
else {
|
|
82
83
|
query += `JOIN \`${_1.Registration.table}\` as reg_filter ON reg_filter.\`${_1.Member.registrations.foreignKey}\` = \`${_1.Member.table}\`.\`${_1.Member.primary.name}\` AND reg_filter.\`waitingList\` = 0 AND reg_filter.\`registeredAt\` is not null\n`;
|
|
83
84
|
}
|
|
84
|
-
query += _1.Member.users.joinQuery(_1.Member.table, _1.User.table) +
|
|
85
|
+
query += _1.Member.users.joinQuery(_1.Member.table, _1.User.table) + '\n';
|
|
85
86
|
// We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
|
|
86
87
|
query += `where reg_filter.\`groupId\` = ? AND reg_filter.\`cycle\` = ?`;
|
|
87
88
|
const [results] = await simple_database_1.Database.select(query, [this.id, this.cycle - cycleOffset]);
|
|
@@ -91,7 +92,7 @@ class Group extends simple_database_1.Model {
|
|
|
91
92
|
for (const row of results) {
|
|
92
93
|
const foundMember = _1.Member.fromRow(row[_1.Member.table]);
|
|
93
94
|
if (!foundMember) {
|
|
94
|
-
throw new Error(
|
|
95
|
+
throw new Error('Expected member in every row');
|
|
95
96
|
}
|
|
96
97
|
const _f = foundMember.setManyRelation(_1.Member.registrations, []).setManyRelation(_1.Member.users, []);
|
|
97
98
|
// Seach if we already got this member?
|
|
@@ -107,7 +108,7 @@ class Group extends simple_database_1.Model {
|
|
|
107
108
|
if (!member.registrations.find(r => r.id == registration.id)) {
|
|
108
109
|
const group = groups.find(g => g.id == registration.groupId);
|
|
109
110
|
if (!group) {
|
|
110
|
-
throw new Error(
|
|
111
|
+
throw new Error('Expected group');
|
|
111
112
|
}
|
|
112
113
|
member.registrations.push(registration.setRelation(_1.Registration.group, group));
|
|
113
114
|
}
|
|
@@ -144,9 +145,19 @@ class Group extends simple_database_1.Model {
|
|
|
144
145
|
}
|
|
145
146
|
return null;
|
|
146
147
|
}
|
|
147
|
-
async updateOccupancy() {
|
|
148
|
-
this.settings.registeredMembers
|
|
149
|
-
|
|
148
|
+
async updateOccupancy(options) {
|
|
149
|
+
const registeredMembersBefore = this.settings.registeredMembers ?? 0;
|
|
150
|
+
const registeredMembersAfter = await Group.getCount('groupId = ? and registeredAt is not null AND deactivatedAt is null', [this.id]);
|
|
151
|
+
this.settings.registeredMembers = registeredMembersAfter;
|
|
152
|
+
this.settings.reservedMembers = await Group.getCount('groupId = ? and registeredAt is null AND (canRegister = 1 OR reservedUntil >= ?)', [this.id, new Date()]);
|
|
153
|
+
if (this.defaultAgeGroupId) {
|
|
154
|
+
const hasSufficientMembersBefore = registeredMembersBefore >= structures_1.minimumRegistrationCount;
|
|
155
|
+
const hasSufficientMembersAfter = (registeredMembersAfter ?? 0) >= structures_1.minimumRegistrationCount;
|
|
156
|
+
if (options?.isNew || hasSufficientMembersAfter !== hasSufficientMembersBefore) {
|
|
157
|
+
SetupStepsUpdater_1.SetupStepUpdater.updateForOrganizationId(this.organizationId)
|
|
158
|
+
.catch(console.error);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
150
161
|
}
|
|
151
162
|
static async deleteUnreachable(organizationId, period, allGroups) {
|
|
152
163
|
const reachable = new Map();
|
|
@@ -180,7 +191,7 @@ class Group extends simple_database_1.Model {
|
|
|
180
191
|
continue;
|
|
181
192
|
}
|
|
182
193
|
if (!reachable.get(group.id) && group.deletedAt === null) {
|
|
183
|
-
console.log(
|
|
194
|
+
console.log('Deleting unreachable group ' + group.id + ' from organization ' + organizationId + ' org period ' + period.id);
|
|
184
195
|
group.deletedAt = new Date();
|
|
185
196
|
await group.save();
|
|
186
197
|
_1.Member.updateMembershipsForGroupId(group.id);
|
|
@@ -191,7 +202,7 @@ class Group extends simple_database_1.Model {
|
|
|
191
202
|
await queues_1.QueueHandler.schedule('group-stock-update-' + groupId, async () => {
|
|
192
203
|
const updatedGroup = await Group.getByID(groupId);
|
|
193
204
|
if (!updatedGroup) {
|
|
194
|
-
throw new Error(
|
|
205
|
+
throw new Error('Expected group');
|
|
195
206
|
}
|
|
196
207
|
if (!free) {
|
|
197
208
|
updatedGroup.stockReservations = structures_1.StockReservation.added(updatedGroup.stockReservations, addStockReservations);
|
|
@@ -209,71 +220,71 @@ class Group extends simple_database_1.Model {
|
|
|
209
220
|
exports.Group = Group;
|
|
210
221
|
tslib_1.__decorate([
|
|
211
222
|
(0, simple_database_1.column)({
|
|
212
|
-
primary: true, type:
|
|
223
|
+
primary: true, type: 'string', beforeSave(value) {
|
|
213
224
|
return value ?? (0, uuid_1.v4)();
|
|
214
|
-
}
|
|
225
|
+
},
|
|
215
226
|
})
|
|
216
227
|
], Group.prototype, "id", void 0);
|
|
217
228
|
tslib_1.__decorate([
|
|
218
|
-
(0, simple_database_1.column)({ type:
|
|
229
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
219
230
|
], Group.prototype, "type", void 0);
|
|
220
231
|
tslib_1.__decorate([
|
|
221
|
-
(0, simple_database_1.column)({ type:
|
|
232
|
+
(0, simple_database_1.column)({ type: 'json', decoder: structures_1.GroupSettings })
|
|
222
233
|
], Group.prototype, "settings", void 0);
|
|
223
234
|
tslib_1.__decorate([
|
|
224
235
|
(0, simple_database_1.column)({
|
|
225
|
-
type:
|
|
236
|
+
type: 'json', decoder: structures_1.GroupPrivateSettings,
|
|
226
237
|
})
|
|
227
238
|
], Group.prototype, "privateSettings", void 0);
|
|
228
239
|
tslib_1.__decorate([
|
|
229
|
-
(0, simple_database_1.column)({ type:
|
|
240
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
230
241
|
], Group.prototype, "organizationId", void 0);
|
|
231
242
|
tslib_1.__decorate([
|
|
232
|
-
(0, simple_database_1.column)({ type:
|
|
243
|
+
(0, simple_database_1.column)({ type: 'string', nullable: true })
|
|
233
244
|
], Group.prototype, "waitingListId", void 0);
|
|
234
245
|
tslib_1.__decorate([
|
|
235
|
-
(0, simple_database_1.column)({ type:
|
|
246
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
236
247
|
], Group.prototype, "periodId", void 0);
|
|
237
248
|
tslib_1.__decorate([
|
|
238
|
-
(0, simple_database_1.column)({ type:
|
|
249
|
+
(0, simple_database_1.column)({ type: 'string', nullable: true })
|
|
239
250
|
], Group.prototype, "defaultAgeGroupId", void 0);
|
|
240
251
|
tslib_1.__decorate([
|
|
241
|
-
(0, simple_database_1.column)({ type:
|
|
252
|
+
(0, simple_database_1.column)({ type: 'integer' })
|
|
242
253
|
], Group.prototype, "cycle", void 0);
|
|
243
254
|
tslib_1.__decorate([
|
|
244
255
|
(0, simple_database_1.column)({
|
|
245
|
-
type:
|
|
256
|
+
type: 'datetime', beforeSave(old) {
|
|
246
257
|
if (old !== undefined) {
|
|
247
258
|
return old;
|
|
248
259
|
}
|
|
249
260
|
const date = new Date();
|
|
250
261
|
date.setMilliseconds(0);
|
|
251
262
|
return date;
|
|
252
|
-
}
|
|
263
|
+
},
|
|
253
264
|
})
|
|
254
265
|
], Group.prototype, "createdAt", void 0);
|
|
255
266
|
tslib_1.__decorate([
|
|
256
267
|
(0, simple_database_1.column)({
|
|
257
|
-
type:
|
|
268
|
+
type: 'datetime', beforeSave() {
|
|
258
269
|
const date = new Date();
|
|
259
270
|
date.setMilliseconds(0);
|
|
260
271
|
return date;
|
|
261
272
|
},
|
|
262
|
-
skipUpdate: true
|
|
273
|
+
skipUpdate: true,
|
|
263
274
|
})
|
|
264
275
|
], Group.prototype, "updatedAt", void 0);
|
|
265
276
|
tslib_1.__decorate([
|
|
266
277
|
(0, simple_database_1.column)({
|
|
267
|
-
type:
|
|
268
|
-
nullable: true
|
|
278
|
+
type: 'datetime',
|
|
279
|
+
nullable: true,
|
|
269
280
|
})
|
|
270
281
|
], Group.prototype, "deletedAt", void 0);
|
|
271
282
|
tslib_1.__decorate([
|
|
272
|
-
(0, simple_database_1.column)({ type:
|
|
283
|
+
(0, simple_database_1.column)({ type: 'string' })
|
|
273
284
|
], Group.prototype, "status", void 0);
|
|
274
285
|
tslib_1.__decorate([
|
|
275
|
-
(0, simple_database_1.column)({ type:
|
|
286
|
+
(0, simple_database_1.column)({ type: 'json', decoder: new simple_encoding_1.ArrayDecoder(structures_1.StockReservation) })
|
|
276
287
|
], Group.prototype, "stockReservations", void 0);
|
|
277
|
-
_1.Registration.group = new simple_database_1.ManyToOneRelation(Group,
|
|
278
|
-
_1.Registration.group.foreignKey =
|
|
288
|
+
_1.Registration.group = new simple_database_1.ManyToOneRelation(Group, 'group');
|
|
289
|
+
_1.Registration.group.foreignKey = 'groupId';
|
|
279
290
|
//# sourceMappingURL=Group.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../src/models/Group.ts"],"names":[],"mappings":";;;;AAAA,iEAA4G;AAC5G,
|
|
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":"AAAA,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,CAAC;IAGb,WAAW,EAAE,UAAU,EAAE,CAAM;IAG/B,SAAS,EAAE,IAAI,CAAc;WAEhB,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;CA2HhI"}
|
package/dist/src/models/Image.js
CHANGED
|
@@ -10,7 +10,7 @@ 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
|
-
static table =
|
|
13
|
+
static table = 'images';
|
|
14
14
|
id;
|
|
15
15
|
source;
|
|
16
16
|
resolutions = [];
|
|
@@ -18,20 +18,20 @@ class Image extends simple_database_1.Model {
|
|
|
18
18
|
static async create(fileContent, type, resolutions) {
|
|
19
19
|
if (!STAMHOOFD.SPACES_BUCKET || !STAMHOOFD.SPACES_ENDPOINT || !STAMHOOFD.SPACES_KEY || !STAMHOOFD.SPACES_SECRET) {
|
|
20
20
|
throw new simple_errors_1.SimpleError({
|
|
21
|
-
code:
|
|
22
|
-
message:
|
|
23
|
-
statusCode: 503
|
|
21
|
+
code: 'not_available',
|
|
22
|
+
message: 'Uploading is not available',
|
|
23
|
+
statusCode: 503,
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
let fileType = 'png';
|
|
27
|
-
if (type ==
|
|
28
|
-
fileType =
|
|
27
|
+
if (type == 'image/jpeg' || type == 'image/jpg') {
|
|
28
|
+
fileType = 'jpg';
|
|
29
29
|
}
|
|
30
|
-
if (type ===
|
|
31
|
-
fileType =
|
|
30
|
+
if (type === 'image/svg+xml' || type === 'image/svg') {
|
|
31
|
+
fileType = 'svg';
|
|
32
32
|
}
|
|
33
33
|
console.log('creating image', fileType, type, resolutions);
|
|
34
|
-
const supportsTransparency = fileType ==
|
|
34
|
+
const supportsTransparency = fileType == 'png' || fileType == 'svg';
|
|
35
35
|
const promises = [];
|
|
36
36
|
if (resolutions.length) {
|
|
37
37
|
let sharpStream = (0, sharp_1.default)(fileContent, fileType === 'svg' ? { density: 600 } : {}).rotate();
|
|
@@ -43,7 +43,7 @@ class Image extends simple_database_1.Model {
|
|
|
43
43
|
width: r.width ?? undefined,
|
|
44
44
|
height: r.height ?? undefined,
|
|
45
45
|
fit: r.fit,
|
|
46
|
-
withoutEnlargement: type !==
|
|
46
|
+
withoutEnlargement: type !== 'image/svg+xml',
|
|
47
47
|
};
|
|
48
48
|
let t = sharpStream.resize(size);
|
|
49
49
|
// Generate the image data
|
|
@@ -62,31 +62,31 @@ class Image extends simple_database_1.Model {
|
|
|
62
62
|
const s3 = new aws_sdk_1.default.S3({
|
|
63
63
|
endpoint: STAMHOOFD.SPACES_ENDPOINT,
|
|
64
64
|
accessKeyId: STAMHOOFD.SPACES_KEY,
|
|
65
|
-
secretAccessKey: STAMHOOFD.SPACES_SECRET
|
|
65
|
+
secretAccessKey: STAMHOOFD.SPACES_SECRET,
|
|
66
66
|
});
|
|
67
|
-
let prefix = (STAMHOOFD.SPACES_PREFIX ??
|
|
67
|
+
let prefix = (STAMHOOFD.SPACES_PREFIX ?? '');
|
|
68
68
|
if (prefix.length > 0) {
|
|
69
|
-
prefix +=
|
|
69
|
+
prefix += '/';
|
|
70
70
|
}
|
|
71
71
|
const uploadPromises = [];
|
|
72
72
|
const image = new Image();
|
|
73
73
|
image.id = (0, uuid_1.v4)();
|
|
74
74
|
for (const f of files) {
|
|
75
75
|
const fileId = (0, uuid_1.v4)();
|
|
76
|
-
const key = prefix + (STAMHOOFD.environment ??
|
|
76
|
+
const key = prefix + (STAMHOOFD.environment ?? 'development') + '/' + image.id + '/' + fileId + (!supportsTransparency ? '.jpg' : '.png');
|
|
77
77
|
const params = {
|
|
78
78
|
Bucket: STAMHOOFD.SPACES_BUCKET,
|
|
79
79
|
Key: key,
|
|
80
80
|
Body: f.data,
|
|
81
81
|
ContentType: !supportsTransparency ? 'image/jpeg' : 'image/png',
|
|
82
|
-
ACL:
|
|
82
|
+
ACL: 'public-read',
|
|
83
83
|
};
|
|
84
84
|
uploadPromises.push(s3.putObject(params).promise());
|
|
85
85
|
const _file = new structures_1.File({
|
|
86
86
|
id: fileId,
|
|
87
|
-
server:
|
|
87
|
+
server: 'https://' + STAMHOOFD.SPACES_BUCKET + '.' + STAMHOOFD.SPACES_ENDPOINT,
|
|
88
88
|
path: key,
|
|
89
|
-
size: f.info.size
|
|
89
|
+
size: f.info.size,
|
|
90
90
|
});
|
|
91
91
|
const _image = new structures_1.Resolution({
|
|
92
92
|
file: _file,
|
|
@@ -98,19 +98,19 @@ class Image extends simple_database_1.Model {
|
|
|
98
98
|
// Also include the source, in private mode
|
|
99
99
|
const fileId = (0, uuid_1.v4)();
|
|
100
100
|
const uploadExt = fileType;
|
|
101
|
-
const key = prefix + (STAMHOOFD.environment ??
|
|
101
|
+
const key = prefix + (STAMHOOFD.environment ?? 'development') + '/' + image.id + '/' + fileId + '.' + uploadExt;
|
|
102
102
|
const params = {
|
|
103
103
|
Bucket: STAMHOOFD.SPACES_BUCKET,
|
|
104
104
|
Key: key,
|
|
105
105
|
Body: fileContent,
|
|
106
|
-
ContentType: type ??
|
|
107
|
-
ACL:
|
|
106
|
+
ContentType: type ?? 'image/jpeg',
|
|
107
|
+
ACL: 'private',
|
|
108
108
|
};
|
|
109
109
|
image.source = new structures_1.File({
|
|
110
110
|
id: fileId,
|
|
111
|
-
server:
|
|
111
|
+
server: 'https://' + STAMHOOFD.SPACES_BUCKET + '.' + STAMHOOFD.SPACES_ENDPOINT,
|
|
112
112
|
path: key,
|
|
113
|
-
size: fileContent.length
|
|
113
|
+
size: fileContent.length,
|
|
114
114
|
});
|
|
115
115
|
uploadPromises.push(s3.putObject(params).promise());
|
|
116
116
|
await Promise.all(uploadPromises);
|
|
@@ -120,17 +120,17 @@ class Image extends simple_database_1.Model {
|
|
|
120
120
|
}
|
|
121
121
|
exports.Image = Image;
|
|
122
122
|
tslib_1.__decorate([
|
|
123
|
-
(0, simple_database_1.column)({ primary: true, type:
|
|
123
|
+
(0, simple_database_1.column)({ primary: true, type: 'string', beforeSave(value) {
|
|
124
124
|
return value ?? (0, uuid_1.v4)();
|
|
125
125
|
} })
|
|
126
126
|
], Image.prototype, "id", void 0);
|
|
127
127
|
tslib_1.__decorate([
|
|
128
|
-
(0, simple_database_1.column)({ type:
|
|
128
|
+
(0, simple_database_1.column)({ type: 'json', decoder: structures_1.File })
|
|
129
129
|
], Image.prototype, "source", void 0);
|
|
130
130
|
tslib_1.__decorate([
|
|
131
|
-
(0, simple_database_1.column)({ type:
|
|
131
|
+
(0, simple_database_1.column)({ type: 'json', decoder: new simple_encoding_1.ArrayDecoder(structures_1.Resolution) })
|
|
132
132
|
], Image.prototype, "resolutions", void 0);
|
|
133
133
|
tslib_1.__decorate([
|
|
134
|
-
(0, simple_database_1.column)({ type:
|
|
134
|
+
(0, simple_database_1.column)({ type: 'datetime' })
|
|
135
135
|
], Image.prototype, "createdAt", void 0);
|
|
136
136
|
//# sourceMappingURL=Image.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,iEAA2D;AAC3D,6DAAwD;AACxD,sDAA4E;AAC5E,8DAA0B;AAC1B,0DAA0B;AAC1B,+BAAoC;AAEpC,MAAa,KAAM,SAAQ,uBAAK;IAC5B,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;IAKxB,EAAE,CAAU;IAGZ,MAAM,CAAO;IAGb,WAAW,GAAiB,EAAE,CAAC;IAG/B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAE7B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAA4B,EAAE,IAAwB,EAAE,WAAgC;QACxG,IAAI,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;YAC9G,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,4BAA4B;gBACrC,UAAU,EAAE,GAAG;aAClB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,IAAI,IAAI,YAAY,IAAI,IAAI,IAAI,WAAW,EAAE,CAAC;YAC9C,QAAQ,GAAG,KAAK,CAAC;QACrB,CAAC;QACD,IAAI,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YACnD,QAAQ,GAAG,KAAK,CAAC;QACrB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAE3D,MAAM,oBAAoB,GAAG,QAAQ,IAAI,KAAK,IAAI,QAAQ,IAAI,KAAK,CAAC;QACpE,MAAM,QAAQ,GAAuD,EAAE,CAAC;QAExE,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,WAAW,GAAG,IAAA,eAAK,EAAC,WAAW,EAAE,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;YAC1F,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBACxB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAClF,CAAC;YAED,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;gBAC1B,MAAM,IAAI,GAAG;oBACT,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,SAAS;oBAC3B,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,SAAS;oBAC7B,GAAG,EAAE,CAAC,CAAC,GAAG;oBACV,kBAAkB,EAAE,IAAI,KAAK,eAAe;iBAC/C,CAAC;gBAEF,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEjC,0BAA0B;gBAC1B,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBACxB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACP,OAAO,EAAE,EAAE;qBACd,CAAC,CAAC;gBACP,CAAC;qBACI,CAAC;oBACF,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBAChB,CAAC;gBAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC3D,CAAC;QACL,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE1C,MAAM,EAAE,GAAG,IAAI,iBAAG,CAAC,EAAE,CAAC;YAClB,QAAQ,EAAE,SAAS,CAAC,eAAe;YACnC,WAAW,EAAE,SAAS,CAAC,UAAU;YACjC,eAAe,EAAE,SAAS,CAAC,aAAa;SAC3C,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;QAC7C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,GAAG,CAAC;QAClB,CAAC;QAED,MAAM,cAAc,GAAmB,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,KAAK,CAAC,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;QAEpB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACpB,MAAM,MAAM,GAAG,IAAA,SAAM,GAAE,CAAC;YAExB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,IAAI,aAAa,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,MAAM,GAAG,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC1I,MAAM,MAAM,GAAG;gBACX,MAAM,EAAE,SAAS,CAAC,aAAa;gBAC/B,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,WAAW,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW;gBAC/D,GAAG,EAAE,aAAa;aACrB,CAAC;YAEF,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAEpD,MAAM,KAAK,GAAG,IAAI,iBAAI,CAAC;gBACnB,EAAE,EAAE,MAAM;gBACV,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC,aAAa,GAAG,GAAG,GAAG,SAAS,CAAC,eAAe;gBAC9E,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI;aACpB,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,IAAI,uBAAU,CAAC;gBAC1B,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK;gBACnB,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM;aACxB,CAAC,CAAC;YACH,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,2CAA2C;QAC3C,MAAM,MAAM,GAAG,IAAA,SAAM,GAAE,CAAC;QACxB,MAAM,SAAS,GAAG,QAAQ,CAAC;QAC3B,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,IAAI,aAAa,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;QAChH,MAAM,MAAM,GAAG;YACX,MAAM,EAAE,SAAS,CAAC,aAAa;YAC/B,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,IAAI,IAAI,YAAY;YACjC,GAAG,EAAE,SAAS;SACjB,CAAC;QAEF,KAAK,CAAC,MAAM,GAAG,IAAI,iBAAI,CAAC;YACpB,EAAE,EAAE,MAAM;YACV,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC,aAAa,GAAG,GAAG,GAAG,SAAS,CAAC,eAAe;YAC9E,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,WAAW,CAAC,MAAM;SAC3B,CAAC,CAAC;QAEH,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpD,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAClC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC;IACjB,CAAC;;AA3IL,sBA4IC;AAtIG;IAHC,IAAA,wBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YACrD,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC,EAAE,CAAC;iCACQ;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAI,EAAE,CAAC;qCAC3B;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,8BAAY,CAAC,uBAAU,CAAC,EAAE,CAAC;0CACjC;AAG/B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;wCACA"}
|
|
@@ -44,24 +44,24 @@ export declare class Member extends Model {
|
|
|
44
44
|
*/
|
|
45
45
|
static getRegistrationWithMembersForGroup(groupId: string): Promise<RegistrationWithMember[]>;
|
|
46
46
|
/**
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
* Fetch all registrations with members with their corresponding (valid) registrations and payment
|
|
48
|
+
*/
|
|
49
49
|
static getRegistrationWithMembersForPayment(paymentId: string): Promise<RegistrationWithMember[]>;
|
|
50
50
|
/**
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
* Fetch all members with their corresponding (valid) registrations, users
|
|
52
|
+
*/
|
|
53
53
|
static getBlobByIds(...ids: string[]): Promise<MemberWithRegistrations[]>;
|
|
54
54
|
/**
|
|
55
55
|
* Fetch all members with their corresponding (valid) registrations and payment
|
|
56
56
|
*/
|
|
57
57
|
static getFamilyWithRegistrations(id: string): Promise<MemberWithRegistrations[]>;
|
|
58
58
|
/**
|
|
59
|
-
|
|
60
|
-
|
|
59
|
+
* Fetch all members with their corresponding (valid) registrations or waiting lists and payments
|
|
60
|
+
*/
|
|
61
61
|
static getMemberIdsWithRegistrationForUser(user: User): Promise<string[]>;
|
|
62
62
|
/**
|
|
63
|
-
|
|
64
|
-
|
|
63
|
+
* Fetch all members with their corresponding (valid) registrations or waiting lists and payments
|
|
64
|
+
*/
|
|
65
65
|
static getMembersWithRegistrationForUser(user: User): Promise<MemberWithRegistrations[]>;
|
|
66
66
|
getStructureWithRegistrations(this: MemberWithRegistrations, forOrganization?: null | boolean): MemberWithRegistrationsBlob;
|
|
67
67
|
static getRegistrationWithMemberStructure(registration: RegistrationWithMember & {
|
|
@@ -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,EAA+D,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AACtI,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG;IAC3C,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,CAAC,YAAY,GAAG;
|
|
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,EAA+D,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AACtI,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG;IAC3C,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,CAAC,YAAY,GAAG;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,EAAE,CAAC;CACtD,CAAC;AAGF,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,qBAAa,MAAO,SAAQ,KAAK;IAC7B,MAAM,CAAC,KAAK,SAAa;IAQzB,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAQrC,SAAS,EAAE,MAAM,CAAC;IAMlB,QAAQ,EAAE,MAAM,CAAC;IASjB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IASxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAG5B,OAAO,EAAE,aAAa,CAAC;IAEvB;;OAEG;IAEH,kBAAkB,SAAK;IAYvB,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAGhB,MAAM,CAAC,aAAa,2DAA4E;IAGhG,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;IAiCnG;;OAEG;WACU,oCAAoC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAwCvG;;OAEG;WACU,YAAY,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IA+D/E;;OAEG;WACU,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAmBvF;;OAEG;WACU,mCAAmC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAoB/E;;OAEG;WACU,iCAAiC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAI9F,6BAA6B,CAAC,IAAI,EAAE,uBAAuB,EAAE,eAAe,GAAE,IAAI,GAAG,OAAc;IASnG,MAAM,CAAC,kCAAkC,CAAC,YAAY,EAAE,sBAAsB,GAAG;QAAE,KAAK,EAAE,OAAO,SAAS,EAAE,KAAK,CAAA;KAAE,GAAG,4BAA4B;IAYlJ,MAAM,CAAC,2BAA2B,CAAC,EAAE,EAAE,MAAM;WA6BhC,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,UAAQ;YA4JhD,kBAAkB;IA8B1B,kBAAkB,CAAC,UAAU,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;IAsFzE,iBAAiB;IAIjB,yCAAyC;CA6BlD"}
|