Merge branch 'fix-prepare-deploy-server' into render-on-yaml

Author: aster-void

.cspell.json

@@ -2,19 +2,20 @@
   "version": "0.2",
   "language": "en",
   "words": [
-    "supabase",
-    "direnv",
+    "autoincrement",
     "bunx",
-    "qiita",
     "coursemate",
-    "safify",
-    "notistack",
-    "autoincrement",
     "datasource",
+    "direnv",
+    "ECCS",
+    "isready",
     "lockb",
+    "notistack",
     "psql",
-    "isready",
-    "ECCS"
+    "qiita",
+    "safify",
+    "supabase",
+    "swiper"
   ],
   "dictionaries": [
     "softwareTerms",
@@ -37,6 +38,7 @@
     "**/package.json",
     "**/bun.lockb",
     "**/*.svg",
-    "**/migration.sql"
+    "**/migration.sql",
+    "**/data.json"
   ]
 }

.github/workflows/keep-alive.yml

@@ -2,7 +2,7 @@ name: Keep Alive
 
 on:
   schedule:
-    - cron: "*/5 * * * *"
+    - cron: "*/2 * * * *"
   workflow_dispatch:
 
 env:

Makefile

@@ -45,10 +45,9 @@ test: dev-db
 
 prepare-deploy-web: copy-common
 	cd web; bun install; bun run build
-prepare-deploy-server: copy-common
-	cd server; bun install; npx prisma generate;
+prepare-deploy-server: copy-common sync-server generate-sql
 deploy-server:
-	cd server; bun src/index.ts
+	cd server; bun src/main.ts
 
 docker: copy-common
 	@# deferring `docker compose down`. https://qiita.com/KEINOS/items/532dc395fe0f89c2b574
@@ -95,16 +94,16 @@ spell-check:
 # Sync (install/update packages, generate prisma, etc)
 
 sync-web:
-	cd web; bun install
+	cd web; bun install --frozen-lockfile
 	# copy .env.sample -> .env only if .env is not there
 
 sync-server:
-	cd server; bun install
+	cd server; bun install --frozen-lockfile
 	cd server; bunx prisma generate
 	# copy .env.sample -> .env only if .env is not there
 
 sync-root:
-	bun install
+	bun install --frozen-lockfile
 
 
 # Static checks

biome.json

@@ -10,6 +10,6 @@
     "useIgnoreFile": true
   },
   "files": {
-    "ignore": ["bun.lockb", "server/target"]
+    "ignore": ["bun.lockb", "server/target", "data.json"]
   }
 }

common/zod/schemas.ts

@@ -102,7 +102,8 @@ export const ShareRoomIDSchema = z.number();
 
 export const ContentSchema = z
   .string()
-  .min(1, { message: "Content must not be empty." });
+  .min(1, { message: "Content must not be empty." })
+  .max(255, { message: "Content is too big" });
 
 export const MessageSchema = z.object({
   id: MessageIDSchema,

server/prisma/schema.prisma

@@ -75,7 +75,7 @@ model Slot {
 
 model Enrollment {
   id       Int    @id @default(autoincrement())
-  user     User   @relation(fields: [userId], references: [id])
+  user     User   @relation(fields: [userId], references: [id], onDelete: Cascade)
   userId   Int
   course   Course @relation(fields: [courseId], references: [id])
   courseId String

server/src/.gitignore

@@ -1 +1,2 @@
 /common
+/seeds/data.json