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.
Some checks failed
Deploy with Docker Compose / deploy (push) Has been cancelled

This commit is contained in:
Julien Froidefond
2025-12-18 08:48:31 +01:00
parent 12bc44e3ac
commit 1b82bd9ee6
23 changed files with 1026 additions and 113 deletions

2
.env
View File

@@ -25,7 +25,7 @@ POSTGRES_PORT=5433
# Database URL (construite automatiquement si non définie) # Database URL (construite automatiquement si non définie)
# Si vous définissez cette variable, elle sera utilisée telle quelle # Si vous définissez cette variable, elle sera utilisée telle quelle
# Sinon, elle sera construite à partir des variables POSTGRES_* ci-dessus # Sinon, elle sera construite à partir des variables POSTGRES_* ci-dessus
# DATABASE_URL=postgresql://gotgaming:change-this-in-production@got-postgres:5432/gotgaming?schema=public DATABASE_URL=postgresql://gotgaming:change-this-in-production@localhost:5433/gotgaming?schema=public
# Docker Volumes (optionnel) # Docker Volumes (optionnel)
POSTGRES_DATA_PATH=./data/postgres POSTGRES_DATA_PATH=./data/postgres

View File

@@ -22,6 +22,9 @@ export async function updateSitePreferences(data: {
challengesBackground?: string | null; challengesBackground?: string | null;
eventRegistrationPoints?: number; eventRegistrationPoints?: number;
eventFeedbackPoints?: number; eventFeedbackPoints?: number;
houseJoinPoints?: number;
houseLeavePoints?: number;
houseCreatePoints?: number;
}) { }) {
try { try {
await checkAdminAccess()(); await checkAdminAccess()();
@@ -33,6 +36,9 @@ export async function updateSitePreferences(data: {
challengesBackground: data.challengesBackground, challengesBackground: data.challengesBackground,
eventRegistrationPoints: data.eventRegistrationPoints, eventRegistrationPoints: data.eventRegistrationPoints,
eventFeedbackPoints: data.eventFeedbackPoints, eventFeedbackPoints: data.eventFeedbackPoints,
houseJoinPoints: data.houseJoinPoints,
houseLeavePoints: data.houseLeavePoints,
houseCreatePoints: data.houseCreatePoints,
}); });
revalidatePath("/admin"); revalidatePath("/admin");

View File

@@ -7,6 +7,7 @@ import {
ValidationError, ValidationError,
ConflictError, ConflictError,
ForbiddenError, ForbiddenError,
NotFoundError,
} from "@/services/errors"; } from "@/services/errors";
export async function updateHouse( export async function updateHouse(
@@ -112,3 +113,37 @@ export async function leaveHouse(houseId: string) {
} }
} }
export async function removeMember(houseId: string, memberId: string) {
try {
const session = await auth();
if (!session?.user?.id) {
return {
success: false,
error: "Vous devez être connecté",
};
}
await houseService.removeMember(houseId, memberId, session.user.id);
revalidatePath("/houses");
revalidatePath("/profile");
return { success: true, message: "Membre retiré de la maison" };
} catch (error) {
console.error("Remove member error:", error);
if (
error instanceof ForbiddenError ||
error instanceof NotFoundError
) {
return { success: false, error: error.message };
}
return {
success: false,
error: "Une erreur est survenue lors du retrait du membre",
};
}
}

View File

@@ -0,0 +1,23 @@
import { NextResponse } from "next/server";
import { auth } from "@/lib/auth";
import { houseService } from "@/services/houses/house.service";
export async function GET() {
try {
const session = await auth();
if (!session?.user?.id) {
return NextResponse.json({ count: 0 });
}
// Compter les invitations ET les demandes d'adhésion en attente
const count = await houseService.getPendingHouseActionsCount(
session.user.id
);
return NextResponse.json({ count });
} catch (error) {
console.error("Error fetching pending house actions count:", error);
return NextResponse.json({ count: 0 });
}
}

View File

@@ -4,7 +4,7 @@ import { getBackgroundImage } from "@/lib/preferences";
import NavigationWrapper from "@/components/navigation/NavigationWrapper"; import NavigationWrapper from "@/components/navigation/NavigationWrapper";
import HousesSection from "@/components/houses/HousesSection"; import HousesSection from "@/components/houses/HousesSection";
import { houseService } from "@/services/houses/house.service"; import { houseService } from "@/services/houses/house.service";
import { userService } from "@/services/users/user.service"; import { prisma } from "@/services/database";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -70,13 +70,21 @@ export default async function HousesPage() {
}), }),
// Récupérer les invitations de l'utilisateur // Récupérer les invitations de l'utilisateur
houseService.getUserInvitations(session.user.id, "PENDING"), houseService.getUserInvitations(session.user.id, "PENDING"),
// Récupérer tous les utilisateurs pour les invitations // Récupérer tous les utilisateurs sans maison pour les invitations
userService.getAllUsers({ prisma.user.findMany({
where: {
houseMemberships: {
none: {},
},
},
select: { select: {
id: true, id: true,
username: true, username: true,
avatar: true, avatar: true,
}, },
orderBy: {
username: "asc",
},
}), }),
getBackgroundImage("challenges", "/got-2.jpg"), getBackgroundImage("challenges", "/got-2.jpg"),
]); ]);

View File

@@ -8,6 +8,7 @@ import ChallengeManagement from "@/components/admin/ChallengeManagement";
import BackgroundPreferences from "@/components/admin/BackgroundPreferences"; import BackgroundPreferences from "@/components/admin/BackgroundPreferences";
import EventPointsPreferences from "@/components/admin/EventPointsPreferences"; import EventPointsPreferences from "@/components/admin/EventPointsPreferences";
import EventFeedbackPointsPreferences from "@/components/admin/EventFeedbackPointsPreferences"; import EventFeedbackPointsPreferences from "@/components/admin/EventFeedbackPointsPreferences";
import HousePointsPreferences from "@/components/admin/HousePointsPreferences";
import { Button, Card, SectionTitle } from "@/components/ui"; import { Button, Card, SectionTitle } from "@/components/ui";
interface SitePreferences { interface SitePreferences {
@@ -18,6 +19,9 @@ interface SitePreferences {
challengesBackground: string | null; challengesBackground: string | null;
eventRegistrationPoints: number; eventRegistrationPoints: number;
eventFeedbackPoints: number; eventFeedbackPoints: number;
houseJoinPoints: number;
houseLeavePoints: number;
houseCreatePoints: number;
} }
interface AdminPanelProps { interface AdminPanelProps {
@@ -99,6 +103,7 @@ export default function AdminPanel({ initialPreferences }: AdminPanelProps) {
<BackgroundPreferences initialPreferences={initialPreferences} /> <BackgroundPreferences initialPreferences={initialPreferences} />
<EventPointsPreferences initialPreferences={initialPreferences} /> <EventPointsPreferences initialPreferences={initialPreferences} />
<EventFeedbackPointsPreferences initialPreferences={initialPreferences} /> <EventFeedbackPointsPreferences initialPreferences={initialPreferences} />
<HousePointsPreferences initialPreferences={initialPreferences} />
</div> </div>
</Card> </Card>
)} )}

View File

@@ -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>
);
}

View File

@@ -60,6 +60,8 @@ export default function HouseCard({ house, onRequestSent }: HouseCardProps) {
const result = await requestToJoin(house.id); const result = await requestToJoin(house.id);
if (result.success) { 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"); setSuccess("Demande envoyée avec succès");
onRequestSent?.(); onRequestSent?.();
} else { } else {

View File

@@ -38,6 +38,10 @@ export default function HouseForm({
: await createHouse({ name, description: description || null }); : await createHouse({ name, description: description || null });
if (result.success) { 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?.(); onSuccess?.();
} else { } else {
setError(result.error || "Une erreur est survenue"); setError(result.error || "Une erreur est survenue");

View File

@@ -7,7 +7,7 @@ import Button from "@/components/ui/Button";
import HouseForm from "./HouseForm"; import HouseForm from "./HouseForm";
import RequestList from "./RequestList"; import RequestList from "./RequestList";
import Alert from "@/components/ui/Alert"; 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"; import { inviteUser } from "@/actions/houses/invitations";
interface House { interface House {
@@ -112,6 +112,8 @@ export default function HouseManagement({
startTransition(async () => { startTransition(async () => {
const result = await deleteHouse(house.id); const result = await deleteHouse(house.id);
if (result.success) { if (result.success) {
// Rafraîchir le score dans le header (le créateur perd des points)
window.dispatchEvent(new Event("refreshUserScore"));
onUpdate?.(); onUpdate?.();
} else { } else {
setError(result.error || "Erreur lors de la suppression"); setError(result.error || "Erreur lors de la suppression");
@@ -128,6 +130,7 @@ export default function HouseManagement({
startTransition(async () => { startTransition(async () => {
const result = await leaveHouse(house.id); const result = await leaveHouse(house.id);
if (result.success) { if (result.success) {
window.dispatchEvent(new Event("refreshUserScore"));
onUpdate?.(); onUpdate?.();
} else { } else {
setError(result.error || "Erreur lors de la sortie"); setError(result.error || "Erreur lors de la sortie");
@@ -144,6 +147,8 @@ export default function HouseManagement({
startTransition(async () => { startTransition(async () => {
const result = await inviteUser(house.id, selectedUserId); const result = await inviteUser(house.id, selectedUserId);
if (result.success) { 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"); setSuccess("Invitation envoyée");
setShowInviteForm(false); setShowInviteForm(false);
setSelectedUserId(""); setSelectedUserId("");
@@ -303,8 +308,9 @@ export default function HouseManagement({
</span> </span>
</div> </div>
</div> </div>
<div className="flex items-center gap-2 flex-shrink-0">
<span <span
className="text-xs uppercase flex-shrink-0 px-2 py-1 rounded font-bold" className="text-xs uppercase px-2 py-1 rounded font-bold"
style={{ style={{
color: roleColor, color: roleColor,
backgroundColor: `color-mix(in srgb, ${roleColor} 15%, transparent)`, backgroundColor: `color-mix(in srgb, ${roleColor} 15%, transparent)`,
@@ -314,6 +320,33 @@ export default function HouseManagement({
{membership.role === "OWNER" && "👑 "} {membership.role === "OWNER" && "👑 "}
{membership.role} {membership.role}
</span> </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> </div>
); );
})} })}

View File

@@ -41,6 +41,10 @@ export default function InvitationList({
startTransition(async () => { startTransition(async () => {
const result = await acceptInvitation(invitationId); const result = await acceptInvitation(invitationId);
if (result.success) { 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?.(); onUpdate?.();
} else { } else {
setError(result.error || "Erreur lors de l'acceptation"); setError(result.error || "Erreur lors de l'acceptation");
@@ -53,6 +57,8 @@ export default function InvitationList({
startTransition(async () => { startTransition(async () => {
const result = await rejectInvitation(invitationId); const result = await rejectInvitation(invitationId);
if (result.success) { if (result.success) {
// Rafraîchir le badge d'invitations dans le header
window.dispatchEvent(new Event("refreshInvitations"));
onUpdate?.(); onUpdate?.();
} else { } else {
setError(result.error || "Erreur lors du refus"); setError(result.error || "Erreur lors du refus");

View File

@@ -37,6 +37,10 @@ export default function RequestList({
startTransition(async () => { startTransition(async () => {
const result = await acceptRequest(requestId); const result = await acceptRequest(requestId);
if (result.success) { 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?.(); onUpdate?.();
} else { } else {
setError(result.error || "Erreur lors de l'acceptation"); setError(result.error || "Erreur lors de l'acceptation");
@@ -49,6 +53,8 @@ export default function RequestList({
startTransition(async () => { startTransition(async () => {
const result = await rejectRequest(requestId); const result = await rejectRequest(requestId);
if (result.success) { 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?.(); onUpdate?.();
} else { } else {
setError(result.error || "Erreur lors du refus"); setError(result.error || "Erreur lors du refus");

View File

@@ -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>
);
}

View File

@@ -7,6 +7,7 @@ import { usePathname } from "next/navigation";
import PlayerStats from "@/components/profile/PlayerStats"; import PlayerStats from "@/components/profile/PlayerStats";
import { Button, ThemeToggle } from "@/components/ui"; import { Button, ThemeToggle } from "@/components/ui";
import ChallengeBadge from "./ChallengeBadge"; import ChallengeBadge from "./ChallengeBadge";
import InvitationBadge from "./InvitationBadge";
interface UserData { interface UserData {
username: string; username: string;
@@ -23,12 +24,14 @@ interface NavigationProps {
initialUserData?: UserData | null; initialUserData?: UserData | null;
initialIsAdmin?: boolean; initialIsAdmin?: boolean;
initialActiveChallengesCount?: number; initialActiveChallengesCount?: number;
initialPendingInvitationsCount?: number;
} }
export default function Navigation({ export default function Navigation({
initialUserData, initialUserData,
initialIsAdmin, initialIsAdmin,
initialActiveChallengesCount = 0, initialActiveChallengesCount = 0,
initialPendingInvitationsCount = 0,
}: NavigationProps) { }: NavigationProps) {
const { data: session } = useSession(); const { data: session } = useSession();
const [isMenuOpen, setIsMenuOpen] = useState(false); const [isMenuOpen, setIsMenuOpen] = useState(false);
@@ -119,19 +122,7 @@ export default function Navigation({
</Link> </Link>
{isAuthenticated && ( {isAuthenticated && (
<> <>
<Link <InvitationBadge initialCount={initialPendingInvitationsCount} />
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>
<ChallengeBadge initialCount={initialActiveChallengesCount} /> <ChallengeBadge initialCount={initialActiveChallengesCount} />
</> </>
)} )}
@@ -295,20 +286,10 @@ export default function Navigation({
</Link> </Link>
{isAuthenticated && ( {isAuthenticated && (
<> <>
<Link <InvitationBadge
href="/houses" initialCount={initialPendingInvitationsCount}
onClick={() => setIsMenuOpen(false)} onNavigate={() => 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>
<ChallengeBadge <ChallengeBadge
initialCount={initialActiveChallengesCount} initialCount={initialActiveChallengesCount}
onNavigate={() => setIsMenuOpen(false)} onNavigate={() => setIsMenuOpen(false)}

View File

@@ -1,6 +1,7 @@
import { auth } from "@/lib/auth"; import { auth } from "@/lib/auth";
import { userService } from "@/services/users/user.service"; import { userService } from "@/services/users/user.service";
import { challengeService } from "@/services/challenges/challenge.service"; import { challengeService } from "@/services/challenges/challenge.service";
import { houseService } from "@/services/houses/house.service";
import Navigation from "./Navigation"; import Navigation from "./Navigation";
interface UserData { interface UserData {
@@ -20,10 +21,11 @@ export default async function NavigationWrapper() {
let userData: UserData | null = null; let userData: UserData | null = null;
const isAdmin = session?.user?.role === "ADMIN"; const isAdmin = session?.user?.role === "ADMIN";
let activeChallengesCount = 0; let activeChallengesCount = 0;
let pendingHouseActionsCount = 0;
if (session?.user?.id) { if (session?.user?.id) {
// Paralléliser les appels DB // Paralléliser les appels DB
const [user, count] = await Promise.all([ const [user, challengesCount, houseActionsCount] = await Promise.all([
userService.getUserById(session.user.id, { userService.getUserById(session.user.id, {
username: true, username: true,
avatar: true, avatar: true,
@@ -35,13 +37,15 @@ export default async function NavigationWrapper() {
score: true, score: true,
}), }),
challengeService.getActiveChallengesCount(session.user.id), challengeService.getActiveChallengesCount(session.user.id),
houseService.getPendingHouseActionsCount(session.user.id),
]); ]);
if (user) { if (user) {
userData = user; userData = user;
} }
activeChallengesCount = count; activeChallengesCount = challengesCount;
pendingHouseActionsCount = houseActionsCount;
} }
return ( return (
@@ -49,6 +53,7 @@ export default async function NavigationWrapper() {
initialUserData={userData} initialUserData={userData}
initialIsAdmin={isAdmin} initialIsAdmin={isAdmin}
initialActiveChallengesCount={activeChallengesCount} initialActiveChallengesCount={activeChallengesCount}
initialPendingInvitationsCount={pendingHouseActionsCount}
/> />
); );
} }

File diff suppressed because one or more lines are too long

View File

@@ -1351,6 +1351,9 @@ export const SitePreferencesScalarFieldEnum = {
challengesBackground: 'challengesBackground', challengesBackground: 'challengesBackground',
eventRegistrationPoints: 'eventRegistrationPoints', eventRegistrationPoints: 'eventRegistrationPoints',
eventFeedbackPoints: 'eventFeedbackPoints', eventFeedbackPoints: 'eventFeedbackPoints',
houseJoinPoints: 'houseJoinPoints',
houseLeavePoints: 'houseLeavePoints',
houseCreatePoints: 'houseCreatePoints',
createdAt: 'createdAt', createdAt: 'createdAt',
updatedAt: 'updatedAt' updatedAt: 'updatedAt'
} as const } as const

View File

@@ -164,6 +164,9 @@ export const SitePreferencesScalarFieldEnum = {
challengesBackground: 'challengesBackground', challengesBackground: 'challengesBackground',
eventRegistrationPoints: 'eventRegistrationPoints', eventRegistrationPoints: 'eventRegistrationPoints',
eventFeedbackPoints: 'eventFeedbackPoints', eventFeedbackPoints: 'eventFeedbackPoints',
houseJoinPoints: 'houseJoinPoints',
houseLeavePoints: 'houseLeavePoints',
houseCreatePoints: 'houseCreatePoints',
createdAt: 'createdAt', createdAt: 'createdAt',
updatedAt: 'updatedAt' updatedAt: 'updatedAt'
} as const } as const

View File

@@ -29,11 +29,17 @@ export type AggregateSitePreferences = {
export type SitePreferencesAvgAggregateOutputType = { export type SitePreferencesAvgAggregateOutputType = {
eventRegistrationPoints: number | null eventRegistrationPoints: number | null
eventFeedbackPoints: number | null eventFeedbackPoints: number | null
houseJoinPoints: number | null
houseLeavePoints: number | null
houseCreatePoints: number | null
} }
export type SitePreferencesSumAggregateOutputType = { export type SitePreferencesSumAggregateOutputType = {
eventRegistrationPoints: number | null eventRegistrationPoints: number | null
eventFeedbackPoints: number | null eventFeedbackPoints: number | null
houseJoinPoints: number | null
houseLeavePoints: number | null
houseCreatePoints: number | null
} }
export type SitePreferencesMinAggregateOutputType = { export type SitePreferencesMinAggregateOutputType = {
@@ -44,6 +50,9 @@ export type SitePreferencesMinAggregateOutputType = {
challengesBackground: string | null challengesBackground: string | null
eventRegistrationPoints: number | null eventRegistrationPoints: number | null
eventFeedbackPoints: number | null eventFeedbackPoints: number | null
houseJoinPoints: number | null
houseLeavePoints: number | null
houseCreatePoints: number | null
createdAt: Date | null createdAt: Date | null
updatedAt: Date | null updatedAt: Date | null
} }
@@ -56,6 +65,9 @@ export type SitePreferencesMaxAggregateOutputType = {
challengesBackground: string | null challengesBackground: string | null
eventRegistrationPoints: number | null eventRegistrationPoints: number | null
eventFeedbackPoints: number | null eventFeedbackPoints: number | null
houseJoinPoints: number | null
houseLeavePoints: number | null
houseCreatePoints: number | null
createdAt: Date | null createdAt: Date | null
updatedAt: Date | null updatedAt: Date | null
} }
@@ -68,6 +80,9 @@ export type SitePreferencesCountAggregateOutputType = {
challengesBackground: number challengesBackground: number
eventRegistrationPoints: number eventRegistrationPoints: number
eventFeedbackPoints: number eventFeedbackPoints: number
houseJoinPoints: number
houseLeavePoints: number
houseCreatePoints: number
createdAt: number createdAt: number
updatedAt: number updatedAt: number
_all: number _all: number
@@ -77,11 +92,17 @@ export type SitePreferencesCountAggregateOutputType = {
export type SitePreferencesAvgAggregateInputType = { export type SitePreferencesAvgAggregateInputType = {
eventRegistrationPoints?: true eventRegistrationPoints?: true
eventFeedbackPoints?: true eventFeedbackPoints?: true
houseJoinPoints?: true
houseLeavePoints?: true
houseCreatePoints?: true
} }
export type SitePreferencesSumAggregateInputType = { export type SitePreferencesSumAggregateInputType = {
eventRegistrationPoints?: true eventRegistrationPoints?: true
eventFeedbackPoints?: true eventFeedbackPoints?: true
houseJoinPoints?: true
houseLeavePoints?: true
houseCreatePoints?: true
} }
export type SitePreferencesMinAggregateInputType = { export type SitePreferencesMinAggregateInputType = {
@@ -92,6 +113,9 @@ export type SitePreferencesMinAggregateInputType = {
challengesBackground?: true challengesBackground?: true
eventRegistrationPoints?: true eventRegistrationPoints?: true
eventFeedbackPoints?: true eventFeedbackPoints?: true
houseJoinPoints?: true
houseLeavePoints?: true
houseCreatePoints?: true
createdAt?: true createdAt?: true
updatedAt?: true updatedAt?: true
} }
@@ -104,6 +128,9 @@ export type SitePreferencesMaxAggregateInputType = {
challengesBackground?: true challengesBackground?: true
eventRegistrationPoints?: true eventRegistrationPoints?: true
eventFeedbackPoints?: true eventFeedbackPoints?: true
houseJoinPoints?: true
houseLeavePoints?: true
houseCreatePoints?: true
createdAt?: true createdAt?: true
updatedAt?: true updatedAt?: true
} }
@@ -116,6 +143,9 @@ export type SitePreferencesCountAggregateInputType = {
challengesBackground?: true challengesBackground?: true
eventRegistrationPoints?: true eventRegistrationPoints?: true
eventFeedbackPoints?: true eventFeedbackPoints?: true
houseJoinPoints?: true
houseLeavePoints?: true
houseCreatePoints?: true
createdAt?: true createdAt?: true
updatedAt?: true updatedAt?: true
_all?: true _all?: true
@@ -215,6 +245,9 @@ export type SitePreferencesGroupByOutputType = {
challengesBackground: string | null challengesBackground: string | null
eventRegistrationPoints: number eventRegistrationPoints: number
eventFeedbackPoints: number eventFeedbackPoints: number
houseJoinPoints: number
houseLeavePoints: number
houseCreatePoints: number
createdAt: Date createdAt: Date
updatedAt: Date updatedAt: Date
_count: SitePreferencesCountAggregateOutputType | null _count: SitePreferencesCountAggregateOutputType | null
@@ -250,6 +283,9 @@ export type SitePreferencesWhereInput = {
challengesBackground?: Prisma.StringNullableFilter<"SitePreferences"> | string | null challengesBackground?: Prisma.StringNullableFilter<"SitePreferences"> | string | null
eventRegistrationPoints?: Prisma.IntFilter<"SitePreferences"> | number eventRegistrationPoints?: Prisma.IntFilter<"SitePreferences"> | number
eventFeedbackPoints?: Prisma.IntFilter<"SitePreferences"> | number eventFeedbackPoints?: Prisma.IntFilter<"SitePreferences"> | number
houseJoinPoints?: Prisma.IntFilter<"SitePreferences"> | number
houseLeavePoints?: Prisma.IntFilter<"SitePreferences"> | number
houseCreatePoints?: Prisma.IntFilter<"SitePreferences"> | number
createdAt?: Prisma.DateTimeFilter<"SitePreferences"> | Date | string createdAt?: Prisma.DateTimeFilter<"SitePreferences"> | Date | string
updatedAt?: Prisma.DateTimeFilter<"SitePreferences"> | Date | string updatedAt?: Prisma.DateTimeFilter<"SitePreferences"> | Date | string
} }
@@ -262,6 +298,9 @@ export type SitePreferencesOrderByWithRelationInput = {
challengesBackground?: Prisma.SortOrderInput | Prisma.SortOrder challengesBackground?: Prisma.SortOrderInput | Prisma.SortOrder
eventRegistrationPoints?: Prisma.SortOrder eventRegistrationPoints?: Prisma.SortOrder
eventFeedbackPoints?: Prisma.SortOrder eventFeedbackPoints?: Prisma.SortOrder
houseJoinPoints?: Prisma.SortOrder
houseLeavePoints?: Prisma.SortOrder
houseCreatePoints?: Prisma.SortOrder
createdAt?: Prisma.SortOrder createdAt?: Prisma.SortOrder
updatedAt?: Prisma.SortOrder updatedAt?: Prisma.SortOrder
} }
@@ -277,6 +316,9 @@ export type SitePreferencesWhereUniqueInput = Prisma.AtLeast<{
challengesBackground?: Prisma.StringNullableFilter<"SitePreferences"> | string | null challengesBackground?: Prisma.StringNullableFilter<"SitePreferences"> | string | null
eventRegistrationPoints?: Prisma.IntFilter<"SitePreferences"> | number eventRegistrationPoints?: Prisma.IntFilter<"SitePreferences"> | number
eventFeedbackPoints?: Prisma.IntFilter<"SitePreferences"> | number eventFeedbackPoints?: Prisma.IntFilter<"SitePreferences"> | number
houseJoinPoints?: Prisma.IntFilter<"SitePreferences"> | number
houseLeavePoints?: Prisma.IntFilter<"SitePreferences"> | number
houseCreatePoints?: Prisma.IntFilter<"SitePreferences"> | number
createdAt?: Prisma.DateTimeFilter<"SitePreferences"> | Date | string createdAt?: Prisma.DateTimeFilter<"SitePreferences"> | Date | string
updatedAt?: Prisma.DateTimeFilter<"SitePreferences"> | Date | string updatedAt?: Prisma.DateTimeFilter<"SitePreferences"> | Date | string
}, "id"> }, "id">
@@ -289,6 +331,9 @@ export type SitePreferencesOrderByWithAggregationInput = {
challengesBackground?: Prisma.SortOrderInput | Prisma.SortOrder challengesBackground?: Prisma.SortOrderInput | Prisma.SortOrder
eventRegistrationPoints?: Prisma.SortOrder eventRegistrationPoints?: Prisma.SortOrder
eventFeedbackPoints?: Prisma.SortOrder eventFeedbackPoints?: Prisma.SortOrder
houseJoinPoints?: Prisma.SortOrder
houseLeavePoints?: Prisma.SortOrder
houseCreatePoints?: Prisma.SortOrder
createdAt?: Prisma.SortOrder createdAt?: Prisma.SortOrder
updatedAt?: Prisma.SortOrder updatedAt?: Prisma.SortOrder
_count?: Prisma.SitePreferencesCountOrderByAggregateInput _count?: Prisma.SitePreferencesCountOrderByAggregateInput
@@ -309,6 +354,9 @@ export type SitePreferencesScalarWhereWithAggregatesInput = {
challengesBackground?: Prisma.StringNullableWithAggregatesFilter<"SitePreferences"> | string | null challengesBackground?: Prisma.StringNullableWithAggregatesFilter<"SitePreferences"> | string | null
eventRegistrationPoints?: Prisma.IntWithAggregatesFilter<"SitePreferences"> | number eventRegistrationPoints?: Prisma.IntWithAggregatesFilter<"SitePreferences"> | number
eventFeedbackPoints?: Prisma.IntWithAggregatesFilter<"SitePreferences"> | number eventFeedbackPoints?: Prisma.IntWithAggregatesFilter<"SitePreferences"> | number
houseJoinPoints?: Prisma.IntWithAggregatesFilter<"SitePreferences"> | number
houseLeavePoints?: Prisma.IntWithAggregatesFilter<"SitePreferences"> | number
houseCreatePoints?: Prisma.IntWithAggregatesFilter<"SitePreferences"> | number
createdAt?: Prisma.DateTimeWithAggregatesFilter<"SitePreferences"> | Date | string createdAt?: Prisma.DateTimeWithAggregatesFilter<"SitePreferences"> | Date | string
updatedAt?: Prisma.DateTimeWithAggregatesFilter<"SitePreferences"> | Date | string updatedAt?: Prisma.DateTimeWithAggregatesFilter<"SitePreferences"> | Date | string
} }
@@ -321,6 +369,9 @@ export type SitePreferencesCreateInput = {
challengesBackground?: string | null challengesBackground?: string | null
eventRegistrationPoints?: number eventRegistrationPoints?: number
eventFeedbackPoints?: number eventFeedbackPoints?: number
houseJoinPoints?: number
houseLeavePoints?: number
houseCreatePoints?: number
createdAt?: Date | string createdAt?: Date | string
updatedAt?: Date | string updatedAt?: Date | string
} }
@@ -333,6 +384,9 @@ export type SitePreferencesUncheckedCreateInput = {
challengesBackground?: string | null challengesBackground?: string | null
eventRegistrationPoints?: number eventRegistrationPoints?: number
eventFeedbackPoints?: number eventFeedbackPoints?: number
houseJoinPoints?: number
houseLeavePoints?: number
houseCreatePoints?: number
createdAt?: Date | string createdAt?: Date | string
updatedAt?: Date | string updatedAt?: Date | string
} }
@@ -345,6 +399,9 @@ export type SitePreferencesUpdateInput = {
challengesBackground?: Prisma.NullableStringFieldUpdateOperationsInput | string | null challengesBackground?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
eventRegistrationPoints?: Prisma.IntFieldUpdateOperationsInput | number eventRegistrationPoints?: Prisma.IntFieldUpdateOperationsInput | number
eventFeedbackPoints?: Prisma.IntFieldUpdateOperationsInput | number eventFeedbackPoints?: Prisma.IntFieldUpdateOperationsInput | number
houseJoinPoints?: Prisma.IntFieldUpdateOperationsInput | number
houseLeavePoints?: Prisma.IntFieldUpdateOperationsInput | number
houseCreatePoints?: Prisma.IntFieldUpdateOperationsInput | number
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
} }
@@ -357,6 +414,9 @@ export type SitePreferencesUncheckedUpdateInput = {
challengesBackground?: Prisma.NullableStringFieldUpdateOperationsInput | string | null challengesBackground?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
eventRegistrationPoints?: Prisma.IntFieldUpdateOperationsInput | number eventRegistrationPoints?: Prisma.IntFieldUpdateOperationsInput | number
eventFeedbackPoints?: Prisma.IntFieldUpdateOperationsInput | number eventFeedbackPoints?: Prisma.IntFieldUpdateOperationsInput | number
houseJoinPoints?: Prisma.IntFieldUpdateOperationsInput | number
houseLeavePoints?: Prisma.IntFieldUpdateOperationsInput | number
houseCreatePoints?: Prisma.IntFieldUpdateOperationsInput | number
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
} }
@@ -369,6 +429,9 @@ export type SitePreferencesCreateManyInput = {
challengesBackground?: string | null challengesBackground?: string | null
eventRegistrationPoints?: number eventRegistrationPoints?: number
eventFeedbackPoints?: number eventFeedbackPoints?: number
houseJoinPoints?: number
houseLeavePoints?: number
houseCreatePoints?: number
createdAt?: Date | string createdAt?: Date | string
updatedAt?: Date | string updatedAt?: Date | string
} }
@@ -381,6 +444,9 @@ export type SitePreferencesUpdateManyMutationInput = {
challengesBackground?: Prisma.NullableStringFieldUpdateOperationsInput | string | null challengesBackground?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
eventRegistrationPoints?: Prisma.IntFieldUpdateOperationsInput | number eventRegistrationPoints?: Prisma.IntFieldUpdateOperationsInput | number
eventFeedbackPoints?: Prisma.IntFieldUpdateOperationsInput | number eventFeedbackPoints?: Prisma.IntFieldUpdateOperationsInput | number
houseJoinPoints?: Prisma.IntFieldUpdateOperationsInput | number
houseLeavePoints?: Prisma.IntFieldUpdateOperationsInput | number
houseCreatePoints?: Prisma.IntFieldUpdateOperationsInput | number
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
} }
@@ -393,6 +459,9 @@ export type SitePreferencesUncheckedUpdateManyInput = {
challengesBackground?: Prisma.NullableStringFieldUpdateOperationsInput | string | null challengesBackground?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
eventRegistrationPoints?: Prisma.IntFieldUpdateOperationsInput | number eventRegistrationPoints?: Prisma.IntFieldUpdateOperationsInput | number
eventFeedbackPoints?: Prisma.IntFieldUpdateOperationsInput | number eventFeedbackPoints?: Prisma.IntFieldUpdateOperationsInput | number
houseJoinPoints?: Prisma.IntFieldUpdateOperationsInput | number
houseLeavePoints?: Prisma.IntFieldUpdateOperationsInput | number
houseCreatePoints?: Prisma.IntFieldUpdateOperationsInput | number
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
} }
@@ -405,6 +474,9 @@ export type SitePreferencesCountOrderByAggregateInput = {
challengesBackground?: Prisma.SortOrder challengesBackground?: Prisma.SortOrder
eventRegistrationPoints?: Prisma.SortOrder eventRegistrationPoints?: Prisma.SortOrder
eventFeedbackPoints?: Prisma.SortOrder eventFeedbackPoints?: Prisma.SortOrder
houseJoinPoints?: Prisma.SortOrder
houseLeavePoints?: Prisma.SortOrder
houseCreatePoints?: Prisma.SortOrder
createdAt?: Prisma.SortOrder createdAt?: Prisma.SortOrder
updatedAt?: Prisma.SortOrder updatedAt?: Prisma.SortOrder
} }
@@ -412,6 +484,9 @@ export type SitePreferencesCountOrderByAggregateInput = {
export type SitePreferencesAvgOrderByAggregateInput = { export type SitePreferencesAvgOrderByAggregateInput = {
eventRegistrationPoints?: Prisma.SortOrder eventRegistrationPoints?: Prisma.SortOrder
eventFeedbackPoints?: Prisma.SortOrder eventFeedbackPoints?: Prisma.SortOrder
houseJoinPoints?: Prisma.SortOrder
houseLeavePoints?: Prisma.SortOrder
houseCreatePoints?: Prisma.SortOrder
} }
export type SitePreferencesMaxOrderByAggregateInput = { export type SitePreferencesMaxOrderByAggregateInput = {
@@ -422,6 +497,9 @@ export type SitePreferencesMaxOrderByAggregateInput = {
challengesBackground?: Prisma.SortOrder challengesBackground?: Prisma.SortOrder
eventRegistrationPoints?: Prisma.SortOrder eventRegistrationPoints?: Prisma.SortOrder
eventFeedbackPoints?: Prisma.SortOrder eventFeedbackPoints?: Prisma.SortOrder
houseJoinPoints?: Prisma.SortOrder
houseLeavePoints?: Prisma.SortOrder
houseCreatePoints?: Prisma.SortOrder
createdAt?: Prisma.SortOrder createdAt?: Prisma.SortOrder
updatedAt?: Prisma.SortOrder updatedAt?: Prisma.SortOrder
} }
@@ -434,6 +512,9 @@ export type SitePreferencesMinOrderByAggregateInput = {
challengesBackground?: Prisma.SortOrder challengesBackground?: Prisma.SortOrder
eventRegistrationPoints?: Prisma.SortOrder eventRegistrationPoints?: Prisma.SortOrder
eventFeedbackPoints?: Prisma.SortOrder eventFeedbackPoints?: Prisma.SortOrder
houseJoinPoints?: Prisma.SortOrder
houseLeavePoints?: Prisma.SortOrder
houseCreatePoints?: Prisma.SortOrder
createdAt?: Prisma.SortOrder createdAt?: Prisma.SortOrder
updatedAt?: Prisma.SortOrder updatedAt?: Prisma.SortOrder
} }
@@ -441,6 +522,9 @@ export type SitePreferencesMinOrderByAggregateInput = {
export type SitePreferencesSumOrderByAggregateInput = { export type SitePreferencesSumOrderByAggregateInput = {
eventRegistrationPoints?: Prisma.SortOrder eventRegistrationPoints?: Prisma.SortOrder
eventFeedbackPoints?: Prisma.SortOrder eventFeedbackPoints?: Prisma.SortOrder
houseJoinPoints?: Prisma.SortOrder
houseLeavePoints?: Prisma.SortOrder
houseCreatePoints?: Prisma.SortOrder
} }
@@ -453,6 +537,9 @@ export type SitePreferencesSelect<ExtArgs extends runtime.Types.Extensions.Inter
challengesBackground?: boolean challengesBackground?: boolean
eventRegistrationPoints?: boolean eventRegistrationPoints?: boolean
eventFeedbackPoints?: boolean eventFeedbackPoints?: boolean
houseJoinPoints?: boolean
houseLeavePoints?: boolean
houseCreatePoints?: boolean
createdAt?: boolean createdAt?: boolean
updatedAt?: boolean updatedAt?: boolean
}, ExtArgs["result"]["sitePreferences"]> }, ExtArgs["result"]["sitePreferences"]>
@@ -465,6 +552,9 @@ export type SitePreferencesSelectCreateManyAndReturn<ExtArgs extends runtime.Typ
challengesBackground?: boolean challengesBackground?: boolean
eventRegistrationPoints?: boolean eventRegistrationPoints?: boolean
eventFeedbackPoints?: boolean eventFeedbackPoints?: boolean
houseJoinPoints?: boolean
houseLeavePoints?: boolean
houseCreatePoints?: boolean
createdAt?: boolean createdAt?: boolean
updatedAt?: boolean updatedAt?: boolean
}, ExtArgs["result"]["sitePreferences"]> }, ExtArgs["result"]["sitePreferences"]>
@@ -477,6 +567,9 @@ export type SitePreferencesSelectUpdateManyAndReturn<ExtArgs extends runtime.Typ
challengesBackground?: boolean challengesBackground?: boolean
eventRegistrationPoints?: boolean eventRegistrationPoints?: boolean
eventFeedbackPoints?: boolean eventFeedbackPoints?: boolean
houseJoinPoints?: boolean
houseLeavePoints?: boolean
houseCreatePoints?: boolean
createdAt?: boolean createdAt?: boolean
updatedAt?: boolean updatedAt?: boolean
}, ExtArgs["result"]["sitePreferences"]> }, ExtArgs["result"]["sitePreferences"]>
@@ -489,11 +582,14 @@ export type SitePreferencesSelectScalar = {
challengesBackground?: boolean challengesBackground?: boolean
eventRegistrationPoints?: boolean eventRegistrationPoints?: boolean
eventFeedbackPoints?: boolean eventFeedbackPoints?: boolean
houseJoinPoints?: boolean
houseLeavePoints?: boolean
houseCreatePoints?: boolean
createdAt?: boolean createdAt?: boolean
updatedAt?: boolean updatedAt?: boolean
} }
export type SitePreferencesOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "homeBackground" | "eventsBackground" | "leaderboardBackground" | "challengesBackground" | "eventRegistrationPoints" | "eventFeedbackPoints" | "createdAt" | "updatedAt", ExtArgs["result"]["sitePreferences"]> export type SitePreferencesOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "homeBackground" | "eventsBackground" | "leaderboardBackground" | "challengesBackground" | "eventRegistrationPoints" | "eventFeedbackPoints" | "houseJoinPoints" | "houseLeavePoints" | "houseCreatePoints" | "createdAt" | "updatedAt", ExtArgs["result"]["sitePreferences"]>
export type $SitePreferencesPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = { export type $SitePreferencesPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
name: "SitePreferences" name: "SitePreferences"
@@ -506,6 +602,9 @@ export type $SitePreferencesPayload<ExtArgs extends runtime.Types.Extensions.Int
challengesBackground: string | null challengesBackground: string | null
eventRegistrationPoints: number eventRegistrationPoints: number
eventFeedbackPoints: number eventFeedbackPoints: number
houseJoinPoints: number
houseLeavePoints: number
houseCreatePoints: number
createdAt: Date createdAt: Date
updatedAt: Date updatedAt: Date
}, ExtArgs["result"]["sitePreferences"]> }, ExtArgs["result"]["sitePreferences"]>
@@ -938,6 +1037,9 @@ export interface SitePreferencesFieldRefs {
readonly challengesBackground: Prisma.FieldRef<"SitePreferences", 'String'> readonly challengesBackground: Prisma.FieldRef<"SitePreferences", 'String'>
readonly eventRegistrationPoints: Prisma.FieldRef<"SitePreferences", 'Int'> readonly eventRegistrationPoints: Prisma.FieldRef<"SitePreferences", 'Int'>
readonly eventFeedbackPoints: Prisma.FieldRef<"SitePreferences", 'Int'> readonly eventFeedbackPoints: Prisma.FieldRef<"SitePreferences", 'Int'>
readonly houseJoinPoints: Prisma.FieldRef<"SitePreferences", 'Int'>
readonly houseLeavePoints: Prisma.FieldRef<"SitePreferences", 'Int'>
readonly houseCreatePoints: Prisma.FieldRef<"SitePreferences", 'Int'>
readonly createdAt: Prisma.FieldRef<"SitePreferences", 'DateTime'> readonly createdAt: Prisma.FieldRef<"SitePreferences", 'DateTime'>
readonly updatedAt: Prisma.FieldRef<"SitePreferences", 'DateTime'> readonly updatedAt: Prisma.FieldRef<"SitePreferences", 'DateTime'>
} }

View File

@@ -0,0 +1,9 @@
-- AlterTable
ALTER TABLE "SitePreferences" ADD COLUMN "houseJoinPoints" INTEGER NOT NULL DEFAULT 100;
-- AlterTable
ALTER TABLE "SitePreferences" ADD COLUMN "houseLeavePoints" INTEGER NOT NULL DEFAULT 100;
-- AlterTable
ALTER TABLE "SitePreferences" ADD COLUMN "houseCreatePoints" INTEGER NOT NULL DEFAULT 100;

View File

@@ -109,6 +109,9 @@ model SitePreferences {
challengesBackground String? challengesBackground String?
eventRegistrationPoints Int @default(100) eventRegistrationPoints Int @default(100)
eventFeedbackPoints Int @default(100) eventFeedbackPoints Int @default(100)
houseJoinPoints Int @default(100)
houseLeavePoints Int @default(100)
houseCreatePoints Int @default(100)
createdAt DateTime @default(now()) createdAt DateTime @default(now())
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
} }

View File

@@ -8,6 +8,7 @@ import type {
InvitationStatus, InvitationStatus,
RequestStatus, RequestStatus,
Prisma, Prisma,
SitePreferences,
} from "@/prisma/generated/prisma/client"; } from "@/prisma/generated/prisma/client";
import { import {
ValidationError, ValidationError,
@@ -15,6 +16,14 @@ import {
ConflictError, ConflictError,
ForbiddenError, ForbiddenError,
} from "../errors"; } from "../errors";
import { sitePreferencesService } from "../preferences/site-preferences.service";
// Type étendu pour les préférences avec les nouveaux champs de points des maisons
type SitePreferencesWithHousePoints = SitePreferences & {
houseJoinPoints?: number;
houseLeavePoints?: number;
houseCreatePoints?: number;
};
const HOUSE_NAME_MIN_LENGTH = 3; const HOUSE_NAME_MIN_LENGTH = 3;
const HOUSE_NAME_MAX_LENGTH = 50; const HOUSE_NAME_MAX_LENGTH = 50;
@@ -143,10 +152,7 @@ export class HouseService {
/** /**
* Vérifie si un utilisateur est membre d'une maison * Vérifie si un utilisateur est membre d'une maison
*/ */
async isUserMemberOfHouse( async isUserMemberOfHouse(userId: string, houseId: string): Promise<boolean> {
userId: string,
houseId: string
): Promise<boolean> {
const membership = await prisma.houseMembership.findUnique({ const membership = await prisma.houseMembership.findUnique({
where: { where: {
houseId_userId: { houseId_userId: {
@@ -161,10 +167,7 @@ export class HouseService {
/** /**
* Vérifie si un utilisateur est propriétaire ou admin d'une maison * Vérifie si un utilisateur est propriétaire ou admin d'une maison
*/ */
async isUserOwnerOrAdmin( async isUserOwnerOrAdmin(userId: string, houseId: string): Promise<boolean> {
userId: string,
houseId: string
): Promise<boolean> {
const membership = await prisma.houseMembership.findUnique({ const membership = await prisma.houseMembership.findUnique({
where: { where: {
houseId_userId: { houseId_userId: {
@@ -248,7 +251,10 @@ export class HouseService {
); );
} }
if (data.description && data.description.length > HOUSE_DESCRIPTION_MAX_LENGTH) { if (
data.description &&
data.description.length > HOUSE_DESCRIPTION_MAX_LENGTH
) {
throw new ValidationError( throw new ValidationError(
`La description ne peut pas dépasser ${HOUSE_DESCRIPTION_MAX_LENGTH} caractères`, `La description ne peut pas dépasser ${HOUSE_DESCRIPTION_MAX_LENGTH} caractères`,
"description" "description"
@@ -280,8 +286,22 @@ export class HouseService {
throw new ConflictError("Ce nom de maison est déjà utilisé"); throw new ConflictError("Ce nom de maison est déjà utilisé");
} }
// Créer la maison et ajouter le créateur comme OWNER // Récupérer les points à attribuer depuis les préférences du site
return prisma.house.create({ const sitePreferences =
await sitePreferencesService.getOrCreateSitePreferences();
const pointsToAward =
(sitePreferences as SitePreferencesWithHousePoints).houseCreatePoints ??
100;
console.log(
"[HouseService] Creating house - points to award:",
pointsToAward,
"preferences:",
sitePreferences
);
// Créer la maison et ajouter le créateur comme OWNER, puis attribuer les points
return prisma.$transaction(async (tx) => {
const house = await tx.house.create({
data: { data: {
name: data.name.trim(), name: data.name.trim(),
description: data.description?.trim() || null, description: data.description?.trim() || null,
@@ -294,6 +314,19 @@ export class HouseService {
}, },
}, },
}); });
// Attribuer les points au créateur
await tx.user.update({
where: { id: data.creatorId },
data: {
score: {
increment: pointsToAward,
},
},
});
return house;
});
} }
/** /**
@@ -348,7 +381,10 @@ export class HouseService {
} }
if (data.description !== undefined) { if (data.description !== undefined) {
if (data.description && data.description.length > HOUSE_DESCRIPTION_MAX_LENGTH) { if (
data.description &&
data.description.length > HOUSE_DESCRIPTION_MAX_LENGTH
) {
throw new ValidationError( throw new ValidationError(
`La description ne peut pas dépasser ${HOUSE_DESCRIPTION_MAX_LENGTH} caractères`, `La description ne peut pas dépasser ${HOUSE_DESCRIPTION_MAX_LENGTH} caractères`,
"description" "description"
@@ -370,13 +406,48 @@ export class HouseService {
// Vérifier que l'utilisateur est propriétaire // Vérifier que l'utilisateur est propriétaire
const isOwner = await this.isUserOwner(userId, houseId); const isOwner = await this.isUserOwner(userId, houseId);
if (!isOwner) { if (!isOwner) {
throw new ForbiddenError( throw new ForbiddenError("Seul le propriétaire peut supprimer la maison");
"Seul le propriétaire peut supprimer la maison"
);
} }
await prisma.house.delete({ // Récupérer la maison pour obtenir le créateur
const house = await prisma.house.findUnique({
where: { id: houseId }, where: { id: houseId },
select: { creatorId: true },
});
if (!house) {
throw new NotFoundError("Maison");
}
// Récupérer les points à enlever depuis les préférences du site
const sitePreferences =
await sitePreferencesService.getOrCreateSitePreferences();
const pointsToDeduct =
(sitePreferences as SitePreferencesWithHousePoints).houseCreatePoints ??
100;
console.log(
"[HouseService] Deleting house - points to deduct:",
pointsToDeduct,
"creatorId:",
house.creatorId
);
// Supprimer la maison et enlever les points au créateur
await prisma.$transaction(async (tx) => {
// Enlever les points au créateur
await tx.user.update({
where: { id: house.creatorId },
data: {
score: {
decrement: pointsToDeduct,
},
},
});
// Supprimer la maison (cela supprimera automatiquement les membreships, invitations, etc. grâce aux CASCADE)
await tx.house.delete({
where: { id: houseId },
});
}); });
} }
@@ -404,22 +475,6 @@ export class HouseService {
throw new ConflictError("Cet utilisateur est déjà membre de la maison"); throw new ConflictError("Cet utilisateur est déjà membre de la maison");
} }
// Vérifier qu'il n'y a pas déjà une invitation en attente
const existingInvitation = await prisma.houseInvitation.findUnique({
where: {
houseId_inviteeId: {
houseId: data.houseId,
inviteeId: data.inviteeId,
},
},
});
if (existingInvitation && existingInvitation.status === "PENDING") {
throw new ConflictError(
"Une invitation est déjà en attente pour cet utilisateur"
);
}
// Vérifier que l'invité n'est pas déjà dans une autre maison // Vérifier que l'invité n'est pas déjà dans une autre maison
const existingMembership = await prisma.houseMembership.findFirst({ const existingMembership = await prisma.houseMembership.findFirst({
where: { userId: data.inviteeId }, where: { userId: data.inviteeId },
@@ -431,6 +486,37 @@ export class HouseService {
); );
} }
// Vérifier s'il existe déjà une invitation (peu importe le statut)
const existingInvitation = await prisma.houseInvitation.findUnique({
where: {
houseId_inviteeId: {
houseId: data.houseId,
inviteeId: data.inviteeId,
},
},
});
if (existingInvitation) {
if (existingInvitation.status === "PENDING") {
throw new ConflictError(
"Une invitation est déjà en attente pour cet utilisateur"
);
}
// Si l'invitation existe avec un autre statut, on la réinitialise
return prisma.houseInvitation.update({
where: {
houseId_inviteeId: {
houseId: data.houseId,
inviteeId: data.inviteeId,
},
},
data: {
inviterId: data.inviterId,
status: "PENDING",
},
});
}
// Créer l'invitation // Créer l'invitation
return prisma.houseInvitation.create({ return prisma.houseInvitation.create({
data: { data: {
@@ -476,6 +562,19 @@ export class HouseService {
); );
} }
// Récupérer les points à attribuer depuis les préférences du site
const sitePreferences =
await sitePreferencesService.getOrCreateSitePreferences();
const pointsToAward =
(sitePreferences as SitePreferencesWithHousePoints).houseJoinPoints ??
100;
console.log(
"[HouseService] Accepting invitation - points to award:",
pointsToAward,
"userId:",
userId
);
// Créer le membership et mettre à jour l'invitation // Créer le membership et mettre à jour l'invitation
return prisma.$transaction(async (tx) => { return prisma.$transaction(async (tx) => {
const membership = await tx.houseMembership.create({ const membership = await tx.houseMembership.create({
@@ -510,6 +609,16 @@ export class HouseService {
data: { status: "CANCELLED" }, data: { status: "CANCELLED" },
}); });
// Attribuer les points à l'utilisateur qui rejoint
await tx.user.update({
where: { id: userId },
data: {
score: {
increment: pointsToAward,
},
},
});
return membership; return membership;
}); });
} }
@@ -592,7 +701,7 @@ export class HouseService {
); );
} }
// Vérifier qu'il n'y a pas déjà une demande en attente // Vérifier s'il existe déjà une demande
const existingRequest = await prisma.houseRequest.findUnique({ const existingRequest = await prisma.houseRequest.findUnique({
where: { where: {
houseId_requesterId: { houseId_requesterId: {
@@ -602,13 +711,27 @@ export class HouseService {
}, },
}); });
if (existingRequest && existingRequest.status === "PENDING") { if (existingRequest) {
if (existingRequest.status === "PENDING") {
throw new ConflictError( throw new ConflictError(
"Une demande est déjà en attente pour cette maison" "Une demande est déjà en attente pour cette maison"
); );
} }
// Si la demande existe mais n'est pas PENDING (REJECTED, CANCELLED), on la réactive
return prisma.houseRequest.update({
where: {
houseId_requesterId: {
houseId: data.houseId,
requesterId: data.requesterId,
},
},
data: {
status: "PENDING",
},
});
}
// Créer la demande // Créer une nouvelle demande
return prisma.houseRequest.create({ return prisma.houseRequest.create({
data: { data: {
houseId: data.houseId, houseId: data.houseId,
@@ -635,10 +758,7 @@ export class HouseService {
} }
// Vérifier que l'utilisateur est propriétaire ou admin de la maison // Vérifier que l'utilisateur est propriétaire ou admin de la maison
const isAuthorized = await this.isUserOwnerOrAdmin( const isAuthorized = await this.isUserOwnerOrAdmin(userId, request.houseId);
userId,
request.houseId
);
if (!isAuthorized) { if (!isAuthorized) {
throw new ForbiddenError( throw new ForbiddenError(
"Vous n'avez pas les permissions pour accepter cette demande" "Vous n'avez pas les permissions pour accepter cette demande"
@@ -660,6 +780,19 @@ export class HouseService {
); );
} }
// Récupérer les points à attribuer depuis les préférences du site
const sitePreferences =
await sitePreferencesService.getOrCreateSitePreferences();
const pointsToAward =
(sitePreferences as SitePreferencesWithHousePoints).houseJoinPoints ??
100;
console.log(
"[HouseService] Accepting request - points to award:",
pointsToAward,
"requesterId:",
request.requesterId
);
// Créer le membership et mettre à jour la demande // Créer le membership et mettre à jour la demande
return prisma.$transaction(async (tx) => { return prisma.$transaction(async (tx) => {
const membership = await tx.houseMembership.create({ const membership = await tx.houseMembership.create({
@@ -694,6 +827,16 @@ export class HouseService {
data: { status: "CANCELLED" }, data: { status: "CANCELLED" },
}); });
// Attribuer les points à l'utilisateur qui rejoint
await tx.user.update({
where: { id: request.requesterId },
data: {
score: {
increment: pointsToAward,
},
},
});
return membership; return membership;
}); });
} }
@@ -711,10 +854,7 @@ export class HouseService {
} }
// Vérifier que l'utilisateur est propriétaire ou admin de la maison // Vérifier que l'utilisateur est propriétaire ou admin de la maison
const isAuthorized = await this.isUserOwnerOrAdmin( const isAuthorized = await this.isUserOwnerOrAdmin(userId, request.houseId);
userId,
request.houseId
);
if (!isAuthorized) { if (!isAuthorized) {
throw new ForbiddenError( throw new ForbiddenError(
"Vous n'avez pas les permissions pour refuser cette demande" "Vous n'avez pas les permissions pour refuser cette demande"
@@ -759,6 +899,88 @@ export class HouseService {
}); });
} }
/**
* Retire un membre d'une maison (par un OWNER ou ADMIN)
*/
async removeMember(
houseId: string,
memberIdToRemove: string,
removerId: string
): Promise<void> {
// Vérifier que celui qui retire est OWNER ou ADMIN
const isAuthorized = await this.isUserOwnerOrAdmin(removerId, houseId);
if (!isAuthorized) {
throw new ForbiddenError(
"Vous n'avez pas les permissions pour retirer un membre"
);
}
// Récupérer les membreships
const removerMembership = await prisma.houseMembership.findUnique({
where: {
houseId_userId: {
houseId,
userId: removerId,
},
},
});
const memberToRemoveMembership = await prisma.houseMembership.findUnique({
where: {
houseId_userId: {
houseId,
userId: memberIdToRemove,
},
},
});
if (!memberToRemoveMembership) {
throw new NotFoundError("Membre");
}
// Un OWNER ne peut pas être retiré
if (memberToRemoveMembership.role === "OWNER") {
throw new ForbiddenError("Le propriétaire ne peut pas être retiré");
}
// Un ADMIN ne peut retirer que des MEMBER (pas d'autres ADMIN)
if (
removerMembership?.role === "ADMIN" &&
memberToRemoveMembership.role === "ADMIN"
) {
throw new ForbiddenError("Un admin ne peut pas retirer un autre admin");
}
// Récupérer les points à enlever depuis les préférences du site
const sitePreferences =
await sitePreferencesService.getOrCreateSitePreferences();
const pointsToDeduct =
(sitePreferences as SitePreferencesWithHousePoints).houseLeavePoints ??
100;
// Supprimer le membership et enlever les points
await prisma.$transaction(async (tx) => {
await tx.houseMembership.delete({
where: {
houseId_userId: {
houseId,
userId: memberIdToRemove,
},
},
});
// Enlever les points à l'utilisateur retiré
await tx.user.update({
where: { id: memberIdToRemove },
data: {
score: {
decrement: pointsToDeduct,
},
},
});
});
}
/** /**
* Quitte une maison * Quitte une maison
*/ */
@@ -783,7 +1005,22 @@ export class HouseService {
); );
} }
await prisma.houseMembership.delete({ // Récupérer les points à enlever depuis les préférences du site
const sitePreferences =
await sitePreferencesService.getOrCreateSitePreferences();
const pointsToDeduct =
(sitePreferences as SitePreferencesWithHousePoints).houseLeavePoints ??
100;
console.log(
"[HouseService] Leaving house - points to deduct:",
pointsToDeduct,
"userId:",
userId
);
// Supprimer le membership et enlever les points
await prisma.$transaction(async (tx) => {
await tx.houseMembership.delete({
where: { where: {
houseId_userId: { houseId_userId: {
houseId, houseId,
@@ -791,6 +1028,17 @@ export class HouseService {
}, },
}, },
}); });
// Enlever les points à l'utilisateur qui quitte
await tx.user.update({
where: { id: userId },
data: {
score: {
decrement: pointsToDeduct,
},
},
});
});
} }
/** /**
@@ -819,6 +1067,66 @@ export class HouseService {
}); });
} }
/**
* Compte les invitations en attente pour un utilisateur
*/
async getPendingInvitationsCount(userId: string): Promise<number> {
return prisma.houseInvitation.count({
where: {
inviteeId: userId,
status: "PENDING",
},
});
}
/**
* Compte les demandes d'adhésion en attente pour un utilisateur
* (demandes reçues pour les maisons dont l'utilisateur est propriétaire ou admin)
*/
async getPendingRequestsCount(userId: string): Promise<number> {
// Trouver toutes les maisons où l'utilisateur est OWNER ou ADMIN
const userHouses = await prisma.houseMembership.findMany({
where: {
userId,
role: {
in: ["OWNER", "ADMIN"],
},
},
select: {
houseId: true,
},
});
const houseIds = userHouses.map((m) => m.houseId);
if (houseIds.length === 0) {
return 0;
}
// Compter les demandes PENDING pour ces maisons
return prisma.houseRequest.count({
where: {
houseId: {
in: houseIds,
},
status: "PENDING",
},
});
}
/**
* Compte le total des invitations et demandes en attente pour un utilisateur
* - Invitations : invitations reçues par l'utilisateur (inviteeId)
* - Demandes : demandes reçues pour les maisons dont l'utilisateur est OWNER ou ADMIN
*/
async getPendingHouseActionsCount(userId: string): Promise<number> {
const [invitationsCount, requestsCount] = await Promise.all([
this.getPendingInvitationsCount(userId),
this.getPendingRequestsCount(userId),
]);
return invitationsCount + requestsCount;
}
/** /**
* Récupère les demandes d'une maison * Récupère les demandes d'une maison
*/ */
@@ -879,9 +1187,7 @@ export class HouseService {
/** /**
* Récupère une invitation par son ID (avec seulement houseId) * Récupère une invitation par son ID (avec seulement houseId)
*/ */
async getInvitationById( async getInvitationById(id: string): Promise<{ houseId: string } | null> {
id: string
): Promise<{ houseId: string } | null> {
return prisma.houseInvitation.findUnique({ return prisma.houseInvitation.findUnique({
where: { id }, where: { id },
select: { houseId: true }, select: { houseId: true },
@@ -890,4 +1196,3 @@ export class HouseService {
} }
export const houseService = new HouseService(); export const houseService = new HouseService();

View File

@@ -2,6 +2,13 @@ import { prisma } from "../database";
import { normalizeBackgroundUrl } from "@/lib/avatars"; import { normalizeBackgroundUrl } from "@/lib/avatars";
import type { SitePreferences } from "@/prisma/generated/prisma/client"; import type { SitePreferences } from "@/prisma/generated/prisma/client";
// Type étendu pour les préférences avec les nouveaux champs de points des maisons
type SitePreferencesWithHousePoints = SitePreferences & {
houseJoinPoints?: number;
houseLeavePoints?: number;
houseCreatePoints?: number;
};
export interface UpdateSitePreferencesInput { export interface UpdateSitePreferencesInput {
homeBackground?: string | null; homeBackground?: string | null;
eventsBackground?: string | null; eventsBackground?: string | null;
@@ -9,6 +16,9 @@ export interface UpdateSitePreferencesInput {
challengesBackground?: string | null; challengesBackground?: string | null;
eventRegistrationPoints?: number; eventRegistrationPoints?: number;
eventFeedbackPoints?: number; eventFeedbackPoints?: number;
houseJoinPoints?: number;
houseLeavePoints?: number;
houseCreatePoints?: number;
} }
/** /**
@@ -42,10 +52,19 @@ export class SitePreferencesService {
challengesBackground: null, challengesBackground: null,
eventRegistrationPoints: 100, eventRegistrationPoints: 100,
eventFeedbackPoints: 100, eventFeedbackPoints: 100,
houseJoinPoints: 100,
houseLeavePoints: 100,
houseCreatePoints: 100,
}, },
}); });
} }
// S'assurer que les valeurs par défaut sont présentes même si les colonnes n'existent pas encore
const prefs = sitePreferences as SitePreferencesWithHousePoints;
if (prefs.houseJoinPoints == null) prefs.houseJoinPoints = 100;
if (prefs.houseLeavePoints == null) prefs.houseLeavePoints = 100;
if (prefs.houseCreatePoints == null) prefs.houseCreatePoints = 100;
return sitePreferences; return sitePreferences;
} }
@@ -82,6 +101,16 @@ export class SitePreferencesService {
data.eventFeedbackPoints !== undefined data.eventFeedbackPoints !== undefined
? data.eventFeedbackPoints ? data.eventFeedbackPoints
: undefined, : undefined,
houseJoinPoints:
data.houseJoinPoints !== undefined ? data.houseJoinPoints : undefined,
houseLeavePoints:
data.houseLeavePoints !== undefined
? data.houseLeavePoints
: undefined,
houseCreatePoints:
data.houseCreatePoints !== undefined
? data.houseCreatePoints
: undefined,
}, },
create: { create: {
id: "global", id: "global",
@@ -99,6 +128,9 @@ export class SitePreferencesService {
: (data.challengesBackground ?? null), : (data.challengesBackground ?? null),
eventRegistrationPoints: data.eventRegistrationPoints ?? 100, eventRegistrationPoints: data.eventRegistrationPoints ?? 100,
eventFeedbackPoints: data.eventFeedbackPoints ?? 100, eventFeedbackPoints: data.eventFeedbackPoints ?? 100,
houseJoinPoints: data.houseJoinPoints ?? 100,
houseLeavePoints: data.houseLeavePoints ?? 100,
houseCreatePoints: data.houseCreatePoints ?? 100,
}, },
}); });
} }