@studious-lms/server 1.7.0 → 1.9.0

package/src/services/labChat.ts

@@ -25,6 +25,7 @@ import {
   claimMessageAttachments,
   ensureMessageHasContentOrAttachments,
 } from "./message.js";
+import { messageFileSelect } from "../models/message.js";
 
 /** Create a lab chat with conversation and teacher members. Broadcasts via Pusher. */
 export async function createLabChat(
@@ -307,7 +308,7 @@ export async function postToLabChat(
           },
         },
         attachments: {
-          select: { id: true, name: true, type: true },
+          select: messageFileSelect,
         },
       },
     });

package/src/services/message.ts

@@ -19,6 +19,7 @@ import {
   findMessageByIdMinimal,
   countUnreadMessages,
   countUnreadMentions,
+  messageFileSelect,
 } from "../models/message.js";
 
 export function ensureMessageHasContentOrAttachments(
@@ -110,19 +111,6 @@ export async function confirmMessageUpload(
     });
   }
 
-  if (input.uploadSuccess) {
-    await prisma.$transaction(async (tx) => {
-      await tx.file.update({
-        where: { id: input.fileId },
-        data: { uploadStatus: "FAILED", uploadError: input.errorMessage },
-      });
-    });
-    throw new TRPCError({
-      code: "INTERNAL_SERVER_ERROR",
-      message: "Failed to confirm upload",
-    });
-  }
-
   const file = await prisma.file.findFirst({
     where: {
       id: input.fileId,
@@ -193,11 +181,7 @@ export async function listMessages(
       createdAt: message.createdAt,
       sender: message.sender,
       status: message.status,
-      attachments: message.attachments.map((a) => ({
-        id: a.id,
-        name: a.name,
-        type: a.type,
-      })),
+      attachments: message.attachments,
       meta: message.meta as Record<string, unknown>,
       mentions: message.mentions.map((m) => ({ user: m.user })),
       mentionsMe: message.mentions.some((m) => m.userId === userId),
@@ -302,7 +286,7 @@ export async function sendMessage(
           },
         },
         attachments: {
-          select: { id: true, name: true, type: true },
+          select: messageFileSelect,
         },
       },
     });
@@ -413,7 +397,7 @@ export async function updateMessage(
           },
         },
         attachments: {
-          select: { id: true, name: true, type: true },
+          select: messageFileSelect,
         },
       },
     });
@@ -622,7 +606,7 @@ export async function markSuggestionCreated(
               },
             },
           },
-          attachments: { select: { id: true, name: true, type: true } },
+          attachments: { select: messageFileSelect },
           mentions: { select: { userId: true } },
         },
       });

package/src/services/newtonChat.ts

@@ -12,6 +12,7 @@ import {
   claimMessageAttachments,
   ensureMessageHasContentOrAttachments,
 } from "./message.js";
+import { messageFileSelect } from "../models/message.js";
 import {
   findClassWithStudent,
   findSubmissionByAssignmentAndStudent,
@@ -212,7 +213,7 @@ export async function postToNewtonChat(
           },
         },
         attachments: {
-          select: { id: true, name: true, type: true },
+          select: messageFileSelect,
         },
       },
     });