Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Student Statistics Dashboard #234

Merged
merged 13 commits into from
Nov 25, 2024
Merged

feat: Student Statistics Dashboard #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7be0725
feat: initialize statistics page charts
piotr-pajak Nov 18, 2024
9686d48
refactor: statistics module improvements
piotr-pajak Nov 21, 2024
4d3ff14
feat: statistics page
piotr-pajak Nov 21, 2024
fced63b
feat: refactor statistics response
wielopolski Nov 22, 2024
fc32e73
refactor: apply review feedback
piotr-pajak Nov 22, 2024
7b20a51
feat: update avg quiz results
wielopolski Nov 23, 2024
55094fe
feat: update lessons statistics result
wielopolski Nov 25, 2024
f07eb26
feat: update coursess statistics result
wielopolski Nov 25, 2024
8136ef1
fix: calculate lesson progress summary
wielopolski Nov 25, 2024
a2e736b
refaactor: update react-day-picker component according to new version
piotr-pajak Nov 25, 2024
1beeec4
fix: repair 0011_update_courses_table migration
wielopolski Nov 25, 2024
ff7cb5d
refactor: apply review feedback
piotr-pajak Nov 25, 2024
e22f6e6
feat: update last lesson return in statistics response
wielopolski Nov 25, 2024
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
148 changes: 74 additions & 74 deletions apps/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,85 +30,85 @@
"db:truncate-tables": "node dist/src/truncateTables.js"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.658.1",
"@aws-sdk/client-ses": "^3.624.0",
"@aws-sdk/s3-request-presigner": "^3.658.1",
"@faker-js/faker": "^8.4.1",
"@golevelup/nestjs-stripe": "^0.8.2",
"@knaadh/nestjs-drizzle-postgres": "^1.0.0",
"@nestjs/common": "^10.0.0",
"@nestjs/config": "^3.2.3",
"@nestjs/core": "^10.0.0",
"@nestjs/cqrs": "^10.2.7",
"@nestjs/jwt": "^10.2.0",
"@nestjs/passport": "^10.0.3",
"@nestjs/platform-express": "^10.0.0",
"@nestjs/platform-socket.io": "^10.4.4",
"@nestjs/schedule": "^4.1.0",
"@nestjs/swagger": "^7.4.0",
"@nestjs/terminus": "^10.2.3",
"@nestjs/websockets": "^10.4.4",
"@aws-sdk/client-s3": "3.658.1",
"@aws-sdk/client-ses": "3.624.0",
"@aws-sdk/s3-request-presigner": "3.658.1",
"@faker-js/faker": "8.4.1",
"@golevelup/nestjs-stripe": "0.8.2",
"@knaadh/nestjs-drizzle-postgres": "1.0.0",
"@nestjs/common": "10.0.0",
"@nestjs/config": "3.2.3",
"@nestjs/core": "10.0.0",
"@nestjs/cqrs": "10.2.7",
"@nestjs/jwt": "10.2.0",
"@nestjs/passport": "10.0.3",
"@nestjs/platform-express": "10.0.0",
"@nestjs/platform-socket.io": "10.4.4",
"@nestjs/schedule": "4.1.0",
"@nestjs/swagger": "7.4.0",
"@nestjs/terminus": "10.2.3",
"@nestjs/websockets": "10.4.4",
"@repo/email-templates": "workspace:*",
"@sinclair/typebox": "^0.32.34",
"@types/multer": "^1.4.12",
"add": "^2.0.6",
"bcrypt": "^5.1.1",
"cookie": "^0.6.0",
"cookie-parser": "^1.4.6",
"date-fns": "^3.6.0",
"dotenv": "^16.4.5",
"drizzle-kit": "^0.22.8",
"drizzle-orm": "^0.31.2",
"drizzle-typebox": "^0.1.1",
"@sinclair/typebox": "0.32.34",
"@types/multer": "1.4.12",
"add": "2.0.6",
"bcrypt": "5.1.1",
"cookie": "0.6.0",
"cookie-parser": "1.4.6",
"date-fns": "3.6.0",
"dotenv": "16.4.5",
"drizzle-kit": "0.22.8",
"drizzle-orm": "0.31.2",
"drizzle-typebox": "0.1.1",
"faker": "link:@types/@faker-js/faker",
"lodash": "^4.17.21",
"lodash": "4.17.21",
"nanoid": "3.3.7",
"nestjs-typebox": "3.0.0-next.8",
"nodemailer": "^6.9.14",
"passport": "^0.7.0",
"passport-jwt": "^4.0.1",
"passport-local": "^1.0.0",
"postgres": "^3.4.4",
"reflect-metadata": "^0.2.0",
"rxjs": "^7.8.1",
"stripe": "^17.0.0",
"ts-pattern": "^5.2.0",
"uuid": "^10.0.0"
"nodemailer": "6.9.14",
"passport": "0.7.0",
"passport-jwt": "4.0.1",
"passport-local": "1.0.0",
"postgres": "3.4.4",
"reflect-metadata": "0.2.0",
"rxjs": "7.8.1",
"stripe": "17.0.0",
"ts-pattern": "5.2.0",
"uuid": "10.0.0"
},
"devDependencies": {
"@nestjs/cli": "^10.0.0",
"@nestjs/schematics": "^10.0.0",
"@nestjs/testing": "^10.0.0",
"@types/aws-sdk": "^2.7.0",
"@types/bcrypt": "^5.0.2",
"@types/cookie": "^0.6.0",
"@types/cookie-parser": "^1.4.7",
"@types/express": "^4.17.17",
"@types/jest": "^29.5.2",
"@types/lodash": "^4.17.6",
"@types/node": "^20.3.1",
"@types/nodemailer": "^6.4.15",
"@types/passport-jwt": "^4.0.1",
"@types/passport-local": "^1.0.38",
"@types/supertest": "^6.0.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"eslint": "^8.42.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-unused-imports": "^4.1.4",
"fishery": "^2.2.2",
"jest": "^29.5.0",
"prettier": "^3.0.0",
"source-map-support": "^0.5.21",
"supertest": "^6.3.3",
"testcontainers": "^10.10.3",
"ts-jest": "^29.1.0",
"ts-loader": "^9.4.3",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.4.5"
"@aws-sdk/types": "3.696.0",
"@nestjs/cli": "10.0.0",
"@nestjs/schematics": "10.0.0",
"@nestjs/testing": "10.0.0",
"@types/bcrypt": "5.0.2",
"@types/cookie": "0.6.0",
"@types/cookie-parser": "1.4.7",
"@types/express": "4.17.17",
"@types/jest": "29.5.2",
"@types/lodash": "4.17.6",
"@types/node": "20.17.6",
"@types/nodemailer": "6.4.15",
"@types/passport-jwt": "4.0.1",
"@types/passport-local": "1.0.38",
"@types/supertest": "6.0.0",
"@types/uuid": "10.0.0",
"@typescript-eslint/eslint-plugin": "6.0.0",
"@typescript-eslint/parser": "6.0.0",
"eslint": "8.42.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-import": "2.28.1",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-unused-imports": "4.1.4",
"fishery": "2.2.2",
"jest": "29.5.0",
"prettier": "3.0.0",
"source-map-support": "0.5.21",
"supertest": "6.3.3",
"testcontainers": "10.10.3",
"ts-jest": "29.1.0",
"ts-loader": "9.4.3",
"ts-node": "10.9.1",
"tsconfig-paths": "4.2.0",
"typescript": "5.4.5"
}
}
39 changes: 21 additions & 18 deletions apps/api/src/courses/courses.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { DatabasePg } from "src/common";
import { addPagination, DEFAULT_PAGE_SIZE } from "src/common/pagination";
import { STATES } from "src/common/states";
import { S3Service } from "src/file/s3.service";
import { LESSON_ITEM_TYPE, LESSON_TYPE } from "src/lessons/lesson.type";
import { LessonProgress } from "src/lessons/schemas/lesson.types";

import { getSortOptions } from "../common/helpers/getSortOptions";
Expand Down Expand Up @@ -44,6 +45,7 @@ import type { AllCoursesForTutorResponse, AllCoursesResponse } from "./schemas/c
import type { CreateCourseBody } from "./schemas/createCourse.schema";
import type { UpdateCourseBody } from "./schemas/updateCourse.schema";
import type { Pagination, UUIDType } from "src/common";
import type { LessonProgressType } from "src/lessons/schemas/lesson.types";

@Injectable()
export class CoursesService {
Expand Down Expand Up @@ -267,19 +269,19 @@ export class CoursesService {
(SELECT COUNT(*)
FROM ${courseLessons}
JOIN ${lessons} ON ${courseLessons.lessonId} = ${lessons.id}
WHERE ${courseLessons.courseId} = ${courses.id} AND ${lessons.state} = 'published' AND ${lessons.archived} = false)::INTEGER`,
WHERE ${courseLessons.courseId} = ${courses.id} AND ${lessons.state} = ${STATES.published} AND ${lessons.archived} = false)::INTEGER`,
completedLessonCount: sql<number>`
(SELECT COUNT(*)
FROM ${courseLessons}
JOIN ${lessons} ON ${courseLessons.lessonId} = ${lessons.id}
WHERE ${courseLessons.courseId} = ${courses.id}
AND ${lessons.state} = 'published'
AND ${lessons.state} = ${STATES.published}
AND ${lessons.archived} = false
AND (
SELECT COUNT(*)
FROM ${lessonItems}
WHERE ${lessonItems.lessonId} = ${lessons.id}
AND ${lessonItems.lessonItemType} != 'text_block'
AND ${lessonItems.lessonItemType} != ${LESSON_ITEM_TYPE.text_block.key}
) = (
SELECT COUNT(*)
FROM ${studentCompletedLessonItems}
Expand Down Expand Up @@ -315,6 +317,7 @@ export class CoursesService {

if (!course) throw new NotFoundException("Course not found");

// TODO: to remove and start use getLessonsDetails form lessonsRepository
const courseLessonList = await this.db
.select({
id: lessons.id,
Expand All @@ -335,20 +338,20 @@ export class CoursesService {
(SELECT COUNT(*)
FROM ${lessonItems}
WHERE ${lessonItems.lessonId} = ${lessons.id}
AND ${lessonItems.lessonItemType} != 'text_block')::INTEGER`,
AND ${lessonItems.lessonItemType} != ${LESSON_ITEM_TYPE.text_block.key})::INTEGER`,
itemsCompletedCount: sql<number>`
(SELECT COUNT(*)
FROM ${studentCompletedLessonItems}
WHERE ${studentCompletedLessonItems.lessonId} = ${lessons.id}
AND ${studentCompletedLessonItems.courseId} = ${course.id}
AND ${studentCompletedLessonItems.studentId} = ${userId})::INTEGER`,
lessonProgress: sql<"completed" | "in_progress" | "not_started">`
lessonProgress: sql<LessonProgressType>`
(CASE
WHEN (
SELECT COUNT(*)
FROM ${lessonItems}
WHERE ${lessonItems.lessonId} = ${lessons.id}
AND ${lessonItems.lessonItemType} != 'text_block'
AND ${lessonItems.lessonItemType} != ${LESSON_ITEM_TYPE.text_block.key}
) = (
SELECT COUNT(*)
FROM ${studentCompletedLessonItems}
Expand Down Expand Up @@ -411,7 +414,7 @@ export class CoursesService {
(SELECT COUNT(*)
FROM ${courseLessons}
JOIN ${lessons} ON ${courseLessons.lessonId} = ${lessons.id}
WHERE ${courseLessons.courseId} = ${courses.id} AND ${lessons.state} = 'published' AND ${lessons.archived} = false)::INTEGER`,
WHERE ${courseLessons.courseId} = ${courses.id} AND ${lessons.state} = ${STATES.published} AND ${lessons.archived} = false)::INTEGER`,
state: courses.state,
priceInCents: courses.priceInCents,
currency: courses.currency,
Expand All @@ -432,7 +435,7 @@ export class CoursesService {
itemsCount: sql<number>`
(SELECT COUNT(*)
FROM ${lessonItems}
WHERE ${lessonItems.lessonId} = ${lessons.id} AND ${lessonItems.lessonItemType} != 'text_block')::INTEGER`,
WHERE ${lessonItems.lessonId} = ${lessons.id} AND ${lessonItems.lessonItemType} != ${LESSON_ITEM_TYPE.text_block.key})::INTEGER`,
isFree: courseLessons.isFree,
})
.from(courseLessons)
Expand Down Expand Up @@ -627,10 +630,11 @@ export class CoursesService {

if (!enrolledCourse) throw new ConflictException("Course not enrolled");

const quizLessons = await trx
const courseLessonList = await trx
.select({
id: lessons.id,
itemCount: sql<number>`count(${lessonItems.id})`,
lessonType: lessons.type,
itemCount: lessons.itemsCount,
})
.from(courseLessons)
.innerJoin(lessons, eq(courseLessons.lessonId, lessons.id))
Expand All @@ -640,19 +644,18 @@ export class CoursesService {
eq(courseLessons.courseId, course.id),
eq(lessons.archived, false),
eq(lessons.state, STATES.published),
eq(lessons.type, "quiz"),
),
)
.groupBy(lessons.id);

if (quizLessons.length > 0) {
if (courseLessonList.length > 0) {
await trx.insert(studentLessonsProgress).values(
quizLessons.map((lesson) => ({
courseLessonList.map((lesson) => ({
studentId: userId,
lessonId: lesson.id,
courseId: course.id,
quizCompleted: false,
lessonItemCount: lesson.itemCount,
quizCompleted: lesson.lessonType === LESSON_TYPE.quiz.key ? false : null,
quizScore: lesson.lessonType === LESSON_TYPE.quiz.key ? 0 : null,
completedLessonItemCount: 0,
})),
);
Expand Down Expand Up @@ -763,20 +766,20 @@ export class CoursesService {
FROM ${courseLessons}
JOIN ${lessons} ON ${courseLessons.lessonId} = ${lessons.id}
WHERE ${courseLessons.courseId} = ${courses.id}
AND ${lessons.state} = 'published'
AND ${lessons.state} = ${STATES.published}
AND ${lessons.archived} = false)::INTEGER`,
completedLessonCount: sql<number>`
(SELECT COUNT(*)
FROM ${courseLessons}
JOIN ${lessons} ON ${courseLessons.lessonId} = ${lessons.id}
WHERE ${courseLessons.courseId} = ${courses.id}
AND ${lessons.state} = 'published'
AND ${lessons.state} = ${STATES.published}
AND ${lessons.archived} = false
AND (
SELECT COUNT(*)
FROM ${lessonItems}
WHERE ${lessonItems.lessonId} = ${lessons.id}
AND ${lessonItems.lessonItemType} != 'text_block'
AND ${lessonItems.lessonItemType} != ${LESSON_ITEM_TYPE.text_block.key}
) = (
SELECT COUNT(*)
FROM ${studentCompletedLessonItems}
Expand Down
15 changes: 11 additions & 4 deletions apps/api/src/lessons/adminLessonItems.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { DEFAULT_PAGE_SIZE } from "src/common/pagination";
import { S3Service } from "src/file/s3.service";
import { files, questions, textBlocks } from "src/storage/schema";

import { LESSON_TYPE } from "./lesson.type";
import { AdminLessonItemsRepository } from "./repositories/adminLessonItems.repository";
import { AdminLessonsRepository } from "./repositories/adminLessons.repository";

Expand Down Expand Up @@ -197,7 +198,7 @@ export class AdminLessonItemsService {
throw new NotFoundException("Lesson not found");
}

if (lesson.type == "quiz") {
if (lesson.type == LESSON_TYPE.quiz.key) {
const lessonStudentAnswers = await this.adminLessonItemsRepository.getLessonStudentAnswers(
lesson.id,
);
Expand All @@ -209,7 +210,10 @@ export class AdminLessonItemsService {

await this.verifyItems(items);

await this.adminLessonItemsRepository.addLessonItemToLesson(lessonId, items);
await this.db.transaction(async (trx) => {
await this.adminLessonItemsRepository.addLessonItemToLesson(lessonId, items, trx);
await this.adminLessonsRepository.updateLessonItemsCount(lessonId, trx);
});
}

async unassignItemsFromLesson(lessonId: string, items: LessonItemToRemove[]): Promise<void> {
Expand All @@ -219,7 +223,7 @@ export class AdminLessonItemsService {
throw new NotFoundException("Lesson not found");
}

if (lesson.type == "quiz") {
if (lesson.type == LESSON_TYPE.quiz.key) {
const lessonStudentAnswers = await this.adminLessonItemsRepository.getLessonStudentAnswers(
lesson.id,
);
Expand All @@ -229,7 +233,10 @@ export class AdminLessonItemsService {
}
}

await this.adminLessonItemsRepository.removeLessonItemFromLesson(lessonId, items);
await this.db.transaction(async (trx) => {
await this.adminLessonItemsRepository.removeLessonItemFromLesson(lessonId, items, trx);
await this.adminLessonsRepository.updateLessonItemsCount(lessonId, trx);
});
}

async updateTextBlockItem(id: UUIDType, body: UpdateTextBlockBody) {
Expand Down
Loading