remove contentType

Author: kentcdodds

app/routes/resources+/download-user-data.tsx

@@ -18,7 +18,7 @@ export async function loader({ request }: Route.LoaderArgs) {
 					id: true,
 					createdAt: true,
 					updatedAt: true,
-					contentType: true,
+					objectKey: true,
 				},
 			},
 			notes: {
@@ -28,7 +28,7 @@ export async function loader({ request }: Route.LoaderArgs) {
 							id: true,
 							createdAt: true,
 							updatedAt: true,
-							contentType: true,
+							objectKey: true,
 						},
 					},
 				},

app/utils/auth.server.ts

@@ -179,7 +179,6 @@ export async function signupWithConnection({
 			data: {
 				image: {
 					create: {
-						contentType: imageFile.type,
 						objectKey: await uploadProfileImage(user.id, imageFile),
 					},
 				},

prisma/migrations/20250221001609_init/migration.sql renamed to prisma/migrations/20250221233640_init/migration.sql

@@ -23,7 +23,6 @@ CREATE TABLE "Note" (
 CREATE TABLE "NoteImage" (
     "id" TEXT NOT NULL PRIMARY KEY,
     "altText" TEXT,
-    "contentType" TEXT NOT NULL,
     "objectKey" TEXT NOT NULL,
     "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" DATETIME NOT NULL,
@@ -35,7 +34,6 @@ CREATE TABLE "NoteImage" (
 CREATE TABLE "UserImage" (
     "id" TEXT NOT NULL PRIMARY KEY,
     "altText" TEXT,
-    "contentType" TEXT NOT NULL,
     "objectKey" TEXT NOT NULL,
     "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" DATETIME NOT NULL,
@@ -188,7 +186,6 @@ CREATE UNIQUE INDEX "_RoleToUser_AB_unique" ON "_RoleToUser"("A", "B");
 -- CreateIndex
 CREATE INDEX "_RoleToUser_B_index" ON "_RoleToUser"("B");
 
-
 --------------------------------- Manual Seeding --------------------------
 -- Hey there, Kent here! This is how you can reliably seed your database with
 -- some data. You edit the migration.sql file and that will handle it for you.

prisma/schema.prisma

@@ -48,10 +48,9 @@ model Note {
 }
 
 model NoteImage {
-  id          String  @id @default(cuid())
-  altText     String?
-  contentType String
-  objectKey   String
+  id        String  @id @default(cuid())
+  altText   String?
+  objectKey String
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -64,10 +63,9 @@ model NoteImage {
 }
 
 model UserImage {
-  id          String  @id @default(cuid())
-  altText     String?
-  contentType String
-  objectKey   String
+  id        String  @id @default(cuid())
+  altText   String?
+  objectKey String
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt

prisma/seed.ts

@@ -1,13 +1,11 @@
 import { faker } from '@faker-js/faker'
-import { promiseHash } from 'remix-utils/promise'
 import { prisma } from '#app/utils/db.server.ts'
 import { MOCK_CODE_GITHUB } from '#app/utils/providers/constants'
 import {
 	createPassword,
 	createUser,
 	getNoteImages,
 	getUserImages,
-	img,
 } from '#tests/db-utils.ts'
 import { insertGitHubUser } from '#tests/mocks/github.ts'
 
@@ -37,8 +35,6 @@ async function seed() {
 			await prisma.userImage.create({
 				data: {
 					userId: user.id,
-					contentType: userImage.contentType,
-					altText: userImage.altText,
 					objectKey: userImage.objectKey,
 				},
 			})
@@ -65,7 +61,6 @@ async function seed() {
 					await prisma.noteImage.create({
 						data: {
 							noteId: note.id,
-							contentType: noteImage.contentType,
 							altText: noteImage.altText,
 							objectKey: noteImage.objectKey,
 						},
@@ -78,38 +73,38 @@ async function seed() {
 
 	console.time(`🐨 Created admin user "kody"`)
 
-	const kodyImages = await promiseHash({
-		kodyUser: img({ objectKey: 'user/kody.png' }),
-		cuteKoala: img({
+	const kodyImages = {
+		kodyUser: { objectKey: 'user/kody.png' },
+		cuteKoala: {
 			altText: 'an adorable koala cartoon illustration',
 			objectKey: 'kody-notes/cute-koala.png',
-		}),
-		koalaEating: img({
+		},
+		koalaEating: {
 			altText: 'a cartoon illustration of a koala in a tree eating',
 			objectKey: 'kody-notes/koala-eating.png',
-		}),
-		koalaCuddle: img({
+		},
+		koalaCuddle: {
 			altText: 'a cartoon illustration of koalas cuddling',
 			objectKey: 'kody-notes/koala-cuddle.png',
-		}),
-		mountain: img({
+		},
+		mountain: {
 			altText: 'a beautiful mountain covered in snow',
 			objectKey: 'kody-notes/mountain.png',
-		}),
-		koalaCoder: img({
+		},
+		koalaCoder: {
 			altText: 'a koala coding at the computer',
 			objectKey: 'kody-notes/koala-coder.png',
-		}),
-		koalaMentor: img({
+		},
+		koalaMentor: {
 			altText:
 				'a koala in a friendly and helpful posture. The Koala is standing next to and teaching a woman who is coding on a computer and shows positive signs of learning and understanding what is being explained.',
 			objectKey: 'kody-notes/koala-mentor.png',
-		}),
-		koalaSoccer: img({
+		},
+		koalaSoccer: {
 			altText: 'a cute cartoon koala kicking a soccer ball on a soccer field ',
 			objectKey: 'kody-notes/koala-soccer.png',
-		}),
-	})
+		},
+	}
 
 	const githubUser = await insertGitHubUser(MOCK_CODE_GITHUB)
 
@@ -130,8 +125,6 @@ async function seed() {
 	await prisma.userImage.create({
 		data: {
 			userId: kody.id,
-			contentType: kodyImages.kodyUser.contentType,
-			altText: kodyImages.kodyUser.altText,
 			objectKey: kodyImages.kodyUser.objectKey,
 		},
 	})
@@ -239,7 +232,6 @@ async function seed() {
 			await prisma.noteImage.create({
 				data: {
 					noteId: note.id,
-					contentType: image.contentType,
 					altText: image.altText,
 					objectKey: image.objectKey,
 				},

tests/db-utils.ts

@@ -35,80 +35,66 @@ export function createPassword(password: string = faker.internet.password()) {
 	}
 }
 
-let noteImages: Array<Awaited<ReturnType<typeof img>>> | undefined
+let noteImages: Array<{ altText: string; objectKey: string }> | undefined
 export async function getNoteImages() {
 	if (noteImages) return noteImages
 
 	noteImages = await Promise.all([
-		img({
+		{
 			altText: 'a nice country house',
 			objectKey: 'notes/0.png',
-		}),
-		img({
+		},
+		{
 			altText: 'a city scape',
 			objectKey: 'notes/1.png',
-		}),
-		img({
+		},
+		{
 			altText: 'a sunrise',
 			objectKey: 'notes/2.png',
-		}),
-		img({
+		},
+		{
 			altText: 'a group of friends',
 			objectKey: 'notes/3.png',
-		}),
-		img({
+		},
+		{
 			altText: 'friends being inclusive of someone who looks lonely',
 			objectKey: 'notes/4.png',
-		}),
-		img({
+		},
+		{
 			altText: 'an illustration of a hot air balloon',
 			objectKey: 'notes/5.png',
-		}),
-		img({
+		},
+		{
 			altText:
 				'an office full of laptops and other office equipment that look like it was abandoned in a rush out of the building in an emergency years ago.',
 			objectKey: 'notes/6.png',
-		}),
-		img({
+		},
+		{
 			altText: 'a rusty lock',
 			objectKey: 'notes/7.png',
-		}),
-		img({
+		},
+		{
 			altText: 'something very happy in nature',
 			objectKey: 'notes/8.png',
-		}),
-		img({
+		},
+		{
 			altText: `someone at the end of a cry session who's starting to feel a little better.`,
 			objectKey: 'notes/9.png',
-		}),
+		},
 	])
 
 	return noteImages
 }
 
-let userImages: Array<Awaited<ReturnType<typeof img>>> | undefined
+let userImages: Array<{ objectKey: string }> | undefined
 export async function getUserImages() {
 	if (userImages) return userImages
 
 	userImages = await Promise.all(
-		Array.from({ length: 10 }, (_, index) =>
-			img({ objectKey: `user/${index}.jpg` }),
-		),
+		Array.from({ length: 10 }, (_, index) => ({
+			objectKey: `user/${index}.jpg`,
+		})),
 	)
 
 	return userImages
 }
-
-export async function img({
-	altText,
-	objectKey,
-}: {
-	altText?: string
-	objectKey: string
-}) {
-	return {
-		altText,
-		objectKey,
-		contentType: objectKey.endsWith('.png') ? 'image/png' : 'image/jpeg',
-	}
-}

tests/e2e/note-images.test.ts

@@ -124,7 +124,6 @@ function createNoteWithImage() {
 		images: {
 			create: {
 				altText: 'cute koala',
-				contentType: 'image/png',
 				objectKey: 'kody-notes/cute-koala.png',
 			},
 		},
@@ -133,7 +132,7 @@ function createNoteWithImage() {
 		'id' | 'createdAt' | 'updatedAt' | 'type' | 'ownerId'
 	> & {
 		images: {
-			create: Pick<NoteImage, 'altText' | 'contentType' | 'objectKey'>
+			create: Pick<NoteImage, 'altText' | 'objectKey'>
 		}
 	}
 }