@hed-hog/lms 0.0.338 → 0.0.347

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/lms",
-  "version": "0.0.338",
+  "version": "0.0.347",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -11,13 +11,13 @@
     "@nestjs/mapped-types": "*",
     "@hed-hog/api-prisma": "0.0.6",
     "@hed-hog/api-types": "0.0.1",
+    "@hed-hog/api-locale": "0.0.14",
     "@hed-hog/api": "0.0.8",
     "@hed-hog/api-pagination": "0.0.7",
-    "@hed-hog/api-locale": "0.0.14",
-    "@hed-hog/contact": "0.0.338",
-    "@hed-hog/category": "0.0.338",
-    "@hed-hog/core": "0.0.338",
-    "@hed-hog/finance": "0.0.338"
+    "@hed-hog/category": "0.0.347",
+    "@hed-hog/contact": "0.0.347",
+    "@hed-hog/finance": "0.0.347",
+    "@hed-hog/core": "0.0.347"
   },
   "exports": {
     ".": {

package/src/course/course.controller.ts

@@ -28,6 +28,7 @@ export class CourseController {
     @Query('status') status?: string,
     @Query('level') level?: string,
     @Query('category') category?: string,
+    @Query('offeringTypes') offeringTypes?: string | string[],
   ) {
     return this.courseService.list({
       page: page ? Number(page) : 1,
@@ -36,9 +37,26 @@ export class CourseController {
       status,
       level,
       category,
+      offeringTypes: this.toArray(offeringTypes),
     });
   }
 
+  private toArray(value?: string | string[]) {
+    if (Array.isArray(value)) {
+      return value
+        .flatMap((item) => String(item).split(','))
+        .map((item) => item.trim())
+        .filter(Boolean);
+    }
+    if (typeof value === 'string') {
+      return value
+        .split(',')
+        .map((item) => item.trim())
+        .filter(Boolean);
+    }
+    return [];
+  }
+
   @Get('stats')
   stats() {
     return this.courseService.stats();

package/src/course/course.service.ts

@@ -94,6 +94,35 @@ export class CourseService {
     return this.normalizeOptionalText(title) ?? slug;
   }
 
+  private async resolveCertificateTemplateId(value?: string | null) {
+    if (value === undefined) {
+      return undefined;
+    }
+
+    const normalized = String(value ?? '').trim();
+
+    if (!normalized) {
+      return null;
+    }
+
+    const numericId = Number(normalized);
+    const template = await this.prisma.certificate_template.findFirst({
+      where:
+        Number.isInteger(numericId) && numericId > 0
+          ? {
+              OR: [{ id: numericId }, { slug: normalized }],
+            }
+          : { slug: normalized },
+      select: { id: true },
+    });
+
+    if (!template) {
+      throw new BadRequestException('Certificate template not found');
+    }
+
+    return template.id;
+  }
+
   async list(params: {
     page?: number;
     pageSize?: number;
@@ -101,6 +130,7 @@ export class CourseService {
     status?: string;
     level?: string;
     category?: string;
+    offeringTypes?: string[];
   }) {
     const page = Math.max(Number(params.page) || 1, 1);
     const pageSize = Math.max(Number(params.pageSize) || 12, 1);
@@ -128,6 +158,9 @@ export class CourseService {
         some: { category: { slug: params.category } },
       };
     }
+    if (params.offeringTypes && params.offeringTypes.length > 0) {
+      where.offering_type = { in: params.offeringTypes };
+    }
 
     const [courses, total] = await Promise.all([
       this.prisma.course.findMany({
@@ -244,6 +277,9 @@ export class CourseService {
             },
           },
         },
+        certificate_template: {
+          select: { id: true, slug: true },
+        },
         _count: {
           select: {
             course_enrollment: true,
@@ -318,9 +354,18 @@ export class CourseService {
   }
 
   async create(dto: CreateCourseDto) {
-    const { categorySlugs, logoFileId, bannerFileId, instructorIds, ...data } = dto;
+    const {
+      categorySlugs,
+      logoFileId,
+      bannerFileId,
+      instructorIds,
+      certificateModel,
+      ...data
+    } = dto;
     const normalizedSlug = data.slug.trim();
     const resolvedTitle = this.resolveCourseTitle(data.title, normalizedSlug);
+    const certificateTemplateId =
+      await this.resolveCertificateTemplateId(certificateModel);
 
     const categories = categorySlugs?.length
       ? await this.prisma.category.findMany({
@@ -365,6 +410,9 @@ export class CourseService {
         ...(data.certificateWorkload !== undefined && {
           certificate_workload: data.certificateWorkload,
         }),
+        ...(certificateTemplateId !== undefined && {
+          certificate_template_id: certificateTemplateId,
+        }),
         ...(data.primaryColor !== undefined && {
           primary_color: data.primaryColor,
         }),
@@ -427,6 +475,9 @@ export class CourseService {
             },
           },
         },
+        certificate_template: {
+          select: { id: true, slug: true },
+        },
         _count: { select: { course_enrollment: true } },
       },
     });
@@ -457,7 +508,14 @@ export class CourseService {
   }
 
   async update(id: number, dto: UpdateCourseDto) {
-    const { categorySlugs, logoFileId, bannerFileId, instructorIds, ...data } = dto;
+    const {
+      categorySlugs,
+      logoFileId,
+      bannerFileId,
+      instructorIds,
+      certificateModel,
+      ...data
+    } = dto;
     let existingSlug: string | undefined;
 
     if (
@@ -478,6 +536,8 @@ export class CourseService {
       data.title !== undefined
         ? this.resolveCourseTitle(data.title, resolvedSlug ?? existingSlug ?? '')
         : undefined;
+    const certificateTemplateId =
+      await this.resolveCertificateTemplateId(certificateModel);
 
     const categories = categorySlugs?.length
       ? await this.prisma.category.findMany({
@@ -535,6 +595,9 @@ export class CourseService {
         ...(data.certificateWorkload !== undefined && {
           certificate_workload: data.certificateWorkload,
         }),
+        ...(certificateTemplateId !== undefined && {
+          certificate_template_id: certificateTemplateId,
+        }),
         ...(data.primaryColor !== undefined && {
           primary_color: data.primaryColor,
         }),
@@ -589,6 +652,9 @@ export class CourseService {
             },
           },
         },
+        certificate_template: {
+          select: { id: true, slug: true },
+        },
         _count: { select: { course_enrollment: true } },
       },
     });
@@ -731,6 +797,11 @@ export class CourseService {
       averageCompletion: Math.round(metrics?.averageCompletion ?? 0),
       certificatesIssued:
         metrics?.certificatesIssued ?? c._count?.certificate ?? 0,
+      certificateModel:
+        c.certificate_template?.slug ??
+        (c.certificate_template_id
+          ? String(c.certificate_template_id)
+          : null),
       progressByModule: metrics?.progressByModule ?? [],
       instructors: (c.course_instructor ?? []).map((ci: any) => ({
         id: ci.instructor_id,

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

@@ -99,6 +99,10 @@ export class CreateCourseDto {
   @IsOptional()
   categorySlugs?: string[];
 
+  @IsString()
+  @IsOptional()
+  certificateModel?: string | null;
+
   @IsArray()
   @IsInt({ each: true })
   @IsOptional()

package/src/instructor/instructor.service.ts

@@ -102,6 +102,7 @@ export class InstructorService {
                   user_id: true,
                   user: {
                     select: {
+                      photo_id: true,
                       role_user: {
                         where: { role: { slug: 'lms-instructor' } },
                         select: { id: true },
@@ -181,6 +182,7 @@ export class InstructorService {
             personId: row.person_id,
             name: row.person?.name?.trim() || `Instructor #${row.id}`,
             avatarId: row.person?.avatar_id ?? null,
+            userPhotoId: personUser?.user?.photo_id ?? null,
             email: this.getPrimaryContactValue(
               row.person?.contact ?? [],
               ['EMAIL'],

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

@@ -58,6 +58,10 @@ export class CreateTrainingDto {
   @IsOptional()
   status?: 'draft' | 'active' | 'archived';
 
+  @IsEnum(['sequential', 'free'])
+  @IsOptional()
+  progressMode?: 'sequential' | 'free';
+
   @IsArray()
   @IsInt({ each: true })
   @IsOptional()

package/src/training/training.service.ts

@@ -12,6 +12,80 @@ export class TrainingService {
     private readonly integrationApi: IntegrationDeveloperApiService,
   ) {}
 
+  private normalizeProgressMode(value?: string | null) {
+    if (!value) return undefined;
+    const normalized = value.trim().toLowerCase();
+
+    if (normalized === 'free' || normalized === 'livre') return 'free';
+    if (normalized === 'sequential' || normalized === 'sequencial') {
+      return 'sequential';
+    }
+
+    return undefined;
+  }
+
+  private progressModeToPt(value?: string | null) {
+    return this.normalizeProgressMode(value) === 'free' ? 'livre' : 'sequencial';
+  }
+
+  private async getTrainingExtras(ids: number[]) {
+    const extrasById = new Map<number, { progress_mode?: 'sequential' | 'free' | null }>();
+
+    const normalizedIds = ids
+      .map((id) => Number(id))
+      .filter((id) => Number.isInteger(id) && id > 0);
+
+    if (normalizedIds.length === 0) {
+      return extrasById;
+    }
+
+    try {
+      const rows = (await this.prisma.$queryRawUnsafe(
+        `
+          SELECT id, progress_mode
+          FROM learning_path
+          WHERE id IN (${normalizedIds.join(',')})
+        `,
+      )) as Array<{
+        id: number;
+        progress_mode: 'sequential' | 'free' | null;
+      }>;
+
+      for (const row of rows) {
+        extrasById.set(row.id, {
+          progress_mode: row.progress_mode,
+        });
+      }
+    } catch {
+      return extrasById;
+    }
+
+    return extrasById;
+  }
+
+  private async persistTrainingProgressMode(
+    id: number,
+    progressMode?: 'sequential' | 'free',
+  ) {
+    if (progressMode === undefined) {
+      return;
+    }
+
+    try {
+      await this.prisma.$executeRawUnsafe(
+        `
+          UPDATE learning_path
+          SET progress_mode = $1
+          WHERE id = $2
+        `,
+        progressMode,
+        id,
+      );
+    } catch {
+      // Some environments may still be behind the current learning_path schema.
+    }
+  }
+
   async list(params: {
     page?: number;
     pageSize?: number;
@@ -110,12 +184,14 @@ export class TrainingService {
       this.prisma.learning_path.count({ where }),
     ]);
 
+    const extrasById = await this.getTrainingExtras(paths.map((path) => path.id));
+
     return {
       total,
       page,
       pageSize,
       lastPage: Math.max(1, Math.ceil(total / pageSize)),
-      data: paths.map((path) => this.mapTraining(path)),
+      data: paths.map((path) => this.mapTraining(path, extrasById.get(path.id))),
     };
   }
 
@@ -179,7 +255,9 @@ export class TrainingService {
     });
 
     if (!path) return null;
-    return this.mapTraining(path);
+
+    const extrasById = await this.getTrainingExtras([id]);
+    return this.mapTraining(path, extrasById.get(id));
   }
 
   async create(dto: CreateTrainingDto) {
@@ -187,6 +265,8 @@ export class TrainingService {
     const stepItems = this.resolveIncomingSteps(dto);
     const normalizedLevel = this.normalizeLevel(dto.level) ?? 'beginner';
     const normalizedStatus = this.normalizeStatus(dto.status) ?? 'draft';
+    const normalizedProgressMode =
+      this.normalizeProgressMode(dto.progressMode) ?? 'sequential';
 
     const created = await this.prisma.learning_path.create({
       data: {
@@ -242,7 +322,14 @@ export class TrainingService {
       },
     });
 
-    const trainingResult = this.mapTraining(created);
+    await this.persistTrainingProgressMode(created.id, normalizedProgressMode);
+
+    const extrasById = await this.getTrainingExtras([created.id]);
+
+    const trainingResult = this.mapTraining(
+      created,
+      extrasById.get(created.id),
+    );
 
     await this.integrationApi.publishEvent({
       eventName: 'lms.training.created',
@@ -262,6 +349,10 @@ export class TrainingService {
       dto.level !== undefined ? this.normalizeLevel(dto.level) : undefined;
     const normalizedStatus =
       dto.status !== undefined ? this.normalizeStatus(dto.status) : undefined;
+    const normalizedProgressMode =
+      dto.progressMode !== undefined
+        ? this.normalizeProgressMode(dto.progressMode)
+        : undefined;
 
     if (stepsWereProvided) {
       await this.prisma.learning_path_step.deleteMany({
@@ -329,7 +420,11 @@ export class TrainingService {
       },
     });
 
-    const updateTrainingResult = this.mapTraining(updated);
+    await this.persistTrainingProgressMode(id, normalizedProgressMode);
+
+    const extrasById = await this.getTrainingExtras([id]);
+
+    const updateTrainingResult = this.mapTraining(updated, extrasById.get(id));
 
     await this.integrationApi.publishEvent({
       eventName: 'lms.training.updated',
@@ -356,7 +451,10 @@ export class TrainingService {
     return { success: true };
   }
 
-  private mapTraining(path: any) {
+  private mapTraining(
+    path: any,
+    extras?: { progress_mode?: 'sequential' | 'free' | null },
+  ) {
     const steps = [...(path.learning_path_step ?? [])].sort(
       (a: any, b: any) => (a?.order ?? 0) - (b?.order ?? 0),
     );
@@ -419,6 +517,7 @@ export class TrainingService {
       courseIds,
       examIds,
       items,
+      progressionMode: this.progressModeToPt(extras?.progress_mode),
       cargaTotal,
       alunos: path._count?.learning_path_enrollment ?? 0,
       status: this.statusToPt(path.status),