Refactor admin actions and improve code formatting: Standardize import statements, enhance error handling messages, and apply consistent formatting across event, user, and preference management functions for better readability and maintainability.
Some checks failed
Deploy with Docker Compose / deploy (push) Has been cancelled

This commit is contained in:
Julien Froidefond
2025-12-15 21:20:39 +01:00
parent 321da3176e
commit b790ee21f2
52 changed files with 12712 additions and 8554 deletions

View File

@@ -1,73 +1,79 @@
'use server'
"use server";
import { revalidatePath } from 'next/cache'
import { auth } from '@/lib/auth'
import { eventService } from '@/services/events/event.service'
import { Role, EventType } from '@/prisma/generated/prisma/client'
import { ValidationError, NotFoundError } from '@/services/errors'
import { revalidatePath } from "next/cache";
import { auth } from "@/lib/auth";
import { eventService } from "@/services/events/event.service";
import { Role, EventType } from "@/prisma/generated/prisma/client";
import { ValidationError, NotFoundError } from "@/services/errors";
function checkAdminAccess() {
return async () => {
const session = await auth()
const session = await auth();
if (!session?.user || session.user.role !== Role.ADMIN) {
throw new Error('Accès refusé')
throw new Error("Accès refusé");
}
return session
}
return session;
};
}
export async function createEvent(data: {
date: string
name: string
description?: string | null
type: string
room?: string | null
time?: string | null
maxPlaces?: number | null
date: string;
name: string;
description?: string | null;
type: string;
room?: string | null;
time?: string | null;
maxPlaces?: number | null;
}) {
try {
await checkAdminAccess()()
await checkAdminAccess()();
const event = await eventService.validateAndCreateEvent({
date: data.date,
name: data.name,
description: data.description ?? '',
description: data.description ?? "",
type: data.type as EventType,
room: data.room ?? undefined,
time: data.time ?? undefined,
maxPlaces: data.maxPlaces ?? undefined,
})
});
revalidatePath('/admin')
revalidatePath('/events')
revalidatePath('/')
revalidatePath("/admin");
revalidatePath("/events");
revalidatePath("/");
return { success: true, data: event }
return { success: true, data: event };
} catch (error) {
console.error('Error creating event:', error)
console.error("Error creating event:", error);
if (error instanceof ValidationError) {
return { success: false, error: error.message }
return { success: false, error: error.message };
}
if (error instanceof Error && error.message === 'Accès refusé') {
return { success: false, error: 'Accès refusé' }
if (error instanceof Error && error.message === "Accès refusé") {
return { success: false, error: "Accès refusé" };
}
return { success: false, error: 'Erreur lors de la création de l\'événement' }
return {
success: false,
error: "Erreur lors de la création de l'événement",
};
}
}
export async function updateEvent(eventId: string, data: {
date?: string
name?: string
description?: string | null
type?: string
room?: string | null
time?: string | null
maxPlaces?: number | null
}) {
export async function updateEvent(
eventId: string,
data: {
date?: string;
name?: string;
description?: string | null;
type?: string;
room?: string | null;
time?: string | null;
maxPlaces?: number | null;
}
) {
try {
await checkAdminAccess()()
await checkAdminAccess()();
const event = await eventService.validateAndUpdateEvent(eventId, {
date: data.date,
@@ -77,55 +83,60 @@ export async function updateEvent(eventId: string, data: {
room: data.room ?? undefined,
time: data.time ?? undefined,
maxPlaces: data.maxPlaces ?? undefined,
})
});
revalidatePath('/admin')
revalidatePath('/events')
revalidatePath('/')
revalidatePath("/admin");
revalidatePath("/events");
revalidatePath("/");
return { success: true, data: event }
return { success: true, data: event };
} catch (error) {
console.error('Error updating event:', error)
console.error("Error updating event:", error);
if (error instanceof ValidationError) {
return { success: false, error: error.message }
return { success: false, error: error.message };
}
if (error instanceof NotFoundError) {
return { success: false, error: error.message }
return { success: false, error: error.message };
}
if (error instanceof Error && error.message === 'Accès refusé') {
return { success: false, error: 'Accès refusé' }
if (error instanceof Error && error.message === "Accès refusé") {
return { success: false, error: "Accès refusé" };
}
return { success: false, error: 'Erreur lors de la mise à jour de l\'événement' }
return {
success: false,
error: "Erreur lors de la mise à jour de l'événement",
};
}
}
export async function deleteEvent(eventId: string) {
try {
await checkAdminAccess()()
await checkAdminAccess()();
const existingEvent = await eventService.getEventById(eventId)
const existingEvent = await eventService.getEventById(eventId);
if (!existingEvent) {
return { success: false, error: 'Événement non trouvé' }
return { success: false, error: "Événement non trouvé" };
}
await eventService.deleteEvent(eventId)
await eventService.deleteEvent(eventId);
revalidatePath('/admin')
revalidatePath('/events')
revalidatePath('/')
revalidatePath("/admin");
revalidatePath("/events");
revalidatePath("/");
return { success: true }
return { success: true };
} catch (error) {
console.error('Error deleting event:', error)
console.error("Error deleting event:", error);
if (error instanceof Error && error.message === 'Accès refusé') {
return { success: false, error: 'Accès refusé' }
if (error instanceof Error && error.message === "Accès refusé") {
return { success: false, error: "Accès refusé" };
}
return { success: false, error: 'Erreur lors de la suppression de l\'événement' }
return {
success: false,
error: "Erreur lors de la suppression de l'événement",
};
}
}

View File

@@ -1,48 +1,50 @@
'use server'
"use server";
import { revalidatePath } from 'next/cache'
import { auth } from '@/lib/auth'
import { sitePreferencesService } from '@/services/preferences/site-preferences.service'
import { Role } from '@/prisma/generated/prisma/client'
import { revalidatePath } from "next/cache";
import { auth } from "@/lib/auth";
import { sitePreferencesService } from "@/services/preferences/site-preferences.service";
import { Role } from "@/prisma/generated/prisma/client";
function checkAdminAccess() {
return async () => {
const session = await auth()
const session = await auth();
if (!session?.user || session.user.role !== Role.ADMIN) {
throw new Error('Accès refusé')
throw new Error("Accès refusé");
}
return session
}
return session;
};
}
export async function updateSitePreferences(data: {
homeBackground?: string | null
eventsBackground?: string | null
leaderboardBackground?: string | null
homeBackground?: string | null;
eventsBackground?: string | null;
leaderboardBackground?: string | null;
}) {
try {
await checkAdminAccess()()
await checkAdminAccess()();
const preferences = await sitePreferencesService.updateSitePreferences({
homeBackground: data.homeBackground,
eventsBackground: data.eventsBackground,
leaderboardBackground: data.leaderboardBackground,
})
});
revalidatePath('/admin')
revalidatePath('/')
revalidatePath('/events')
revalidatePath('/leaderboard')
revalidatePath("/admin");
revalidatePath("/");
revalidatePath("/events");
revalidatePath("/leaderboard");
return { success: true, data: preferences }
return { success: true, data: preferences };
} catch (error) {
console.error('Error updating admin preferences:', error)
console.error("Error updating admin preferences:", error);
if (error instanceof Error && error.message === 'Accès refusé') {
return { success: false, error: 'Accès refusé' }
if (error instanceof Error && error.message === "Accès refusé") {
return { success: false, error: "Accès refusé" };
}
return { success: false, error: 'Erreur lors de la mise à jour des préférences' }
return {
success: false,
error: "Erreur lors de la mise à jour des préférences",
};
}
}

View File

@@ -1,47 +1,55 @@
'use server'
"use server";
import { revalidatePath } from 'next/cache'
import { auth } from '@/lib/auth'
import { userService } from '@/services/users/user.service'
import { userStatsService } from '@/services/users/user-stats.service'
import { Role } from '@/prisma/generated/prisma/client'
import { revalidatePath } from "next/cache";
import { auth } from "@/lib/auth";
import { userService } from "@/services/users/user.service";
import { userStatsService } from "@/services/users/user-stats.service";
import { Role } from "@/prisma/generated/prisma/client";
import {
ValidationError,
NotFoundError,
ConflictError,
} from '@/services/errors'
} from "@/services/errors";
function checkAdminAccess() {
return async () => {
const session = await auth()
const session = await auth();
if (!session?.user || session.user.role !== Role.ADMIN) {
throw new Error('Accès refusé')
throw new Error("Accès refusé");
}
return session
}
return session;
};
}
export async function updateUser(userId: string, data: {
username?: string
avatar?: string | null
hpDelta?: number
xpDelta?: number
score?: number
level?: number
role?: string
}) {
export async function updateUser(
userId: string,
data: {
username?: string;
avatar?: string | null;
hpDelta?: number;
xpDelta?: number;
score?: number;
level?: number;
role?: string;
}
) {
try {
await checkAdminAccess()()
await checkAdminAccess()();
// Valider username si fourni
if (data.username !== undefined) {
try {
await userService.validateAndUpdateUserProfile(userId, { username: data.username })
await userService.validateAndUpdateUserProfile(userId, {
username: data.username,
});
} catch (error) {
if (error instanceof ValidationError || error instanceof ConflictError) {
return { success: false, error: error.message }
if (
error instanceof ValidationError ||
error instanceof ConflictError
) {
return { success: false, error: error.message };
}
throw error
throw error;
}
}
@@ -70,47 +78,52 @@ export async function updateUser(userId: string, data: {
maxXp: true,
avatar: true,
}
)
);
revalidatePath('/admin')
revalidatePath('/leaderboard')
revalidatePath("/admin");
revalidatePath("/leaderboard");
return { success: true, data: updatedUser }
return { success: true, data: updatedUser };
} catch (error) {
console.error('Error updating user:', error)
console.error("Error updating user:", error);
if (error instanceof Error && error.message === 'Accès refusé') {
return { success: false, error: 'Accès refusé' }
if (error instanceof Error && error.message === "Accès refusé") {
return { success: false, error: "Accès refusé" };
}
return { success: false, error: 'Erreur lors de la mise à jour de l\'utilisateur' }
return {
success: false,
error: "Erreur lors de la mise à jour de l'utilisateur",
};
}
}
export async function deleteUser(userId: string) {
try {
const session = await checkAdminAccess()()
const session = await checkAdminAccess()();
await userService.validateAndDeleteUser(userId, session.user.id)
await userService.validateAndDeleteUser(userId, session.user.id);
revalidatePath('/admin')
revalidatePath('/leaderboard')
revalidatePath("/admin");
revalidatePath("/leaderboard");
return { success: true }
return { success: true };
} catch (error) {
console.error('Error deleting user:', error)
console.error("Error deleting user:", error);
if (error instanceof ValidationError) {
return { success: false, error: error.message }
return { success: false, error: error.message };
}
if (error instanceof NotFoundError) {
return { success: false, error: error.message }
return { success: false, error: error.message };
}
if (error instanceof Error && error.message === 'Accès refusé') {
return { success: false, error: 'Accès refusé' }
if (error instanceof Error && error.message === "Accès refusé") {
return { success: false, error: "Accès refusé" };
}
return { success: false, error: 'Erreur lors de la suppression de l\'utilisateur' }
return {
success: false,
error: "Erreur lors de la suppression de l'utilisateur",
};
}
}