Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/courses/courses.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ export class CoursesController {
@ApiOperation({ summary: 'Get a specific course by ID' })
@ApiResponse({ status: 200, description: 'Returns course details' })
@ApiResponse({ status: 404, description: 'Course not found' })
async findOne(@Param('id') id: string) {
return this.coursesService.findOne(id);
async findOne(@Param('id') id: string, @Request() req) {
return this.coursesService.findOne(id, req.user);
}

@Put(':id')
Expand Down
4 changes: 3 additions & 1 deletion src/courses/courses.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Module } from '@nestjs/common';
import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { CoursesService } from './courses.service';
import { EnrollmentsService } from './enrollments.service';
Expand All @@ -10,13 +10,15 @@ import { CourseReview } from './entities/course-review.entity';
import { CourseModule } from './entities/course-module.entity';
import { BulkOperation } from './entities/bulk-operation.entity';
import { CachingModule } from '../caching/caching.module';
import { AnalyticsModule } from '../analytics/analytics.module';

import { PaginationService } from '../common/services/pagination.service';

@Module({
imports: [
TypeOrmModule.forFeature([Course, Enrollment, CourseReview, CourseModule, BulkOperation]),
CachingModule,
forwardRef(() => AnalyticsModule),
],
providers: [CoursesService, EnrollmentsService, PaginationService],
controllers: [CoursesController, EnrollmentsController],
Expand Down
4 changes: 3 additions & 1 deletion src/courses/courses.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Injectable, Optional } from '@nestjs/common';
import { Injectable, Optional, Inject, forwardRef } from '@nestjs/common';
import { EventEmitter2 } from '@nestjs/event-emitter';
import { InjectRepository } from '@nestjs/typeorm';
import { In, Repository } from 'typeorm';
Expand Down Expand Up @@ -31,6 +31,8 @@ import { PaginationQueryDto } from '../common/dto/pagination.dto';
import { OffsetPaginatedResponse } from '../common/interfaces/pagination.interface';

import { PaginationService } from '../common/services/pagination.service';
import { AnalyticsService } from '../analytics/analytics.service';
import { EventType } from '../analytics/entities/event.entity';

function checkUserRole(user?: User, ...roleNames: UserRole[]): boolean {
if (!user) return false;
Expand Down
1 change: 0 additions & 1 deletion src/routing/interceptors/routing.interceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ export class RoutingInterceptor implements NestInterceptor {
// Include experimental data
if (transformed.analytics) {
transformed.analytics.experimental = {
predictiveScores: Math.random(),
behaviorInsights: 'beta-feature-data',
};
}
Expand Down
12 changes: 6 additions & 6 deletions src/utils/masking/kpi.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { MetricsService } from './metrics.service';
import { User } from '../../users/entities/user.entity';
import { Course } from '../../courses/entities/course.entity';
import { Enrollment } from '../../courses/entities/enrollment.entity';
import { AnalyticsEvent } from '../../analytics/entities/event.entity';
import { AnalyticsEvent, EventType } from '../../analytics/entities/event.entity';
import { Payment, PaymentStatus } from '../../payments/entities/payment.entity';

@Injectable()
Expand Down Expand Up @@ -111,16 +111,16 @@ export class KpiService {
}

async calculateEnrollmentConversionRate(): Promise<void> {
// This is a simplified version. A real-world scenario would track views vs enrollments.
// Here we'll simulate it by looking at enrollments vs total users.
// For a more accurate metric, you'd need an event tracking system for 'course_viewed'.
const courses = await this.courseRepository.find();
this.metricsService.enrollmentConversionGauge.reset();

for (const course of courses) {
const enrollments = await this.enrollmentRepository.count({ where: { courseId: course.id } });
// Placeholder for views. In a real system, you'd query an analytics table.
const views = enrollments * 5 + Math.floor(Math.random() * 100); // Simulate views
const views = await this.eventRepository
.createQueryBuilder('event')
.where('event.eventType = :eventType', { eventType: EventType.COURSE_VIEW })
.andWhere("event.properties->>'courseId' = :courseId", { courseId: course.id })
.getCount();

const conversionRate = views > 0 ? (enrollments / views) * 100 : 0;
this.metricsService.enrollmentConversionGauge.labels(course.id).set(conversionRate);
Expand Down