@bash-app/bash-common 30.108.0 → 30.110.0

package/src/definitions.ts

@@ -140,7 +140,7 @@ export const SERVICE_SUBSCRIPTION_TIERS = {
   Ally: {
     name: "Ally",
     description: "Enhanced features for growing entertainment and event service providers",
-    price: 14,
+    price: 14, // NOTE: This is a FALLBACK ONLY - actual price fetched from Stripe via API
     features: [
       "Up to 5 service listings",
       "Unlimited photos & videos",
@@ -164,7 +164,7 @@ export const SERVICE_SUBSCRIPTION_TIERS = {
   Partner: {
     name: "Partner", 
     description: "Professional tools for established vendors and service providers",
-    price: 49,
+    price: 49, // NOTE: This is a FALLBACK ONLY - actual price fetched from Stripe via API
     features: [
       "Unlimited service listings",
       "Unlimited photos & videos",
@@ -189,7 +189,7 @@ export const SERVICE_SUBSCRIPTION_TIERS = {
   Patron: {
     name: "Patron",
     description: "Premium enterprise solution for venues and large organizations", 
-    price: 99,
+    price: 99, // NOTE: This is a FALLBACK ONLY - actual price fetched from Stripe via API
     features: [
       "Everything in Partner +",
       "Featured first (top placement)",

package/src/extendedSchemas.ts

@@ -11,6 +11,8 @@ import {
     BlogTag,
     Checkout,
     Competition,
+    CompetitionParticipant,
+    CompetitionVote,
     Contact,
     Coordinates,
     Demerit,
@@ -113,7 +115,9 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
   givenName: true,
   familyName: true,
   image: true,
+  imageUpdatedAt: true,
   uploadedImage: true,
+  uploadedImageUpdatedAt: true,
   isSuperUser: true,
   socialMediaProfiles: true,
   city: true,
@@ -162,6 +166,8 @@ export interface PrizeExt extends Prize {
 
 export interface CompetitionExt extends Competition {
   prizes: PrizeExt[];
+  participants?: CompetitionParticipant[];
+  votes?: CompetitionVote[];
 }
 
 export interface BashEventExt extends BashEvent {
@@ -226,6 +232,13 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
           },
         },
       },
+      participants: {
+        include: {
+          user: {
+            select: FRONT_END_USER_DATA_TO_SELECT,
+          },
+        },
+      },
     },
   },
 } satisfies Prisma.BashEventInclude;

package/src/utils/apiUtils.ts

@@ -30,6 +30,24 @@ export function getUserImage(contactOrUser: CombinedUserOrContact | undefined):
     return noProfilePicture;
   }
   const user = contactOrUser as CombinedUser;
+  
+  // Prioritize the most recently updated image for best UX
+  // If both images exist, compare timestamps
+  if (user.uploadedImage && user.image) {
+    const uploadedTime = user.uploadedImageUpdatedAt ? new Date(user.uploadedImageUpdatedAt).getTime() : 0;
+    const googleTime = user.imageUpdatedAt ? new Date(user.imageUpdatedAt).getTime() : 0;
+    
+    // Return the most recently updated image
+    if (uploadedTime > googleTime) {
+      return user.uploadedImage;
+    } else if (googleTime > 0) {
+      return user.image;
+    }
+    // If no timestamps, fall back to uploadedImage (existing behavior for backward compatibility)
+    return user.uploadedImage;
+  }
+  
+  // If only one image exists, return it
   return user.uploadedImage ?? user.image ?? noProfilePicture;
 }