Merge pull request #300 from wizeline/feat/298/dont-show-inactive-uni…

…versities feat/298/dont-show-inactive-universities
WizelineLabs · Jan 10, 2024 · 8fb31fc · 8fb31fc
2 parents f513ed3 + 5616be8
commit 8fb31fc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/app/models/university.server.ts b/app/models/university.server.ts
@@ -17,6 +17,18 @@ export async function getUniversities() {
   });
 }
 
+export async function geActivetUniversities() {
+  return await db.universities.findMany({
+    select: { id: true, name: true, active: true },
+    orderBy: {
+      name: "asc",
+    },
+    where: {
+      active: true,
+    }
+  });
+}
+
 
 async function validateUniversity(id: string) {
   const innovationTier = await db.universities.findFirst({

diff --git a/app/routes/applicationForm/$applicantId/index.tsx b/app/routes/applicationForm/$applicantId/index.tsx
@@ -5,7 +5,7 @@ import { z } from "zod";
 import { ValidatedForm } from "remix-validated-form";
 import { zfd } from "zod-form-data";
 import SelectField from '~/core/components/FormFields/SelectField';
-import { getUniversities } from '~/models/university.server';
+import { geActivetUniversities } from '~/models/university.server';
 import type { LoaderFunction } from "@remix-run/node";
 import { json } from "@remix-run/node";
 import { type SubmitOptions, useLoaderData, useFetcher } from "@remix-run/react";
@@ -101,7 +101,7 @@ type UserProfile = {
 };
 
 type LoaderData = {
-  universities: Awaited<ReturnType<typeof getUniversities>>;
+  universities: Awaited<ReturnType<typeof geActivetUniversities>>;
   profile: UserProfile;
 };
 
@@ -118,7 +118,7 @@ const profileFetcherOptions: SubmitOptions = {
 
 
 export const loader: LoaderFunction = async ({ request }) => {
-  const universities = await getUniversities();
+  const universities = await geActivetUniversities();
   const profile = await requireProfile(request);
 
   return json<LoaderData>({