@unchainedshop/core-enrollments 4.8.9 → 4.8.11

package/lib/db/EnrollmentsCollection.js

@@ -1,4 +1,4 @@
-import { mongodb, buildDbIndexes, isDocumentDBCompatModeEnabled } from '@unchainedshop/mongodb';
+import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
 import {} from '@unchainedshop/mongodb';
 export const EnrollmentStatus = {
     INITIAL: 'INITIAL',
@@ -8,34 +8,33 @@ export const EnrollmentStatus = {
 };
 export const EnrollmentsCollection = async (db) => {
     const Enrollments = db.collection('enrollments');
-    if (!isDocumentDBCompatModeEnabled()) {
-        await buildDbIndexes(Enrollments, [
-            {
-                index: {
-                    _id: 'text',
-                    userId: 'text',
-                    enrollmentNumber: 'text',
-                    status: 'text',
-                    'contact.telNumber': 'text',
-                    'contact.emailAddress': 'text',
-                },
-                options: {
-                    weights: {
-                        _id: 8,
-                        userId: 3,
-                        enrollmentNumber: 6,
-                        'contact.telNumber': 5,
-                        'contact.emailAddress': 4,
-                        status: 1,
-                    },
-                    name: 'enrollment_fulltext_search',
+    await buildDbIndexes(Enrollments, [
+        {
+            index: {
+                _id: 'text',
+                userId: 'text',
+                enrollmentNumber: 'text',
+                status: 'text',
+                'contact.telNumber': 'text',
+                'contact.emailAddress': 'text',
+            },
+            options: {
+                weights: {
+                    _id: 8,
+                    userId: 3,
+                    enrollmentNumber: 6,
+                    'contact.telNumber': 5,
+                    'contact.emailAddress': 4,
+                    status: 1,
                 },
+                name: 'enrollment_fulltext_search',
             },
-        ]);
-    }
+        },
+    ]);
     await buildDbIndexes(Enrollments, [
-        { index: { userId: 1 } },
-        { index: { productId: 1 } },
+        { index: { 'periods.orderId': 1 } },
+        { index: { userId: 1, status: 1 } },
+        { index: { productId: 1, status: 1 } },
         { index: { status: 1 } },
         { index: { enrollmentNumber: 1 } },
     ]);

package/lib/module/configureEnrollmentsModule.d.ts

@@ -18,6 +18,9 @@ export declare const configureEnrollmentsModule: ({ db, options: enrollmentOptio
     } | {
         orderId: string;
     }, options?: mongodb.FindOptions) => Promise<Enrollment | null>;
+    findEnrollmentsByOrderIds: ({ orderIds }: {
+        orderIds: string[];
+    }, options?: mongodb.FindOptions) => Promise<Enrollment[]>;
     findEnrollments: ({ limit, offset, sort, ...query }: EnrollmentQuery & {
         limit?: number;
         offset?: number;

package/lib/module/configureEnrollmentsModule.js

@@ -1,7 +1,7 @@
 import { SortDirection } from '@unchainedshop/utils';
 import { EnrollmentStatus, } from "../db/EnrollmentsCollection.js";
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbFilterById, buildSortOptions, mongodb, generateDbObjectId, assertDocumentDBCompatMode, } from '@unchainedshop/mongodb';
+import { generateDbFilterById, buildSortOptions, mongodb, generateDbObjectId, } from '@unchainedshop/mongodb';
 import { EnrollmentsCollection } from "../db/EnrollmentsCollection.js";
 import { enrollmentsSettings } from "../enrollments-settings.js";
 const ENROLLMENT_EVENTS = [
@@ -19,7 +19,6 @@ export const buildFindSelector = ({ queryString, status, userId }) => {
     if (userId)
         selector.userId = userId;
     if (queryString) {
-        assertDocumentDBCompatMode();
         selector.$text = { $search: queryString };
     }
     return selector;
@@ -102,6 +101,11 @@ export const configureEnrollmentsModule = async ({ db, options: enrollmentOption
             }
             return Enrollments.findOne({ 'periods.orderId': params.orderId, deleted: null }, options);
         },
+        findEnrollmentsByOrderIds: async ({ orderIds }, options) => {
+            if (!orderIds?.length)
+                return [];
+            return Enrollments.find({ 'periods.orderId': { $in: orderIds }, deleted: null }, options).toArray();
+        },
         findEnrollments: async ({ limit, offset, sort, ...query }) => {
             const defaultSortOption = [{ key: 'created', value: SortDirection.ASC }];
             const enrollments = Enrollments.find(buildFindSelector(query), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-enrollments",
   "description": "Subscription and recurring billing module for the Unchained Engine",
-  "version": "4.8.9",
+  "version": "4.8.11",
   "main": "lib/enrollments-index.js",
   "types": "lib/enrollments-index.d.ts",
   "type": "module",