From 4b78080f5341a7e2b0423acc49f2e4974cff4925 Mon Sep 17 00:00:00 2001
From: Matt <matt@letsbe.solutions>
Date: Fri, 15 Aug 2025 15:53:13 +0200
Subject: [PATCH] fixes

---
 components/MemberCard.vue                  | 31 +++++++---------------
 server/api/admin/assign-member-ids.post.ts | 24 +++++------------
 2 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/components/MemberCard.vue b/components/MemberCard.vue
index 5d0c313..dffd135 100644
--- a/components/MemberCard.vue
+++ b/components/MemberCard.vue
@@ -217,6 +217,11 @@
 <script setup lang="ts">
 import type { Member } from '~/utils/types';
 import { getCountryName } from '~/utils/countries';
+import { 
+  isPaymentOverOneYear as checkPaymentOverOneYear, 
+  isDuesActuallyCurrent as checkDuesActuallyCurrent, 
+  calculateOverdueDays 
+} from '~/utils/dues-calculations';
 
 interface Props {
   member: Member;
@@ -308,36 +313,18 @@ const isInGracePeriod = computed(() => {
 
 /**
  * Check if a member's last payment is over 1 year old
- * Uses the same logic as dues-status API
+ * Uses standardized dues calculation function
  */
 const isPaymentOverOneYear = computed(() => {
-  if (!props.member.membership_date_paid) return false;
-  
-  try {
-    const lastPaidDate = new Date(props.member.membership_date_paid);
-    const oneYearFromPayment = new Date(lastPaidDate);
-    oneYearFromPayment.setFullYear(oneYearFromPayment.getFullYear() + 1);
-    const today = new Date();
-    
-    return today > oneYearFromPayment;
-  } catch {
-    return false;
-  }
+  return checkPaymentOverOneYear(props.member);
 });
 
 /**
  * Check if dues are actually current
- * Uses the same logic as dues-status API
+ * Uses standardized dues calculation function
  */
 const isDuesActuallyCurrent = computed(() => {
-  const paymentTooOld = isPaymentOverOneYear.value;
-  const duesCurrentlyPaid = props.member.current_year_dues_paid === 'true';
-  const gracePeriod = isInGracePeriod.value;
-  
-  // Member is NOT overdue if they're in grace period OR (dues paid AND payment not too old)
-  const isOverdue = paymentTooOld || (!duesCurrentlyPaid && !gracePeriod);
-  
-  return !isOverdue;
+  return checkDuesActuallyCurrent(props.member);
 });
 
 const duesColor = computed(() => {
diff --git a/server/api/admin/assign-member-ids.post.ts b/server/api/admin/assign-member-ids.post.ts
index d76fac9..25db5de 100644
--- a/server/api/admin/assign-member-ids.post.ts
+++ b/server/api/admin/assign-member-ids.post.ts
@@ -39,24 +39,15 @@ export default defineEventHandler(async (event) => {
       };
     }
 
-    // Get the highest existing member ID number to continue sequence
-    const existingMemberIds = allMembers
-      .filter((member: Member) => member.member_id)
-      .map((member: Member) => extractMemberIDNumber(member.member_id!))
-      .filter(num => num !== null) as number[];
-    
-    // Start from next available number, or 1 if no existing IDs
-    let nextIdNumber = existingMemberIds.length > 0 ? Math.max(...existingMemberIds) + 1 : 1;
-    console.log(`[api/admin/assign-member-ids.post] Starting with member ID number: ${nextIdNumber}`);
-
-    // Assign IDs to members without them
+    // Use the same generation method as new members to maintain consistency
+    // Generate unique 6-digit member IDs for consistency with existing format
     const updatedMembers = [];
     
     for (const member of membersWithoutIds) {
-      // Use 4-digit padding for member IDs (MUSA-0001, MUSA-0002, etc.)
-      const memberId = `MUSA-${nextIdNumber.toString().padStart(4, '0')}`;
-      
       try {
+        // Use the same generateMemberID function to ensure consistency
+        const memberId = await generateMemberID();
+        
         await updateMember(member.Id, {
           member_id: memberId
         });
@@ -69,7 +60,6 @@ export default defineEventHandler(async (event) => {
         });
         
         console.log(`[api/admin/assign-member-ids.post] Assigned ${memberId} to ${member.first_name} ${member.last_name}`);
-        nextIdNumber++;
         
       } catch (updateError: any) {
         console.error(`[api/admin/assign-member-ids.post] Failed to assign ID to member ${member.Id}:`, updateError);
@@ -86,8 +76,8 @@ export default defineEventHandler(async (event) => {
         totalMembers: allMembers.length,
         membersUpdated: updatedMembers.length,
         updatedMembers: updatedMembers.slice(0, 10), // Return first 10 for display
-        startingId: updatedMembers.length > 0 ? `MUSA-${(nextIdNumber - updatedMembers.length).toString().padStart(4, '0')}` : null,
-        endingId: updatedMembers.length > 0 ? updatedMembers[updatedMembers.length - 1].memberId : null
+        firstAssignedId: updatedMembers.length > 0 ? updatedMembers[0].memberId : null,
+        lastAssignedId: updatedMembers.length > 0 ? updatedMembers[updatedMembers.length - 1].memberId : null
       }
     };