diff --git a/backend/controllers/accidentController.js b/backend/controllers/accidentController.js new file mode 100644 index 0000000..22a90d1 --- /dev/null +++ b/backend/controllers/accidentController.js @@ -0,0 +1,23 @@ +import AccidentService from '../services/accidentService.js'; + +export const addAccident = async (req, res) => { + try { + const { authcode: userToken } = req.headers; + const { clubId, memberId, diaryDateId, accident } = req.body; + await AccidentService.createAccident(userToken, clubId, memberId, diaryDateId, accident); + res.status(201).json({ message: 'Accident added successfully' }); + } catch (error) { + res.status(500).json({ message: 'Error adding accident', error: error.message }); + } +}; + +export const getAccidents = async (req, res) => { + try { + const { authcode: userToken } = req.headers; + const { clubId, dateId } = req.params; + const accidents = await AccidentService.getAccidents(userToken, clubId, dateId); + res.status(200).json(accidents); + } catch (error) { + res.status(500).json({ message: 'Error getting activities', error: error.message }); + } +} \ No newline at end of file diff --git a/backend/models/Accident.js b/backend/models/Accident.js new file mode 100644 index 0000000..b007b1f --- /dev/null +++ b/backend/models/Accident.js @@ -0,0 +1,43 @@ +import { DataTypes } from 'sequelize'; +import sequelize from '../database.js'; +import bcrypt from 'bcrypt'; +import { encryptData, decryptData } from '../utils/encrypt.js'; + +const Accident = sequelize.define('Accident', { + memberId: { + type: DataTypes.INTEGER, + allowNull: false, + }, + diaryDateId: { + type: DataTypes.INTEGER, + allowNull: false, + }, + accident: { + type: DataTypes.STRING, + allowNull: false, + set(value) { + const encryptedValue = encryptData(value); + this.setDataValue('accident', encryptedValue); + }, + get() { + const encryptedValue = this.getDataValue('accident'); + return decryptData(encryptedValue); + } + }, + salt: { + type: DataTypes.STRING, + allowNull: true, + }, +}, { + tableName: 'accident', + underscored: true, + timestamps: true, + hooks: { + beforeCreate: async (user) => { + const salt = await bcrypt.genSalt(10); + user.salt = salt; + }, + } +}); + +export default Accident; diff --git a/backend/models/Member.js b/backend/models/Member.js index c1417e9..f61ebdf 100644 --- a/backend/models/Member.js +++ b/backend/models/Member.js @@ -4,7 +4,7 @@ import sequelize from '../database.js'; import Club from './Club.js'; import { encryptData, decryptData } from '../utils/encrypt.js'; -const Member = sequelize.define('User', { +const Member = sequelize.define('Member', { id: { type: DataTypes.INTEGER, primaryKey: true, diff --git a/backend/models/index.js b/backend/models/index.js index d7533a1..086af88 100644 --- a/backend/models/index.js +++ b/backend/models/index.js @@ -26,6 +26,7 @@ import TournamentGroup from './TournamentGroup.js'; import TournamentMember from './TournamentMember.js'; import TournamentMatch from './TournamentMatch.js'; import TournamentResult from './TournamentResult.js'; +import Accident from './Accident.js'; User.hasMany(Log, { foreignKey: 'userId' }); Log.belongsTo(User, { foreignKey: 'userId' }); @@ -156,6 +157,12 @@ TournamentMatch.belongsTo(TournamentMember, { foreignKey: 'player2Id', as: 'play TournamentMember.hasMany(TournamentMatch, { foreignKey: 'player1Id', as: 'player1Matches' }); TournamentMember.hasMany(TournamentMatch, { foreignKey: 'player2Id', as: 'player2Matches' }); +Accident.belongsTo(Member, { foreignKey: 'memberId', as: 'members' }); +Member.hasMany(Accident, { foreignKey: 'memberId', as: 'accidents' }); + +Accident.belongsTo(DiaryDate, { foreignKey: 'diaryDateId', as: 'diaryDates' }); +DiaryDate.hasMany(Accident, { foreignKey: 'diaryDateId', as: 'accidents' }); + export { User, Log, @@ -184,4 +191,5 @@ export { TournamentMember, TournamentMatch, TournamentResult, + Accident, }; diff --git a/backend/routes/accidentRoutes.js b/backend/routes/accidentRoutes.js new file mode 100644 index 0000000..1f7981d --- /dev/null +++ b/backend/routes/accidentRoutes.js @@ -0,0 +1,10 @@ +import express from 'express'; +import { addAccident, getAccidents } from '../controllers/accidentController.js'; +import { authenticate } from '../middleware/authMiddleware.js'; + +const router = express.Router(); + +router.post('/', authenticate, addAccident); +router.get('/:clubId/:dateId', authenticate, getAccidents); + +export default router; diff --git a/backend/server.js b/backend/server.js index 4fd1bb3..64a5e51 100644 --- a/backend/server.js +++ b/backend/server.js @@ -7,12 +7,8 @@ import { User, Log, Club, UserClub, Member, DiaryDate, Participant, Activity, MemberNote, DiaryNote, DiaryTag, MemberDiaryTag, DiaryDateTag, DiaryMemberNote, DiaryMemberTag, PredefinedActivity, DiaryDateActivity, Match, League, Team, Group, - GroupActivity, - Tournament, - TournamentGroup, - TournamentMatch, - TournamentResult, - TournamentMember + GroupActivity, Tournament, TournamentGroup, TournamentMatch, TournamentResult, + TournamentMember, Accident } from './models/index.js'; import authRoutes from './routes/authRoutes.js'; import clubRoutes from './routes/clubRoutes.js'; @@ -33,6 +29,7 @@ import groupRoutes from './routes/groupRoutes.js'; import diaryDateTagRoutes from './routes/diaryDateTagRoutes.js'; import sessionRoutes from './routes/sessionRoutes.js'; import tournamentRoutes from './routes/tournamentRoutes.js'; +import accidentRoutes from './routes/accidentRoutes.js'; const app = express(); const port = process.env.PORT || 3000; @@ -60,6 +57,7 @@ app.use('/api/group', groupRoutes); app.use('/api/diarydatetags', diaryDateTagRoutes); app.use('/api/session', sessionRoutes); app.use('/api/tournament', tournamentRoutes); +app.use('/api/accident', accidentRoutes); app.use(express.static(path.join(__dirname, '../frontend/dist'))); @@ -100,6 +98,7 @@ app.get('*', (req, res) => { await TournamentMember.sync({ alter: true }); await TournamentMatch.sync({ alter: true }); await TournamentResult.sync({ alter: true }); + await Accident.sync({ alter: true }); app.listen(port, () => { console.log(`Server is running on http://localhost:${port}`); diff --git a/backend/services/accidentService.js b/backend/services/accidentService.js new file mode 100644 index 0000000..3be7273 --- /dev/null +++ b/backend/services/accidentService.js @@ -0,0 +1,62 @@ +import Accident from '../models/Accident.js'; +import DiaryDate from '../models/DiaryDates.js'; +import Member from '../models/Member.js'; +import { checkAccess, getUserByToken} from '../utils/userUtils.js'; + +class AccidentService { + async createAccident(userToken, clubId, memberId, diaryDateId, accident) { + await checkAccess(userToken, clubId); + const user = await getUserByToken(userToken); + if (!user) { + console.log('---------------'); + throw new Error('User not found'); + } + const member = await Member.findByPk(memberId); + if (!member || member.clubId != clubId) { + throw new Error('Member not found'); + } + console.log(diaryDateId); + const diaryDate = await DiaryDate.findByPk(diaryDateId); + if (!diaryDate || diaryDate.clubId != clubId) { + throw new Error('Diary date not found'); + } + const newAccident = await Accident.create({ + memberId, + diaryDateId: diaryDate.id, + accident, + }); + + return newAccident; + } + + async getAccidents(userToken, clubId, diaryDateId) { + await checkAccess(userToken, clubId); + const user = await getUserByToken(userToken); + if (!user) { + throw new Error('User not found'); + } + const diaryDate = await DiaryDate.findByPk(diaryDateId); + if (!diaryDate || diaryDate.clubId != clubId) { + throw new Error('Diary date not found'); + } + const accidents = await Accident.findAll({ + where: { + diaryDateId, + }, + include: [{ + model: Member, + as: 'members' + }] + }); + const cleanupedAccidents = accidents.map(accident => { + return { + accident: accident.accident, + firstName: accident.members.firstName, + lastName: accident.members.lastName, + } + }) + return cleanupedAccidents; + } +} + +export default new AccidentService(); diff --git a/backend/utils/userUtils.js b/backend/utils/userUtils.js index c90652d..a897b64 100644 --- a/backend/utils/userUtils.js +++ b/backend/utils/userUtils.js @@ -1,6 +1,7 @@ import User from '../models/User.js' import UserClub from '../models/UserClub.js'; import HttpError from '../exceptions/HttpError.js'; +import { config } from 'dotenv'; export const getUserByToken = async(token) => { try { @@ -32,6 +33,7 @@ export const hasUserClubAccess = async(userId, clubId) => { console.log(error); throw new HttpError('notfound', 500); } + console.log('---- no user found'); } export const checkAccess = async(userToken, clubId) => { diff --git a/frontend/src/views/DiaryView.vue b/frontend/src/views/DiaryView.vue index 89103db..f8568f0 100644 --- a/frontend/src/views/DiaryView.vue +++ b/frontend/src/views/DiaryView.vue @@ -158,6 +158,11 @@
+
+ +
+
+

Aktivitäten

@@ -176,9 +181,9 @@ :checked="isParticipant(member.id)"> {{ - member.firstName + member ? member.firstName : '' }} {{ - member.lastName }} + member ? member.lastName : '' }} 📝 🖼 ℹ️ @@ -241,7 +246,27 @@
- +
+
+
+ + +
+
+ + +
+ + + +
+