@goscribe/server 1.1.7 → 1.2.0

package/src/routers/podcast.ts

@@ -6,13 +6,9 @@ import inference from '../lib/inference.js';
 import { uploadToSupabase, generateSignedUrl, deleteFromSupabase } from '../lib/storage.js';
 import PusherService from '../lib/pusher.js';
 import { aiSessionService } from '../lib/ai-session.js';
-
-// Prisma enum values mapped manually to avoid type import issues in ESM
-const ArtifactType = {
-  PODCAST_EPISODE: 'PODCAST_EPISODE',
-  STUDY_GUIDE: 'STUDY_GUIDE',
-  FLASHCARD_SET: 'FLASHCARD_SET',
-} as const;
+import { ArtifactType } from '../lib/constants.js';
+import { workspaceAccessFilter } from '../lib/workspace-access.js';
+import { logger } from '../lib/logger.js';
 
 // Podcast segment schema
 const podcastSegmentSchema = z.object({
@@ -94,9 +90,9 @@ export const podcast = router({
         orderBy: { updatedAt: 'desc' },
       });
       
-      console.log(`📻 Found ${artifacts.length} podcast artifacts`);
+      logger.debug(`Found ${artifacts.length} podcast artifacts`);
       artifacts.forEach((artifact, i) => {
-        console.log(`  Podcast ${i + 1}: "${artifact.title}" - ${artifact.podcastSegments.length} segments`);
+        logger.debug(`  Podcast ${i + 1}: "${artifact.title}" - ${artifact.podcastSegments.length} segments`);
       });
 
       // Transform to include segments with fresh signed URLs
@@ -126,7 +122,7 @@ export const podcast = router({
                     order: segment.order,
                   };
                 } catch (error) {
-                  console.error(`Failed to generate signed URL for segment ${segment.id}:`, error);
+                  logger.error(`Failed to generate signed URL for segment ${segment.id}:`, error);
                   return {
                     id: segment.id,
                     title: segment.title,
@@ -154,10 +150,10 @@ export const podcast = router({
           let metadata = null;
           if (latestVersion) {
             try {
-              console.log(latestVersion.data)
+              logger.debug(latestVersion.data)
               metadata = podcastMetadataSchema.parse(latestVersion.data);
             } catch (error) {
-              console.error('Failed to parse podcast metadata:', error);
+              logger.error('Failed to parse podcast metadata:', error);
             }
           }
 
@@ -191,7 +187,7 @@ export const podcast = router({
         where: { 
           id: input.episodeId,
           type: ArtifactType.PODCAST_EPISODE,
-          workspace: { ownerId: ctx.session.user.id }
+          workspace: workspaceAccessFilter(ctx.session.user.id)
         },
         include: {
           versions: {
@@ -204,18 +200,18 @@ export const podcast = router({
         },
       });
 
-      console.log(episode)
+      logger.debug(episode)
 
       if (!episode) throw new TRPCError({ code: 'NOT_FOUND' });
       
       const latestVersion = episode.versions[0];
       if (!latestVersion) throw new TRPCError({ code: 'NOT_FOUND', message: 'No version found' });
       
-      console.log(latestVersion)
+      logger.debug(latestVersion)
       try {
         const metadata = podcastMetadataSchema.parse(latestVersion.data);
       } catch (error) {
-        console.error('Failed to parse podcast metadata:', error);
+        logger.error('Failed to parse podcast metadata:', error);
       }
       const metadata = podcastMetadataSchema.parse(latestVersion.data);
 
@@ -240,7 +236,7 @@ export const podcast = router({
                 order: segment.order,
               };
             } catch (error) {
-              console.error(`Failed to generate signed URL for segment ${segment.id}:`, error);
+              logger.error(`Failed to generate signed URL for segment ${segment.id}:`, error);
               return {
                 id: segment.id,
                 title: segment.title,
@@ -444,7 +440,7 @@ export const podcast = router({
 
           } catch (audioError) {
             const errorMessage = audioError instanceof Error ? audioError.message : 'Unknown error';
-            console.error(`❌ Error generating audio for segment ${i + 1}:`, {
+            logger.error(`❌ Error generating audio for segment ${i + 1}:`, {
               title: segment.title,
               error: errorMessage,
               stack: audioError instanceof Error ? audioError.stack : undefined,
@@ -471,7 +467,7 @@ export const podcast = router({
         
         // Check if any segments were successfully generated
         if (segments.length === 0) {
-          console.error('No segments were successfully generated');
+          logger.error('No segments were successfully generated');
           await PusherService.emitError(input.workspaceId, 
             `Failed to generate any segments. ${failedSegments.length} segment(s) failed.`, 
             'podcast'
@@ -539,7 +535,7 @@ export const podcast = router({
           }
           episodeSummary = JSON.parse(jsonMatch[0]);
         } catch (parseError) {
-          console.error('Failed to parse summary response:', summaryContent);
+          logger.error('Failed to parse summary response:', summaryContent);
           await PusherService.emitTaskComplete(input.workspaceId, 'podcast_summary_error', { 
             error: 'Failed to parse summary response'
           });
@@ -633,7 +629,7 @@ export const podcast = router({
 
       } catch (error) {
 
-        console.error('Error generating podcast episode:', error);
+        logger.error('Error generating podcast episode:', error);
 
         await ctx.db.artifact.delete({
           where: {
@@ -663,7 +659,7 @@ export const podcast = router({
         where: { 
           id: input.episodeId,
           type: ArtifactType.PODCAST_EPISODE,
-          workspace: { ownerId: ctx.session.user.id }
+          workspace: workspaceAccessFilter(ctx.session.user.id)
         },
         include: {
           versions: {
@@ -714,7 +710,7 @@ export const podcast = router({
         where: { 
           id: input.episodeId,
           type: ArtifactType.PODCAST_EPISODE,
-          workspace: { ownerId: ctx.session.user.id }
+          workspace: workspaceAccessFilter(ctx.session.user.id)
         },
         include: {
           versions: {
@@ -766,7 +762,7 @@ export const podcast = router({
         where: { 
           id: input.episodeId,
           type: ArtifactType.PODCAST_EPISODE,
-          workspace: { ownerId: ctx.session.user.id }
+          workspace: workspaceAccessFilter(ctx.session.user.id)
         },
         include: {
           versions: {
@@ -796,7 +792,7 @@ export const podcast = router({
             try {
               await deleteFromSupabase(segment.objectKey);
             } catch (error) {
-              console.error(`Failed to delete audio file ${segment.objectKey}:`, error);
+              logger.error(`Failed to delete audio file ${segment.objectKey}:`, error);
             }
           }
         }
@@ -825,7 +821,7 @@ export const podcast = router({
         return true;
 
       } catch (error) {
-        console.error('Error deleting episode:', error);
+        logger.error('Error deleting episode:', error);
         await PusherService.emitError(episode.workspaceId, `Failed to delete episode: ${error instanceof Error ? error.message : 'Unknown error'}`, 'podcast');
         throw new TRPCError({ 
           code: 'INTERNAL_SERVER_ERROR', 
@@ -842,7 +838,7 @@ export const podcast = router({
         where: { 
           id: input.segmentId,
           artifact: {
-            workspace: { ownerId: ctx.session.user.id }
+            workspace: workspaceAccessFilter(ctx.session.user.id)
           }
         },
         include: {
@@ -858,7 +854,7 @@ export const podcast = router({
         try {
           audioUrl = await generateSignedUrl(segment.objectKey, 24); // 24 hours
         } catch (error) {
-          console.error(`Failed to generate signed URL for segment ${segment.id}:`, error);
+          logger.error(`Failed to generate signed URL for segment ${segment.id}:`, error);
         }
       }
 

package/src/routers/studyguide.ts

@@ -1,12 +1,8 @@
 import { z } from 'zod';
 import { TRPCError } from '@trpc/server';
 import { router, authedProcedure } from '../trpc.js';
-import { title } from 'node:process';
-
-// Mirror Prisma enum to avoid direct type import
-const ArtifactType = {
-  STUDY_GUIDE: 'STUDY_GUIDE',
-} as const;
+import { ArtifactType } from '../lib/constants.js';
+import { workspaceAccessFilter } from '../lib/workspace-access.js';
 
 const initializeEditorJsEmptyBlock = () => ({
   time: Date.now(),
@@ -14,7 +10,7 @@ const initializeEditorJsEmptyBlock = () => ({
     {
       id: 'initial',
       type: 'paragraph',
-      data: { text: 'Start writing your study guide...' },
+      data: { text: 'Upload some files to begin creating your revision workspace...' },
     },
   ],
   version: '2.27.0',
@@ -34,14 +30,13 @@ export const studyguide = router({
         where: {
           workspaceId: input.workspaceId!,
           type: ArtifactType.STUDY_GUIDE,
-          workspace: { ownerId: ctx.session.user.id },
+          workspace: workspaceAccessFilter(ctx.session.user.id),
         },
         include: {
           versions: { orderBy: { version: 'desc' }, take: 1 },
         },
       });
 
-      console.log('artifact', artifact);
       if (!artifact) {
         artifact = await ctx.db.artifact.create({
           data: {
@@ -67,78 +62,77 @@ export const studyguide = router({
     }),
 
   // Edit study guide content by creating a new version, or create if doesn't exist
-  edit: authedProcedure
-    .input(
-      z.object({
-        workspaceId: z.string(),
-        studyGuideId: z.string().optional(),
-        content: z.string().min(1),
-        data: z.record(z.string(), z.unknown()).optional(),
-        title: z.string().min(1).optional(),
-      })
-    )
-    .mutation(async ({ ctx, input }) => {
-      let artifact;
+  // edit: authedProcedure
+  //   .input(
+  //     z.object({
+  //       workspaceId: z.string(),
+  //       studyGuideId: z.string().optional(),
+  //       content: z.string().min(1),
+  //       data: z.record(z.string(), z.unknown()).optional(),
+  //       title: z.string().min(1).optional(),
+  //     })
+  //   )
+  //   .mutation(async ({ ctx, input }) => {
+  //     let artifact;
       
-      if (input.studyGuideId) {
-        // Try to find existing study guide
-        artifact = await ctx.db.artifact.findFirst({
-          where: {
-            id: input.studyGuideId,
-            type: ArtifactType.STUDY_GUIDE,
-            workspace: { ownerId: ctx.session.user.id },
-          },
-        });
-      } else {
-        // Find by workspace if no specific studyGuideId provided
-        artifact = await ctx.db.artifact.findFirst({
-          where: {
-            workspaceId: input.workspaceId,
-            type: ArtifactType.STUDY_GUIDE,
-            workspace: { ownerId: ctx.session.user.id },
-          },
-        });
-      }
+  //     if (input.studyGuideId) {
+  //       // Try to find existing study guide
+  //       artifact = await ctx.db.artifact.findFirst({
+  //         where: {
+  //           id: input.studyGuideId,
+  //           type: ArtifactType.STUDY_GUIDE,
+  //           workspace: workspaceAccessFilter(ctx.session.user.id),
+  //         },
+  //       });
+  //     } else {
+  //       // Find by workspace if no specific studyGuideId provided
+  //       artifact = await ctx.db.artifact.findFirst({
+  //         where: {
+  //           workspaceId: input.workspaceId,
+  //           type: ArtifactType.STUDY_GUIDE,
+  //           workspace: workspaceAccessFilter(ctx.session.user.id),
+  //         },
+  //       });
+  //     }
       
-      // If no study guide found, create a new one
-      if (!artifact) {
-        artifact = await ctx.db.artifact.create({
-          data: {
-            workspaceId: input.workspaceId,
-            type: ArtifactType.STUDY_GUIDE,
-            title: 'Study Guide',
-            createdById: ctx.session.user.id,
-          },
-        });
-      }
+  //     // If no study guide found, create a new one
+  //     if (!artifact) {
+  //       artifact = await ctx.db.artifact.create({
+  //         data: {
+  //           workspaceId: input.workspaceId,
+  //           type: ArtifactType.STUDY_GUIDE,
+  //           title: 'Study Guide',
+  //           createdById: ctx.session.user.id,
+  //         },
+  //       });
+  //     }
 
-      const last = await ctx.db.artifactVersion.findFirst({
-        where: { artifactId: artifact.id },
-        orderBy: { version: 'desc' },
-      });
+  //     const last = await ctx.db.artifactVersion.findFirst({
+  //       where: { artifactId: artifact.id },
+  //       orderBy: { version: 'desc' },
+  //     });
 
-      if (input.title && input.title !== artifact.title) {
-        console.log('rename')
-        await ctx.db.artifact.update({
-          where: { id: artifact.id },
-          data: { title: input.title },
-        });
-      }
+  //     if (input.title && input.title !== artifact.title) {
+  //       await ctx.db.artifact.update({
+  //         where: { id: artifact.id },
+  //         data: { title: input.title },
+  //       });
+  //     }
       
-      const nextVersion = (last?.version ?? 0) + 1;
+  //     const nextVersion = (last?.version ?? 0) + 1;
 
-      const version = await ctx.db.artifactVersion.create({
-        data: {
-          artifactId: artifact.id,
-          content: input.content,
-          data: input.data as any,
-          version: nextVersion,
-          createdById: ctx.session.user.id,
-        },
-      });
+  //     const version = await ctx.db.artifactVersion.create({
+  //       data: {
+  //         artifactId: artifact.id,
+  //         content: input.content,
+  //         data: input.data ?? undefined,
+  //         version: nextVersion,
+  //         createdById: ctx.session.user.id,
+  //       },
+  //     });
 
-      return { artifactId: artifact.id, version };
-    }),
+  //     return { artifactId: artifact.id, version };
+  //   }),
 });
 
 

package/src/routers/worksheets.ts

@@ -4,11 +4,8 @@ import { router, authedProcedure } from '../trpc.js';
 import { aiSessionService } from '../lib/ai-session.js';
 import PusherService from '../lib/pusher.js';
 import { logger } from '../lib/logger.js';
-
-// Avoid importing Prisma enums directly; mirror values as string literals
-const ArtifactType = {
-  WORKSHEET: 'WORKSHEET',
-} as const;
+import { ArtifactType } from '../lib/constants.js';
+import { workspaceAccessFilter } from '../lib/workspace-access.js';
 
 const Difficulty = {
   EASY: 'EASY',
@@ -130,7 +127,7 @@ export const worksheets = router({
         where: {
           id: input.worksheetId,
           type: ArtifactType.WORKSHEET,
-          workspace: { ownerId: ctx.session.user.id },
+          workspace: workspaceAccessFilter(ctx.session.user.id),
         },
         include: { questions: true },
         orderBy: { updatedAt: 'desc' },
@@ -181,7 +178,7 @@ export const worksheets = router({
     }))
     .mutation(async ({ ctx, input }) => {
       const worksheet = await ctx.db.artifact.findFirst({
-        where: { id: input.worksheetId, type: ArtifactType.WORKSHEET, workspace: { ownerId: ctx.session.user.id } },
+        where: { id: input.worksheetId, type: ArtifactType.WORKSHEET, workspace: workspaceAccessFilter(ctx.session.user.id) },
       });
       if (!worksheet) throw new TRPCError({ code: 'NOT_FOUND' });
       return ctx.db.worksheetQuestion.create({
@@ -210,7 +207,7 @@ export const worksheets = router({
     }))
     .mutation(async ({ ctx, input }) => {
       const q = await ctx.db.worksheetQuestion.findFirst({
-        where: { id: input.worksheetQuestionId, artifact: { type: ArtifactType.WORKSHEET, workspace: { ownerId: ctx.session.user.id } } },
+        where: { id: input.worksheetQuestionId, artifact: { type: ArtifactType.WORKSHEET, workspace: workspaceAccessFilter(ctx.session.user.id) } },
       });
       if (!q) throw new TRPCError({ code: 'NOT_FOUND' });
       return ctx.db.worksheetQuestion.update({
@@ -231,7 +228,7 @@ export const worksheets = router({
     .input(z.object({ worksheetQuestionId: z.string() }))
     .mutation(async ({ ctx, input }) => {
       const q = await ctx.db.worksheetQuestion.findFirst({
-        where: { id: input.worksheetQuestionId, artifact: { workspace: { ownerId: ctx.session.user.id } } },
+        where: { id: input.worksheetQuestionId, artifact: { workspace: workspaceAccessFilter(ctx.session.user.id) } },
       });
       if (!q) throw new TRPCError({ code: 'NOT_FOUND' });
       await ctx.db.worksheetQuestion.delete({ where: { id: input.worksheetQuestionId } });
@@ -253,7 +250,7 @@ export const worksheets = router({
           id: input.problemId,
           artifact: {
             type: ArtifactType.WORKSHEET,
-            workspace: { ownerId: ctx.session.user.id },
+            workspace: workspaceAccessFilter(ctx.session.user.id),
           },
         },
       });
@@ -297,7 +294,7 @@ export const worksheets = router({
         where: {
           id: input.worksheetId,
           type: ArtifactType.WORKSHEET,
-          workspace: { ownerId: ctx.session.user.id },
+          workspace: workspaceAccessFilter(ctx.session.user.id),
         },
       });
       if (!worksheet) throw new TRPCError({ code: 'NOT_FOUND' });
@@ -342,7 +339,7 @@ export const worksheets = router({
         where: {
           id,
           type: ArtifactType.WORKSHEET,
-          workspace: { ownerId: ctx.session.user.id },
+          workspace: workspaceAccessFilter(ctx.session.user.id),
         },
       });
       if (!existingWorksheet) throw new TRPCError({ code: 'NOT_FOUND' });
@@ -388,7 +385,7 @@ export const worksheets = router({
     .input(z.object({ id: z.string() }))
     .mutation(async ({ ctx, input }) => {
       const deleted = await ctx.db.artifact.deleteMany({
-        where: { id: input.id, type: ArtifactType.WORKSHEET, workspace: { ownerId: ctx.session.user.id } },
+        where: { id: input.id, type: ArtifactType.WORKSHEET, workspace: workspaceAccessFilter(ctx.session.user.id) },
       });
       if (deleted.count === 0) throw new TRPCError({ code: 'NOT_FOUND' });
       return true;
@@ -484,7 +481,7 @@ export const worksheets = router({
       answer: z.string().min(1),
     }))
     .mutation(async ({ ctx, input }) => {
-      const worksheet = await ctx.db.artifact.findFirst({ where: { id: input.worksheetId, type: ArtifactType.WORKSHEET, workspace: { ownerId: ctx.session.user.id } }, include: { workspace: true } });
+      const worksheet = await ctx.db.artifact.findFirst({ where: { id: input.worksheetId, type: ArtifactType.WORKSHEET, workspace: workspaceAccessFilter(ctx.session.user.id) }, include: { workspace: true } });
       if (!worksheet) throw new TRPCError({ code: 'NOT_FOUND' });
       const question = await ctx.db.worksheetQuestion.findFirst({ where: { id: input.questionId, artifactId: input.worksheetId } });
       if (!question) throw new TRPCError({ code: 'NOT_FOUND' });