fix: switch backend to CommonJS, generate Drizzle migrations, add migrate script
All checks were successful
Build and Push Docker Image to Gitea / build-and-push (push) Successful in 4m23s
All checks were successful
Build and Push Docker Image to Gitea / build-and-push (push) Successful in 4m23s
- Remove "type": "module" and switch tsconfig to CommonJS/Node resolution to fix drizzle-kit ESM/CJS incompatibility - Strip .js extensions from all backend TypeScript imports - Fix gamification resolver: combine two .where() calls using and() - Fix index.ts: wrap top-level awaits in async main(), fix Fastify+yoga request handling via handleNodeRequestAndResponse - Generate initial Drizzle SQL migration (0000_pale_hellion.sql) for all 15 tables - Add src/scripts/migrate.ts: programmatic Drizzle migrator for production - Copy migrations folder into Docker image (Dockerfile.backend) - Add schema:migrate npm script Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import SchemaBuilder from "@pothos/core";
|
||||
import ErrorsPlugin from "@pothos/plugin-errors";
|
||||
import type { DB } from "../db/connection.js";
|
||||
import type { SessionUser } from "../lib/auth.js";
|
||||
import type { DB } from "../db/connection";
|
||||
import type { SessionUser } from "../lib/auth";
|
||||
import type Redis from "ioredis";
|
||||
import { GraphQLDateTime, GraphQLJSON } from "graphql-scalars";
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import type { YogaInitialContext } from "graphql-yoga";
|
||||
import type { Context } from "./builder.js";
|
||||
import { getSession } from "../lib/auth.js";
|
||||
import { db } from "../db/connection.js";
|
||||
import { redis } from "../lib/auth.js";
|
||||
import type { Context } from "./builder";
|
||||
import { getSession } from "../lib/auth";
|
||||
import { db } from "../db/connection";
|
||||
import { redis } from "../lib/auth";
|
||||
|
||||
export async function buildContext(ctx: YogaInitialContext & { request: Request; reply: unknown; db: typeof db; redis: typeof redis }): Promise<Context> {
|
||||
const request = ctx.request;
|
||||
|
||||
@@ -9,6 +9,6 @@ import "./resolvers/recordings.js";
|
||||
import "./resolvers/comments.js";
|
||||
import "./resolvers/gamification.js";
|
||||
import "./resolvers/stats.js";
|
||||
import { builder } from "./builder.js";
|
||||
import { builder } from "./builder";
|
||||
|
||||
export const schema = builder.toSchema();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { builder } from "../builder.js";
|
||||
import { ArticleType } from "../types/index.js";
|
||||
import { articles, users } from "../../db/schema/index.js";
|
||||
import { builder } from "../builder";
|
||||
import { ArticleType } from "../types/index";
|
||||
import { articles, users } from "../../db/schema/index";
|
||||
import { eq, and, lte, desc } from "drizzle-orm";
|
||||
|
||||
builder.queryField("articles", (t) =>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { GraphQLError } from "graphql";
|
||||
import { builder } from "../builder.js";
|
||||
import { CurrentUserType } from "../types/index.js";
|
||||
import { users } from "../../db/schema/index.js";
|
||||
import { builder } from "../builder";
|
||||
import { CurrentUserType } from "../types/index";
|
||||
import { users } from "../../db/schema/index";
|
||||
import { eq } from "drizzle-orm";
|
||||
import { hash, verify as verifyArgon } from "../../lib/argon.js";
|
||||
import { setSession, deleteSession } from "../../lib/auth.js";
|
||||
import { sendVerification, sendPasswordReset } from "../../lib/email.js";
|
||||
import { slugify } from "../../lib/slugify.js";
|
||||
import { hash, verify as verifyArgon } from "../../lib/argon";
|
||||
import { setSession, deleteSession } from "../../lib/auth";
|
||||
import { sendVerification, sendPasswordReset } from "../../lib/email";
|
||||
import { slugify } from "../../lib/slugify";
|
||||
import { nanoid } from "nanoid";
|
||||
|
||||
builder.mutationField("login", (t) =>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { GraphQLError } from "graphql";
|
||||
import { builder } from "../builder.js";
|
||||
import { CommentType } from "../types/index.js";
|
||||
import { comments, users } from "../../db/schema/index.js";
|
||||
import { builder } from "../builder";
|
||||
import { CommentType } from "../types/index";
|
||||
import { comments, users } from "../../db/schema/index";
|
||||
import { eq, and, desc } from "drizzle-orm";
|
||||
import { awardPoints, checkAchievements } from "../../lib/gamification.js";
|
||||
import { awardPoints, checkAchievements } from "../../lib/gamification";
|
||||
|
||||
builder.queryField("commentsForVideo", (t) =>
|
||||
t.field({
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { builder } from "../builder.js";
|
||||
import { LeaderboardEntryType, UserGamificationType, AchievementType } from "../types/index.js";
|
||||
import { user_stats, users, user_achievements, achievements, user_points } from "../../db/schema/index.js";
|
||||
import { eq, desc, gt, count, isNotNull } from "drizzle-orm";
|
||||
import { builder } from "../builder";
|
||||
import { LeaderboardEntryType, UserGamificationType, AchievementType } from "../types/index";
|
||||
import { user_stats, users, user_achievements, achievements, user_points } from "../../db/schema/index";
|
||||
import { eq, desc, gt, count, isNotNull, and } from "drizzle-orm";
|
||||
|
||||
builder.queryField("leaderboard", (t) =>
|
||||
t.field({
|
||||
@@ -73,8 +73,7 @@ builder.queryField("userGamification", (t) =>
|
||||
})
|
||||
.from(user_achievements)
|
||||
.leftJoin(achievements, eq(user_achievements.achievement_id, achievements.id))
|
||||
.where(eq(user_achievements.user_id, args.userId))
|
||||
.where(isNotNull(user_achievements.date_unlocked))
|
||||
.where(and(eq(user_achievements.user_id, args.userId), isNotNull(user_achievements.date_unlocked)))
|
||||
.orderBy(desc(user_achievements.date_unlocked));
|
||||
|
||||
const recentPoints = await ctx.db
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { builder } from "../builder.js";
|
||||
import { ModelType } from "../types/index.js";
|
||||
import { users, user_photos, files } from "../../db/schema/index.js";
|
||||
import { builder } from "../builder";
|
||||
import { ModelType } from "../types/index";
|
||||
import { users, user_photos, files } from "../../db/schema/index";
|
||||
import { eq, and, desc } from "drizzle-orm";
|
||||
|
||||
async function enrichModel(db: any, user: any) {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import { GraphQLError } from "graphql";
|
||||
import { builder } from "../builder.js";
|
||||
import { RecordingType } from "../types/index.js";
|
||||
import { recordings, recording_plays } from "../../db/schema/index.js";
|
||||
import { builder } from "../builder";
|
||||
import { RecordingType } from "../types/index";
|
||||
import { recordings, recording_plays } from "../../db/schema/index";
|
||||
import { eq, and, desc } from "drizzle-orm";
|
||||
import { slugify } from "../../lib/slugify.js";
|
||||
import { awardPoints, checkAchievements } from "../../lib/gamification.js";
|
||||
import { slugify } from "../../lib/slugify";
|
||||
import { awardPoints, checkAchievements } from "../../lib/gamification";
|
||||
|
||||
builder.queryField("recordings", (t) =>
|
||||
t.field({
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { builder } from "../builder.js";
|
||||
import { StatsType } from "../types/index.js";
|
||||
import { users, videos } from "../../db/schema/index.js";
|
||||
import { builder } from "../builder";
|
||||
import { StatsType } from "../types/index";
|
||||
import { users, videos } from "../../db/schema/index";
|
||||
import { eq, count } from "drizzle-orm";
|
||||
|
||||
builder.queryField("stats", (t) =>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { GraphQLError } from "graphql";
|
||||
import { builder } from "../builder.js";
|
||||
import { CurrentUserType, UserType } from "../types/index.js";
|
||||
import { users } from "../../db/schema/index.js";
|
||||
import { builder } from "../builder";
|
||||
import { CurrentUserType, UserType } from "../types/index";
|
||||
import { users } from "../../db/schema/index";
|
||||
import { eq } from "drizzle-orm";
|
||||
|
||||
builder.queryField("me", (t) =>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { GraphQLError } from "graphql";
|
||||
import { builder } from "../builder.js";
|
||||
import { VideoType, VideoLikeResponseType, VideoPlayResponseType, VideoLikeStatusType } from "../types/index.js";
|
||||
import { videos, video_models, video_likes, video_plays, users, files } from "../../db/schema/index.js";
|
||||
import { builder } from "../builder";
|
||||
import { VideoType, VideoLikeResponseType, VideoPlayResponseType, VideoLikeStatusType } from "../types/index";
|
||||
import { videos, video_models, video_likes, video_plays, users, files } from "../../db/schema/index";
|
||||
import { eq, and, lte, desc, inArray, count } from "drizzle-orm";
|
||||
|
||||
async function enrichVideo(db: any, video: any) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { builder } from "../builder.js";
|
||||
import { builder } from "../builder";
|
||||
|
||||
// File type
|
||||
export const FileType = builder.objectRef<{
|
||||
|
||||
Reference in New Issue
Block a user