🐛 Fix: someday event validation errors (#597)

* fix(web): Someday event validation error due to incorrect prep function

old prep function used core event zod schema, which did not return `order` field, triggering a validation runtime error

implemented a new prep function specially for someday events that return expected someday event schema shape including the order field

* fix(web): update on convert to someday event validation to use validateSomedayEvent

fixes runtime error due to incorrect zod schema validation function

Author: that-one-arab

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

@@ -11,6 +11,7 @@ import { Categories_Event, Schema_Event } from "@core/types/event.types";
 import { validateEvent } from "@core/validators/event.validator";
 import { getUserId } from "@web/auth/auth.util";
 import { PartialMouseEvent } from "@web/common/types/util.types";
+import { validateSomedayEvent } from "@web/common/validators/someday.event.validator";
 import {
   DATA_EVENT_ELEMENT_ID,
   ID_OPTIMISTIC_PREFIX,
@@ -223,6 +224,20 @@ export const prepEvtBeforeSubmit = (
   return event;
 };
 
+export const prepSomedayEventBeforeSubmit = (
+  draft: Schema_Event | Schema_GridEvent,
+  userId: string,
+) => {
+  const _event = {
+    ...draft,
+    origin: Origin.COMPASS,
+    user: userId,
+  };
+
+  const event = validateSomedayEvent(_event);
+  return event;
+};
+
 export const replaceIdWithOptimisticId = (
   event: Schema_Event,
 ): Schema_OptimisticEvent => {

packages/web/src/views/Calendar/components/Draft/hooks/actions/useDraftActions.ts

@@ -6,7 +6,6 @@ import {
 } from "@core/constants/core.constants";
 import { YEAR_MONTH_DAY_FORMAT } from "@core/constants/date.constants";
 import { devAlert } from "@core/util/app.util";
-import { validateEvent } from "@core/validators/event.validator";
 import { getUserId } from "@web/auth/auth.util";
 import { PartialMouseEvent } from "@web/common/types/util.types";
 import { Schema_GridEvent } from "@web/common/types/web.event.types";
@@ -15,6 +14,7 @@ import {
   prepEvtBeforeSubmit,
 } from "@web/common/utils/event.util";
 import { getX } from "@web/common/utils/grid.util";
+import { validateSomedayEvent } from "@web/common/validators/someday.event.validator";
 import {
   selectDraft,
   selectDraftStatus,
@@ -151,7 +151,7 @@ export const useDraftActions = (
       endDate: end,
       order: somedayWeekCount,
     };
-    const event = validateEvent(_draft);
+    const event = validateSomedayEvent(_draft);
     dispatch(getWeekEventsSlice.actions.convert({ event }));
 
     discard();

packages/web/src/views/Calendar/components/Draft/sidebar/hooks/useSidebarActions.ts

@@ -20,7 +20,7 @@ import { isEventFormOpen, isSomedayEventFormOpen } from "@web/common/utils";
 import {
   assembleDefaultEvent,
   prepEvtAfterDraftDrop,
-  prepEvtBeforeSubmit,
+  prepSomedayEventBeforeSubmit,
 } from "@web/common/utils/event.util";
 import { getX } from "@web/common/utils/grid.util";
 import {
@@ -386,7 +386,7 @@ export const useSidebarActions = (
     }
 
     const userId = await getUserId();
-    _event = prepEvtBeforeSubmit(_event, userId);
+    _event = prepSomedayEventBeforeSubmit(_event, userId);
 
     const isExisting = _event._id;
     if (isExisting) {