@unchainedshop/core-events 3.0.0-alpha2 → 3.0.0-alpha4

package/lib/db/EventsCollection.d.ts

@@ -1,5 +1,5 @@
 import type { mongodb } from '@unchainedshop/mongodb';
-import { TimestampFields } from '@unchainedshop/types/common.js';
+import type { TimestampFields } from '@unchainedshop/mongodb';
 export type Event = {
     _id?: string;
     type: string;

package/lib/db/EventsCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventsCollection.d.ts","sourceRoot":"","sources":["../../src/db/EventsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAIjE,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,gBAAgB,OAAc,OAAO,CAAC,EAAE,uCAsBpD,CAAC"}
+{"version":3,"file":"EventsCollection.d.ts","sourceRoot":"","sources":["../../src/db/EventsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,gBAAgB,OAAc,OAAO,CAAC,EAAE,uCAsBpD,CAAC"}

package/lib/events-index.d.ts

@@ -1,3 +1,3 @@
 export type { Event } from './db/EventsCollection.js';
-export { configureEventsModule } from './module/configureEventsModule.js';
+export * from './module/configureEventsModule.js';
 //# sourceMappingURL=events-index.d.ts.map

package/lib/events-index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events-index.d.ts","sourceRoot":"","sources":["../src/events-index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"events-index.d.ts","sourceRoot":"","sources":["../src/events-index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAEtD,cAAc,mCAAmC,CAAC"}

package/lib/events-index.js

@@ -1,2 +1,2 @@
-export { configureEventsModule } from './module/configureEventsModule.js';
+export * from './module/configureEventsModule.js';
 //# sourceMappingURL=events-index.js.map

package/lib/events-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"events-index.js","sourceRoot":"","sources":["../src/events-index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"events-index.js","sourceRoot":"","sources":["../src/events-index.ts"],"names":[],"mappings":"AAEA,cAAc,mCAAmC,CAAC"}

package/lib/module/configureEventHistoryAdapter.d.ts

@@ -1,4 +1,5 @@
-import { ModuleMutations } from '@unchainedshop/types/core.js';
-import { Event } from '../db/EventsCollection.js';
-export declare const configureEventHistoryAdapter: (mutations: ModuleMutations<Event>) => void;
+import { RawPayloadType } from '@unchainedshop/events/EventDirector.js';
+export declare const configureEventHistoryAdapter: (createFn: ({ type, payload, context }: RawPayloadType<any> & {
+    type: string;
+}) => Promise<unknown>) => void;
 //# sourceMappingURL=configureEventHistoryAdapter.d.ts.map

package/lib/module/configureEventHistoryAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureEventHistoryAdapter.d.ts","sourceRoot":"","sources":["../../src/module/configureEventHistoryAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,eAAO,MAAM,4BAA4B,cAAe,eAAe,CAAC,KAAK,CAAC,SAgB7E,CAAC"}
+{"version":3,"file":"configureEventHistoryAdapter.d.ts","sourceRoot":"","sources":["../../src/module/configureEventHistoryAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,eAAO,MAAM,4BAA4B,aAC7B,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,OAAO,CAAC,SAiBnG,CAAC"}

package/lib/module/configureEventHistoryAdapter.js

@@ -1,12 +1,12 @@
 import { getEmitHistoryAdapter, setEmitHistoryAdapter } from '@unchainedshop/events';
-export const configureEventHistoryAdapter = (mutations) => {
+export const configureEventHistoryAdapter = (createFn) => {
     if (!getEmitHistoryAdapter()) {
         const adapter = {
             subscribe: () => {
                 // Do nothing
             },
             publish: async (eventName, { payload, context = {} }) => {
-                await mutations.create({
+                await createFn({
                     type: eventName,
                     payload,
                     context,

package/lib/module/configureEventHistoryAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureEventHistoryAdapter.js","sourceRoot":"","sources":["../../src/module/configureEventHistoryAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAe,MAAM,uBAAuB,CAAC;AAGlG,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,SAAiC,EAAE,EAAE;IAChF,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAgB;YAC3B,SAAS,EAAE,GAAG,EAAE;gBACd,aAAa;YACf,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE;gBACtD,MAAM,SAAS,CAAC,MAAM,CAAC;oBACrB,IAAI,EAAE,SAAS;oBACf,OAAO;oBACP,OAAO;iBACR,CAAC,CAAC;YACL,CAAC;SACF,CAAC;QACF,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"configureEventHistoryAdapter.js","sourceRoot":"","sources":["../../src/module/configureEventHistoryAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAe,MAAM,uBAAuB,CAAC;AAGlG,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,QAAkG,EAClG,EAAE;IACF,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAgB;YAC3B,SAAS,EAAE,GAAG,EAAE;gBACd,aAAa;YACf,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE;gBACtD,MAAM,QAAQ,CAAC;oBACb,IAAI,EAAE,SAAS;oBACf,OAAO;oBACP,OAAO;iBACR,CAAC,CAAC;YACL,CAAC;SACF,CAAC;QACF,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;AACH,CAAC,CAAC"}

package/lib/module/configureEventsModule.d.ts

@@ -1,7 +1,11 @@
 import type { mongodb } from '@unchainedshop/mongodb';
-import { SortOption } from '@unchainedshop/types/api.js';
-import { ModuleCreateMutation, ModuleInput } from '@unchainedshop/types/core.js';
+import { SortOption } from '@unchainedshop/utils';
+import { ModuleInput } from '@unchainedshop/mongodb';
 import { Event } from '../db/EventsCollection.js';
+export type EventReport = {
+    emitCount: number;
+    type: string;
+};
 export type EventQuery = {
     types?: Array<string>;
     queryString?: string;
@@ -12,7 +16,7 @@ export declare const buildFindSelector: ({ types, queryString, created }: EventQ
     $text?: any;
     created?: any;
 };
-export interface EventsModule extends ModuleCreateMutation<Event> {
+export interface EventsModule {
     findEvent: (params: mongodb.Filter<Event> & {
         eventId: string;
     }, options?: mongodb.FindOptions) => Promise<Event>;
@@ -22,7 +26,13 @@ export interface EventsModule extends ModuleCreateMutation<Event> {
         sort?: Array<SortOption>;
     }, options?: mongodb.FindOptions) => Promise<Array<Event>>;
     type: (event: Event) => string;
+    create: (doc: Event) => Promise<string | null>;
     count: (query: EventQuery) => Promise<number>;
+    getReport: (params?: {
+        from?: Date;
+        to?: Date;
+        types?: string[];
+    }) => Promise<EventReport[]>;
 }
 export declare const configureEventsModule: ({ db, }: ModuleInput<Record<string, never>>) => Promise<EventsModule>;
 //# sourceMappingURL=configureEventsModule.d.ts.map

package/lib/module/configureEventsModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureEventsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureEventsModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAItD,OAAO,EAAiB,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAmB,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAoB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAIpE,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,iBAAiB,oCAAqC,UAAU;WAClD,GAAG;YAAU,GAAG;cAAY,GAAG;CAMzD,CAAC;AAEF,MAAM,WAAW,YAAa,SAAQ,oBAAoB,CAAC,KAAK,CAAC;IAC/D,SAAS,EAAE,CACT,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EACnD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,KAC1B,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpB,UAAU,EAAE,CACV,MAAM,EAAE,UAAU,GAAG;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;KAC1B,EACD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,KAC1B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3B,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC;IAE/B,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/C;AAED,eAAO,MAAM,qBAAqB,YAE/B,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,YAAY,CAqC3D,CAAC"}
+{"version":3,"file":"configureEventsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureEventsModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAItD,OAAO,EAAiB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAoB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAGpE,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,iBAAiB,oCAAqC,UAAU;WAClD,GAAG;YAAU,GAAG;cAAY,GAAG;CAMzD,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,CACT,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EACnD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,KAC1B,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpB,UAAU,EAAE,CACV,MAAM,EAAE,UAAU,GAAG;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;KAC1B,EACD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,KAC1B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3B,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC;IAC/B,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAE/C,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,IAAI,CAAC;QAAC,EAAE,CAAC,EAAE,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;CAC9F;AAED,eAAO,MAAM,qBAAqB,YAE/B,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,YAAY,CAoG3D,CAAC"}

package/lib/module/configureEventsModule.js

@@ -1,8 +1,7 @@
-import { generateDbFilterById, generateDbMutations, buildSortOptions } from '@unchainedshop/mongodb';
+import { generateDbFilterById, buildSortOptions, generateDbObjectId } from '@unchainedshop/mongodb';
 import { getRegisteredEvents } from '@unchainedshop/events';
-import { SortDirection } from '@unchainedshop/types/api.js';
+import { SortDirection } from '@unchainedshop/utils';
 import { EventsCollection } from '../db/EventsCollection.js';
-import { EventsSchema } from '../db/EventsSchema.js';
 import { configureEventHistoryAdapter } from './configureEventHistoryAdapter.js';
 export const buildFindSelector = ({ types, queryString, created }) => {
     const selector = {};
@@ -16,12 +15,17 @@ export const buildFindSelector = ({ types, queryString, created }) => {
 };
 export const configureEventsModule = async ({ db, }) => {
     const Events = await EventsCollection(db);
-    const mutations = generateDbMutations(Events, EventsSchema, {
-        hasCreateOnly: true,
-    });
-    configureEventHistoryAdapter(mutations);
+    const create = async (doc) => {
+        const result = await Events.insertOne({
+            _id: generateDbObjectId(),
+            created: new Date(),
+            ...doc,
+        });
+        return result.insertedId;
+    };
+    await configureEventHistoryAdapter(create);
     return {
-        ...mutations,
+        create,
         findEvent: async ({ eventId, ...rest }, options) => {
             const selector = eventId ? generateDbFilterById(eventId) : rest;
             return Events.findOne(selector, options);
@@ -44,6 +48,58 @@ export const configureEventsModule = async ({ db, }) => {
             const count = await Events.countDocuments(buildFindSelector(query));
             return count;
         },
+        getReport: async ({ from, to, types } = { from: null, to: null, types: null }) => {
+            const pipeline = [];
+            const matchConditions = [];
+            // build date filter based on provided values it can be a range if both to and from is supplied
+            // a upper or lowe limit if either from or to is provided
+            // or all if none is provided
+            if (from || to) {
+                const dateConditions = [];
+                if (from) {
+                    const fromDate = new Date(from);
+                    dateConditions.push({
+                        $or: [{ created: { $gte: fromDate } }, { updated: { $gte: fromDate } }],
+                    });
+                }
+                if (to) {
+                    const toDate = new Date(to);
+                    dateConditions.push({
+                        $or: [{ created: { $lte: toDate } }, { updated: { $lte: toDate } }],
+                    });
+                }
+                if (dateConditions.length > 0) {
+                    matchConditions.push({ $and: dateConditions });
+                }
+            }
+            // build types filter if type is provided or ignore types if it is not provided
+            if (types && Array.isArray(types) && types.length) {
+                matchConditions.push({ type: { $in: types } });
+            }
+            if (matchConditions.length > 0) {
+                pipeline.push({
+                    $match: {
+                        $and: matchConditions,
+                    },
+                });
+            }
+            pipeline.push(...[
+                {
+                    $group: {
+                        _id: '$type',
+                        emitCount: { $sum: 1 },
+                    },
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        type: '$_id',
+                        emitCount: 1,
+                    },
+                },
+            ]);
+            return Events.aggregate(pipeline).toArray();
+        },
     };
 };
 //# sourceMappingURL=configureEventsModule.js.map

package/lib/module/configureEventsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureEventsModule.js","sourceRoot":"","sources":["../../src/module/configureEventsModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACrG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAc,MAAM,6BAA6B,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAS,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAQjF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAc,EAAE,EAAE;IAC/E,MAAM,QAAQ,GAA+C,EAAE,CAAC;IAEhE,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,QAAQ,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAClE,IAAI,WAAW;QAAE,QAAQ,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAC3D,IAAI,OAAO;QAAE,QAAQ,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAsBF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAC1C,EAAE,GACiC,EAAyB,EAAE;IAC9D,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAE1C,MAAM,SAAS,GAAG,mBAAmB,CAAQ,MAAM,EAAE,YAAY,EAAE;QACjE,aAAa,EAAE,IAAI;KACpB,CAA2B,CAAC;IAE7B,4BAA4B,CAAC,SAAS,CAAC,CAAC;IAExC,OAAO;QACL,GAAG,SAAS;QACZ,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE;YACjD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAQ,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACvE,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;YACtD,MAAM,WAAW,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,CAAsB,CAAC;YACzF,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;gBAC3C,IAAI,EAAE,MAAM;gBACZ,KAAK;gBACL,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAAI,WAAW,CAAC;aAC5C,CAAC,CAAC,OAAO,EAAE,CAAC;QACf,CAAC;QAED,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YACd,IAAI,mBAAmB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/C,OAAO,KAAK,CAAC,IAAI,CAAC;YACpB,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACpE,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"configureEventsModule.js","sourceRoot":"","sources":["../../src/module/configureEventsModule.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-events",
-  "version": "3.0.0-alpha2",
+  "version": "3.0.0-alpha4",
   "main": "lib/events-index.js",
   "exports": {
     ".": "./lib/events-index.js",
@@ -31,15 +31,13 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^3.0.0-alpha2",
-    "@unchainedshop/utils": "^3.0.0-alpha2",
-    "simpl-schema": "^3.4.6"
+    "@unchainedshop/events": "^3.0.0-alpha4",
+    "@unchainedshop/utils": "^3.0.0-alpha4"
   },
   "devDependencies": {
-    "@types/node": "^20.14.12",
-    "@unchainedshop/types": "^3.0.0-alpha2",
+    "@types/node": "^22.7.8",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.3",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3"
   }
 }

package/src/db/EventsCollection.ts

@@ -1,6 +1,6 @@
 import type { mongodb } from '@unchainedshop/mongodb';
 import { buildDbIndexes } from '@unchainedshop/mongodb';
-import { TimestampFields } from '@unchainedshop/types/common.js';
+import type { TimestampFields } from '@unchainedshop/mongodb';
 
 const TWO_DAYS_SEC = 172800;
 

package/src/events-index.ts

@@ -1,3 +1,3 @@
 export type { Event } from './db/EventsCollection.js';
 
-export { configureEventsModule } from './module/configureEventsModule.js';
+export * from './module/configureEventsModule.js';

package/src/module/buildFindSelector.test.ts

@@ -1,30 +1,36 @@
-import { buildFindSelector } from "./configureEventsModule.js";
+import { buildFindSelector } from './configureEventsModule.js';
 
-describe('Event', () => {
-  describe('buildFindSelector', () => {
-  it('Return correct filter object when passed create, queryString, types', async () => {
-   expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z"), queryString: "Hello world", types: ['PRODUCT_CREATED']})).toEqual({
-      type: { '$in': [ 'PRODUCT_CREATED' ] },
-      '$text': { '$search': 'Hello world' },
-      created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
-    })
+describe('buildFindSelector', () => {
+  it('Return correct filter object when passed create, queryString, types', () => {
+    expect(
+      buildFindSelector({
+        created: new Date('2022-12-03T18:23:38.278Z'),
+        queryString: 'Hello world',
+        types: ['PRODUCT_CREATED'],
+      }),
+    ).toEqual({
+      type: { $in: ['PRODUCT_CREATED'] },
+      $text: { $search: 'Hello world' },
+      created: { $gte: new Date('2022-12-03T18:23:38.278Z') },
+    });
   });
 
-  it('Return correct filter object when passed create, queryString', async () => {
-    expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z"), queryString: "Hello world"})).toEqual({       
-       '$text': { '$search': 'Hello world' },
-       created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
-     })
-   });
+  it('Return correct filter object when passed create, queryString', () => {
+    expect(
+      buildFindSelector({ created: new Date('2022-12-03T18:23:38.278Z'), queryString: 'Hello world' }),
+    ).toEqual({
+      $text: { $search: 'Hello world' },
+      created: { $gte: new Date('2022-12-03T18:23:38.278Z') },
+    });
+  });
 
-   it('Return correct filter object when passed create', async () => {
-    expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z")})).toEqual({              
-       created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
-     })
-   });
+  it('Return correct filter object when passed create', () => {
+    expect(buildFindSelector({ created: new Date('2022-12-03T18:23:38.278Z') })).toEqual({
+      created: { $gte: new Date('2022-12-03T18:23:38.278Z') },
+    });
+  });
 
-   it('Return correct filter object when passed no argument', async () => {
-    expect(buildFindSelector({})).toEqual({})
-   });
-})
+  it('Return correct filter object when passed no argument', () => {
+    expect(buildFindSelector({})).toEqual({});
+  });
 });

package/src/module/configureEventHistoryAdapter.ts

@@ -1,15 +1,16 @@
-import { ModuleMutations } from '@unchainedshop/types/core.js';
 import { getEmitHistoryAdapter, setEmitHistoryAdapter, EmitAdapter } from '@unchainedshop/events';
-import { Event } from '../db/EventsCollection.js';
+import { RawPayloadType } from '@unchainedshop/events/EventDirector.js';
 
-export const configureEventHistoryAdapter = (mutations: ModuleMutations<Event>) => {
+export const configureEventHistoryAdapter = (
+  createFn: ({ type, payload, context }: RawPayloadType<any> & { type: string }) => Promise<unknown>,
+) => {
   if (!getEmitHistoryAdapter()) {
     const adapter: EmitAdapter = {
       subscribe: () => {
         // Do nothing
       },
       publish: async (eventName, { payload, context = {} }) => {
-        await mutations.create({
+        await createFn({
           type: eventName,
           payload,
           context,

package/src/module/configureEventsModule.ts

@@ -1,13 +1,17 @@
 import type { mongodb } from '@unchainedshop/mongodb';
 
-import { generateDbFilterById, generateDbMutations, buildSortOptions } from '@unchainedshop/mongodb';
+import { generateDbFilterById, buildSortOptions, generateDbObjectId } from '@unchainedshop/mongodb';
 import { getRegisteredEvents } from '@unchainedshop/events';
-import { SortDirection, SortOption } from '@unchainedshop/types/api.js';
-import { ModuleCreateMutation, ModuleInput, ModuleMutations } from '@unchainedshop/types/core.js';
+import { SortDirection, SortOption } from '@unchainedshop/utils';
+import { ModuleInput } from '@unchainedshop/mongodb';
 import { EventsCollection, Event } from '../db/EventsCollection.js';
-import { EventsSchema } from '../db/EventsSchema.js';
 import { configureEventHistoryAdapter } from './configureEventHistoryAdapter.js';
 
+export type EventReport = {
+  emitCount: number;
+  type: string;
+};
+
 export type EventQuery = {
   types?: Array<string>;
   queryString?: string;
@@ -23,7 +27,7 @@ export const buildFindSelector = ({ types, queryString, created }: EventQuery) =
   return selector;
 };
 
-export interface EventsModule extends ModuleCreateMutation<Event> {
+export interface EventsModule {
   findEvent: (
     params: mongodb.Filter<Event> & { eventId: string },
     options?: mongodb.FindOptions,
@@ -39,8 +43,10 @@ export interface EventsModule extends ModuleCreateMutation<Event> {
   ) => Promise<Array<Event>>;
 
   type: (event: Event) => string;
+  create: (doc: Event) => Promise<string | null>;
 
   count: (query: EventQuery) => Promise<number>;
+  getReport: (params?: { from?: Date; to?: Date; types?: string[] }) => Promise<EventReport[]>;
 }
 
 export const configureEventsModule = async ({
@@ -48,14 +54,20 @@ export const configureEventsModule = async ({
 }: ModuleInput<Record<string, never>>): Promise<EventsModule> => {
   const Events = await EventsCollection(db);
 
-  const mutations = generateDbMutations<Event>(Events, EventsSchema, {
-    hasCreateOnly: true,
-  }) as ModuleMutations<Event>;
+  const create = async (doc) => {
+    const result = await Events.insertOne({
+      _id: generateDbObjectId(),
+      created: new Date(),
+      ...doc,
+    });
+    return result.insertedId as string;
+  };
 
-  configureEventHistoryAdapter(mutations);
+  await configureEventHistoryAdapter(create);
 
   return {
-    ...mutations,
+    create,
+
     findEvent: async ({ eventId, ...rest }, options) => {
       const selector = eventId ? generateDbFilterById<Event>(eventId) : rest;
       return Events.findOne(selector, options);
@@ -81,5 +93,62 @@ export const configureEventsModule = async ({
       const count = await Events.countDocuments(buildFindSelector(query));
       return count;
     },
+
+    getReport: async ({ from, to, types } = { from: null, to: null, types: null }) => {
+      const pipeline = [];
+      const matchConditions = [];
+      // build date filter based on provided values it can be a range if both to and from is supplied
+      // a upper or lowe limit if either from or to is provided
+      // or all if none is provided
+      if (from || to) {
+        const dateConditions = [];
+        if (from) {
+          const fromDate = new Date(from);
+          dateConditions.push({
+            $or: [{ created: { $gte: fromDate } }, { updated: { $gte: fromDate } }],
+          });
+        }
+        if (to) {
+          const toDate = new Date(to);
+          dateConditions.push({
+            $or: [{ created: { $lte: toDate } }, { updated: { $lte: toDate } }],
+          });
+        }
+        if (dateConditions.length > 0) {
+          matchConditions.push({ $and: dateConditions });
+        }
+      }
+      // build types filter if type is provided or ignore types if it is not provided
+      if (types && Array.isArray(types) && types.length) {
+        matchConditions.push({ type: { $in: types } });
+      }
+      if (matchConditions.length > 0) {
+        pipeline.push({
+          $match: {
+            $and: matchConditions,
+          },
+        });
+      }
+
+      pipeline.push(
+        ...[
+          {
+            $group: {
+              _id: '$type',
+              emitCount: { $sum: 1 },
+            },
+          },
+          {
+            $project: {
+              _id: 0,
+              type: '$_id',
+              emitCount: 1,
+            },
+          },
+        ],
+      );
+
+      return Events.aggregate(pipeline).toArray() as Promise<EventReport[]>;
+    },
   };
 };

package/lib/db/EventsSchema.d.ts

@@ -1,3 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-export declare const EventsSchema: SimpleSchema;
-//# sourceMappingURL=EventsSchema.d.ts.map

package/lib/db/EventsSchema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"EventsSchema.d.ts","sourceRoot":"","sources":["../../src/db/EventsSchema.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,eAAO,MAAM,YAAY,cAQxB,CAAC"}

package/lib/db/EventsSchema.js

@@ -1,9 +0,0 @@
-import { Schemas } from '@unchainedshop/utils';
-import SimpleSchema from 'simpl-schema';
-export const EventsSchema = new SimpleSchema({
-    type: { type: String, required: true },
-    payload: { type: Object, blackbox: true },
-    context: { type: Object, blackbox: true },
-    ...Schemas.timestampFields,
-}, { requiredByDefault: false });
-//# sourceMappingURL=EventsSchema.js.map

package/lib/db/EventsSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"EventsSchema.js","sourceRoot":"","sources":["../../src/db/EventsSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,YAAY,CAC1C;IACE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACzC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACzC,GAAG,OAAO,CAAC,eAAe;CAC3B,EACD,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAC"}

package/src/db/EventsSchema.ts

@@ -1,12 +0,0 @@
-import { Schemas } from '@unchainedshop/utils';
-import SimpleSchema from 'simpl-schema';
-
-export const EventsSchema = new SimpleSchema(
-  {
-    type: { type: String, required: true },
-    payload: { type: Object, blackbox: true },
-    context: { type: Object, blackbox: true },
-    ...Schemas.timestampFields,
-  },
-  { requiredByDefault: false },
-);