feat: add enrichWithNames to admin learning API
All checks were successful
Deploy API Server / build-and-deploy (push) Successful in 50s
All checks were successful
Deploy API Server / build-and-deploy (push) Successful in 50s
All list endpoints now return userName, kbName, materialName resolved from User, KnowledgeBase, KnowledgeSource tables. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
parent
af8d95cdb6
commit
ff4135b7c6
@ -9,6 +9,39 @@ export class AdminLearningService {
|
|||||||
private readonly snapshotBuilder: SnapshotBuilderService,
|
private readonly snapshotBuilder: SnapshotBuilderService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
// ══ Name resolution ══
|
||||||
|
|
||||||
|
private async enrichWithNames<T extends Record<string, any>>(items: T[]): Promise<(T & { userName?: string; kbName?: string; materialName?: string })[]> {
|
||||||
|
if (items.length === 0) return items;
|
||||||
|
|
||||||
|
const userIds = [...new Set(items.map(i => i.userId).filter(Boolean))];
|
||||||
|
const kbIds = [...new Set(items.map(i => i.knowledgeBaseId).filter(Boolean))];
|
||||||
|
const materialIds = [...new Set(items.map(i => i.materialId).filter(Boolean))];
|
||||||
|
|
||||||
|
const [users, kbs, materials] = await Promise.all([
|
||||||
|
userIds.length > 0
|
||||||
|
? this.prisma.user.findMany({ where: { id: { in: userIds } }, select: { id: true, nickname: true } })
|
||||||
|
: [],
|
||||||
|
kbIds.length > 0
|
||||||
|
? this.prisma.knowledgeBase.findMany({ where: { id: { in: kbIds } }, select: { id: true, title: true } })
|
||||||
|
: [],
|
||||||
|
materialIds.length > 0
|
||||||
|
? this.prisma.knowledgeSource.findMany({ where: { id: { in: materialIds } }, select: { id: true, originalFilename: true, title: true } })
|
||||||
|
: [],
|
||||||
|
]);
|
||||||
|
|
||||||
|
const userMap = new Map<string, string>(users.map(u => [u.id, u.nickname || u.id] as [string, string]));
|
||||||
|
const kbMap = new Map<string, string>(kbs.map(k => [k.id, k.title] as [string, string]));
|
||||||
|
const matMap = new Map<string, string>(materials.map(m => [m.id, m.originalFilename || m.title || m.id] as [string, string]));
|
||||||
|
|
||||||
|
return items.map(item => ({
|
||||||
|
...item,
|
||||||
|
userName: userMap.get(item.userId),
|
||||||
|
kbName: kbMap.get(item.knowledgeBaseId),
|
||||||
|
materialName: matMap.get(item.materialId),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
// ══ Knowledge Bases (for filter dropdown) ══
|
// ══ Knowledge Bases (for filter dropdown) ══
|
||||||
|
|
||||||
async getKnowledgeBases() {
|
async getKnowledgeBases() {
|
||||||
@ -112,7 +145,7 @@ export class AdminLearningService {
|
|||||||
this.prisma.readingEvent.findMany({ where, orderBy, skip: (page - 1) * limit, take: limit }),
|
this.prisma.readingEvent.findMany({ where, orderBy, skip: (page - 1) * limit, take: limit }),
|
||||||
this.prisma.readingEvent.count({ where }),
|
this.prisma.readingEvent.count({ where }),
|
||||||
]);
|
]);
|
||||||
return { items, total, page, limit };
|
const enriched = await this.enrichWithNames(items); return { items: enriched, total, page, limit };
|
||||||
}
|
}
|
||||||
|
|
||||||
async getReadingEvent(id: string) {
|
async getReadingEvent(id: string) {
|
||||||
@ -138,7 +171,7 @@ export class AdminLearningService {
|
|||||||
this.prisma.learningSession.findMany({ where, orderBy: { startedAt: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
this.prisma.learningSession.findMany({ where, orderBy: { startedAt: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
||||||
this.prisma.learningSession.count({ where }),
|
this.prisma.learningSession.count({ where }),
|
||||||
]);
|
]);
|
||||||
return { items, total, page, limit };
|
const enriched = await this.enrichWithNames(items); return { items: enriched, total, page, limit };
|
||||||
}
|
}
|
||||||
|
|
||||||
async getSession(id: string) {
|
async getSession(id: string) {
|
||||||
@ -161,7 +194,7 @@ export class AdminLearningService {
|
|||||||
this.prisma.materialReadingProgress.findMany({ where, orderBy: { lastReadAt: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
this.prisma.materialReadingProgress.findMany({ where, orderBy: { lastReadAt: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
||||||
this.prisma.materialReadingProgress.count({ where }),
|
this.prisma.materialReadingProgress.count({ where }),
|
||||||
]);
|
]);
|
||||||
return { items, total, page, limit };
|
const enriched = await this.enrichWithNames(items); return { items: enriched, total, page, limit };
|
||||||
}
|
}
|
||||||
|
|
||||||
async getProgressDetail(id: string) {
|
async getProgressDetail(id: string) {
|
||||||
@ -184,7 +217,7 @@ export class AdminLearningService {
|
|||||||
this.prisma.dailyLearningActivity.findMany({ where, orderBy: { activityDate: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
this.prisma.dailyLearningActivity.findMany({ where, orderBy: { activityDate: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
||||||
this.prisma.dailyLearningActivity.count({ where }),
|
this.prisma.dailyLearningActivity.count({ where }),
|
||||||
]);
|
]);
|
||||||
return { items, total, page, limit };
|
const enriched = await this.enrichWithNames(items); return { items: enriched, total, page, limit };
|
||||||
}
|
}
|
||||||
|
|
||||||
// ══ Records ══
|
// ══ Records ══
|
||||||
@ -202,7 +235,7 @@ export class AdminLearningService {
|
|||||||
this.prisma.learningRecord.findMany({ where, orderBy: { occurredAt: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
this.prisma.learningRecord.findMany({ where, orderBy: { occurredAt: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
||||||
this.prisma.learningRecord.count({ where }),
|
this.prisma.learningRecord.count({ where }),
|
||||||
]);
|
]);
|
||||||
return { items, total, page, limit };
|
const enriched = await this.enrichWithNames(items); return { items: enriched, total, page, limit };
|
||||||
}
|
}
|
||||||
|
|
||||||
async getRecord(id: string) {
|
async getRecord(id: string) {
|
||||||
@ -225,7 +258,7 @@ export class AdminLearningService {
|
|||||||
}),
|
}),
|
||||||
this.prisma.aiAnalysisResult.count({ where }),
|
this.prisma.aiAnalysisResult.count({ where }),
|
||||||
]);
|
]);
|
||||||
return { items, total, page, limit };
|
const enriched = await this.enrichWithNames(items); return { items: enriched, total, page, limit };
|
||||||
}
|
}
|
||||||
|
|
||||||
// ══ AI Usage ══
|
// ══ AI Usage ══
|
||||||
@ -243,7 +276,7 @@ export class AdminLearningService {
|
|||||||
}),
|
}),
|
||||||
this.prisma.aiUsageLog.count({ where }),
|
this.prisma.aiUsageLog.count({ where }),
|
||||||
]);
|
]);
|
||||||
return { items, total, page, limit };
|
const enriched = await this.enrichWithNames(items); return { items: enriched, total, page, limit };
|
||||||
}
|
}
|
||||||
|
|
||||||
// ══ Timeline ══
|
// ══ Timeline ══
|
||||||
@ -310,7 +343,7 @@ export class AdminLearningService {
|
|||||||
this.prisma.temporaryReadingMaterial.findMany({ orderBy: { createdAt: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
this.prisma.temporaryReadingMaterial.findMany({ orderBy: { createdAt: 'desc' }, skip: (page - 1) * limit, take: limit }),
|
||||||
this.prisma.temporaryReadingMaterial.count(),
|
this.prisma.temporaryReadingMaterial.count(),
|
||||||
]);
|
]);
|
||||||
return { items, total, page, limit };
|
const enriched = await this.enrichWithNames(items); return { items: enriched, total, page, limit };
|
||||||
}
|
}
|
||||||
|
|
||||||
// ══ Operations ══
|
// ══ Operations ══
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user