Add form slug to pub update/create calls in tests

Author: kalilsn

core/app/components/pubs/PubEditor/actions.db.test.ts

@@ -86,6 +86,7 @@ describe("createPubRecursive", () => {
 					[`${community.slug}:title`]: "test title",
 				},
 			},
+			formSlug: pubTypes["Minimal Pub"].defaultForm.slug,
 			trx,
 		});
 		expect(result).toMatchObject(expected);
@@ -124,7 +125,7 @@ describe("updatePub", () => {
 		},
 	])("$name", async ({ loginUser, userRole, expected }) => {
 		const { seedCommunity } = await import("~/prisma/seed/seedCommunity");
-		const { community, pubs, users } = await seedCommunity({
+		const { community, pubs, users, pubTypes } = await seedCommunity({
 			community: {
 				name: "test",
 				slug: "test-actions-create-pub",
@@ -176,6 +177,7 @@ describe("updatePub", () => {
 			},
 			continueOnValidationError: false,
 			deleted: [],
+			formSlug: pubTypes["Minimal Pub"].defaultForm.slug,
 		});
 		expect(result).toMatchObject(expected);
 	});

core/lib/__tests__/db.ts

@@ -20,8 +20,29 @@ Pg.types.setTypeParser(int8TypeId, (val: any) => {
 
 const kyselyLogger =
 	env.LOG_LEVEL === "debug" && env.KYSELY_DEBUG === "true"
-		? ({ query: { sql, parameters }, ...event }: LogEvent) =>
-				logger.debug({ event }, "Kysely query:\n%s; --Parameters: %o", sql, parameters)
+		? ({ query: { sql, parameters }, ...event }: LogEvent) => {
+				const params = parameters.map((p) => {
+					if (p === null) {
+						return "null";
+					}
+					if (p instanceof Date) {
+						return `'${p.toISOString()}'`;
+					}
+					if (typeof p === "object") {
+						const stringified = `'${JSON.stringify(p)}'`;
+						if (Array.isArray(p)) {
+							return "ARRAY " + stringified;
+						}
+						return stringified;
+					}
+					return `'${p}'`;
+				});
+				logger.debug(
+					{ event },
+					"Kysely query:\n%s",
+					sql.replaceAll(/\$[0-9]+/g, () => params.shift()!)
+				);
+			}
 		: undefined;
 
 const tablesWithUpdateAt = databaseTables

core/prisma/seed/seedCommunity.ts

@@ -443,7 +443,10 @@ type PubFieldsByName<PF> = {
 };
 
 type PubTypesByName<PT, PF> = {
-	[K in keyof PT]: Omit<PubTypes, "name"> & { name: K } & { fields: PubFieldsByName<PF> };
+	[K in keyof PT]: Omit<PubTypes, "name"> & { name: K } & {
+		fields: PubFieldsByName<PF>;
+		defaultForm: { slug: string };
+	};
 };
 
 type UsersBySlug<U extends UsersInitializer> = {
@@ -841,6 +844,9 @@ export async function seedCommunity<
 							] as const;
 						})
 				),
+				defaultForm: {
+					slug: `${slugifyString(pubType.name)}-default-editor`,
+				},
 			},
 		])
 	) as PubTypesByName<PT, PF>;
@@ -850,11 +856,11 @@ export async function seedCommunity<
 			insertForm(
 				{ ...pubType, fields: Object.values(pubType.fields) },
 				`${pubType.name} Editor (Default)`,
-				`${slugifyString(pubType.name)}-default-editor`,
+				pubType.defaultForm.slug,
 				communityId,
 				true,
 				trx
-			).execute()
+			).executeTakeFirst()
 		)
 	);
 

packages/contracts/src/resources/types.ts

@@ -78,7 +78,7 @@ export type CreatePubRequestBody = z.infer<typeof CreatePubRequestBody>;
 
 // TODO: there has to be a better way to allow the API requests to include nulls in json fields
 export const CreatePubRequestBodyWithNulls = commonPubFields.extend({
-	id: z.string().optional(),
+	id: pubsIdSchema.optional(),
 	values: z.record(
 		z.union([
 			jsonSchema.or(z.date()),