Merge branch 'main' into change-seed

Author: aster-void

.github/workflows/rust.yml

@@ -22,8 +22,9 @@ jobs:
             ~/.rustup/
             scraper/target
           key: cargo-cache-${{ github.job }}-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
+          toolchain: 1.82.0
           components: clippy,rustfmt
       - run: cargo build
       - run: cargo build --release

Makefile

@@ -16,14 +16,17 @@ setup-ci:
 	make generate-sql
 
 sync: sync-server sync-web sync-root sync-common
-	bunx lefthook install || true
 	@echo '----------------------------------------------------------------------------------------------------------'
 	@echo '| Most work is done. now running prisma-generate-sql (which might fail if .env.dev is not set configured)|'
 	@echo '----------------------------------------------------------------------------------------------------------'
 	make generate-sql || true
 
 generate-sql:
-	@cd server; bun run prisma-generate-sql
+	@cd server; \
+		if command -v dotenv && command -v prisma; \
+		then dotenv -e .env.dev -- prisma generate --sql; \
+		else bunx dotenv -e .env.dev -- bunx prisma generate --sql; \
+		fi
 
 start: start-all # build -> serve
 build: build-server build-web
@@ -44,6 +47,9 @@ test: dev-db
 
 prepare-deploy-web: sync-common
 	cd web; bun install; bun run build
+deploy-web:
+	@if [ "${PORT}" == "" ]; then echo 'env PORT not found!'; exit 1; fi
+	cd web; bun next start --port ${PORT}
 prepare-deploy-server: sync-common sync-server generate-sql
 deploy-server:
 	cd server; bun src/main.ts
@@ -56,7 +62,7 @@ docker-watch:
 	docker compose up --build --watch
 
 seed:
-	cd server; bunx prisma db seed
+	cd server; if command -v prisma; then prisma db seed; else bunx prisma db seed; fi
 
 ## server/.envをDATABASE_URL=postgres://user:password@localhost:5432/databaseにしてから行う
 dev-db: export DATABASE_URL=$(LOCAL_DB)
@@ -70,14 +76,16 @@ dev-db:
 	  -e POSTGRES_DB=database \
 	  postgres:alpine
 	@echo "Waiting for PostgreSQL to be ready..."
-	@sleep 5 # PostgreSQLが起動するまでの待機（必要に応じて調整）
+	@sleep 2 # PostgreSQLが起動するまでの待機（必要に応じて調整）
 	@until docker exec postgres pg_isready -U user -d database; do \
 		echo "Waiting for PostgreSQL to be ready..."; \
 		sleep 1; \
 	done
 	@echo "PostgreSQL is ready. Running seed..."
-	@cd server; bunx prisma generate; bunx prisma db push; cd ..
-	@make seed;
+	@cd server; if command -v prisma; then \
+		prisma generate; prisma db push; else \
+		bunx prisma generate; bunx prisma db push; fi
+	@make seed
 	@echo "Seeding completed."
 
 # Sync (install/update packages, generate prisma, etc)
@@ -88,7 +96,7 @@ sync-web:
 
 sync-server:
 	cd server; bun install --frozen-lockfile
-	cd server; bunx prisma generate
+	cd server; if command -v prisma; then prisma generate; else bunx prisma generate; fi
 	# copy .env.sample -> .env only if .env is not there
 
 sync-root:

bun.lockb

@@ -7,6 +7,7 @@ export type {
   Gender,
   RelationshipStatus,
   InterestSubject,
+  Interest,
   User,
   InitUser,
   UpdateUser,
@@ -17,6 +18,7 @@ export type {
   Course,
   Enrollment,
   Day,
+  UserWithCoursesAndSubjects,
   MessageID,
   ShareRoomID,
   Message,

common/types.ts

@@ -38,6 +38,11 @@ export const InterestSubjectSchema = z.object({
   group: z.string(),
 });
 
+export const InterestSchema = z.object({
+  userId: UserIDSchema,
+  subjectId: z.number(),
+});
+
 export const UserSchema = z.object({
   id: UserIDSchema,
   guid: GUIDSchema,
@@ -103,6 +108,11 @@ export const EnrollmentSchema = z.object({
   courseId: CourseIDSchema,
 });
 
+export const UserWithCoursesAndSubjectsSchema = UserSchema.extend({
+  courses: CourseSchema.array(),
+  interestSubjects: InterestSubjectSchema.array(),
+});
+
 export const MessageIDSchema = z.number(); // TODO! Add __internal_prevent_cast_MessageID: PhantomData
 export const ShareRoomIDSchema = z.number();
 
@@ -116,6 +126,7 @@ export const MessageSchema = z.object({
   creator: UserIDSchema,
   createdAt: z.date(),
   content: ContentSchema,
+  isPicture: z.boolean(),
   edited: z.boolean(),
 });
 
@@ -136,6 +147,7 @@ export const DMOverviewSchema = z.object({
   name: NameSchema,
   thumbnail: z.string(),
   lastMsg: MessageSchema.optional(),
+  unreadMessages: z.number(),
 });
 
 export const SharedRoomOverviewSchema = z.object({
@@ -161,6 +173,8 @@ export const PersonalizedDMRoomSchema = z.object({
   name: NameSchema,
   thumbnail: z.string(),
   matchingStatus: MatchingStatusSchema,
+  unreadMessages: z.number(),
+  friendId: z.number(),
 });
 
 export const SharedRoomSchema = z.object({

common/zod/schemas.ts

@@ -14,6 +14,7 @@ import type {
   InitRoomSchema,
   InitSharedRoomSchema,
   InitUserSchema,
+  InterestSchema,
   InterestSubjectSchema,
   IntroLongSchema,
   IntroShortSchema,
@@ -37,6 +38,7 @@ import type {
   UpdateUserSchema,
   UserIDSchema,
   UserSchema,
+  UserWithCoursesAndSubjectsSchema,
 } from "./schemas";
 
 export type UserID = z.infer<typeof UserIDSchema>;
@@ -47,6 +49,7 @@ export type PictureUrl = z.infer<typeof PictureUrlSchema>;
 export type Gender = z.infer<typeof GenderSchema>;
 export type RelationshipStatus = z.infer<typeof RelationshipStatusSchema>;
 export type InterestSubject = z.infer<typeof InterestSubjectSchema>;
+export type Interest = z.infer<typeof InterestSchema>;
 export type User = z.infer<typeof UserSchema>;
 export type InitUser = z.infer<typeof InitUserSchema>;
 export type UpdateUser = z.infer<typeof UpdateUserSchema>;
@@ -59,6 +62,9 @@ export type Course = z.infer<typeof CourseSchema>;
 export type Enrollment = z.infer<typeof EnrollmentSchema>;
 export type Day = z.infer<typeof DaySchema>;
 export type Period = z.infer<typeof PeriodSchema>;
+export type UserWithCoursesAndSubjects = z.infer<
+  typeof UserWithCoursesAndSubjectsSchema
+>;
 export type MessageID = z.infer<typeof MessageIDSchema>;
 export type ShareRoomID = z.infer<typeof ShareRoomIDSchema>;
 export type Message = z.infer<typeof MessageSchema>;

common/zod/types.ts

@@ -27,6 +27,9 @@
             biome
             pkg-config
             openssl
+            lefthook
+            pkgs.prisma
+            dotenv-cli
           ] ++ [
             rust-pkgs
           ];

flake.nix

@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "prepare": "lefthook install"
   },
   "keywords": [],
   "author": "",

package.json

@@ -7,8 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "bun --watch src/main.ts",
     "build": "tsc",
-    "serve": "bun target/main.js",
-    "prisma-generate-sql": "bunx dotenv -e .env.dev -- prisma generate --sql"
+    "serve": "bun target/main.js"
   },
   "prisma": {
     "seed": "bun src/seeds/seed-test.ts"
@@ -36,5 +35,6 @@
     "globals": "^15.8.0",
     "prisma": "^5.11.0",
     "typescript": "^5.4.5"
-  }
+  },
+  "trustedPackages": ["prisma"]
 }

server/package.json

@@ -42,19 +42,24 @@ model User {
   interests      Interest[]
 }
 
-// プロフィールの画像。
 model Avatar {
   guid String @id
   data Bytes
 }
 
+model Picture {
+  hash     String @id
+  data     Bytes
+  key      String // password
+}
+
 model InterestSubject {
   id       Int        @id @default(autoincrement())
   name     String
   group    String // such as Computer Science | name = ML
+  Interest Interest[] // ignore this
 
   @@unique([name, group])
-  Interest Interest[] // ignore this
 }
 
 // User->Interest->InterestSubject
@@ -122,8 +127,6 @@ enum MatchingStatus {
   REJECTED
 }
 
-// TODO: lazy load MessageLog s.t. it doesn't need to be loaded on Overview query.
-// https://www.prisma.io/docs/orm/prisma-client/queries/select-fields
 model SharedRoom {
   id        Int       @id @default(autoincrement())
   thumbnail String // URL to thumbnail picture
@@ -134,10 +137,12 @@ model SharedRoom {
 
 model Message {
   id           Int           @id @default(autoincrement())
-  creator      Int // refers to UserId
+  creator      Int           // refers to UserId
   createdAt    DateTime      @default(now()) // @readonly
   edited       Boolean       @default(false)
   content      String
+  isPicture    Boolean       // iff the message is a picture. if true, then content is a url of picture.
+  read         Boolean       @default(false)
   relation     Relationship? @relation(fields: [relationId], references: [id], onDelete: Cascade)
   relationId   Int?
   sharedRoom   SharedRoom?   @relation(fields: [sharedRoomId], references: [id], onDelete: Cascade)