From 22ed18404f199dc2b9401659a5c21a105feff2cf Mon Sep 17 00:00:00 2001 From: wangdl Date: Mon, 8 Jun 2026 21:12:36 +0800 Subject: [PATCH] fix: import paths + dead code cleanup + export ProcessResult - Fix PrismaService/PrismaModule import paths (infrastructure/database/) - Remove dead upsertFromReadingEvent wrappers in learning-activity/learning-session services - Export ProcessResult interface for controller return type Co-Authored-By: Claude Opus 4.7 --- .../learning-activity.service.ts | 10 +--------- .../learning-record/learning-record.module.ts | 2 +- .../learning-record/learning-record.service.ts | 2 +- .../learning-session/learning-session.service.ts | 15 --------------- .../material-reading-progress.module.ts | 2 +- .../material-reading-progress.service.ts | 2 +- .../reading-event-processor.service.ts | 4 ++-- .../reading-event/reading-event.controller.ts | 2 +- src/modules/reading-event/reading-event.module.ts | 2 +- .../reading-event/reading-event.service.ts | 2 +- src/modules/reading/reading.controller.ts | 2 +- src/modules/reading/reading.module.ts | 2 +- .../temporary-reading-material.module.ts | 2 +- .../temporary-reading-material.service.ts | 2 +- 14 files changed, 14 insertions(+), 37 deletions(-) diff --git a/src/modules/learning-activity/learning-activity.service.ts b/src/modules/learning-activity/learning-activity.service.ts index f66ca07..8f42234 100644 --- a/src/modules/learning-activity/learning-activity.service.ts +++ b/src/modules/learning-activity/learning-activity.service.ts @@ -130,13 +130,5 @@ export class LearningActivityService { } /** M8: Upsert daily activity from a reading event. */ - async upsertFromReadingEvent(data: { - userId: string; - activityDate: Date; - activeSecondsDelta: number; - isNewMaterial?: boolean; - isMarkedRead?: boolean; - }) { - return this.repository.upsertFromReadingEvent(data); - } + // M8: upsert handled directly by repository in ProcessorService transaction — remove unused wrapper } diff --git a/src/modules/learning-record/learning-record.module.ts b/src/modules/learning-record/learning-record.module.ts index 189bc2c..67b706a 100644 --- a/src/modules/learning-record/learning-record.module.ts +++ b/src/modules/learning-record/learning-record.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { PrismaModule } from '../../infrastructure/prisma.module'; +import { PrismaModule } from '../../infrastructure/database/prisma.module'; import { LearningRecordService } from './learning-record.service'; @Module({ diff --git a/src/modules/learning-record/learning-record.service.ts b/src/modules/learning-record/learning-record.service.ts index a56250d..cc1f417 100644 --- a/src/modules/learning-record/learning-record.service.ts +++ b/src/modules/learning-record/learning-record.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { PrismaService } from '../../infrastructure/prisma.service'; +import { PrismaService } from '../../infrastructure/database/prisma.service'; export const LEARNING_RECORD_TYPES = [ 'reading', diff --git a/src/modules/learning-session/learning-session.service.ts b/src/modules/learning-session/learning-session.service.ts index e5c6c9e..3ab52cf 100644 --- a/src/modules/learning-session/learning-session.service.ts +++ b/src/modules/learning-session/learning-session.service.ts @@ -19,19 +19,4 @@ export class LearningSessionService { return this.repository.findByUserId(userId, opts); } - /** Upsert a session from a reading event (M8 aggregation). */ - async upsertFromReadingEvent(data: { - userId: string; - clientSessionId: string; - materialId: string; - readingTargetType: string; - knowledgeBaseId?: string | null; - eventType: string; - activeSecondsDelta: number; - position?: any; - timestampMs: number; - startedAt: Date; - }) { - return this.repository.upsertByClientSession(data); - } } diff --git a/src/modules/material-reading-progress/material-reading-progress.module.ts b/src/modules/material-reading-progress/material-reading-progress.module.ts index 5023f68..0e9ad52 100644 --- a/src/modules/material-reading-progress/material-reading-progress.module.ts +++ b/src/modules/material-reading-progress/material-reading-progress.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { PrismaModule } from '../../infrastructure/prisma.module'; +import { PrismaModule } from '../../infrastructure/database/prisma.module'; import { MaterialReadingProgressService } from './material-reading-progress.service'; @Module({ diff --git a/src/modules/material-reading-progress/material-reading-progress.service.ts b/src/modules/material-reading-progress/material-reading-progress.service.ts index 370902c..c61a678 100644 --- a/src/modules/material-reading-progress/material-reading-progress.service.ts +++ b/src/modules/material-reading-progress/material-reading-progress.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { PrismaService } from '../../infrastructure/prisma.service'; +import { PrismaService } from '../../infrastructure/database/prisma.service'; @Injectable() export class MaterialReadingProgressService { diff --git a/src/modules/reading-event/reading-event-processor.service.ts b/src/modules/reading-event/reading-event-processor.service.ts index 37d6f26..a032944 100644 --- a/src/modules/reading-event/reading-event-processor.service.ts +++ b/src/modules/reading-event/reading-event-processor.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { PrismaService } from '../../infrastructure/prisma.service'; +import { PrismaService } from '../../infrastructure/database/prisma.service'; import { LearningSessionRepository } from '../learning-session/learning-session.repository'; import { LearningActivityRepository } from '../learning-activity/learning-activity.repository'; import { LearningRecordService } from '../learning-record/learning-record.service'; @@ -12,7 +12,7 @@ const VALID_EVENT_TYPES = new Set([ const VALID_TARGET_TYPES = new Set(['knowledge_source', 'temporary_file']); const MAX_DELTA = 300; -interface ProcessResult { +export interface ProcessResult { processed: number; duplicate: number; failed: number; diff --git a/src/modules/reading-event/reading-event.controller.ts b/src/modules/reading-event/reading-event.controller.ts index 222b62e..d962202 100644 --- a/src/modules/reading-event/reading-event.controller.ts +++ b/src/modules/reading-event/reading-event.controller.ts @@ -1,6 +1,6 @@ import { Body, Controller, Param, Post, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common'; import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard'; -import { PrismaService } from '../../infrastructure/prisma.service'; +import { PrismaService } from '../../infrastructure/database/prisma.service'; import { BatchUploadReadingEventsDto } from './reading-event.dto'; import { ReadingEventProcessorService } from './reading-event-processor.service'; diff --git a/src/modules/reading-event/reading-event.module.ts b/src/modules/reading-event/reading-event.module.ts index c2bb972..9cdfc43 100644 --- a/src/modules/reading-event/reading-event.module.ts +++ b/src/modules/reading-event/reading-event.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { PrismaModule } from '../../infrastructure/prisma.module'; +import { PrismaModule } from '../../infrastructure/database/prisma.module'; import { LearningSessionModule } from '../learning-session/learning-session.module'; import { LearningActivityModule } from '../learning-activity/learning-activity.module'; import { LearningRecordModule } from '../learning-record/learning-record.module'; diff --git a/src/modules/reading-event/reading-event.service.ts b/src/modules/reading-event/reading-event.service.ts index 265dd61..a7384e7 100644 --- a/src/modules/reading-event/reading-event.service.ts +++ b/src/modules/reading-event/reading-event.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { PrismaService } from '../../infrastructure/prisma.service'; +import { PrismaService } from '../../infrastructure/database/prisma.service'; @Injectable() export class ReadingEventService { diff --git a/src/modules/reading/reading.controller.ts b/src/modules/reading/reading.controller.ts index b1738b7..ebd2c30 100644 --- a/src/modules/reading/reading.controller.ts +++ b/src/modules/reading/reading.controller.ts @@ -1,6 +1,6 @@ import { Controller, Get, Param, Query, Req, UseGuards } from '@nestjs/common'; import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard'; -import { PrismaService } from '../../infrastructure/prisma.service'; +import { PrismaService } from '../../infrastructure/database/prisma.service'; import { LearningActivityRepository } from '../learning-activity/learning-activity.repository'; import { LearningRecordService } from '../learning-record/learning-record.service'; import { MaterialReadingProgressService } from '../material-reading-progress/material-reading-progress.service'; diff --git a/src/modules/reading/reading.module.ts b/src/modules/reading/reading.module.ts index e35ec98..8b9edae 100644 --- a/src/modules/reading/reading.module.ts +++ b/src/modules/reading/reading.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { PrismaModule } from '../../infrastructure/prisma.module'; +import { PrismaModule } from '../../infrastructure/database/prisma.module'; import { LearningActivityModule } from '../learning-activity/learning-activity.module'; import { LearningRecordModule } from '../learning-record/learning-record.module'; import { MaterialReadingProgressModule } from '../material-reading-progress/material-reading-progress.module'; diff --git a/src/modules/temporary-reading-material/temporary-reading-material.module.ts b/src/modules/temporary-reading-material/temporary-reading-material.module.ts index cea8019..13578c4 100644 --- a/src/modules/temporary-reading-material/temporary-reading-material.module.ts +++ b/src/modules/temporary-reading-material/temporary-reading-material.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { PrismaModule } from '../../infrastructure/prisma.module'; +import { PrismaModule } from '../../infrastructure/database/prisma.module'; import { TemporaryReadingMaterialService } from './temporary-reading-material.service'; @Module({ diff --git a/src/modules/temporary-reading-material/temporary-reading-material.service.ts b/src/modules/temporary-reading-material/temporary-reading-material.service.ts index f0d7ae9..0547232 100644 --- a/src/modules/temporary-reading-material/temporary-reading-material.service.ts +++ b/src/modules/temporary-reading-material/temporary-reading-material.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { PrismaService } from '../../infrastructure/prisma.service'; +import { PrismaService } from '../../infrastructure/database/prisma.service'; @Injectable() export class TemporaryReadingMaterialService {