🐛 fix(calendar-event-transiton): calendar event to someday fix (#973)

Author: victor-enogwe

jest.config.js

@@ -102,6 +102,9 @@ module.exports = {
       testEnvironment: "node",
       testMatch: ["<rootDir>/packages/core/**/?(*.)+(spec|test).[tj]s?(x)"],
       setupFiles: ["<rootDir>/packages/core/src/__tests__/core.test.init.ts"],
+      setupFilesAfterEnv: [
+        "<rootDir>/packages/core/src/__tests__/core.test.start.ts",
+      ],
     },
     {
       displayName: "web",

packages/core/src/__mocks__/v1/events/events.misc.ts

@@ -1,14 +1,15 @@
+import { ObjectId } from "bson";
 import { Origin, Priorities } from "@core/constants/core.constants";
 import { Schema_Event } from "@core/types/event.types";
 
 /**
  * Assortment of events with no direct relation to another
  */
 
-const USER = "6227e1a1623abad10d70afbf";
+const USER = new ObjectId().toString();
 
 export const CHILL_ALL_DAY: Schema_Event = {
-  _id: "620c177bfadfdec705cdd69c",
+  _id: new ObjectId().toString(),
   gEventId: "6csjad336cs3ibb469imcb9kc9gj6bb26ss30bb56kojgoj464o66ohh60",
   user: USER,
   origin: Origin.GOOGLE_IMPORT,
@@ -20,7 +21,7 @@ export const CHILL_ALL_DAY: Schema_Event = {
   endDate: "2022-09-24",
 };
 export const CLIMB: Schema_Event = {
-  _id: "62322b127837957382660217",
+  _id: new ObjectId().toString(),
   gEventId: "ccq34eb261j3ab9jckpj6b9kcos6cbb26pi38b9pc5i64e9mcgp3ao9p6o",
   user: USER,
   origin: Origin.GOOGLE_IMPORT,
@@ -32,7 +33,7 @@ export const CLIMB: Schema_Event = {
   endDate: "2022-03-01T19:00:00-06:00",
 };
 export const EUROPE_TRIP: Schema_Event = {
-  _id: "6262d2840138892cb743444a",
+  _id: new ObjectId().toString(),
   user: USER,
   origin: Origin.COMPASS,
   title: "Europe Trip",
@@ -44,7 +45,7 @@ export const EUROPE_TRIP: Schema_Event = {
   order: 2,
 };
 export const LEARN_CHINESE: Schema_Event = {
-  _id: "awk92akknm",
+  _id: new ObjectId().toString(),
   description: "",
   isSomeday: true,
   origin: Origin.COMPASS,
@@ -56,7 +57,7 @@ export const LEARN_CHINESE: Schema_Event = {
   order: 1,
 };
 export const MARCH_1: Schema_Event = {
-  _id: "62322b127837957382660212",
+  _id: new ObjectId().toString(),
   gEventId: "2ip0l4k0kqhg22cagtmrlml5mn",
   user: USER,
   origin: Origin.GOOGLE_IMPORT,
@@ -68,7 +69,7 @@ export const MARCH_1: Schema_Event = {
   endDate: "2022-03-02",
 };
 export const GROCERIES: Schema_Event = {
-  _id: "620c177bfadfdec705cdd70a",
+  _id: new ObjectId().toString(),
   gEventId: "pihjll1k75s1g9019ru6tkb97c",
   user: USER,
   origin: Origin.GOOGLE_IMPORT,
@@ -80,7 +81,7 @@ export const GROCERIES: Schema_Event = {
   endDate: "2022-02-21T12:45:00-06:00",
 };
 export const MULTI_WEEK: Schema_Event = {
-  _id: "62322b12783795738266022e",
+  _id: new ObjectId().toString(),
   gEventId: "1k2rgneltn79cbchccut08alqs",
   user: USER,
   origin: Origin.GOOGLE_IMPORT,
@@ -93,7 +94,7 @@ export const MULTI_WEEK: Schema_Event = {
   endDate: "2022-09-22T00:00:00-06:00",
 };
 export const TY_TIM: Schema_Event = {
-  _id: "62322b127837957382660231",
+  _id: new ObjectId().toString(),
   gEventId: "726v6dgnasekgmv5hc1jifpumm",
   user: USER,
   origin: Origin.GOOGLE_IMPORT,

packages/core/src/__tests__/core.test.start.ts

@@ -0,0 +1,3 @@
+import { mockBSON } from "@core/__tests__/mock.setup";
+
+mockBSON();

packages/core/src/__tests__/mock.setup.ts

@@ -0,0 +1,25 @@
+import { faker as mockFaker } from "@faker-js/faker";
+
+export const mockBSON = () => {
+  jest.mock("bson", () => ({
+    ObjectId: class ObjectId {
+      #value: string;
+
+      constructor(value?: string) {
+        if (value && !ObjectId.isValid(value)) {
+          throw new Error("Invalid ObjectId");
+        }
+
+        this.#value = value ?? mockFaker.database.mongodbObjectId();
+      }
+
+      toString() {
+        return this.#value;
+      }
+
+      static isValid(value?: string) {
+        return /^[a-fA-F0-9]{24}$/.test(value ?? "");
+      }
+    },
+  }));
+};

packages/core/src/types/event.types.ts

@@ -1,4 +1,4 @@
-import type { ObjectId } from "bson";
+import { ObjectId } from "bson";
 import type { Query } from "express-serve-static-core";
 import { z } from "zod";
 import {
@@ -150,13 +150,17 @@ export enum CompassEventStatus {
   CANCELLED = "CANCELLED",
 }
 
+export const idSchema = z.string().refine(ObjectId.isValid, {
+  message: "Invalid id",
+});
+
 export const eventDateSchema = z.union([
   z.string().datetime({ offset: true }),
   z.string().date(),
 ]);
 
 export const CoreEventSchema = z.object({
-  _id: z.string().optional(),
+  _id: idSchema.optional(),
   description: z.string().nullable().optional(),
   endDate: eventDateSchema,
   isAllDay: z.boolean().optional(),
@@ -195,14 +199,18 @@ export const EventUpdateSchema = z.object({
 export const CompassCoreEventSchema = CoreEventSchema.omit({
   recurrence: true,
 }).extend({
-  _id: z.string(),
+  _id: idSchema,
   recurrence: CompassEventRecurrence.omit({ rule: true })
     .extend({
       rule: z.union([z.null(), z.array(z.string())]),
     })
     .optional(),
 });
 
+export const CompassCoreCalendarEventSchema = CompassCoreEventSchema.extend({
+  isSomeday: z.literal(false),
+});
+
 const BaseCompassEventSchema = z.object({
   status: z
     .nativeEnum(CompassEventStatus)

packages/web/package.json

@@ -44,7 +44,6 @@
     "redux": "^4.1.1",
     "redux-saga": "^1.1.3",
     "regenerator-runtime": "^0.14.1",
-    "reselect": "^4.0.0",
     "sass-loader": "^13.2.0",
     "socket.io-client": "^4.7.5",
     "style-loader": "^3.2.1",
@@ -81,6 +80,7 @@
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-testing-library": "^5.0.5",
+    "@faker-js/faker": "^9.6.0",
     "jest": "^29.0.3",
     "jest-environment-jsdom": "^29.7.0",
     "jest-styled-components": "^7.0.5",

packages/web/src/__tests__/Calendar/calendar.interactions.test.tsx

@@ -10,7 +10,7 @@ import { CalendarView } from "@web/views/Calendar";
 
 it("displays alert upon server error", async () => {
   server.use(
-    rest.get(`${ENV_WEB.API_BASEURL}/event`, (req, res, ctx) => {
+    rest.get(`${ENV_WEB.API_BASEURL}/event`, (_req, res, ctx) => {
       return res(
         ctx.status(500),
         ctx.json({

packages/web/src/__tests__/__mocks__/server/mock.handlers.ts

@@ -1,3 +1,4 @@
+import { ObjectId } from "bson";
 import { rest } from "msw";
 import {
   CLIMB,
@@ -17,7 +18,7 @@ export const globalHandlers = [
       return res(
         ctx.json([
           {
-            _id: "somedayFoo",
+            _id: new ObjectId().toString(),
             description: "somesomesome",
             isSomeday: true,
             origin: "compass",

packages/web/src/__tests__/utils/test.util.ts

@@ -34,17 +34,3 @@ export const mockResizeObserver = () => {
 export const mockScroll = () => {
   window.HTMLElement.prototype.scroll = jest.fn();
 };
-
-export const mockBSON = () => {
-  jest.mock("bson", () => ({
-    ObjectId: class ObjectId {
-      toString() {
-        return crypto.randomUUID();
-      }
-
-      static isValid(value?: string) {
-        return value?.length === 36;
-      }
-    },
-  }));
-};

packages/web/src/__tests__/web.test.init.js

@@ -1,2 +1,6 @@
+import { mockBSON } from "@core/__tests__/mock.setup";
+
 process.env.API_BASEURL = "http://localhost:3000/api";
 process.env.GOOGLE_CLIENT_ID = "mockedClientId";
+
+mockBSON();