Remove insertId

Author: mauriciabad

src/app/api/upload/place-image/route.ts

@@ -30,20 +30,22 @@ export const POST = withAxiom(async (request) => {
   })
 
   const rawDate = formData.get('captureDate')?.toString()
-  const insertImageResult = await db
-    .insert(images)
-    .values({
-      ...image,
-      alt: formData.get('alt')?.toString(),
-      source: formData.get('source')?.toString(),
-      captureDate: rawDate ? new Date(rawDate) : null,
-    })
-    .execute()
-  const imageId = Number(insertImageResult.insertId)
+  const newImage = (
+    await db
+      .insert(images)
+      .values({
+        ...image,
+        alt: formData.get('alt')?.toString(),
+        source: formData.get('source')?.toString(),
+        captureDate: rawDate ? new Date(rawDate) : null,
+      })
+      .returning()
+      .execute()
+  )[0]
 
   return NextResponse.json({
     image: {
-      id: imageId,
+      id: newImage.id,
       ...image,
     },
   } satisfies UploadPlaceImageResponse)

src/server/api/router/admin/places.ts

@@ -211,30 +211,35 @@ export const placesAdminRouter = router({
     .input(createPlaceSchema)
     .mutation(async ({ input }) => {
       await db.transaction(async (tx) => {
-        const insertFeaturesResult = await tx
-          .insert(features)
-          .values({ ...input.features })
-
-        const featuresId = Number(insertFeaturesResult.insertId)
+        const newFeatures = (
+          await tx
+            .insert(features)
+            .values({ ...input.features })
+            .returning()
+        )[0]
 
-        const insertPlaceResult = await tx.insert(places).values({
-          name: input.name,
-          description: input.description,
-          googleMapsId: input.googleMapsId,
-          mainCategoryId: input.mainCategory,
-          mainImageId: input.mainImageId,
-          location: pointToString(input.location),
-          importance: input.importance,
-          content: input.content,
-          verificationRequirementsId: 1,
-          featuresId,
-        })
-        const newPlaceId = Number(insertPlaceResult.insertId)
+        const newPlace = (
+          await tx
+            .insert(places)
+            .values({
+              name: input.name,
+              description: input.description,
+              googleMapsId: input.googleMapsId,
+              mainCategoryId: input.mainCategory,
+              mainImageId: input.mainImageId,
+              location: pointToString(input.location),
+              importance: input.importance,
+              content: input.content,
+              verificationRequirementsId: 1,
+              featuresId: newFeatures.id,
+            })
+            .returning()
+        )[0]
 
         if (input.categories.length > 0) {
           await tx.insert(placesToPlaceCategories).values(
             input.categories.map((categoryId) => ({
-              placeId: newPlaceId,
+              placeId: newPlace.id,
               categoryId: categoryId,
             }))
           )
@@ -243,13 +248,13 @@ export const placesAdminRouter = router({
         if (input.externalLinks.length > 0) {
           await tx.insert(externalLinks).values(
             input.externalLinks.map((externalLink) => ({
-              placeId: newPlaceId,
+              placeId: newPlace.id,
               ...externalLink,
             }))
           )
         }
 
-        return newPlaceId
+        return newPlace.id
       })
     }),
   editPlace: adminProcedure

src/server/api/router/admin/routes.ts

@@ -213,28 +213,33 @@ export const routesAdminRouter = router({
     .input(createRouteSchema)
     .mutation(async ({ input }) => {
       await db.transaction(async (tx) => {
-        const insertFeaturesResult = await tx
-          .insert(features)
-          .values({ ...input.features })
-
-        const featuresId = Number(insertFeaturesResult.insertId)
+        const newFeatures = (
+          await tx
+            .insert(features)
+            .values({ ...input.features })
+            .returning()
+        )[0]
 
-        const insertRouteResult = await tx.insert(routes).values({
-          name: input.name,
-          description: input.description,
-          mainCategoryId: input.mainCategory,
-          path: multiLineToString(input.path),
-          importance: input.importance,
-          content: input.content,
-          verificationRequirementsId: 1,
-          featuresId,
-        })
-        const newRouteId = Number(insertRouteResult.insertId)
+        const newRoute = (
+          await tx
+            .insert(routes)
+            .values({
+              name: input.name,
+              description: input.description,
+              mainCategoryId: input.mainCategory,
+              path: multiLineToString(input.path),
+              importance: input.importance,
+              content: input.content,
+              verificationRequirementsId: 1,
+              featuresId: newFeatures.id,
+            })
+            .returning()
+        )[0]
 
         if (input.categories.length > 0) {
           await tx.insert(routesToRouteCategories).values(
             input.categories.map((categoryId) => ({
-              routeId: newRouteId,
+              routeId: newRoute.id,
               categoryId: categoryId,
             }))
           )
@@ -243,13 +248,13 @@ export const routesAdminRouter = router({
         if (input.externalLinks.length > 0) {
           await tx.insert(externalLinks).values(
             input.externalLinks.map((externalLink) => ({
-              routeId: newRouteId,
+              routeId: newRoute.id,
               ...externalLink,
             }))
           )
         }
 
-        return newRouteId
+        return newRoute.id
       })
     }),
   editRoute: adminProcedure

src/server/helpers/auth/initialize-user.ts

@@ -26,41 +26,43 @@ export async function initializeUserInDatabase(newUser: {
 
     const userId = uuidv4()
 
-    const visitedPlaceListId = Number(
-      (
-        await tx.insert(placeLists).values({
+    const newVisitedPlaceList = (
+      await tx
+        .insert(placeLists)
+        .values({
           userId,
         })
-      ).insertId
-    )
+        .returning()
+    )[0]
 
     if (
       !(
         await tx.query.placeLists.findFirst({
           columns: { id: true },
-          where: eq(placeLists.id, visitedPlaceListId),
+          where: eq(placeLists.id, newVisitedPlaceList.id),
         })
       )?.id
     ) {
       throw new Error('Error creating visitedPlaceList')
     }
 
-    await tx.insert(users).values({
-      id: userId,
-      email: newUser.email,
-      emailVerified: newUser.emailVerified,
-      name: newUser.name,
-      image: newUser.image,
-      hashedPassword: newUser.password
-        ? bcrypt.hashSync(newUser.password, 10)
-        : null,
-      visitedPlaceListId: visitedPlaceListId,
-    })
+    const createdUser = (
+      await tx
+        .insert(users)
+        .values({
+          id: userId,
+          email: newUser.email,
+          emailVerified: newUser.emailVerified,
+          name: newUser.name,
+          image: newUser.image,
+          hashedPassword: newUser.password
+            ? bcrypt.hashSync(newUser.password, 10)
+            : null,
+          visitedPlaceListId: newVisitedPlaceList.id,
+        })
+        .returning()
+    )[0]
 
-    return await tx
-      .select()
-      .from(users)
-      .where(eq(users.id, userId))
-      .then((res) => res[0])
+    return createdUser
   })
 }