Merge branch 'main' into fix/form-validation

Author: chrimesdev

application/CohortManager/src/Web/app/api/GetValidationExceptions/route.ts

@@ -45,8 +45,6 @@ function addExceptionDetails<T extends { ExceptionId: number }>(items: T[]) {
 export async function GET(request: Request) {
   const { searchParams } = new URL(request.url);
   const exceptionId = searchParams.get("exceptionId");
-  const raisedOnly = searchParams.get("raisedOnly");
-  const notRaisedOnly = searchParams.get("notRaisedOnly");
   const sortBy = searchParams.get("sortBy");
   const sortOrder = searchParams.get("sortOrder");
   const exceptionStatus = searchParams.get("exceptionStatus");
@@ -113,28 +111,6 @@ export async function GET(request: Request) {
     return NextResponse.json(response, { status: 200 });
   }
 
-  if (notRaisedOnly) {
-    const notRaisedExceptions = mockDataStore.getNotRaisedExceptions();
-    const sortedItems = sortExceptions([...notRaisedExceptions], sortBy);
-    const response = createExceptionListResponse(
-      addExceptionDetails(sortedItems)
-    );
-    return NextResponse.json(response, { status: 200 });
-  }
-
-  if (raisedOnly) {
-    const raisedExceptions = mockDataStore.getRaisedExceptions();
-    const sortedItems = sortExceptions(
-      [...raisedExceptions],
-      sortBy,
-      "ServiceNowCreatedDate"
-    );
-    const response = createExceptionListResponse(
-      addExceptionDetails(sortedItems)
-    );
-    return NextResponse.json(response, { status: 200 });
-  }
-
   // Default fallback
   return NextResponse.json(
     { error: "No valid query parameters provided" },

application/CohortManager/src/Web/app/lib/auth.ts

@@ -114,7 +114,7 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
 
       // Handle test accounts in development
       if (
-        process.env.NODE_ENV === "development" &&
+        process.env.APP_ENV === "development" &&
         account?.provider === "credentials"
       ) {
         Object.assign(token, {

application/CohortManager/src/Web/app/lib/fetchExceptions.ts

@@ -13,7 +13,7 @@ export async function fetchExceptions(exceptionId?: number) {
 }
 
 export async function fetchExceptionsNotRaised() {
-  const apiUrl = `${process.env.EXCEPTIONS_API_URL}/api/GetValidationExceptions?notRaisedOnly=true`;
+  const apiUrl = `${process.env.EXCEPTIONS_API_URL}/api/GetValidationExceptions?exceptionStatus=2`;
 
   const response = await fetch(apiUrl);
   if (!response.ok) {
@@ -23,7 +23,7 @@ export async function fetchExceptionsNotRaised() {
 }
 
 export async function fetchExceptionsRaised() {
-  const apiUrl = `${process.env.EXCEPTIONS_API_URL}/api/GetValidationExceptions?raisedOnly=true`;
+  const apiUrl = `${process.env.EXCEPTIONS_API_URL}/api/GetValidationExceptions?exceptionStatus=1`;
 
   const response = await fetch(apiUrl);
   if (!response.ok) {
@@ -33,7 +33,7 @@ export async function fetchExceptionsRaised() {
 }
 
 export async function fetchExceptionsNotRaisedSorted(sortBy: 0 | 1) {
-  const apiUrl = `${process.env.EXCEPTIONS_API_URL}/api/GetValidationExceptions?notRaisedOnly=true&sortBy=${sortBy}`;
+  const apiUrl = `${process.env.EXCEPTIONS_API_URL}/api/GetValidationExceptions?exceptionStatus=2&sortBy=${sortBy}`;
 
   const response = await fetch(apiUrl);
   if (!response.ok) {
@@ -43,7 +43,7 @@ export async function fetchExceptionsNotRaisedSorted(sortBy: 0 | 1) {
 }
 
 export async function fetchExceptionsRaisedSorted(sortBy: 0 | 1) {
-  const apiUrl = `${process.env.EXCEPTIONS_API_URL}/api/GetValidationExceptions?raisedOnly=true&sortBy=${sortBy}`;
+  const apiUrl = `${process.env.EXCEPTIONS_API_URL}/api/GetValidationExceptions?exceptionStatus=1&sortBy=${sortBy}`;
 
   const response = await fetch(apiUrl);
   if (!response.ok) {