Clean up database stuff

Author: cte

.env.development

@@ -0,0 +1 @@
+DATABASE_URL=postgres://postgres:password@localhost:5432/roo_code_development

.env.test

@@ -0,0 +1 @@
+DATABASE_URL=postgres://postgres:password@localhost:5432/roo_code_test

.husky/pre-commit

@@ -1,3 +1 @@
-#!/bin/sh
-# Disable concurent to run `check-types` after ESLint in lint-staged
-cd "$(dirname "$0")/.." && npx --no lint-staged --concurrent false
+pnpx lint-staged

README.md

@@ -28,6 +28,12 @@ You can now install the required packages with:
 pnpm install
 ```
 
+Make sure your database is migrated:
+
+```sh
+pnpm db:migrate
+```
+
 If everything is working as expected you should be able to run any of the following without errors:
 
 ```sh

drizzle.config.ts

@@ -2,11 +2,9 @@ import { defineConfig } from 'drizzle-kit';
 
 export default defineConfig({
   out: './migrations',
-  schema: './src/models/Schema.ts',
+  schema: './src/db/schema.ts',
   dialect: 'postgresql',
-  dbCredentials: {
-    url: process.env.DATABASE_URL ?? '',
-  },
+  dbCredentials: { url: process.env.DATABASE_URL! },
   verbose: true,
   strict: true,
 });

migrations/0000_init-db.sql

@@ -0,0 +1,12 @@
+CREATE TABLE "organization" (
+	"id" text PRIMARY KEY NOT NULL,
+	"stripe_customer_id" text,
+	"stripe_subscription_id" text,
+	"stripe_subscription_price_id" text,
+	"stripe_subscription_status" text,
+	"stripe_subscription_current_period_end" bigint,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX "stripe_customer_id_idx" ON "organization" USING btree ("stripe_customer_id");

migrations/0000_misty_leo.sql

@@ -1,5 +1,5 @@
 {
-  "id": "400db9e7-780a-44b8-b0be-2db504f59104",
+  "id": "013accf9-070a-47cd-9b49-1318a1c8a237",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -78,60 +78,18 @@
       },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "public.todo": {
-      "name": "todo",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "serial",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "owner_id": {
-          "name": "owner_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "message": {
-          "name": "message",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
     }
   },
   "enums": {},
   "schemas": {},
   "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
   "_meta": {
     "columns": {},
     "schemas": {},

migrations/meta/0000_snapshot.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1726784321202,
-      "tag": "0000_init-db",
+      "when": 1747031111132,
+      "tag": "0000_misty_leo",
       "breakpoints": true
     }
   ]

migrations/meta/_journal.json

@@ -13,9 +13,9 @@
     "start": "next start",
     "build-stats": "cross-env ANALYZE=true pnpm run build",
     "clean": "rimraf .next out coverage",
-    "db:generate": "drizzle-kit generate",
-    "db:migrate": "dotenv -c production -- drizzle-kit migrate",
-    "db:studio": "dotenv -c production -- drizzle-kit studio",
+    "db:generate": "dotenvx run -f .env.development -- drizzle-kit generate",
+    "db:migrate": "dotenvx run -f .env.development -- drizzle-kit migrate",
+    "db:studio": "dotenvx run -f .env.development -- drizzle-kit studio",
     "storybook": "storybook dev -p 6006",
     "storybook:build": "storybook build",
     "storybook:serve": "http-server storybook-static --port 6006 --silent",
@@ -27,7 +27,6 @@
     "@clerk/localizations": "^3.14.2",
     "@clerk/nextjs": "^6.18.3",
     "@clerk/themes": "^2.1.36",
-    "@electric-sql/pglite": "^0.3.0",
     "@logtail/pino": "^0.5.2",
     "@radix-ui/react-dropdown-menu": "^2.1.14",
     "@radix-ui/react-icons": "^1.3.2",
@@ -57,6 +56,7 @@
   },
   "devDependencies": {
     "@clerk/testing": "^1.3.11",
+    "@dotenvx/dotenvx": "^1.43.0",
     "@eslint/js": "^9.26.0",
     "@next/bundle-analyzer": "^15.3.2",
     "@next/eslint-plugin-next": "^15.3.2",
@@ -83,7 +83,6 @@
     "@vitest/expect": "^3.1.3",
     "autoprefixer": "^10.4.20",
     "cross-env": "^7.0.3",
-    "dotenv-cli": "^8.0.0",
     "drizzle-kit": "^0.31.1",
     "eslint": "^9.26.0",
     "eslint-config-prettier": "^10.1.5",