Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
refactor: migrate project to postgrest (#3900)
Bogdan Chadkin4cda8738a199
diff --git a/packages/domain/src/trpc/domain.ts b/packages/domain/src/trpc/domain.tsindex 98c9d90cdf..3babfd3686 100644--- a/packages/domain/src/trpc/domain.ts+++ b/packages/domain/src/trpc/domain.ts@@ -1,11 +1,11 @@import { z } from "zod";-+import { nanoid } from "nanoid";+import type { Project } from "@webstudio-is/project";import { db as projectDb } from "@webstudio-is/project/index.server";-import { db } from "../db";import { createProductionBuild } from "@webstudio-is/project-build/index.server";import { router, procedure } from "@webstudio-is/trpc-interface/index.server";-import { nanoid } from "nanoid";import { Templates } from "@webstudio-is/sdk";+import { db } from "../db";export const domainRouter = router({getEntriToken: procedure.query(async ({ ctx }) => {@@ -29,7 +29,10 @@ export const domainRouter = router({.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {try {- const project = await projectDb.project.loadById(input.projectId, ctx);+ const project: Project = await projectDb.project.loadById(+ input.projectId,+ ctx+ );return {success: true,diff --git a/packages/project/package.json b/packages/project/package.jsonindex 794c614894..1b3326a7c0 100644--- a/packages/project/package.json+++ b/packages/project/package.json@@ -11,11 +11,11 @@"dependencies": {"@trpc/server": "^10.45.2","@webstudio-is/asset-uploader": "workspace:*",- "@webstudio-is/prisma-client": "workspace:*","@webstudio-is/project-build": "workspace:*","@webstudio-is/trpc-interface": "workspace:*","nanoid": "^5.0.1","slugify": "^1.6.6",+ "type-fest": "^4.3.1","zod": "^3.22.4"},"devDependencies": {diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.tsindex 25672e51b0..da70b4d7a5 100644--- a/packages/project/src/db/project.ts+++ b/packages/project/src/db/project.ts@@ -1,4 +1,4 @@-import { prisma, Prisma } from "@webstudio-is/prisma-client";+import { nanoid } from "nanoid";import {authorizeProject,type AppContext,@@ -7,7 +7,7 @@ import {import { createBuild } from "@webstudio-is/project-build/index.server";import { MarketplaceApprovalStatus, Project, Title } from "../shared/schema";import { generateDomain, validateProjectDomain } from "./project-domain";-import { nanoid } from "nanoid";+import type { SetNonNullable } from "type-fest";export const loadById = async (projectId: Project["id"],@@ -22,20 +22,35 @@ export const loadById = async (throw new AuthorizationError("You don't have access to this project");}- const data = await prisma.project.findUnique({- where: { id_isDeleted: { id: projectId, isDeleted: false } },- include: {- latestBuild: true,- latestStaticBuild: true,- previewImageAsset: true,- },- });-- if (data === null) {- throw new Error(`Project ${projectId} not found`);+ const data = await context.postgrest.client+ .from("Project")+ .select(+ `+ *,+ previewImageAsset:Asset (*),+ latestBuild:LatestBuildPerProject (*),+ latestStaticBuild:LatestStaticBuildPerProject (*)+ `+ )+ .eq("id", projectId)+ .eq("isDeleted", false)+ .single();+ if (data.error) {+ throw data.error;}-- return Project.parse(data);+ const { latestBuild, latestStaticBuild, ...project } = data.data;++ return {+ ...project,+ // postgres marks all view fields as nullable+ // workaround this by casting to non nullable+ latestBuild: (latestBuild[0] ?? null) as null | SetNonNullable<+ NonNullable<(typeof latestBuild)[0]>+ >,+ latestStaticBuild: (latestStaticBuild[0] ?? null) as null | SetNonNullable<+ NonNullable<(typeof latestStaticBuild)[0]>+ >,+ } satisfies Project;};export const create = async (@@ -92,7 +107,7 @@ export const markAsDeleted = async (return { errors: "Only the owner can delete the project" };}- return await context.postgrest.client+ const deletedProject = await context.postgrest.client.from("Project").update({isDeleted: true,@@ -100,6 +115,9 @@ export const markAsDeleted = async (domain: nanoid(),}).eq("id", projectId);+ if (deletedProject.error) {+ throw deletedProject.error;+ }};const assertEditPermission = async (projectId: string, context: AppContext) => {@@ -129,10 +147,13 @@ export const rename = async (await assertEditPermission(projectId, context);- return await prisma.project.update({- where: { id: projectId },- data: { title },- });+ const renamedProject = await context.postgrest.client+ .from("Project")+ .update({ title })+ .eq("id", projectId);+ if (renamedProject.error) {+ throw renamedProject.error;+ }};export const updatePreviewImage = async (@@ -147,10 +168,13 @@ export const updatePreviewImage = async () => {await assertEditPermission(projectId, context);- return await prisma.project.update({- where: { id: projectId },- data: { previewImageAssetId: assetId },- });+ const updatedProject = await context.postgrest.client+ .from("Project")+ .update({ previewImageAssetId: assetId })+ .eq("id", projectId);+ if (updatedProject.error) {+ throw updatedProject.error;+ }};export const clone = async (@@ -203,20 +227,15 @@ export const updateDomain = async (await assertEditPermission(input.id, context);- try {- const project = await prisma.project.update({- data: { domain },- where: { id: input.id },- });- return project;- } catch (error) {- if (- error instanceof Prisma.PrismaClientKnownRequestError &&- error.code === "P2002"- ) {+ const updatedProject = await context.postgrest.client+ .from("Project")+ .update({ domain })+ .eq("id", input.id);+ if (updatedProject.error) {+ if (updatedProject.error.code === "23505") {throw new Error(`Domain "${domain}" is already used`);}- throw error;+ throw updatedProject.error;}};@@ -238,8 +257,14 @@ export const setMarketplaceApprovalStatus = async (}await assertEditPermission(projectId, context);- return await prisma.project.update({- where: { id: projectId },- data: { marketplaceApprovalStatus },- });+ const updatedProject = await context.postgrest.client+ .from("Project")+ .update({ marketplaceApprovalStatus })+ .eq("id", projectId)+ .select()+ .single();+ if (updatedProject.error) {+ throw updatedProject.error;+ }+ return updatedProject.data;};diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 69bb62574d..5ea2c87e43 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1658,9 +1658,6 @@ importers:'@webstudio-is/asset-uploader':specifier: workspace:*version: link:../asset-uploader- '@webstudio-is/prisma-client':- specifier: workspace:*- version: link:../prisma-client'@webstudio-is/project-build':specifier: workspace:*version: link:../project-build@@ -1673,6 +1670,9 @@ importers:slugify:specifier: ^1.6.6version: 1.6.6+ type-fest:+ specifier: ^4.3.1+ version: 4.3.1zod:specifier: ^3.22.4version: 3.22.4