@stamhoofd/models 2.5.0 → 2.7.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/migrations/1722845608-registration-stock-reservations.sql +2 -0
- package/dist/src/migrations/1722845609-group-stock-reservations.sql +2 -0
- package/dist/src/migrations/1722852362-stripe-intents-account-id.sql +2 -0
- package/dist/src/migrations/1722852363-stripe-checkout-sessions-account-id.sql +2 -0
- package/dist/src/models/BalanceItem.d.ts +1 -0
- package/dist/src/models/BalanceItem.d.ts.map +1 -1
- package/dist/src/models/BalanceItem.js +36 -43
- package/dist/src/models/BalanceItem.js.map +1 -1
- package/dist/src/models/DocumentTemplate.js +1 -1
- 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 +16 -8
- package/dist/src/models/Email.js.map +1 -1
- package/dist/src/models/EmailTemplate.d.ts.map +1 -1
- package/dist/src/models/EmailTemplate.js.map +1 -1
- package/dist/src/models/Event.d.ts +7 -0
- package/dist/src/models/Event.d.ts.map +1 -1
- package/dist/src/models/Event.js +28 -0
- package/dist/src/models/Event.js.map +1 -1
- package/dist/src/models/Group.d.ts +6 -3
- package/dist/src/models/Group.d.ts.map +1 -1
- package/dist/src/models/Group.js +29 -6
- package/dist/src/models/Group.js.map +1 -1
- package/dist/src/models/Member.d.ts +3 -2
- package/dist/src/models/Member.d.ts.map +1 -1
- package/dist/src/models/Member.js +32 -22
- package/dist/src/models/Member.js.map +1 -1
- package/dist/src/models/Payment.d.ts +5 -7
- package/dist/src/models/Payment.d.ts.map +1 -1
- package/dist/src/models/Payment.js +8 -13
- package/dist/src/models/Payment.js.map +1 -1
- package/dist/src/models/Registration.d.ts +18 -2
- package/dist/src/models/Registration.d.ts.map +1 -1
- package/dist/src/models/Registration.js +72 -8
- package/dist/src/models/Registration.js.map +1 -1
- package/dist/src/models/StripeCheckoutSession.d.ts +4 -0
- package/dist/src/models/StripeCheckoutSession.d.ts.map +1 -1
- package/dist/src/models/StripeCheckoutSession.js +7 -0
- package/dist/src/models/StripeCheckoutSession.js.map +1 -1
- package/dist/src/models/StripePaymentIntent.d.ts +4 -0
- package/dist/src/models/StripePaymentIntent.d.ts.map +1 -1
- package/dist/src/models/StripePaymentIntent.js +7 -0
- package/dist/src/models/StripePaymentIntent.js.map +1 -1
- package/package.json +2 -2
- package/src/migrations/1722845608-registration-stock-reservations.sql +2 -0
- package/src/migrations/1722845609-group-stock-reservations.sql +2 -0
- package/src/migrations/1722852362-stripe-intents-account-id.sql +2 -0
- package/src/migrations/1722852363-stripe-checkout-sessions-account-id.sql +2 -0
- package/src/models/BalanceItem.ts +40 -46
- package/src/models/DocumentTemplate.ts +1 -1
- package/src/models/Email.ts +28 -17
- package/src/models/EmailTemplate.ts +1 -1
- package/src/models/Event.ts +31 -0
- package/src/models/Group.ts +36 -14
- package/src/models/Member.ts +34 -23
- package/src/models/Payment.ts +10 -16
- package/src/models/Registration.ts +88 -12
- package/src/models/StripeAccount.ts +1 -1
- package/src/models/StripeCheckoutSession.ts +6 -0
- package/src/models/StripePaymentIntent.ts +6 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Group.d.ts","sourceRoot":"","sources":["../../../src/models/Group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,IAAI,WAAW,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Group.d.ts","sourceRoot":"","sources":["../../../src/models/Group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,IAAI,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI3J,OAAO,EAAU,uBAAuB,EAAE,8BAA8B,EAA+B,MAAM,IAAI,CAAC;AAiBlH,qBAAa,KAAM,SAAQ,KAAK;IAC5B,MAAM,CAAC,KAAK,SAAY;IAOxB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,YAAwB;IAG5B,QAAQ,EAAE,aAAa,CAAC;IAKxB,eAAe,uBAAkC;IAGjD,cAAc,EAAE,MAAM,CAAC;IAGvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAO;IAGnC,QAAQ,EAAE,MAAM,CAAC;IAGjB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAO;IAEvC;;OAEG;IAEH,KAAK,SAAK;IAYV,SAAS,EAAE,IAAI,CAAA;IAUf,SAAS,EAAE,IAAI,CAAA;IAMf,SAAS,EAAE,IAAI,GAAG,IAAI,CAAO;IAG7B,MAAM,cAAoB;IAE1B;;OAEG;IAEH,iBAAiB,EAAE,gBAAgB,EAAE,CAAK;WAE7B,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAC,IAAI,EAAE,MAAM,UAAO;IAUhF;;OAEG;IACH,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,SAAS,UAAO,GAAG,aAAa,EAAE;IAkB5E;;OAEG;IACG,0BAA0B,CAAC,WAAW,UAAQ,EAAE,WAAW,SAAI,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAgE1G;;OAEG;IACH,YAAY;IAIZ;;OAEG;IACH,mBAAmB;mBAIE,QAAQ;IAWvB,eAAe;WAYR,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,8BAA8B,EAAE,SAAS,EAAE,KAAK,EAAE;WAiDpG,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,EAAE,IAAI,UAAQ;WAiB9F,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE;CAKvF"}
|
package/dist/src/models/Group.js
CHANGED
|
@@ -7,6 +7,8 @@ const structures_1 = require("@stamhoofd/structures");
|
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
8
|
const utility_1 = require("@stamhoofd/utility");
|
|
9
9
|
const _1 = require("./");
|
|
10
|
+
const queues_1 = require("@stamhoofd/queues");
|
|
11
|
+
const simple_encoding_1 = require("@simonbackx/simple-encoding");
|
|
10
12
|
if (_1.Member === undefined) {
|
|
11
13
|
throw new Error("Import Member is undefined");
|
|
12
14
|
}
|
|
@@ -31,16 +33,17 @@ class Group extends simple_database_1.Model {
|
|
|
31
33
|
*/
|
|
32
34
|
this.cycle = 0;
|
|
33
35
|
this.deletedAt = null;
|
|
36
|
+
this.status = structures_1.GroupStatus.Open;
|
|
34
37
|
/**
|
|
35
|
-
*
|
|
38
|
+
* Editing this field is only allowed when running inside the QueueHandler
|
|
36
39
|
*/
|
|
37
|
-
this.
|
|
40
|
+
this.stockReservations = [];
|
|
38
41
|
}
|
|
39
42
|
static async getAll(organizationId, periodId, active = true) {
|
|
40
43
|
const w = periodId ? { periodId } : {};
|
|
41
44
|
if (active) {
|
|
42
45
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
43
|
-
return await Group.where({ organizationId, deletedAt: null, ...w
|
|
46
|
+
return await Group.where({ organizationId, deletedAt: null, ...w });
|
|
44
47
|
}
|
|
45
48
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
46
49
|
return await Group.where({ organizationId, ...w });
|
|
@@ -138,9 +141,8 @@ class Group extends simple_database_1.Model {
|
|
|
138
141
|
return null;
|
|
139
142
|
}
|
|
140
143
|
async updateOccupancy() {
|
|
141
|
-
this.settings.registeredMembers = await Group.getCount("groupId = ? and
|
|
142
|
-
this.settings.reservedMembers = await Group.getCount("groupId = ? and
|
|
143
|
-
this.settings.waitingListSize = await Group.getCount("groupId = ? and cycle = ? and waitingList = 1", [this.id, this.cycle, new Date()]);
|
|
144
|
+
this.settings.registeredMembers = await Group.getCount("groupId = ? and registeredAt is not null AND deactivatedAt is null", [this.id]);
|
|
145
|
+
this.settings.reservedMembers = await Group.getCount("groupId = ? and registeredAt is null AND (canRegister = 1 OR reservedUntil >= ?)", [this.id, new Date()]);
|
|
144
146
|
}
|
|
145
147
|
static async deleteUnreachable(organizationId, period, allGroups) {
|
|
146
148
|
const reachable = new Map();
|
|
@@ -181,6 +183,24 @@ class Group extends simple_database_1.Model {
|
|
|
181
183
|
}
|
|
182
184
|
}
|
|
183
185
|
}
|
|
186
|
+
static async applyStockReservations(groupId, addStockReservations, free = false) {
|
|
187
|
+
await queues_1.QueueHandler.schedule('group-stock-update-' + groupId, async () => {
|
|
188
|
+
const updatedGroup = await Group.getByID(groupId);
|
|
189
|
+
if (!updatedGroup) {
|
|
190
|
+
throw new Error("Expected group");
|
|
191
|
+
}
|
|
192
|
+
if (!free) {
|
|
193
|
+
updatedGroup.stockReservations = structures_1.StockReservation.added(updatedGroup.stockReservations, addStockReservations);
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
updatedGroup.stockReservations = structures_1.StockReservation.removed(updatedGroup.stockReservations, addStockReservations);
|
|
197
|
+
}
|
|
198
|
+
await updatedGroup.save();
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
static async freeStockReservations(groupId, reservations) {
|
|
202
|
+
return await this.applyStockReservations(groupId, reservations, true);
|
|
203
|
+
}
|
|
184
204
|
}
|
|
185
205
|
exports.Group = Group;
|
|
186
206
|
Group.table = "groups";
|
|
@@ -248,6 +268,9 @@ tslib_1.__decorate([
|
|
|
248
268
|
tslib_1.__decorate([
|
|
249
269
|
(0, simple_database_1.column)({ type: "string" })
|
|
250
270
|
], Group.prototype, "status", void 0);
|
|
271
|
+
tslib_1.__decorate([
|
|
272
|
+
(0, simple_database_1.column)({ type: "json", decoder: new simple_encoding_1.ArrayDecoder(structures_1.StockReservation) })
|
|
273
|
+
], Group.prototype, "stockReservations", void 0);
|
|
251
274
|
_1.Registration.group = new simple_database_1.ManyToOneRelation(Group, "group");
|
|
252
275
|
_1.Registration.group.foreignKey = "groupId";
|
|
253
276
|
//# sourceMappingURL=Group.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../src/models/Group.ts"],"names":[],"mappings":";;;;AAAA,iEAA4G;AAC5G,
|
|
1
|
+
{"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../src/models/Group.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ export declare class Member extends Model {
|
|
|
41
41
|
/**
|
|
42
42
|
* Fetch all registrations with members with their corresponding (valid) registrations
|
|
43
43
|
*/
|
|
44
|
-
static getRegistrationWithMembersForGroup(groupId: string
|
|
44
|
+
static getRegistrationWithMembersForGroup(groupId: string): Promise<RegistrationWithMember[]>;
|
|
45
45
|
/**
|
|
46
46
|
* Fetch all registrations with members with their corresponding (valid) registrations and payment
|
|
47
47
|
*/
|
|
@@ -63,6 +63,7 @@ export declare class Member extends Model {
|
|
|
63
63
|
group: import('./Group').Group;
|
|
64
64
|
}): RegistrationWithMemberStruct;
|
|
65
65
|
static updateMembershipsForGroupId(id: string): void;
|
|
66
|
-
|
|
66
|
+
static updateMembershipsForId(id: string): Promise<void>;
|
|
67
|
+
updateMemberships(): Promise<void>;
|
|
67
68
|
}
|
|
68
69
|
//# sourceMappingURL=Member.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Member.d.ts","sourceRoot":"","sources":["../../../src/models/Member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,kBAAkB,EAAqB,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhI,OAAO,
|
|
1
|
+
{"version":3,"file":"Member.d.ts","sourceRoot":"","sources":["../../../src/models/Member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,kBAAkB,EAAqB,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhI,OAAO,EAAE,aAAa,EAAE,2BAA2B,EAAE,sBAAsB,IAAI,4BAA4B,EAAc,MAAM,uBAAuB,CAAC;AAKvJ,OAAO,EAAE,KAAK,EAA+C,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC5F,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG;IAC3C,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,CAAC,YAAY,GAAG;QAAC,KAAK,EAAE,KAAK,CAAA;KAAC,CAAC,EAAE,CAAA;CACnD,CAAA;AAGD,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAEtE,qBAAa,MAAO,SAAQ,KAAK;IAC7B,MAAM,CAAC,KAAK,SAAY;IAQxB,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,GAAC,IAAI,CAAQ;IASnC,SAAS,EAAE,MAAM,CAAA;IAOjB,QAAQ,EAAE,MAAM,CAAA;IAUhB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IAGvB,OAAO,EAAE,aAAa,CAAA;IAEtB;;OAEG;IAEH,kBAAkB,SAAI;IAYtB,SAAS,EAAE,IAAI,CAAA;IAUf,SAAS,EAAE,IAAI,CAAA;IAEf,MAAM,CAAC,aAAa,2DAA2E;IAG/F,MAAM,CAAC,KAAK,uDAAiD;IAE7D;;OAEG;WACU,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC;IAItF;;OAEG;WACU,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,KAAK;IAmCjE;;OAEG;WACU,+BAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAoC9F;;OAEG;WACU,kCAAkC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAiClG;;MAEE;WACU,oCAAoC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAwCtG;;MAEE;WACU,YAAY,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAgE/E;;OAEG;WACU,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAmBtF;;MAEE;WACU,iCAAiC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAsB9F,6BAA6B,CAAC,IAAI,EAAE,uBAAuB,EAAE,eAAe,GAAE,IAAI,GAAG,OAAc;IASnG,MAAM,CAAC,kCAAkC,CAAC,YAAY,EAAE,sBAAsB,GAAG;QAAC,KAAK,EAAE,OAAO,SAAS,EAAE,KAAK,CAAA;KAAC,GAAG,4BAA4B;IAYhJ,MAAM,CAAC,2BAA2B,CAAC,EAAE,EAAE,MAAM;WA6BhC,sBAAsB,CAAC,EAAE,EAAE,MAAM;IA0GxC,iBAAiB;CAG1B"}
|
|
@@ -7,8 +7,8 @@ const sql_1 = require("@stamhoofd/sql");
|
|
|
7
7
|
const structures_1 = require("@stamhoofd/structures");
|
|
8
8
|
const utility_1 = require("@stamhoofd/utility");
|
|
9
9
|
const uuid_1 = require("uuid");
|
|
10
|
-
const _1 = require("./");
|
|
11
10
|
const queues_1 = require("@stamhoofd/queues");
|
|
11
|
+
const _1 = require("./");
|
|
12
12
|
class Member extends simple_database_1.Model {
|
|
13
13
|
constructor() {
|
|
14
14
|
super(...arguments);
|
|
@@ -65,7 +65,7 @@ class Member extends simple_database_1.Model {
|
|
|
65
65
|
return [];
|
|
66
66
|
}
|
|
67
67
|
let query = `SELECT ${Member.getDefaultSelect()}, ${_1.Registration.getDefaultSelect()} from \`${Member.table}\`\n`;
|
|
68
|
-
query += `JOIN \`${_1.Registration.table}\` ON \`${_1.Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${_1.Registration.table}\`.\`registeredAt\` is not null OR \`${_1.Registration.table}\`.\`
|
|
68
|
+
query += `JOIN \`${_1.Registration.table}\` ON \`${_1.Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${_1.Registration.table}\`.\`registeredAt\` is not null OR \`${_1.Registration.table}\`.\`canRegister\` = 1)\n`;
|
|
69
69
|
// We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
|
|
70
70
|
query += `where \`${_1.Registration.table}\`.\`${_1.Registration.primary.name}\` IN (?)`;
|
|
71
71
|
const [results] = await simple_database_1.Database.select(query, [ids]);
|
|
@@ -90,12 +90,12 @@ class Member extends simple_database_1.Model {
|
|
|
90
90
|
/**
|
|
91
91
|
* Fetch all registrations with members with their corresponding (valid) registrations
|
|
92
92
|
*/
|
|
93
|
-
static async getRegistrationWithMembersForGroup(groupId
|
|
93
|
+
static async getRegistrationWithMembersForGroup(groupId) {
|
|
94
94
|
let query = `SELECT ${Member.getDefaultSelect()}, ${_1.Registration.getDefaultSelect()} from \`${Member.table}\`\n`;
|
|
95
|
-
query += `JOIN \`${_1.Registration.table}\` ON \`${_1.Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${_1.Registration.table}\`.\`registeredAt\` is not null OR \`${_1.Registration.table}\`.\`
|
|
95
|
+
query += `JOIN \`${_1.Registration.table}\` ON \`${_1.Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${_1.Registration.table}\`.\`registeredAt\` is not null OR \`${_1.Registration.table}\`.\`canRegister\` = 1)\n`;
|
|
96
96
|
// We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
|
|
97
|
-
query += `where \`${_1.Registration.table}\`.\`groupId\` =
|
|
98
|
-
const [results] = await simple_database_1.Database.select(query, [groupId
|
|
97
|
+
query += `where \`${_1.Registration.table}\`.\`groupId\` = ?`;
|
|
98
|
+
const [results] = await simple_database_1.Database.select(query, [groupId]);
|
|
99
99
|
const registrations = [];
|
|
100
100
|
// In the future we might add a 'reverse' method on manytoone relation, instead of defining the new relation. But then we need to store 2 model types in the many to one relation.
|
|
101
101
|
const registrationMemberRelation = new simple_database_1.ManyToOneRelation(Member, "member");
|
|
@@ -154,7 +154,7 @@ class Member extends simple_database_1.Model {
|
|
|
154
154
|
return [];
|
|
155
155
|
}
|
|
156
156
|
let query = `SELECT ${Member.getDefaultSelect()}, ${_1.Registration.getDefaultSelect()}, ${_1.User.getDefaultSelect()} from \`${Member.table}\`\n`;
|
|
157
|
-
query += `LEFT JOIN \`${_1.Registration.table}\` ON \`${_1.Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${_1.Registration.table}\`.\`registeredAt\` is not null OR \`${_1.Registration.table}\`.\`
|
|
157
|
+
query += `LEFT JOIN \`${_1.Registration.table}\` ON \`${_1.Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${_1.Registration.table}\`.\`registeredAt\` is not null OR \`${_1.Registration.table}\`.\`canRegister\` = 1)\n`;
|
|
158
158
|
query += Member.users.joinQuery(Member.table, _1.User.table) + "\n";
|
|
159
159
|
// We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
|
|
160
160
|
query += `where \`${Member.table}\`.\`${Member.primary.name}\` IN (?)`;
|
|
@@ -243,7 +243,11 @@ class Member extends simple_database_1.Model {
|
|
|
243
243
|
return structures_1.RegistrationWithMember.create({
|
|
244
244
|
...registration.getStructure(),
|
|
245
245
|
cycle: registration.cycle,
|
|
246
|
-
member: structures_1.
|
|
246
|
+
member: structures_1.TinyMember.create({
|
|
247
|
+
id: registration.member.id,
|
|
248
|
+
firstName: registration.member.firstName,
|
|
249
|
+
lastName: registration.member.lastName,
|
|
250
|
+
}),
|
|
247
251
|
});
|
|
248
252
|
}
|
|
249
253
|
static updateMembershipsForGroupId(id) {
|
|
@@ -254,18 +258,21 @@ class Member extends simple_database_1.Model {
|
|
|
254
258
|
.from(sql_1.SQL.table(Member.table))
|
|
255
259
|
.join(sql_1.SQL.leftJoin(sql_1.SQL.table(_1.Registration.table)).where(sql_1.SQL.column(_1.Registration.table, 'memberId'), sql_1.SQL.column(Member.table, 'id'))).where(sql_1.SQL.column(_1.Registration.table, 'groupId'), id).fetch()).flatMap(r => (r.members && (typeof r.members.id) === 'string') ? [r.members.id] : []);
|
|
256
260
|
for (const id of memberIds) {
|
|
257
|
-
|
|
258
|
-
await (member === null || member === void 0 ? void 0 : member.updateMemberships());
|
|
261
|
+
await Member.updateMembershipsForId(id);
|
|
259
262
|
}
|
|
260
263
|
}).catch((e) => {
|
|
261
264
|
console.error('Failed to update memberships for group id ', id), e;
|
|
262
265
|
});
|
|
263
266
|
}
|
|
264
|
-
async
|
|
265
|
-
|
|
266
|
-
|
|
267
|
+
static async updateMembershipsForId(id) {
|
|
268
|
+
return await queues_1.QueueHandler.schedule('updateMemberships-' + id, async function () {
|
|
269
|
+
const me = await Member.getWithRegistrations(id);
|
|
270
|
+
if (!me) {
|
|
271
|
+
console.log('Skipping automatic membership for: ' + id, ' - member not found');
|
|
272
|
+
return;
|
|
273
|
+
}
|
|
267
274
|
const platform = await _1.Platform.getShared();
|
|
268
|
-
const registrations =
|
|
275
|
+
const registrations = me.registrations.filter(r => r.group.periodId == platform.periodId && r.registeredAt && !r.deactivatedAt);
|
|
269
276
|
const defaultMemberships = registrations.flatMap(r => {
|
|
270
277
|
if (!r.group.defaultAgeGroupId) {
|
|
271
278
|
return [];
|
|
@@ -284,7 +291,7 @@ class Member extends simple_database_1.Model {
|
|
|
284
291
|
}];
|
|
285
292
|
});
|
|
286
293
|
// Get active memberships for this member that
|
|
287
|
-
const memberships = await _1.MemberPlatformMembership.where({ memberId:
|
|
294
|
+
const memberships = await _1.MemberPlatformMembership.where({ memberId: me.id, periodId: platform.periodId });
|
|
288
295
|
const now = new Date();
|
|
289
296
|
const activeMemberships = memberships.filter(m => m.startDate <= now && m.endDate >= now && m.deletedAt === null);
|
|
290
297
|
const activeMembershipsUndeletable = activeMemberships.filter(m => !m.canDelete() || !m.generated);
|
|
@@ -292,17 +299,17 @@ class Member extends simple_database_1.Model {
|
|
|
292
299
|
// Stop all active memberships taht were added automatically
|
|
293
300
|
for (const membership of activeMemberships) {
|
|
294
301
|
if (membership.canDelete() && membership.generated) {
|
|
295
|
-
console.log('Removing membership because no longer registered member and not yet invoiced for: ' +
|
|
302
|
+
console.log('Removing membership because no longer registered member and not yet invoiced for: ' + me.id + ' - membership ' + membership.id);
|
|
296
303
|
membership.deletedAt = new Date();
|
|
297
304
|
await membership.save();
|
|
298
305
|
}
|
|
299
306
|
}
|
|
300
|
-
console.log('Skipping automatic membership for: ' +
|
|
307
|
+
console.log('Skipping automatic membership for: ' + me.id, ' - no default memberships found');
|
|
301
308
|
return;
|
|
302
309
|
}
|
|
303
310
|
if (activeMembershipsUndeletable.length) {
|
|
304
311
|
// Skip automatic additions
|
|
305
|
-
console.log('Skipping automatic membership for: ' +
|
|
312
|
+
console.log('Skipping automatic membership for: ' + me.id, ' - already has active memberships');
|
|
306
313
|
return;
|
|
307
314
|
}
|
|
308
315
|
// Add the cheapest available membership
|
|
@@ -318,7 +325,7 @@ class Member extends simple_database_1.Model {
|
|
|
318
325
|
}
|
|
319
326
|
// Check if already have the same membership
|
|
320
327
|
if (activeMemberships.find(m => m.membershipTypeId == cheapestMembership.membership.id)) {
|
|
321
|
-
console.log('Skipping automatic membership for: ' +
|
|
328
|
+
console.log('Skipping automatic membership for: ' + me.id, ' - already has this membership');
|
|
322
329
|
return;
|
|
323
330
|
}
|
|
324
331
|
const periodConfig = cheapestMembership.membership.periods.get(platform.periodId);
|
|
@@ -326,9 +333,9 @@ class Member extends simple_database_1.Model {
|
|
|
326
333
|
throw new Error("Period config not found");
|
|
327
334
|
}
|
|
328
335
|
// Can we revive an earlier deleted membership?
|
|
329
|
-
console.log('Creating automatic membership for: ' +
|
|
336
|
+
console.log('Creating automatic membership for: ' + me.id + ' - membership type ' + cheapestMembership.membership.id);
|
|
330
337
|
const membership = new _1.MemberPlatformMembership();
|
|
331
|
-
membership.memberId =
|
|
338
|
+
membership.memberId = me.id;
|
|
332
339
|
membership.membershipTypeId = cheapestMembership.membership.id;
|
|
333
340
|
membership.organizationId = cheapestMembership.registration.organizationId;
|
|
334
341
|
membership.periodId = platform.periodId;
|
|
@@ -341,13 +348,16 @@ class Member extends simple_database_1.Model {
|
|
|
341
348
|
// This reasoning allows us to replace an existing membership with a cheaper one (not date based ones, but type based ones)
|
|
342
349
|
for (const toDelete of activeMemberships) {
|
|
343
350
|
if (toDelete.canDelete() && toDelete.generated) {
|
|
344
|
-
console.log('Removing membership because cheaper membership found for: ' +
|
|
351
|
+
console.log('Removing membership because cheaper membership found for: ' + me.id + ' - membership ' + toDelete.id);
|
|
345
352
|
toDelete.deletedAt = new Date();
|
|
346
353
|
await toDelete.save();
|
|
347
354
|
}
|
|
348
355
|
}
|
|
349
356
|
});
|
|
350
357
|
}
|
|
358
|
+
async updateMemberships() {
|
|
359
|
+
return await Member.updateMembershipsForId(this.id);
|
|
360
|
+
}
|
|
351
361
|
}
|
|
352
362
|
exports.Member = Member;
|
|
353
363
|
Member.table = "members";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Member.js","sourceRoot":"","sources":["../../../src/models/Member.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Member.js","sourceRoot":"","sources":["../../../src/models/Member.ts"],"names":[],"mappings":";;;;AAAA,iEAAgI;AAChI,wCAAqC;AACrC,sDAAuJ;AACvJ,gDAAuD;AACvD,+BAAoC;AAEpC,8CAAiD;AACjD,yBAA4F;AAS5F,MAAa,MAAO,SAAQ,uBAAK;IAAjC;;QAYI,mBAAc,GAAgB,IAAI,CAAC;QA+BnC;;WAEG;QAEH,uBAAkB,GAAG,CAAC,CAAA;IAid1B,CAAC;IApbG;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAU;;QACxC,OAAO,MAAA,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,mCAAI,IAAI,CAAA;IACnD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,SAA2B;QAC7D,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC/C,OAAM;QACV,CAAC;QAED,MAAM,MAAM,GAAU,EAAE,CAAA;QACxB,IAAI,UAAU,GAAG,EAAE,CAAA;QACnB,IAAI,WAAW,GAAG,EAAE,CAAA;QAEpB,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACtB,UAAU,GAAG,sBAAsB,CAAA;YACnC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAEtB,WAAW,GAAG,yBAAyB,CAAA;YACvC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC1B,CAAC;QAED,MAAM,KAAK,GAAG;;;;;;;;0CAQoB,UAAU;;;;;UAK1C,WAAW,EAAE,CAAA;QAEf,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACxC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,GAAa;QACtD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnB,OAAO,EAAE,CAAA;QACb,CAAC;QACD,IAAI,KAAK,GAAG,UAAU,MAAM,CAAC,gBAAgB,EAAE,KAAK,eAAY,CAAC,gBAAgB,EAAE,WAAW,MAAM,CAAC,KAAK,MAAM,CAAC;QAEjH,KAAK,IAAI,UAAU,eAAY,CAAC,KAAK,WAAW,eAAY,CAAC,KAAK,QAAQ,MAAM,CAAC,aAAa,CAAC,UAAU,UAAU,MAAM,CAAC,KAAK,QAAQ,MAAM,CAAC,OAAO,CAAC,IAAI,aAAa,eAAY,CAAC,KAAK,wCAAwC,eAAY,CAAC,KAAK,2BAA2B,CAAA;QAE9Q,uIAAuI;QACvI,KAAK,IAAI,WAAW,eAAY,CAAC,KAAK,QAAQ,eAAY,CAAC,OAAO,CAAC,IAAI,WAAW,CAAA;QAElF,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;QACrD,MAAM,aAAa,GAA6B,EAAE,CAAA;QAEjD,kLAAkL;QACnL,MAAM,0BAA0B,GAAG,IAAI,mCAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC1E,0BAA0B,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,UAAU,CAAA;QAEvE,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,eAAY,CAAC,OAAO,CAAC,GAAG,CAAC,eAAY,CAAC,KAAK,CAAC,CAAC,CAAA;YAClE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;YACzD,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;YACrD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACnD,CAAC;YAED,MAAM,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC,0BAA0B,EAAE,WAAW,CAAC,CAAA;YAC5E,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,aAAa,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,OAAe;QAC3D,IAAI,KAAK,GAAG,UAAU,MAAM,CAAC,gBAAgB,EAAE,KAAK,eAAY,CAAC,gBAAgB,EAAE,WAAW,MAAM,CAAC,KAAK,MAAM,CAAC;QAEjH,KAAK,IAAI,UAAU,eAAY,CAAC,KAAK,WAAW,eAAY,CAAC,KAAK,QAAQ,MAAM,CAAC,aAAa,CAAC,UAAU,UAAU,MAAM,CAAC,KAAK,QAAQ,MAAM,CAAC,OAAO,CAAC,IAAI,aAAa,eAAY,CAAC,KAAK,wCAAwC,eAAY,CAAC,KAAK,2BAA2B,CAAA;QAE9Q,uIAAuI;QACvI,KAAK,IAAI,WAAW,eAAY,CAAC,KAAK,oBAAoB,CAAA;QAE1D,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;QACzD,MAAM,aAAa,GAA6B,EAAE,CAAA;QAEjD,kLAAkL;QACnL,MAAM,0BAA0B,GAAG,IAAI,mCAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC1E,0BAA0B,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,UAAU,CAAA;QAEvE,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,eAAY,CAAC,OAAO,CAAC,GAAG,CAAC,eAAY,CAAC,KAAK,CAAC,CAAC,CAAA;YAClE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;YACzD,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;YACrD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACnD,CAAC;YAED,MAAM,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC,0BAA0B,EAAE,WAAW,CAAC,CAAA;YAC5E,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,aAAa,CAAA;IACxB,CAAC;IAEA;;MAEE;IACH,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,SAAiB;QAC/D,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAC,GAAG,gEAAa,IAAI,GAAC,CAAC;QAE9D,IAAI,KAAK,GAAG,UAAU,MAAM,CAAC,gBAAgB,EAAE,KAAK,eAAY,CAAC,gBAAgB,EAAE,WAAW,MAAM,CAAC,KAAK,MAAM,CAAC;QAEjH,KAAK,IAAI,UAAU,eAAY,CAAC,KAAK,WAAW,eAAY,CAAC,KAAK,QAAQ,MAAM,CAAC,aAAa,CAAC,UAAU,UAAU,MAAM,CAAC,KAAK,QAAQ,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAA;QAEhK,KAAK,IAAI,eAAe,WAAW,CAAC,KAAK,WAAW,WAAW,CAAC,KAAK,6BAA6B,eAAY,CAAC,KAAK,QAAQ,eAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAA;QAC3J,KAAK,IAAI,eAAe,kBAAkB,CAAC,KAAK,WAAW,kBAAkB,CAAC,KAAK,QAAQ,kBAAkB,CAAC,WAAW,CAAC,UAAU,UAAU,WAAW,CAAC,KAAK,QAAQ,WAAW,CAAC,OAAO,CAAC,IAAI,MAAM,CAAA;QACrM,KAAK,IAAI,UAAU,UAAO,CAAC,KAAK,WAAW,UAAO,CAAC,KAAK,QAAQ,UAAO,CAAC,OAAO,CAAC,IAAI,UAAU,kBAAkB,CAAC,KAAK,QAAQ,kBAAkB,CAAC,OAAO,CAAC,UAAU,MAAM,CAAA;QAEzK,uIAAuI;QACvI,KAAK,IAAI,WAAW,UAAO,CAAC,KAAK,QAAQ,UAAO,CAAC,OAAO,CAAC,IAAI,UAAU,CAAA;QACvE,KAAK,IAAI,cAAc,eAAY,CAAC,KAAK,QAAQ,eAAY,CAAC,OAAO,CAAC,IAAI,SAAS,MAAM,CAAC,KAAK,QAAQ,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;QAE9H,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;QAC3D,MAAM,aAAa,GAA6B,EAAE,CAAA;QAEjD,kLAAkL;QACnL,MAAM,0BAA0B,GAAG,IAAI,mCAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC1E,0BAA0B,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,UAAU,CAAA;QAEvE,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,eAAY,CAAC,OAAO,CAAC,GAAG,CAAC,eAAY,CAAC,KAAK,CAAC,CAAC,CAAA;YAClE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;YACzD,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;YACrD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACnD,CAAC;YAED,MAAM,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC,0BAA0B,EAAE,WAAW,CAAC,CAAA;YAC5E,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,aAAa,CAAA;IACxB,CAAC;IAEA;;MAEE;IACH,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,GAAa;QACtC,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAClB,OAAO,EAAE,CAAA;QACb,CAAC;QACD,IAAI,KAAK,GAAG,UAAU,MAAM,CAAC,gBAAgB,EAAE,KAAK,eAAY,CAAC,gBAAgB,EAAE,KAAK,OAAI,CAAC,gBAAgB,EAAE,YAAY,MAAM,CAAC,KAAK,MAAM,CAAC;QAC9I,KAAK,IAAI,eAAe,eAAY,CAAC,KAAK,WAAW,eAAY,CAAC,KAAK,QAAQ,MAAM,CAAC,aAAa,CAAC,UAAU,UAAU,MAAM,CAAC,KAAK,QAAQ,MAAM,CAAC,OAAO,CAAC,IAAI,aAAa,eAAY,CAAC,KAAK,wCAAwC,eAAY,CAAC,KAAK,2BAA2B,CAAA;QACnR,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,OAAI,CAAC,KAAK,CAAC,GAAC,IAAI,CAAA;QAE9D,uIAAuI;QACvI,KAAK,IAAI,WAAW,MAAM,CAAC,KAAK,QAAQ,MAAM,CAAC,OAAO,CAAC,IAAI,WAAW,CAAA;QAEtE,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;QACrD,MAAM,OAAO,GAA8B,EAAE,CAAA;QAE7C,cAAc;QACd,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,eAAY,CAAC,KAAK,CAAC,0CAAE,OAAO,CAAA,EAAA,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAa,CAAA;QAC9F,MAAM,MAAM,GAAG,MAAM,QAAK,CAAC,QAAQ,CAAC,GAAG,mBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;QAEvE,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;YACrD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACnD,CAAC;YACD,MAAM,EAAE,GAAG,WAAW;iBACjB,eAAe,CAAC,MAAM,CAAC,aAAqG,EAAE,EAAE,CAAC;iBACjI,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAElC,uCAAuC;YAC3C,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;YAEvD,MAAM,MAAM,GAA4B,CAAC,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,EAAE,CAAC,CAAA;YAC9D,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACxB,CAAC;YAEA,iDAAiD;YAClD,MAAM,YAAY,GAAG,eAAY,CAAC,OAAO,CAAC,GAAG,CAAC,eAAY,CAAC,KAAK,CAAC,CAAC,CAAA;YAClE,IAAI,YAAY,EAAE,CAAC;gBACf,6CAA6C;gBAC7C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC3D,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,YAAY,CAAC,OAAO,CAAC,CAAA;oBACxD,IAAI,CAAC,CAAC,EAAE,CAAC;wBACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;oBACtC,CAAC;oBACD,IAAI,CAAC,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;wBACvB,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,eAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;oBAC9E,CAAC;gBACL,CAAC;YACL,CAAC;YAED,0BAA0B;YAC1B,MAAM,IAAI,GAAG,OAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAI,CAAC,KAAK,CAAC,CAAC,CAAA;YAC1C,IAAI,IAAI,EAAE,CAAC;gBACP,6CAA6C;gBAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC3C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC3B,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAA;IAElB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,EAAU;QAC9C,IAAI,KAAK,GAAG,oDAAoD,CAAC;QACjE,KAAK,IAAI,sDAAsD,CAAA;QAC/D,KAAK,IAAI,8CAA8C,CAAA;QAEvD,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QACpD,MAAM,GAAG,GAAa,EAAE,CAAA;QACxB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YACxB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAW,CAAC,CAAA;QACvC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YACpB,sBAAsB;YACtB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChB,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAA;IAC1C,CAAC;IAEA;;MAEE;IACH,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,IAAU;QACrD,MAAM,KAAK,GAAG,SAAG;aACZ,MAAM,CACH,SAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB;aACA,IAAI,CAAC,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC7B,IAAI,CACD,SAAG,CAAC,QAAQ,CACR,SAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAC9B,CAAC,KAAK,CACH,SAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC,EACzC,SAAG,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CACjC,CACJ,CAAC,KAAK,CACH,SAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,EACvC,IAAI,CAAC,EAAE,CACV,CAAA;QAEL,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;QAChC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAY,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,6BAA6B,CAAgC,kBAAkC,IAAI;QAC/F,OAAO,wCAA2B,CAAC,MAAM,CAAC;YACtC,GAAG,IAAI;YACP,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;YAC5D,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;SAC/C,CAAC,CAAA;IACN,CAAC;IAED,MAAM,CAAC,kCAAkC,CAAC,YAAuE;QAC7G,OAAO,mCAA4B,CAAC,MAAM,CAAC;YACvC,GAAG,YAAY,CAAC,YAAY,EAAE;YAC9B,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,MAAM,EAAE,uBAAU,CAAC,MAAM,CAAC;gBACtB,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE;gBAC1B,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,SAAS;gBACxC,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ;aACzC,CAAC;SACL,CAAC,CAAA;IACN,CAAC;IAED,MAAM,CAAC,2BAA2B,CAAC,EAAU;QACzC,qBAAY,CAAC,QAAQ,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACxD,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,EAAE,CAAC,CAAA;YAE1D,oDAAoD;YACpD,MAAM,SAAS,GAAG,CAAC,MAAM,SAAG,CAAC,MAAM,CAC3B,SAAG,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAC9B;iBACA,IAAI,CAAC,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBAC7B,IAAI,CACD,SAAG,CAAC,QAAQ,CACR,SAAG,CAAC,KAAK,CAAC,eAAY,CAAC,KAAK,CAAC,CAChC,CAAC,KAAK,CACH,SAAG,CAAC,MAAM,CAAC,eAAY,CAAC,KAAK,EAAE,UAAU,CAAC,EAC1C,SAAG,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CACjC,CACJ,CAAC,KAAK,CACH,SAAG,CAAC,MAAM,CAAC,eAAY,CAAC,KAAK,EAAE,SAAS,CAAC,EACzC,EAAE,CACL,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YAE9G,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;gBACzB,MAAM,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAA;YAC3C,CAAC;QACL,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;QACtE,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAU;QAC1C,OAAO,MAAM,qBAAY,CAAC,QAAQ,CAAC,oBAAoB,GAAG,EAAE,EAAE,KAAK;YAC/D,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;YAChD,IAAI,CAAC,EAAE,EAAE,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,EAAE,EAAE,qBAAqB,CAAC,CAAA;gBAC9E,OAAM;YACV,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,WAAQ,CAAC,SAAS,EAAE,CAAA;YAC3C,MAAM,aAAa,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAA;YAE/H,MAAM,kBAAkB,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACjD,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC;oBAC7B,OAAO,EAAE,CAAA;gBACb,CAAC;gBACD,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;gBACrG,IAAI,CAAC,eAAe,IAAI,CAAC,eAAe,CAAC,uBAAuB,EAAE,CAAC;oBAC/D,OAAO,EAAE,CAAA;gBACb,CAAC;gBAED,MAAM,iBAAiB,GAAI,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,eAAe,CAAC,uBAAuB,CAAC,CAAA;gBACrH,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACrB,OAAO,EAAE,CAAA;gBACb,CAAC;gBAED,OAAO,CAAC;wBACJ,YAAY,EAAE,CAAC;wBACf,UAAU,EAAE,iBAAiB;qBAChC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;YACF,8CAA8C;YAC9C,MAAM,WAAW,GAAG,MAAM,2BAAwB,CAAC,KAAK,CAAC,EAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;YACzG,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;YACtB,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,IAAI,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,CAAA;YACjH,MAAM,4BAA4B,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YAElG,IAAI,kBAAkB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBACjC,4DAA4D;gBAC5D,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;oBACzC,IAAI,UAAU,CAAC,SAAS,EAAE,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;wBACjD,OAAO,CAAC,GAAG,CAAC,oFAAoF,GAAG,EAAE,CAAC,EAAE,GAAG,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,CAAA;wBAC5I,UAAU,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;wBACjC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;oBAC3B,CAAC;gBACL,CAAC;gBAED,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,EAAE,CAAC,EAAE,EAAE,iCAAiC,CAAC,CAAA;gBAC7F,OAAM;YACV,CAAC;YAGD,IAAI,4BAA4B,CAAC,MAAM,EAAE,CAAC;gBACtC,2BAA2B;gBAC3B,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,EAAE,CAAC,EAAE,EAAE,mCAAmC,CAAC,CAAA;gBAC/F,OAAM;YACV,CAAC;YAED,wCAAwC;YACxC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAC,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAC,EAAE,EAAC,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAC,EAAE,EAAE;gBACxH,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAE,CAAC,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAE,CAAC,KAAK,CAAA;gBAClG,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;oBACZ,OAAO,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;gBACzD,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACL,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;YAC1C,CAAC;YAED,4CAA4C;YAC5C,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;gBACtF,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,EAAE,CAAC,EAAE,EAAE,gCAAgC,CAAC,CAAA;gBAC5F,OAAM;YACV,CAAC;YAED,MAAM,YAAY,GAAG,kBAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YACjF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;YAC9C,CAAC;YAED,+CAA+C;YAC/C,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,EAAE,CAAC,EAAE,GAAG,qBAAqB,GAAG,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YACrH,MAAM,UAAU,GAAG,IAAI,2BAAwB,EAAE,CAAC;YAClD,UAAU,CAAC,QAAQ,GAAG,EAAE,CAAC,EAAE,CAAA;YAC3B,UAAU,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAA;YAC9D,UAAU,CAAC,cAAc,GAAG,kBAAkB,CAAC,YAAY,CAAC,cAAc,CAAA;YAC1E,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;YAEvC,UAAU,CAAC,SAAS,GAAG,YAAY,CAAC,SAAS,CAAA;YAC7C,UAAU,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAA;YACzC,UAAU,CAAC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAA;YAC/C,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC;YAE5B,MAAM,UAAU,CAAC,cAAc,EAAE,CAAA;YACjC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;YAEvB,2HAA2H;YAC3H,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;gBACvC,IAAI,QAAQ,CAAC,SAAS,EAAE,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;oBAC7C,OAAO,CAAC,GAAG,CAAC,4DAA4D,GAAG,EAAE,CAAC,EAAE,GAAG,gBAAgB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;oBAClH,QAAQ,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;oBAC/B,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;gBACzB,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,OAAO,MAAM,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACvD,CAAC;;AA/fL,wBAggBC;AA/fU,YAAK,GAAG,SAAS,AAAZ,CAAY;AAsEjB,oBAAa,GAAG,IAAI,mCAAiB,CAAC,MAAM,EAAE,eAAY,EAAE,eAAe,EAAE,UAAU,CAAC,AAA3E,CAA2E;AAE/F,wGAAwG;AACjG,YAAK,GAAG,IAAI,oCAAkB,CAAC,MAAM,EAAE,OAAI,EAAE,OAAO,CAAC,AAAhD,CAAiD;AAjE7D;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;kCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8CACR;AASnC;IAPC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;;YACR,OAAO,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,SAAS,mCAAI,EAAE,CAAA;QACxC,CAAC;QACD,UAAU,EAAE,IAAI;KACnB,CAAC;yCACe;AAOjB;IALC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ;QACpB,UAAU,EAAE;;YACR,OAAO,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,mCAAI,EAAE,CAAA;QACvC,CAAC;QACD,UAAU,EAAE,IAAI,EAAE,CAAC;wCACP;AAUhB;IARC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE;;YACR,OAAO,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,EAAC,CAAC,CAAC,mBAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACnF,CAAC;QACD,UAAU,EAAE,IAAI;KACnB,CAAC;wCACqB;AAGvB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,0BAAa,EAAE,CAAC;uCAC3B;AAMtB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;kDACN;AAYtB;IAVC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,GAAS;YAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC;YACf,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;KACJ,CAAC;yCACa;AAUf;IARC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU;YACxB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;QACD,UAAU,EAAE,IAAI;KACnB,CAAC;yCACa"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Model } from '@simonbackx/simple-database';
|
|
2
2
|
import { PaymentGeneral, PaymentMethod, PaymentProvider, PaymentStatus, Settlement, TransferSettings } from '@stamhoofd/structures';
|
|
3
|
-
import { Organization
|
|
3
|
+
import { Organization } from './';
|
|
4
4
|
export declare class Payment extends Model {
|
|
5
5
|
static table: string;
|
|
6
6
|
id: string;
|
|
@@ -35,15 +35,14 @@ export declare class Payment extends Model {
|
|
|
35
35
|
[key: string]: string;
|
|
36
36
|
}): void;
|
|
37
37
|
static getGeneralStructure(payments: Payment[], includeSettlements?: boolean): Promise<PaymentGeneral[]>;
|
|
38
|
-
static getGeneralStructureFromRelations({ payments, registrations, orders,
|
|
38
|
+
static getGeneralStructureFromRelations({ payments, registrations, orders, balanceItemPayments, balanceItems, groups }: {
|
|
39
39
|
payments: Payment[];
|
|
40
|
-
registrations: import("./
|
|
40
|
+
registrations: import("./Member").RegistrationWithMember[];
|
|
41
41
|
orders: import("./Order").Order[];
|
|
42
|
-
members: import("./Member").Member[];
|
|
43
42
|
balanceItemPayments: import("./BalanceItemPayment").BalanceItemPayment[];
|
|
44
43
|
balanceItems: import("./BalanceItem").BalanceItem[];
|
|
45
44
|
groups: import("./Group").Group[];
|
|
46
|
-
}, includeSettlements?: boolean): PaymentGeneral[]
|
|
45
|
+
}, includeSettlements?: boolean): Promise<PaymentGeneral[]>;
|
|
47
46
|
/**
|
|
48
47
|
*
|
|
49
48
|
* @param checkPermissions Only set to undefined when not returned in the API + not for public use
|
|
@@ -55,9 +54,8 @@ export declare class Payment extends Model {
|
|
|
55
54
|
balanceItems: import("./BalanceItem").BalanceItem[];
|
|
56
55
|
}>;
|
|
57
56
|
static loadBalanceItemRelations(balanceItems: import("./BalanceItem").BalanceItem[]): Promise<{
|
|
58
|
-
registrations:
|
|
57
|
+
registrations: import("./Member").RegistrationWithMember[];
|
|
59
58
|
orders: import("./Order").Order[];
|
|
60
|
-
members: import("./Member").Member[];
|
|
61
59
|
groups: import("./Group").Group[];
|
|
62
60
|
}>;
|
|
63
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Payment.d.ts","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAiG,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAInO,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"Payment.d.ts","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAiG,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAInO,OAAO,EAAE,YAAY,EAAgB,MAAM,IAAI,CAAC;AAEhD,qBAAa,OAAQ,SAAQ,KAAK;IAC9B,MAAM,CAAC,KAAK,SAAa;IAOzB,EAAE,EAAG,MAAM,CAAC;IAGZ,MAAM,EAAE,aAAa,CAAC;IAGtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAQ;IAGxC,MAAM,EAAE,aAAa,CAAC;IAGtB,cAAc,EAAE,MAAM,GAAE,IAAI,CAAO;IAInC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAI7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEtC;;OAEG;IAEH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IAEH,WAAW,SAAI;IAEf;;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,CAAA;IAEf,eAAe,EAAE,IAAI,GAAG,IAAI,CAAO;IAanC,SAAS,EAAE,IAAI,CAAA;IAGf,MAAM,EAAE,IAAI,GAAG,IAAI,CAAO;IAI1B,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;WAKlG,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,kBAAkB,UAAQ,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;WAkB/F,gCAAgC,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,EAAC,EAAE;QACxH,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,aAAa,EAAE,OAAO,UAAU,EAAE,sBAAsB,EAAE,CAAC;QAC3D,MAAM,EAAE,OAAO,SAAS,EAAE,KAAK,EAAE,CAAC;QAClC,mBAAmB,EAAE,OAAO,sBAAsB,EAAE,kBAAkB,EAAE,CAAC;QACzE,YAAY,EAAE,OAAO,eAAe,EAAE,WAAW,EAAE,CAAC;QACpD,MAAM,EAAE,OAAO,SAAS,EAAE,KAAK,EAAE,CAAC;KACrC,EAAE,kBAAkB,UAAQ,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAiCzD;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,cAAc,CAAC;WAIvC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE;;;;WAoBpC,wBAAwB,CAAC,YAAY,EAAE,OAAO,eAAe,EAAE,WAAW,EAAE;;;;;CAgB5F"}
|
|
@@ -43,28 +43,27 @@ class Payment extends simple_database_1.Model {
|
|
|
43
43
|
return [];
|
|
44
44
|
}
|
|
45
45
|
const { balanceItemPayments, balanceItems } = await Payment.loadBalanceItems(payments);
|
|
46
|
-
const { registrations, orders,
|
|
47
|
-
return this.getGeneralStructureFromRelations({
|
|
46
|
+
const { registrations, orders, groups } = await Payment.loadBalanceItemRelations(balanceItems);
|
|
47
|
+
return await this.getGeneralStructureFromRelations({
|
|
48
48
|
payments,
|
|
49
49
|
registrations,
|
|
50
50
|
orders,
|
|
51
|
-
members,
|
|
52
51
|
balanceItemPayments,
|
|
53
52
|
balanceItems,
|
|
54
53
|
groups
|
|
55
54
|
}, includeSettlements);
|
|
56
55
|
}
|
|
57
|
-
static getGeneralStructureFromRelations({ payments, registrations, orders,
|
|
56
|
+
static async getGeneralStructureFromRelations({ payments, registrations, orders, balanceItemPayments, balanceItems, groups }, includeSettlements = false) {
|
|
58
57
|
if (payments.length === 0) {
|
|
59
58
|
return [];
|
|
60
59
|
}
|
|
60
|
+
const { Member } = (await Promise.resolve().then(() => tslib_1.__importStar(require("./Member"))));
|
|
61
61
|
return payments.map(payment => {
|
|
62
62
|
return structures_1.PaymentGeneral.create({
|
|
63
63
|
...payment,
|
|
64
64
|
balanceItemPayments: balanceItemPayments.filter(item => item.paymentId === payment.id).map((item) => {
|
|
65
65
|
const balanceItem = balanceItems.find(b => b.id === item.balanceItemId);
|
|
66
|
-
const registration = (balanceItem === null || balanceItem === void 0 ? void 0 : balanceItem.registrationId)
|
|
67
|
-
const member = (balanceItem === null || balanceItem === void 0 ? void 0 : balanceItem.memberId) ? members.find(r => r.id === balanceItem.memberId) : undefined;
|
|
66
|
+
const registration = (balanceItem === null || balanceItem === void 0 ? void 0 : balanceItem.registrationId) ? registrations.find(r => r.id === balanceItem.registrationId) : null;
|
|
68
67
|
const order = (balanceItem === null || balanceItem === void 0 ? void 0 : balanceItem.orderId) && orders.find(r => r.id === balanceItem.orderId);
|
|
69
68
|
const group = registration ? groups.find(g => g.id === registration.groupId) : null;
|
|
70
69
|
if (registration && !group) {
|
|
@@ -74,8 +73,7 @@ class Payment extends simple_database_1.Model {
|
|
|
74
73
|
...item,
|
|
75
74
|
balanceItem: structures_1.BalanceItemDetailed.create({
|
|
76
75
|
...balanceItem,
|
|
77
|
-
registration: registration ? registration.setRelation(_1.Registration.group, group)
|
|
78
|
-
member: member ? structures_1.Member.create(member) : null,
|
|
76
|
+
registration: registration ? Member.getRegistrationWithMemberStructure(registration.setRelation(_1.Registration.group, group)) : null,
|
|
79
77
|
order: order ? structures_1.Order.create({ ...order, payment: null }) : null
|
|
80
78
|
})
|
|
81
79
|
});
|
|
@@ -110,19 +108,16 @@ class Payment extends simple_database_1.Model {
|
|
|
110
108
|
return { balanceItemPayments, balanceItems };
|
|
111
109
|
}
|
|
112
110
|
static async loadBalanceItemRelations(balanceItems) {
|
|
113
|
-
const { Registration } = await Promise.resolve().then(() => tslib_1.__importStar(require("./Registration")));
|
|
114
111
|
const { Order } = await Promise.resolve().then(() => tslib_1.__importStar(require("./Order")));
|
|
115
112
|
const { Member } = await Promise.resolve().then(() => tslib_1.__importStar(require("./Member")));
|
|
116
113
|
// Load members and orders
|
|
117
114
|
const registrationIds = utility_1.Formatter.uniqueArray(balanceItems.flatMap(b => b.registrationId ? [b.registrationId] : []));
|
|
118
115
|
const orderIds = utility_1.Formatter.uniqueArray(balanceItems.flatMap(b => b.orderId ? [b.orderId] : []));
|
|
119
|
-
const
|
|
120
|
-
const registrations = await Registration.getByIDs(...registrationIds);
|
|
116
|
+
const registrations = await Member.getRegistrationWithMembersByIDs(registrationIds);
|
|
121
117
|
const orders = await Order.getByIDs(...orderIds);
|
|
122
|
-
const members = await Member.getByIDs(...memberIds);
|
|
123
118
|
const groupIds = utility_1.Formatter.uniqueArray(registrations.map(r => r.groupId));
|
|
124
119
|
const groups = await (await Promise.resolve().then(() => tslib_1.__importStar(require("./Group")))).Group.getByIDs(...groupIds);
|
|
125
|
-
return { registrations, orders,
|
|
120
|
+
return { registrations, orders, groups };
|
|
126
121
|
}
|
|
127
122
|
}
|
|
128
123
|
exports.Payment = Payment;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Payment.js","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":";;;;AAAA,iEAA+E;AAC/E,sDAAmO;AACnO,gDAA+C;AAC/C,+BAAoC;AAEpC,yBAAgD;AAEhD,MAAa,OAAQ,SAAQ,uBAAK;IAAlC;;QAcI,aAAQ,GAA2B,IAAI,CAAC;QAMxC,mBAAc,GAAiB,IAAI,CAAA;QAEnC,4BAA4B;QAE5B,WAAM,GAAkB,IAAI,CAAC;QAE7B,4BAA4B;QAE5B,oBAAe,GAAkB,IAAI,CAAC;QAQtC;;WAEG;QAEH,gBAAW,GAAG,CAAC,CAAA;QAEf;;WAEG;QAEH,qBAAgB,GAAkB,IAAI,CAAC;QAGvC,wBAAmB,GAAkB,IAAI,CAAC;QAG1C,qBAAgB,GAA4B,IAAI,CAAC;QAcjD,oBAAe,GAAgB,IAAI,CAAA;QAgBnC,WAAM,GAAgB,IAAI,CAAA;QAE1B,wBAAwB;QAExB,eAAU,GAAsB,IAAI,CAAC;QAGrC,SAAI,GAAkB,IAAI,CAAC;QAG3B,aAAQ,GAAkB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Payment.js","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ManyToOneRelation, Model } from '@simonbackx/simple-database';
|
|
2
|
-
import { EmailTemplateType, Recipient, Registration as RegistrationStructure } from '@stamhoofd/structures';
|
|
2
|
+
import { EmailTemplateType, Recipient, Registration as RegistrationStructure, StockReservation } from '@stamhoofd/structures';
|
|
3
3
|
import { Organization, User } from './';
|
|
4
4
|
export declare class Registration extends Model {
|
|
5
5
|
static table: string;
|
|
@@ -18,6 +18,9 @@ export declare class Registration extends Model {
|
|
|
18
18
|
updatedAt: Date;
|
|
19
19
|
registeredAt: Date | null;
|
|
20
20
|
reservedUntil: Date | null;
|
|
21
|
+
/**
|
|
22
|
+
* @deprecated - replaced by group type
|
|
23
|
+
*/
|
|
21
24
|
waitingList: boolean;
|
|
22
25
|
/**
|
|
23
26
|
* When a registration is on the waiting list or is invite only, set this to true to allow the user to
|
|
@@ -29,6 +32,10 @@ export declare class Registration extends Model {
|
|
|
29
32
|
* Part of price that is paid
|
|
30
33
|
*/
|
|
31
34
|
pricePaid: number;
|
|
35
|
+
/**
|
|
36
|
+
* Set to null if no reservations are made, to help faster querying
|
|
37
|
+
*/
|
|
38
|
+
stockReservations: StockReservation[];
|
|
32
39
|
static group: ManyToOneRelation<"group", import('./Group').Group>;
|
|
33
40
|
getStructure(this: Registration & {
|
|
34
41
|
group: import('./Group').Group;
|
|
@@ -36,17 +43,26 @@ export declare class Registration extends Model {
|
|
|
36
43
|
/**
|
|
37
44
|
* Update the outstanding balance of multiple members in one go (or all members)
|
|
38
45
|
*/
|
|
39
|
-
static updateOutstandingBalance(registrationIds: string[] | 'all', organizationId
|
|
46
|
+
static updateOutstandingBalance(registrationIds: string[] | 'all', organizationId?: string): Promise<void>;
|
|
40
47
|
/**
|
|
41
48
|
* Get the number of active members that are currently registered
|
|
42
49
|
* This is used for billing
|
|
43
50
|
*/
|
|
44
51
|
static getActiveMembers(organizationId: string): Promise<number>;
|
|
52
|
+
deactivate(): Promise<void>;
|
|
45
53
|
markValid(this: Registration): Promise<boolean>;
|
|
46
54
|
getRecipients(organization: Organization, group: import('./').Group): Promise<Recipient[]>;
|
|
47
55
|
sendEmailTemplate(data: {
|
|
48
56
|
type: EmailTemplateType;
|
|
49
57
|
}): Promise<void>;
|
|
50
58
|
static sendTransferEmail(user: User, organization: Organization, payment: import('./').Payment): Promise<void>;
|
|
59
|
+
shouldIncludeStock(): boolean | null;
|
|
60
|
+
/**
|
|
61
|
+
* Adds or removes the order to the stock of the webshop (if it wasn't already included). If amounts were changed, only those
|
|
62
|
+
* changes will get added
|
|
63
|
+
* Should always happen in the webshop-stock queue to prevent multiple webshop writes at the same time
|
|
64
|
+
* + in combination with validation and reading the webshop
|
|
65
|
+
*/
|
|
66
|
+
scheduleStockUpdate(): void;
|
|
51
67
|
}
|
|
52
68
|
//# sourceMappingURL=Registration.d.ts.map
|