♻️ Refactor: Move mock utils to @core (#368)

Author: tyler-dane

packages/backend/src/__tests__/helpers/mock.events.init.ts

@@ -7,8 +7,8 @@ import {
   gSchema$EventBase,
   gSchema$EventInstance,
 } from "@core/types/gcal";
+import { isBase } from "@core/util/event/event.util";
 import { Collections } from "@backend/common/constants/collections";
-import { isBase } from "@backend/event/util/event.util";
 import { mockGcalEvents } from "../mocks.gcal/mocks.gcal/factories/gcal.event.factory";
 
 export interface State_AfterGcalImport {

…_tests__/mocks.ccal/ccal.mock.db.util.ts …/__tests__/mocks.db/ccal.mock.db.util.tspackages/backend/src/__tests__/mocks.ccal/ccal.mock.db.util.ts renamed to packages/backend/src/__tests__/mocks.db/ccal.mock.db.util.ts packages/backend/src/__tests__/mocks.ccal/ccal.mock.db.util.ts renamed to packages/backend/src/__tests__/mocks.db/ccal.mock.db.util.ts

@@ -1,13 +1,16 @@
 import { ObjectId } from "mongodb";
 import { faker } from "@faker-js/faker/.";
+import {
+  createMockBaseEvent,
+  createMockInstance,
+} from "@core/__mocks__/mocks.ccal/ccal.event.factory";
 import {
   Schema_Event,
   Schema_Event_Recur_Base,
   Schema_Event_Recur_Instance,
 } from "@core/types/event.types";
 import { Collections } from "@backend/common/constants/collections";
 import { TestSetup } from "../helpers/mock.db.setup";
-import { createMockBaseEvent, createMockInstance } from "./ccal.event.factory";
 
 export const createRecurrenceSeries = async (
   setup: TestSetup,

packages/backend/src/event/services/event.delete.test.ts

@@ -4,7 +4,7 @@ import { Schema_Event } from "@core/types/event.types";
 import {
   mockSomedayRecurrences,
   newsletterId,
-} from "../../../../core/src/__mocks__/events/events.someday.recur";
+} from "../../../../core/src/__mocks__/v1/events/events.someday.recur";
 import { YEAR_MONTH_DAY_FORMAT } from "../../../../core/src/constants/date.constants";
 import { getDeleteByIdFilter } from "./event.service.util";
 

packages/backend/src/event/services/event.find.allday.test.ts

@@ -1,6 +1,6 @@
 import { Collection, Db, Filter, MongoClient } from "mongodb";
 import { Schema_Event } from "@core/types/event.types";
-import { mockEventSetMar22 } from "../../../../core/src/__mocks__/events/events.22mar";
+import { mockEventSetMar22 } from "../../../../core/src/__mocks__/v1/events/events.22mar";
 import { getReadAllFilter } from "./event.service.util";
 
 describe("Mar 6 - 12, 2022: All-Day Events", () => {

packages/backend/src/event/services/event.find.test.ts

@@ -1,13 +1,13 @@
 import { Collection, Db, MongoClient } from "mongodb";
 import { MapEvent } from "@core/mappers/map.event";
 import { Schema_Event } from "@core/types/event.types";
+import { isBase, isExistingInstance } from "@core/util/event/event.util";
 import {
   mockRecurringGcalBaseEvent,
   mockRecurringGcalInstances,
 } from "@backend/__tests__/mocks.gcal/factories/gcal.event.factory";
-import { mockEventSetJan22 } from "../../../../core/src/__mocks__/events/events.22jan";
-import { mockEventSetSomeday1 } from "../../../../core/src/__mocks__/events/events.someday.1";
-import { isBase, isExistingInstance } from "../util/event.util";
+import { mockEventSetJan22 } from "../../../../core/src/__mocks__/v1/events/events.22jan";
+import { mockEventSetSomeday1 } from "../../../../core/src/__mocks__/v1/events/events.someday.1";
 import { getReadAllFilter } from "./event.service.util";
 
 const gBase = mockRecurringGcalBaseEvent();

packages/backend/src/sync/services/import/all/import.all.util.test.ts

@@ -1,7 +1,9 @@
 import { ObjectId } from "mongodb";
+import {
+  createMockBaseEvent,
+  createMockInstance,
+} from "@core/__mocks__/mocks.ccal/ccal.event.factory";
 import { Event_Core } from "@core/types/event.types";
-import { createMockBaseEvent } from "@backend/__tests__/mocks.ccal/ccal.event.factory";
-import { createMockInstance } from "@backend/__tests__/mocks.ccal/ccal.event.factory";
 import { assignIds } from "./import.all.util";
 
 const getEventsWithoutIds = () => {

packages/backend/src/sync/services/import/sync.import.series.test.ts

@@ -1,3 +1,7 @@
+import {
+  filterBaseEvents,
+  filterExistingInstances,
+} from "@core/util/event/event.util";
 import {
   cleanupCollections,
   cleanupTestMongo,
@@ -6,10 +10,6 @@ import {
 import { mockRecurringGcalBaseEvent } from "@backend/__tests__/mocks.gcal/factories/gcal.event.factory";
 import { mockGcalEvents } from "@backend/__tests__/mocks.gcal/factories/gcal.event.factory.set";
 import mongoService from "@backend/common/services/mongo.service";
-import {
-  filterBaseEvents,
-  filterExistingInstances,
-} from "@backend/event/util/event.util";
 import { createSyncImport } from "./sync.import";
 
 // Mock Gcal Instances API response

packages/backend/src/sync/services/import/sync.import.ts

@@ -12,6 +12,7 @@ import {
 } from "@core/types/event.types";
 import { gCalendar, gSchema$Event, gSchema$EventBase } from "@core/types/gcal";
 import { Schema_Sync } from "@core/types/sync.types";
+import { categorizeRecurringEvents } from "@core/util/event/event.util";
 import { getGcalClient } from "@backend/auth/services/google.auth.service";
 import { Collections } from "@backend/common/constants/collections";
 import { ENV } from "@backend/common/constants/env.constants";
@@ -23,7 +24,6 @@ import {
 import { error } from "@backend/common/errors/handlers/error.handler";
 import gcalService from "@backend/common/services/gcal/gcal.service";
 import mongoService from "@backend/common/services/mongo.service";
-import { categorizeRecurringEvents } from "@backend/event/util/event.util";
 import {
   getSync,
   updateSync,

packages/backend/src/sync/services/import/sync.import.util.test.ts

@@ -1,5 +1,5 @@
 import dayjs from "dayjs";
-import { gcalEvents } from "../../../../../core/src/__mocks__/events/gcal/gcal.event";
+import { gcalEvents } from "../../../../../core/src/__mocks__/v1/events/gcal/gcal.event";
 import { cancelledEventsIds } from "../../../common/services/gcal/gcal.utils";
 import { syncExpired, syncExpiresSoon } from "../../util/sync.util";
 import { organizeGcalEventsByType } from "./sync.import.util";

packages/backend/src/sync/services/sync/gcal.sync.processor.test.ts

@@ -5,6 +5,10 @@ import {
   Schema_Event_Recur_Base,
   Schema_Event_Recur_Instance,
 } from "@core/types/event.types";
+import {
+  categorizeEvents,
+  isExistingInstance,
+} from "@core/util/event/event.util";
 import {
   getEventsInDb,
   isEventCollectionEmpty,
@@ -16,7 +20,7 @@ import {
   setupTestDb,
 } from "@backend/__tests__/helpers/mock.db.setup";
 import { simulateDbAfterGcalImport } from "@backend/__tests__/helpers/mock.events.init";
-import { createRecurrenceSeries } from "@backend/__tests__/mocks.ccal/ccal.mock.db.util";
+import { createRecurrenceSeries } from "@backend/__tests__/mocks.db/ccal.mock.db.util";
 import {
   mockRecurringGcalBaseEvent,
   mockRegularGcalEvent,
@@ -26,10 +30,6 @@ import {
   mockGcalEvents,
 } from "@backend/__tests__/mocks.gcal/mocks.gcal/factories/gcal.event.factory";
 import { RecurringEventRepository } from "@backend/event/services/recur/repo/recur.event.repo";
-import {
-  categorizeEvents,
-  isExistingInstance,
-} from "@backend/event/util/event.util";
 import { Change_Gcal } from "@backend/sync/sync.types";
 import { GcalSyncProcessor } from "./gcal.sync.processor";
 import {