@stamhoofd/models 2.107.0 → 2.107.2
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/BalanceItemFactory.d.ts +1 -1
- package/dist/src/factories/BalanceItemFactory.d.ts.map +1 -1
- package/dist/src/factories/BalanceItemFactory.js +2 -2
- package/dist/src/factories/BalanceItemFactory.js.map +1 -1
- package/dist/src/factories/DocumentTemplateFactory.d.ts +1 -1
- package/dist/src/factories/DocumentTemplateFactory.d.ts.map +1 -1
- package/dist/src/factories/DocumentTemplateFactory.js +2 -2
- package/dist/src/factories/DocumentTemplateFactory.js.map +1 -1
- package/dist/src/factories/EmailTemplateFactory.d.ts +2 -2
- package/dist/src/factories/EmailTemplateFactory.d.ts.map +1 -1
- package/dist/src/factories/EmailTemplateFactory.js +2 -2
- package/dist/src/factories/EmailTemplateFactory.js.map +1 -1
- package/dist/src/factories/EmergencyContactFactory.js.map +1 -1
- package/dist/src/factories/EventFactory.d.ts +3 -3
- package/dist/src/factories/EventFactory.d.ts.map +1 -1
- package/dist/src/factories/EventFactory.js +4 -4
- package/dist/src/factories/EventFactory.js.map +1 -1
- package/dist/src/factories/EventNotificationFactory.d.ts +3 -3
- package/dist/src/factories/EventNotificationFactory.d.ts.map +1 -1
- package/dist/src/factories/EventNotificationFactory.js +7 -7
- package/dist/src/factories/EventNotificationFactory.js.map +1 -1
- package/dist/src/factories/EventNotificationTypeFactory.js +2 -2
- package/dist/src/factories/EventNotificationTypeFactory.js.map +1 -1
- package/dist/src/factories/GroupFactory.d.ts +3 -3
- package/dist/src/factories/GroupFactory.d.ts.map +1 -1
- package/dist/src/factories/GroupFactory.js +4 -4
- package/dist/src/factories/GroupFactory.js.map +1 -1
- package/dist/src/factories/MemberFactory.d.ts +3 -3
- package/dist/src/factories/MemberFactory.d.ts.map +1 -1
- package/dist/src/factories/MemberFactory.js +12 -12
- package/dist/src/factories/MemberFactory.js.map +1 -1
- package/dist/src/factories/MemberResponsibilityRecordFactory.d.ts +1 -1
- package/dist/src/factories/MemberResponsibilityRecordFactory.d.ts.map +1 -1
- package/dist/src/factories/MemberResponsibilityRecordFactory.js +4 -4
- package/dist/src/factories/MemberResponsibilityRecordFactory.js.map +1 -1
- package/dist/src/factories/OrganizationFactory.d.ts +2 -2
- package/dist/src/factories/OrganizationFactory.d.ts.map +1 -1
- package/dist/src/factories/OrganizationFactory.js +4 -4
- package/dist/src/factories/OrganizationFactory.js.map +1 -1
- package/dist/src/factories/OrganizationRegistrationPeriodFactory.d.ts +3 -3
- package/dist/src/factories/OrganizationRegistrationPeriodFactory.d.ts.map +1 -1
- package/dist/src/factories/OrganizationRegistrationPeriodFactory.js +2 -2
- package/dist/src/factories/OrganizationRegistrationPeriodFactory.js.map +1 -1
- package/dist/src/factories/OrganizationTagFactory.js +2 -2
- package/dist/src/factories/OrganizationTagFactory.js.map +1 -1
- package/dist/src/factories/ParentFactory.js +2 -2
- package/dist/src/factories/ParentFactory.js.map +1 -1
- package/dist/src/factories/PlatformEventTypeFactory.js +2 -2
- package/dist/src/factories/PlatformEventTypeFactory.js.map +1 -1
- package/dist/src/factories/PlatformResponsibilityFactory.js +2 -2
- package/dist/src/factories/PlatformResponsibilityFactory.js.map +1 -1
- package/dist/src/factories/RecordAnswerFactory.js +2 -2
- package/dist/src/factories/RecordAnswerFactory.js.map +1 -1
- package/dist/src/factories/RecordCategoryFactory.d.ts +1 -1
- package/dist/src/factories/RecordCategoryFactory.d.ts.map +1 -1
- package/dist/src/factories/RecordCategoryFactory.js +2 -2
- package/dist/src/factories/RecordCategoryFactory.js.map +1 -1
- package/dist/src/factories/RegisterCodeFactory.d.ts +1 -1
- package/dist/src/factories/RegisterCodeFactory.d.ts.map +1 -1
- package/dist/src/factories/RegisterCodeFactory.js +2 -2
- package/dist/src/factories/RegisterCodeFactory.js.map +1 -1
- package/dist/src/factories/RegistrationFactory.d.ts +4 -4
- package/dist/src/factories/RegistrationFactory.d.ts.map +1 -1
- package/dist/src/factories/RegistrationFactory.js +4 -4
- package/dist/src/factories/RegistrationFactory.js.map +1 -1
- package/dist/src/factories/RegistrationPeriodFactory.d.ts +1 -1
- package/dist/src/factories/RegistrationPeriodFactory.d.ts.map +1 -1
- package/dist/src/factories/RegistrationPeriodFactory.js +2 -2
- package/dist/src/factories/RegistrationPeriodFactory.js.map +1 -1
- package/dist/src/factories/STPackageFactory.d.ts +2 -2
- package/dist/src/factories/STPackageFactory.d.ts.map +1 -1
- package/dist/src/factories/STPackageFactory.js +2 -2
- package/dist/src/factories/STPackageFactory.js.map +1 -1
- package/dist/src/factories/UserFactory.d.ts +2 -2
- package/dist/src/factories/UserFactory.d.ts.map +1 -1
- package/dist/src/factories/UserFactory.js +4 -4
- package/dist/src/factories/UserFactory.js.map +1 -1
- package/dist/src/factories/WebshopFactory.d.ts +1 -1
- package/dist/src/factories/WebshopFactory.d.ts.map +1 -1
- package/dist/src/factories/WebshopFactory.js +4 -4
- package/dist/src/factories/WebshopFactory.js.map +1 -1
- package/dist/src/factories/index.d.ts +26 -26
- package/dist/src/factories/index.d.ts.map +1 -1
- package/dist/src/factories/index.js +26 -26
- package/dist/src/factories/index.js.map +1 -1
- package/dist/src/helpers/EmailBuilder.d.ts +1 -1
- package/dist/src/helpers/EmailBuilder.d.ts.map +1 -1
- package/dist/src/helpers/EmailBuilder.js +12 -12
- package/dist/src/helpers/EmailBuilder.js.map +1 -1
- package/dist/src/helpers/GroupBuilder.d.ts +1 -1
- package/dist/src/helpers/GroupBuilder.d.ts.map +1 -1
- package/dist/src/helpers/GroupBuilder.js +26 -26
- package/dist/src/helpers/GroupBuilder.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 +10 -10
- package/dist/src/helpers/MemberMerger.js.map +1 -1
- package/dist/src/helpers/MemberMerger.test.js +18 -18
- package/dist/src/helpers/MemberMerger.test.js.map +1 -1
- package/dist/src/helpers/WebshopCounter.d.ts +1 -1
- package/dist/src/helpers/WebshopCounter.d.ts.map +1 -1
- package/dist/src/index.d.ts +8 -8
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +8 -8
- package/dist/src/index.js.map +1 -1
- package/dist/src/migrations/1605262045-import-postcodes.d.ts +1 -1
- package/dist/src/migrations/1605262045-import-postcodes.js +9 -9
- package/dist/src/migrations/1605262046-import-postcodes-nl.js +7 -7
- package/dist/src/models/BalanceItem.d.ts +3 -3
- package/dist/src/models/BalanceItem.d.ts.map +1 -1
- package/dist/src/models/BalanceItem.js +3 -3
- package/dist/src/models/BalanceItem.js.map +1 -1
- package/dist/src/models/BalanceItemPayment.d.ts +1 -1
- package/dist/src/models/BalanceItemPayment.d.ts.map +1 -1
- package/dist/src/models/BalanceItemPayment.js +3 -3
- package/dist/src/models/BalanceItemPayment.js.map +1 -1
- package/dist/src/models/CachedBalance.d.ts +1 -1
- package/dist/src/models/CachedBalance.d.ts.map +1 -1
- package/dist/src/models/CachedBalance.js +13 -13
- package/dist/src/models/CachedBalance.js.map +1 -1
- package/dist/src/models/Document.d.ts +3 -3
- package/dist/src/models/Document.d.ts.map +1 -1
- package/dist/src/models/Document.js +11 -11
- 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 +17 -17
- package/dist/src/models/DocumentTemplate.js.map +1 -1
- package/dist/src/models/Email.d.ts +2 -2
- package/dist/src/models/Email.d.ts.map +1 -1
- package/dist/src/models/Email.js +33 -33
- package/dist/src/models/Email.js.map +1 -1
- package/dist/src/models/Email.test.js +38 -38
- package/dist/src/models/Email.test.js.map +1 -1
- package/dist/src/models/EmailRecipient.js +2 -2
- package/dist/src/models/EmailRecipient.js.map +1 -1
- package/dist/src/models/EmailVerificationCode.js +6 -6
- package/dist/src/models/EmailVerificationCode.js.map +1 -1
- package/dist/src/models/Event.d.ts +1 -1
- package/dist/src/models/Event.d.ts.map +1 -1
- package/dist/src/models/Event.js +2 -2
- package/dist/src/models/Event.js.map +1 -1
- package/dist/src/models/EventNotification.d.ts +1 -1
- package/dist/src/models/EventNotification.d.ts.map +1 -1
- package/dist/src/models/EventNotification.js +2 -2
- package/dist/src/models/EventNotification.js.map +1 -1
- package/dist/src/models/Group.d.ts +1 -1
- package/dist/src/models/Group.d.ts.map +1 -1
- package/dist/src/models/Group.js +19 -19
- package/dist/src/models/Group.js.map +1 -1
- package/dist/src/models/Member.d.ts +1 -1
- package/dist/src/models/Member.d.ts.map +1 -1
- package/dist/src/models/Member.js +28 -28
- package/dist/src/models/Member.js.map +1 -1
- package/dist/src/models/MemberPlatformMembership.d.ts +2 -2
- package/dist/src/models/MemberPlatformMembership.d.ts.map +1 -1
- package/dist/src/models/MemberPlatformMembership.js +14 -14
- package/dist/src/models/MemberPlatformMembership.js.map +1 -1
- package/dist/src/models/MergedMember.d.ts +1 -1
- package/dist/src/models/MergedMember.d.ts.map +1 -1
- package/dist/src/models/MollieToken.d.ts +1 -1
- package/dist/src/models/MollieToken.d.ts.map +1 -1
- package/dist/src/models/OneTimeToken.d.ts +1 -1
- package/dist/src/models/OneTimeToken.d.ts.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 +28 -27
- package/dist/src/models/Order.js.map +1 -1
- package/dist/src/models/Organization.d.ts +4 -4
- package/dist/src/models/Organization.d.ts.map +1 -1
- package/dist/src/models/Organization.js +14 -14
- package/dist/src/models/Organization.js.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.d.ts +2 -1
- package/dist/src/models/OrganizationRegistrationPeriod.d.ts.map +1 -1
- package/dist/src/models/PasswordToken.d.ts +1 -1
- package/dist/src/models/PasswordToken.d.ts.map +1 -1
- package/dist/src/models/PasswordToken.js +4 -4
- 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/Payment.d.ts +3 -3
- package/dist/src/models/Payment.d.ts.map +1 -1
- package/dist/src/models/Payment.js +6 -6
- package/dist/src/models/Payment.js.map +1 -1
- package/dist/src/models/Platform.js +5 -5
- package/dist/src/models/Platform.js.map +1 -1
- package/dist/src/models/Platform.test.js +23 -23
- package/dist/src/models/Platform.test.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 +8 -8
- package/dist/src/models/Registration.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/STPackage.js +7 -7
- 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 +2 -2
- package/dist/src/models/STPendingInvoice.js.map +1 -1
- package/dist/src/models/Ticket.d.ts +1 -1
- package/dist/src/models/Ticket.d.ts.map +1 -1
- package/dist/src/models/Ticket.js +4 -4
- package/dist/src/models/Ticket.js.map +1 -1
- package/dist/src/models/Token.d.ts +1 -1
- package/dist/src/models/Token.d.ts.map +1 -1
- package/dist/src/models/Token.js +5 -5
- package/dist/src/models/Token.js.map +1 -1
- package/dist/src/models/Token.test.js +11 -11
- package/dist/src/models/Token.test.js.map +1 -1
- package/dist/src/models/User.d.ts +1 -1
- package/dist/src/models/User.d.ts.map +1 -1
- package/dist/src/models/User.js +3 -3
- package/dist/src/models/User.js.map +1 -1
- package/dist/src/models/UserPermissions.d.ts +1 -1
- package/dist/src/models/UserPermissions.d.ts.map +1 -1
- package/dist/src/models/UserPermissions.js +3 -3
- 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 +4 -4
- package/dist/src/models/Webshop.js.map +1 -1
- package/dist/src/models/addresses/City.d.ts +1 -1
- package/dist/src/models/addresses/City.d.ts.map +1 -1
- package/dist/src/models/addresses/City.js +2 -2
- package/dist/src/models/addresses/City.js.map +1 -1
- package/dist/src/models/addresses/PostalCode.d.ts +1 -1
- package/dist/src/models/addresses/PostalCode.d.ts.map +1 -1
- package/dist/src/models/addresses/PostalCode.js +10 -10
- package/dist/src/models/addresses/PostalCode.js.map +1 -1
- package/dist/src/models/addresses/PostalCode.test.js +19 -19
- package/dist/src/models/addresses/PostalCode.test.js.map +1 -1
- package/dist/src/models/addresses/Street.d.ts +1 -1
- package/dist/src/models/addresses/Street.d.ts.map +1 -1
- package/dist/src/models/addresses/Street.js +2 -2
- package/dist/src/models/addresses/Street.js.map +1 -1
- package/dist/src/models/index.d.ts +51 -51
- package/dist/src/models/index.d.ts.map +1 -1
- package/dist/src/models/index.js +62 -62
- package/dist/src/models/index.js.map +1 -1
- package/package.json +2 -2
- package/src/factories/BalanceItemFactory.ts +1 -1
- package/src/factories/DocumentTemplateFactory.ts +1 -1
- package/src/factories/EmailTemplateFactory.ts +2 -2
- package/src/factories/EmergencyContactFactory.ts +10 -10
- package/src/factories/EventFactory.ts +4 -4
- package/src/factories/EventNotificationFactory.ts +5 -5
- package/src/factories/EventNotificationTypeFactory.ts +1 -1
- package/src/factories/GroupFactory.ts +4 -4
- package/src/factories/MemberFactory.ts +16 -16
- package/src/factories/MemberResponsibilityRecordFactory.ts +2 -2
- package/src/factories/OrganizationFactory.ts +3 -3
- package/src/factories/OrganizationRegistrationPeriodFactory.ts +3 -3
- package/src/factories/OrganizationTagFactory.ts +1 -1
- package/src/factories/ParentFactory.ts +11 -11
- package/src/factories/PlatformEventTypeFactory.ts +1 -1
- package/src/factories/PlatformResponsibilityFactory.ts +1 -1
- package/src/factories/RecordAnswerFactory.ts +1 -1
- package/src/factories/RecordCategoryFactory.ts +1 -1
- package/src/factories/RegisterCodeFactory.ts +1 -1
- package/src/factories/RegistrationFactory.ts +5 -5
- package/src/factories/RegistrationPeriodFactory.ts +1 -1
- package/src/factories/STPackageFactory.ts +2 -2
- package/src/factories/UserFactory.ts +3 -3
- package/src/factories/WebshopFactory.ts +2 -2
- package/src/factories/index.ts +26 -26
- package/src/helpers/EmailBuilder.ts +2 -2
- package/src/helpers/GroupBuilder.ts +1 -1
- package/src/helpers/MemberMerger.test.ts +2 -2
- package/src/helpers/MemberMerger.ts +1 -1
- package/src/helpers/WebshopCounter.ts +1 -1
- package/src/index.ts +8 -8
- package/src/migrations/1605262045-import-postcodes.ts +3 -3
- package/src/migrations/1605262046-import-postcodes-nl.ts +3 -3
- package/src/models/BalanceItem.ts +4 -4
- package/src/models/BalanceItemPayment.ts +1 -1
- package/src/models/CachedBalance.ts +2 -2
- package/src/models/Document.ts +13 -13
- package/src/models/DocumentTemplate.ts +8 -8
- package/src/models/Email.test.ts +6 -6
- package/src/models/Email.ts +6 -6
- package/src/models/EmailRecipient.ts +1 -1
- package/src/models/EmailVerificationCode.ts +3 -3
- package/src/models/Event.ts +1 -1
- package/src/models/EventNotification.ts +1 -1
- package/src/models/Group.ts +1 -1
- package/src/models/Member.ts +2 -2
- package/src/models/MemberPlatformMembership.ts +6 -6
- package/src/models/MergedMember.ts +1 -1
- package/src/models/MollieToken.ts +1 -1
- package/src/models/OneTimeToken.ts +1 -1
- package/src/models/Order.ts +4 -3
- package/src/models/Organization.ts +5 -5
- package/src/models/OrganizationRegistrationPeriod.ts +2 -2
- package/src/models/PasswordToken.ts +1 -1
- package/src/models/PayconiqPayment.ts +1 -1
- package/src/models/Payment.ts +5 -5
- package/src/models/Platform.test.ts +1 -1
- package/src/models/Platform.ts +1 -1
- package/src/models/Registration.ts +5 -5
- package/src/models/STInvoice.ts +1 -1
- package/src/models/STPackage.ts +3 -3
- package/src/models/STPendingInvoice.ts +1 -1
- package/src/models/Ticket.ts +1 -1
- package/src/models/Token.test.ts +5 -5
- package/src/models/Token.ts +2 -2
- package/src/models/User.ts +2 -2
- package/src/models/UserPermissions.ts +1 -1
- package/src/models/Webshop.ts +2 -2
- package/src/models/addresses/City.ts +1 -1
- package/src/models/addresses/PostalCode.test.ts +3 -3
- package/src/models/addresses/PostalCode.ts +1 -1
- package/src/models/addresses/Street.ts +1 -1
- package/src/models/index.ts +60 -60
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { QueryableModel } from '@stamhoofd/sql';
|
|
2
2
|
import { OrganizationRegistrationPeriodSettings, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, SetupSteps } from '@stamhoofd/structures';
|
|
3
|
-
import { Group
|
|
3
|
+
import { Group } from './Group.js';
|
|
4
|
+
import { RegistrationPeriod } from './RegistrationPeriod.js';
|
|
4
5
|
export declare class OrganizationRegistrationPeriod extends QueryableModel {
|
|
5
6
|
static table: string;
|
|
6
7
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrganizationRegistrationPeriod.d.ts","sourceRoot":"","sources":["../../../src/models/OrganizationRegistrationPeriod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAwB,sCAAsC,EAAE,8BAA8B,IAAI,oCAAoC,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGzL,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"OrganizationRegistrationPeriod.d.ts","sourceRoot":"","sources":["../../../src/models/OrganizationRegistrationPeriod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAwB,sCAAsC,EAAE,8BAA8B,IAAI,oCAAoC,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGzL,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,qBAAa,8BAA+B,SAAQ,cAAc;IAC9D,MAAM,CAAC,KAAK,SAAuC;IAOnD,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,CAAC;IAGvB,QAAQ,EAAE,MAAM,CAAC;IAGjB,QAAQ,yCAAqD;IAY7D,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAGhB,UAAU,aAAyB;IAEnC,YAAY,CAAC,IAAI,EAAE,8BAA8B,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,KAAK,EAAE;IAQ9F,mBAAmB,CAAC,IAAI,EAAE,8BAA8B,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,KAAK,EAAE;IAQ/F,eAAe,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE;CAsEtF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ManyToOneRelation } from '@simonbackx/simple-database';
|
|
2
2
|
import { I18n } from '@stamhoofd/backend-i18n';
|
|
3
3
|
import { QueryableModel } from '@stamhoofd/sql';
|
|
4
|
-
import { Organization, User } from './';
|
|
4
|
+
import { Organization, User } from './index.js';
|
|
5
5
|
export type PasswordTokenWithUser = PasswordToken & {
|
|
6
6
|
user: User;
|
|
7
7
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PasswordToken.d.ts","sourceRoot":"","sources":["../../../src/models/PasswordToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"PasswordToken.d.ts","sourceRoot":"","sources":["../../../src/models/PasswordToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAKhD,MAAM,MAAM,qBAAqB,GAAG,aAAa,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAcnE,qBAAa,aAAc,SAAQ,cAAc;IAC7C,MAAM,CAAC,KAAK,SAAqB;IAIjC,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,IAAI,CAAC;IAYjB,SAAS,EAAE,IAAI,CAAC;IAGhB,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,IAAI,kCAAuC;IAElD,SAAS,IAAI,OAAO;IAIpB;;;;OAIG;WACU,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,UAAQ,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAiC1G;;OAEG;WACU,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,qBAAqB,CAAC;WAwBvF,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI;WAoBnG,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY;WAMxD,QAAQ,CAAC,MAAM,EAAE,MAAM;CAIvC"}
|
|
@@ -6,7 +6,7 @@ const simple_database_1 = require("@simonbackx/simple-database");
|
|
|
6
6
|
const sql_1 = require("@stamhoofd/sql");
|
|
7
7
|
const base_x_1 = tslib_1.__importDefault(require("base-x"));
|
|
8
8
|
const crypto_1 = tslib_1.__importDefault(require("crypto"));
|
|
9
|
-
const
|
|
9
|
+
const index_js_1 = require("./index.js");
|
|
10
10
|
const simple_errors_1 = require("@simonbackx/simple-errors");
|
|
11
11
|
const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
|
|
12
12
|
const bs58 = (0, base_x_1.default)(ALPHABET);
|
|
@@ -28,7 +28,7 @@ class PasswordToken extends sql_1.QueryableModel {
|
|
|
28
28
|
validUntil;
|
|
29
29
|
createdAt;
|
|
30
30
|
userId;
|
|
31
|
-
static user = new simple_database_1.ManyToOneRelation(
|
|
31
|
+
static user = new simple_database_1.ManyToOneRelation(index_js_1.User, 'user');
|
|
32
32
|
isExpired() {
|
|
33
33
|
return this.validUntil < new Date();
|
|
34
34
|
}
|
|
@@ -38,7 +38,7 @@ class PasswordToken extends sql_1.QueryableModel {
|
|
|
38
38
|
* @param ignoreExpireDate: do not return if it is expired
|
|
39
39
|
*/
|
|
40
40
|
static async getToken(token, ignoreExpireDate = false) {
|
|
41
|
-
const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()}, ${
|
|
41
|
+
const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()}, ${index_js_1.User.getDefaultSelect('user')} FROM ${this.table} ${PasswordToken.user.joinQuery(this.table, 'user')} WHERE ${this.primary.name} = ? LIMIT 1 `, [token]);
|
|
42
42
|
if (rows.length == 0) {
|
|
43
43
|
return undefined;
|
|
44
44
|
}
|
|
@@ -50,7 +50,7 @@ class PasswordToken extends sql_1.QueryableModel {
|
|
|
50
50
|
// If the refresh token is invalid, do not return it
|
|
51
51
|
return undefined;
|
|
52
52
|
}
|
|
53
|
-
const user =
|
|
53
|
+
const user = index_js_1.User.fromRow(rows[0]['user']) || null;
|
|
54
54
|
if (!user) {
|
|
55
55
|
console.error('Password token without a valid user!');
|
|
56
56
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PasswordToken.js","sourceRoot":"","sources":["../../../src/models/PasswordToken.ts"],"names":[],"mappings":";;;;AAAA,iEAAkF;AAElF,wCAAgD;AAChD,4DAA2B;AAC3B,4DAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"PasswordToken.js","sourceRoot":"","sources":["../../../src/models/PasswordToken.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { QueryableModel } from '@stamhoofd/sql';
|
|
2
2
|
import { PayconiqAccount, PaymentStatus } from '@stamhoofd/structures';
|
|
3
|
-
import { Organization, Payment } from './';
|
|
3
|
+
import { Organization, Payment } from './index.js';
|
|
4
4
|
export declare class PayconiqPayment extends QueryableModel {
|
|
5
5
|
static table: string;
|
|
6
6
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayconiqPayment.d.ts","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,uBAAuB,CAAC;AAKhF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"PayconiqPayment.d.ts","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,uBAAuB,CAAC;AAKhF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGnD,qBAAa,eAAgB,SAAQ,cAAc;IAC/C,MAAM,CAAC,KAAK,SAAuB;IAOnC,EAAE,EAAG,MAAM,CAAC;IAGZ,SAAS,EAAE,MAAM,CAAC;IAGlB,UAAU,EAAE,MAAM,CAAC;IAEnB,iBAAiB,CAAC,QAAQ,EAAE,GAAG;IAwBzB,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAuD/E,MAAM,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;WAoB7C,UAAU,CAAC,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC;WAsBrG,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IAqD/L;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,OAAO;CAgHzB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PaymentCustomer, PaymentGeneral, PaymentMethod, PaymentProvider, PaymentStatus, Settlement, TransferSettings, PaymentType } from '@stamhoofd/structures';
|
|
2
|
-
import { BalanceItem, Organization } from './';
|
|
2
|
+
import { BalanceItem, Organization } from './index.js';
|
|
3
3
|
import { QueryableModel } from '@stamhoofd/sql';
|
|
4
4
|
export declare class Payment extends QueryableModel {
|
|
5
5
|
static table: string;
|
|
@@ -100,8 +100,8 @@ export declare class Payment extends QueryableModel {
|
|
|
100
100
|
payingOrganizations: Organization[];
|
|
101
101
|
}>;
|
|
102
102
|
static loadBalanceItemRelations(balanceItems: import('./BalanceItem').BalanceItem[]): Promise<{
|
|
103
|
-
registrations: import("./Member").RegistrationWithMember[];
|
|
104
|
-
orders: import("./Order").Order[];
|
|
103
|
+
registrations: import("./Member.js").RegistrationWithMember[];
|
|
104
|
+
orders: import("./Order.js").Order[];
|
|
105
105
|
}>;
|
|
106
106
|
}
|
|
107
107
|
//# sourceMappingURL=Payment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Payment.d.ts","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":"AACA,OAAO,EAAmD,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAoB,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIrO,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"Payment.d.ts","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":"AACA,OAAO,EAAmD,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAoB,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIrO,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,qBAAa,OAAQ,SAAQ,cAAc;IACvC,MAAM,CAAC,KAAK,SAAc;IAO1B,EAAE,EAAG,MAAM,CAAC;IAEZ;;;;;OAKG;IAEH,IAAI,cAAuB;IAE3B;;OAEG;IAEH,MAAM,EAAE,aAAa,CAAC;IAGtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAQ;IAGxC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAQ;IAGxC,MAAM,EAAE,aAAa,CAAC;IAGtB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAErC;;OAEG;IAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEnC;;OAEG;IACH,IAAI,MAAM,IAOK,MAAM,GAAG,IAAI,CAL3B;IAED;;OAEG;IACH,IAAI,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,EAE3B;IAED;;OAEG;IAEH,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEtC;;OAEG;IAEH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IAEH,WAAW,SAAK;IAEhB;;;;;OAKG;IAEH,gBAAgB,SAAK;IAErB;;;;OAIG;IAEH,gBAAgB,SAAK;IAErB;;OAEG;IAEH,uBAAuB,SAAK;IAE5B;;OAEG;IAEH,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGvC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG1C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAYjD,SAAS,EAAE,IAAI,CAAC;IAEhB,eAAe,EAAE,IAAI,GAAG,IAAI,CAAQ;IAapC,SAAS,EAAE,IAAI,CAAC;IAGhB,MAAM,EAAE,IAAI,GAAG,IAAI,CAAQ;IAI3B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAQ;IAGrC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE/B,mBAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO;IAK/G,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM;WAIlB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,kBAAkB,UAAQ,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAgB5G,MAAM,CAAC,gCAAgC,CAAC,EAAE,QAAQ,EAAE,mBAAmB,EAAE,YAAY,EAAE,mBAAmB,EAAE,EAAE;QAC1G,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,mBAAmB,EAAE,OAAO,sBAAsB,EAAE,kBAAkB,EAAE,CAAC;QACzE,YAAY,EAAE,OAAO,eAAe,EAAE,WAAW,EAAE,CAAC;QACpD,mBAAmB,EAAE,YAAY,EAAE,CAAC;KACvC,EAAE,kBAAkB,UAAQ,GAAG,cAAc,EAAE;IA8BhD;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,cAAc,CAAC;WAIvC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE;;;;WAoBpC,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE;;;WAW3C,wBAAwB,CAAC,YAAY,EAAE,OAAO,eAAe,EAAE,WAAW,EAAE;;;;CAa5F"}
|
|
@@ -6,7 +6,7 @@ const simple_database_1 = require("@simonbackx/simple-database");
|
|
|
6
6
|
const structures_1 = require("@stamhoofd/structures");
|
|
7
7
|
const utility_1 = require("@stamhoofd/utility");
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
|
-
const
|
|
9
|
+
const index_js_1 = require("./index.js");
|
|
10
10
|
const sql_1 = require("@stamhoofd/sql");
|
|
11
11
|
class Payment extends sql_1.QueryableModel {
|
|
12
12
|
static table = 'payments';
|
|
@@ -146,8 +146,8 @@ class Payment extends sql_1.QueryableModel {
|
|
|
146
146
|
if (payments.length === 0) {
|
|
147
147
|
return { balanceItemPayments: [], balanceItems: [] };
|
|
148
148
|
}
|
|
149
|
-
const { BalanceItemPayment } = await Promise.resolve().then(() => tslib_1.__importStar(require('./BalanceItemPayment')));
|
|
150
|
-
const { BalanceItem } = await Promise.resolve().then(() => tslib_1.__importStar(require('./BalanceItem')));
|
|
149
|
+
const { BalanceItemPayment } = await Promise.resolve().then(() => tslib_1.__importStar(require('./BalanceItemPayment.js')));
|
|
150
|
+
const { BalanceItem } = await Promise.resolve().then(() => tslib_1.__importStar(require('./BalanceItem.js')));
|
|
151
151
|
// Load all the related models from the database so we can build the structures
|
|
152
152
|
const balanceItemPayments = await BalanceItemPayment.where({
|
|
153
153
|
paymentId: {
|
|
@@ -164,12 +164,12 @@ class Payment extends sql_1.QueryableModel {
|
|
|
164
164
|
if (ids.length === 0) {
|
|
165
165
|
return { payingOrganizations: [] };
|
|
166
166
|
}
|
|
167
|
-
const payingOrganizations = await
|
|
167
|
+
const payingOrganizations = await index_js_1.Organization.getByIDs(...ids);
|
|
168
168
|
return { payingOrganizations };
|
|
169
169
|
}
|
|
170
170
|
static async loadBalanceItemRelations(balanceItems) {
|
|
171
|
-
const { Order } = await Promise.resolve().then(() => tslib_1.__importStar(require('./Order')));
|
|
172
|
-
const { Member } = await Promise.resolve().then(() => tslib_1.__importStar(require('./Member')));
|
|
171
|
+
const { Order } = await Promise.resolve().then(() => tslib_1.__importStar(require('./Order.js')));
|
|
172
|
+
const { Member } = await Promise.resolve().then(() => tslib_1.__importStar(require('./Member.js')));
|
|
173
173
|
// Load members and orders
|
|
174
174
|
const registrationIds = utility_1.Formatter.uniqueArray(balanceItems.flatMap(b => b.registrationId ? [b.registrationId] : []));
|
|
175
175
|
const orderIds = utility_1.Formatter.uniqueArray(balanceItems.flatMap(b => b.orderId ? [b.orderId] : []));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Payment.js","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":";;;;AAAA,iEAAqD;AACrD,sDAAqO;AACrO,gDAA+C;AAC/C,+BAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"Payment.js","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const sql_1 = require("@stamhoofd/sql");
|
|
|
9
9
|
const structures_1 = require("@stamhoofd/structures");
|
|
10
10
|
const utility_1 = require("@stamhoofd/utility");
|
|
11
11
|
const uuid_1 = require("uuid");
|
|
12
|
-
const
|
|
12
|
+
const RegistrationPeriod_js_1 = require("./RegistrationPeriod.js");
|
|
13
13
|
class Platform extends sql_1.QueryableModel {
|
|
14
14
|
static table = 'platform';
|
|
15
15
|
id;
|
|
@@ -51,7 +51,7 @@ class Platform extends sql_1.QueryableModel {
|
|
|
51
51
|
return this.sharedStruct;
|
|
52
52
|
}
|
|
53
53
|
async setPreviousPeriodId() {
|
|
54
|
-
const period = await
|
|
54
|
+
const period = await RegistrationPeriod_js_1.RegistrationPeriod.getByID(this.periodId);
|
|
55
55
|
this.previousPeriodId = period?.previousPeriodId ?? null;
|
|
56
56
|
this.nextPeriodId = period?.nextPeriodId ?? null;
|
|
57
57
|
}
|
|
@@ -74,10 +74,10 @@ class Platform extends sql_1.QueryableModel {
|
|
|
74
74
|
model = new Platform();
|
|
75
75
|
model.id = '1';
|
|
76
76
|
if (STAMHOOFD.userMode === 'platform') {
|
|
77
|
-
model.periodId = (await
|
|
77
|
+
model.periodId = (await RegistrationPeriod_js_1.RegistrationPeriod.all())[0].id;
|
|
78
78
|
}
|
|
79
79
|
else {
|
|
80
|
-
const period = await
|
|
80
|
+
const period = await RegistrationPeriod_js_1.RegistrationPeriod.select().where('organizationId', null).first(true);
|
|
81
81
|
model.periodId = period.id;
|
|
82
82
|
}
|
|
83
83
|
await model.save();
|
|
@@ -114,7 +114,7 @@ class Platform extends sql_1.QueryableModel {
|
|
|
114
114
|
}
|
|
115
115
|
static async setCachesFromModel(model) {
|
|
116
116
|
// Set structure cache
|
|
117
|
-
const period = await
|
|
117
|
+
const period = await RegistrationPeriod_js_1.RegistrationPeriod.getByID(model.periodId);
|
|
118
118
|
const struct = structures_1.Platform.create({
|
|
119
119
|
...model,
|
|
120
120
|
period: period?.getStructure() ?? undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../../../src/models/Platform.ts"],"names":[],"mappings":";;;;AAAA,iEAAqD;AACrD,6DAAwD;AACxD,8CAAiD;AACjD,wCAAgD;AAChD,sDAAgI;AAChI,gDAAgD;AAChD,+BAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../../../src/models/Platform.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const structures_1 = require("@stamhoofd/structures");
|
|
4
|
-
const
|
|
4
|
+
const Platform_js_1 = require("./Platform.js");
|
|
5
5
|
const simple_database_1 = require("@simonbackx/simple-database");
|
|
6
6
|
describe('Model.Platform', () => {
|
|
7
7
|
describe('Shared caches', () => {
|
|
8
8
|
beforeEach(async () => {
|
|
9
|
-
const platform = await
|
|
9
|
+
const platform = await Platform_js_1.Platform.getByID('1');
|
|
10
10
|
platform.config = structures_1.PlatformConfig.create({});
|
|
11
11
|
await platform.save();
|
|
12
12
|
});
|
|
13
13
|
test('Editable model changes do not propagate', async () => {
|
|
14
|
-
const editable = await
|
|
14
|
+
const editable = await Platform_js_1.Platform.getForEditing();
|
|
15
15
|
editable.config.membershipTypes = [
|
|
16
16
|
structures_1.PlatformMembershipType.create({ id: '1', name: 'Test' }),
|
|
17
17
|
];
|
|
18
|
-
const shared = (await
|
|
18
|
+
const shared = (await Platform_js_1.Platform.getShared());
|
|
19
19
|
expect(shared.config.membershipTypes).toHaveLength(0);
|
|
20
20
|
});
|
|
21
21
|
test('Shared model is immutable', async () => {
|
|
22
|
-
const editable = await
|
|
22
|
+
const editable = await Platform_js_1.Platform.getForEditing();
|
|
23
23
|
editable.config.membershipTypes = [
|
|
24
24
|
structures_1.PlatformMembershipType.create({ id: '1', name: 'Test' }),
|
|
25
25
|
];
|
|
26
26
|
await editable.save();
|
|
27
|
-
const shared = (await
|
|
27
|
+
const shared = (await Platform_js_1.Platform.getShared());
|
|
28
28
|
expect(() => {
|
|
29
29
|
shared.privateConfig.roles = [];
|
|
30
30
|
}).toThrow();
|
|
@@ -37,17 +37,17 @@ describe('Model.Platform', () => {
|
|
|
37
37
|
}).toThrow();
|
|
38
38
|
});
|
|
39
39
|
test('Saving changes propagates to all shared states', async () => {
|
|
40
|
-
const structBefore = await
|
|
41
|
-
const privateStructBefore = await
|
|
42
|
-
const sharedModelBefore = await
|
|
43
|
-
const editable = await
|
|
40
|
+
const structBefore = await Platform_js_1.Platform.getSharedStruct();
|
|
41
|
+
const privateStructBefore = await Platform_js_1.Platform.getSharedPrivateStruct();
|
|
42
|
+
const sharedModelBefore = await Platform_js_1.Platform.getShared();
|
|
43
|
+
const editable = await Platform_js_1.Platform.getForEditing();
|
|
44
44
|
editable.config.membershipTypes = [
|
|
45
45
|
structures_1.PlatformMembershipType.create({ id: '1', name: 'Hey there' }),
|
|
46
46
|
];
|
|
47
47
|
await editable.save();
|
|
48
|
-
const structAfter = await
|
|
49
|
-
const privateStructAfter = await
|
|
50
|
-
const sharedModelAfter = await
|
|
48
|
+
const structAfter = await Platform_js_1.Platform.getSharedStruct();
|
|
49
|
+
const privateStructAfter = await Platform_js_1.Platform.getSharedPrivateStruct();
|
|
50
|
+
const sharedModelAfter = await Platform_js_1.Platform.getShared();
|
|
51
51
|
expect(structAfter.config.membershipTypes[0].name).toEqual('Hey there');
|
|
52
52
|
expect(privateStructAfter.config.membershipTypes[0].name).toEqual('Hey there');
|
|
53
53
|
expect(sharedModelAfter.config.membershipTypes[0].name).toEqual('Hey there');
|
|
@@ -60,30 +60,30 @@ describe('Model.Platform', () => {
|
|
|
60
60
|
describe('Creating fresh platform', () => {
|
|
61
61
|
beforeEach(async () => {
|
|
62
62
|
await simple_database_1.Database.delete('DELETE FROM platform');
|
|
63
|
-
await
|
|
64
|
-
if (await
|
|
63
|
+
await Platform_js_1.Platform.clearCacheWithoutRefresh();
|
|
64
|
+
if (await Platform_js_1.Platform.getByID('1')) {
|
|
65
65
|
throw new Error('Platform 1 should not exist');
|
|
66
66
|
}
|
|
67
67
|
});
|
|
68
68
|
test('when requesting getForEditing', async () => {
|
|
69
|
-
const editable = await
|
|
69
|
+
const editable = await Platform_js_1.Platform.getForEditing();
|
|
70
70
|
expect(editable.id).toBe('1');
|
|
71
|
-
expect(await
|
|
71
|
+
expect(await Platform_js_1.Platform.getByID('1')).toEqual(editable);
|
|
72
72
|
});
|
|
73
73
|
test('when requesting getShared', async () => {
|
|
74
|
-
const shared = await
|
|
74
|
+
const shared = await Platform_js_1.Platform.getShared();
|
|
75
75
|
expect(shared.id).toBe('1');
|
|
76
|
-
expect(await
|
|
76
|
+
expect(await Platform_js_1.Platform.getByID('1')).toMatchObject(shared);
|
|
77
77
|
});
|
|
78
78
|
test('when requesting getSharedPrivateStruct', async () => {
|
|
79
|
-
const editable = await
|
|
79
|
+
const editable = await Platform_js_1.Platform.getSharedPrivateStruct();
|
|
80
80
|
expect(editable).toBeDefined();
|
|
81
|
-
expect(await
|
|
81
|
+
expect(await Platform_js_1.Platform.getByID('1')).toBeDefined();
|
|
82
82
|
});
|
|
83
83
|
test('when requesting getSharedStruct', async () => {
|
|
84
|
-
const editable = await
|
|
84
|
+
const editable = await Platform_js_1.Platform.getSharedStruct();
|
|
85
85
|
expect(editable).toBeDefined();
|
|
86
|
-
expect(await
|
|
86
|
+
expect(await Platform_js_1.Platform.getByID('1')).toBeDefined();
|
|
87
87
|
});
|
|
88
88
|
});
|
|
89
89
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Platform.test.js","sourceRoot":"","sources":["../../../src/models/Platform.test.ts"],"names":[],"mappings":";;AAAA,sDAA+E;AAC/E
|
|
1
|
+
{"version":3,"file":"Platform.test.js","sourceRoot":"","sources":["../../../src/models/Platform.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ManyToOneRelation } from '@simonbackx/simple-database';
|
|
2
2
|
import { AppliedRegistrationDiscount, EmailTemplateType, GroupPrice, Recipient, RecordAnswer, RegisterItemOption, Registration as RegistrationStructure, StockReservation } from '@stamhoofd/structures';
|
|
3
3
|
import { QueryableModel } from '@stamhoofd/sql';
|
|
4
|
-
import { Organization, User } from './';
|
|
4
|
+
import { Organization, User } from './index.js';
|
|
5
5
|
export declare class Registration extends QueryableModel {
|
|
6
6
|
static table: string;
|
|
7
7
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Registration.d.ts","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,UAAU,EAAiD,SAAS,EAAE,YAAY,EAAuB,kBAAkB,EAAE,YAAY,IAAI,qBAAqB,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAK1R,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAS,YAAY,EAAkC,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"Registration.d.ts","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,UAAU,EAAiD,SAAS,EAAE,YAAY,EAAuB,kBAAkB,EAAE,YAAY,IAAI,qBAAqB,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAK1R,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAS,YAAY,EAAkC,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvF,qBAAa,YAAa,SAAQ,cAAc;IAC5C,MAAM,CAAC,KAAK,SAAmB;IAO/B,EAAE,EAAG,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,cAAc,EAAE,MAAM,CAAC;IAGvB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3C,QAAQ,EAAE,MAAM,CAAC;IAGjB,OAAO,EAAE,MAAM,CAAC;IAGhB,UAAU,EAAE,UAAU,CAAC;IAGvB,OAAO,EAAE,kBAAkB,EAAE,CAAM;IAGnC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAErD;;OAEG;IAEH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEhC;;OAEG;IAEH,KAAK,EAAE,MAAM,CAAK;IAElB;;;OAGG;IAEH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAY5B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAEhB;;OAEG;IAEH,YAAY,EAAE,IAAI,GAAG,IAAI,CAAQ;IAGjC,aAAa,EAAE,IAAI,GAAG,IAAI,CAAQ;IAElC;;OAEG;IAEH,SAAS,EAAE,IAAI,GAAG,IAAI,CAAQ;IAE9B;;OAEG;IAEH,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAE/B;;OAEG;IAEH,WAAW,UAAS;IAEpB;;;OAGG;IAEH,WAAW,UAAS;IAGpB,qBAAqB,UAAQ;IAG7B,aAAa,EAAE,IAAI,GAAG,IAAI,CAAQ;IAElC;;;OAGG;IAEH,SAAS,SAAK;IAEd;;OAEG;IAEH,iBAAiB,EAAE,gBAAgB,EAAE,CAAM;IAE3C;;;;;;;;OAQG;IAEH,SAAS,2CAAkD;IAE3D,MAAM,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,EAAE,OAAO,SAAS,EAAE,KAAK,CAAC,CAAC;IAElE,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG;QAAE,KAAK,EAAE,OAAO,SAAS,EAAE,KAAK,CAAA;KAAE;IAQpE;;;OAGG;WACU,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBhE,aAAa,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,IAAI,EAAE,KAAK;IAqCnE,iBAAiB,CAAC,IAAI,EAAE;QAC1B,IAAI,EAAE,iBAAiB,CAAC;KAC3B;WA0BY,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,OAAO;IA+EpG,kBAAkB;CAGrB"}
|
|
@@ -8,8 +8,8 @@ const utility_1 = require("@stamhoofd/utility");
|
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
9
|
const simple_encoding_1 = require("@simonbackx/simple-encoding");
|
|
10
10
|
const sql_1 = require("@stamhoofd/sql");
|
|
11
|
-
const
|
|
12
|
-
const
|
|
11
|
+
const EmailBuilder_js_1 = require("../helpers/EmailBuilder.js");
|
|
12
|
+
const index_js_1 = require("./index.js");
|
|
13
13
|
class Registration extends sql_1.QueryableModel {
|
|
14
14
|
static table = 'registrations';
|
|
15
15
|
id;
|
|
@@ -107,7 +107,7 @@ class Registration extends sql_1.QueryableModel {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
async getRecipients(organization, group) {
|
|
110
|
-
const { Member } = await Promise.resolve().then(() => tslib_1.__importStar(require('./Member')));
|
|
110
|
+
const { Member } = await Promise.resolve().then(() => tslib_1.__importStar(require('./Member.js')));
|
|
111
111
|
const member = await Member.getWithRegistrations(this.memberId);
|
|
112
112
|
if (!member) {
|
|
113
113
|
return [];
|
|
@@ -139,18 +139,18 @@ class Registration extends sql_1.QueryableModel {
|
|
|
139
139
|
})).filter(r => allowedEmails.includes(r.email.toLocaleLowerCase()));
|
|
140
140
|
}
|
|
141
141
|
async sendEmailTemplate(data) {
|
|
142
|
-
const Group = (await Promise.resolve().then(() => tslib_1.__importStar(require('./')))).Group;
|
|
142
|
+
const Group = (await Promise.resolve().then(() => tslib_1.__importStar(require('./index.js')))).Group;
|
|
143
143
|
const group = await Group.getByID(this.groupId);
|
|
144
144
|
if (!group) {
|
|
145
145
|
return;
|
|
146
146
|
}
|
|
147
|
-
const organization = await
|
|
147
|
+
const organization = await index_js_1.Organization.getByID(group.organizationId);
|
|
148
148
|
if (!organization) {
|
|
149
149
|
return;
|
|
150
150
|
}
|
|
151
151
|
const recipients = await this.getRecipients(organization, group);
|
|
152
152
|
// Create e-mail builder
|
|
153
|
-
await (0,
|
|
153
|
+
await (0, EmailBuilder_js_1.sendEmailTemplate)(organization, {
|
|
154
154
|
template: {
|
|
155
155
|
type: data.type,
|
|
156
156
|
group,
|
|
@@ -220,11 +220,11 @@ class Registration extends sql_1.QueryableModel {
|
|
|
220
220
|
];
|
|
221
221
|
let group = null;
|
|
222
222
|
if (groupIds.length == 1) {
|
|
223
|
-
const Group = (await Promise.resolve().then(() => tslib_1.__importStar(require('./')))).Group;
|
|
223
|
+
const Group = (await Promise.resolve().then(() => tslib_1.__importStar(require('./index.js')))).Group;
|
|
224
224
|
group = await Group.getByID(groupIds[0]);
|
|
225
225
|
}
|
|
226
226
|
// Create e-mail builder
|
|
227
|
-
await (0,
|
|
227
|
+
await (0, EmailBuilder_js_1.sendEmailTemplate)(organization, {
|
|
228
228
|
template: {
|
|
229
229
|
type: structures_1.EmailTemplateType.RegistrationTransferDetails,
|
|
230
230
|
group,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Registration.js","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":";;;;AAAA,iEAAkF;AAClF,sDAA0R;AAC1R,gDAA+C;AAC/C,+BAAoC;AAEpC,iEAAsF;AACtF,wCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"Registration.js","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { QueryableModel } from '@stamhoofd/sql';
|
|
2
2
|
import { OrganizationPaymentMandate, STInvoiceMeta } from '@stamhoofd/structures';
|
|
3
|
-
import { Organization } from './';
|
|
3
|
+
import { Organization } from './index.js';
|
|
4
4
|
export declare class STInvoice extends QueryableModel {
|
|
5
5
|
static table: string;
|
|
6
6
|
private static numberCache;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"STInvoice.d.ts","sourceRoot":"","sources":["../../../src/models/STInvoice.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAqC,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAErH,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"STInvoice.d.ts","sourceRoot":"","sources":["../../../src/models/STInvoice.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAqC,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAErH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,qBAAa,SAAU,SAAQ,cAAc;IACzC,MAAM,CAAC,KAAK,SAAwB;IAEpC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAuB;IAQjD,EAAE,EAAG,MAAM,CAAC;IAEZ;;OAEG;IAEH,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9B;;OAEG;IAEH,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpC;;;OAGG;IAEH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE/B;;OAEG;IAEH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGhC,IAAI,EAAE,aAAa,CAAC;IAEpB;;OAEG;IAEH,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG7B,MAAM,EAAE,IAAI,GAAG,IAAI,CAAQ;IAY3B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGhC,aAAa,UAAS;WAKT,iBAAiB,CAAC,YAAY,EAAE,YAAY;CA6C5D"}
|
|
@@ -8,9 +8,9 @@ const structures_1 = require("@stamhoofd/structures");
|
|
|
8
8
|
const utility_1 = require("@stamhoofd/utility");
|
|
9
9
|
const uuid_1 = require("uuid");
|
|
10
10
|
const sql_1 = require("@stamhoofd/sql");
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const
|
|
11
|
+
const EmailBuilder_js_1 = require("../helpers/EmailBuilder.js");
|
|
12
|
+
const GroupBuilder_js_1 = require("../helpers/GroupBuilder.js");
|
|
13
|
+
const index_js_1 = require("./index.js");
|
|
14
14
|
class STPackage extends sql_1.QueryableModel {
|
|
15
15
|
static table = 'stamhoofd_packages';
|
|
16
16
|
// Columns
|
|
@@ -52,14 +52,14 @@ class STPackage extends sql_1.QueryableModel {
|
|
|
52
52
|
static async updateOrganizationPackages(organizationId) {
|
|
53
53
|
console.log('Updating packages for organization ' + organizationId);
|
|
54
54
|
const map = await this.getOrganizationPackagesMap(organizationId);
|
|
55
|
-
const organization = await
|
|
55
|
+
const organization = await index_js_1.Organization.getByID(organizationId);
|
|
56
56
|
if (organization) {
|
|
57
57
|
const didUseMembers = organization.meta.packages.useMembers && organization.meta.packages.useActivities;
|
|
58
58
|
organization.meta.packages.packages = map;
|
|
59
59
|
await organization.save();
|
|
60
60
|
if (!didUseMembers && organization.meta.packages.useMembers && organization.meta.packages.useActivities) {
|
|
61
61
|
console.log('Building groups and categories for ' + organization.id);
|
|
62
|
-
const builder = new
|
|
62
|
+
const builder = new GroupBuilder_js_1.GroupBuilder(organization);
|
|
63
63
|
await builder.build();
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -225,7 +225,7 @@ class STPackage extends sql_1.QueryableModel {
|
|
|
225
225
|
await this.save();
|
|
226
226
|
}
|
|
227
227
|
async sendEmailTemplate(data) {
|
|
228
|
-
const organization = await
|
|
228
|
+
const organization = await index_js_1.Organization.getByID(this.organizationId);
|
|
229
229
|
if (!organization) {
|
|
230
230
|
console.error('Could not find package organization ' + this.id);
|
|
231
231
|
return;
|
|
@@ -259,7 +259,7 @@ class STPackage extends sql_1.QueryableModel {
|
|
|
259
259
|
],
|
|
260
260
|
}));
|
|
261
261
|
// Create e-mail builder
|
|
262
|
-
await (0,
|
|
262
|
+
await (0, EmailBuilder_js_1.sendEmailTemplate)(null, {
|
|
263
263
|
template: {
|
|
264
264
|
type: data.type,
|
|
265
265
|
},
|