@hed-hog/lms 0.0.357 → 0.0.358

package/src/enterprise/enterprise.service.ts

@@ -67,7 +67,7 @@ export class EnterpriseService {
         take: pageSize,
         orderBy: { name: 'asc' },
         include: {
-          person: { select: { id: true, name: true } },
+          person: { select: { id: true, name: true, avatar_id: true } },
           _count: {
             select: {
               enterprise_user: true,

package/src/instructor/instructor.service.ts

@@ -928,7 +928,10 @@ export class InstructorService {
       status?: string;
     } = {},
   ) {
-    const { page = 1, pageSize = 6, search, status } = options;
+    const page = Math.max(Number(options.page) || 1, 1);
+    const pageSize = Math.min(Math.max(Number(options.pageSize) || 6, 1), 100);
+    const skip = (page - 1) * pageSize;
+    const { search, status } = options;
 
     const where: Prisma.course_class_groupWhereInput = {
       instructor_id: instructorId,
@@ -971,7 +974,7 @@ export class InstructorService {
             },
           },
         },
-        skip: (page - 1) * pageSize,
+        skip,
         take: pageSize,
       }),
       this.prisma.course_class_group.count({ where }),
@@ -999,6 +1002,12 @@ export class InstructorService {
       };
     });
 
-    return { data, total, page, pageSize, lastPage: Math.ceil(total / pageSize) };
+    return {
+      data,
+      total,
+      page,
+      pageSize,
+      lastPage: Math.max(1, Math.ceil(total / pageSize)),
+    };
   }
 }