torsten/trainingstagebuch
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Umfangreiche Änderungen für Trainingslogging

Browse Source
This commit is contained in:
Torsten Schulz
2024-09-09 22:51:37 +02:00
parent c65c629210
commit 28bf98a169
32 changed files with 1702 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/controllers/authController.js
View File

@@ -21,7 +21,6 @@ const activate = async (req, res, next) => {
};
const loginUser = async (req, res, next) => {
console.log('login');
try {
const { email, password } = req.body;
const result = await login(email, password);

75
backend/controllers/diaryController.js
View File

@@ -1,11 +1,9 @@
import DiaryService from '../services/diaryService.js';
import diaryService from '../services/diaryService.js';
import HttpError from '../exceptions/HttpError.js';
const diaryService = new DiaryService();
const getDatesForClub = async (req, res) => {
try {
const { clubId } = req.params;
const { clubId } = req.params;
const { authcode: userToken } = req.headers;
const dates = await diaryService.getDatesForClub(userToken, clubId);
res.status(200).json(dates);
@@ -34,7 +32,6 @@ const createDateForClub = async (req, res) => {
}
};
const updateTrainingTimes = async (req, res) => {
try {
const { clubId } = req.params;
@@ -51,4 +48,70 @@ const updateTrainingTimes = async (req, res) => {
}
};
export { getDatesForClub, createDateForClub, updateTrainingTimes };
const addDiaryNote = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { diaryDateId, content } = req.body;
const notes = await diaryService.addNoteToDate(userToken, diaryDateId, content);
res.status(201).json(notes);
} catch (error) {
console.error('[addDiaryNote] - Error:', error);
res.status(500).json({ error: 'systemerror' });
}
};
const deleteDiaryNote = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { noteId } = req.params;
const notes = await diaryService.deleteNoteFromDate(userToken, noteId);
res.status(200).json(notes);
} catch (error) {
console.error('[deleteDiaryNote] - Error:', error);
res.status(500).json({ error: 'systemerror' });
}
};
const addDiaryTag = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { diaryDateId, tagName } = req.body;
const tags = await diaryService.addTagToDate(userToken, diaryDateId, tagName);
res.status(201).json(tags);
} catch (error) {
console.error('[addDiaryTag] - Error:', error);
res.status(500).json({ error: 'systemerror' });
}
};
const addTagToDiaryDate = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubId } = req.params;
const { diaryDateId, tagId } = req.body;
if (!diaryDateId || !tagId) {
return res.status(400).json({ message: 'diaryDateId and tagId are required.' });
}
const result = await diaryService.addTagToDiaryDate(userToken, clubId, diaryDateId, tagId);
res.status(200).json(result);
} catch (error) {
console.error('[addTagToDiaryDate] - Error:', error);
res.status(500).json({ message: 'An error occurred while adding the tag to the diary date.' });
}
};
const deleteTagFromDiaryDate = async (req, res) => {
try {
const { tagId } = req.query;
const { authcode: userToken } = req.headers;
const { clubId } = req.params;
await diaryService.removeTagFromDiaryDate(userToken, clubId, tagId);
res.status(200).json({ message: 'Tag deleted' });
} catch (error) {
console.error('[deleteTag] - Error:', error);
res.status(500).json({ error: 'Error deleting tag' });
}
};
export { getDatesForClub, createDateForClub, updateTrainingTimes, addDiaryNote, deleteDiaryNote, addDiaryTag,
addTagToDiaryDate, deleteTagFromDiaryDate };

84
backend/controllers/diaryMemberController.js Normal file
View File

@@ -0,0 +1,84 @@
import DiaryMemberService from '../services/diaryMemberService.js';
const getMemberTags = async (req, res) => {
try {
const { diaryDateId, memberId } = req.query;
const { clubId } = req.params;
const { authcode: userToken } = req.headers;
const tags = await DiaryMemberService.getTagsForMemberAndDate(userToken, clubId, diaryDateId, memberId);
res.status(200).json(tags);
} catch (error) {
console.error('[getMemberTags] - Error: ', error);
res.status(500).json({ error: 'systemerror' });
}
};
const getMemberNotes = async (req, res) => {
try {
const { diaryDateId, memberId } = req.query;
const { clubId } = req.params;
const { authcode: userToken } = req.headers;
console.log('---------->', userToken, clubId);
const notes = await DiaryMemberService.getNotesForMember(userToken, clubId, diaryDateId, memberId);
res.status(200).json(notes);
} catch (error) {
console.error('[getMemberNotes] - Error: ', error);
res.status(500).json({ error: 'systemerror' });
}
};
const addMemberNote = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { memberId, diaryDateId, content } = req.body;
const { clubId } = req.params;
await DiaryMemberService.addNoteToMember(userToken, clubId, diaryDateId, memberId, content);
const notes = await DiaryMemberService.getNotesForMember(userToken, clubId, diaryDateId, memberId);
res.status(201).json(notes);
} catch (error) {
console.error('[addMemberNote] - Error: ', error);
res.status(500).json({ error: 'systemerror' });
}
};
const addMemberTag = async (req, res) => {
try {
const { diaryDateId, memberId, tagId } = req.body;
const { authcode: userToken } = req.headers;
const { clubId } = req.params;
await DiaryMemberService.addTagToMemberAndDate(userToken, clubId, diaryDateId, memberId, tagId);
const tags = await DiaryMemberService.getTagsForMemberAndDate(userToken, clubId, diaryDateId, memberId);
res.status(201).json(tags);
} catch (error) {
console.error('[addMemberTag] - Error: ', error);
res.status(500).json({ error: 'systemerror' });
}
};
const removeMemberNote = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { memberId, diaryDateId, content } = req.body;
await DiaryMemberService.removeNoteFromMember(userToken, req.params.clubId, diaryDateId, memberId, content);
const notes = await DiaryMemberService.getNotesForMember(userToken, req.params.clubId, diaryDateId, memberId);
res.status(200).json(notes);
} catch (error) {
console.error('[removeMemberNote] - Error: ', error.message);
res.status(400).json({ error: error.message });
}
};
const removeMemberTag = async (req, res) => {
try {
const { diaryDateId, memberId, tagId } = req.body;
const { authcode: userToken } = req.headers;
await DiaryMemberService.removeTagFromMemberAndDate(userToken, req.params.clubId, diaryDateId, memberId, tagId);
const tags = await DiaryMemberService.getTagsForMemberAndDate(userToken, req.params.clubId, diaryDateId, memberId);
res.status(200).json(tags);
} catch (error) {
console.error('[removeMemberTag] - Error: ', error.message);
res.status(400).json({ error: error.message });
}
};
export { getMemberTags, getMemberNotes, addMemberNote, addMemberTag, removeMemberNote, removeMemberTag };

44
backend/controllers/diaryNoteController.js Normal file
View File

@@ -0,0 +1,44 @@
import { DiaryNote, DiaryTag } from '../models/index.js';
import diaryService from '../services/diaryService.js';
export const getNotes = async (req, res) => {
try {
const { diaryDateId, memberId } = req.query;
if (!diaryDateId || !memberId) {
return res.status(400).json({ error: 'diaryDateId and memberId are required.' });
}
const notes = await diaryService.getDiaryNotesForDateAndMember(diaryDateId, memberId);
res.status(200).json(notes);
} catch (error) {
console.error('[getNotes] - Error:', error);
res.status(500).json({ error: 'An error occurred while fetching the notes.' });
}
};
export const createNote = async (req, res) => {
try {
const { memberId, content, tags } = req.body;
const newNote = await DiaryNote.create({ memberId, content });
if (tags && tags.length > 0) {
const tagInstances = await DiaryTag.findAll({ where: { id: tags } });
await newNote.addTags(tagInstances);
}
const noteWithTags = await DiaryNote.findByPk(newNote.id, {
include: [{ model: DiaryTag, as: 'tags' }],
});
res.status(201).json(noteWithTags);
} catch (error) {
res.status(500).json({ error: 'Error creating note' });
}
};
export const deleteNote = async (req, res) => {
try {
const { noteId } = req.params;
await DiaryNote.destroy({ where: { id: noteId } });
res.status(200).json({ message: 'Note deleted' });
} catch (error) {
res.status(500).json({ error: 'Error deleting note' });
}
};

33
backend/controllers/diaryTagController.js Normal file
View File

@@ -0,0 +1,33 @@
import { DiaryTag, DiaryDateTag } from '../models/index.js';
export const getTags = async (req, res) => {
try {
const tags = await DiaryTag.findAll();
res.status(200).json(tags);
} catch (error) {
res.status(500).json({ error: 'Error fetching tags' });
}
};
export const createTag = async (req, res) => {
try {
const { name } = req.body;
const newTag = await DiaryTag.create({ name });
res.status(201).json(newTag);
} catch (error) {
res.status(500).json({ error: 'Error creating tag' });
}
};
export const deleteTag = async (req, res) => {
try {
const { tagId } = req.params;
const { authcode: userToken } = req.headers;
const { clubId } = req.params;
await diaryService.removeTagFromDiaryDate(userToken, clubId, tagId);
res.status(200).json({ message: 'Tag deleted' });
} catch (error) {
console.error('[deleteTag] - Error:', error);
res.status(500).json({ error: 'Error deleting tag' });
}
};

47
backend/controllers/memberNoteController.js Normal file
View File

@@ -0,0 +1,47 @@
import MemberNoteService from "../services/memberNoteService.js";
const getMemberNotes = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { memberId } = req.params;
const { clubId } = req.query;
console.log('[getMemberNotes]', userToken, memberId, clubId);
const notes = await MemberNoteService.getNotesForMember(userToken, clubId, memberId);
res.status(200).json(notes);
} catch (error) {
console.log('[getMemberNotes] - Error: ', error);
res.status(500).json({ error: 'systemerror' });
}
};
const addMemberNote = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { memberId, content, clubId } = req.body;
console.log('[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) {
console.log('[addMemberNote] - Error: ', error);
res.status(500).json({ error: 'systemerror' });
}
};
const deleteMemberNote = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { noteId } = req.params;
const { clubId } = req.body;
console.log('[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) {
console.log('[deleteMemberNote] - Error: ', error);
res.status(500).json({ error: 'systemerror' });
}
};
export { getMemberNotes, addMemberNote, deleteMemberNote };