@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
|
@@ -4,19 +4,19 @@ const structures_1 = require("@stamhoofd/structures");
|
|
|
4
4
|
const uuid_1 = require("uuid");
|
|
5
5
|
const models_1 = require("../models");
|
|
6
6
|
const MemberMerger_1 = require("./MemberMerger");
|
|
7
|
-
describe(
|
|
8
|
-
describe(
|
|
9
|
-
describe(
|
|
10
|
-
|
|
7
|
+
describe('member merge', () => {
|
|
8
|
+
describe('mergeMemberDetails', () => {
|
|
9
|
+
describe('empty base details', () => {
|
|
10
|
+
// #region arrange
|
|
11
11
|
const m1 = new models_1.Member();
|
|
12
12
|
const m2 = new models_1.Member();
|
|
13
13
|
const d1Old = structures_1.MemberDetails.create({
|
|
14
|
-
firstName:
|
|
15
|
-
lastName:
|
|
14
|
+
firstName: ' ',
|
|
15
|
+
lastName: '',
|
|
16
16
|
birthDay: undefined,
|
|
17
17
|
memberNumber: undefined,
|
|
18
18
|
uitpasNumber: undefined,
|
|
19
|
-
email:
|
|
19
|
+
email: ' ',
|
|
20
20
|
phone: undefined,
|
|
21
21
|
gender: structures_1.Gender.Other,
|
|
22
22
|
requiresFinancialSupport: undefined,
|
|
@@ -33,66 +33,66 @@ describe("member merge", () => {
|
|
|
33
33
|
});
|
|
34
34
|
const recordAnswer = structures_1.RecordAnswer.create({
|
|
35
35
|
settings: structures_1.RecordSettings.create({
|
|
36
|
-
name:
|
|
36
|
+
name: 'answer1',
|
|
37
37
|
required: true,
|
|
38
38
|
choices: [],
|
|
39
39
|
}),
|
|
40
40
|
});
|
|
41
41
|
const d2Old = structures_1.MemberDetails.create({
|
|
42
|
-
firstName:
|
|
43
|
-
lastName:
|
|
42
|
+
firstName: 'John',
|
|
43
|
+
lastName: 'Doe',
|
|
44
44
|
birthDay: new Date(1990, 1, 1),
|
|
45
|
-
memberNumber:
|
|
46
|
-
uitpasNumber:
|
|
47
|
-
email:
|
|
48
|
-
phone:
|
|
45
|
+
memberNumber: '123',
|
|
46
|
+
uitpasNumber: '56',
|
|
47
|
+
email: 'b7v2X@example.com',
|
|
48
|
+
phone: '04863544',
|
|
49
49
|
gender: structures_1.Gender.Male,
|
|
50
50
|
requiresFinancialSupport: structures_1.BooleanStatus.create({ value: true }),
|
|
51
51
|
dataPermissions: structures_1.BooleanStatus.create({ value: true }),
|
|
52
52
|
address: structures_1.Address.create({
|
|
53
|
-
city:
|
|
54
|
-
street:
|
|
55
|
-
number:
|
|
56
|
-
postalCode:
|
|
53
|
+
city: 'Amsterdam',
|
|
54
|
+
street: 'Mozartstraat',
|
|
55
|
+
number: '1',
|
|
56
|
+
postalCode: '1011AB',
|
|
57
57
|
country: structures_1.Country.Netherlands,
|
|
58
58
|
}),
|
|
59
|
-
parents: [structures_1.Parent.create({ firstName:
|
|
59
|
+
parents: [structures_1.Parent.create({ firstName: 'John', lastName: 'Doe' })],
|
|
60
60
|
emergencyContacts: [
|
|
61
61
|
structures_1.EmergencyContact.create({
|
|
62
|
-
name:
|
|
63
|
-
title:
|
|
64
|
-
phone:
|
|
62
|
+
name: 'blabla',
|
|
63
|
+
title: 'title',
|
|
64
|
+
phone: '04863544654',
|
|
65
65
|
}),
|
|
66
66
|
],
|
|
67
67
|
reviewTimes: structures_1.ReviewTimes.create({
|
|
68
68
|
times: [
|
|
69
69
|
structures_1.ReviewTime.create({
|
|
70
|
-
name:
|
|
70
|
+
name: 'parents',
|
|
71
71
|
reviewedAt: new Date(2020, 1, 1),
|
|
72
72
|
}),
|
|
73
73
|
structures_1.ReviewTime.create({
|
|
74
|
-
name:
|
|
74
|
+
name: 'details',
|
|
75
75
|
reviewedAt: new Date(2021, 1, 1),
|
|
76
76
|
}),
|
|
77
77
|
],
|
|
78
78
|
}),
|
|
79
79
|
recordAnswers: new Map([[recordAnswer.id, recordAnswer]]),
|
|
80
|
-
unverifiedEmails: [
|
|
81
|
-
unverifiedPhones: [
|
|
80
|
+
unverifiedEmails: ['email1@test.be', 'email2@test.be'],
|
|
81
|
+
unverifiedPhones: ['04863545', '04863546'],
|
|
82
82
|
unverifiedAddresses: [
|
|
83
83
|
structures_1.Address.create({
|
|
84
|
-
city:
|
|
85
|
-
street:
|
|
86
|
-
number:
|
|
87
|
-
postalCode:
|
|
84
|
+
city: 'Amsterdam',
|
|
85
|
+
street: 'Mozartstraat',
|
|
86
|
+
number: '2',
|
|
87
|
+
postalCode: '1011AB',
|
|
88
88
|
country: structures_1.Country.Netherlands,
|
|
89
89
|
}),
|
|
90
90
|
],
|
|
91
|
-
notes:
|
|
91
|
+
notes: 'note1',
|
|
92
92
|
});
|
|
93
93
|
m1.details = d1Old.clone();
|
|
94
94
|
m2.details = d2Old.clone();
|
|
95
|
-
|
|
95
|
+
// #endregion
|
|
96
96
|
// act
|
|
97
97
|
let d1;
|
|
98
98
|
beforeAll(() => {
|
|
@@ -100,136 +100,136 @@ describe("member merge", () => {
|
|
|
100
100
|
d1 = m1.details;
|
|
101
101
|
});
|
|
102
102
|
// assert
|
|
103
|
-
test(
|
|
103
|
+
test('firstName', () => {
|
|
104
104
|
expect(d1.firstName).toBe(d2Old.firstName);
|
|
105
105
|
});
|
|
106
|
-
test(
|
|
106
|
+
test('lastName', () => {
|
|
107
107
|
expect(d1.lastName).toBe(d2Old.lastName);
|
|
108
108
|
});
|
|
109
|
-
test(
|
|
109
|
+
test('memberNumber', () => {
|
|
110
110
|
expect(d1.memberNumber).toBe(d2Old.memberNumber);
|
|
111
111
|
});
|
|
112
|
-
test(
|
|
112
|
+
test('uitpasNumber', () => {
|
|
113
113
|
expect(d1.uitpasNumber).toBe(d2Old.uitpasNumber);
|
|
114
114
|
});
|
|
115
|
-
test(
|
|
115
|
+
test('email', () => {
|
|
116
116
|
expect(d1.email).toBe(d2Old.email);
|
|
117
117
|
expect(d1.unverifiedEmails).not.toContain(d2Old.email);
|
|
118
118
|
});
|
|
119
|
-
test(
|
|
119
|
+
test('phone', () => {
|
|
120
120
|
expect(d1.phone).toBe(d2Old.phone);
|
|
121
121
|
expect(d1.unverifiedPhones).not.toContain(d2Old.phone);
|
|
122
122
|
});
|
|
123
|
-
test(
|
|
123
|
+
test('gender', () => {
|
|
124
124
|
expect(d1.gender).toBe(d2Old.gender);
|
|
125
125
|
});
|
|
126
|
-
test(
|
|
126
|
+
test('birthDay', () => {
|
|
127
127
|
expect(d1.birthDay?.getTime() ?? -1).toBe(d2Old.birthDay?.getTime() ?? -1);
|
|
128
128
|
});
|
|
129
|
-
test(
|
|
129
|
+
test('requires financial support', () => {
|
|
130
130
|
expect(d1.requiresFinancialSupport?.date.getTime() ?? -1).toBe(d2Old.requiresFinancialSupport?.date.getTime() ?? -1);
|
|
131
131
|
});
|
|
132
|
-
test(
|
|
132
|
+
test('data permissions', () => {
|
|
133
133
|
expect(d1.dataPermissions?.date.getTime() ?? -1).toBe(d2Old.dataPermissions?.date.getTime() ?? -1);
|
|
134
134
|
});
|
|
135
|
-
test(
|
|
135
|
+
test('address', () => {
|
|
136
136
|
expect(d1.address?.id).toBe(d2Old.address?.id);
|
|
137
137
|
});
|
|
138
|
-
test(
|
|
138
|
+
test('parents', () => {
|
|
139
139
|
expect(d1.parents.length).toBe(d2Old.parents.length);
|
|
140
140
|
});
|
|
141
|
-
test(
|
|
141
|
+
test('emergency contacts', () => {
|
|
142
142
|
expect(d1.emergencyContacts.length).toBe(d2Old.emergencyContacts.length);
|
|
143
143
|
});
|
|
144
|
-
test(
|
|
144
|
+
test('review times', () => {
|
|
145
145
|
expect(d1.reviewTimes.times.length).toBe(d2Old.reviewTimes.times.length);
|
|
146
146
|
});
|
|
147
|
-
test(
|
|
147
|
+
test('answers', () => {
|
|
148
148
|
expect(d1.recordAnswers.size).toBe(d2Old.recordAnswers.size);
|
|
149
149
|
});
|
|
150
|
-
test(
|
|
150
|
+
test('unverifiedEmails', () => {
|
|
151
151
|
expect(d1.unverifiedEmails.length).toBe(d2Old.unverifiedEmails.length);
|
|
152
152
|
});
|
|
153
|
-
test(
|
|
153
|
+
test('unverifiedPhones', () => {
|
|
154
154
|
expect(d1.unverifiedPhones.length).toBe(d2Old.unverifiedPhones.length);
|
|
155
155
|
});
|
|
156
|
-
test(
|
|
156
|
+
test('unverifiedAddresses', () => {
|
|
157
157
|
expect(d1.unverifiedAddresses.length).toBe(d2Old.unverifiedAddresses.length);
|
|
158
158
|
});
|
|
159
|
-
test(
|
|
160
|
-
expect(d1.notes).toEqual(
|
|
159
|
+
test('notes', () => {
|
|
160
|
+
expect(d1.notes).toEqual('note1');
|
|
161
161
|
});
|
|
162
162
|
});
|
|
163
|
-
describe(
|
|
164
|
-
|
|
163
|
+
describe('empty other details', () => {
|
|
164
|
+
// #region arrange
|
|
165
165
|
const m1 = new models_1.Member();
|
|
166
166
|
const m2 = new models_1.Member();
|
|
167
167
|
const recordAnswer = structures_1.RecordAnswer.create({
|
|
168
168
|
settings: structures_1.RecordSettings.create({
|
|
169
|
-
name:
|
|
169
|
+
name: 'answer1',
|
|
170
170
|
required: true,
|
|
171
171
|
choices: [],
|
|
172
172
|
}),
|
|
173
173
|
});
|
|
174
174
|
const d1Old = structures_1.MemberDetails.create({
|
|
175
|
-
firstName:
|
|
176
|
-
lastName:
|
|
175
|
+
firstName: 'John',
|
|
176
|
+
lastName: 'Doe',
|
|
177
177
|
birthDay: new Date(1990, 1, 1),
|
|
178
|
-
memberNumber:
|
|
179
|
-
uitpasNumber:
|
|
180
|
-
email:
|
|
181
|
-
phone:
|
|
178
|
+
memberNumber: '123',
|
|
179
|
+
uitpasNumber: '56',
|
|
180
|
+
email: 'b7v2X@example.com',
|
|
181
|
+
phone: '04863544',
|
|
182
182
|
gender: structures_1.Gender.Male,
|
|
183
183
|
requiresFinancialSupport: structures_1.BooleanStatus.create({ value: true }),
|
|
184
184
|
dataPermissions: structures_1.BooleanStatus.create({ value: true }),
|
|
185
185
|
address: structures_1.Address.create({
|
|
186
|
-
city:
|
|
187
|
-
street:
|
|
188
|
-
number:
|
|
189
|
-
postalCode:
|
|
186
|
+
city: 'Amsterdam',
|
|
187
|
+
street: 'Mozartstraat',
|
|
188
|
+
number: '1',
|
|
189
|
+
postalCode: '1011AB',
|
|
190
190
|
country: structures_1.Country.Netherlands,
|
|
191
191
|
}),
|
|
192
|
-
parents: [structures_1.Parent.create({ firstName:
|
|
192
|
+
parents: [structures_1.Parent.create({ firstName: 'John', lastName: 'Doe' })],
|
|
193
193
|
emergencyContacts: [
|
|
194
194
|
structures_1.EmergencyContact.create({
|
|
195
|
-
name:
|
|
196
|
-
title:
|
|
197
|
-
phone:
|
|
195
|
+
name: 'blabla',
|
|
196
|
+
title: 'title',
|
|
197
|
+
phone: '04863544654',
|
|
198
198
|
}),
|
|
199
199
|
],
|
|
200
200
|
reviewTimes: structures_1.ReviewTimes.create({
|
|
201
201
|
times: [
|
|
202
202
|
structures_1.ReviewTime.create({
|
|
203
|
-
name:
|
|
203
|
+
name: 'parents',
|
|
204
204
|
reviewedAt: new Date(2020, 1, 1),
|
|
205
205
|
}),
|
|
206
206
|
structures_1.ReviewTime.create({
|
|
207
|
-
name:
|
|
207
|
+
name: 'details',
|
|
208
208
|
reviewedAt: new Date(2021, 1, 1),
|
|
209
209
|
}),
|
|
210
210
|
],
|
|
211
211
|
}),
|
|
212
212
|
recordAnswers: new Map([[recordAnswer.id, recordAnswer]]),
|
|
213
|
-
unverifiedEmails: [
|
|
214
|
-
unverifiedPhones: [
|
|
213
|
+
unverifiedEmails: ['email1@test.be', 'email2@test.be'],
|
|
214
|
+
unverifiedPhones: ['04863545', '04863546'],
|
|
215
215
|
unverifiedAddresses: [
|
|
216
216
|
structures_1.Address.create({
|
|
217
|
-
city:
|
|
218
|
-
street:
|
|
219
|
-
number:
|
|
220
|
-
postalCode:
|
|
217
|
+
city: 'Amsterdam',
|
|
218
|
+
street: 'Mozartstraat',
|
|
219
|
+
number: '2',
|
|
220
|
+
postalCode: '1011AB',
|
|
221
221
|
country: structures_1.Country.Netherlands,
|
|
222
222
|
}),
|
|
223
223
|
],
|
|
224
|
-
notes:
|
|
224
|
+
notes: 'note1',
|
|
225
225
|
});
|
|
226
226
|
const d2Old = structures_1.MemberDetails.create({
|
|
227
|
-
firstName:
|
|
228
|
-
lastName:
|
|
227
|
+
firstName: ' ',
|
|
228
|
+
lastName: '',
|
|
229
229
|
birthDay: undefined,
|
|
230
230
|
memberNumber: undefined,
|
|
231
231
|
uitpasNumber: undefined,
|
|
232
|
-
email:
|
|
232
|
+
email: ' ',
|
|
233
233
|
phone: undefined,
|
|
234
234
|
gender: structures_1.Gender.Other,
|
|
235
235
|
requiresFinancialSupport: undefined,
|
|
@@ -246,7 +246,7 @@ describe("member merge", () => {
|
|
|
246
246
|
});
|
|
247
247
|
m1.details = d1Old.clone();
|
|
248
248
|
m2.details = d2Old.clone();
|
|
249
|
-
|
|
249
|
+
// #endregion
|
|
250
250
|
// act
|
|
251
251
|
let d1;
|
|
252
252
|
beforeAll(() => {
|
|
@@ -254,73 +254,73 @@ describe("member merge", () => {
|
|
|
254
254
|
d1 = m1.details;
|
|
255
255
|
});
|
|
256
256
|
// assert
|
|
257
|
-
test(
|
|
257
|
+
test('firstName', () => {
|
|
258
258
|
expect(d1.firstName).toBe(d1Old.firstName);
|
|
259
259
|
});
|
|
260
|
-
test(
|
|
260
|
+
test('lastName', () => {
|
|
261
261
|
expect(d1.lastName).toBe(d1Old.lastName);
|
|
262
262
|
});
|
|
263
|
-
test(
|
|
263
|
+
test('memberNumber', () => {
|
|
264
264
|
expect(d1.memberNumber).toBe(d1Old.memberNumber);
|
|
265
265
|
});
|
|
266
|
-
test(
|
|
266
|
+
test('uitpasNumber', () => {
|
|
267
267
|
expect(d1.uitpasNumber).toBe(d1Old.uitpasNumber);
|
|
268
268
|
});
|
|
269
|
-
test(
|
|
269
|
+
test('email', () => {
|
|
270
270
|
expect(d1.email).toBe(d1Old.email);
|
|
271
271
|
expect(d1.unverifiedEmails).not.toContain(d2Old.email);
|
|
272
272
|
});
|
|
273
|
-
test(
|
|
273
|
+
test('phone', () => {
|
|
274
274
|
expect(d1.phone).toBe(d1Old.phone);
|
|
275
275
|
expect(d1.unverifiedPhones).not.toContain(d2Old.phone);
|
|
276
276
|
});
|
|
277
|
-
test(
|
|
277
|
+
test('gender', () => {
|
|
278
278
|
expect(d1.gender).toBe(d1Old.gender);
|
|
279
279
|
});
|
|
280
|
-
test(
|
|
280
|
+
test('birthDay', () => {
|
|
281
281
|
expect(d1.birthDay?.getTime() ?? -1).toBe(d1Old.birthDay?.getTime() ?? -1);
|
|
282
282
|
});
|
|
283
|
-
test(
|
|
283
|
+
test('requires financial support', () => {
|
|
284
284
|
expect(d1.requiresFinancialSupport?.date.getTime() ?? -1).toBe(d1Old.requiresFinancialSupport?.date.getTime() ?? -1);
|
|
285
285
|
});
|
|
286
|
-
test(
|
|
286
|
+
test('data permissions', () => {
|
|
287
287
|
expect(d1.dataPermissions?.date.getTime() ?? -1).toBe(d1Old.dataPermissions?.date.getTime() ?? -1);
|
|
288
288
|
});
|
|
289
|
-
test(
|
|
289
|
+
test('address', () => {
|
|
290
290
|
expect(d1.address?.id).toBe(d1Old.address?.id);
|
|
291
291
|
});
|
|
292
|
-
test(
|
|
292
|
+
test('parents', () => {
|
|
293
293
|
expect(d1.parents.length).toBe(d1Old.parents.length);
|
|
294
294
|
});
|
|
295
|
-
test(
|
|
295
|
+
test('emergency contacts', () => {
|
|
296
296
|
expect(d1.emergencyContacts.length).toBe(d1Old.emergencyContacts.length);
|
|
297
297
|
});
|
|
298
|
-
test(
|
|
298
|
+
test('review times', () => {
|
|
299
299
|
expect(d1.reviewTimes.times.length).toBe(d1Old.reviewTimes.times.length);
|
|
300
300
|
});
|
|
301
|
-
test(
|
|
301
|
+
test('answers', () => {
|
|
302
302
|
expect(d1.recordAnswers.size).toBe(d1Old.recordAnswers.size);
|
|
303
303
|
});
|
|
304
|
-
test(
|
|
304
|
+
test('unverifiedEmails', () => {
|
|
305
305
|
expect(d1.unverifiedEmails.length).toBe(d1Old.unverifiedEmails.length);
|
|
306
306
|
});
|
|
307
|
-
test(
|
|
307
|
+
test('unverifiedPhones', () => {
|
|
308
308
|
expect(d1.unverifiedPhones.length).toBe(d1Old.unverifiedPhones.length);
|
|
309
309
|
});
|
|
310
|
-
test(
|
|
310
|
+
test('unverifiedAddresses', () => {
|
|
311
311
|
expect(d1.unverifiedAddresses.length).toBe(d1Old.unverifiedAddresses.length);
|
|
312
312
|
});
|
|
313
|
-
test(
|
|
314
|
-
expect(d1.notes).toEqual(
|
|
313
|
+
test('notes', () => {
|
|
314
|
+
expect(d1.notes).toEqual('note1');
|
|
315
315
|
});
|
|
316
316
|
});
|
|
317
|
-
describe(
|
|
318
|
-
|
|
317
|
+
describe('complete base and other details', () => {
|
|
318
|
+
// #region arrange
|
|
319
319
|
const m1 = new models_1.Member();
|
|
320
320
|
const m2 = new models_1.Member();
|
|
321
321
|
const recordAnswer1 = structures_1.RecordAnswer.create({
|
|
322
322
|
settings: structures_1.RecordSettings.create({
|
|
323
|
-
name:
|
|
323
|
+
name: 'answer1',
|
|
324
324
|
required: true,
|
|
325
325
|
choices: [],
|
|
326
326
|
}),
|
|
@@ -329,39 +329,39 @@ describe("member merge", () => {
|
|
|
329
329
|
recordAnswer1b.date = new Date(1990, 1, 1);
|
|
330
330
|
const recordAnswer2 = structures_1.RecordAnswer.create({
|
|
331
331
|
settings: structures_1.RecordSettings.create({
|
|
332
|
-
name:
|
|
332
|
+
name: 'answer2',
|
|
333
333
|
required: true,
|
|
334
334
|
choices: [],
|
|
335
335
|
}),
|
|
336
336
|
});
|
|
337
337
|
// will not changed because cloned
|
|
338
338
|
const oldParent1 = structures_1.Parent.create({
|
|
339
|
-
firstName:
|
|
340
|
-
lastName:
|
|
341
|
-
email:
|
|
342
|
-
phone:
|
|
339
|
+
firstName: 'John',
|
|
340
|
+
lastName: 'Doe',
|
|
341
|
+
email: 'john@test.be',
|
|
342
|
+
phone: '04111111',
|
|
343
343
|
});
|
|
344
344
|
const parent1Alt = structures_1.Parent.create({
|
|
345
|
-
firstName:
|
|
346
|
-
lastName:
|
|
347
|
-
email:
|
|
348
|
-
phone:
|
|
345
|
+
firstName: 'John',
|
|
346
|
+
lastName: 'Doe',
|
|
347
|
+
email: 'oldJohn@test.be',
|
|
348
|
+
phone: '0499999',
|
|
349
349
|
address: structures_1.Address.create({
|
|
350
|
-
street:
|
|
351
|
-
number:
|
|
352
|
-
city:
|
|
353
|
-
postalCode:
|
|
350
|
+
street: 'john street',
|
|
351
|
+
number: '5',
|
|
352
|
+
city: 'Amsterdam',
|
|
353
|
+
postalCode: '1011AB',
|
|
354
354
|
country: structures_1.Country.Belgium,
|
|
355
355
|
}),
|
|
356
356
|
});
|
|
357
357
|
const d1Old = structures_1.MemberDetails.create({
|
|
358
|
-
firstName:
|
|
359
|
-
lastName:
|
|
358
|
+
firstName: 'John',
|
|
359
|
+
lastName: 'Doe',
|
|
360
360
|
birthDay: new Date(1990, 1, 1),
|
|
361
|
-
memberNumber:
|
|
362
|
-
uitpasNumber:
|
|
363
|
-
email:
|
|
364
|
-
phone:
|
|
361
|
+
memberNumber: '123',
|
|
362
|
+
uitpasNumber: '56',
|
|
363
|
+
email: 'b7v2X@example.com',
|
|
364
|
+
phone: '04863544',
|
|
365
365
|
gender: structures_1.Gender.Male,
|
|
366
366
|
requiresFinancialSupport: structures_1.BooleanStatus.create({
|
|
367
367
|
value: true,
|
|
@@ -372,59 +372,59 @@ describe("member merge", () => {
|
|
|
372
372
|
date: new Date(2020, 1, 1),
|
|
373
373
|
}),
|
|
374
374
|
address: structures_1.Address.create({
|
|
375
|
-
city:
|
|
376
|
-
street:
|
|
377
|
-
number:
|
|
378
|
-
postalCode:
|
|
375
|
+
city: 'Amsterdam',
|
|
376
|
+
street: 'Mozartstraat',
|
|
377
|
+
number: '1',
|
|
378
|
+
postalCode: '1011AB',
|
|
379
379
|
country: structures_1.Country.Netherlands,
|
|
380
380
|
}),
|
|
381
381
|
parents: [oldParent1],
|
|
382
382
|
emergencyContacts: [
|
|
383
383
|
structures_1.EmergencyContact.create({
|
|
384
|
-
name:
|
|
385
|
-
title:
|
|
386
|
-
phone:
|
|
384
|
+
name: 'blabla',
|
|
385
|
+
title: 'title',
|
|
386
|
+
phone: '04863544654',
|
|
387
387
|
}),
|
|
388
388
|
structures_1.EmergencyContact.create({
|
|
389
|
-
name:
|
|
390
|
-
title:
|
|
391
|
-
phone:
|
|
389
|
+
name: 'blabla2',
|
|
390
|
+
title: 'title2',
|
|
391
|
+
phone: '04863544654',
|
|
392
392
|
}),
|
|
393
393
|
],
|
|
394
394
|
reviewTimes: structures_1.ReviewTimes.create({
|
|
395
395
|
times: [
|
|
396
396
|
structures_1.ReviewTime.create({
|
|
397
|
-
name:
|
|
397
|
+
name: 'parents',
|
|
398
398
|
reviewedAt: new Date(2020, 1, 1),
|
|
399
399
|
}),
|
|
400
400
|
structures_1.ReviewTime.create({
|
|
401
|
-
name:
|
|
401
|
+
name: 'details',
|
|
402
402
|
reviewedAt: new Date(2021, 1, 1),
|
|
403
403
|
}),
|
|
404
404
|
],
|
|
405
405
|
}),
|
|
406
406
|
recordAnswers: new Map([[recordAnswer1.id, recordAnswer1]]),
|
|
407
|
-
unverifiedEmails: [
|
|
408
|
-
unverifiedPhones: [
|
|
407
|
+
unverifiedEmails: ['email1@test.be', 'email2@test.be'],
|
|
408
|
+
unverifiedPhones: ['04863545', '04863546'],
|
|
409
409
|
unverifiedAddresses: [
|
|
410
410
|
structures_1.Address.create({
|
|
411
|
-
city:
|
|
412
|
-
street:
|
|
413
|
-
number:
|
|
414
|
-
postalCode:
|
|
411
|
+
city: 'Amsterdam',
|
|
412
|
+
street: 'Mozartstraat',
|
|
413
|
+
number: '2',
|
|
414
|
+
postalCode: '1011AB',
|
|
415
415
|
country: structures_1.Country.Netherlands,
|
|
416
416
|
}),
|
|
417
417
|
],
|
|
418
|
-
notes:
|
|
418
|
+
notes: 'note1',
|
|
419
419
|
});
|
|
420
420
|
const d2Old = structures_1.MemberDetails.create({
|
|
421
|
-
firstName:
|
|
422
|
-
lastName:
|
|
421
|
+
firstName: 'John',
|
|
422
|
+
lastName: 'Doe',
|
|
423
423
|
birthDay: new Date(2000, 1, 1),
|
|
424
|
-
memberNumber:
|
|
425
|
-
uitpasNumber:
|
|
426
|
-
email:
|
|
427
|
-
phone:
|
|
424
|
+
memberNumber: '123456',
|
|
425
|
+
uitpasNumber: '567',
|
|
426
|
+
email: 'other@example.com',
|
|
427
|
+
phone: '048635449',
|
|
428
428
|
gender: structures_1.Gender.Female,
|
|
429
429
|
// earlier date
|
|
430
430
|
requiresFinancialSupport: structures_1.BooleanStatus.create({
|
|
@@ -437,36 +437,36 @@ describe("member merge", () => {
|
|
|
437
437
|
date: new Date(2021, 1, 1),
|
|
438
438
|
}),
|
|
439
439
|
address: structures_1.Address.create({
|
|
440
|
-
city:
|
|
441
|
-
street:
|
|
442
|
-
number:
|
|
443
|
-
postalCode:
|
|
440
|
+
city: 'Amsterdam',
|
|
441
|
+
street: 'Mozartstraat',
|
|
442
|
+
number: '5',
|
|
443
|
+
postalCode: '1011AB',
|
|
444
444
|
country: structures_1.Country.Netherlands,
|
|
445
445
|
}),
|
|
446
446
|
parents: [
|
|
447
447
|
parent1Alt,
|
|
448
|
-
structures_1.Parent.create({ firstName:
|
|
448
|
+
structures_1.Parent.create({ firstName: 'John', lastName: 'Other' }),
|
|
449
449
|
],
|
|
450
450
|
emergencyContacts: [
|
|
451
451
|
structures_1.EmergencyContact.create({
|
|
452
|
-
name:
|
|
453
|
-
title:
|
|
454
|
-
phone:
|
|
452
|
+
name: 'other emergency contact',
|
|
453
|
+
title: 'title',
|
|
454
|
+
phone: '04863544654',
|
|
455
455
|
}),
|
|
456
456
|
structures_1.EmergencyContact.create({
|
|
457
|
-
name:
|
|
458
|
-
title:
|
|
459
|
-
phone:
|
|
457
|
+
name: 'blabla',
|
|
458
|
+
title: 'title',
|
|
459
|
+
phone: '04863544654',
|
|
460
460
|
}),
|
|
461
461
|
],
|
|
462
462
|
reviewTimes: structures_1.ReviewTimes.create({
|
|
463
463
|
times: [
|
|
464
464
|
structures_1.ReviewTime.create({
|
|
465
|
-
name:
|
|
465
|
+
name: 'parents',
|
|
466
466
|
reviewedAt: new Date(2019, 1, 1),
|
|
467
467
|
}),
|
|
468
468
|
structures_1.ReviewTime.create({
|
|
469
|
-
name:
|
|
469
|
+
name: 'details',
|
|
470
470
|
reviewedAt: new Date(2023, 1, 1),
|
|
471
471
|
}),
|
|
472
472
|
],
|
|
@@ -476,68 +476,68 @@ describe("member merge", () => {
|
|
|
476
476
|
[recordAnswer1.id, recordAnswer1],
|
|
477
477
|
[recordAnswer1b.id, recordAnswer1b],
|
|
478
478
|
]),
|
|
479
|
-
unverifiedEmails: [
|
|
480
|
-
unverifiedPhones: [
|
|
479
|
+
unverifiedEmails: ['otherUnverivied@test.be'],
|
|
480
|
+
unverifiedPhones: ['0486354599', '0486354699'],
|
|
481
481
|
unverifiedAddresses: [
|
|
482
482
|
structures_1.Address.create({
|
|
483
|
-
city:
|
|
484
|
-
street:
|
|
485
|
-
number:
|
|
486
|
-
postalCode:
|
|
483
|
+
city: 'Amsterdam',
|
|
484
|
+
street: 'AndereStraat',
|
|
485
|
+
number: '100',
|
|
486
|
+
postalCode: '1011AB',
|
|
487
487
|
country: structures_1.Country.Netherlands,
|
|
488
488
|
}),
|
|
489
489
|
],
|
|
490
|
-
notes:
|
|
490
|
+
notes: 'note2',
|
|
491
491
|
});
|
|
492
492
|
m1.details = d1Old.clone();
|
|
493
493
|
m2.details = d2Old.clone();
|
|
494
|
-
|
|
494
|
+
// #endregion
|
|
495
495
|
// act
|
|
496
496
|
let d1;
|
|
497
497
|
let parent1;
|
|
498
498
|
beforeAll(() => {
|
|
499
499
|
(0, MemberMerger_1.mergeMemberDetails)(m1, m2);
|
|
500
500
|
d1 = m1.details;
|
|
501
|
-
parent1 = d1.parents.find(
|
|
501
|
+
parent1 = d1.parents.find(p => p.id === oldParent1.id);
|
|
502
502
|
});
|
|
503
503
|
// assert
|
|
504
|
-
test(
|
|
504
|
+
test('firstName', () => {
|
|
505
505
|
expect(d1.firstName).toBe(d1Old.firstName);
|
|
506
506
|
});
|
|
507
|
-
test(
|
|
507
|
+
test('lastName', () => {
|
|
508
508
|
expect(d1.lastName).toBe(d1Old.lastName);
|
|
509
509
|
});
|
|
510
|
-
test(
|
|
510
|
+
test('memberNumber', () => {
|
|
511
511
|
expect(d1.memberNumber).toBe(d1Old.memberNumber);
|
|
512
512
|
});
|
|
513
|
-
test(
|
|
513
|
+
test('uitpasNumber', () => {
|
|
514
514
|
expect(d1.uitpasNumber).toBe(d1Old.uitpasNumber);
|
|
515
515
|
});
|
|
516
|
-
test(
|
|
516
|
+
test('email', () => {
|
|
517
517
|
expect(d1.email).toBe(d1Old.email);
|
|
518
518
|
expect(d1.unverifiedEmails).toContain(d2Old.email);
|
|
519
519
|
});
|
|
520
|
-
test(
|
|
520
|
+
test('phone', () => {
|
|
521
521
|
expect(d1.phone).toBe(d1Old.phone);
|
|
522
522
|
expect(d1.unverifiedPhones).toContain(d2Old.phone);
|
|
523
523
|
});
|
|
524
|
-
test(
|
|
524
|
+
test('gender', () => {
|
|
525
525
|
expect(d1.gender).toBe(d1Old.gender);
|
|
526
526
|
});
|
|
527
|
-
test(
|
|
527
|
+
test('birthDay', () => {
|
|
528
528
|
expect(d1.birthDay?.getTime() ?? -1).toBe(d1Old.birthDay?.getTime() ?? -1);
|
|
529
529
|
});
|
|
530
|
-
test(
|
|
530
|
+
test('requires financial support', () => {
|
|
531
531
|
expect(d1.requiresFinancialSupport?.date.getTime() ?? -1).toBe(d1Old.requiresFinancialSupport?.date.getTime() ?? -1);
|
|
532
532
|
});
|
|
533
|
-
test(
|
|
533
|
+
test('data permissions', () => {
|
|
534
534
|
expect(d1.dataPermissions?.date.getTime() ?? -1).toBe(d2Old.dataPermissions?.date.getTime() ?? -1);
|
|
535
535
|
});
|
|
536
|
-
test(
|
|
536
|
+
test('address', () => {
|
|
537
537
|
expect(d1.address?.id).toBe(d1Old.address?.id);
|
|
538
|
-
expect(d1.unverifiedAddresses.map(
|
|
538
|
+
expect(d1.unverifiedAddresses.map(a => a.id)).toContain(d2Old.address?.id);
|
|
539
539
|
});
|
|
540
|
-
test(
|
|
540
|
+
test('parents', () => {
|
|
541
541
|
expect(d1.parents.length).toBe(2);
|
|
542
542
|
expect(parent1.firstName).toBe(parent1Alt.firstName);
|
|
543
543
|
expect(parent1.lastName).toBe(parent1Alt.lastName);
|
|
@@ -547,30 +547,30 @@ describe("member merge", () => {
|
|
|
547
547
|
expect(d1.unverifiedPhones).toContain(parent1Alt.phone);
|
|
548
548
|
expect(parent1.alternativeEmails).toContain(parent1Alt.email);
|
|
549
549
|
});
|
|
550
|
-
test(
|
|
550
|
+
test('emergency contacts', () => {
|
|
551
551
|
expect(d1.emergencyContacts.length).toBe(3);
|
|
552
552
|
});
|
|
553
|
-
test(
|
|
553
|
+
test('review times', () => {
|
|
554
554
|
expect(d1.reviewTimes.times.length).toBe(2);
|
|
555
555
|
});
|
|
556
|
-
test(
|
|
556
|
+
test('answers', () => {
|
|
557
557
|
expect(d1.recordAnswers.size).toBe(3);
|
|
558
558
|
});
|
|
559
|
-
test(
|
|
559
|
+
test('unverifiedEmails', () => {
|
|
560
560
|
expect(d1.unverifiedEmails.length).toBe(4);
|
|
561
561
|
});
|
|
562
|
-
test(
|
|
562
|
+
test('unverifiedPhones', () => {
|
|
563
563
|
expect(d1.unverifiedPhones.length).toBe(6);
|
|
564
564
|
});
|
|
565
|
-
test(
|
|
565
|
+
test('unverifiedAddresses', () => {
|
|
566
566
|
expect(d1.unverifiedAddresses.length).toBe(3);
|
|
567
567
|
});
|
|
568
|
-
test(
|
|
569
|
-
expect(d1.notes).toEqual(
|
|
568
|
+
test('notes', () => {
|
|
569
|
+
expect(d1.notes).toEqual('note1\nnote2');
|
|
570
570
|
});
|
|
571
571
|
});
|
|
572
572
|
});
|
|
573
|
-
test(
|
|
573
|
+
test('select base member should return last created member', () => {
|
|
574
574
|
const m1 = new models_1.Member();
|
|
575
575
|
m1.createdAt = new Date(2020, 0, 1);
|
|
576
576
|
m1.id = (0, uuid_1.v4)();
|
|
@@ -584,7 +584,7 @@ describe("member merge", () => {
|
|
|
584
584
|
const { base, others } = (0, MemberMerger_1.selectBaseMember)(members);
|
|
585
585
|
expect(base.id).toBe(m3.id);
|
|
586
586
|
expect(others).toHaveLength(2);
|
|
587
|
-
const otherIds = others.map(
|
|
587
|
+
const otherIds = others.map(m => m.id);
|
|
588
588
|
expect(otherIds).toContain(m1.id);
|
|
589
589
|
expect(otherIds).toContain(m2.id);
|
|
590
590
|
});
|