(rewrite) remove old models and rename new models

apps/backend/src/modules/catalog/controller.ts

@@ -2,15 +2,15 @@ import Fuse from "fuse.js";
 import { GraphQLResolveInfo } from "graphql";
 
 import {
+  ClassModel,
+  CourseModel,
   GradeDistributionModel,
   IClassItem,
   ICourseItem,
   IGradeDistributionItem,
   ISectionItem,
-  NewClassModel,
-  NewCourseModel,
-  NewSectionModel,
-  NewTermModel,
+  SectionModel,
+  TermModel,
 } from "@repo/common";
 
 import { getFields } from "../../utils/graphql";
@@ -363,7 +363,7 @@ export const getCatalog = async (
   info: GraphQLResolveInfo,
   query?: string | null
 ) => {
-  const term = await NewTermModel.findOne({
+  const term = await TermModel.findOne({
     name: `${year} ${semester}`,
   })
     .select({ _id: 1 })
@@ -384,7 +384,7 @@ export const getCatalog = async (
    */
 
   // Fetch available classes for the term
-  const classes = await NewClassModel.find({
+  const classes = await ClassModel.find({
     year,
     semester,
     anyPrintInScheduleOfClasses: true,
@@ -394,13 +394,13 @@ export const getCatalog = async (
   const courseIds = classes.map((_class) => _class.courseId);
 
   // Fetch available courses for the term
-  const courses = await NewCourseModel.find({
+  const courses = await CourseModel.find({
     courseId: { $in: courseIds },
     printInCatalog: true,
   }).lean();
 
   // Fetch available sections for the term
-  const sections = await NewSectionModel.find({
+  const sections = await SectionModel.find({
     year,
     semester,
     courseId: { $in: courseIds },

apps/backend/src/modules/class/controller.ts

@@ -1,8 +1,8 @@
 import {
+  ClassModel,
   IClassItem,
   ISectionItem,
-  NewClassModel,
-  NewSectionModel,
+  SectionModel,
 } from "@repo/common";
 
 import { formatClass, formatSection } from "./formatter";
@@ -15,7 +15,7 @@ export const getClass = async (
   courseNumber: string,
   number: string
 ) => {
-  const _class = await NewClassModel.findOne({
+  const _class = await ClassModel.findOne({
     year,
     semester,
     sessionId: sessionId ? sessionId : "1",
@@ -24,6 +24,8 @@ export const getClass = async (
     number,
   }).lean();
 
+  console.log(await ClassModel.countDocuments({}));
+
   if (!_class) return null;
 
   return formatClass(_class as IClassItem);
@@ -37,7 +39,7 @@ export const getSecondarySections = async (
   courseNumber: string,
   number: string
 ) => {
-  const sections = await NewSectionModel.find({
+  const sections = await SectionModel.find({
     year,
     semester,
     sessionId: sessionId ? sessionId : "1",
@@ -57,7 +59,7 @@ export const getPrimarySection = async (
   courseNumber: string,
   number: string
 ) => {
-  const section = await NewSectionModel.findOne({
+  const section = await SectionModel.findOne({
     year,
     semester,
     sessionId: sessionId ? sessionId : "1",
@@ -80,7 +82,7 @@ export const getSection = async (
   courseNumber: string,
   number: string
 ) => {
-  const section = await NewSectionModel.findOne({
+  const section = await SectionModel.findOne({
     year,
     semester,
     sessionId: sessionId ? sessionId : "1",

apps/backend/src/modules/course/controller.ts

@@ -1,17 +1,11 @@
-import {
-  CourseModel,
-  IClassItem,
-  ICourseItem,
-  NewClassModel,
-  NewCourseModel,
-} from "@repo/common";
+import { ClassModel, CourseModel, IClassItem, ICourseItem } from "@repo/common";
 
 import { formatClass } from "../class/formatter";
 import { IntermediateCourse, formatCourse } from "./formatter";
 import { CourseModule } from "./generated-types/module-types";
 
 export const getCourse = async (subject: string, number: string) => {
-  const course = await NewCourseModel.findOne({ subject, number })
+  const course = await CourseModel.findOne({ subject, number })
     .sort({ fromDate: -1 })
     .lean();
 
@@ -21,7 +15,7 @@ export const getCourse = async (subject: string, number: string) => {
 };
 
 export const getClassesByCourse = async (courseId: string) => {
-  const classes = await NewClassModel.find({
+  const classes = await ClassModel.find({
     courseId,
   }).lean();
 
@@ -43,7 +37,7 @@ export const getAssociatedCoursesBySubjectNumber = async (
     };
   });
 
-  const associatedCourses = await NewCourseModel.find({
+  const associatedCourses = await CourseModel.find({
     $or: queries,
   })
     .sort({ fromDate: -1 })
@@ -65,7 +59,7 @@ export const getAssociatedCoursesBySubjectNumber = async (
 };
 
 export const getAssociatedCoursesById = async (courseIds: string[]) => {
-  const associatedCourses = await NewCourseModel.find({
+  const associatedCourses = await CourseModel.find({
     courseId: { $in: courseIds },
   })
     .sort({ fromDate: -1 })

apps/backend/src/modules/grade-distribution/controller.ts

@@ -1,7 +1,7 @@
 import {
   GradeDistributionModel,
   IGradeDistributionItem,
-  NewSectionModel,
+  SectionModel,
 } from "@repo/common";
 
 enum Letter {
@@ -191,7 +191,7 @@ export const getGradeDistributionByClass = async (
   courseNumber: string,
   sectionNumber: string
 ) => {
-  const section = await NewSectionModel.findOne({
+  const section = await SectionModel.findOne({
     year,
     semester,
     sessionId: sessionId ? sessionId : "1",
@@ -254,7 +254,7 @@ export const getGradeDistributionByInstructor = async (
   familyName: string,
   givenName: string
 ) => {
-  const sections = await NewSectionModel.find({
+  const sections = await SectionModel.find({
     subject,
     courseNumber,
     "meetings.instructors.familyName": familyName,
@@ -291,7 +291,7 @@ export const getGradeDistributionByInstructorAndSemester = async (
   familyName: string,
   givenName: string
 ) => {
-  const sections = await NewSectionModel.find({
+  const sections = await SectionModel.find({
     year,
     semester,
     sessionId: sessionId ? sessionId : "1",

apps/backend/src/modules/schedule/controller.ts

@@ -1,9 +1,9 @@
 import {
+  ClassModel,
   IClassItem,
-  NewClassModel,
-  NewSectionModel,
-  NewTermModel,
   ScheduleModel,
+  SectionModel,
+  TermModel,
 } from "@repo/common";
 
 import {
@@ -55,7 +55,7 @@ export const createSchedule = async (
 ) => {
   if (!context.user._id) throw new Error("Unauthorized");
 
-  const term = await NewTermModel.findOne({
+  const term = await TermModel.findOne({
     name: `${input.year} ${input.semester}`,
   })
     .select({ _id: 1 })
@@ -114,7 +114,7 @@ export const getClasses = async (
   const classes = [];
 
   for (const selectedClass of selectedClasses) {
-    const _class = await NewClassModel.findOne({
+    const _class = await ClassModel.findOne({
       year,
       semester,
       sessionId: sessionId ? sessionId : "1",
@@ -125,7 +125,7 @@ export const getClasses = async (
 
     if (!_class) continue;
 
-    const sections = await NewSectionModel.find({
+    const sections = await SectionModel.find({
       termId: _class.termId,
       sessionId: _class.sessionId,
       sectionId: { $in: selectedClass.sectionIds },

apps/backend/src/modules/term/controller.ts

@@ -1,4 +1,4 @@
-import { NewTermModel } from "@repo/common";
+import { TermModel } from "@repo/common";
 
 import { formatTerm } from "./formatter";
 
@@ -20,7 +20,7 @@ const fields = {
 };
 
 export const getTerms = async () => {
-  const terms = await NewTermModel.find({}).select(fields).lean();
+  const terms = await TermModel.find({}).select(fields).lean();
 
   return terms.map(formatTerm);
 };
@@ -30,7 +30,7 @@ export const getTerm = async (
   semester: string,
   academicCareerCode: string = "UGRD"
 ) => {
-  const term = await NewTermModel.findOne({
+  const term = await TermModel.findOne({
     name: `${year} ${semester}`,
     academicCareerCode,
   })

apps/backend/src/modules/user/controller.ts

@@ -1,8 +1,8 @@
 import {
+  ClassModel,
+  CourseModel,
   IClassItem,
   ICourseItem,
-  NewClassModel,
-  NewCourseModel,
   UserModel,
 } from "@repo/common";
 
@@ -42,7 +42,7 @@ export const getBookmarkedCourses = async (
   const courses = [];
 
   for (const bookmarkedCourse of bookmarkedCourses) {
-    const course = await NewCourseModel.findOne({
+    const course = await CourseModel.findOne({
       subject: bookmarkedCourse.subject,
       number: bookmarkedCourse.number,
     })
@@ -63,7 +63,7 @@ export const getBookmarkedClasses = async (
   const classes = [];
 
   for (const bookmarkedClass of bookmarkedClasses) {
-    const _class = await NewClassModel.findOne({
+    const _class = await ClassModel.findOne({
       year: bookmarkedClass.year,
       semester: bookmarkedClass.semester,
       sessionId: bookmarkedClass.sessionId ? bookmarkedClass.sessionId : "1",