Implement house points system: Add houseJoinPoints, houseLeavePoints, and houseCreatePoints to SitePreferences model and update related services. Enhance house management features to award and deduct points for house creation, membership removal, and leaving a house. Update environment configuration for PostgreSQL and adjust UI components to reflect new functionalities.

2025-12-18 08:48:31 +01:00
parent 12bc44e3ac
commit 1b82bd9ee6
23 changed files with 1026 additions and 113 deletions
--- a/components/admin/AdminPanel.tsx
+++ b/components/admin/AdminPanel.tsx
@@ -8,6 +8,7 @@ import ChallengeManagement from "@/components/admin/ChallengeManagement";
 import BackgroundPreferences from "@/components/admin/BackgroundPreferences";
 import EventPointsPreferences from "@/components/admin/EventPointsPreferences";
 import EventFeedbackPointsPreferences from "@/components/admin/EventFeedbackPointsPreferences";
+import HousePointsPreferences from "@/components/admin/HousePointsPreferences";
 import { Button, Card, SectionTitle } from "@/components/ui";

 interface SitePreferences {
@@ -18,6 +19,9 @@ interface SitePreferences {
  challengesBackground: string | null;
  eventRegistrationPoints: number;
  eventFeedbackPoints: number;
+  houseJoinPoints: number;
+  houseLeavePoints: number;
+  houseCreatePoints: number;
 }

 interface AdminPanelProps {
@@ -99,6 +103,7 @@ export default function AdminPanel({ initialPreferences }: AdminPanelProps) {
              <BackgroundPreferences initialPreferences={initialPreferences} />
              <EventPointsPreferences initialPreferences={initialPreferences} />
              <EventFeedbackPointsPreferences initialPreferences={initialPreferences} />
+              <HousePointsPreferences initialPreferences={initialPreferences} />
            </div>
          </Card>
        )}
--- a/components/admin/HousePointsPreferences.tsx
+++ b/components/admin/HousePointsPreferences.tsx
@@ -0,0 +1,269 @@
+"use client";
+
+import { useState, useEffect } from "react";
+import { updateSitePreferences } from "@/actions/admin/preferences";
+import { Button, Card, Input } from "@/components/ui";
+
+interface SitePreferences {
+  id: string;
+  houseJoinPoints: number;
+  houseLeavePoints: number;
+  houseCreatePoints: number;
+}
+
+interface HousePointsPreferencesProps {
+  initialPreferences: SitePreferences;
+}
+
+export default function HousePointsPreferences({
+  initialPreferences,
+}: HousePointsPreferencesProps) {
+  const [preferences, setPreferences] = useState<SitePreferences | null>(
+    initialPreferences
+  );
+  const [isEditing, setIsEditing] = useState(false);
+  const [formData, setFormData] = useState({
+    houseJoinPoints: initialPreferences.houseJoinPoints.toString(),
+    houseLeavePoints: initialPreferences.houseLeavePoints.toString(),
+    houseCreatePoints: initialPreferences.houseCreatePoints.toString(),
+  });
+  const [isSaving, setIsSaving] = useState(false);
+
+  // Synchroniser les préférences quand initialPreferences change
+  useEffect(() => {
+    setPreferences(initialPreferences);
+    setFormData({
+      houseJoinPoints: initialPreferences.houseJoinPoints.toString(),
+      houseLeavePoints: initialPreferences.houseLeavePoints.toString(),
+      houseCreatePoints: initialPreferences.houseCreatePoints.toString(),
+    });
+  }, [initialPreferences]);
+
+  const handleEdit = () => {
+    setIsEditing(true);
+  };
+
+  const handleSave = async () => {
+    const joinPoints = parseInt(formData.houseJoinPoints, 10);
+    const leavePoints = parseInt(formData.houseLeavePoints, 10);
+    const createPoints = parseInt(formData.houseCreatePoints, 10);
+    
+    if (isNaN(joinPoints) || joinPoints < 0) {
+      alert("Le nombre de points pour rejoindre une maison doit être un nombre positif");
+      return;
+    }
+    
+    if (isNaN(leavePoints) || leavePoints < 0) {
+      alert("Le nombre de points pour quitter une maison doit être un nombre positif");
+      return;
+    }
+    
+    if (isNaN(createPoints) || createPoints < 0) {
+      alert("Le nombre de points pour créer une maison doit être un nombre positif");
+      return;
+    }
+
+    setIsSaving(true);
+    try {
+      const result = await updateSitePreferences({
+        houseJoinPoints: joinPoints,
+        houseLeavePoints: leavePoints,
+        houseCreatePoints: createPoints,
+      });
+
+      if (result.success && result.data) {
+        setPreferences(result.data);
+        setFormData({
+          houseJoinPoints: result.data.houseJoinPoints.toString(),
+          houseLeavePoints: result.data.houseLeavePoints.toString(),
+          houseCreatePoints: result.data.houseCreatePoints.toString(),
+        });
+        setIsEditing(false);
+      } else {
+        console.error("Error updating preferences:", result.error);
+        alert(result.error || "Erreur lors de la mise à jour");
+      }
+    } catch (error) {
+      console.error("Error updating preferences:", error);
+      alert("Erreur lors de la mise à jour");
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  const handleCancel = () => {
+    setIsEditing(false);
+    if (preferences) {
+      setFormData({
+        houseJoinPoints: preferences.houseJoinPoints.toString(),
+        houseLeavePoints: preferences.houseLeavePoints.toString(),
+        houseCreatePoints: preferences.houseCreatePoints.toString(),
+      });
+    }
+  };
+
+  return (
+    <Card variant="default" className="p-3 sm:p-4">
+      <div className="flex flex-col sm:flex-row sm:justify-between sm:items-start gap-3 mb-4">
+        <div className="min-w-0 flex-1">
+          <h3 className="text-pixel-gold font-bold text-base sm:text-lg break-words">
+            Points des Maisons
+          </h3>
+          <p className="text-gray-400 text-xs sm:text-sm">
+            Nombre de points attribués ou retirés pour les actions liées aux maisons
+          </p>
+        </div>
+        {!isEditing && (
+          <Button
+            onClick={handleEdit}
+            variant="primary"
+            size="sm"
+            className="whitespace-nowrap flex-shrink-0"
+          >
+            Modifier
+          </Button>
+        )}
+      </div>
+
+      {isEditing ? (
+        <div className="space-y-4">
+          <div>
+            <label
+              htmlFor="houseJoinPoints"
+              className="block text-sm font-medium text-pixel-gold mb-2"
+            >
+              Points pour rejoindre une maison
+            </label>
+            <Input
+              id="houseJoinPoints"
+              type="number"
+              min="0"
+              value={formData.houseJoinPoints}
+              onChange={(e) =>
+                setFormData({
+                  ...formData,
+                  houseJoinPoints: e.target.value,
+                })
+              }
+              placeholder="100"
+              className="w-full"
+            />
+            <p className="text-xs text-gray-400 mt-1">
+              Les utilisateurs gagneront ce nombre de points lorsqu&apos;ils rejoignent une maison
+            </p>
+          </div>
+          
+          <div>
+            <label
+              htmlFor="houseLeavePoints"
+              className="block text-sm font-medium text-pixel-gold mb-2"
+            >
+              Points retirés en quittant une maison
+            </label>
+            <Input
+              id="houseLeavePoints"
+              type="number"
+              min="0"
+              value={formData.houseLeavePoints}
+              onChange={(e) =>
+                setFormData({
+                  ...formData,
+                  houseLeavePoints: e.target.value,
+                })
+              }
+              placeholder="100"
+              className="w-full"
+            />
+            <p className="text-xs text-gray-400 mt-1">
+              Les utilisateurs perdront ce nombre de points lorsqu&apos;ils quittent une maison
+            </p>
+          </div>
+          
+          <div>
+            <label
+              htmlFor="houseCreatePoints"
+              className="block text-sm font-medium text-pixel-gold mb-2"
+            >
+              Points pour créer une maison
+            </label>
+            <Input
+              id="houseCreatePoints"
+              type="number"
+              min="0"
+              value={formData.houseCreatePoints}
+              onChange={(e) =>
+                setFormData({
+                  ...formData,
+                  houseCreatePoints: e.target.value,
+                })
+              }
+              placeholder="100"
+              className="w-full"
+            />
+            <p className="text-xs text-gray-400 mt-1">
+              Les utilisateurs gagneront ce nombre de points lorsqu&apos;ils créent une maison
+            </p>
+          </div>
+          
+          <div className="flex flex-col sm:flex-row gap-2 pt-4">
+            <Button
+              onClick={handleSave}
+              variant="success"
+              size="md"
+              disabled={isSaving}
+            >
+              {isSaving ? "Enregistrement..." : "Enregistrer"}
+            </Button>
+            <Button
+              onClick={handleCancel}
+              variant="secondary"
+              size="md"
+              disabled={isSaving}
+            >
+              Annuler
+            </Button>
+          </div>
+        </div>
+      ) : (
+        <div className="space-y-3">
+          <div className="flex flex-col sm:flex-row sm:items-center gap-2 sm:gap-4">
+            <span className="text-pixel-gold font-bold text-sm sm:text-base min-w-0 sm:min-w-[200px] flex-shrink-0">
+              Points pour rejoindre:
+            </span>
+            <div className="flex items-center gap-2">
+              <span className="text-lg sm:text-xl font-bold text-white">
+                {preferences?.houseJoinPoints ?? 100}
+              </span>
+              <span className="text-xs sm:text-sm text-gray-400">points</span>
+            </div>
+          </div>
+          
+          <div className="flex flex-col sm:flex-row sm:items-center gap-2 sm:gap-4">
+            <span className="text-pixel-gold font-bold text-sm sm:text-base min-w-0 sm:min-w-[200px] flex-shrink-0">
+              Points retirés en quittant:
+            </span>
+            <div className="flex items-center gap-2">
+              <span className="text-lg sm:text-xl font-bold text-white">
+                {preferences?.houseLeavePoints ?? 100}
+              </span>
+              <span className="text-xs sm:text-sm text-gray-400">points</span>
+            </div>
+          </div>
+          
+          <div className="flex flex-col sm:flex-row sm:items-center gap-2 sm:gap-4">
+            <span className="text-pixel-gold font-bold text-sm sm:text-base min-w-0 sm:min-w-[200px] flex-shrink-0">
+              Points pour créer:
+            </span>
+            <div className="flex items-center gap-2">
+              <span className="text-lg sm:text-xl font-bold text-white">
+                {preferences?.houseCreatePoints ?? 100}
+              </span>
+              <span className="text-xs sm:text-sm text-gray-400">points</span>
+            </div>
+          </div>
+        </div>
+      )}
+    </Card>
+  );
+}
+
--- a/components/houses/HouseCard.tsx
+++ b/components/houses/HouseCard.tsx
@@ -60,6 +60,8 @@ export default function HouseCard({ house, onRequestSent }: HouseCardProps) {
      const result = await requestToJoin(house.id);

      if (result.success) {
+        // Rafraîchir le badge d'invitations/demandes dans le header
+        window.dispatchEvent(new Event("refreshInvitations"));
        setSuccess("Demande envoyée avec succès");
        onRequestSent?.();
      } else {
--- a/components/houses/HouseForm.tsx
+++ b/components/houses/HouseForm.tsx
@@ -38,6 +38,10 @@ export default function HouseForm({
        : await createHouse({ name, description: description || null });

      if (result.success) {
+        // Rafraîchir le score dans le header si on crée une maison (pas si on met à jour)
+        if (!house) {
+          window.dispatchEvent(new Event("refreshUserScore"));
+        }
        onSuccess?.();
      } else {
        setError(result.error || "Une erreur est survenue");
--- a/components/houses/HouseManagement.tsx
+++ b/components/houses/HouseManagement.tsx
@@ -7,7 +7,7 @@ import Button from "@/components/ui/Button";
 import HouseForm from "./HouseForm";
 import RequestList from "./RequestList";
 import Alert from "@/components/ui/Alert";
-import { deleteHouse, leaveHouse } from "@/actions/houses/update";
+import { deleteHouse, leaveHouse, removeMember } from "@/actions/houses/update";
 import { inviteUser } from "@/actions/houses/invitations";

 interface House {
@@ -112,6 +112,8 @@ export default function HouseManagement({
    startTransition(async () => {
      const result = await deleteHouse(house.id);
      if (result.success) {
+        // Rafraîchir le score dans le header (le créateur perd des points)
+        window.dispatchEvent(new Event("refreshUserScore"));
        onUpdate?.();
      } else {
        setError(result.error || "Erreur lors de la suppression");
@@ -128,6 +130,7 @@ export default function HouseManagement({
    startTransition(async () => {
      const result = await leaveHouse(house.id);
      if (result.success) {
+        window.dispatchEvent(new Event("refreshUserScore"));
        onUpdate?.();
      } else {
        setError(result.error || "Erreur lors de la sortie");
@@ -144,6 +147,8 @@ export default function HouseManagement({
    startTransition(async () => {
      const result = await inviteUser(house.id, selectedUserId);
      if (result.success) {
+        // Rafraîchir le badge d'invitations/demandes dans le header (pour l'invité)
+        window.dispatchEvent(new Event("refreshInvitations"));
        setSuccess("Invitation envoyée");
        setShowInviteForm(false);
        setSelectedUserId("");
@@ -303,17 +308,45 @@ export default function HouseManagement({
                        </span>
                      </div>
                    </div>
-                    <span 
-                      className="text-xs uppercase flex-shrink-0 px-2 py-1 rounded font-bold"
-                      style={{ 
-                        color: roleColor,
-                        backgroundColor: `color-mix(in srgb, ${roleColor} 15%, transparent)`,
-                        border: `1px solid color-mix(in srgb, ${roleColor} 30%, transparent)`
-                      }}
-                    >
-                      {membership.role === "OWNER" && "👑 "}
-                      {membership.role}
-                    </span>
+                    <div className="flex items-center gap-2 flex-shrink-0">
+                      <span 
+                        className="text-xs uppercase px-2 py-1 rounded font-bold"
+                        style={{ 
+                          color: roleColor,
+                          backgroundColor: `color-mix(in srgb, ${roleColor} 15%, transparent)`,
+                          border: `1px solid color-mix(in srgb, ${roleColor} 30%, transparent)`
+                        }}
+                      >
+                        {membership.role === "OWNER" && "👑 "}
+                        {membership.role}
+                      </span>
+                      {isAdmin && 
+                        !isCurrentUser && 
+                        (isOwner || membership.role === "MEMBER") &&
+                        membership.role !== "OWNER" && (
+                        <Button
+                          onClick={() => {
+                            if (confirm(`Êtes-vous sûr de vouloir retirer ${membership.user.username} de la maison ?`)) {
+                              startTransition(async () => {
+                                const result = await removeMember(house.id, membership.user.id);
+                                if (result.success) {
+                                  // Rafraîchir le score dans le header (le membre retiré perd des points)
+                                  window.dispatchEvent(new Event("refreshUserScore"));
+                                  onUpdate?.();
+                                } else {
+                                  setError(result.error || "Erreur lors du retrait du membre");
+                                }
+                              });
+                            }
+                          }}
+                          disabled={isPending}
+                          variant="danger"
+                          size="sm"
+                        >
+                          Retirer
+                        </Button>
+                      )}
+                    </div>
                  </div>
                );
              })}
--- a/components/houses/InvitationList.tsx
+++ b/components/houses/InvitationList.tsx
@@ -41,6 +41,10 @@ export default function InvitationList({
    startTransition(async () => {
      const result = await acceptInvitation(invitationId);
      if (result.success) {
+        // Rafraîchir le score dans le header (l'utilisateur reçoit des points)
+        window.dispatchEvent(new Event("refreshUserScore"));
+        // Rafraîchir le badge d'invitations dans le header
+        window.dispatchEvent(new Event("refreshInvitations"));
        onUpdate?.();
      } else {
        setError(result.error || "Erreur lors de l'acceptation");
@@ -53,6 +57,8 @@ export default function InvitationList({
    startTransition(async () => {
      const result = await rejectInvitation(invitationId);
      if (result.success) {
+        // Rafraîchir le badge d'invitations dans le header
+        window.dispatchEvent(new Event("refreshInvitations"));
        onUpdate?.();
      } else {
        setError(result.error || "Erreur lors du refus");
--- a/components/houses/RequestList.tsx
+++ b/components/houses/RequestList.tsx
@@ -37,6 +37,10 @@ export default function RequestList({
    startTransition(async () => {
      const result = await acceptRequest(requestId);
      if (result.success) {
+        // Rafraîchir le score dans le header (le requester reçoit des points)
+        window.dispatchEvent(new Event("refreshUserScore"));
+        // Rafraîchir le badge d'invitations/demandes dans le header (le requester n'a plus de demande en attente)
+        window.dispatchEvent(new Event("refreshInvitations"));
        onUpdate?.();
      } else {
        setError(result.error || "Erreur lors de l'acceptation");
@@ -49,6 +53,8 @@ export default function RequestList({
    startTransition(async () => {
      const result = await rejectRequest(requestId);
      if (result.success) {
+        // Rafraîchir le badge d'invitations/demandes dans le header (le requester n'a plus de demande en attente)
+        window.dispatchEvent(new Event("refreshInvitations"));
        onUpdate?.();
      } else {
        setError(result.error || "Erreur lors du refus");
--- a/components/navigation/InvitationBadge.tsx
+++ b/components/navigation/InvitationBadge.tsx
@@ -0,0 +1,73 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import Link from "next/link";
+
+interface InvitationBadgeProps {
+  initialCount?: number;
+  onNavigate?: () => void;
+}
+
+export default function InvitationBadge({
+  initialCount = 0,
+  onNavigate,
+}: InvitationBadgeProps) {
+  const [count, setCount] = useState(initialCount);
+
+  // Utiliser le count initial (déjà récupéré côté serveur)
+  useEffect(() => {
+    setCount(initialCount);
+  }, [initialCount]);
+
+  // Écouter les événements de refresh des invitations (déclenché après acceptation/refus)
+  useEffect(() => {
+    const handleRefreshInvitations = async () => {
+      try {
+        const response = await fetch("/api/invitations/pending-count");
+        const data = await response.json();
+        setCount(data.count || 0);
+      } catch (error) {
+        console.error("Error fetching pending invitations count:", error);
+      }
+    };
+
+    window.addEventListener("refreshInvitations", handleRefreshInvitations);
+    return () => {
+      window.removeEventListener("refreshInvitations", handleRefreshInvitations);
+    };
+  }, []);
+
+  return (
+    <Link
+      href="/houses"
+      onClick={onNavigate}
+      className={`inline-flex items-center gap-1.5 transition text-xs font-normal uppercase tracking-widest ${
+        onNavigate ? "py-2" : ""
+      }`}
+      style={{ color: "var(--foreground)" }}
+      onMouseEnter={(e) =>
+        (e.currentTarget.style.color = "var(--accent-color)")
+      }
+      onMouseLeave={(e) => (e.currentTarget.style.color = "var(--foreground)")}
+      title={
+        count > 0
+          ? `${count} action${count > 1 ? "s" : ""} en attente (invitations et demandes)`
+          : "Maisons"
+      }
+    >
+      <span>MAISONS</span>
+      {count > 0 && (
+        <span
+          className="flex h-5 w-5 min-w-[20px] items-center justify-center rounded-full text-[10px] font-bold leading-none"
+          style={{
+            backgroundColor: "var(--accent)",
+            color: "var(--background)",
+          }}
+        >
+          {count > 9 ? "9+" : count}
+        </span>
+      )}
+    </Link>
+  );
+}
+
--- a/components/navigation/Navigation.tsx
+++ b/components/navigation/Navigation.tsx
@@ -7,6 +7,7 @@ import { usePathname } from "next/navigation";
 import PlayerStats from "@/components/profile/PlayerStats";
 import { Button, ThemeToggle } from "@/components/ui";
 import ChallengeBadge from "./ChallengeBadge";
+import InvitationBadge from "./InvitationBadge";

 interface UserData {
  username: string;
@@ -23,12 +24,14 @@ interface NavigationProps {
  initialUserData?: UserData | null;
  initialIsAdmin?: boolean;
  initialActiveChallengesCount?: number;
+  initialPendingInvitationsCount?: number;
 }

 export default function Navigation({
  initialUserData,
  initialIsAdmin,
  initialActiveChallengesCount = 0,
+  initialPendingInvitationsCount = 0,
 }: NavigationProps) {
  const { data: session } = useSession();
  const [isMenuOpen, setIsMenuOpen] = useState(false);
@@ -119,19 +122,7 @@ export default function Navigation({
          </Link>
          {isAuthenticated && (
            <>
-              <Link
-                href="/houses"
-                className="transition text-xs font-normal uppercase tracking-widest"
-                style={{ color: "var(--foreground)" }}
-                onMouseEnter={(e) =>
-                  (e.currentTarget.style.color = "var(--accent-color)")
-                }
-                onMouseLeave={(e) =>
-                  (e.currentTarget.style.color = "var(--foreground)")
-                }
-              >
-                MAISONS
-              </Link>
+              <InvitationBadge initialCount={initialPendingInvitationsCount} />
              <ChallengeBadge initialCount={initialActiveChallengesCount} />
            </>
          )}
@@ -295,20 +286,10 @@ export default function Navigation({
              </Link>
              {isAuthenticated && (
                <>
-                  <Link
-                    href="/houses"
-                    onClick={() => setIsMenuOpen(false)}
-                    className="transition text-xs font-normal uppercase tracking-widest py-2"
-                    style={{ color: "var(--foreground)" }}
-                    onMouseEnter={(e) =>
-                      (e.currentTarget.style.color = "var(--accent-color)")
-                    }
-                    onMouseLeave={(e) =>
-                      (e.currentTarget.style.color = "var(--foreground)")
-                    }
-                  >
-                    MAISONS
-                  </Link>
+                  <InvitationBadge
+                    initialCount={initialPendingInvitationsCount}
+                    onNavigate={() => setIsMenuOpen(false)}
+                  />
                  <ChallengeBadge
                    initialCount={initialActiveChallengesCount}
                    onNavigate={() => setIsMenuOpen(false)}
--- a/components/navigation/NavigationWrapper.tsx
+++ b/components/navigation/NavigationWrapper.tsx
@@ -1,6 +1,7 @@
 import { auth } from "@/lib/auth";
 import { userService } from "@/services/users/user.service";
 import { challengeService } from "@/services/challenges/challenge.service";
+import { houseService } from "@/services/houses/house.service";
 import Navigation from "./Navigation";

 interface UserData {
@@ -20,10 +21,11 @@ export default async function NavigationWrapper() {
  let userData: UserData | null = null;
  const isAdmin = session?.user?.role === "ADMIN";
  let activeChallengesCount = 0;
+  let pendingHouseActionsCount = 0;

  if (session?.user?.id) {
    // Paralléliser les appels DB
-    const [user, count] = await Promise.all([
+    const [user, challengesCount, houseActionsCount] = await Promise.all([
      userService.getUserById(session.user.id, {
        username: true,
        avatar: true,
@@ -35,13 +37,15 @@ export default async function NavigationWrapper() {
        score: true,
      }),
      challengeService.getActiveChallengesCount(session.user.id),
+      houseService.getPendingHouseActionsCount(session.user.id),
    ]);

    if (user) {
      userData = user;
    }

-    activeChallengesCount = count;
+    activeChallengesCount = challengesCount;
+    pendingHouseActionsCount = houseActionsCount;
  }

  return (
@@ -49,6 +53,7 @@ export default async function NavigationWrapper() {
      initialUserData={userData}
      initialIsAdmin={isAdmin}
      initialActiveChallengesCount={activeChallengesCount}
+      initialPendingInvitationsCount={pendingHouseActionsCount}
    />
  );
 }