Merge pull request #51 from DevKor-github/feature/course

Feature/course
DevKor-github · Jul 25, 2024 · dc190ca · dc190ca
2 parents 518dc67 + c8f3141
commit dc190ca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/src/course/course.service.ts b/src/course/course.service.ts
@@ -83,14 +83,14 @@ export class CourseService {
           id: MoreThan(searchCourseCodeDto.cursorId),
         },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     } else {
       courses = await this.courseRepository.find({
         where: { courseCode: Like(`${searchCourseCodeDto.courseCode}%`) },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     }
@@ -118,7 +118,7 @@ export class CourseService {
         .andWhere('course.major = :major', { major })
         .andWhere('course.category = :category', { category: 'Major' })
         .orderBy('course.id', 'ASC')
-        .limit(5);
+        .limit(21);
 
       if (searchCourseNameDto.cursorId) {
         queryBuilder.andWhere('course.id > :cursorId', {
@@ -152,7 +152,7 @@ export class CourseService {
           id: MoreThan(searchProfessorNameDto.cursorId),
         },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     } else {
@@ -163,7 +163,7 @@ export class CourseService {
           category: 'Major',
         },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     }
@@ -190,7 +190,7 @@ export class CourseService {
           category: 'General Studies',
         })
         .orderBy('course.id', 'ASC')
-        .limit(5);
+        .limit(21);
 
       if (searchCourseNameDto.cursorId) {
         queryBuilder.andWhere('course.id > :cursorId', {
@@ -219,7 +219,7 @@ export class CourseService {
           id: MoreThan(searchProfessorNameDto.cursorId),
         },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     } else {
@@ -229,7 +229,7 @@ export class CourseService {
           category: 'General Studies',
         },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     }
@@ -244,14 +244,14 @@ export class CourseService {
       courses = await this.courseRepository.find({
         where: { category: 'General Studies', id: MoreThan(cursorId) },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     } else {
       courses = await this.courseRepository.find({
         where: { category: 'General Studies' },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     }
@@ -270,14 +270,14 @@ export class CourseService {
       courses = await this.courseRepository.find({
         where: { category: 'Major', major: major, id: MoreThan(cursorId) },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     } else {
       courses = await this.courseRepository.find({
         where: { category: 'Major', major: major },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     }
@@ -300,14 +300,14 @@ export class CourseService {
           id: MoreThan(cursorId),
         },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     } else {
       courses = await this.courseRepository.find({
         where: { category: 'Academic Foundations', college: college },
         order: { id: 'ASC' },
-        take: 5,
+        take: 21,
         relations: ['courseDetails'],
       });
     }

diff --git a/src/course/dto/paginated-courses.dto.ts b/src/course/dto/paginated-courses.dto.ts
@@ -12,15 +12,13 @@ export class PaginatedCoursesDto {
   data: CommonCourseResponseDto[];
 
   constructor(commonCourseResponseDto: CommonCourseResponseDto[]) {
-    const hasNextPage = commonCourseResponseDto.length === 5;
-    const nextCursorId = hasNextPage
-      ? commonCourseResponseDto[3].id
-      : null;
+    const hasNextPage = commonCourseResponseDto.length === 21;
+    const nextCursorId = hasNextPage ? commonCourseResponseDto[19].id : null;
 
     this.hasNextPage = hasNextPage;
     this.nextCursorId = nextCursorId;
     this.data = hasNextPage
-      ? commonCourseResponseDto.slice(0, 4)
+      ? commonCourseResponseDto.slice(0, 20)
       : commonCourseResponseDto;
   }
 }