Entfernt Konsolenausgaben aus verschiedenen Controllern und Services, um die Codequalität zu verbessern und die Lesbarkeit zu erhöhen. Diese Änderungen betreffen die Controller für Clubs, Club-Teams, Mitglieder, Tagebuch-Tags, Saisons und Teams sowie die zugehörigen Services. Ziel ist es, die Protokollierung zu optimieren und die Performance zu steigern.
This commit is contained in:
@@ -8,12 +8,10 @@ export const getClubTeams = async (req, res) => {
|
||||
const { clubid: clubId } = req.params;
|
||||
const { seasonid: seasonId } = req.query;
|
||||
|
||||
devLog('[getClubTeams] - Getting club teams for club:', clubId, 'season:', seasonId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
// Check if user has access to this club
|
||||
const clubTeams = await ClubTeamService.getAllClubTeamsByClub(clubId, seasonId);
|
||||
devLog('[getClubTeams] - Found club teams:', clubTeams.length);
|
||||
|
||||
res.status(200).json(clubTeams);
|
||||
} catch (error) {
|
||||
@@ -26,7 +24,6 @@ export const getClubTeam = async (req, res) => {
|
||||
try {
|
||||
const { authcode: token } = req.headers;
|
||||
const { clubteamid: clubTeamId } = req.params;
|
||||
devLog('[getClubTeam] - Getting club team:', clubTeamId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const clubTeam = await ClubTeamService.getClubTeamById(clubTeamId);
|
||||
@@ -47,7 +44,6 @@ export const createClubTeam = async (req, res) => {
|
||||
const { clubid: clubId } = req.params;
|
||||
const { name, leagueId, seasonId } = req.body;
|
||||
|
||||
devLog('[createClubTeam] - Creating club team:', { name, clubId, leagueId, seasonId });
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
if (!name) {
|
||||
@@ -62,7 +58,6 @@ export const createClubTeam = async (req, res) => {
|
||||
};
|
||||
|
||||
const newClubTeam = await ClubTeamService.createClubTeam(clubTeamData);
|
||||
devLog('[createClubTeam] - Club team created with ID:', newClubTeam.id);
|
||||
|
||||
res.status(201).json(newClubTeam);
|
||||
} catch (error) {
|
||||
@@ -77,7 +72,6 @@ export const updateClubTeam = async (req, res) => {
|
||||
const { clubteamid: clubTeamId } = req.params;
|
||||
const { name, leagueId, seasonId } = req.body;
|
||||
|
||||
devLog('[updateClubTeam] - Updating club team:', clubTeamId, { name, leagueId, seasonId });
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const updateData = {};
|
||||
@@ -102,7 +96,6 @@ export const deleteClubTeam = async (req, res) => {
|
||||
try {
|
||||
const { authcode: token } = req.headers;
|
||||
const { clubteamid: clubTeamId } = req.params;
|
||||
devLog('[deleteClubTeam] - Deleting club team:', clubTeamId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const success = await ClubTeamService.deleteClubTeam(clubTeamId);
|
||||
@@ -123,11 +116,9 @@ export const getLeagues = async (req, res) => {
|
||||
const { clubid: clubId } = req.params;
|
||||
const { seasonid: seasonId } = req.query;
|
||||
|
||||
devLog('[getLeagues] - Getting leagues for club:', clubId, 'season:', seasonId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const leagues = await ClubTeamService.getLeaguesByClub(clubId, seasonId);
|
||||
devLog('[getLeagues] - Found leagues:', leagues.length);
|
||||
|
||||
res.status(200).json(leagues);
|
||||
} catch (error) {
|
||||
|
||||
@@ -4,11 +4,8 @@ import { devLog } from '../utils/logger.js';
|
||||
|
||||
export const getClubs = async (req, res) => {
|
||||
try {
|
||||
devLog('[getClubs] - get clubs');
|
||||
const clubs = await ClubService.getAllClubs();
|
||||
devLog('[getClubs] - prepare response');
|
||||
res.status(200).json(clubs);
|
||||
devLog('[getClubs] - done');
|
||||
} catch (error) {
|
||||
console.error('[getClubs] - error:', error);
|
||||
res.status(500).json({ error: "internalerror" });
|
||||
@@ -16,28 +13,20 @@ export const getClubs = async (req, res) => {
|
||||
};
|
||||
|
||||
export const addClub = async (req, res) => {
|
||||
devLog('[addClub] - Read out parameters');
|
||||
const { authcode: token } = req.headers;
|
||||
const { name: clubName } = req.body;
|
||||
|
||||
try {
|
||||
devLog('[addClub] - find club by name');
|
||||
const club = await ClubService.findClubByName(clubName);
|
||||
devLog('[addClub] - get user');
|
||||
const user = await getUserByToken(token);
|
||||
devLog('[addClub] - check if club already exists');
|
||||
if (club) {
|
||||
res.status(409).json({ error: "alreadyexists" });
|
||||
return;
|
||||
}
|
||||
|
||||
devLog('[addClub] - create club');
|
||||
const newClub = await ClubService.createClub(clubName);
|
||||
devLog('[addClub] - add user to new club');
|
||||
await ClubService.addUserToClub(user.id, newClub.id);
|
||||
devLog('[addClub] - prepare response');
|
||||
res.status(200).json(newClub);
|
||||
devLog('[addClub] - done');
|
||||
} catch (error) {
|
||||
console.error('[addClub] - error:', error);
|
||||
res.status(500).json({ error: "internalerror" });
|
||||
@@ -45,30 +34,22 @@ export const addClub = async (req, res) => {
|
||||
};
|
||||
|
||||
export const getClub = async (req, res) => {
|
||||
devLog('[getClub] - start');
|
||||
try {
|
||||
const { authcode: token } = req.headers;
|
||||
const { clubid: clubId } = req.params;
|
||||
devLog('[getClub] - get user');
|
||||
const user = await getUserByToken(token);
|
||||
devLog('[getClub] - get users club');
|
||||
const access = await ClubService.getUserClubAccess(user.id, clubId);
|
||||
devLog('[getClub] - check access');
|
||||
if (access.length === 0 || !access[0].approved) {
|
||||
res.status(403).json({ error: "noaccess", status: access.length === 0 ? "notrequested" : "requested" });
|
||||
return;
|
||||
}
|
||||
|
||||
devLog('[getClub] - get club');
|
||||
const club = await ClubService.findClubById(clubId);
|
||||
devLog('[getClub] - check club exists');
|
||||
if (!club) {
|
||||
return res.status(404).json({ message: 'Club not found' });
|
||||
}
|
||||
|
||||
devLog('[getClub] - set response');
|
||||
res.status(200).json(club);
|
||||
devLog('[getClub] - done');
|
||||
} catch (error) {
|
||||
console.error('[getClub] - error:', error);
|
||||
res.status(500).json({ message: 'Server error' });
|
||||
@@ -81,7 +62,6 @@ export const requestClubAccess = async (req, res) => {
|
||||
|
||||
try {
|
||||
const user = await getUserByToken(token);
|
||||
devLog('[requestClubAccess] - user:', user);
|
||||
|
||||
await ClubService.requestAccessToClub(user.id, clubId);
|
||||
res.status(200).json({});
|
||||
|
||||
@@ -17,7 +17,6 @@ export const createTag = async (req, res) => {
|
||||
const newTag = await DiaryTag.findOrCreate({ where: { name }, defaults: { name } });
|
||||
res.status(201).json(newTag);
|
||||
} catch (error) {
|
||||
devLog('[createTag] - Error:', error);
|
||||
res.status(500).json({ error: 'Error creating tag' });
|
||||
}
|
||||
};
|
||||
|
||||
@@ -10,24 +10,17 @@ const getClubMembers = async(req, res) => {
|
||||
}
|
||||
res.status(200).json(await MemberService.getClubMembers(userToken, clubId, showAll));
|
||||
} catch(error) {
|
||||
devLog('[getClubMembers] - Error: ', error);
|
||||
res.status(500).json({ error: 'systemerror' });
|
||||
}
|
||||
}
|
||||
|
||||
const getWaitingApprovals = async(req, res) => {
|
||||
try {
|
||||
devLog('[getWaitingApprovals] - Start');
|
||||
const { id: clubId } = req.params;
|
||||
devLog('[getWaitingApprovals] - get token');
|
||||
const { authcode: userToken } = req.headers;
|
||||
devLog('[getWaitingApprovals] - load for waiting approvals');
|
||||
const waitingApprovals = await MemberService.getApprovalRequests(userToken, clubId);
|
||||
devLog('[getWaitingApprovals] - set response');
|
||||
res.status(200).json(waitingApprovals);
|
||||
devLog('[getWaitingApprovals] - done');
|
||||
} catch(error) {
|
||||
devLog('[getWaitingApprovals] - Error: ', error);
|
||||
res.status(403).json({ error: error });
|
||||
}
|
||||
}
|
||||
@@ -60,7 +53,6 @@ const uploadMemberImage = async (req, res) => {
|
||||
};
|
||||
|
||||
const getMemberImage = async (req, res) => {
|
||||
devLog('[getMemberImage]');
|
||||
try {
|
||||
const { clubId, memberId } = req.params;
|
||||
const { authcode: userToken } = req.headers;
|
||||
@@ -77,7 +69,6 @@ const getMemberImage = async (req, res) => {
|
||||
};
|
||||
|
||||
const updateRatingsFromMyTischtennis = async (req, res) => {
|
||||
devLog('[updateRatingsFromMyTischtennis]');
|
||||
try {
|
||||
const { id: clubId } = req.params;
|
||||
const { authcode: userToken } = req.headers;
|
||||
|
||||
@@ -6,11 +6,9 @@ const getMemberNotes = async (req, res) => {
|
||||
const { authcode: userToken } = req.headers;
|
||||
const { memberId } = req.params;
|
||||
const { clubId } = req.query;
|
||||
devLog('[getMemberNotes]', userToken, memberId, clubId);
|
||||
const notes = await MemberNoteService.getNotesForMember(userToken, clubId, memberId);
|
||||
res.status(200).json(notes);
|
||||
} catch (error) {
|
||||
devLog('[getMemberNotes] - Error: ', error);
|
||||
res.status(500).json({ error: 'systemerror' });
|
||||
}
|
||||
};
|
||||
@@ -19,12 +17,10 @@ const addMemberNote = async (req, res) => {
|
||||
try {
|
||||
const { authcode: userToken } = req.headers;
|
||||
const { memberId, content, clubId } = req.body;
|
||||
devLog('[addMemberNote]', userToken, memberId, content, clubId);
|
||||
await MemberNoteService.addNoteToMember(userToken, clubId, memberId, content);
|
||||
const notes = await MemberNoteService.getNotesForMember(userToken, clubId, memberId);
|
||||
res.status(201).json(notes);
|
||||
} catch (error) {
|
||||
devLog('[addMemberNote] - Error: ', error);
|
||||
res.status(500).json({ error: 'systemerror' });
|
||||
}
|
||||
};
|
||||
@@ -34,13 +30,11 @@ const deleteMemberNote = async (req, res) => {
|
||||
const { authcode: userToken } = req.headers;
|
||||
const { noteId } = req.params;
|
||||
const { clubId } = req.body;
|
||||
devLog('[deleteMemberNote]', userToken, noteId, clubId);
|
||||
const memberId = await MemberNoteService.getMemberIdForNote(noteId); // Member ID ermitteln
|
||||
await MemberNoteService.deleteNoteForMember(userToken, clubId, noteId);
|
||||
const notes = await MemberNoteService.getNotesForMember(userToken, clubId, memberId);
|
||||
res.status(200).json(notes);
|
||||
} catch (error) {
|
||||
devLog('[deleteMemberNote] - Error: ', error);
|
||||
res.status(500).json({ error: 'systemerror' });
|
||||
}
|
||||
};
|
||||
|
||||
@@ -36,7 +36,6 @@ export const uploadPredefinedActivityImage = async (req, res) => {
|
||||
|
||||
// Extrahiere Zeichnungsdaten aus dem Request
|
||||
const drawingData = req.body.drawingData ? JSON.parse(req.body.drawingData) : null;
|
||||
devLog('[uploadPredefinedActivityImage] - drawingData:', drawingData);
|
||||
|
||||
const imageRecord = await PredefinedActivityImage.create({
|
||||
predefinedActivityId: id,
|
||||
|
||||
@@ -5,11 +5,9 @@ import { devLog } from '../utils/logger.js';
|
||||
export const getSeasons = async (req, res) => {
|
||||
try {
|
||||
const { authcode: token } = req.headers;
|
||||
devLog('[getSeasons] - Getting all seasons');
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const seasons = await SeasonService.getAllSeasons();
|
||||
devLog('[getSeasons] - Found seasons:', seasons.length);
|
||||
|
||||
res.status(200).json(seasons);
|
||||
} catch (error) {
|
||||
@@ -21,11 +19,9 @@ export const getSeasons = async (req, res) => {
|
||||
export const getCurrentSeason = async (req, res) => {
|
||||
try {
|
||||
const { authcode: token } = req.headers;
|
||||
devLog('[getCurrentSeason] - Getting current season');
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const season = await SeasonService.getOrCreateCurrentSeason();
|
||||
devLog('[getCurrentSeason] - Current season:', season.season);
|
||||
|
||||
res.status(200).json(season);
|
||||
} catch (error) {
|
||||
@@ -39,7 +35,6 @@ export const createSeason = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { season } = req.body;
|
||||
|
||||
devLog('[createSeason] - Creating season:', season);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
if (!season) {
|
||||
@@ -53,7 +48,6 @@ export const createSeason = async (req, res) => {
|
||||
}
|
||||
|
||||
const newSeason = await SeasonService.createSeason(season);
|
||||
devLog('[createSeason] - Season created with ID:', newSeason.id);
|
||||
|
||||
res.status(201).json(newSeason);
|
||||
} catch (error) {
|
||||
@@ -71,7 +65,6 @@ export const getSeason = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { seasonid: seasonId } = req.params;
|
||||
|
||||
devLog('[getSeason] - Getting season:', seasonId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const season = await SeasonService.getSeasonById(seasonId);
|
||||
@@ -91,7 +84,6 @@ export const deleteSeason = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { seasonid: seasonId } = req.params;
|
||||
|
||||
devLog('[deleteSeason] - Deleting season:', seasonId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const success = await SeasonService.deleteSeason(seasonId);
|
||||
|
||||
@@ -8,12 +8,10 @@ export const getTeams = async (req, res) => {
|
||||
const { clubid: clubId } = req.params;
|
||||
const { seasonid: seasonId } = req.query;
|
||||
|
||||
devLog('[getTeams] - Getting teams for club:', clubId, 'season:', seasonId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
// Check if user has access to this club
|
||||
const teams = await TeamService.getAllTeamsByClub(clubId, seasonId);
|
||||
devLog('[getTeams] - Found teams:', teams.length);
|
||||
|
||||
res.status(200).json(teams);
|
||||
} catch (error) {
|
||||
@@ -27,7 +25,6 @@ export const getTeam = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { teamid: teamId } = req.params;
|
||||
|
||||
devLog('[getTeam] - Getting team:', teamId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const team = await TeamService.getTeamById(teamId);
|
||||
@@ -48,7 +45,6 @@ export const createTeam = async (req, res) => {
|
||||
const { clubid: clubId } = req.params;
|
||||
const { name, leagueId, seasonId } = req.body;
|
||||
|
||||
devLog('[createTeam] - Creating team:', { name, clubId, leagueId, seasonId });
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
if (!name) {
|
||||
@@ -63,7 +59,6 @@ export const createTeam = async (req, res) => {
|
||||
};
|
||||
|
||||
const newTeam = await TeamService.createTeam(teamData);
|
||||
devLog('[createTeam] - Team created with ID:', newTeam.id);
|
||||
|
||||
res.status(201).json(newTeam);
|
||||
} catch (error) {
|
||||
@@ -78,7 +73,6 @@ export const updateTeam = async (req, res) => {
|
||||
const { teamid: teamId } = req.params;
|
||||
const { name, leagueId, seasonId } = req.body;
|
||||
|
||||
devLog('[updateTeam] - Updating team:', teamId, { name, leagueId, seasonId });
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const updateData = {};
|
||||
@@ -104,7 +98,6 @@ export const deleteTeam = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { teamid: teamId } = req.params;
|
||||
|
||||
devLog('[deleteTeam] - Deleting team:', teamId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const success = await TeamService.deleteTeam(teamId);
|
||||
@@ -125,11 +118,9 @@ export const getLeagues = async (req, res) => {
|
||||
const { clubid: clubId } = req.params;
|
||||
const { seasonid: seasonId } = req.query;
|
||||
|
||||
devLog('[getLeagues] - Getting leagues for club:', clubId, 'season:', seasonId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const leagues = await TeamService.getLeaguesByClub(clubId, seasonId);
|
||||
devLog('[getLeagues] - Found leagues:', leagues.length);
|
||||
|
||||
res.status(200).json(leagues);
|
||||
} catch (error) {
|
||||
|
||||
@@ -43,7 +43,6 @@ export const uploadDocument = async (req, res) => {
|
||||
const { clubteamid: clubTeamId } = req.params;
|
||||
const { documentType } = req.body;
|
||||
|
||||
devLog('[uploadDocument] - Uploading document for club team:', clubTeamId, 'type:', documentType);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
if (!req.file) {
|
||||
@@ -56,7 +55,6 @@ export const uploadDocument = async (req, res) => {
|
||||
|
||||
const document = await TeamDocumentService.uploadDocument(req.file, clubTeamId, documentType);
|
||||
|
||||
devLog('[uploadDocument] - Document uploaded successfully:', document.id);
|
||||
res.status(201).json(document);
|
||||
} catch (error) {
|
||||
console.error('[uploadDocument] - Error:', error);
|
||||
@@ -84,11 +82,9 @@ export const getDocuments = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { clubteamid: clubTeamId } = req.params;
|
||||
|
||||
devLog('[getDocuments] - Getting documents for club team:', clubTeamId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const documents = await TeamDocumentService.getDocumentsByClubTeam(clubTeamId);
|
||||
devLog('[getDocuments] - Found documents:', documents.length);
|
||||
|
||||
res.status(200).json(documents);
|
||||
} catch (error) {
|
||||
@@ -102,7 +98,6 @@ export const getDocument = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { documentid: documentId } = req.params;
|
||||
|
||||
devLog('[getDocument] - Getting document:', documentId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const document = await TeamDocumentService.getDocumentById(documentId);
|
||||
@@ -122,7 +117,6 @@ export const downloadDocument = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { documentid: documentId } = req.params;
|
||||
|
||||
devLog('[downloadDocument] - Downloading document:', documentId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const document = await TeamDocumentService.getDocumentById(documentId);
|
||||
@@ -158,7 +152,6 @@ export const deleteDocument = async (req, res) => {
|
||||
const { authcode: token } = req.headers;
|
||||
const { documentid: documentId } = req.params;
|
||||
|
||||
devLog('[deleteDocument] - Deleting document:', documentId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
const success = await TeamDocumentService.deleteDocument(documentId);
|
||||
@@ -179,7 +172,6 @@ export const parsePDF = async (req, res) => {
|
||||
const { documentid: documentId } = req.params;
|
||||
const { leagueid: leagueId } = req.query;
|
||||
|
||||
devLog('[parsePDF] - Parsing PDF document:', documentId, 'league:', leagueId);
|
||||
const user = await getUserByToken(token);
|
||||
|
||||
if (!leagueId) {
|
||||
@@ -203,19 +195,9 @@ export const parsePDF = async (req, res) => {
|
||||
// Speichere Matches in Datenbank
|
||||
const saveResult = await PDFParserService.saveMatchesToDatabase(parseResult.matches, parseInt(leagueId));
|
||||
|
||||
devLog('[parsePDF] - PDF parsed successfully:', {
|
||||
matchesFound: parseResult.matches.length,
|
||||
created: saveResult.created,
|
||||
updated: saveResult.updated,
|
||||
errors: saveResult.errors.length
|
||||
});
|
||||
|
||||
res.status(200).json({
|
||||
message: "PDF parsed successfully",
|
||||
parseResult: {
|
||||
matchesFound: parseResult.matches.length,
|
||||
errors: parseResult.errors,
|
||||
metadata: parseResult.metadata,
|
||||
debugInfo: parseResult.debugInfo,
|
||||
allLines: parseResult.allLines,
|
||||
rawText: parseResult.rawText
|
||||
|
||||
Reference in New Issue
Block a user