Merge branch 'master' into test-serializers

.eslintrc.js

@@ -15,14 +15,14 @@ module.exports = {
     // "airbnb-base",
     // "airbnb-typescript/base",
     // Overrides AirBnB styles; keep in this order
-    "plugin:prettier/recommended",
+    // "plugin:prettier/recommended",
   ],
   parser: "@typescript-eslint/parser",
   parserOptions: {
     project: "./tsconfig.eslint.json",
     ecmaVersion: 2021,
   },
-  plugins: ["@typescript-eslint/eslint-plugin", "deprecation", "prettier"],
+  plugins: ["@typescript-eslint/eslint-plugin", "deprecation" /*"prettier"*/],
   rules: {
     // // "@typescript-eslint/explicit-function-return-type": "off",
     // // "@typescript-eslint/explicit-module-boundary-types": "off",

.github/workflows/docker.yaml

@@ -18,7 +18,7 @@ jobs:
         ports:
           - 5432:5432
       elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.0
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
         env:
           discovery.type: single-node
         ports:

.github/workflows/lint.yaml

@@ -28,7 +28,7 @@ jobs:
       - name: install node
         uses: actions/setup-node@v2
         with:
-          node-version: "16"
+          node-version: "22"
       - uses: bahmutov/npm-install@v1
       - name: Linting
         run: yarn lint
@@ -42,7 +42,7 @@ jobs:
       - name: install node
         uses: actions/setup-node@v2
         with:
-          node-version: "16"
+          node-version: "22"
       - uses: bahmutov/npm-install@v1
       - name: Checks for duplicate definitions in the yarn lockfile
         run: yarn yarn-deduplicate --fail

.github/workflows/test.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: install node
         uses: actions/setup-node@v2
         with:
-          node-version: "16"
+          node-version: "22"
       - uses: bahmutov/npm-install@v1
 
       - run: yarn unittest --coverage
@@ -44,7 +44,7 @@ jobs:
         ports:
           - 5432:5432
       elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.0
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
         env:
           discovery.type: single-node
         ports:
@@ -59,7 +59,7 @@ jobs:
       - name: install node
         uses: actions/setup-node@v2
         with:
-          node-version: "16"
+          node-version: "22"
       - uses: bahmutov/npm-install@v1
 
       - run: yarn db:migrate
@@ -94,7 +94,7 @@ jobs:
         ports:
           - 5432:5432
       elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.0
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
         env:
           discovery.type: single-node
         ports:
@@ -112,7 +112,7 @@ jobs:
       - name: install node
         uses: actions/setup-node@v2
         with:
-          node-version: "16"
+          node-version: "22"
 
       - uses: bahmutov/npm-install@v1
 

.husky/pre-commit

@@ -0,0 +1 @@
+yarn pretty-quick --staged && yarn eslint --no-error-on-unmatched-pattern --fix $(git diff --name-only HEAD | grep -E '\\.(js|ts)$' | xargs)

.nvmrc

@@ -1 +1 @@
-16
+22

Dockerfile

@@ -1,5 +1,5 @@
 # build environment
-FROM node:16-alpine as build
+FROM node:22-alpine as build
 WORKDIR /app
 # Install deps
 COPY package.json /app/package.json
@@ -26,12 +26,9 @@ RUN apk update && apk add wget && rm -rf /var/cache/apk/* \
     && wget "https://s3.amazonaws.com/rds-downloads/rds-ca-2019-root.pem"
 ENV dbCertPath /app/rds-ca-2019-root.pem
 
-# Required for Prisma compatibility since Node 16.16
-RUN apk add --update --no-cache openssl1.1-compat
-
 ENV NODE_ENV=prod
 
 ENTRYPOINT ["/app/entrypoint.sh"]
 
 EXPOSE 4000 8080
-CMD ["yarn", "prod"]
+CMD ["yarn", "prod"]

babel.config.json

@@ -10,6 +10,6 @@
     ],
     "@babel/preset-typescript"
   ],
-  "plugins": ["@babel/plugin-proposal-class-properties"],
+  "plugins": [],
   "ignore": ["node_modules"]
 }

graphql/resolvers/class.ts

@@ -20,7 +20,7 @@ const serializeValues = (results: PrismaCourse[]): Course[] => {
 
 const getLatestClassOccurrence = async (
   subject: string,
-  classId: string
+  classId: string,
 ): Promise<Course> => {
   const result: PrismaCourse | null = await prisma.course.findFirst({
     where: { subject, classId },
@@ -35,7 +35,7 @@ const getLatestClassOccurrence = async (
         extensions: {
           code: "COURSE_NOT_FOUND",
         },
-      }
+      },
     );
   }
   return HydrateCourseSerializer.serializeCourse(result);
@@ -45,7 +45,7 @@ const getBulkClassOccurrences = async (
   input: Array<{
     subject: string;
     classId: string;
-  }>
+  }>,
 ): Promise<Course[]> => {
   const results: PrismaCourse[] = await prisma.course.findMany({
     where: { OR: input },
@@ -57,7 +57,7 @@ const getBulkClassOccurrences = async (
 
 const getAllClassOccurrences = async (
   subject: string,
-  classId: string
+  classId: string,
 ): Promise<Course[]> => {
   const results = await prisma.course.findMany({
     where: { subject, classId },
@@ -71,7 +71,7 @@ const getAllClassOccurrences = async (
 const getClassOccurrence = async (
   termId: string,
   subject: string,
-  classId: string
+  classId: string,
 ): Promise<Course> => {
   const result: PrismaCourse | null = await prisma.course.findUnique({
     where: {
@@ -87,7 +87,7 @@ const getClassOccurrence = async (
         extensions: {
           code: "COURSE_NOT_FOUND",
         },
-      }
+      },
     );
   }
 
@@ -107,7 +107,7 @@ const getClassOccurrenceById = async (id: string): Promise<Course> => {
         extensions: {
           code: "COURSE_NOT_FOUND",
         },
-      }
+      },
     );
   }
   return HydrateCourseSerializer.serializeCourse(result);
@@ -125,7 +125,7 @@ const getSectionById = async (id: string): Promise<Section> => {
         extensions: {
           code: "SECTION_NOT_FOUND",
         },
-      }
+      },
     );
   }
   const resSec: Section = HydrateCourseSerializer.serializeSection(result); // this mutates res

graphql/resolvers/major.ts

@@ -7,7 +7,7 @@ const noResultsError = (recordType): never => {
 };
 
 const getLatestMajorOccurrence = async (
-  majorId: string
+  majorId: string,
 ): Promise<PrismaMajor> => {
   const majors: PrismaMajor[] = await prisma.major.findMany({
     where: { majorId: majorId },

graphql/resolvers/search.ts

@@ -31,7 +31,7 @@ const resolvers = {
   Query: {
     search: async (
       parent,
-      args: SearchArgs
+      args: SearchArgs,
     ): Promise<SearchResultItemConnection> => {
       const { offset = 0, first = 10 } = args;
       const results = await searcher.search(
@@ -48,8 +48,8 @@ const resolvers = {
             classIdRange: args.classIdRange,
             honors: args.honors,
           },
-          identity
-        )
+          identity,
+        ),
       );
 
       const hasNextPage = offset + first < results.resultCount;
@@ -59,7 +59,7 @@ const resolvers = {
         nodes: results.searchContent.map((r) =>
           r.type === "employee"
             ? r.employee
-            : { ...r.class, sections: r.sections }
+            : { ...r.class, sections: r.sections },
         ),
         pageInfo: {
           hasNextPage,