@hed-hog/lms 0.0.353 → 0.0.354

package/src/course/course.module.ts

@@ -2,14 +2,16 @@ import { PrismaModule } from '@hed-hog/api-prisma';
 import { CoreModule } from '@hed-hog/core';
 import { QueueModule } from '@hed-hog/queue';
 import { forwardRef, Module } from '@nestjs/common';
+import { InstructorModule } from '../instructor/instructor.module';
+import { CourseLessonController } from './course-lesson.controller';
 import { CourseOperationsIntegrationService } from './course-operations-integration.service';
 import { CourseStructureController } from './course-structure.controller';
+import { LmsSettingController } from './lms-setting.controller';
 import { CourseStructureService } from './course-structure.service';
 import { CourseVideoConversionService } from './course-video-conversion.service';
-import { LmsCoursesMcpTools } from './course.mcp-tools';
 import { CourseController } from './course.controller';
+import { LmsCoursesMcpTools } from './course.mcp-tools';
 import { CourseService } from './course.service';
-import { InstructorModule } from '../instructor/instructor.module';
 
 @Module({
   imports: [
@@ -18,7 +20,7 @@ import { InstructorModule } from '../instructor/instructor.module';
     forwardRef(() => CoreModule),
     forwardRef(() => QueueModule),
   ],
-  controllers: [CourseController, CourseStructureController],
+  controllers: [CourseController, CourseStructureController, CourseLessonController, LmsSettingController],
   providers: [
     CourseOperationsIntegrationService,
     CourseService,

package/src/course/course.service.ts

@@ -258,65 +258,76 @@ export class CourseService {
   }
 
   async getById(id: number) {
-    const c = await this.prisma.course.findUnique({
-      where: { id },
-      include: {
-        course_category: {
-          include: {
-            category: { select: { id: true, slug: true } },
-          },
-        },
-        course_image: {
-          where: {
-            image_type: {
-              slug: { in: ['course-logo', 'course-banner'] },
+    const [c, lessonInstructors] = await Promise.all([
+      this.prisma.course.findUnique({
+        where: { id },
+        include: {
+          course_category: {
+            include: {
+              category: { select: { id: true, slug: true } },
             },
           },
-          include: {
-            image_type: {
-              select: {
-                slug: true,
-                suggested_width: true,
-                suggested_height: true,
-                allowed_extensions: true,
-                aspect_ratio: true,
+          course_image: {
+            where: {
+              image_type: {
+                slug: { in: ['course-logo', 'course-banner'] },
               },
             },
-            file: {
-              select: { id: true, filename: true },
-            },
-          },
-          orderBy: [{ is_primary: 'desc' }, { order: 'asc' }],
-        },
-        course_instructor: {
-          include: {
-            instructor: {
-              select: {
-                id: true,
-                person: {
-                  select: {
-                    id: true,
-                    name: true,
-                    avatar_id: true,
-                  },
+            include: {
+              image_type: {
+                select: {
+                  slug: true,
+                  suggested_width: true,
+                  suggested_height: true,
+                  allowed_extensions: true,
+                  aspect_ratio: true,
                 },
               },
+              file: {
+                select: { id: true, filename: true },
+              },
+            },
+            orderBy: [{ is_primary: 'desc' }, { order: 'asc' }],
+          },
+          certificate_template: {
+            select: { id: true, slug: true },
+          },
+          _count: {
+            select: {
+              course_enrollment: true,
+              course_module: true,
+              course_class_group: true,
+              certificate: true,
             },
           },
         },
-        certificate_template: {
-          select: { id: true, slug: true },
+      }),
+      this.prisma.course_lesson_instructor.findMany({
+        where: {
+          course_lesson: {
+            course_module: {
+              course_id: id,
+            },
+          },
         },
-        _count: {
-          select: {
-            course_enrollment: true,
-            course_module: true,
-            course_class_group: true,
-            certificate: true,
+        select: {
+          instructor_id: true,
+          role: true,
+          instructor: {
+            select: {
+              id: true,
+              person: {
+                select: {
+                  id: true,
+                  name: true,
+                  avatar_id: true,
+                },
+              },
+            },
           },
         },
-      },
-    });
+      }),
+    ]);
 
     if (!c) return null;
 
@@ -385,6 +396,7 @@ export class CourseService {
       },
       extrasById.get(id),
       projectLinksById.get(id),
+      lessonInstructors,
     );
   }
 
@@ -393,7 +405,6 @@ export class CourseService {
       categorySlugs,
       logoFileId,
       bannerFileId,
-      instructorIds,
       certificateModel,
       operationsProjectId,
       ...data
@@ -414,22 +425,14 @@ export class CourseService {
         })
       : [];
 
-    // Validate instructor IDs if provided
-    let validInstructorIds: number[] = [];
-    if (instructorIds?.length) {
-      const instructors = await this.prisma.instructor.findMany({
-        where: { id: { in: instructorIds } },
-        select: { id: true },
-      });
-      const validIds = new Set(instructors.map((i) => i.id));
-      validInstructorIds = instructorIds.filter((id) => validIds.has(id));
-    }
-
     const c = await this.prisma.course.create({
       data: {
         name: data.name,
         slug: normalizedSlug,
         title: resolvedTitle,
+        ...(data.locale_id !== undefined && {
+          locale_id: data.locale_id,
+        }),
         ...(data.description !== undefined && {
           description: data.description,
         }),
@@ -472,14 +475,6 @@ export class CourseService {
             create: categories.map((item) => ({ category_id: item.id })),
           },
         }),
-        ...(validInstructorIds.length > 0 && {
-          course_instructor: {
-            create: validInstructorIds.map((instructorId) => ({
-              instructor_id: instructorId,
-              role: 'lead',
-            })),
-          },
-        }),
       },
       include: {
         course_category: {
@@ -501,22 +496,6 @@ export class CourseService {
           },
           orderBy: [{ is_primary: 'desc' }, { order: 'asc' }],
         },
-        course_instructor: {
-          include: {
-            instructor: {
-              select: {
-                id: true,
-                person: {
-                  select: {
-                    id: true,
-                    name: true,
-                    avatar_id: true,
-                  },
-                },
-              },
-            },
-          },
-        },
         certificate_template: {
           select: { id: true, slug: true },
         },
@@ -566,7 +545,6 @@ export class CourseService {
       categorySlugs,
       logoFileId,
       bannerFileId,
-      instructorIds,
       certificateModel,
       operationsProjectId,
       ...data
@@ -605,21 +583,6 @@ export class CourseService {
         })
       : [];
 
-    // Validate instructor IDs if provided
-    let validInstructorIds: number[] | undefined;
-    if (instructorIds !== undefined) {
-      if (instructorIds.length === 0) {
-        validInstructorIds = [];
-      } else {
-        const instructors = await this.prisma.instructor.findMany({
-          where: { id: { in: instructorIds } },
-          select: { id: true },
-        });
-        const validIds = new Set(instructors.map((i) => i.id));
-        validInstructorIds = instructorIds.filter((id) => validIds.has(id));
-      }
-    }
-
     if (categorySlugs !== undefined) {
       await this.prisma.course_category.deleteMany({
         where: { course_id: id },
@@ -632,6 +595,9 @@ export class CourseService {
         ...(data.name !== undefined && { name: data.name }),
         ...(resolvedSlug !== undefined && { slug: resolvedSlug }),
         ...(resolvedTitle !== undefined && { title: resolvedTitle }),
+        ...(data.locale_id !== undefined && {
+          locale_id: data.locale_id,
+        }),
         ...(data.description !== undefined && { description: data.description }),
         ...(data.level !== undefined && {
           level: this.normalizeLevel(data.level),
@@ -700,22 +666,6 @@ export class CourseService {
           },
           orderBy: [{ is_primary: 'desc' }, { order: 'asc' }],
         },
-        course_instructor: {
-          include: {
-            instructor: {
-              select: {
-                id: true,
-                person: {
-                  select: {
-                    id: true,
-                    name: true,
-                    avatar_id: true,
-                  },
-                },
-              },
-            },
-          },
-        },
         certificate_template: {
           select: { id: true, slug: true },
         },
@@ -723,23 +673,6 @@ export class CourseService {
       },
     });
 
-    // Handle instructor relationships
-    if (validInstructorIds !== undefined) {
-      await this.prisma.course_instructor.deleteMany({
-        where: { course_id: id },
-      });
-
-      if (validInstructorIds.length > 0) {
-        await this.prisma.course_instructor.createMany({
-          data: validInstructorIds.map((instructorId) => ({
-            course_id: id,
-            instructor_id: instructorId,
-            role: 'lead',
-          })),
-        });
-      }
-    }
-
     await this.syncCourseImages(id, {
       logoFileId,
       bannerFileId,
@@ -808,6 +741,18 @@ export class CourseService {
     },
     extras?: CourseExtraFields,
     project?: CourseProjectFields,
+    lessonInstructors?: Array<{
+      instructor_id: number;
+      role: string;
+      instructor?: {
+        id: number;
+        person?: {
+          id: number;
+          name: string;
+          avatar_id?: number | null;
+        } | null;
+      } | null;
+    }>,
   ) {
     const resolvedName = extras?.name ?? c.name ?? null;
     const resolvedTitle = this.normalizeOptionalText(c.title) ?? c.slug;
@@ -829,6 +774,7 @@ export class CourseService {
       name: resolvedName ?? '',
       slug: c.slug,
       code: c.code ?? null,
+      locale_id: c.locale_id ?? null,
       title: resolvedTitle,
       description: c.description ?? '',
       level: c.level,
@@ -894,14 +840,16 @@ export class CourseService {
           ? String(c.certificate_template_id)
           : null),
       progressByModule: metrics?.progressByModule ?? [],
-      instructors: (c.course_instructor ?? []).map((ci: any) => ({
-        id: ci.instructor_id,
-        name: ci.instructor?.person?.name ?? `Instructor #${ci.instructor_id}`,
-        avatarId: ci.instructor?.person?.avatar_id ?? null,
+      instructors: Array.from(
+        new Map(
+          (lessonInstructors ?? []).map((item) => [item.instructor_id, item]),
+        ).values(),
+      ).map((item) => ({
+        id: item.instructor_id,
+        name:
+          item.instructor?.person?.name ?? `Instructor #${item.instructor_id}`,
+        avatarId: item.instructor?.person?.avatar_id ?? null,
       })),
-      instructorIds: (c.course_instructor ?? []).map(
-        (ci: any) => ci.instructor_id,
-      ),
       createdAt: c.created_at,
     };
   }

package/src/course/dto/create-course-lesson-frame.dto.ts

@@ -0,0 +1,14 @@
+import { Type } from 'class-transformer';
+import { IsInt, Min } from 'class-validator';
+
+export class CreateCourseLessonFrameDto {
+  @Type(() => Number)
+  @IsInt()
+  @Min(0)
+  timeSeconds: number;
+
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  fileId: number;
+}

package/src/course/dto/create-course-structure-lesson.dto.ts

@@ -7,11 +7,26 @@ import {
     IsNotEmpty,
     IsOptional,
     IsString,
+    Matches,
     MaxLength,
     Min,
     ValidateNested,
 } from 'class-validator';
 
+const COURSE_LESSON_FILE_TYPES = [
+  'lesson_audio',
+  'student_download',
+  'supplementary_material',
+  'video_original',
+] as const;
+
+const COURSE_LESSON_FILE_TYPE_REGEX =
+  /^(lesson_audio|student_download|supplementary_material|video_original|video_profile:\d+)$/;
+
+export type CourseLessonFileType =
+  | (typeof COURSE_LESSON_FILE_TYPES)[number]
+  | `video_profile:${number}`;
+
 class CourseLessonResourceDto {
   @IsString()
   @IsNotEmpty()
@@ -23,13 +38,14 @@ class CourseLessonResourceDto {
   @IsOptional()
   fileId?: number;
 
-  @IsString()
+  @Matches(COURSE_LESSON_FILE_TYPE_REGEX)
   @IsOptional()
-  tipo?: string;
+  type?: CourseLessonFileType;
 
   @IsBoolean()
   @IsOptional()
-  publico?: boolean;
+  is_public?: boolean;
+
 }
 
 export class CreateLessonVideoConversionDto {

package/src/course/dto/create-course.dto.ts

@@ -106,11 +106,6 @@ export class CreateCourseDto {
   @IsOptional()
   certificateModel?: string | null;
 
-  @IsArray()
-  @IsInt({ each: true })
-  @IsOptional()
-  instructorIds?: number[];
-
   @IsInt()
   @IsOptional()
   logoFileId?: number | null;
@@ -119,6 +114,11 @@ export class CreateCourseDto {
   @IsOptional()
   bannerFileId?: number | null;
 
+  @Type(() => Number)
+  @IsInt()
+  @IsOptional()
+  locale_id?: number | null;
+
   @Type(() => Number)
   @IsInt()
   @IsOptional()

package/src/course/dto/update-course-lesson-frame.dto.ts

@@ -0,0 +1,16 @@
+import { Type } from 'class-transformer';
+import { IsInt, IsOptional, Min } from 'class-validator';
+
+export class UpdateCourseLessonFrameDto {
+  @Type(() => Number)
+  @IsInt()
+  @Min(0)
+  @IsOptional()
+  timeSeconds?: number;
+
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  @IsOptional()
+  fileId?: number;
+}

package/src/course/dto/update-course-resources.dto.ts

@@ -6,11 +6,26 @@ import {
     IsNotEmpty,
     IsOptional,
     IsString,
+    Matches,
     MaxLength,
     Min,
     ValidateNested,
 } from 'class-validator';
 
+const COURSE_LESSON_FILE_TYPES = [
+  'lesson_audio',
+  'student_download',
+  'supplementary_material',
+  'video_original',
+] as const;
+
+const COURSE_LESSON_FILE_TYPE_REGEX =
+  /^(lesson_audio|student_download|supplementary_material|video_original|video_profile:\d+)$/;
+
+type CourseLessonFileType =
+  | (typeof COURSE_LESSON_FILE_TYPES)[number]
+  | `video_profile:${number}`;
+
 class CourseResourceDto {
   @IsString()
   @IsNotEmpty()
@@ -22,13 +37,13 @@ class CourseResourceDto {
   @IsOptional()
   fileId?: number;
 
-  @IsString()
+  @Matches(COURSE_LESSON_FILE_TYPE_REGEX)
   @IsOptional()
-  tipo?: string;
+  type?: CourseLessonFileType;
 
   @IsBoolean()
   @IsOptional()
-  publico?: boolean;
+  is_public?: boolean;
 }
 
 export class UpdateCourseResourcesDto {

package/src/course/dto/update-transcription-segments.dto.ts

@@ -0,0 +1,20 @@
+import { Type } from 'class-transformer';
+import { IsArray, IsNumber, IsString, ValidateNested } from 'class-validator';
+
+class TranscriptionSegmentItemDTO {
+  @IsNumber()
+  startSeconds: number;
+
+  @IsNumber()
+  endSeconds: number;
+
+  @IsString()
+  text: string;
+}
+
+export class UpdateTranscriptionSegmentsDTO {
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => TranscriptionSegmentItemDTO)
+  segments: TranscriptionSegmentItemDTO[];
+}

package/src/course/lms-setting.controller.ts

@@ -0,0 +1,30 @@
+import { SettingService } from '@hed-hog/core';
+import { Controller, forwardRef, Get, Inject } from '@nestjs/common';
+import { Role } from '@hed-hog/api';
+
+@Role()
+@Controller('lms/settings')
+export class LmsSettingController {
+  constructor(
+    @Inject(forwardRef(() => SettingService))
+    private readonly settingService: SettingService,
+  ) {}
+
+  @Get()
+  async getFeatureFlags() {
+    const v = await this.settingService.getSettingValues([
+      'lms-video-conversion-enabled',
+      'lms-image-extraction-enabled',
+      'lms-audio-transcription-enabled',
+      'lms-youtube-provider-enabled',
+      'lms-vimeo-provider-enabled',
+    ]);
+    return {
+      videoConversionEnabled: v['lms-video-conversion-enabled'] !== false,
+      imageExtractionEnabled: v['lms-image-extraction-enabled'] !== false,
+      transcriptionEnabled: v['lms-audio-transcription-enabled'] !== false,
+      youtubeEnabled: v['lms-youtube-provider-enabled'] !== false,
+      vimeoEnabled: v['lms-vimeo-provider-enabled'] !== false,
+    };
+  }
+}