Merge remote-tracking branch 'refs/remotes/origin/crowd-sourced-data'…

… into crowd-sourced-data
asuc-octo · Oct 30, 2024 · 8938ca8 · 8938ca8
2 parents 9888104 + 35a49ee
commit 8938ca8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/apps/backend/src/modules/rating/formatter.ts b/apps/backend/src/modules/rating/formatter.ts
@@ -3,14 +3,15 @@ import {
   Rating, 
   AggregatedRatings,
   Metric,
-  Category
-} from './typedefs/rating';
+  Category,
+  Semester
+} from '../../generated-types/graphql';
 // mongo -> graphql (models -> typedefs)
 
 export const formatUserRating = (rating: RatingType): Rating => ({
   subject: rating.subject,
   courseNumber: rating.courseNumber,
-  semester: rating.semester,
+  semester: rating.semester as Semester,
   year: rating.year,
   class: rating.class,
 
@@ -22,7 +23,7 @@ export const formatUserRating = (rating: RatingType): Rating => ({
 
 // does mongo always return an array? single return val vs multiple val
 export const formatUserRatings = (ratings: any[]): Rating[] => {
-  return ratings.map(formatUserRatings);
+  return ratings.map(formatUserRating);
 };
 
 // grandparent group by class -> done

diff --git a/packages/common/src/models/rating.ts b/packages/common/src/models/rating.ts
@@ -28,7 +28,7 @@ const ratingSchema = new Schema({
     required: true,
   },
   year: {
-    type: String,
+    type: Number,
     required: true,
   },
   class: {