From 79982dcba993063d833bf0424181f0e7d7704789 Mon Sep 17 00:00:00 2001 From: Bryan Silva Date: Thu, 23 May 2024 18:07:12 -0700 Subject: [PATCH] Fixed getSchedule file organization --- package.json | 2 +- packages/api/src/schedules/index.ts | 6 +++--- packages/api/src/schedules/procedures/getSchedule.ts | 2 +- packages/api/src/schedules/{ => services}/getWeekInfo.ts | 4 ++-- packages/api/src/schedules/{ => services}/schedule.test.ts | 0 packages/api/src/schedules/{ => services}/schedule.ts | 0 packages/api/src/schedules/{ => services}/updateDaily.ts | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) rename packages/api/src/schedules/{ => services}/getWeekInfo.ts (93%) rename packages/api/src/schedules/{ => services}/schedule.test.ts (100%) rename packages/api/src/schedules/{ => services}/schedule.ts (100%) rename packages/api/src/schedules/{ => services}/updateDaily.ts (89%) diff --git a/package.json b/package.json index 3d49ec37..4d1a9034 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build": "turbo build", "clean": "git clean -xdf node_modules", "clean:workspaces": "turbo clean", - "db:push": "pnpm -F db push", + "db:push": "pnpm -F db db:push", "db:studio": "pnpm --filter db run db:studio", "db:dump": "pg_dump -h icssc.cf3yrjegcna8.us-east-1.rds.amazonaws.com -U zotmeal_prod -W -O -x zotmeal > ./docker/db/zotmeal.sql", "dev": "turbo dev --parallel --concurrency=13", diff --git a/packages/api/src/schedules/index.ts b/packages/api/src/schedules/index.ts index e9041696..5b708d11 100644 --- a/packages/api/src/schedules/index.ts +++ b/packages/api/src/schedules/index.ts @@ -1,3 +1,3 @@ -export * from "./getWeekInfo"; -export * from "./schedule"; -export * from "./updateDaily"; +export * from "./services/getWeekInfo"; +export * from "./services/schedule"; +export * from "./services/updateDaily"; diff --git a/packages/api/src/schedules/procedures/getSchedule.ts b/packages/api/src/schedules/procedures/getSchedule.ts index ac1bf464..97a5e97f 100644 --- a/packages/api/src/schedules/procedures/getSchedule.ts +++ b/packages/api/src/schedules/procedures/getSchedule.ts @@ -1,7 +1,7 @@ import { TRPCError } from "@trpc/server"; import { publicProcedure } from "../../trpc"; -import { getSchedule, GetScheduleSchema } from "../schedule"; +import { getSchedule, GetScheduleSchema } from "../services/schedule"; // import { getSchedule, GetScheduleSchema } from diff --git a/packages/api/src/schedules/getWeekInfo.ts b/packages/api/src/schedules/services/getWeekInfo.ts similarity index 93% rename from packages/api/src/schedules/getWeekInfo.ts rename to packages/api/src/schedules/services/getWeekInfo.ts index ecfd0209..e1b16564 100644 --- a/packages/api/src/schedules/getWeekInfo.ts +++ b/packages/api/src/schedules/services/getWeekInfo.ts @@ -4,10 +4,10 @@ import { z } from "zod"; import type { Drizzle } from "@zotmeal/db"; import { RestaurantSchema } from "@zotmeal/db"; import { DateRegex } from "@zotmeal/validators"; -import { scrapeCampusDishEvents } from "../events"; +import { scrapeCampusDishEvents } from "../../events"; import type { UpdateDailyParams } from "./updateDaily"; -import { logger } from "../../logger"; +import { logger } from "../../../logger"; import { updateDaily } from "./updateDaily"; export const GetWeekInfoSchema = z.object({ diff --git a/packages/api/src/schedules/schedule.test.ts b/packages/api/src/schedules/services/schedule.test.ts similarity index 100% rename from packages/api/src/schedules/schedule.test.ts rename to packages/api/src/schedules/services/schedule.test.ts diff --git a/packages/api/src/schedules/schedule.ts b/packages/api/src/schedules/services/schedule.ts similarity index 100% rename from packages/api/src/schedules/schedule.ts rename to packages/api/src/schedules/services/schedule.ts diff --git a/packages/api/src/schedules/updateDaily.ts b/packages/api/src/schedules/services/updateDaily.ts similarity index 89% rename from packages/api/src/schedules/updateDaily.ts rename to packages/api/src/schedules/services/updateDaily.ts index c8a2ce2d..f400be1b 100644 --- a/packages/api/src/schedules/updateDaily.ts +++ b/packages/api/src/schedules/services/updateDaily.ts @@ -5,9 +5,9 @@ import { RestaurantSchema } from "@zotmeal/db"; import { periodNames } from "@zotmeal/utils"; import { DateRegex } from "@zotmeal/validators"; -import type { GetMenuParams } from "../menus"; -import { logger } from "../../logger"; -import { getCampusDish, parseCampusDish } from "../menus"; +import type { GetMenuParams } from "../../menus"; +import { logger } from "../../../logger"; +import { getCampusDish, parseCampusDish } from "../../menus"; export const UpdateDailySchema = z.object({ date: DateRegex,