🐛 fix(event-conversion): fix tests - remove mongo import from core pkg

victor-enogwe · victor-enogwe · commit ee6de04b2ecb · 2025-09-26T12:43:04.000+01:00
diff --git a/packages/core/src/__mocks__/v1/events/events.22mar.ts b/packages/core/src/__mocks__/v1/events/events.22mar.ts
@@ -1,8 +1,10 @@
-import { ObjectId, WithId } from "mongodb";
-import { Priorities } from "../../../constants/core.constants";
-import { Schema_Event } from "../../../types/event.types";
+import { ObjectId } from "bson";
+import { Priorities } from "@core/constants/core.constants";
+import { Schema_Event, WithMongoId } from "@core/types/event.types";
 
-const allDayEventsThatShouldMatch: Array<WithId<Omit<Schema_Event, "_id">>> =
+const allDayEventsThatShouldMatch: Array<
+  WithMongoId<Omit<Schema_Event, "_id">>
+> =
   // ordered by start date
   [
     {
@@ -43,49 +45,50 @@ const allDayEventsThatShouldMatch: Array<WithId<Omit<Schema_Event, "_id">>> =
     },
   ];
 
-const allDayEventsThatShouldNotMatch: Array<WithId<Omit<Schema_Event, "_id">>> =
-  [
-    {
-      _id: new ObjectId(),
-      user: "user1",
-      title: "Feb 28 - Mar 5",
-      isAllDay: true,
-      isSomeday: false,
-      startDate: "2022-02-28",
-      endDate: "2022-03-05",
-      priority: Priorities.WORK,
-    },
-    {
-      _id: new ObjectId(),
-      user: "user1",
-      title: "Mar 5",
-      isAllDay: true,
-      isSomeday: false,
-      startDate: "2022-03-05",
-      endDate: "2022-03-06",
-      priority: Priorities.WORK,
-    },
-    {
-      _id: new ObjectId(),
-      user: "user1",
-      title: "Mar 13",
-      isAllDay: true,
-      isSomeday: false,
-      startDate: "2022-03-13",
-      endDate: "2022-03-14",
-      priority: Priorities.WORK,
-    },
-    {
-      _id: new ObjectId(),
-      user: "user1",
-      title: "Mar 13 - 16",
-      isAllDay: true,
-      isSomeday: false,
-      startDate: "2022-03-13",
-      endDate: "2022-03-17",
-      priority: Priorities.WORK,
-    },
-  ];
+const allDayEventsThatShouldNotMatch: Array<
+  WithMongoId<Omit<Schema_Event, "_id">>
+> = [
+  {
+    _id: new ObjectId(),
+    user: "user1",
+    title: "Feb 28 - Mar 5",
+    isAllDay: true,
+    isSomeday: false,
+    startDate: "2022-02-28",
+    endDate: "2022-03-05",
+    priority: Priorities.WORK,
+  },
+  {
+    _id: new ObjectId(),
+    user: "user1",
+    title: "Mar 5",
+    isAllDay: true,
+    isSomeday: false,
+    startDate: "2022-03-05",
+    endDate: "2022-03-06",
+    priority: Priorities.WORK,
+  },
+  {
+    _id: new ObjectId(),
+    user: "user1",
+    title: "Mar 13",
+    isAllDay: true,
+    isSomeday: false,
+    startDate: "2022-03-13",
+    endDate: "2022-03-14",
+    priority: Priorities.WORK,
+  },
+  {
+    _id: new ObjectId(),
+    user: "user1",
+    title: "Mar 13 - 16",
+    isAllDay: true,
+    isSomeday: false,
+    startDate: "2022-03-13",
+    endDate: "2022-03-17",
+    priority: Priorities.WORK,
+  },
+];
 
 export const mockEventSetMar22: Array<Omit<Schema_Event, "_id">> = [
   ...allDayEventsThatShouldMatch,
diff --git a/packages/core/src/mappers/map.event.ts b/packages/core/src/mappers/map.event.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-namespace */
 import mergeWith from "lodash.mergewith";
-import { WithId } from "mongodb";
 import { Origin, Priorities } from "@core/constants/core.constants";
 import { BaseError } from "@core/errors/errors.base";
 import {
@@ -11,6 +10,7 @@ import {
   Schema_Event_Recur_Instance,
   Schema_Event_Regular,
   WithCompassId,
+  WithMongoId,
   WithoutCompassId,
 } from "@core/types/event.types";
 import { WithGcalId, gSchema$Event } from "@core/types/gcal";
@@ -37,9 +37,9 @@ export namespace MapEvent {
   };
 
   export const removeProviderData = (
-    event: WithId<Omit<Schema_Event, "_id">> | Schema_Event,
+    event: WithMongoId<Omit<Schema_Event, "_id">> | Schema_Event,
   ): Omit<
-    WithId<Omit<Schema_Event, "_id">> | Schema_Event,
+    WithMongoId<Omit<Schema_Event, "_id">> | Schema_Event,
     "gEventId" | "gRecurringEventId"
   > => {
     const {
@@ -57,7 +57,7 @@ export namespace MapEvent {
   };
 
   export const removeIdentifyingData = (
-    event: WithId<Omit<Schema_Event, "_id">> | Schema_Event,
+    event: WithMongoId<Omit<Schema_Event, "_id">> | Schema_Event,
   ): Omit<
     Schema_Event,
     | "_id"
@@ -128,7 +128,7 @@ export namespace MapEvent {
 
   export const toGcalSingleProviderData = (
     base:
-      | WithId<Omit<Schema_Event_Recur_Base | Schema_Event_Regular, "_id">>
+      | WithMongoId<Omit<Schema_Event_Recur_Base | Schema_Event_Regular, "_id">>
       | WithCompassId<
           Omit<Schema_Event_Recur_Base | Schema_Event_Regular, "_id">
         >,
@@ -140,11 +140,11 @@ export namespace MapEvent {
 
   export const toProviderData = (
     event:
-      | WithId<Omit<Schema_Event, "_id" | "recurrence">>
+      | WithMongoId<Omit<Schema_Event, "_id" | "recurrence">>
       | WithCompassId<Omit<Schema_Event, "_id" | "recurrence">>,
     provider?: CalendarProvider,
     base?:
-      | WithId<Omit<Schema_Event_Recur_Base, "_id">>
+      | WithMongoId<Omit<Schema_Event_Recur_Base, "_id">>
       | WithCompassId<Omit<Schema_Event_Recur_Base, "_id">>,
   ) => {
     const isCInstance = isInstance(event);
@@ -153,7 +153,7 @@ export namespace MapEvent {
       case CalendarProvider.GOOGLE: {
         return isCInstance
           ? MapEvent.toGcalInstanceProviderData(
-              event as WithId<Omit<Schema_Event_Recur_Instance, "_id">>,
+              event as WithMongoId<Omit<Schema_Event_Recur_Instance, "_id">>,
               base,
             )
           : MapEvent.toGcalSingleProviderData(event);
diff --git a/packages/core/src/types/mongo.types.ts b/packages/core/src/types/mongo.types.ts
@@ -1,3 +1,3 @@
-import { ObjectId } from "mongodb";
+import { ObjectId } from "bson";
 
 export type InsertedIds = { [key: number]: ObjectId };
diff --git a/packages/core/src/types/sync.types.ts b/packages/core/src/types/sync.types.ts
@@ -1,4 +1,4 @@
-import { AnyBulkWriteOperation, BulkWriteResult } from "mongodb";
+import type { AnyBulkWriteOperation, BulkWriteResult } from "mongodb";
 import { BaseError } from "@core/errors/errors.base";
 
 export interface Params_Sync_Gcal extends Payload_Sync_Notif {
diff --git a/packages/core/src/util/event/compass.event.rrule.test.ts b/packages/core/src/util/event/compass.event.rrule.test.ts
@@ -1,4 +1,4 @@
-import { ObjectId, type WithId } from "mongodb";
+import { ObjectId } from "bson";
 import { RRule } from "rrule";
 import { faker } from "@faker-js/faker";
 import { recurring } from "@core/__mocks__/v1/events/gcal/gcal.recurring";
@@ -7,6 +7,7 @@ import { gEventToCompassEvent } from "@core/mappers/map.event";
 import {
   CalendarProvider,
   type Schema_Event_Recur_Base,
+  WithMongoId,
 } from "@core/types/event.types";
 import dayjs from "@core/util/date/dayjs";
 import { CompassEventRRule } from "@core/util/event/compass.event.rrule";
@@ -390,7 +391,7 @@ describe("CompassEventRRule: ", () => {
         return event;
       });
 
-      const baseEvent = compassEvents.find(isBase) as WithId<
+      const baseEvent = compassEvents.find(isBase) as WithMongoId<
         Omit<Schema_Event_Recur_Base, "_id">
       >;
 
diff --git a/packages/core/src/util/event/compass.event.rrule.ts b/packages/core/src/util/event/compass.event.rrule.ts
@@ -1,5 +1,4 @@
 import { ObjectId } from "bson";
-import type { WithId } from "mongodb";
 import type { Options, RRuleStrOptions } from "rrule";
 import { RRule, rrulestr } from "rrule";
 import type { ParsedOptions } from "rrule/dist/esm/types";
@@ -9,6 +8,7 @@ import type {
   CalendarProvider,
   Schema_Event_Recur_Base,
   Schema_Event_Recur_Instance,
+  WithMongoId,
 } from "@core/types/event.types";
 import dayjs from "@core/util/date/dayjs";
 import {
@@ -18,13 +18,13 @@ import {
 } from "@core/util/event/event.util";
 
 export class CompassEventRRule extends RRule {
-  #event: WithId<Omit<Schema_Event_Recur_Base, "_id">>;
+  #event: WithMongoId<Omit<Schema_Event_Recur_Base, "_id">>;
   #dateFormat: string;
   #durationMs!: number;
 
   constructor(
     event: Pick<
-      WithId<Omit<Schema_Event_Recur_Base, "_id">>,
+      WithMongoId<Omit<Schema_Event_Recur_Base, "_id">>,
       "startDate" | "endDate" | "_id" | "recurrence"
     >,
     options: Partial<Options> = {},
@@ -41,7 +41,7 @@ export class CompassEventRRule extends RRule {
   }
 
   static #initOptions(
-    event: WithId<Omit<Schema_Event_Recur_Base, "_id">>,
+    event: WithMongoId<Omit<Schema_Event_Recur_Base, "_id">>,
     _options: Partial<Options> = {},
   ): Partial<Options> {
     const startDate = parseCompassEventDate(event.startDate!);
@@ -111,7 +111,7 @@ export class CompassEventRRule extends RRule {
 
   base(
     provider?: CalendarProvider,
-  ): WithId<Omit<Schema_Event_Recur_Base, "_id">> {
+  ): WithMongoId<Omit<Schema_Event_Recur_Base, "_id">> {
     const _id = this.#event._id ?? new ObjectId();
     const recurrence = { rule: this.toRecurrence() };
     const event = { ...this.#event, _id, recurrence };
@@ -129,7 +129,7 @@ export class CompassEventRRule extends RRule {
    */
   instances(
     provider?: CalendarProvider,
-  ): WithId<Omit<Schema_Event_Recur_Instance, "_id">>[] {
+  ): WithMongoId<Omit<Schema_Event_Recur_Instance, "_id">>[] {
     const base = this.base();
     const baseData = MapEvent.removeIdentifyingData(base);
     const baseEventId = base._id.toString();
diff --git a/packages/core/src/util/test/ccal.event.factory.ts b/packages/core/src/util/test/ccal.event.factory.ts
@@ -1,4 +1,4 @@
-import { ObjectId } from "mongodb";
+import { ObjectId } from "bson";
 import { faker } from "@faker-js/faker";
 import { Origin, Priorities } from "@core/constants/core.constants";
 import {
@@ -8,7 +8,7 @@ import {
   WithCompassId,
 } from "@core/types/event.types";
 import dayjs from "@core/util/date/dayjs";
-import { isAllDay, parseCompassEventDate } from "../event/event.util";
+import { isAllDay, parseCompassEventDate } from "@core/util/event/event.util";
 
 export const createMockStandaloneEvent = (
   overrides: Partial<Schema_Event> = {},
diff --git a/packages/web/src/common/types/web.event.types.ts b/packages/web/src/common/types/web.event.types.ts
@@ -24,7 +24,7 @@ const WebEventRecurrence = z.union([
 ]);
 
 const WebCoreEventSchema = CompassCoreEventSchema.extend({
-  _id: z.union([idSchema, optimisticIdSchema]),
+  _id: z.union([idSchema, optimisticIdSchema]).optional(),
   recurrence: WebEventRecurrence,
   order: z.number().optional(),
 });
diff --git a/packages/web/src/common/validators/grid.event.validator.ts b/packages/web/src/common/validators/grid.event.validator.ts
@@ -1,7 +1,10 @@
-import { Schema_Event } from "@core/types/event.types";
-import { GridEventSchema, Schema_GridEvent } from "../types/web.event.types";
+import {
+  GridEventSchema,
+  Schema_GridEvent,
+  Schema_WebEvent,
+} from "@web/common/types/web.event.types";
 
-export const validateGridEvent = (event: Schema_Event): Schema_GridEvent => {
+export const validateGridEvent = (event: Schema_WebEvent): Schema_GridEvent => {
   const result = GridEventSchema.parse(event) as Schema_GridEvent;
 
   return result;
diff --git a/packages/web/src/ducks/events/sagas/saga.util.test.ts b/packages/web/src/ducks/events/sagas/saga.util.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-import { ObjectId } from "mongodb";`
	`1`	`+import { ObjectId } from "bson";`
`2`	`2`
`3`	`3`	`export type InsertedIds = { [key: number]: ObjectId };`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { AnyBulkWriteOperation, BulkWriteResult } from "mongodb";`
	`1`	`+import type { AnyBulkWriteOperation, BulkWriteResult } from "mongodb";`
`2`	`2`	`import { BaseError } from "@core/errors/errors.base";`
`3`	`3`
`4`	`4`	`export interface Params_Sync_Gcal extends Payload_Sync_Notif {`