Removed groupRank (#343)

codelitdev · May 20, 2024 · 9de0d56 · 9de0d56
1 parent ca61e67
commit 9de0d56
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/apps/web/graphql/lessons/helpers.ts b/apps/web/graphql/lessons/helpers.ts
@@ -71,7 +71,7 @@ function validateMediaContent(lessonData: LessonValidatorProps) {
     }
 }
 
-type GroupLessonItem = Pick<Lesson, "lessonId" | "groupId" | "groupRank">;
+type GroupLessonItem = Pick<Lesson, "lessonId" | "groupId">;
 export const getGroupedLessons = async (
     courseId: string,
     domainId: mongoose.Types.ObjectId,
@@ -89,7 +89,6 @@ export const getGroupedLessons = async (
         },
         {
             lessonId: 1,
-            groupRank: 1,
             groupId: 1,
         },
     );
@@ -104,7 +103,8 @@ export const getGroupedLessons = async (
                 )
                 .sort(
                     (a: GroupLessonItem, b: GroupLessonItem) =>
-                        a.groupRank - b.groupRank,
+                        group.lessonsOrder.indexOf(a.lessonId) -
+                        group.lessonsOrder.indexOf(b.lessonId),
                 ),
         );
     }

diff --git a/apps/web/graphql/lessons/logic.ts b/apps/web/graphql/lessons/logic.ts
@@ -142,7 +142,6 @@ export const createLesson = async (
             creatorId: ctx.user._id, // TODO: refactor this
             courseId: course.courseId,
             groupId: lessonData.groupId,
-            groupRank: -1,
             requiresEnrollment: lessonData.requiresEnrollment,
         });
 
@@ -235,7 +234,6 @@ export const getAllLessons = async (course: Course, ctx: GQLContext) => {
             requiresEnrollment: 1,
             courseId: 1,
             groupId: 1,
-            groupRank: 1,
         },
     );
 

diff --git a/apps/web/graphql/lessons/types.ts b/apps/web/graphql/lessons/types.ts
@@ -76,7 +76,6 @@ const lessonMetaType = new GraphQLObjectType({
         },
         courseId: { type: new GraphQLNonNull(GraphQLID) },
         groupId: { type: new GraphQLNonNull(GraphQLID) },
-        groupRank: { type: new GraphQLNonNull(GraphQLID) },
     },
 });
 

diff --git a/apps/web/models/Lesson.ts b/apps/web/models/Lesson.ts
@@ -26,7 +26,6 @@ export interface Lesson {
     requiresEnrollment: boolean;
     published: boolean;
     groupId: string;
-    groupRank: number;
 }
 
 const LessonSchema = new mongoose.Schema<Lesson>({
@@ -46,7 +45,6 @@ const LessonSchema = new mongoose.Schema<Lesson>({
     requiresEnrollment: { type: Boolean, default: true },
     published: { type: Boolean, required: true, default: false },
     groupId: { type: String, required: true },
-    groupRank: { type: Number, required: true },
 });
 
 export default mongoose.models.Lesson || mongoose.model("Lesson", LessonSchema);
diff --git a/apps/web/pages/course/[slug]/[id]/index.tsx b/apps/web/pages/course/[slug]/[id]/index.tsx
@@ -165,7 +165,6 @@ export async function getServerSideProps({ query, req }: any) {
           requiresEnrollment,
           courseId,
           groupId,
-          groupRank
         },
         tags,
         firstLesson

diff --git a/packages/common-widgets/src/content/widget.tsx b/packages/common-widgets/src/content/widget.tsx
@@ -75,7 +75,6 @@ export default function Widget({
                         groupId,
                         lessonId,
                         type,
-                        groupRank,
                         requiresEnrollment
                     },
                     groups {
@@ -126,7 +125,11 @@ export default function Widget({
             course.groups.map((group) => {
                 formattedCourse[group.name] = course.lessons
                     .filter((lesson: Lesson) => lesson.groupId === group.id)
-                    .sort((a: any, b: any) => a.groupRank - b.groupRank);
+                    .sort(
+                        (a: any, b: any) =>
+                            group.lessonsOrder.indexOf(a.lessonId) -
+                            group.lessonsOrder.indexOf(b.lessonId),
+                    );
             });
             setFormattedCourse(formattedCourse);
         }