Merge pull request #683 from UTDNebula/change-validator-route

fix: rename route test-validate => validate

Author: akevinge

.prettierignore

@@ -6,3 +6,6 @@ public
 
 node_modules/
 prisma/generated
+
+**/.mypy_cache/
+**/venv/

src/server/trpc/router/plan.ts

@@ -373,46 +373,6 @@ export const planRouter = router({
         console.error(error);
       }
     }),
-  // Unprotected route
-  validateDegreePlan: protectedProcedure
-    .input(
-      z.object({
-        courses: z.array(
-          z.object({
-            name: z.string(),
-            department: z.string(),
-            level: z.number(),
-            hours: z.number(),
-          }),
-        ),
-        bypasses: z.array(
-          z.object({
-            course: z.string(),
-            requirement: z.string(),
-            hours: z.number(),
-          }),
-        ),
-        degree: z.string(),
-      }),
-    )
-    .query(async ({ ctx, input }) => {
-      try {
-        return await fetch('http://0.0.0.0:5001/test-validate', {
-          method: 'POST',
-          body: JSON.stringify(input),
-          headers: {
-            'content-type': 'application/json',
-          },
-        }).then(async (res) => {
-          const rawData = await res.json();
-
-          return rawData;
-          // Transform data
-        });
-      } catch (error) {
-        console.log(error);
-      }
-    }),
   // Protected route: route uses session user id
   changeSemesterColor: protectedProcedure
     .input(

src/server/trpc/router/validator.ts

@@ -2,6 +2,7 @@ import { Course, Prisma, Semester } from '@prisma/client';
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
+import { env } from '@/env/server.mjs';
 import courses, { JSONCourse } from '@data/courses.json';
 
 import { protectedProcedure, router } from '../trpc';
@@ -375,7 +376,7 @@ export const validatorRouter = router({
       bypasses,
     };
 
-    const validationData = await fetch(`${process.env.NEXT_PUBLIC_VALIDATOR}/test-validate`, {
+    const validationData = await fetch(`${env.NEXT_PUBLIC_VALIDATOR}/validate`, {
       method: 'POST',
       body: JSON.stringify(body),
       headers: {

validator/api.py

@@ -45,7 +45,7 @@ def get_degree_plans() -> Response:
     )
 
 
-@app.route("/test-validate", methods=["POST"])
+@app.route("/validate", methods=["POST"])
 def test_validate() -> Response:
     try:
         j = request.get_json()