🐛 fix(event-conversion): someday to grid event fix

Author: victor-enogwe

packages/web/src/common/utils/event.util.test.ts

@@ -1,4 +1,10 @@
-import { isEventInRange } from "./event.util";
+import { createMockStandaloneEvent } from "@core/util/test/ccal.event.factory";
+import {
+  Schema_GridEvent,
+  Schema_WebEvent,
+} from "@web/common/types/web.event.types";
+import { isEventInRange } from "@web/common/utils/event.util";
+import { _assembleGridEvent } from "@web/ducks/events/sagas/saga.util";
 
 describe("isEventInRange", () => {
   it("returns true if event is in range", () => {
@@ -9,6 +15,7 @@ describe("isEventInRange", () => {
     };
     expect(isEventInRange(event, dates)).toBe(true);
   });
+
   it("returns false if event is not in range", () => {
     const event = { start: "2022-03-15", end: "2022-03-15" };
     const dates = {
@@ -18,3 +25,31 @@ describe("isEventInRange", () => {
     expect(isEventInRange(event, dates)).toBe(false);
   });
 });
+
+describe("_assembleGridEvent", () => {
+  it("should successfully convert Someday event to Grid event by adding position field", () => {
+    // Create a mock Someday event (without position field)
+    const somedayEvent = createMockStandaloneEvent({
+      isSomeday: true,
+    }) as Schema_WebEvent;
+
+    const generator = _assembleGridEvent(somedayEvent);
+
+    // First, it calls getEventById
+    const getEventStep = generator.next();
+    expect(getEventStep.done).toBe(false);
+
+    // Mock returning the Someday event
+    const validateStep = generator.next({ ...somedayEvent, isSomeday: false });
+
+    // This should now succeed because the fix adds the required position field
+    expect(validateStep.done).toBe(true);
+    const result = validateStep.value as Schema_GridEvent;
+
+    // Verify that position field is now present
+    expect(result.position).toBeDefined();
+    expect(result.position.isOverlapping).toBe(false);
+    expect(result.position.widthMultiplier).toBe(1);
+    expect(result.position.horizontalOrder).toBe(1);
+  });
+});

packages/web/src/common/utils/event.util.ts

@@ -21,10 +21,10 @@ import {
   Schema_OptimisticEvent,
   Schema_WebEvent,
 } from "@web/common/types/web.event.types";
+import { validateGridEvent } from "@web/common/validators/grid.event.validator";
 import { validateSomedayEvent } from "@web/common/validators/someday.event.validator";
-import { validateGridEvent } from "../validators/grid.event.validator";
 
-const gridEventDefaultPosition = {
+export const gridEventDefaultPosition = {
   isOverlapping: false,
   widthMultiplier: 1,
   horizontalOrder: 1,
@@ -87,7 +87,7 @@ export const assembleDefaultEvent = async (
   }
 };
 
-export const assembleGridEvent = (event: Schema_Event): Schema_GridEvent => {
+export const assembleGridEvent = (event: Schema_WebEvent): Schema_GridEvent => {
   const gridEvent: Schema_GridEvent = {
     ...event,
     position: gridEventDefaultPosition,
@@ -97,7 +97,7 @@ export const assembleGridEvent = (event: Schema_Event): Schema_GridEvent => {
     origin: event.origin ?? Origin.COMPASS,
     priority: event.priority ?? Priorities.UNASSIGNED,
     user: event.user!,
-    recurrence: event.recurrence as Schema_Event_Recur_Base["recurrence"],
+    recurrence: event.recurrence,
   };
 
   return gridEvent;
@@ -203,13 +203,10 @@ export const prepEvtAfterDraftDrop = (
   return event;
 };
 
-export const prepEvtBeforeSubmit = (
-  draft: Schema_Event | Schema_GridEvent,
-  userId: string,
-) => {
-  const _event: Omit<Schema_Event | Schema_GridEvent, "recurrence"> = {
+export const prepEvtBeforeSubmit = (draft: Schema_WebEvent, userId: string) => {
+  const _event = {
     ...draft,
-    origin: Origin.COMPASS,
+    origin: draft.origin ?? Origin.COMPASS,
     user: userId,
   };
 

packages/web/src/ducks/events/sagas/saga.util.ts

@@ -1,13 +1,16 @@
 import dayjs from "dayjs";
 import { normalize, schema } from "normalizr";
-import { call, put, select } from "redux-saga/effects";
+import { SelectEffect, call, put, select } from "redux-saga/effects";
 import { ID_OPTIMISTIC_PREFIX } from "@core/constants/core.constants";
 import {
   Params_Events,
   RecurringEventUpdateScope,
   Schema_Event,
 } from "@core/types/event.types";
-import { Schema_GridEvent } from "@web/common/types/web.event.types";
+import {
+  Schema_GridEvent,
+  Schema_WebEvent,
+} from "@web/common/types/web.event.types";
 import {
   assembleGridEvent,
   replaceIdWithOptimisticId,
@@ -25,8 +28,8 @@ export function* getEventById(
   _id: string,
 ): Generator<
   ReturnType<typeof select>,
-  Schema_GridEvent | undefined,
-  Schema_GridEvent | undefined
+  Schema_GridEvent | Schema_WebEvent,
+  Schema_GridEvent | Schema_WebEvent
 > {
   const currEvent = yield select((state: RootState) =>
     selectEventById(state, _id),
@@ -39,7 +42,7 @@ export function* _editEvent(
   gridEvent: Schema_GridEvent,
   params: { applyTo?: RecurringEventUpdateScope } = {},
 ) {
-  yield call(EventApi.edit, gridEvent._id as string, gridEvent, params);
+  yield call(EventApi.edit, gridEvent._id, gridEvent, params);
 }
 
 export function* insertOptimisticEvent(
@@ -61,17 +64,22 @@ export function* insertOptimisticEvent(
 export function* _assembleGridEvent({
   _id,
   ...updatedFields
-}: Payload_ConvertEvent["event"]) {
+}: Payload_ConvertEvent["event"]): Generator<
+  SelectEffect,
+  Schema_GridEvent,
+  Schema_WebEvent
+> {
   const currEvent = yield* getEventById(_id);
 
   // First merge the current event with updated fields
-  const eventWithUpdates = { ...currEvent, ...updatedFields };
+  const eventWithUpdates = { ...currEvent, ...updatedFields, _id };
 
   // Use assembleGridEvent to ensure position field is properly set
   const gridEventWithDefaults = assembleGridEvent(eventWithUpdates);
 
   // Validate the result
   const gridEvent = validateGridEvent(gridEventWithDefaults);
+
   return gridEvent;
 }