Refactor and dedupe schema

sgcarstrends · Dec 25, 2024 · d02cc21 · d02cc21
1 parent 43b798d
commit d02cc21
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 72 deletions.
diff --git a/packages/api/src/lib/getCarsByFuelType.ts b/packages/api/src/lib/getCarsByFuelType.ts
@@ -1,9 +1,9 @@
 import db from "@/config/db";
 import { getLatestMonth } from "@/lib/getLatestMonth";
-import { cars } from "@/schema";
 import type { FuelType } from "@/types";
 import getTrailingTwelveMonths from "@/utils/getTrailingTwelveMonths";
 import { and, asc, between, desc, eq, ilike, or } from "drizzle-orm";
+import { cars } from "../../../schema";
 
 const HYBRID_TYPES = [
   "Diesel-Electric",

diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts
diff --git a/packages/api/src/v1/routes/cars.ts b/packages/api/src/v1/routes/cars.ts
@@ -4,13 +4,13 @@ import redis from "@/config/redis";
 import { getLatestMonth } from "@/lib/getLatestMonth";
 import { getUniqueMonths } from "@/lib/getUniqueMonths";
 import { groupMonthsByYear } from "@/lib/groupMonthsByYear";
-import { cars } from "@/schema";
 import { CarQuerySchema, MonthsQuerySchema } from "@/schemas";
 import type { Make } from "@/types";
 import getTrailingTwelveMonths from "@/utils/getTrailingTwelveMonths";
 import { zValidator } from "@hono/zod-validator";
 import { and, asc, between, desc, eq, ilike } from "drizzle-orm";
 import { Hono } from "hono";
+import { cars } from "../../../../schema";
 
 const app = new Hono();
 

diff --git a/packages/api/src/v1/routes/coe.ts b/packages/api/src/v1/routes/coe.ts
@@ -4,11 +4,11 @@ import redis from "@/config/redis";
 import { getLatestMonth } from "@/lib/getLatestMonth";
 import { getUniqueMonths } from "@/lib/getUniqueMonths";
 import { groupMonthsByYear } from "@/lib/groupMonthsByYear";
-import { coe } from "@/schema";
 import { type COE, COEQuerySchema, MonthsQuerySchema } from "@/schemas";
 import { zValidator } from "@hono/zod-validator";
 import { and, asc, desc, eq, gte, lte } from "drizzle-orm";
 import { Hono } from "hono";
+import { coe } from "../../../schema";
 
 const app = new Hono();
 

diff --git a/packages/api/src/v1/routes/makes.ts b/packages/api/src/v1/routes/makes.ts
@@ -1,11 +1,11 @@
 import { CACHE_TTL } from "@/config";
 import db from "@/config/db";
 import redis from "@/config/redis";
-import { cars } from "@/schema";
 import { MakeParamSchema, MakeQuerySchema } from "@/schemas";
 import { zValidator } from "@hono/zod-validator";
 import { and, asc, desc, eq, ilike } from "drizzle-orm";
 import { Hono } from "hono";
+import { cars } from "../../../../schema";
 
 const app = new Hono();
 

diff --git a/packages/api/src/v1/routes/months.ts b/packages/api/src/v1/routes/months.ts
@@ -1,8 +1,8 @@
 import { getLatestMonth } from "@/lib/getLatestMonth";
-import { cars, coe } from "@/schema";
 import { LatestMonthQuerySchema } from "@/schemas";
 import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
+import { cars, coe } from "../../../../schema";
 
 const app = new Hono();
 

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,15 +1,16 @@
 {
-	"name": "@sgcarstrends/schema",
-	"version": "1.0.0-beta.1",
-	"description": "",
-	"private": true,
-	"dependencies": {
-		"dotenv": "^16.4.7",
-		"drizzle-orm": "^0.38.2"
-	},
-	"devDependencies": {
-		"@biomejs/biome": "1.9.4",
-		"@types/node": "^22.10.2",
-		"drizzle-kit": "^0.30.1"
-	}
+  "name": "@sgcarstrends/schema",
+  "version": "1.0.0-beta.1",
+  "description": "",
+  "main": "src/schema.ts",
+  "private": true,
+  "dependencies": {
+    "dotenv": "^16.4.7",
+    "drizzle-orm": "^0.38.2"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "1.9.4",
+    "@types/node": "^22.10.2",
+    "drizzle-kit": "^0.30.1"
+  }
 }