Merge 'dev' branch into main #13

saifsweelam · 2025-09-02T22:43:07Z

No description provided.

… default values for DailyQuiz

…culty, solved to Topic; create unique index on DailyQuiz

…guration

…z submissions by date

…ement

…x and remove optional answer field

…endations

…eve questions based on AI recommendations

…er quiz topics and progress

…missions and calculate scores

…ctions for courses and topics and tracks with server-side validation and aplly authntication middleware

Adds full CRUD functionality for user notes, including advanced filtering, sorting, and pagination.

… DailyQuiz model

…eve quiz submission days for a given month

…ted code

…id question index

…iz table

Adds full CRUD functionality for user notes, including advanced filtering, sorting, and pagination. Description: This pull request introduces the full backend implementation for the user notes feature, allowing learners to create, manage, and review personal notes associated with topics. Key Changes: Database: Added a Note model to the Prisma schema with relationships to User, Topic, and Course for efficient filtering. API Endpoints: Implemented a new set of RESTful endpoints under /api/notes and /api/topics/:topicId/notes for complete CRUD functionality. Business Logic: Created a dedicated note.service.ts to encapsulate all business logic, ensuring a clean separation of concerns. Validation: Integrated Zod schemas for rigorous validation of all incoming requests, including query parameters for advanced filtering, sorting, search, and pagination. Security: All new endpoints are protected and require user authentication. Authorization checks are in place to ensure users can only access and modify their own notes.

Apply authentication middleware and server-side validation, and implement a course, topic, and track endpoints with course-completion feature

Remove unused functions, update dependencies, and implement new features for quiz management, including tracking user submissions and enhancing the DailyQuiz and Topic models. Improve error handling and middleware configuration for better application stability.

- Restructured routes and controllers - Added comprehensive Postman collection with all API endpoints - Removed deprecated controller files - Added new service files for better organization - Updated schemas and middleware

Copilot

Pull Request Overview

This PR merges the 'dev' branch into main, introducing a comprehensive API and web application for an Open Learning Platform. The changes add complete functionality for tracks, courses, topics, notes, quizzes, and authentication systems.

Implementation of RESTful API endpoints for learning platform features
Frontend React components and services for user interaction
Authentication system using better-auth with JWT tokens
Database schema updates for notes and quiz functionality

Reviewed Changes

Copilot reviewed 52 out of 54 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
apps/web/src/services/*	API service modules for frontend-backend communication
apps/web/src/hooks/*	React Query hooks for data fetching and state management
apps/web/src/lib/*	Authentication client and route protection components
apps/api/src/services/*	Business logic services for API endpoints
apps/api/src/routes/*	Express route handlers for API endpoints
apps/api/src/schemas/*	Validation schemas using Zod
apps/api/prisma/*	Database schema and migration files
package.json files	Dependency updates for both frontend and backend

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-09-02T22:44:44Z

apps/api/src/services/topics.ts

+  });
+};
+
+export const getToltalTopics = async (


Function name contains a typo: 'getToltalTopics' should be 'getTotalTopics'.

Suggested change

export const getToltalTopics = async (

export const getTotalTopics = async (

Copilot · 2025-09-02T22:44:44Z

apps/api/src/services/courses.ts

+  });
+};
+
+export const getToltalTopics = async (courseId: string) => {


Function name contains a typo: 'getToltalTopics' should be 'getTotalTopics'.

Suggested change

export const getToltalTopics = async (courseId: string) => {

export const getTotalTopics = async (courseId: string) => {

Copilot · 2025-09-02T22:44:44Z

apps/api/src/routes/courses.ts

+import exprees from "express";
+const router = exprees.Router();


Import statement contains a typo: 'exprees' should be 'express'.

Suggested change

import exprees from "express";

const router = exprees.Router();

import express from "express";

const router = express.Router();

Copilot · 2025-09-02T22:44:45Z

apps/api/src/routes/courses.ts

+  async (req, res) => {
+    const course = await Service.getCourse(req.params.courseId);
+
+    const totalTopics = await Service.getToltalTopics(req.params.courseId);


Function call contains a typo: 'getToltalTopics' should be 'getTotalTopics'.

Copilot · 2025-09-02T22:44:45Z

apps/api/src/routes/courses.ts

+  async (req, res) => {
+    const { completed } = req.query;
+
+    const topics = await topicService.getToltalTopics(


Function call contains a typo: 'getToltalTopics' should be 'getTotalTopics'.

Suggested change

const topics = await topicService.getToltalTopics(

const topics = await topicService.getTotalTopics(

Copilot · 2025-09-02T22:44:45Z

apps/api/src/routes/topics.ts

+router.delete(
+  "/:topicId/completion",
+  requireAuth,
+  validate({ params: getTopicParamsSchema }),
+  async (req, res) => {
+    await unmarkTopicAsCompleted(req.user!.id, req.params.topicId);
+    res.enhancedSend(204, undefined);
+  },
+);


The DELETE endpoint for topic completion should use POST method instead, as indicated by the frontend service which calls unMarkTopicAsCompleted via POST to /topics/${topicId}/uncompletion. This creates an API inconsistency.

Copilot · 2025-09-02T22:44:45Z

apps/web/src/services/notesService.tsx

+  title: string;
+  content: string;
+  topicId: string;
+  userId: string; // موجود في schema


Comment contains non-English text. Code comments should be in English for consistency and maintainability in international teams.

Suggested change

userId: string; // موجود في schema

userId: string; // Present in schema

NaderMohamed325 and others added 30 commits August 13, 2025 22:52

refactor: remove unused quiz and recommendation service functions

7882b04

fix(pnpm-lock): update dependency versions and add axios

0fb3a0b

fix(package.json): ensure axios dependency is included

684fdc7

feat(prisma): add difficulty and attempt tracking to Topic model; set…

6ba0573

… default values for DailyQuiz

feat(migration): add totalQuestions to DailyQuiz and attempted, diffi…

6b4575f

…culty, solved to Topic; create unique index on DailyQuiz

chore: update app.ts for improved error handling and middleware confi…

2c972bb

…guration

feat(calendar): implement getQuizSubmissionCalendar to track user qui…

34d2001

…z submissions by date

feat(quiz): implement getQuiz and submitQuiz endpoints for quiz manag…

37f6029

…ement

feat(quizzes): implement calendar endpoint for quiz submission tracking

6dd9535

feat(quizzes): update submitDailyQuizBodySchema to require choiceInde…

6a576b9

…x and remove optional answer field

feat(ai): add fetchAiRecommendation function for AI-based quiz recomm…

1eeb191

…endations

feat(daily-quiz): implement daily quiz service with CRUD operations

0437764

feat(questions): add fetchQuestionsByRecommendation function to retri…

1f6b5e2

…eve questions based on AI recommendations

feat(quiz-data): implement buildUserQuizData function to aggregate us…

81440cd

…er quiz topics and progress

feat(quiz-submission): add gradeAnswers function to evaluate quiz sub…

88371c7

…missions and calculate scores

implement the user-topic completion feature and add the essential fun…

08b00d9

…ctions for courses and topics and tracks with server-side validation and aplly authntication middleware

feat(api): implement notes feature

790354d

Adds full CRUD functionality for user notes, including advanced filtering, sorting, and pagination.

fix(api): correct linting and formatting in note schemas

f6ded3d

replace the completed course array with set

d685096

replace the forEach with for of

7335942

feat(daily-quiz): add quizDate field and update unique constraint for…

a60b30f

… DailyQuiz model

feat(calendar): implement getQuizSubmissionCalendar function to retri…

498b256

…eve quiz submission days for a given month

feat(calendar): remove getQuizSubmissionCalendar function and associa…

4960098

…ted code

fix(quizzes): correct import path for getQuizSubmissionCalendar function

3f81264

chore(ai.service): no code changes made

309a7e2

fix(quiz-submission): replace hardcoded value with constant for inval…

ffd1bbe

…id question index

feat(migration): add quizDate column and unique constraint to DailyQu…

fc0686b

…iz table

Merge branch 'dev' into main

3597b22

implement course-completion feature (#10)

180417a

Apply authentication middleware and server-side validation, and implement a course, topic, and track endpoints with course-completion feature

saifsweelam and others added 6 commits August 19, 2025 23:04

Merge branch 'dev' into main

4e602d5

Refactor API structure and add Postman collection

2992d22

- Restructured routes and controllers - Added comprehensive Postman collection with all API endpoints - Removed deprecated controller files - Added new service files for better organization - Updated schemas and middleware

apply sercvices

28e91c0

feat(api): apply cors configuration

51fbdf7

fix(api): remove unused adminjs settings for now

b7f3c56

saifsweelam requested a review from Copilot September 2, 2025 22:43

Copilot AI reviewed Sep 2, 2025

View reviewed changes

saifsweelam merged commit 1bc0f1e into main Sep 2, 2025
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 'dev' branch into main #13

Merge 'dev' branch into main #13

Uh oh!

saifsweelam commented Sep 2, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	export const getToltalTopics = async (
	export const getTotalTopics = async (

	export const getToltalTopics = async (courseId: string) => {
	export const getTotalTopics = async (courseId: string) => {

		import exprees from "express";
		const router = exprees.Router();

	const topics = await topicService.getToltalTopics(
	const topics = await topicService.getTotalTopics(

	userId: string; // موجود في schema
	userId: string; // Present in schema

Merge 'dev' branch into main #13

Merge 'dev' branch into main #13

Uh oh!

Conversation

saifsweelam commented Sep 2, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants