@unchainedshop/core-enrollments 3.1.13 → 4.0.0-rc.3
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/lib/db/EnrollmentsCollection.d.ts +5 -5
- package/lib/db/EnrollmentsCollection.d.ts.map +1 -1
- package/lib/db/EnrollmentsCollection.js +2 -2
- package/lib/db/EnrollmentsCollection.js.map +1 -1
- package/lib/module/configureEnrollmentsModule.d.ts +5 -5
- package/lib/module/configureEnrollmentsModule.d.ts.map +1 -1
- package/lib/module/configureEnrollmentsModule.js +4 -2
- package/lib/module/configureEnrollmentsModule.js.map +1 -1
- package/package.json +4 -4
- package/src/db/EnrollmentsCollection.ts +5 -5
- package/src/module/configureEnrollmentsModule.ts +11 -8
|
@@ -7,10 +7,10 @@ export interface EnrollmentPeriod {
|
|
|
7
7
|
isTrial?: boolean;
|
|
8
8
|
}
|
|
9
9
|
export interface EnrollmentPlan {
|
|
10
|
-
configuration:
|
|
10
|
+
configuration: {
|
|
11
11
|
key: string;
|
|
12
12
|
value: string;
|
|
13
|
-
}
|
|
13
|
+
}[];
|
|
14
14
|
productId: string;
|
|
15
15
|
quantity: number;
|
|
16
16
|
}
|
|
@@ -23,10 +23,10 @@ export declare enum EnrollmentStatus {
|
|
|
23
23
|
export type Enrollment = {
|
|
24
24
|
_id?: string;
|
|
25
25
|
billingAddress: Address;
|
|
26
|
-
configuration?:
|
|
26
|
+
configuration?: {
|
|
27
27
|
key: string;
|
|
28
28
|
value: string;
|
|
29
|
-
}
|
|
29
|
+
}[];
|
|
30
30
|
contact: Contact;
|
|
31
31
|
context?: any;
|
|
32
32
|
countryCode?: string;
|
|
@@ -43,7 +43,7 @@ export type Enrollment = {
|
|
|
43
43
|
paymentProviderId?: string;
|
|
44
44
|
context?: any;
|
|
45
45
|
};
|
|
46
|
-
periods:
|
|
46
|
+
periods: EnrollmentPeriod[];
|
|
47
47
|
productId: string;
|
|
48
48
|
quantity?: number;
|
|
49
49
|
status: EnrollmentStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnrollmentsCollection.d.ts","sourceRoot":"","sources":["../../src/db/EnrollmentsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"EnrollmentsCollection.d.ts","sourceRoot":"","sources":["../../src/db/EnrollmentsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAiD,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtF,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,IAAI,CAAC;IACZ,GAAG,EAAE,IAAI,CAAC;IACV,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,oBAAY,gBAAgB;IAC1B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE;QACR,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IACF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,EAAE;QACP,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IACF,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,SAAS,GACX,eAAe,CAAC;AAElB,eAAO,MAAM,qBAAqB,GAAU,IAAI,OAAO,CAAC,EAAE,4CAiCzD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { buildDbIndexes } from '@unchainedshop/mongodb';
|
|
1
|
+
import { buildDbIndexes, isDocumentDBCompatModeEnabled } from '@unchainedshop/mongodb';
|
|
2
2
|
export var EnrollmentStatus;
|
|
3
3
|
(function (EnrollmentStatus) {
|
|
4
4
|
EnrollmentStatus["INITIAL"] = "INITIAL";
|
|
@@ -14,7 +14,7 @@ export const EnrollmentsCollection = async (db) => {
|
|
|
14
14
|
{ index: { productId: 1 } },
|
|
15
15
|
{ index: { status: 1 } },
|
|
16
16
|
{ index: { enrollmentNumber: 1 } },
|
|
17
|
-
{
|
|
17
|
+
!isDocumentDBCompatModeEnabled() && {
|
|
18
18
|
index: {
|
|
19
19
|
_id: 'text',
|
|
20
20
|
userId: 'text',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnrollmentsCollection.js","sourceRoot":"","sources":["../../src/db/EnrollmentsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"EnrollmentsCollection.js","sourceRoot":"","sources":["../../src/db/EnrollmentsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAgBhG,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,uCAAmB,CAAA;IACnB,qCAAiB,CAAA;IACjB,qCAAiB,CAAA;IACjB,6CAAyB,CAAA;AAC3B,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B;AA8BD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;IAC5D,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAa,aAAa,CAAC,CAAC;IAE7D,qBAAqB;IACrB,MAAM,cAAc,CAAa,WAAW,EAAE;QAC5C,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE;QACxB,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE;QAC3B,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE;QACxB,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,EAAE;QAClC,CAAC,6BAA6B,EAAE,IAAI;YAClC,KAAK,EAAE;gBACL,GAAG,EAAE,MAAM;gBACX,MAAM,EAAE,MAAM;gBACd,gBAAgB,EAAE,MAAM;gBACxB,MAAM,EAAE,MAAM;gBACd,mBAAmB,EAAE,MAAM;gBAC3B,sBAAsB,EAAE,MAAM;aACxB;YACR,OAAO,EAAE;gBACP,OAAO,EAAE;oBACP,GAAG,EAAE,CAAC;oBACN,MAAM,EAAE,CAAC;oBACT,gBAAgB,EAAE,CAAC;oBACnB,mBAAmB,EAAE,CAAC;oBACtB,sBAAsB,EAAE,CAAC;oBACzB,MAAM,EAAE,CAAC;iBACV;gBACD,IAAI,EAAE,4BAA4B;aACnC;SACF;KACF,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC"}
|
|
@@ -2,11 +2,11 @@ import { SortOption } from '@unchainedshop/utils';
|
|
|
2
2
|
import { Enrollment, EnrollmentPeriod, EnrollmentPlan, EnrollmentStatus } from '../db/EnrollmentsCollection.js';
|
|
3
3
|
import { mongodb, Address, Contact, ModuleInput } from '@unchainedshop/mongodb';
|
|
4
4
|
import { EnrollmentsSettingsOptions } from '../enrollments-settings.js';
|
|
5
|
-
export
|
|
6
|
-
status?:
|
|
5
|
+
export interface EnrollmentQuery {
|
|
6
|
+
status?: EnrollmentStatus[];
|
|
7
7
|
userId?: string;
|
|
8
8
|
queryString?: string;
|
|
9
|
-
}
|
|
9
|
+
}
|
|
10
10
|
export declare const buildFindSelector: ({ queryString, status, userId }: EnrollmentQuery) => {
|
|
11
11
|
deleted: Date;
|
|
12
12
|
status?: any;
|
|
@@ -27,8 +27,8 @@ export declare const configureEnrollmentsModule: ({ db, options: enrollmentOptio
|
|
|
27
27
|
findEnrollments: ({ limit, offset, sort, ...query }: EnrollmentQuery & {
|
|
28
28
|
limit?: number;
|
|
29
29
|
offset?: number;
|
|
30
|
-
sort?:
|
|
31
|
-
}) => Promise<
|
|
30
|
+
sort?: SortOption[];
|
|
31
|
+
}) => Promise<Enrollment[]>;
|
|
32
32
|
normalizedStatus: (enrollment: Enrollment) => EnrollmentStatus;
|
|
33
33
|
isExpired: (enrollment: Enrollment, { referenceDate }: {
|
|
34
34
|
referenceDate?: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureEnrollmentsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureEnrollmentsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAGL,OAAO,EACP,OAAO,EACP,OAAO,EAEP,WAAW,
|
|
1
|
+
{"version":3,"file":"configureEnrollmentsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureEnrollmentsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAGL,OAAO,EACP,OAAO,EACP,OAAO,EAEP,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAuB,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE7F,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AASD,eAAO,MAAM,iBAAiB,GAAI,iCAAiC,eAAe;aAErE,IAAI;aACJ,GAAG;YACJ;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;aAClB,MAAM;CAYlB,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAU,qCAG9C,WAAW,CAAC,0BAA0B,CAAC;mBAoFjB,eAAe;+CAIa;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,UAAU,CAAC;gDAO/D;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,YAC5D,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,UAAU,CAAC;yDAanB,eAAe,GAAG;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;KACrB,KAAG,OAAO,CAAC,UAAU,EAAE,CAAC;mCAYM,UAAU,KAAG,gBAAgB;4BAvH/B,UAAU,qBAAqB;QAAE,aAAa,CAAC,EAAE,IAAI,CAAA;KAAE;wCAgI1C,MAAM,UAAU,gBAAgB,KAAG,OAAO,CAAC,UAAU,CAAC;+DAgC7F,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,SAAS,GAAG,KAAK,CAAC,KAAG,OAAO,CAAC,UAAU,CAAC;2BAoB1C,MAAM;oDAcnB,MAAM,WACX,MAAM,KACd,OAAO,CAAC,UAAU,CAAC;yCAxID,MAAM;kCAAN,MAAM;kCAAN,MAAM;mCAAN,MAAM;;;;kCAAN,MAAM;;;;+BA8JM,MAAM,QAAQ,cAAc,KAAG,OAAO,CAAC,UAAU,CAAC;iCA3MrE,MAAM,oBACG;QAAE,MAAM,EAAE,gBAAgB,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KACjE,OAAO,CAAC,UAAU,CAAC;4CA4N0B,MAAM;EAQvD,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SortDirection } from '@unchainedshop/utils';
|
|
2
2
|
import { EnrollmentStatus, } from '../db/EnrollmentsCollection.js';
|
|
3
3
|
import { emit, registerEvents } from '@unchainedshop/events';
|
|
4
|
-
import { generateDbFilterById, buildSortOptions, generateDbObjectId, } from '@unchainedshop/mongodb';
|
|
4
|
+
import { generateDbFilterById, buildSortOptions, generateDbObjectId, assertDocumentDBCompatMode, } from '@unchainedshop/mongodb';
|
|
5
5
|
import { EnrollmentsCollection } from '../db/EnrollmentsCollection.js';
|
|
6
6
|
import { enrollmentsSettings } from '../enrollments-settings.js';
|
|
7
7
|
const ENROLLMENT_EVENTS = [
|
|
@@ -18,8 +18,10 @@ export const buildFindSelector = ({ queryString, status, userId }) => {
|
|
|
18
18
|
selector.status = { $in: status };
|
|
19
19
|
if (userId)
|
|
20
20
|
selector.userId = userId;
|
|
21
|
-
if (queryString)
|
|
21
|
+
if (queryString) {
|
|
22
|
+
assertDocumentDBCompatMode();
|
|
22
23
|
selector.$text = { $search: queryString };
|
|
24
|
+
}
|
|
23
25
|
return selector;
|
|
24
26
|
};
|
|
25
27
|
export const configureEnrollmentsModule = async ({ db, options: enrollmentOptions = {}, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureEnrollmentsModule.js","sourceRoot":"","sources":["../../src/module/configureEnrollmentsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAIL,gBAAgB,GACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAIhB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"configureEnrollmentsModule.js","sourceRoot":"","sources":["../../src/module/configureEnrollmentsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAIL,gBAAgB,GACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAIhB,kBAAkB,EAElB,0BAA0B,GAC3B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAA8B,MAAM,4BAA4B,CAAC;AAQ7F,MAAM,iBAAiB,GAAa;IAClC,uBAAuB;IACvB,mBAAmB;IACnB,mBAAmB;IACnB,mBAAmB;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAmB,EAAE,EAAE;IACpF,MAAM,QAAQ,GAKV;QACF,OAAO,EAAE,IAAI;KACd,CAAC;IACF,IAAI,MAAM;QAAE,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAC9C,IAAI,MAAM;QAAE,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;IAErC,IAAI,WAAW,EAAE,CAAC;QAChB,0BAA0B,EAAE,CAAC;QAC7B,QAAQ,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAC5C,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAAE,EAC/C,EAAE,EACF,OAAO,EAAE,iBAAiB,GAAG,EAAE,GACS,EAAE,EAAE;IAC5C,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAElC,mBAAmB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAEzD,MAAM,WAAW,GAAG,MAAM,qBAAqB,CAAC,EAAE,CAAC,CAAC;IAEpD,MAAM,SAAS,GAAG,CAAC,UAAsB,EAAE,EAAE,aAAa,EAA4B,EAAE,EAAE;QACxF,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1E,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAChD,OAAO,YAAY,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;IACvD,CAAC,CAAC;IAEF,MAAM,uBAAuB,GAAG,KAAK,EAAE,UAAsB,EAAE,KAAK,GAAG,CAAC,EAAmB,EAAE;QAC3F,MAAM,SAAS,GAAG,mBAAmB,CAAC,sBAAsB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAChF,IAAI,CAAC,MAAM,WAAW,CAAC,cAAc,CAAC,EAAE,gBAAgB,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5F,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,uBAAuB,CAAC,UAAU,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,EACxB,YAAoB,EACpB,EAAE,MAAM,EAAE,IAAI,GAAG,EAAE,EAA+C,EAC7C,EAAE;QACvB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAE3D,IAAI,UAAU,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO,UAAU,CAAC;QAEpD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,QAAQ,GAGV;YACF,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,EAAE;YACrC,KAAK,EAAE;gBACL,GAAG,EAAE;oBACH,IAAI;oBACJ,MAAM;oBACN,IAAI;iBACL;aACF;SACF,CAAC;QAEF,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,gBAAgB,CAAC,MAAM;gBAC1B,QAAQ,CAAC,IAAI,CAAC,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,UAAU,CAAC,CAAC;gBAC3E,MAAM;YACR,KAAK,gBAAgB,CAAC,UAAU;gBAC9B,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;gBACrE,MAAM;YACR;gBACE,MAAM;QACV,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE;YAC/E,cAAc,EAAE,OAAO;SACxB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEjE,OAAO,iBAAiB,CAAC;IAC3B,CAAC,CAAC;IAEF,MAAM,qBAAqB,GACzB,CAAI,QAAgB,EAAE,EAAE,CACxB,KAAK,EAAE,YAAoB,EAAE,UAAa,EAAE,EAAE;QAC5C,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,gBAAgB,CACnD,oBAAoB,CAAC,YAAY,CAAC,EAClC;YACE,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;gBACnB,CAAC,QAAQ,CAAC,EAAE,UAAU;aACvB;SACF,EACD,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;QACF,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjE,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEJ,OAAO;QACL,UAAU;QACV,KAAK,EAAE,KAAK,EAAE,KAAsB,EAAE,EAAE;YACtC,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACnF,OAAO,eAAe,CAAC;QACzB,CAAC;QACD,yBAAyB,EAAE,KAAK,EAAE,EAAE,SAAS,EAAyB,EAAuB,EAAE;YAC7F,MAAM,QAAQ,GAA+B,EAAE,SAAS,EAAE,CAAC;YAC3D,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9E,OAAO,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;QAED,cAAc,EAAE,KAAK,EACnB,EAAE,YAAY,EAAE,OAAO,EAA+C,EACtE,OAA6B,EACR,EAAE;YACvB,MAAM,QAAQ,GAAG,YAAY;gBAC3B,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC;gBACpC,CAAC,CAAC,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC;YAEnC,OAAO,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;QAED,eAAe,EAAE,KAAK,EAAE,EACtB,KAAK,EACL,MAAM,EACN,IAAI,EACJ,GAAG,KAAK,EAKT,EAAyB,EAAE;YAC1B,MAAM,iBAAiB,GAAiB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;YACvF,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;gBAC7D,IAAI,EAAE,MAAM;gBACZ,KAAK;gBACL,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAAI,iBAAiB,CAAC;aAClD,CAAC,CAAC;YAEH,OAAO,WAAW,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC;QAED,kBAAkB;QAClB,gBAAgB,EAAE,CAAC,UAAsB,EAAoB,EAAE;YAC7D,OAAO,UAAU,CAAC,MAAM,KAAK,IAAI;gBAC/B,CAAC,CAAC,gBAAgB,CAAC,OAAO;gBAC1B,CAAC,CAAE,UAAU,CAAC,MAA2B,CAAC;QAC9C,CAAC;QAED,SAAS;QAET,YAAY;QACZ,mBAAmB,EAAE,KAAK,EAAE,YAAoB,EAAE,MAAwB,EAAuB,EAAE;YACjG,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;YAChD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,gBAAgB,CACnD,QAAQ,EACR;gBACE,KAAK,EAAE;oBACL,OAAO,EAAE;wBACP,KAAK;wBACL,GAAG;wBACH,OAAO;wBACP,OAAO;qBACR;iBACF;gBACD,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;iBACpB;aACF,EACD;gBACE,cAAc,EAAE,OAAO;aACxB,CACF,CAAC;YAEF,MAAM,IAAI,CAAC,uBAAuB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAEpD,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,EACb,WAAW,EACX,YAAY,EACZ,GAAG,cAAc,EAC8B,EAAuB,EAAE;YACxE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC/D,GAAG,EAAE,kBAAkB,EAAE;gBACzB,OAAO,EAAE,IAAI,IAAI,EAAE;gBACnB,GAAG,cAAc;gBACjB,MAAM,EAAE,gBAAgB,CAAC,OAAO;gBAChC,OAAO,EAAE,EAAE;gBACX,YAAY;gBACZ,WAAW;gBACX,aAAa,EAAE,cAAc,CAAC,aAAa,IAAI,EAAE;gBACjD,GAAG,EAAE,EAAE;aACR,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC;gBAC3C,GAAG,EAAE,YAAY;aAClB,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAChD,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,YAAoB,EAAE,EAAE;YACrC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,WAAW,CAAC,SAAS,CACjE,oBAAoB,CAAC,YAAY,CAAC,EAClC;gBACE,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;iBACpB;aACF,CACF,CAAC;YACF,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;YAClD,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,+BAA+B,EAAE,KAAK,EACpC,YAAoB,EACpB,OAAe,EACM,EAAE;YACvB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACpD,OAAO,WAAW,CAAC,gBAAgB,CACjC,QAAQ,EACR;gBACE,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;iBACpB;gBACD,KAAK,EAAE;oBACL,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;iBAC1D;aACF,EACD,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;QACJ,CAAC;QAED,oBAAoB,EAAE,qBAAqB,CAAU,gBAAgB,CAAC;QACtE,aAAa,EAAE,qBAAqB,CAAU,SAAS,CAAC;QACxD,aAAa,EAAE,qBAAqB,CAAM,MAAM,CAAC;QACjD,cAAc,EAAE,qBAAqB,CAAyB,UAAU,CAAC;QACzE,aAAa,EAAE,qBAAqB,CAAwB,SAAS,CAAC;QAEtE,UAAU,EAAE,KAAK,EAAE,YAAoB,EAAE,IAAoB,EAAuB,EAAE;YACpF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,gBAAgB,CACnD,oBAAoB,CAAC,YAAY,CAAC,EAClC;gBACE,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;oBACnB,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,aAAa,EAAE,IAAI,CAAC,aAAa;iBAClC;aACF,EACD,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;YAEF,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YAC/D,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,YAAY;QACZ,6BAA6B,EAAE,KAAK,EAAE,MAAc,EAAE,EAAE;YACtD,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC;gBACpD,MAAM;gBACN,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE;aAC/E,CAAC,CAAC;YACH,OAAO,YAAY,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-enrollments",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0-rc.3",
|
|
4
4
|
"main": "lib/enrollments-index.js",
|
|
5
5
|
"types": "lib/enrollments-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@breejs/later": "^4.2.0",
|
|
35
|
-
"@unchainedshop/events": "^
|
|
36
|
-
"@unchainedshop/logger": "^
|
|
37
|
-
"@unchainedshop/utils": "^
|
|
35
|
+
"@unchainedshop/events": "^4.0.0-rc.3",
|
|
36
|
+
"@unchainedshop/logger": "^4.0.0-rc.3",
|
|
37
|
+
"@unchainedshop/utils": "^4.0.0-rc.3"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@types/breejs__later": "^4.1.5",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
|
|
1
|
+
import { mongodb, buildDbIndexes, isDocumentDBCompatModeEnabled } from '@unchainedshop/mongodb';
|
|
2
2
|
import { TimestampFields, LogFields, Address, Contact } from '@unchainedshop/mongodb';
|
|
3
3
|
|
|
4
4
|
export interface EnrollmentPeriod {
|
|
@@ -9,7 +9,7 @@ export interface EnrollmentPeriod {
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export interface EnrollmentPlan {
|
|
12
|
-
configuration:
|
|
12
|
+
configuration: { key: string; value: string }[];
|
|
13
13
|
productId: string;
|
|
14
14
|
quantity: number;
|
|
15
15
|
}
|
|
@@ -24,7 +24,7 @@ export enum EnrollmentStatus {
|
|
|
24
24
|
export type Enrollment = {
|
|
25
25
|
_id?: string;
|
|
26
26
|
billingAddress: Address;
|
|
27
|
-
configuration?:
|
|
27
|
+
configuration?: { key: string; value: string }[];
|
|
28
28
|
contact: Contact;
|
|
29
29
|
context?: any;
|
|
30
30
|
countryCode?: string;
|
|
@@ -41,7 +41,7 @@ export type Enrollment = {
|
|
|
41
41
|
paymentProviderId?: string;
|
|
42
42
|
context?: any;
|
|
43
43
|
};
|
|
44
|
-
periods:
|
|
44
|
+
periods: EnrollmentPeriod[];
|
|
45
45
|
productId: string;
|
|
46
46
|
quantity?: number;
|
|
47
47
|
status: EnrollmentStatus;
|
|
@@ -58,7 +58,7 @@ export const EnrollmentsCollection = async (db: mongodb.Db) => {
|
|
|
58
58
|
{ index: { productId: 1 } },
|
|
59
59
|
{ index: { status: 1 } },
|
|
60
60
|
{ index: { enrollmentNumber: 1 } },
|
|
61
|
-
{
|
|
61
|
+
!isDocumentDBCompatModeEnabled() && {
|
|
62
62
|
index: {
|
|
63
63
|
_id: 'text',
|
|
64
64
|
userId: 'text',
|
|
@@ -14,15 +14,16 @@ import {
|
|
|
14
14
|
Contact,
|
|
15
15
|
generateDbObjectId,
|
|
16
16
|
ModuleInput,
|
|
17
|
+
assertDocumentDBCompatMode,
|
|
17
18
|
} from '@unchainedshop/mongodb';
|
|
18
19
|
import { EnrollmentsCollection } from '../db/EnrollmentsCollection.js';
|
|
19
20
|
import { enrollmentsSettings, EnrollmentsSettingsOptions } from '../enrollments-settings.js';
|
|
20
21
|
|
|
21
|
-
export
|
|
22
|
-
status?:
|
|
22
|
+
export interface EnrollmentQuery {
|
|
23
|
+
status?: EnrollmentStatus[];
|
|
23
24
|
userId?: string;
|
|
24
25
|
queryString?: string;
|
|
25
|
-
}
|
|
26
|
+
}
|
|
26
27
|
|
|
27
28
|
const ENROLLMENT_EVENTS: string[] = [
|
|
28
29
|
'ENROLLMENT_ADD_PERIOD',
|
|
@@ -43,8 +44,10 @@ export const buildFindSelector = ({ queryString, status, userId }: EnrollmentQue
|
|
|
43
44
|
if (status) selector.status = { $in: status };
|
|
44
45
|
if (userId) selector.userId = userId;
|
|
45
46
|
|
|
46
|
-
if (queryString)
|
|
47
|
-
|
|
47
|
+
if (queryString) {
|
|
48
|
+
assertDocumentDBCompatMode();
|
|
49
|
+
selector.$text = { $search: queryString };
|
|
50
|
+
}
|
|
48
51
|
return selector;
|
|
49
52
|
};
|
|
50
53
|
|
|
@@ -164,9 +167,9 @@ export const configureEnrollmentsModule = async ({
|
|
|
164
167
|
}: EnrollmentQuery & {
|
|
165
168
|
limit?: number;
|
|
166
169
|
offset?: number;
|
|
167
|
-
sort?:
|
|
168
|
-
}): Promise<
|
|
169
|
-
const defaultSortOption:
|
|
170
|
+
sort?: SortOption[];
|
|
171
|
+
}): Promise<Enrollment[]> => {
|
|
172
|
+
const defaultSortOption: SortOption[] = [{ key: 'created', value: SortDirection.ASC }];
|
|
170
173
|
const enrollments = Enrollments.find(buildFindSelector(query), {
|
|
171
174
|
skip: offset,
|
|
172
175
|
limit,
|