Merge pull request #87 from teacoder-team/dev

refactor: course module relocation and infra updates

Author: TeaCoder52

.github/dependabot.yml

@@ -0,0 +1,25 @@
+version: 2
+updates:
+    - package-ecosystem: 'npm'
+      directory: '/'
+      schedule:
+          interval: 'weekly'
+          day: 'monday'
+      open-pull-requests-limit: 10
+      labels:
+          - 'dependencies'
+          - 'npm'
+      groups:
+          dependencies:
+              patterns:
+                  - '*'
+              exclude-patterns:
+                  - 'generated/*'
+
+    - package-ecosystem: 'github-actions'
+      directory: '/'
+      schedule:
+          interval: 'monthly'
+      labels:
+          - 'dependencies'
+          - 'github-actions'

src/api/api.module.ts

@@ -18,6 +18,7 @@ import { MfaModule } from './auth/mfa/mfa.module'
 import { PasskeyModule } from './auth/passkey/passkey.module'
 import { SessionModule } from './auth/session/session.module'
 import { SsoModule } from './auth/sso/sso.module'
+import { CourseModule } from './course/course.module'
 import { LessonModule } from './lesson/lesson.module'
 import { PaymentModule } from './payment/payment.module'
 import { ProgressModule } from './progress/progress.module'
@@ -53,7 +54,8 @@ import { UsersModule } from './users/users.module'
 		LessonModule,
 		ProgressModule,
 		StatisticsModule,
-		PaymentModule
+		PaymentModule,
+		CourseModule
 	],
 	providers: [
 		{

…rse/interfaces/rest/course.controller.ts src/api/course/course.controller.tssrc/domains/course/interfaces/rest/course.controller.ts renamed to src/api/course/course.controller.ts src/domains/course/interfaces/rest/course.controller.ts renamed to src/api/course/course.controller.ts

@@ -27,17 +27,19 @@ import {
 } from '@/shared/decorators'
 import { Authorization } from '@/shared/decorators/auth.decorator'
 
-import { CourseResponse } from '../../application/dto/course.response'
-import { CoursesResponse } from '../../application/dto/courses.response'
-import { CreateCourseRequest } from '../../application/dto/create-course.request'
-import { CreateCourseResponse } from '../../application/dto/create-course.response'
-import { GenerateDownloadLinkResponse } from '../../application/dto/generate-download-link.response'
-import { CourseApplicationService } from '../../application/services/course.application.service'
+import { CourseService } from './course.service'
+import { CourseResponse } from './dto/course.dto'
+import { CoursesResponse } from './dto/courses.dto'
+import {
+	CreateCourseRequest,
+	CreateCourseResponse
+} from './dto/create-course.dto'
+import { GenerateDownloadLinkResponse } from './dto/generate-download-link.dto'
 
 @ApiTags('Course')
 @Controller('courses')
 export class CourseController {
-	public constructor(private readonly app: CourseApplicationService) {}
+	public constructor(private readonly courseService: CourseService) {}
 
 	@ApiOperation({
 		summary: 'Fetch All Courses',
@@ -49,7 +51,7 @@ export class CourseController {
 	@Get()
 	@HttpCode(HttpStatus.OK)
 	public async getAll() {
-		return this.app.getAll()
+		return this.courseService.getAll()
 	}
 
 	@ApiOperation({
@@ -63,7 +65,7 @@ export class CourseController {
 	@Get('popular')
 	@HttpCode(HttpStatus.OK)
 	public async getPopular() {
-		return this.app.getPopular()
+		return this.courseService.getPopular()
 	}
 
 	@ApiOperation({
@@ -76,7 +78,7 @@ export class CourseController {
 	@Get(':slug')
 	@HttpCode(HttpStatus.OK)
 	public async getBySlug(@Param('slug') slug: string) {
-		return this.app.getBySlug(slug)
+		return this.courseService.getBySlug(slug)
 	}
 
 	@ApiOperation({
@@ -89,7 +91,7 @@ export class CourseController {
 	@Get(':id/lessons')
 	@HttpCode(HttpStatus.OK)
 	public async getCourseLessons(@Param('id') id: string) {
-		return this.app.getCourseLessons(id)
+		return this.courseService.getCourseLessons(id)
 	}
 
 	@ApiOperation({
@@ -102,7 +104,7 @@ export class CourseController {
 	@Patch(':id/views')
 	@HttpCode(HttpStatus.NO_CONTENT)
 	public async incrementViews(@Param('id') id: string) {
-		await this.app.incrementViews(id)
+		await this.courseService.incrementViews(id)
 	}
 
 	@ApiOperation({
@@ -120,7 +122,7 @@ export class CourseController {
 		@Param('id') id: string,
 		@Authorized() user: User
 	) {
-		return await this.app.generateDownloadLink(id, user)
+		return await this.courseService.generateDownloadLink(id, user)
 	}
 
 	@ApiOperation({
@@ -140,11 +142,17 @@ export class CourseController {
 		@UserAgent() userAgent: string,
 		@Res() res: Response
 	) {
-		const course = await this.app.resolveDownloadToken(token, ip, userAgent)
+		const course = await this.courseService.resolveDownloadToken(
+			token,
+			ip,
+			userAgent
+		)
 
 		try {
 			const { stream, contentType } =
-				await this.app.fetchAttachmentStream(course.attachment)
+				await this.courseService.fetchAttachmentStream(
+					course.attachment
+				)
 
 			res.setHeader(
 				'Content-Disposition',
@@ -171,6 +179,6 @@ export class CourseController {
 	@Post()
 	@HttpCode(HttpStatus.OK)
 	public async create(@Body() dto: CreateCourseRequest) {
-		return this.app.create(dto)
+		return this.courseService.create(dto)
 	}
 }

src/api/course/course.module.ts

@@ -0,0 +1,13 @@
+import { HttpModule } from '@nestjs/axios'
+import { Module } from '@nestjs/common'
+
+import { CourseController } from './course.controller'
+import { CourseRepository } from './course.repository'
+import { CourseService } from './course.service'
+
+@Module({
+	imports: [HttpModule.register({})],
+	controllers: [CourseController],
+	providers: [CourseService, CourseRepository]
+})
+export class CourseModule {}

src/api/course/course.repository.ts

@@ -0,0 +1,70 @@
+import { Injectable } from '@nestjs/common'
+import { type Course, DownloadLog, Lesson, Prisma } from '@prisma/generated'
+
+import { PrismaService } from '@/infra/prisma/prisma.service'
+
+@Injectable()
+export class CourseRepository {
+	public constructor(private readonly prismaService: PrismaService) {}
+
+	public async findAll(params: {
+		skip?: number
+		take?: number
+		cursor?: Prisma.CourseWhereUniqueInput
+		where?: Prisma.CourseWhereInput
+		orderBy?: Prisma.CourseOrderByWithRelationInput
+	}): Promise<Course[]> {
+		return this.prismaService.course.findMany(params)
+	}
+
+	public async findPopular(limit?: number): Promise<Course[]> {
+		return this.prismaService.course.findMany({
+			take: limit,
+			orderBy: {
+				views: 'desc'
+			}
+		})
+	}
+
+	public async findBySlug(slug: string): Promise<Course | null> {
+		return this.prismaService.course.findUnique({
+			where: { slug }
+		})
+	}
+
+	public async findById(id: string): Promise<Course | null> {
+		return this.prismaService.course.findUnique({
+			where: { id }
+		})
+	}
+
+	public async findLessons(courseId: string): Promise<Lesson[]> {
+		return this.prismaService.lesson.findMany({
+			where: { courseId },
+			orderBy: { position: 'asc' }
+		})
+	}
+
+	public async incrementViews(id: string): Promise<void> {
+		await this.prismaService.course.update({
+			where: { id },
+			data: {
+				views: { increment: 1 }
+			}
+		})
+	}
+
+	public async create(data: Prisma.CourseCreateInput): Promise<Course> {
+		return this.prismaService.course.create({
+			data
+		})
+	}
+
+	public async logDownload(
+		data: Prisma.DownloadLogUncheckedCreateInput
+	): Promise<DownloadLog> {
+		return this.prismaService.downloadLog.create({
+			data
+		})
+	}
+}

…n/services/course.application.service.ts src/api/course/course.service.tssrc/domains/course/application/services/course.application.service.ts renamed to src/api/course/course.service.ts src/domains/course/application/services/course.application.service.ts renamed to src/api/course/course.service.ts

@@ -1,49 +1,45 @@
 import { HttpService } from '@nestjs/axios'
-import { Inject, Injectable, NotFoundException } from '@nestjs/common'
+import { Injectable, NotFoundException } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
 import { User } from '@prisma/generated'
 import { randomBytes } from 'crypto'
 import { firstValueFrom } from 'rxjs'
 
-import type { AllConfigs } from '@/config/definitions'
 import { RedisService } from '@/infra/redis/redis.service'
-import { slugify } from '@/shared/utils/slugify'
+import { slugify } from '@/shared/utils'
 
-import { CourseRepository } from '../../domain/repositories/course.repository.interface'
-import { DownloadLogRepository } from '../../domain/repositories/download-log.repository.interface'
+import { CourseRepository } from './course.repository'
 
 @Injectable()
-export class CourseApplicationService {
+export class CourseService {
 	public constructor(
-		@Inject('CourseRepository')
-		private readonly courseRepo: CourseRepository,
-		@Inject('DownloadLogRepository')
-		private readonly downloadLogRepo: DownloadLogRepository,
+		private readonly courseRepository: CourseRepository,
 		private readonly redisService: RedisService,
-		private readonly configService: ConfigService<AllConfigs>,
+		private readonly configService: ConfigService,
 		private readonly httpService: HttpService
 	) {}
 
 	public async getAll() {
-		return this.courseRepo.findAll({
-			isPublished: true,
+		return this.courseRepository.findAll({
+			where: {
+				isPublished: true
+			},
 			orderBy: {
-				field: 'createdAt',
-				direction: 'desc'
+				createdAt: 'desc'
 			}
 		})
 	}
 
 	public async getPopular() {
-		return this.courseRepo.findPopular(4)
+		return this.courseRepository.findPopular(4)
 	}
 
 	public async getBySlug(slug: string) {
 		const cached = await this.redisService.get(`courses:${slug}`)
 
 		if (cached) return JSON.parse(cached)
 
-		const course = await this.courseRepo.findBySlug(slug)
+		const course = await this.courseRepository.findBySlug(slug)
 
 		if (!course || !course.isPublished)
 			throw new NotFoundException('Course not found')
@@ -71,22 +67,22 @@ export class CourseApplicationService {
 	}
 
 	public async getCourseLessons(id: string) {
-		const course = await this.courseRepo.findById(id)
+		const course = await this.courseRepository.findById(id)
 
 		if (!course || !course.isPublished)
 			throw new NotFoundException('Course not found')
 
-		return this.courseRepo.findLessons(course.id)
+		return this.courseRepository.findLessons(course.id)
 	}
 
 	public async incrementViews(id: string) {
-		await this.courseRepo.incrementViews(id)
+		await this.courseRepository.incrementViews(id)
 
 		return true
 	}
 
 	public async generateDownloadLink(id: string, user: User) {
-		const course = await this.courseRepo.findById(id)
+		const course = await this.courseRepository.findById(id)
 
 		if (!course || !course.attachment)
 			throw new NotFoundException('Course not found')
@@ -116,11 +112,11 @@ export class CourseApplicationService {
 
 		const { courseId, userId } = JSON.parse(data)
 
-		const course = await this.courseRepo.findById(courseId)
+		const course = await this.courseRepository.findById(courseId)
 
 		if (!course) throw new NotFoundException('Course not found')
 
-		await this.downloadLogRepo.logDownload({
+		await this.courseRepository.logDownload({
 			token,
 			ip,
 			userAgent,
@@ -155,7 +151,7 @@ export class CourseApplicationService {
 	public async create(request: { title: string }) {
 		const slug = slugify(request.title)
 
-		const created = await this.courseRepo.create({
+		const created = await this.courseRepository.create({
 			title: request.title,
 			slug
 		})

…ourse/application/dto/course.response.ts src/api/course/dto/course.dto.tssrc/domains/course/application/dto/course.response.ts renamed to src/api/course/dto/course.dto.ts src/domains/course/application/dto/course.response.ts renamed to src/api/course/dto/course.dto.ts

@@ -11,3 +11,11 @@ export class CreateCourseRequest {
 	@MaxLength(100, { message: 'Название не должно превышать 100 символов' })
 	public title: string
 }
+
+export class CreateCourseResponse {
+	@ApiProperty({
+		description: 'Unique identifier',
+		example: 'd364587c-b690-43c5-8a7f-3c391eee5b97'
+	})
+	public id: string
+}