@stamhoofd/models 2.3.0 → 2.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/factories/GroupFactory.d.ts.map +1 -1
- package/dist/src/factories/GroupFactory.js +5 -5
- package/dist/src/factories/GroupFactory.js.map +1 -1
- package/dist/src/helpers/EmailBuilder.d.ts +3 -2
- package/dist/src/helpers/EmailBuilder.d.ts.map +1 -1
- package/dist/src/helpers/EmailBuilder.js +29 -16
- package/dist/src/helpers/EmailBuilder.js.map +1 -1
- package/dist/src/helpers/GroupBuilder.d.ts.map +1 -1
- package/dist/src/helpers/GroupBuilder.js +0 -23
- package/dist/src/helpers/GroupBuilder.js.map +1 -1
- package/dist/src/migrations/1721050380-email-table.sql +24 -0
- package/dist/src/migrations/1721050381-email-recipients-table.sql +18 -0
- package/dist/src/migrations/1721342679-responsibility-groupId.sql +2 -0
- package/dist/src/migrations/1721342680-responsibility-groupId-foreign-key.sql +1 -0
- package/dist/src/migrations/1721400546-users-memberId.sql +3 -0
- package/dist/src/migrations/1721639159-membership-deleted-at.sql +2 -0
- package/dist/src/migrations/1721639160-membership-generated.sql +2 -0
- package/dist/src/migrations/1721841819-group-type.sql +2 -0
- package/dist/src/migrations/1722090482-events.sql +18 -0
- package/dist/src/models/DocumentTemplate.js +14 -14
- package/dist/src/models/DocumentTemplate.js.map +1 -1
- package/dist/src/models/Email.d.ts +41 -0
- package/dist/src/models/Email.d.ts.map +1 -0
- package/dist/src/models/Email.js +490 -0
- package/dist/src/models/Email.js.map +1 -0
- package/dist/src/models/EmailRecipient.d.ts +20 -0
- package/dist/src/models/EmailRecipient.d.ts.map +1 -0
- package/dist/src/models/EmailRecipient.js +95 -0
- package/dist/src/models/EmailRecipient.js.map +1 -0
- package/dist/src/models/EmailTemplate.d.ts +2 -1
- package/dist/src/models/EmailTemplate.d.ts.map +1 -1
- package/dist/src/models/EmailTemplate.js +4 -0
- package/dist/src/models/EmailTemplate.js.map +1 -1
- package/dist/src/models/Event.d.ts +19 -0
- package/dist/src/models/Event.d.ts.map +1 -0
- package/dist/src/models/Event.js +78 -0
- package/dist/src/models/Event.js.map +1 -0
- package/dist/src/models/Group.d.ts +2 -1
- package/dist/src/models/Group.d.ts.map +1 -1
- package/dist/src/models/Group.js +9 -22
- package/dist/src/models/Group.js.map +1 -1
- package/dist/src/models/Member.d.ts +1 -0
- package/dist/src/models/Member.d.ts.map +1 -1
- package/dist/src/models/Member.js +42 -11
- package/dist/src/models/Member.js.map +1 -1
- package/dist/src/models/MemberPlatformMembership.d.ts +7 -0
- package/dist/src/models/MemberPlatformMembership.d.ts.map +1 -1
- package/dist/src/models/MemberPlatformMembership.js +22 -0
- package/dist/src/models/MemberPlatformMembership.js.map +1 -1
- package/dist/src/models/MemberResponsibilityRecord.d.ts +3 -0
- package/dist/src/models/MemberResponsibilityRecord.d.ts.map +1 -1
- package/dist/src/models/MemberResponsibilityRecord.js +8 -0
- package/dist/src/models/MemberResponsibilityRecord.js.map +1 -1
- package/dist/src/models/Organization.d.ts +8 -1
- package/dist/src/models/Organization.d.ts.map +1 -1
- package/dist/src/models/Organization.js +37 -9
- package/dist/src/models/Organization.js.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.d.ts +1 -0
- package/dist/src/models/OrganizationRegistrationPeriod.d.ts.map +1 -1
- package/dist/src/models/OrganizationRegistrationPeriod.js +7 -0
- package/dist/src/models/OrganizationRegistrationPeriod.js.map +1 -1
- package/dist/src/models/RegistrationPeriod.d.ts +1 -0
- package/dist/src/models/RegistrationPeriod.d.ts.map +1 -1
- package/dist/src/models/RegistrationPeriod.js +12 -0
- package/dist/src/models/RegistrationPeriod.js.map +1 -1
- package/dist/src/models/User.d.ts +2 -1
- package/dist/src/models/User.d.ts.map +1 -1
- package/dist/src/models/User.js +13 -3
- package/dist/src/models/User.js.map +1 -1
- package/dist/src/models/index.d.ts +3 -0
- package/dist/src/models/index.d.ts.map +1 -1
- package/dist/src/models/index.js +3 -0
- package/dist/src/models/index.js.map +1 -1
- package/package.json +2 -2
- package/src/factories/GroupFactory.ts +6 -6
- package/src/helpers/EmailBuilder.ts +33 -18
- package/src/helpers/GroupBuilder.ts +0 -23
- package/src/migrations/1721050380-email-table.sql +24 -0
- package/src/migrations/1721050381-email-recipients-table.sql +18 -0
- package/src/migrations/1721342679-responsibility-groupId.sql +2 -0
- package/src/migrations/1721342680-responsibility-groupId-foreign-key.sql +1 -0
- package/src/migrations/1721400546-users-memberId.sql +3 -0
- package/src/migrations/1721639159-membership-deleted-at.sql +2 -0
- package/src/migrations/1721639160-membership-generated.sql +2 -0
- package/src/migrations/1721841819-group-type.sql +2 -0
- package/src/migrations/1722090482-events.sql +18 -0
- package/src/models/DocumentTemplate.ts +2 -2
- package/src/models/Email.ts +556 -0
- package/src/models/EmailRecipient.ts +81 -0
- package/src/models/EmailTemplate.ts +5 -1
- package/src/models/Event.ts +71 -0
- package/src/models/Group.ts +10 -37
- package/src/models/Member.ts +60 -12
- package/src/models/MemberPlatformMembership.ts +21 -0
- package/src/models/MemberResponsibilityRecord.ts +7 -0
- package/src/models/Organization.ts +42 -9
- package/src/models/OrganizationRegistrationPeriod.ts +8 -0
- package/src/models/RegistrationPeriod.ts +14 -0
- package/src/models/User.ts +13 -3
- package/src/models/index.ts +3 -0
|
@@ -4,6 +4,7 @@ exports.EmailTemplate = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const simple_database_1 = require("@simonbackx/simple-database");
|
|
6
6
|
const simple_encoding_1 = require("@simonbackx/simple-encoding");
|
|
7
|
+
const structures_1 = require("@stamhoofd/structures");
|
|
7
8
|
const uuid_1 = require("uuid");
|
|
8
9
|
/**
|
|
9
10
|
* Holds the challenges for a given email. User should not exist, since that would allow user enumeration attacks
|
|
@@ -14,6 +15,9 @@ class EmailTemplate extends simple_database_1.Model {
|
|
|
14
15
|
this.groupId = null;
|
|
15
16
|
this.webshopId = null;
|
|
16
17
|
}
|
|
18
|
+
getStructure() {
|
|
19
|
+
return structures_1.EmailTemplate.create(this);
|
|
20
|
+
}
|
|
17
21
|
}
|
|
18
22
|
exports.EmailTemplate = EmailTemplate;
|
|
19
23
|
EmailTemplate.table = "email_templates";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailTemplate.js","sourceRoot":"","sources":["../../../src/models/EmailTemplate.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,iEAAyD;
|
|
1
|
+
{"version":3,"file":"EmailTemplate.js","sourceRoot":"","sources":["../../../src/models/EmailTemplate.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,iEAAyD;AACzD,sDAA0H;AAC1H,+BAAoC;AAGpC;;GAEG;AACH,MAAa,aAAc,SAAQ,uBAAK;IAAxC;;QAiBI,YAAO,GAAkB,IAAI,CAAC;QAG9B,cAAS,GAAkB,IAAI,CAAC;IAsCpC,CAAC;IAHG,YAAY;QACR,OAAO,0BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;;AAzDL,sCA0DC;AAzDU,mBAAK,GAAG,iBAAiB,AAApB,CAAqB;AAOjC;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;yCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAC,CAAC;8CACV;AAGhB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;qDACb;AAG9B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8CACb;AAG9B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gDACX;AAGhC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2CACH;AAIxB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,4BAAU,EAAE,CAAC;2CACpC;AAIV;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2CACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2CACd;AASb;IAPC,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;KACJ,CAAC;gDACa;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;gDACa"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Model } from "@simonbackx/simple-database";
|
|
2
|
+
import { EventMeta, Event as EventStruct } from '@stamhoofd/structures';
|
|
3
|
+
import { Group } from "./Group";
|
|
4
|
+
export declare class Event extends Model {
|
|
5
|
+
static table: string;
|
|
6
|
+
id: string;
|
|
7
|
+
name: string;
|
|
8
|
+
typeId: string;
|
|
9
|
+
organizationId: string | null;
|
|
10
|
+
groupId: string | null;
|
|
11
|
+
startDate: Date;
|
|
12
|
+
endDate: Date;
|
|
13
|
+
meta: EventMeta;
|
|
14
|
+
createdAt: Date;
|
|
15
|
+
updatedAt: Date;
|
|
16
|
+
getStructure(group?: Group | null): EventStruct;
|
|
17
|
+
getPrivateStructure(group?: Group | null): EventStruct;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=Event.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../src/models/Event.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,qBAAa,KAAM,SAAQ,KAAK;IAC5B,MAAM,CAAC,KAAK,SAAY;IAKxB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAE,MAAM,CAAA;IAGZ,MAAM,EAAE,MAAM,CAAA;IAGd,cAAc,EAAE,MAAM,GAAC,IAAI,CAAO;IAGlC,OAAO,EAAE,MAAM,GAAC,IAAI,CAAO;IAG3B,SAAS,EAAE,IAAI,CAAA;IAGf,OAAO,EAAE,IAAI,CAAA;IAGb,IAAI,YAAuB;IAY3B,SAAS,EAAE,IAAI,CAAA;IAUf,SAAS,EAAE,IAAI,CAAA;IAEf,YAAY,CAAC,KAAK,CAAC,EAAE,KAAK,GAAC,IAAI;IAO/B,mBAAmB,CAAC,KAAK,CAAC,EAAE,KAAK,GAAC,IAAI;CAMzC"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Event = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const simple_database_1 = require("@simonbackx/simple-database");
|
|
6
|
+
const structures_1 = require("@stamhoofd/structures");
|
|
7
|
+
const uuid_1 = require("uuid");
|
|
8
|
+
class Event extends simple_database_1.Model {
|
|
9
|
+
constructor() {
|
|
10
|
+
super(...arguments);
|
|
11
|
+
this.organizationId = null;
|
|
12
|
+
this.groupId = null;
|
|
13
|
+
this.meta = structures_1.EventMeta.create({});
|
|
14
|
+
}
|
|
15
|
+
getStructure(group) {
|
|
16
|
+
return structures_1.Event.create({
|
|
17
|
+
...this,
|
|
18
|
+
group: group ? group.getStructure() : null
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
getPrivateStructure(group) {
|
|
22
|
+
return structures_1.Event.create({
|
|
23
|
+
...this,
|
|
24
|
+
group: group ? group.getPrivateStructure() : null
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
exports.Event = Event;
|
|
29
|
+
Event.table = "events";
|
|
30
|
+
tslib_1.__decorate([
|
|
31
|
+
(0, simple_database_1.column)({ primary: true, type: "string", beforeSave(value) {
|
|
32
|
+
return value !== null && value !== void 0 ? value : (0, uuid_1.v4)();
|
|
33
|
+
} })
|
|
34
|
+
], Event.prototype, "id", void 0);
|
|
35
|
+
tslib_1.__decorate([
|
|
36
|
+
(0, simple_database_1.column)({ type: "string" })
|
|
37
|
+
], Event.prototype, "name", void 0);
|
|
38
|
+
tslib_1.__decorate([
|
|
39
|
+
(0, simple_database_1.column)({ type: "string" })
|
|
40
|
+
], Event.prototype, "typeId", void 0);
|
|
41
|
+
tslib_1.__decorate([
|
|
42
|
+
(0, simple_database_1.column)({ type: "string", nullable: true })
|
|
43
|
+
], Event.prototype, "organizationId", void 0);
|
|
44
|
+
tslib_1.__decorate([
|
|
45
|
+
(0, simple_database_1.column)({ type: "string", nullable: true })
|
|
46
|
+
], Event.prototype, "groupId", void 0);
|
|
47
|
+
tslib_1.__decorate([
|
|
48
|
+
(0, simple_database_1.column)({ type: "datetime" })
|
|
49
|
+
], Event.prototype, "startDate", void 0);
|
|
50
|
+
tslib_1.__decorate([
|
|
51
|
+
(0, simple_database_1.column)({ type: "datetime" })
|
|
52
|
+
], Event.prototype, "endDate", void 0);
|
|
53
|
+
tslib_1.__decorate([
|
|
54
|
+
(0, simple_database_1.column)({ type: "json", decoder: structures_1.EventMeta })
|
|
55
|
+
], Event.prototype, "meta", void 0);
|
|
56
|
+
tslib_1.__decorate([
|
|
57
|
+
(0, simple_database_1.column)({
|
|
58
|
+
type: "datetime", beforeSave(old) {
|
|
59
|
+
if (old !== undefined) {
|
|
60
|
+
return old;
|
|
61
|
+
}
|
|
62
|
+
const date = new Date();
|
|
63
|
+
date.setMilliseconds(0);
|
|
64
|
+
return date;
|
|
65
|
+
}
|
|
66
|
+
})
|
|
67
|
+
], Event.prototype, "createdAt", void 0);
|
|
68
|
+
tslib_1.__decorate([
|
|
69
|
+
(0, simple_database_1.column)({
|
|
70
|
+
type: "datetime", beforeSave() {
|
|
71
|
+
const date = new Date();
|
|
72
|
+
date.setMilliseconds(0);
|
|
73
|
+
return date;
|
|
74
|
+
},
|
|
75
|
+
skipUpdate: true
|
|
76
|
+
})
|
|
77
|
+
], Event.prototype, "updatedAt", void 0);
|
|
78
|
+
//# sourceMappingURL=Event.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Event.js","sourceRoot":"","sources":["../../../src/models/Event.ts"],"names":[],"mappings":";;;;AACA,iEAA4D;AAC5D,sDAAwE;AACxE,+BAAoC;AAGpC,MAAa,KAAM,SAAQ,uBAAK;IAAhC;;QAeI,mBAAc,GAAgB,IAAI,CAAA;QAGlC,YAAO,GAAgB,IAAI,CAAA;QAS3B,SAAI,GAAG,sBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAqC/B,CAAC;IAbG,YAAY,CAAC,KAAkB;QAC3B,OAAO,kBAAW,CAAC,MAAM,CAAC;YACtB,GAAG,IAAI;YACP,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI;SAC7C,CAAC,CAAA;IACN,CAAC;IAED,mBAAmB,CAAC,KAAkB;QAClC,OAAO,kBAAW,CAAC,MAAM,CAAC;YACtB,GAAG,IAAI;YACP,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,IAAI;SACpD,CAAC,CAAA;IACN,CAAC;;AA/DL,sBAgEC;AA/DU,WAAK,GAAG,QAAQ,AAAX,CAAY;AAKxB;IAHC,IAAA,wBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YACrD,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC,EAAE,CAAC;iCACQ;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;mCACf;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qCACb;AAGd;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;6CACT;AAGlC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCAChB;AAG3B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;wCACd;AAGf;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;sCAChB;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAS,EAAE,CAAC;mCAClB;AAY3B;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;wCACa;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;wCACa"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Model } from '@simonbackx/simple-database';
|
|
2
|
-
import {
|
|
2
|
+
import { GroupCategory, GroupPrivateSettings, GroupSettings, GroupStatus, Group as GroupStruct, GroupType } from '@stamhoofd/structures';
|
|
3
3
|
import { MemberWithRegistrations, OrganizationRegistrationPeriod } from './';
|
|
4
4
|
export declare class Group extends Model {
|
|
5
5
|
static table: string;
|
|
6
6
|
id: string;
|
|
7
|
+
type: GroupType;
|
|
7
8
|
settings: GroupSettings;
|
|
8
9
|
privateSettings: GroupPrivateSettings;
|
|
9
10
|
organizationId: string;
|
|
@@ -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,
|
|
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;AAIzI,OAAO,EAAU,uBAAuB,EAAE,8BAA8B,EAA+B,MAAM,IAAI,CAAC;AAelH,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,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;IAE7B;;OAEG;IAEH,MAAM,cAAoB;WAEb,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,YAAY;IAIZ,mBAAmB;mBAIE,QAAQ;IAWvB,eAAe;WAiBR,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,8BAA8B,EAAE,SAAS,EAAE,KAAK,EAAE;CAyCpH"}
|
package/dist/src/models/Group.js
CHANGED
|
@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const simple_database_1 = require("@simonbackx/simple-database");
|
|
6
6
|
const structures_1 = require("@stamhoofd/structures");
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
|
-
const _1 = require("./");
|
|
9
8
|
const utility_1 = require("@stamhoofd/utility");
|
|
9
|
+
const _1 = require("./");
|
|
10
10
|
if (_1.Member === undefined) {
|
|
11
11
|
throw new Error("Import Member is undefined");
|
|
12
12
|
}
|
|
@@ -22,6 +22,7 @@ if (_1.Registration === undefined) {
|
|
|
22
22
|
class Group extends simple_database_1.Model {
|
|
23
23
|
constructor() {
|
|
24
24
|
super(...arguments);
|
|
25
|
+
this.type = structures_1.GroupType.Membership;
|
|
25
26
|
this.privateSettings = structures_1.GroupPrivateSettings.create({});
|
|
26
27
|
this.defaultAgeGroupId = null;
|
|
27
28
|
/**
|
|
@@ -131,26 +132,8 @@ class Group extends simple_database_1.Model {
|
|
|
131
132
|
}
|
|
132
133
|
async updateOccupancy() {
|
|
133
134
|
this.settings.registeredMembers = await Group.getCount("groupId = ? and cycle = ? and waitingList = 0 and registeredAt is not null", [this.id, this.cycle]);
|
|
134
|
-
//const query = `select count(*) as c from \`${Registration.table}\` where groupId = ? and cycle = ? and (((registeredAt is not null or reservedUntil >= ?) and waitingList = 0) OR (waitingList = 1 AND canRegister = 1))`
|
|
135
135
|
this.settings.reservedMembers = await Group.getCount("groupId = ? and cycle = ? and ((waitingList = 0 and registeredAt is null AND reservedUntil >= ?) OR (waitingList = 1 and canRegister = 1))", [this.id, this.cycle, new Date()]);
|
|
136
136
|
this.settings.waitingListSize = await Group.getCount("groupId = ? and cycle = ? and waitingList = 1", [this.id, this.cycle, new Date()]);
|
|
137
|
-
// Loop cycle -1 until current (excluding current)
|
|
138
|
-
for (let cycle = -1; cycle < this.cycle; cycle++) {
|
|
139
|
-
if (!this.settings.cycleSettings.has(cycle)) {
|
|
140
|
-
this.settings.cycleSettings.set(cycle, structures_1.CycleInformation.create({
|
|
141
|
-
registeredMembers: 0,
|
|
142
|
-
reservedMembers: 0,
|
|
143
|
-
waitingListSize: 0
|
|
144
|
-
}));
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
// Older cycles
|
|
148
|
-
// todo: optimize this a bit
|
|
149
|
-
for (const [cycle, info] of this.settings.cycleSettings) {
|
|
150
|
-
info.registeredMembers = await Group.getCount("groupId = ? and cycle = ? and waitingList = 0 and registeredAt is not null", [this.id, cycle]);
|
|
151
|
-
info.reservedMembers = await Group.getCount("groupId = ? and cycle = ? and ((waitingList = 0 and registeredAt is null AND reservedUntil >= ?) OR (waitingList = 1 and canRegister = 1))", [this.id, cycle, new Date()]);
|
|
152
|
-
info.waitingListSize = await Group.getCount("groupId = ? and cycle = ? and waitingList = 1", [this.id, cycle, new Date()]);
|
|
153
|
-
}
|
|
154
137
|
}
|
|
155
138
|
static async deleteUnreachable(organizationId, period, allGroups) {
|
|
156
139
|
const reachable = new Map();
|
|
@@ -177,10 +160,11 @@ class Group extends simple_database_1.Model {
|
|
|
177
160
|
}
|
|
178
161
|
}
|
|
179
162
|
for (const group of allGroups) {
|
|
180
|
-
if (!reachable.get(group.id) && group.
|
|
181
|
-
console.log("
|
|
182
|
-
group.
|
|
163
|
+
if (!reachable.get(group.id) && group.deletedAt === null) {
|
|
164
|
+
console.log("Deleting unreachable group " + group.id + " from organization " + organizationId + " org period " + period.id);
|
|
165
|
+
group.deletedAt = new Date();
|
|
183
166
|
await group.save();
|
|
167
|
+
_1.Member.updateMembershipsForGroupId(group.id);
|
|
184
168
|
}
|
|
185
169
|
}
|
|
186
170
|
}
|
|
@@ -194,6 +178,9 @@ tslib_1.__decorate([
|
|
|
194
178
|
}
|
|
195
179
|
})
|
|
196
180
|
], Group.prototype, "id", void 0);
|
|
181
|
+
tslib_1.__decorate([
|
|
182
|
+
(0, simple_database_1.column)({ type: "string" })
|
|
183
|
+
], Group.prototype, "type", void 0);
|
|
197
184
|
tslib_1.__decorate([
|
|
198
185
|
(0, simple_database_1.column)({ type: "json", decoder: structures_1.GroupSettings })
|
|
199
186
|
], Group.prototype, "settings", void 0);
|
|
@@ -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":";;;;AAAA,iEAA4G;AAC5G,sDAAyI;AACzI,+BAAoC;AAEpC,gDAA+C;AAC/C,yBAAkH;AAElH,IAAI,SAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;AACjD,CAAC;AACD,IAAI,OAAI,KAAK,SAAS,EAAE,CAAC;IACrB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;AAC/C,CAAC;AACD,IAAI,UAAO,KAAK,SAAS,EAAE,CAAC;IACxB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;AAClD,CAAC;AACD,IAAI,eAAY,KAAK,SAAS,EAAE,CAAC;IAC7B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;AACvD,CAAC;AAED,MAAa,KAAM,SAAQ,uBAAK;IAAhC;;QAWI,SAAI,GAAG,sBAAS,CAAC,UAAU,CAAC;QAQ5B,oBAAe,GAAG,iCAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QASjD,sBAAiB,GAAkB,IAAI,CAAA;QAEvC;;WAEG;QAEH,UAAK,GAAG,CAAC,CAAC;QA4BV,cAAS,GAAgB,IAAI,CAAA;QAE7B;;WAEG;QAEH,WAAM,GAAG,wBAAW,CAAC,IAAI,CAAC;IAiL9B,CAAC;IA/KG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,cAAsB,EAAE,QAAqB,EAAE,MAAM,GAAG,IAAI;QAC5E,MAAM,CAAC,GAAQ,QAAQ,CAAC,CAAC,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACzC,IAAI,MAAM,EAAE,CAAC;YACT,iEAAiE;YACjE,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,wBAAW,CAAC,QAAQ,EAAC,EAAE,CAAC,CAAA;QAC1H,CAAC;QACD,iEAAiE;QACjE,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;IACtD,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,GAAoB,EAAE,SAAS,GAAG,IAAI;QACtD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAyB,CAAA;QAE5C,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QAC7D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YAE1B,IAAI,SAAS,EAAE,CAAC;gBACZ,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAA;gBAClD,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;oBAC1B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;gBACtB,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;IAC5B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,0BAA0B,CAAC,WAAW,GAAG,KAAK,EAAE,WAAW,GAAG,CAAC;QACjE,IAAI,KAAK,GAAG,UAAU,SAAM,CAAC,gBAAgB,EAAE,KAAK,eAAY,CAAC,gBAAgB,EAAE,KAAK,OAAI,CAAC,gBAAgB,EAAE,WAAW,SAAM,CAAC,KAAK,MAAM,CAAC;QAE7I,KAAK,IAAI,UAAU,eAAY,CAAC,KAAK,WAAW,eAAY,CAAC,KAAK,QAAQ,SAAM,CAAC,aAAa,CAAC,UAAU,UAAU,SAAM,CAAC,KAAK,QAAQ,SAAM,CAAC,OAAO,CAAC,IAAI,aAAa,eAAY,CAAC,KAAK,wCAAwC,eAAY,CAAC,KAAK,2BAA2B,CAAA;QAE9Q,IAAI,WAAW,EAAE,CAAC;YACd,KAAK,IAAI,UAAU,eAAY,CAAC,KAAK,oCAAoC,SAAM,CAAC,aAAa,CAAC,UAAU,UAAU,SAAM,CAAC,KAAK,QAAQ,SAAM,CAAC,OAAO,CAAC,IAAI,yCAAyC,CAAA;QACtM,CAAC;aAAM,CAAC;YACJ,KAAK,IAAI,UAAU,eAAY,CAAC,KAAK,oCAAoC,SAAM,CAAC,aAAa,CAAC,UAAU,UAAU,SAAM,CAAC,KAAK,QAAQ,SAAM,CAAC,OAAO,CAAC,IAAI,qFAAqF,CAAA;QAClP,CAAC;QAED,KAAK,IAAI,SAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAM,CAAC,KAAK,EAAE,OAAI,CAAC,KAAK,CAAC,GAAC,IAAI,CAAA;QAE9D,uIAAuI;QACvI,KAAK,IAAI,+DAA+D,CAAA;QAExE,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC,CAAA;QACnF,MAAM,OAAO,GAA8B,EAAE,CAAA;QAE7C,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,KAAK,CAAC,QAAQ,CAAC,GAAG,mBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;QAEvE,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,WAAW,GAAG,SAAM,CAAC,OAAO,CAAC,GAAG,CAAC,SAAM,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,CAAC,eAAe,CAAC,SAAM,CAAC,aAAqG,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,SAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAE1L,uCAAuC;YACvC,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;YAED,iDAAiD;YACjD,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,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,YAAY,CAAC,OAAO,CAAC,CAAA;oBAC5D,IAAI,CAAC,KAAK,EAAE,CAAC;wBACT,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;oBACrC,CAAC;oBACD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,eAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;gBAClF,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,YAAY;QACR,OAAO,kBAAW,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;IACjE,CAAC;IAED,mBAAmB;QACf,OAAO,kBAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAE,MAAa;QACtD,MAAM,KAAK,GAAG,+BAA+B,eAAY,CAAC,KAAK,YAAY,KAAK,EAAE,CAAA;QAElF,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACtD,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAe,CAAA;QAC1B,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,IAAI,CAAC,QAAQ,CAAC,iBAAiB,GAAG,MAAM,KAAK,CAAC,QAAQ,CAClD,4EAA4E,EAC5E,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CACxB,CAAA;QAED,IAAI,CAAC,QAAQ,CAAC,eAAe,GAAG,MAAM,KAAK,CAAC,QAAQ,CAChD,4IAA4I,EAC5I,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CACpC,CAAA;QAED,IAAI,CAAC,QAAQ,CAAC,eAAe,GAAG,MAAM,KAAK,CAAC,QAAQ,CAChD,+CAA+C,EAC/C,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CACpC,CAAA;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,cAAsB,EAAE,MAAsC,EAAE,SAAkB;QAC7G,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmB,CAAA;QAE5C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAA;QAC1C,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;QAC9C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,CAAA;QAEjD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;YACxB,IAAI,CAAC,EAAE,EAAE,CAAC;gBACN,MAAK;YACT,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;YAClE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,SAAQ;YACZ,CAAC;YAED,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;oBACb,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;gBACxB,CAAC;YACL,CAAC;YAED,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBAChC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;YAC1B,CAAC;QACL,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;gBACvD,OAAO,CAAC,GAAG,CAAC,6BAA6B,GAAC,KAAK,CAAC,EAAE,GAAC,qBAAqB,GAAC,cAAc,GAAG,cAAc,GAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACnH,KAAK,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;gBAC5B,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;gBAElB,SAAM,CAAC,2BAA2B,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YAChD,CAAC;QACL,CAAC;IACL,CAAC;;AAnPL,sBAqPC;AApPU,WAAK,GAAG,QAAQ,AAAX,CAAY;AAOxB;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;iCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;mCACC;AAG5B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,0BAAa,EAAE,CAAC;uCACzB;AAKxB;IAHC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iCAAoB;KAC9C,CAAC;8CAC+C;AAGjD;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;6CACJ;AAGvB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;uCACV;AAGjB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gDACJ;AAMvC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;oCAClB;AAYV;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;wCACa;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;wCACa;AAMf;IAJC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,IAAI;KACjB,CAAC;wCAC2B;AAM7B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qCACD;AAmL9B,eAAY,CAAC,KAAK,GAAG,IAAI,mCAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;AAC1D,eAAY,CAAC,KAAK,CAAC,UAAU,GAAG,SAAS,CAAA"}
|
|
@@ -62,6 +62,7 @@ export declare class Member extends Model {
|
|
|
62
62
|
static getRegistrationWithMemberStructure(registration: RegistrationWithMember & {
|
|
63
63
|
group: import('./Group').Group;
|
|
64
64
|
}): RegistrationWithMemberStruct;
|
|
65
|
+
static updateMembershipsForGroupId(id: string): void;
|
|
65
66
|
updateMemberships(this: MemberWithRegistrations): Promise<void>;
|
|
66
67
|
}
|
|
67
68
|
//# 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,EAA0B,aAAa,EAAE,2BAA2B,EAAE,sBAAsB,IAAI,4BAA4B,
|
|
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,EAA0B,aAAa,EAAE,2BAA2B,EAAE,sBAAsB,IAAI,4BAA4B,EAAmC,MAAM,uBAAuB,CAAC;AAIpM,OAAO,EAAE,KAAK,EAA+C,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE5F,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,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAiCjH;;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;IAQhJ,MAAM,CAAC,2BAA2B,CAAC,EAAE,EAAE,MAAM;IA8BvC,iBAAiB,CAAC,IAAI,EAAE,uBAAuB;CAqGxD"}
|
|
@@ -186,7 +186,9 @@ class Member extends simple_database_1.Model {
|
|
|
186
186
|
if (!g) {
|
|
187
187
|
throw new Error("Group not found");
|
|
188
188
|
}
|
|
189
|
-
|
|
189
|
+
if (g.deletedAt === null) {
|
|
190
|
+
member.registrations.push(registration.setRelation(_1.Registration.group, g));
|
|
191
|
+
}
|
|
190
192
|
}
|
|
191
193
|
}
|
|
192
194
|
// Check if we have a user
|
|
@@ -234,10 +236,7 @@ class Member extends simple_database_1.Model {
|
|
|
234
236
|
...this,
|
|
235
237
|
registrations: this.registrations.map(r => r.getStructure()),
|
|
236
238
|
details: this.details,
|
|
237
|
-
users: this.users.map(u =>
|
|
238
|
-
...u,
|
|
239
|
-
hasAccount: u.hasAccount()
|
|
240
|
-
})),
|
|
239
|
+
users: this.users.map(u => u.getStructure()),
|
|
241
240
|
});
|
|
242
241
|
}
|
|
243
242
|
static getRegistrationWithMemberStructure(registration) {
|
|
@@ -247,6 +246,21 @@ class Member extends simple_database_1.Model {
|
|
|
247
246
|
member: structures_1.Member.create(registration.member),
|
|
248
247
|
});
|
|
249
248
|
}
|
|
249
|
+
static updateMembershipsForGroupId(id) {
|
|
250
|
+
queues_1.QueueHandler.schedule('bulk-update-memberships', async () => {
|
|
251
|
+
console.log('Bulk updating memberships for group id ', id);
|
|
252
|
+
// Get all members that are registered in this group
|
|
253
|
+
const memberIds = (await sql_1.SQL.select(sql_1.SQL.column('members', 'id'))
|
|
254
|
+
.from(sql_1.SQL.table(Member.table))
|
|
255
|
+
.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
|
+
for (const id of memberIds) {
|
|
257
|
+
const member = await Member.getWithRegistrations(id);
|
|
258
|
+
await (member === null || member === void 0 ? void 0 : member.updateMemberships());
|
|
259
|
+
}
|
|
260
|
+
}).catch((e) => {
|
|
261
|
+
console.error('Failed to update memberships for group id ', id), e;
|
|
262
|
+
});
|
|
263
|
+
}
|
|
250
264
|
async updateMemberships() {
|
|
251
265
|
console.log('Updating memberships for member: ' + this.id);
|
|
252
266
|
return await queues_1.QueueHandler.schedule('updateMemberships-' + this.id, async () => {
|
|
@@ -269,22 +283,24 @@ class Member extends simple_database_1.Model {
|
|
|
269
283
|
membership: defaultMembership,
|
|
270
284
|
}];
|
|
271
285
|
});
|
|
272
|
-
// Get active memberships for this member
|
|
286
|
+
// Get active memberships for this member that
|
|
273
287
|
const memberships = await _1.MemberPlatformMembership.where({ memberId: this.id, periodId: platform.periodId });
|
|
274
288
|
const now = new Date();
|
|
275
|
-
const activeMemberships = memberships.filter(m => m.startDate <= now && m.endDate >= now);
|
|
289
|
+
const activeMemberships = memberships.filter(m => m.startDate <= now && m.endDate >= now && m.deletedAt === null);
|
|
290
|
+
const activeMembershipsUndeletable = activeMemberships.filter(m => !m.canDelete() || !m.generated);
|
|
276
291
|
if (defaultMemberships.length == 0) {
|
|
277
|
-
// Stop all active memberships
|
|
292
|
+
// Stop all active memberships taht were added automatically
|
|
278
293
|
for (const membership of activeMemberships) {
|
|
279
|
-
if (
|
|
294
|
+
if (membership.canDelete() && membership.generated) {
|
|
280
295
|
console.log('Removing membership because no longer registered member and not yet invoiced for: ' + this.id + ' - membership ' + membership.id);
|
|
281
|
-
|
|
296
|
+
membership.deletedAt = new Date();
|
|
297
|
+
await membership.save();
|
|
282
298
|
}
|
|
283
299
|
}
|
|
284
300
|
console.log('Skipping automatic membership for: ' + this.id, ' - no default memberships found');
|
|
285
301
|
return;
|
|
286
302
|
}
|
|
287
|
-
if (
|
|
303
|
+
if (activeMembershipsUndeletable.length) {
|
|
288
304
|
// Skip automatic additions
|
|
289
305
|
console.log('Skipping automatic membership for: ' + this.id, ' - already has active memberships');
|
|
290
306
|
return;
|
|
@@ -300,10 +316,16 @@ class Member extends simple_database_1.Model {
|
|
|
300
316
|
if (!cheapestMembership) {
|
|
301
317
|
throw new Error("No membership found");
|
|
302
318
|
}
|
|
319
|
+
// Check if already have the same membership
|
|
320
|
+
if (activeMemberships.find(m => m.membershipTypeId == cheapestMembership.membership.id)) {
|
|
321
|
+
console.log('Skipping automatic membership for: ' + this.id, ' - already has this membership');
|
|
322
|
+
return;
|
|
323
|
+
}
|
|
303
324
|
const periodConfig = cheapestMembership.membership.periods.get(platform.periodId);
|
|
304
325
|
if (!periodConfig) {
|
|
305
326
|
throw new Error("Period config not found");
|
|
306
327
|
}
|
|
328
|
+
// Can we revive an earlier deleted membership?
|
|
307
329
|
console.log('Creating automatic membership for: ' + this.id + ' - membership type ' + cheapestMembership.membership.id);
|
|
308
330
|
const membership = new _1.MemberPlatformMembership();
|
|
309
331
|
membership.memberId = this.id;
|
|
@@ -313,8 +335,17 @@ class Member extends simple_database_1.Model {
|
|
|
313
335
|
membership.startDate = periodConfig.startDate;
|
|
314
336
|
membership.endDate = periodConfig.endDate;
|
|
315
337
|
membership.expireDate = periodConfig.expireDate;
|
|
338
|
+
membership.generated = true;
|
|
316
339
|
await membership.calculatePrice();
|
|
317
340
|
await membership.save();
|
|
341
|
+
// This reasoning allows us to replace an existing membership with a cheaper one (not date based ones, but type based ones)
|
|
342
|
+
for (const toDelete of activeMemberships) {
|
|
343
|
+
if (toDelete.canDelete() && toDelete.generated) {
|
|
344
|
+
console.log('Removing membership because cheaper membership found for: ' + this.id + ' - membership ' + toDelete.id);
|
|
345
|
+
toDelete.deletedAt = new Date();
|
|
346
|
+
await toDelete.save();
|
|
347
|
+
}
|
|
348
|
+
}
|
|
318
349
|
});
|
|
319
350
|
}
|
|
320
351
|
}
|
|
@@ -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":"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"}
|
|
@@ -12,8 +12,15 @@ export declare class MemberPlatformMembership extends Model {
|
|
|
12
12
|
invoiceItemDetailId: string | null;
|
|
13
13
|
invoiceId: string | null;
|
|
14
14
|
price: number;
|
|
15
|
+
/**
|
|
16
|
+
* Whether this was added automatically by the system
|
|
17
|
+
*/
|
|
18
|
+
generated: boolean;
|
|
19
|
+
deletedAt: Date | null;
|
|
15
20
|
createdAt: Date;
|
|
16
21
|
updatedAt: Date;
|
|
22
|
+
canDelete(): boolean;
|
|
23
|
+
delete(): Promise<void>;
|
|
17
24
|
calculatePrice(): Promise<void>;
|
|
18
25
|
}
|
|
19
26
|
//# sourceMappingURL=MemberPlatformMembership.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemberPlatformMembership.d.ts","sourceRoot":"","sources":["../../../src/models/MemberPlatformMembership.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAO5D,qBAAa,wBAAyB,SAAQ,KAAK;IAC/C,MAAM,CAAC,KAAK,SAAiC;IAQ7C,EAAE,EAAG,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,gBAAgB,EAAE,MAAM,CAAC;IAGzB,cAAc,EAAE,MAAM,CAAC;IAGvB,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,EAAE,IAAI,CAAC;IAGhB,OAAO,EAAE,IAAI,CAAC;IAGd,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAG/B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGhC,KAAK,SAAK;
|
|
1
|
+
{"version":3,"file":"MemberPlatformMembership.d.ts","sourceRoot":"","sources":["../../../src/models/MemberPlatformMembership.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAO5D,qBAAa,wBAAyB,SAAQ,KAAK;IAC/C,MAAM,CAAC,KAAK,SAAiC;IAQ7C,EAAE,EAAG,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,gBAAgB,EAAE,MAAM,CAAC;IAGzB,cAAc,EAAE,MAAM,CAAC;IAGvB,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,EAAE,IAAI,CAAC;IAGhB,OAAO,EAAE,IAAI,CAAC;IAGd,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAG/B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGhC,KAAK,SAAK;IAEV;;OAEG;IAEH,SAAS,UAAQ;IAKjB,SAAS,EAAE,IAAI,GAAC,IAAI,CAAO;IAY3B,SAAS,EAAE,IAAI,CAAA;IAUf,SAAS,EAAE,IAAI,CAAA;IAEf,SAAS;IAOT,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjB,cAAc;CAiDvB"}
|
|
@@ -15,6 +15,20 @@ class MemberPlatformMembership extends simple_database_1.Model {
|
|
|
15
15
|
this.invoiceItemDetailId = null;
|
|
16
16
|
this.invoiceId = null;
|
|
17
17
|
this.price = 0;
|
|
18
|
+
/**
|
|
19
|
+
* Whether this was added automatically by the system
|
|
20
|
+
*/
|
|
21
|
+
this.generated = false;
|
|
22
|
+
this.deletedAt = null;
|
|
23
|
+
}
|
|
24
|
+
canDelete() {
|
|
25
|
+
if (this.invoiceId || this.invoiceItemDetailId) {
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
delete() {
|
|
31
|
+
throw new Error('Cannot delete a membership. Use the deletedAt column.');
|
|
18
32
|
}
|
|
19
33
|
async calculatePrice() {
|
|
20
34
|
var _a;
|
|
@@ -98,6 +112,14 @@ tslib_1.__decorate([
|
|
|
98
112
|
tslib_1.__decorate([
|
|
99
113
|
(0, simple_database_1.column)({ type: "integer" })
|
|
100
114
|
], MemberPlatformMembership.prototype, "price", void 0);
|
|
115
|
+
tslib_1.__decorate([
|
|
116
|
+
(0, simple_database_1.column)({ type: "boolean" })
|
|
117
|
+
], MemberPlatformMembership.prototype, "generated", void 0);
|
|
118
|
+
tslib_1.__decorate([
|
|
119
|
+
(0, simple_database_1.column)({
|
|
120
|
+
type: "datetime", nullable: true
|
|
121
|
+
})
|
|
122
|
+
], MemberPlatformMembership.prototype, "deletedAt", void 0);
|
|
101
123
|
tslib_1.__decorate([
|
|
102
124
|
(0, simple_database_1.column)({
|
|
103
125
|
type: "datetime", beforeSave(old) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemberPlatformMembership.js","sourceRoot":"","sources":["../../../src/models/MemberPlatformMembership.ts"],"names":[],"mappings":";;;;AACA,iEAA4D;AAC5D,+BAAoC;AACpC,yCAAsC;AACtC,sDAAwE;AACxE,6DAAwD;AACxD,gDAA+C;AAE/C,MAAa,wBAAyB,SAAQ,uBAAK;IAAnD;;QA8BI,eAAU,GAAgB,IAAI,CAAC;QAG/B,wBAAmB,GAAkB,IAAI,CAAC;QAG1C,cAAS,GAAkB,IAAI,CAAC;QAGhC,UAAK,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MemberPlatformMembership.js","sourceRoot":"","sources":["../../../src/models/MemberPlatformMembership.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { Model } from '@simonbackx/simple-database';
|
|
2
|
+
import { MemberResponsibilityRecord as MemberResponsibilityRecordStruct } from '@stamhoofd/structures';
|
|
2
3
|
export declare class MemberResponsibilityRecord extends Model {
|
|
3
4
|
static table: string;
|
|
4
5
|
id: string;
|
|
5
6
|
organizationId: string | null;
|
|
7
|
+
groupId: string | null;
|
|
6
8
|
memberId: string;
|
|
7
9
|
responsibilityId: string;
|
|
8
10
|
startDate: Date;
|
|
9
11
|
endDate: Date | null;
|
|
12
|
+
getStructure(): MemberResponsibilityRecordStruct;
|
|
10
13
|
}
|
|
11
14
|
//# sourceMappingURL=MemberResponsibilityRecord.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemberResponsibilityRecord.d.ts","sourceRoot":"","sources":["../../../src/models/MemberResponsibilityRecord.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"MemberResponsibilityRecord.d.ts","sourceRoot":"","sources":["../../../src/models/MemberResponsibilityRecord.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,EAAE,0BAA0B,IAAI,gCAAgC,EAAE,MAAM,uBAAuB,CAAC;AAEvG,qBAAa,0BAA2B,SAAQ,KAAK;IACjD,MAAM,CAAC,KAAK,SAAkC;IAQ9C,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,GAAC,IAAI,CAAQ;IAGnC,OAAO,EAAE,MAAM,GAAC,IAAI,CAAQ;IAG5B,QAAQ,EAAE,MAAM,CAAA;IAGhB,gBAAgB,EAAE,MAAM,CAAA;IAYxB,SAAS,EAAE,IAAI,CAAA;IAGf,OAAO,EAAE,IAAI,GAAG,IAAI,CAAO;IAE3B,YAAY;CAGf"}
|
|
@@ -4,12 +4,17 @@ exports.MemberResponsibilityRecord = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const simple_database_1 = require("@simonbackx/simple-database");
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
|
+
const structures_1 = require("@stamhoofd/structures");
|
|
7
8
|
class MemberResponsibilityRecord extends simple_database_1.Model {
|
|
8
9
|
constructor() {
|
|
9
10
|
super(...arguments);
|
|
10
11
|
this.organizationId = null;
|
|
12
|
+
this.groupId = null;
|
|
11
13
|
this.endDate = null;
|
|
12
14
|
}
|
|
15
|
+
getStructure() {
|
|
16
|
+
return structures_1.MemberResponsibilityRecord.create(this);
|
|
17
|
+
}
|
|
13
18
|
}
|
|
14
19
|
exports.MemberResponsibilityRecord = MemberResponsibilityRecord;
|
|
15
20
|
MemberResponsibilityRecord.table = "member_responsibility_records";
|
|
@@ -23,6 +28,9 @@ tslib_1.__decorate([
|
|
|
23
28
|
tslib_1.__decorate([
|
|
24
29
|
(0, simple_database_1.column)({ type: "string", nullable: true })
|
|
25
30
|
], MemberResponsibilityRecord.prototype, "organizationId", void 0);
|
|
31
|
+
tslib_1.__decorate([
|
|
32
|
+
(0, simple_database_1.column)({ type: "string", nullable: true })
|
|
33
|
+
], MemberResponsibilityRecord.prototype, "groupId", void 0);
|
|
26
34
|
tslib_1.__decorate([
|
|
27
35
|
(0, simple_database_1.column)({ type: "string" })
|
|
28
36
|
], MemberResponsibilityRecord.prototype, "memberId", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemberResponsibilityRecord.js","sourceRoot":"","sources":["../../../src/models/MemberResponsibilityRecord.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,+BAAoC;
|
|
1
|
+
{"version":3,"file":"MemberResponsibilityRecord.js","sourceRoot":"","sources":["../../../src/models/MemberResponsibilityRecord.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,+BAAoC;AACpC,sDAAuG;AAEvG,MAAa,0BAA2B,SAAQ,uBAAK;IAArD;;QAYI,mBAAc,GAAgB,IAAI,CAAC;QAGnC,YAAO,GAAgB,IAAI,CAAC;QAqB5B,YAAO,GAAgB,IAAI,CAAA;IAK/B,CAAC;IAHG,YAAY;QACR,OAAO,uCAAgC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxD,CAAC;;AAxCL,gEAyCC;AAxCU,gCAAK,GAAG,+BAA+B,AAAlC,CAAkC;AAQ9C;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;sDACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kEACR;AAGnC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;2DACf;AAG5B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;4DACX;AAGhB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;oEACH;AAYxB;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;6DACa;AAGf;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;2DAClB"}
|