migrate server

aster-void · aster-void · commit 47b91048c650 · 2024-11-17T10:59:17.000+09:00
diff --git a/server/src/database/chat.ts b/server/src/database/chat.ts
@@ -1,5 +1,5 @@
-import { Err, Ok, type Result } from "../common/lib/result";
-import type { UserID } from "../common/types";
+import { Err, Ok, type Result } from "common/lib/result";
+import type { UserID } from "common/types";
 import type {
   DMOverview,
   DMRoom,
@@ -11,7 +11,7 @@ import type {
   ShareRoomID,
   SharedRoom,
   SharedRoomOverview,
-} from "../common/types";
+} from "common/types";
 import { prisma } from "./client";
 import { getRelation } from "./matches";
 import { getMatchedUser } from "./requests";
diff --git a/server/src/database/courses.ts b/server/src/database/courses.ts
@@ -1,4 +1,4 @@
-import type { Course, Day, UserID } from "../common/types";
+import type { Course, Day, UserID } from "common/types";
 import { prisma } from "./client";
 
 export async function getCourseByCourseId(
diff --git a/server/src/database/enrollments.ts b/server/src/database/enrollments.ts
@@ -1,4 +1,4 @@
-import type { Course, CourseID, UserID } from "../common/types";
+import type { Course, CourseID, UserID } from "common/types";
 import { prisma } from "./client";
 import { getCoursesByUserId } from "./courses";
 
diff --git a/server/src/database/interest.ts b/server/src/database/interest.ts
@@ -1,4 +1,4 @@
-import type { InterestSubject, UserID } from "../common/types";
+import type { InterestSubject, UserID } from "common/types";
 import { prisma } from "./client";
 
 export async function all(): Promise<InterestSubject[]> {
diff --git a/server/src/database/matches.ts b/server/src/database/matches.ts
@@ -1,5 +1,5 @@
-import { Err, Ok, type Result } from "../common/lib/result";
-import type { Relationship, UserID } from "../common/types";
+import { Err, Ok, type Result } from "common/lib/result";
+import type { Relationship, UserID } from "common/types";
 import asyncMap from "../lib/async/map";
 import { prisma } from "./client";
 
diff --git a/server/src/database/picture.ts b/server/src/database/picture.ts
@@ -1,5 +1,5 @@
-import { Err, Ok, type Result } from "../common/lib/result";
-import type { GUID } from "../common/types";
+import { Err, Ok, type Result } from "common/lib/result";
+import type { GUID } from "common/types";
 import { prisma } from "./client";
 
 /**
diff --git a/server/src/database/requests.ts b/server/src/database/requests.ts
@@ -1,5 +1,5 @@
-import { Err, Ok, type Result } from "../common/lib/result";
-import type { Relationship, User, UserID } from "../common/types";
+import { Err, Ok, type Result } from "common/lib/result";
+import type { Relationship, User, UserID } from "common/types";
 import { prisma } from "./client";
 
 // マッチリクエストの送信
diff --git a/server/src/database/users.ts b/server/src/database/users.ts
@@ -1,5 +1,5 @@
-import { Err, Ok, type Result } from "../common/lib/result";
-import type { GUID, UpdateUser, User, UserID } from "../common/types";
+import { Err, Ok, type Result } from "common/lib/result";
+import type { GUID, UpdateUser, User, UserID } from "common/types";
 import { prisma } from "./client";
 
 // ユーザーの作成
diff --git a/server/src/firebase/auth/db.ts b/server/src/firebase/auth/db.ts
@@ -1,7 +1,7 @@
 import { PrismaClient } from "@prisma/client";
+import { Err, Ok, type Result } from "common/lib/result";
+import type { IDToken, UserID } from "common/types";
 import type { Request } from "express";
-import { Err, Ok, type Result } from "../../common/lib/result";
-import type { IDToken, UserID } from "../../common/types";
 import { getGUID, getGUIDFromToken } from "./lib";
 
 import { prisma } from "../../database/client";
diff --git a/server/src/firebase/auth/lib.ts b/server/src/firebase/auth/lib.ts
@@ -1,7 +1,7 @@
+import { Err, Ok, type Result } from "common/lib/result";
+import type { GUID, IDToken } from "common/types";
 import type { Request } from "express";
 import * as admin from "firebase-admin/auth";
-import { Err, Ok, type Result } from "../../common/lib/result";
-import type { GUID, IDToken } from "../../common/types";
 import { app } from "../init";
 
 const auth = admin.getAuth(app);
diff --git a/server/src/functions/chat.ts b/server/src/functions/chat.ts
@@ -1,5 +1,5 @@
-import type { Result } from "../common/lib/result";
-import type { InitRoom, SharedRoom, UserID } from "../common/types";
+import type { Result } from "common/lib/result";
+import type { InitRoom, SharedRoom, UserID } from "common/types";
 import type {
   DMRoom,
   Message,
@@ -8,7 +8,7 @@ import type {
   RoomOverview,
   SendMessage,
   ShareRoomID,
-} from "../common/types";
+} from "common/types";
 import * as db from "../database/chat";
 import { areAllMatched, areMatched, getRelation } from "../database/matches";
 import { getUserByID } from "../database/users";
diff --git a/server/src/functions/engines/recommendation.ts b/server/src/functions/engines/recommendation.ts
@@ -1,6 +1,6 @@
 import { recommend as sql } from "@prisma/client/sql";
-import { Err, Ok, type Result } from "../../common/lib/result";
-import type { User, UserID } from "../../common/types";
+import { Err, Ok, type Result } from "common/lib/result";
+import type { User, UserID } from "common/types";
 import { prisma } from "../../database/client";
 import { getUserByID } from "../../database/users";
 
diff --git a/server/src/functions/img/compress.ts b/server/src/functions/img/compress.ts
@@ -1,5 +1,5 @@
+import { Err, Ok, type Result } from "common/lib/result";
 import sharp from "sharp";
-import { Err, Ok, type Result } from "../../common/lib/result";
 
 const IMAGE_SIZE_PX = 320;
 
diff --git a/server/src/functions/user.ts b/server/src/functions/user.ts
@@ -1,5 +1,5 @@
-import { Result } from "../common/lib/result";
-import type { GUID, User, UserID } from "../common/types";
+import { Result } from "common/lib/result";
+import type { GUID, User, UserID } from "common/types";
 import { getMatchedUser } from "../database/requests";
 import * as db from "../database/users";
 import * as http from "./share/http";
diff --git a/server/src/lib/socket/socket.ts b/server/src/lib/socket/socket.ts
@@ -1,7 +1,7 @@
 import type { Server } from "node:http";
+import type { Message, UserID } from "common/types";
 import type { CorsOptions } from "cors";
 import { type Socket, Server as SocketIOServer } from "socket.io";
-import type { Message, UserID } from "../../common/types";
 import { getUserIdFromToken } from "../../firebase/auth/db";
 
 const users = new Map<UserID, Socket>();
diff --git a/server/src/router/chat.ts b/server/src/router/chat.ts
@@ -1,13 +1,13 @@
-import express from "express";
-import { safeParseInt } from "../common/lib/result/safeParseInt";
-import type { MessageID, UserID } from "../common/types";
-import { parseUserID } from "../common/zod/methods";
+import { safeParseInt } from "common/lib/result/safeParseInt";
+import type { MessageID, UserID } from "common/types";
+import { parseUserID } from "common/zod/methods";
 import {
   ContentSchema,
   InitRoomSchema,
   SendMessageSchema,
   SharedRoomSchema,
-} from "../common/zod/schemas";
+} from "common/zod/schemas";
+import express from "express";
 import * as db from "../database/chat";
 import { safeGetUserId } from "../firebase/auth/db";
 import * as core from "../functions/chat";
diff --git a/server/src/router/courses.ts b/server/src/router/courses.ts
@@ -1,6 +1,6 @@
+import type { Day } from "common/types";
+import { DaySchema, PeriodSchema } from "common/zod/schemas";
 import express, { type Request, type Response } from "express";
-import type { Day } from "../common/types";
-import { DaySchema, PeriodSchema } from "../common/zod/schemas";
 import {
   getCourseByCourseId,
   getCourseByDayPeriodAndUserId,
diff --git a/server/src/router/matches.ts b/server/src/router/matches.ts
@@ -1,6 +1,6 @@
+import { safeParseInt } from "common/lib/result/safeParseInt";
+import type { UserID } from "common/types";
 import express, { type Request, type Response } from "express";
-import { safeParseInt } from "../common/lib/result/safeParseInt";
-import type { UserID } from "../common/types";
 import { deleteMatch, getMatchesByUserId } from "../database/matches";
 import { safeGetUserId } from "../firebase/auth/db";
 
diff --git a/server/src/router/requests.ts b/server/src/router/requests.ts
@@ -1,7 +1,7 @@
+import type { UserID } from "common/types";
 import express, { type Request, type Response } from "express";
-import type { UserID } from "../common/types";
 
-import { safeParseInt } from "../common/lib/result/safeParseInt";
+import { safeParseInt } from "common/lib/result/safeParseInt";
 import {
   approveRequest,
   cancelRequest,
diff --git a/server/src/router/users.ts b/server/src/router/users.ts
@@ -1,11 +1,11 @@
-import express, { type Request, type Response } from "express";
-import type { GUID, UpdateUser } from "../common/types";
-import type { User } from "../common/types";
+import type { GUID, UpdateUser } from "common/types";
+import type { User } from "common/types";
 import {
   GUIDSchema,
   InitUserSchema,
   UpdateUserSchema,
-} from "../common/zod/schemas";
+} from "common/zod/schemas";
+import express, { type Request, type Response } from "express";
 import {
   getPendingRequestsFromUser,
   getPendingRequestsToUser,
diff --git a/server/src/seeds/test-data/data.ts b/server/src/seeds/test-data/data.ts
@@ -1,4 +1,4 @@
-import type { Day } from "../../common/types";
+import type { Day } from "common/types";
 
 export const subjects: Array<{
   group: string;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { Course, Day, UserID } from "../common/types";`
	`1`	`+import type { Course, Day, UserID } from "common/types";`
`2`	`2`	`import { prisma } from "./client";`
`3`	`3`
`4`	`4`	`export async function getCourseByCourseId(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { Course, CourseID, UserID } from "../common/types";`
	`1`	`+import type { Course, CourseID, UserID } from "common/types";`
`2`	`2`	`import { prisma } from "./client";`
`3`	`3`	`import { getCoursesByUserId } from "./courses";`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { InterestSubject, UserID } from "../common/types";`
	`1`	`+import type { InterestSubject, UserID } from "common/types";`
`2`	`2`	`import { prisma } from "./client";`
`3`	`3`
`4`	`4`	`export async function all(): Promise<InterestSubject[]> {`