@hed-hog/lms 0.0.357 → 0.0.361

package/src/course/lms-bulk-upload.service.ts

@@ -0,0 +1,204 @@
+import { FileService } from '@hed-hog/core';
+import { PrismaService } from '@hed-hog/api-prisma';
+import { SettingService } from '@hed-hog/core';
+import {
+    BadRequestException,
+    Inject,
+    Injectable,
+    NotFoundException,
+    forwardRef,
+} from '@nestjs/common';
+
+type IntegrationProfileConfig = {
+  access_key_id?: string;
+  secret_access_key?: string;
+  session_token?: string;
+  region?: string;
+  bucket?: string;
+  role_arn?: string;
+  external_id?: string;
+};
+
+@Injectable()
+export class LmsBulkUploadService {
+  constructor(
+    @Inject(forwardRef(() => SettingService))
+    private readonly settingService: SettingService,
+    @Inject(forwardRef(() => PrismaService))
+    private readonly prismaService: PrismaService,
+    @Inject(forwardRef(() => FileService))
+    private readonly fileService: FileService,
+  ) {}
+
+  async getBulkUploadSettings() {
+    const settings = await this.settingService.getSettingValues([
+      'lms-bulk-upload-storage-profile-id',
+      'lms-bulk-upload-s3-bucket',
+      'lms-bulk-upload-sts-duration-seconds',
+    ]);
+
+    return {
+      storageProfileId: Number(settings['lms-bulk-upload-storage-profile-id'] || 0) || null,
+      bucketName:
+        typeof settings['lms-bulk-upload-s3-bucket'] === 'string'
+          ? settings['lms-bulk-upload-s3-bucket'].trim()
+          : '',
+      sessionDurationSeconds:
+        Number(settings['lms-bulk-upload-sts-duration-seconds'] || 3600) || 3600,
+    };
+  }
+
+  async getTemporaryCredentials(userId: number) {
+    const { profile, region, bucket, durationSeconds, prefix } =
+      await this.resolveStorageProfileAndBucket(userId);
+
+    const credentials = profile.config as IntegrationProfileConfig;
+    const accessKeyId = String(credentials.access_key_id ?? '').trim();
+    const secretAccessKey = String(credentials.secret_access_key ?? '').trim();
+    const sessionToken = String(credentials.session_token ?? '').trim() || undefined;
+
+    if (!accessKeyId || !secretAccessKey) {
+      throw new BadRequestException(
+        'Storage profile does not contain AWS credentials (access_key_id/secret_access_key).',
+      );
+    }
+
+    const roleArn = String(credentials.role_arn ?? '').trim();
+    const externalId = String(credentials.external_id ?? '').trim();
+
+    const tempCredentials = await this.fileService.getTemporaryCredentials({
+      accessKeyId,
+      secretAccessKey,
+      sessionToken,
+      region,
+      roleArn: roleArn || undefined,
+      externalId: externalId || undefined,
+      durationSeconds,
+      sessionName: `hedhog-desktop-u${userId}-${Date.now()}`,
+    });
+
+    return {
+      provider: 'aws-s3',
+      bucket,
+      region,
+      keyPrefix: prefix,
+      credentials: {
+        accessKeyId: tempCredentials.AccessKeyId,
+        secretAccessKey: tempCredentials.SecretAccessKey,
+        sessionToken: tempCredentials.SessionToken,
+        expiresAt: tempCredentials.Expiration?.toISOString() ?? null,
+      },
+    };
+  }
+
+  async verifyFileOnS3(userId: number, payload: { key?: string; fileName?: string }) {
+    const { profile, region, bucket, prefix } = await this.resolveStorageProfileAndBucket(userId);
+
+    const credentials = profile.config as IntegrationProfileConfig;
+    const accessKeyId = String(credentials.access_key_id ?? '').trim();
+    const secretAccessKey = String(credentials.secret_access_key ?? '').trim();
+    const sessionToken = String(credentials.session_token ?? '').trim() || undefined;
+
+    if (!accessKeyId || !secretAccessKey) {
+      throw new BadRequestException(
+        'Storage profile does not contain AWS credentials (access_key_id/secret_access_key).',
+      );
+    }
+
+    const objectKey = String(payload.key ?? '').trim() || `${prefix}${String(payload.fileName ?? '').trim()}`;
+    if (!objectKey) {
+      throw new BadRequestException('Provide file key or fileName to verify on S3.');
+    }
+
+    try {
+      const result = await this.fileService.headS3Object({
+        accessKeyId,
+        secretAccessKey,
+        sessionToken,
+        region,
+        bucket,
+        key: objectKey,
+      });
+
+      return {
+        isValid: true,
+        key: objectKey,
+        sizeBytes: result.ContentLength ?? null,
+        etag: result.ETag ?? null,
+      };
+    } catch {
+      return {
+        isValid: false,
+        key: objectKey,
+      };
+    }
+  }
+
+  private async resolveStorageProfileAndBucket(userId: number) {
+    const settings = await this.settingService.getSettingValues([
+      'lms-bulk-upload-storage-profile-id',
+      'lms-bulk-upload-s3-bucket',
+      'lms-bulk-upload-sts-duration-seconds',
+    ]);
+
+    const profileId = Number(settings['lms-bulk-upload-storage-profile-id'] || 0);
+    if (!Number.isFinite(profileId) || profileId <= 0) {
+      throw new BadRequestException(
+        'LMS bulk upload storage profile is not configured (lms-bulk-upload-storage-profile-id).',
+      );
+    }
+
+    const profile = await this.prismaService.integration_profile.findUnique({
+      where: { id: profileId },
+      include: {
+        integration_type: { select: { slug: true } },
+        integration_provider: { select: { slug: true } },
+      },
+    });
+
+    if (!profile) {
+      throw new NotFoundException(`Storage integration profile ${profileId} was not found.`);
+    }
+
+    if (profile.integration_type.slug !== 'storage') {
+      throw new BadRequestException(
+        `Integration profile ${profileId} is not a storage profile.`,
+      );
+    }
+
+    const providerSlug = String(profile.integration_provider.slug ?? '').toLowerCase();
+    if (providerSlug !== 's3') {
+      throw new BadRequestException(
+        `Integration provider ${providerSlug} is not supported for desktop bulk upload. Use AWS S3 profile.`,
+      );
+    }
+
+    const config = (profile.config as IntegrationProfileConfig) ?? {};
+    const region = String(config.region ?? '').trim() || 'us-east-1';
+
+    const bucketFromSettings = String(settings['lms-bulk-upload-s3-bucket'] ?? '').trim();
+    const bucketFromProfile = String(config.bucket ?? '').trim();
+    const bucket = bucketFromSettings || bucketFromProfile;
+
+    if (!bucket) {
+      throw new BadRequestException(
+        'LMS bulk upload bucket is not configured. Set lms-bulk-upload-s3-bucket or profile bucket.',
+      );
+    }
+
+    const durationSeconds = Math.max(
+      900,
+      Math.min(43200, Number(settings['lms-bulk-upload-sts-duration-seconds'] || 3600) || 3600),
+    );
+
+    const prefix = `desktop/lms/u${userId}/`;
+
+    return {
+      profile,
+      region,
+      bucket,
+      durationSeconds,
+      prefix,
+    };
+  }
+}

package/src/course/lms-operations-task.subscriber.ts

@@ -0,0 +1,44 @@
+import { IntegrationDeveloperApiService } from '@hed-hog/core';
+import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
+import { PrismaService } from '@hed-hog/api-prisma';
+import { CourseOperationsIntegrationService } from './course-operations-integration.service';
+
+@Injectable()
+export class LmsOperationsTaskSubscriber implements OnModuleInit {
+  private readonly logger = new Logger(LmsOperationsTaskSubscriber.name);
+
+  constructor(
+    private readonly integrationApi: IntegrationDeveloperApiService,
+    private readonly operationsIntegration: CourseOperationsIntegrationService,
+    private readonly prisma: PrismaService,
+  ) {}
+
+  onModuleInit(): void {
+    this.integrationApi.subscribeMany([
+      {
+        eventName: 'operations.task.updated',
+        consumerName: 'lms.lesson-status-from-task',
+        priority: 5,
+        handler: async (event) => {
+          try {
+            const status = event.payload?.status as string | undefined;
+            if (status !== 'done') return;
+
+            const taskId = Number(event.aggregateId);
+            if (!taskId || !Number.isInteger(taskId) || taskId <= 0) return;
+
+            await this.operationsIntegration.applyTaskCompletionToLesson(
+              taskId,
+              '',
+              this.prisma,
+            );
+          } catch (err) {
+            this.logger.error(
+              `Error applying task completion to lesson: ${String(err)}`,
+            );
+          }
+        },
+      },
+    ]);
+  }
+}

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

@@ -1,6 +1,6 @@
+import { Role } from '@hed-hog/api';
 import { SettingService } from '@hed-hog/core';
 import { Controller, forwardRef, Get, Inject } from '@nestjs/common';
-import { Role } from '@hed-hog/api';
 
 @Role()
 @Controller('lms/settings')
@@ -18,6 +18,9 @@ export class LmsSettingController {
       'lms-audio-transcription-enabled',
       'lms-youtube-provider-enabled',
       'lms-vimeo-provider-enabled',
+      'lms-bulk-upload-storage-profile-id',
+      'lms-bulk-upload-s3-bucket',
+      'lms-bulk-upload-sts-duration-seconds',
     ]);
     return {
       videoConversionEnabled: v['lms-video-conversion-enabled'] !== false,
@@ -25,6 +28,14 @@ export class LmsSettingController {
       transcriptionEnabled: v['lms-audio-transcription-enabled'] !== false,
       youtubeEnabled: v['lms-youtube-provider-enabled'] !== false,
       vimeoEnabled: v['lms-vimeo-provider-enabled'] !== false,
+      bulkUploadStorageProfileId:
+        Number(v['lms-bulk-upload-storage-profile-id'] || 0) || null,
+      bulkUploadBucketName:
+        typeof v['lms-bulk-upload-s3-bucket'] === 'string'
+          ? v['lms-bulk-upload-s3-bucket']
+          : '',
+      bulkUploadStsDurationSeconds:
+        Number(v['lms-bulk-upload-sts-duration-seconds'] || 3600) || 3600,
     };
   }
 }

package/src/enterprise/enterprise.service.ts

@@ -67,7 +67,7 @@ export class EnterpriseService {
         take: pageSize,
         orderBy: { name: 'asc' },
         include: {
-          person: { select: { id: true, name: true } },
+          person: { select: { id: true, name: true, avatar_id: true } },
           _count: {
             select: {
               enterprise_user: true,

package/src/instructor/instructor.service.ts

@@ -928,7 +928,10 @@ export class InstructorService {
       status?: string;
     } = {},
   ) {
-    const { page = 1, pageSize = 6, search, status } = options;
+    const page = Math.max(Number(options.page) || 1, 1);
+    const pageSize = Math.min(Math.max(Number(options.pageSize) || 6, 1), 100);
+    const skip = (page - 1) * pageSize;
+    const { search, status } = options;
 
     const where: Prisma.course_class_groupWhereInput = {
       instructor_id: instructorId,
@@ -971,7 +974,7 @@ export class InstructorService {
             },
           },
         },
-        skip: (page - 1) * pageSize,
+        skip,
         take: pageSize,
       }),
       this.prisma.course_class_group.count({ where }),
@@ -999,6 +1002,12 @@ export class InstructorService {
       };
     });
 
-    return { data, total, page, pageSize, lastPage: Math.ceil(total / pageSize) };
+    return {
+      data,
+      total,
+      page,
+      pageSize,
+      lastPage: Math.max(1, Math.ceil(total / pageSize)),
+    };
   }
 }