@studious-lms/server 1.1.24 → 1.2.26

package/dist/lib/fileUpload.d.ts

@@ -49,7 +49,7 @@ export declare function getFileUrl(filePath: string): Promise<string>;
  * @param submissionId Optional submission ID to associate the file with
  * @returns The direct upload file information with signed URL
  */
-export declare function createDirectUploadFile(file: DirectFileData, userId: string, directory?: string, assignmentId?: string, submissionId?: string): Promise<DirectUploadFile>;
+export declare function createDirectUploadFile(file: DirectFileData, userId: string, directory?: string, assignmentId?: string, submissionId?: string, announcementId?: string): Promise<DirectUploadFile>;
 /**
  * Confirms a direct upload was successful
  * @param fileId The ID of the file record
@@ -72,5 +72,5 @@ export declare function updateUploadProgress(fileId: string, progress: number):
  * @param submissionId Optional submission ID to associate files with
  * @returns Array of direct upload file information
  */
-export declare function createDirectUploadFiles(files: DirectFileData[], userId: string, directory?: string, assignmentId?: string, submissionId?: string): Promise<DirectUploadFile[]>;
+export declare function createDirectUploadFiles(files: DirectFileData[], userId: string, directory?: string, assignmentId?: string, submissionId?: string, announcementId?: string): Promise<DirectUploadFile[]>;
 //# sourceMappingURL=fileUpload.d.ts.map

package/dist/lib/fileUpload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileUpload.d.ts","sourceRoot":"","sources":["../../src/lib/fileUpload.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAEd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAEd;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,IAAI,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;CACzB;AAKD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,YAAY,CAAC,CAKvB;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,QAAQ,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC,CAKzB;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAUlE;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAqF3B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,OAAO,EACtB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,cAAc,EAAE,EACvB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAa7B"}
+{"version":3,"file":"fileUpload.d.ts","sourceRoot":"","sources":["../../src/lib/fileUpload.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAEd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAEd;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,IAAI,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;CACzB;AAKD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,YAAY,CAAC,CAKvB;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,QAAQ,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC,CAKzB;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAUlE;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,MAAM,EACrB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,CAAC,CA8F3B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,OAAO,EACtB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CA+Df;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,cAAc,EAAE,EACvB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,MAAM,EACrB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAiB7B"}

package/dist/lib/fileUpload.js

@@ -1,7 +1,8 @@
 import { TRPCError } from "@trpc/server";
 import { v4 as uuidv4 } from "uuid";
-import { getSignedUrl } from "./googleCloudStorage.js";
+import { getSignedUrl, objectExists } from "./googleCloudStorage.js";
 import { prisma } from "./prisma.js";
+import { logger } from "../utils/logger.js";
 // DEPRECATED: These functions are no longer used - files are uploaded directly to GCS
 // Use createDirectUploadFile() and createDirectUploadFiles() instead
 /**
@@ -48,7 +49,7 @@ export async function getFileUrl(filePath) {
  * @param submissionId Optional submission ID to associate the file with
  * @returns The direct upload file information with signed URL
  */
-export async function createDirectUploadFile(file, userId, directory, assignmentId, submissionId) {
+export async function createDirectUploadFile(file, userId, directory, assignmentId, submissionId, announcementId) {
     try {
         // Validate file extension matches MIME type
         const fileExtension = file.name.split('.').pop()?.toLowerCase();
@@ -105,6 +106,11 @@ export async function createDirectUploadFile(file, userId, directory, assignment
                     submission: {
                         connect: { id: submissionId }
                     }
+                }),
+                ...(announcementId && {
+                    announcement: {
+                        connect: { id: announcementId }
+                    }
                 })
             },
         });
@@ -120,7 +126,11 @@ export async function createDirectUploadFile(file, userId, directory, assignment
         };
     }
     catch (error) {
-        console.error('Error creating direct upload file:', error);
+        logger.error('Error creating direct upload file:', { error: error instanceof Error ? {
+                name: error.name,
+                message: error.message,
+                stack: error.stack,
+            } : error });
         throw new TRPCError({
             code: 'INTERNAL_SERVER_ERROR',
             message: 'Failed to create direct upload file',
@@ -135,15 +145,48 @@ export async function createDirectUploadFile(file, userId, directory, assignment
  */
 export async function confirmDirectUpload(fileId, uploadSuccess, errorMessage) {
     try {
+        // First fetch the file record to get the object path
+        const fileRecord = await prisma.file.findUnique({
+            where: { id: fileId },
+            select: { path: true }
+        });
+        if (!fileRecord) {
+            throw new TRPCError({
+                code: 'NOT_FOUND',
+                message: 'File record not found',
+            });
+        }
+        let actualUploadSuccess = uploadSuccess;
+        let actualErrorMessage = errorMessage;
+        // If uploadSuccess is true, verify the object actually exists in GCS
+        if (uploadSuccess) {
+            try {
+                const exists = await objectExists(process.env.GOOGLE_CLOUD_BUCKET_NAME, fileRecord.path);
+                if (!exists) {
+                    actualUploadSuccess = false;
+                    actualErrorMessage = 'File upload reported as successful but object not found in Google Cloud Storage';
+                    logger.error(`File upload verification failed for ${fileId}: object ${fileRecord.path} not found in GCS`);
+                }
+            }
+            catch (error) {
+                logger.error(`Error verifying file existence in GCS for ${fileId}:`, { error: error instanceof Error ? {
+                        name: error.name,
+                        message: error.message,
+                        stack: error.stack,
+                    } : error });
+                actualUploadSuccess = false;
+                actualErrorMessage = 'Failed to verify file existence in Google Cloud Storage';
+            }
+        }
         const updateData = {
-            uploadStatus: uploadSuccess ? 'COMPLETED' : 'FAILED',
-            uploadProgress: uploadSuccess ? 100 : 0,
+            uploadStatus: actualUploadSuccess ? 'COMPLETED' : 'FAILED',
+            uploadProgress: actualUploadSuccess ? 100 : 0,
         };
-        if (!uploadSuccess && errorMessage) {
-            updateData.uploadError = errorMessage;
+        if (!actualUploadSuccess && actualErrorMessage) {
+            updateData.uploadError = actualErrorMessage;
             updateData.uploadRetryCount = { increment: 1 };
         }
-        if (uploadSuccess) {
+        if (actualUploadSuccess) {
             updateData.uploadedAt = new Date();
         }
         await prisma.file.update({
@@ -152,7 +195,7 @@ export async function confirmDirectUpload(fileId, uploadSuccess, errorMessage) {
         });
     }
     catch (error) {
-        console.error('Error confirming direct upload:', error);
+        logger.error('Error confirming direct upload:', { error });
         throw new TRPCError({
             code: 'INTERNAL_SERVER_ERROR',
             message: 'Failed to confirm upload',
@@ -166,16 +209,31 @@ export async function confirmDirectUpload(fileId, uploadSuccess, errorMessage) {
  */
 export async function updateUploadProgress(fileId, progress) {
     try {
+        // await prisma.file.update({
+        //   where: { id: fileId },
+        //   data: {
+        //     uploadStatus: 'UPLOADING',
+        //     uploadProgress: Math.min(100, Math.max(0, progress))
+        //   }
+        // });
+        const current = await prisma.file.findUnique({ where: { id: fileId }, select: { uploadStatus: true } });
+        if (!current || ['COMPLETED', 'FAILED', 'CANCELLED'].includes(current.uploadStatus))
+            return;
+        const clamped = Math.min(100, Math.max(0, progress));
         await prisma.file.update({
             where: { id: fileId },
             data: {
                 uploadStatus: 'UPLOADING',
-                uploadProgress: Math.min(100, Math.max(0, progress))
+                uploadProgress: clamped
             }
         });
     }
     catch (error) {
-        console.error('Error updating upload progress:', error);
+        logger.error('Error updating upload progress:', { error: error instanceof Error ? {
+                name: error.name,
+                message: error.message,
+                stack: error.stack,
+            } : error });
         throw new TRPCError({
             code: 'INTERNAL_SERVER_ERROR',
             message: 'Failed to update upload progress',
@@ -191,13 +249,17 @@ export async function updateUploadProgress(fileId, progress) {
  * @param submissionId Optional submission ID to associate files with
  * @returns Array of direct upload file information
  */
-export async function createDirectUploadFiles(files, userId, directory, assignmentId, submissionId) {
+export async function createDirectUploadFiles(files, userId, directory, assignmentId, submissionId, announcementId) {
     try {
-        const uploadPromises = files.map(file => createDirectUploadFile(file, userId, directory, assignmentId, submissionId));
+        const uploadPromises = files.map(file => createDirectUploadFile(file, userId, directory, assignmentId, submissionId, announcementId));
         return await Promise.all(uploadPromises);
     }
     catch (error) {
-        console.error('Error creating direct upload files:', error);
+        logger.error('Error creating direct upload files:', { error: error instanceof Error ? {
+                name: error.name,
+                message: error.message,
+                stack: error.stack,
+            } : error });
         throw new TRPCError({
             code: 'INTERNAL_SERVER_ERROR',
             message: 'Failed to create direct upload files',

package/dist/lib/googleCloudStorage.d.ts

@@ -10,4 +10,11 @@ export declare function getSignedUrl(filePath: string, action?: 'read' | 'write'
  * @param filePath The path of the file to delete
  */
 export declare function deleteFile(filePath: string): Promise<void>;
+/**
+ * Checks if an object exists in Google Cloud Storage
+ * @param bucketName The name of the bucket (unused, uses default bucket)
+ * @param objectPath The path of the object to check
+ * @returns Promise<boolean> True if the object exists, false otherwise
+ */
+export declare function objectExists(bucketName: string, objectPath: string): Promise<boolean>;
 //# sourceMappingURL=googleCloudStorage.d.ts.map

package/dist/lib/googleCloudStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"googleCloudStorage.d.ts","sourceRoot":"","sources":["../../src/lib/googleCloudStorage.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,MAAM,wCAAwD,CAAC;AAQ5E;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,GAAG,OAAgB,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsB7H;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhE"}
+{"version":3,"file":"googleCloudStorage.d.ts","sourceRoot":"","sources":["../../src/lib/googleCloudStorage.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,MAAM,wCAAwD,CAAC;AAQ5E;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,GAAG,OAAgB,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsB7H;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhE;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAW3F"}

package/dist/lib/googleCloudStorage.js

@@ -57,3 +57,22 @@ export async function deleteFile(filePath) {
         });
     }
 }
+/**
+ * Checks if an object exists in Google Cloud Storage
+ * @param bucketName The name of the bucket (unused, uses default bucket)
+ * @param objectPath The path of the object to check
+ * @returns Promise<boolean> True if the object exists, false otherwise
+ */
+export async function objectExists(bucketName, objectPath) {
+    try {
+        const [exists] = await bucket.file(objectPath).exists();
+        return exists;
+    }
+    catch (error) {
+        console.error('Error checking if object exists in Google Cloud Storage:', error);
+        throw new TRPCError({
+            code: 'INTERNAL_SERVER_ERROR',
+            message: 'Failed to check object existence',
+        });
+    }
+}

package/dist/lib/notificationHandler.d.ts

@@ -0,0 +1,25 @@
+interface notificationData {
+    title: string;
+    content: string;
+}
+export declare function sendNotification(receiver: string, data: notificationData): Promise<{
+    id: string;
+    title: string;
+    content: string;
+    createdAt: Date;
+    senderId: string | null;
+    receiverId: string;
+    read: boolean;
+}>;
+export declare function sendNotifications(receiverIds: Array<string>, data: notificationData): Promise<import(".prisma/client").Prisma.BatchPayload>;
+export declare function markRead(id: string, read?: boolean): Promise<{
+    id: string;
+    title: string;
+    content: string;
+    createdAt: Date;
+    senderId: string | null;
+    receiverId: string;
+    read: boolean;
+}>;
+export {};
+//# sourceMappingURL=notificationHandler.d.ts.map

package/dist/lib/notificationHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"notificationHandler.d.ts","sourceRoot":"","sources":["../../src/lib/notificationHandler.ts"],"names":[],"mappings":"AAEA,UAAU,gBAAgB;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB;;;;;;;;GAS9E;AAED,wBAAsB,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,gBAAgB,yDASzF;AAED,wBAAsB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,GAAE,OAAc;;;;;;;;GAM9D"}

package/dist/lib/notificationHandler.js

@@ -0,0 +1,28 @@
+import { prisma } from "./prisma.js";
+export async function sendNotification(receiver, data) {
+    const notification = await prisma.notification.create({
+        data: {
+            receiverId: receiver,
+            title: data.title,
+            content: data.content,
+        },
+    });
+    return notification;
+}
+export async function sendNotifications(receiverIds, data) {
+    const notifications = await prisma.notification.createMany({
+        data: receiverIds.map(receiverId => ({
+            receiverId: receiverId,
+            title: data.title,
+            content: data.content,
+        })),
+    });
+    return notifications;
+}
+export async function markRead(id, read = true) {
+    const notification = await prisma.notification.update({
+        where: { id },
+        data: { read: read },
+    });
+    return notification;
+}