v1.5.2

app/admin/nominations/page.tsx

@@ -1,22 +1,24 @@
-import { getAllNominations } from '@/lib/data/nominations';
+import { getActiveNominations } from '@/lib/data/nominations';
 import { getSettings } from '@/lib/data/settings';
 import { createClient } from '@/lib/supabase/server';
 import { redirect } from 'next/navigation';
 import NominationsManager from '@/components/NominationsManager';
 
 export default async function NominationsAdminPage() {
   const supabase = await createClient();
-  const { data: { user } } = await supabase.auth.getUser();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
 
   if (!user) {
     redirect('/login');
   }
 
-  const nominations = await getAllNominations();
+  const nominations = await getActiveNominations();
   const settings = await getSettings();
 
   return (
-    <div className="container max-w-[1600px] mx-auto py-6 px-4">
+    <div className="container max-w-400 mx-auto py-6 px-4">
       <div className="mb-6">
         <h1 className="text-4xl font-bold">Manage Nominations</h1>
         <p className="text-muted-foreground mt-2">

app/dashboard/page.tsx

@@ -1,18 +1,22 @@
-import { getApplicationByNuidWithNominations } from '@/lib/data/applications';
+import { getActiveApplicationByNuidWithNominations } from '@/lib/data/applications';
 import { getSettings } from '@/lib/data/settings';
 import UserDashboard from '@/components/UserDashboard';
 
 export default async function DashboardPage() {
   const settings = await getSettings();
-  
+
   return (
     <div className="container max-w-[1600px] mx-auto py-3 sm:py-6 px-3 sm:px-4">
       <div className="mb-3 sm:mb-6">
-        <h1 className="text-2xl sm:text-3xl lg:text-4xl font-bold">User Dashboard</h1>
-        <p className="text-sm sm:text-base text-muted-foreground mt-2">View your application status and nomination count</p>
+        <h1 className="text-2xl sm:text-3xl lg:text-4xl font-bold">
+          User Dashboard
+        </h1>
+        <p className="text-sm sm:text-base text-muted-foreground mt-2">
+          View your application status and nomination count
+        </p>
       </div>
-      <UserDashboard 
-        getApplicationByNuid={getApplicationByNuidWithNominations} 
+      <UserDashboard
+        getApplicationByNuid={getActiveApplicationByNuidWithNominations}
         settings={settings}
       />
     </div>

lib/actions/nominations.ts

@@ -41,9 +41,10 @@ export async function createNomination(data: NominationData) {
       throw new Error('You cannot nominate yourself for Senator');
     }
 
-    // Validate: Nominee must exist and get their constituency info
+    // Validate: Nominee must exist in the active cycle and get their constituency info
+    const activeCycle = await getActiveCycle();
     const nomineeApp = await db.application.findFirst({
-      where: { fullName: data.nominee },
+      where: { fullName: data.nominee, cycleId: activeCycle.id },
       select: { 
         constituency: true,
         communityConstituencyId: true,
@@ -86,8 +87,6 @@ export async function createNomination(data: NominationData) {
     }
 
     // Create nomination with PENDING status
-    const activeCycle = await getActiveCycle();
-
     await db.nomination.create({
       data: {
         fullName: data.fullName,

lib/data/applications.ts

@@ -4,19 +4,9 @@ import { db } from '@/lib/db';
 import { Application } from '@prisma/client';
 import { getActiveCycle } from '@/lib/data/cycles';
 
-export async function getApplications() {
-  return db.application.findMany();
-}
-
-export async function getApplicationByNuid(nuid: string) {
-  return db.application.findUnique({
-    where: { nuid },
-  });
-}
-
-export async function getApplicationByNuidWithNominations(nuid: string) {
+export async function getActiveApplicationByNuidWithNominations(nuid: string) {
   const application = await db.application.findUnique({
-    where: { nuid },
+    where: { nuid, cycle: { isActive: true } },
     include: {
       communityConstituency: {
         select: { name: true },
@@ -75,7 +65,10 @@ export async function getApplicationWithNominations(id: string) {
   });
 
   const endorsements = await db.endorsement.findMany({
-    where: { applicantName: application.fullName, cycleId: application.cycleId },
+    where: {
+      applicantName: application.fullName,
+      cycleId: application.cycleId,
+    },
     orderBy: { createdAt: 'desc' },
   });
 
@@ -91,7 +84,10 @@ export async function getApplicationWithNominations(id: string) {
   };
 }
 
-export async function getApplicationWithNominationsByCycleId(cycleId: string, id: string) {
+export async function getApplicationWithNominationsByCycleId(
+  cycleId: string,
+  id: string,
+) {
   const application = await db.application.findUnique({
     where: { id },
     include: {
@@ -176,21 +172,25 @@ export async function getApplicationsWithNominationCounts() {
 }
 
 export async function getNominationFormData() {
-  // Get all nominees (applications)
+  const activeCycle = await getActiveCycle();
+
+  // Get nominees from the active cycle only
   const allNominees = await db.application.findMany({
-    select: { 
-      fullName: true, 
+    where: { cycleId: activeCycle.id },
+    select: {
+      fullName: true,
       email: true,
-      nominationFormPdfUrl: true 
+      nominationFormPdfUrl: true,
     },
   });
 
   // Filter out nominees who have uploaded a paper nomination form
   const nominees = allNominees
-    .filter(nominee => !nominee.nominationFormPdfUrl)
+    .filter((nominee) => !nominee.nominationFormPdfUrl)
     .map(({ fullName, email }) => ({ fullName, email }));
 
   const constituencies = await db.application.findMany({
+    where: { cycleId: activeCycle.id },
     select: { constituency: true },
     distinct: ['constituency'],
   });
@@ -208,7 +208,9 @@ export async function getNominationFormData() {
   };
 }
 
-export async function getApplicationsWithNominationCountsByCycleId(cycleId: string) {
+export async function getApplicationsWithNominationCountsByCycleId(
+  cycleId: string,
+) {
   const applications = await db.application.findMany({
     where: { cycleId },
     include: {
@@ -250,7 +252,10 @@ export async function getApplicationsWithNominationCountsByCycleId(cycleId: stri
 }
 
 export async function createOrUpdateApplication(
-  data: Omit<Application, 'id' | 'createdAt' | 'nominationFormPdfUrl' | 'cycleId'>,
+  data: Omit<
+    Application,
+    'id' | 'createdAt' | 'nominationFormPdfUrl' | 'cycleId'
+  >,
 ) {
   const activeCycle = await getActiveCycle();
 

lib/data/nominations.ts

@@ -10,17 +10,6 @@ const Status = {
   MANUAL_REVIEW: 'MANUAL_REVIEW',
 } as const;
 
-export async function getNominations() {
-  return db.nomination.findMany({
-    include: {
-      communityConstituency: {
-        select: { name: true },
-      },
-    },
-    orderBy: { createdAt: 'desc' },
-  });
-}
-
 export async function getNominationsByCycleId(cycleId: string) {
   return db.nomination.findMany({
     where: { cycleId },
@@ -33,8 +22,9 @@ export async function getNominationsByCycleId(cycleId: string) {
   });
 }
 
-export async function getAllNominations() {
+export async function getActiveNominations() {
   return db.nomination.findMany({
+    where: { cycle: { isActive: true } },
     include: {
       communityConstituency: {
         select: { name: true },
@@ -44,7 +34,9 @@ export async function getAllNominations() {
   });
 }
 
-export async function getNominationsByStatus(status: 'PENDING' | 'APPROVED' | 'REJECTED') {
+export async function getNominationsByStatus(
+  status: 'PENDING' | 'APPROVED' | 'REJECTED',
+) {
   return db.nomination.findMany({
     where: { status },
     include: {
@@ -135,7 +127,9 @@ export async function getNomineesWithMinVotes(minVotes: number) {
     .sort((a, b) => b.count - a.count);
 }
 
-export async function createNomination(data: Omit<Nomination, 'id' | 'createdAt' | 'status' | 'cycleId'>) {
+export async function createNomination(
+  data: Omit<Nomination, 'id' | 'createdAt' | 'status' | 'cycleId'>,
+) {
   // Validate: Can't nominate yourself
   if (data.fullName === data.nominee) {
     throw new Error('You cannot nominate yourself for Senator');