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

Added groups to diary

Browse Source
This commit is contained in:
Torsten Schulz
2024-10-21 18:21:43 +02:00
parent 47fa81e190
commit f230b73273
17 changed files with 589 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backend/controllers/diaryDateActivityController.js
View File

@@ -4,13 +4,14 @@ export const createDiaryDateActivity = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubId } = req.params;
const { diaryDateId, activity, duration, durationText, orderId } = req.body;
const { diaryDateId, activity, duration, durationText, orderId, isTimeblock } = req.body;
const activityItem = await diaryDateActivityService.createActivity(userToken, clubId, {
diaryDateId,
activity,
duration,
durationText,
orderId,
isTimeblock,
});
res.status(201).json(activityItem);
} catch (error) {
@@ -23,13 +24,14 @@ export const updateDiaryDateActivity = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubId, id } = req.params;
const { predefinedActivityId, customActivityName, duration, durationText, orderId } = req.body;
const { predefinedActivityId, customActivityName, duration, durationText, orderId, groupId } = req.body; // Add groupId
const updatedActivity = await diaryDateActivityService.updateActivity(userToken, clubId, id, {
predefinedActivityId,
customActivityName,
duration,
durationText,
orderId,
groupId, // Pass groupId to the service
});
res.status(200).json(updatedActivity);
} catch (error) {
@@ -68,6 +70,19 @@ export const getDiaryDateActivities = async (req, res) => {
const activities = await diaryDateActivityService.getActivities(userToken, clubId, diaryDateId);
res.status(200).json(activities);
} catch (error) {
console.log(error);
res.status(500).json({ error: 'Error getting activities' });
}
}
export const addGroupActivity = async(req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubId, diaryDateId, groupId, activity } = req.body;
const activityItem = await diaryDateActivityService.addGroupActivity(userToken, clubId, diaryDateId, groupId, activity);
res.status(201).json(activityItem);
} catch (error) {
console.log(error);
res.status(500).json({ error: 'Error adding group activity' });
}
}

29
backend/controllers/groupController.js Normal file
View File

@@ -0,0 +1,29 @@
import HttpError from '../exceptions/HttpError.js';
import groupService from '../services/groupService.js';
const addGroup = async(req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubid: clubId, dateid: dateId, name, lead } = req.body;
const result = await groupService.addGroup(userToken, clubId, dateId, name, lead);
res.status(201).json(result);
} catch (error) {
console.error('[addGroup] - Error:', error);
console.log(req.params, req.headers, req.body)
res.status(error.statusCode || 500).json({ error: error.message });
}
}
const getGroups = async(req, res) => {
try {
const { clubId, dateId } = req.params;
const { authcode: userToken } = req.headers;
const result = await groupService.getGroups(userToken, clubId, dateId);
res.status(200).json(result);
} catch (error) {
console.error('[getGroups] - Error:', error);
res.status(error.statusCode || 500).json({ error: error.message });
}
}
export { addGroup, getGroups };

13
backend/models/DiaryDateActivity.js
View File

@@ -11,13 +11,18 @@ const DiaryDateActivity = sequelize.define('DiaryDateActivity', {
},
diaryDateId: {
type: DataTypes.INTEGER,
allowNull: false,
allowNull: true,
references: {
model: DiaryDate,
key: 'id',
},
onDelete: 'CASCADE',
},
isTimeblock: {
type: DataTypes.BOOLEAN,
allowNull: false,
defaultValue: false,
},
predefinedActivityId: {
type: DataTypes.INTEGER,
allowNull: true,
@@ -27,11 +32,7 @@ const DiaryDateActivity = sequelize.define('DiaryDateActivity', {
},
onDelete: 'SET NULL',
},
customActivityName: {
type: DataTypes.STRING,
allowNull: true,
},
duration: {
duration: {
type: DataTypes.INTEGER,
allowNull: true,
},

8
backend/models/Group.js
View File

@@ -3,7 +3,13 @@ import sequelize from '../database.js';
import DiaryDate from './DiaryDates.js';
const Group = sequelize.define('Group', {
diaryDate: {
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
allowNull: false,
},
diaryDateId: {
type: DataTypes.INTEGER,
allowNull: false,
references: {

40
backend/models/GroupActivity.js Normal file
View File

@@ -0,0 +1,40 @@
import { DataTypes } from 'sequelize';
import sequelize from '../database.js';
import DiaryDateActivity from './DiaryDateActivity.js';
import Group from './Group.js';
const GroupActivity = sequelize.define('GroupActivity', {
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
},
diaryDateActivity: {
type: DataTypes.INTEGER,
allowNull: false,
references: {
model: DiaryDateActivity,
key: 'id'
},
onDelete: 'CASCADE'
},
groupId: {
type: DataTypes.INTEGER,
allowNull: false,
references: {
model: Group,
key: 'id',
},
onDelete: 'CASCADE'
},
customActivity: {
type: DataTypes.INTEGER,
allowNull: true,
},
}, {
tableName: 'group_activity',
underscored: true,
timestamps: true,
});
export default GroupActivity;

15
backend/models/index.js
View File

@@ -19,6 +19,8 @@ import League from './League.js';
import Team from './Team.js';
import Season from './Season.js';
import Location from './Location.js';
import Group from './Group.js';
import GroupActivity from './GroupActivity.js';
User.hasMany(Log, { foreignKey: 'userId' });
Log.belongsTo(User, { foreignKey: 'userId' });
@@ -94,6 +96,17 @@ User.hasMany(UserClub, { foreignKey: 'userId' });
UserClub.belongsTo(Club, { foreignKey: 'clubId', as: 'club' });
Club.hasMany(UserClub, { foreignKey: 'clubId' });
Group.belongsTo(DiaryDate, { foreignKey: 'diaryDateId', as: 'diaryDateGroup' });
DiaryDate.hasMany(Group, { foreignKey: 'diaryDateId', as: 'groupsDiaryDate' });
GroupActivity.belongsTo(DiaryDateActivity, { foreignKey: 'id', as: 'activityGroupActivity' });
DiaryDateActivity.hasMany(GroupActivity, { foreignKey: 'diaryDateActivity', as: 'groupActivities' });
Group.hasOne(GroupActivity, { foreignKey: 'groupId', as: 'groupGroupActivity' });
GroupActivity.belongsTo(Group, { foreignKey: 'groupId', as: 'groupsGroupActivity' });
GroupActivity.belongsTo(PredefinedActivity, { foreignKey: 'customActivity', as: 'groupPredefinedActivity' });
PredefinedActivity.hasMany(GroupActivity, { foreignKey: 'predefinedActivityId', as: 'groupPredefinedActivities' });
export {
User,
@@ -116,4 +129,6 @@ export {
Match,
League,
Team,
Group,
GroupActivity,
};

2
backend/routes/diaryDateActivityRoutes.js
View File

@@ -5,11 +5,13 @@ import {
deleteDiaryDateActivity,
updateDiaryDateActivityOrder,
getDiaryDateActivities,
addGroupActivity,
} from '../controllers/diaryDateActivityController.js';
import { authenticate } from '../middleware/authMiddleware.js';
const router = express.Router();
router.post('/group', authenticate, addGroupActivity);
router.post('/:clubId/', authenticate, createDiaryDateActivity);
router.put('/:clubId/:id/order', authenticate, updateDiaryDateActivityOrder);
router.put('/:clubId/:id', authenticate, updateDiaryDateActivity);

10
backend/routes/groupRoutes.js Normal file
View File

@@ -0,0 +1,10 @@
import express from 'express';
import { authenticate } from '../middleware/authMiddleware.js';
import { addGroup, getGroups } from '../controllers/groupController.js';
const router = express.Router();
router.post('/', authenticate, addGroup);
router.get('/:clubId/:dateId', authenticate, getGroups);
export default router;

9
backend/server.js
View File

@@ -5,7 +5,8 @@ import sequelize from './database.js';
import {
User, Log, Club, UserClub, Member, DiaryDate, Participant, Activity, MemberNote,
DiaryNote, DiaryTag, MemberDiaryTag, DiaryDateTag, DiaryMemberNote, DiaryMemberTag,
PredefinedActivity, DiaryDateActivity, Match, League, Team // Import der neuen Modelle
PredefinedActivity, DiaryDateActivity, Match, League, Team, Group,
GroupActivity
} from './models/index.js';
import authRoutes from './routes/authRoutes.js';
import clubRoutes from './routes/clubRoutes.js';
@@ -22,6 +23,7 @@ import diaryDateActivityRoutes from './routes/diaryDateActivityRoutes.js';
import matchRoutes from './routes/matchRoutes.js';
import Season from './models/Season.js';
import Location from './models/Location.js';
import groupRoutes from './routes/groupRoutes.js';
const app = express();
const port = process.env.PORT || 3000;
@@ -44,6 +46,7 @@ app.use('/api/diarymember', diaryMemberRoutes);
app.use('/api/predefined-activities', predefinedActivityRoutes);
app.use('/api/diary-date-activities', diaryDateActivityRoutes);
app.use('/api/matches', matchRoutes);
app.use('/api/group', groupRoutes);
app.use(express.static(path.join(__dirname, '../frontend/dist')));
@@ -76,7 +79,9 @@ app.get('*', (req, res) => {
await League.sync({ alter: true });
await Team.sync({ alter: true });
await Location.sync({ alter: true });
await Match.sync({ alter: true }); // Match zuletzt, um sicherzustellen, dass alle Referenzen existieren
await Match.sync({ alter: true });
await Group.sync({ alter: true });
await GroupActivity.sync({ alter: true });
app.listen(port, () => {
console.log(`Server is running on http://localhost:${port}`);

72
backend/services/diaryDateActivityService.js
View File

@@ -1,4 +1,6 @@
import DiaryDateActivity from '../models/DiaryDateActivity.js';
import GroupActivity from '../models/GroupActivity.js';
import Group from '../models/Group.js';
import PredefinedActivity from '../models/PredefinedActivity.js';
import { checkAccess } from '../utils/userUtils.js';
import { Op } from 'sequelize';
@@ -9,6 +11,7 @@ class DiaryDateActivityService {
console.log('[DiaryDateActivityService::createActivity] - check user access');
await checkAccess(userToken, clubId);
console.log('[DiaryDateActivityService::createActivity] - add: ', data);
const { activity, ...restData } = data;
let predefinedActivity = await PredefinedActivity.findOne({ where: { name: data.activity } });
if (!predefinedActivity) {
predefinedActivity = await PredefinedActivity.create({
@@ -17,21 +20,20 @@ class DiaryDateActivityService {
duration: data.duration
});
}
restData.predefinedActivityId = predefinedActivity.id;
const maxOrderId = await DiaryDateActivity.max('orderId', {
where: { diaryDateId: data.diaryDateId }
});
const newOrderId = maxOrderId !== null ? maxOrderId + 1 : 1;
const { activity, ...restData } = data;
restData.predefinedActivityId = predefinedActivity.id;
restData.orderId = newOrderId;
console.log('[DiaryDateActivityService::createActivity] - create diary date activity');
return await DiaryDateActivity.create(restData);
}
async updateActivity(userToken, clubId, id, data) {
console.log('[DiaryDateActivityService::upateActivity] - check user access');
console.log('[DiaryDateActivityService::updateActivity] - check user access');
await checkAccess(userToken, clubId);
console.log('[DiaryDateActivityService::updateActivity] - load activit', id);
console.log('[DiaryDateActivityService::updateActivity] - load activity', id);
const activity = await DiaryDateActivity.findByPk(id);
if (!activity) {
console.log('[DiaryDateActivityService::updateActivity] - activity not found');
@@ -53,11 +55,9 @@ class DiaryDateActivityService {
async updateActivityOrder(userToken, clubId, id, newOrderId) {
console.log(`[DiaryDateActivityService::updateActivityOrder] - Start update for activity id: ${id}`);
console.log(`[DiaryDateActivityService::updateActivityOrder] - User token: ${userToken}, Club id: ${clubId}, New order id: ${newOrderId}`);
console.log('[DiaryDateActivityService::updateActivityOrder] - Checking user access');
await checkAccess(userToken, clubId);
console.log('[DiaryDateActivityService::updateActivityOrder] - User access confirmed');
console.log(`[DiaryDateActivityService::updateActivityOrder] - Finding activity with id: ${id}`);
const activity = await DiaryDateActivity.findByPk(id);
if (!activity) {
@@ -65,10 +65,8 @@ class DiaryDateActivityService {
throw new Error('Activity not found');
}
console.log('[DiaryDateActivityService::updateActivityOrder] - Activity found:', activity);
const currentOrderId = activity.orderId;
console.log(`[DiaryDateActivityService::updateActivityOrder] - Current order id: ${currentOrderId}`);
if (newOrderId < currentOrderId) {
console.log(`[DiaryDateActivityService::updateActivityOrder] - Shifting items down. Moving activities with orderId between ${newOrderId} and ${currentOrderId - 1}`);
await DiaryDateActivity.increment(
@@ -96,14 +94,11 @@ class DiaryDateActivityService {
} else {
console.log('[DiaryDateActivityService::updateActivityOrder] - New order id is the same as the current order id. No shift required.');
}
console.log(`[DiaryDateActivityService::updateActivityOrder] - Setting new order id for activity id: ${id}`);
activity.orderId = newOrderId;
console.log('[DiaryDateActivityService::updateActivityOrder] - Saving activity with new order id');
const savedActivity = await activity.save();
console.log('[DiaryDateActivityService::updateActivityOrder] - Activity saved:', savedActivity);
console.log(`[DiaryDateActivityService::updateActivityOrder] - Finished update for activity id: ${id}`);
return savedActivity;
}
@@ -118,13 +113,66 @@ class DiaryDateActivityService {
include: [
{
model: PredefinedActivity,
as: 'predefinedActivity',
as: 'predefinedActivity',
},
{
model: GroupActivity,
as: 'groupActivities',
include: [
{
model: Group,
as: 'groupsGroupActivity'
},
{
model: PredefinedActivity,
as: 'groupPredefinedActivity',
},
],
}
]
});
console.log(`[DiaryDateActivityService::getActivities] - found ${activities.length} activities`);
return activities;
}
async addGroupActivity(userToken, clubId, diaryDateId, groupId, activity) {
console.log('[DiaryDateActivityService::addGroupActivity] Check user access');
await checkAccess(userToken, clubId);
console.log('[DiaryDateActivityService::addGroupActivity] Check diary date');
const diaryDateActivity = await DiaryDateActivity.findOne({
where: {
diaryDateId,
isTimeblock: true,
},
order: [['order_id', 'ASC']],
limit: 1
});
if (!diaryDateActivity) {
console.error('[DiaryDateActivityService::addGroupActivity] Activity not found');
throw new Error('Activity not found');
}
console.log('[DiaryDateActivityService::addGroupActivity] Check group');
const group = await Group.findByPk(groupId);
if (!group || group.diaryDateId !== diaryDateActivity.diaryDateId) {
console.error('[DiaryDateActivityService::addGroupActivity] Group and date don\'t fit');
throw new Error('Group isn\'t related to date');
}
console.log('[DiaryDateActivityService::addGroupActivity] Get predefined activity');
const [predefinedActivity, created] = await PredefinedActivity.findOrCreate({
where: {
name: activity
}
});
console.log('[DiaryDateActivityService::addGroupActivity] Add group activity');
console.log(predefinedActivity);
const activityData = {
diaryDateActivity: diaryDateActivity.id,
groupId: groupId,
customActivity: predefinedActivity.id
}
console.log(activityData);
return await GroupActivity.create(activityData);
}
}
export default new DiaryDateActivityService();

43
backend/services/groupService.js Normal file
View File

@@ -0,0 +1,43 @@
import { checkAccess } from '../utils/userUtils.js';
import DiaryDate from '../models/DiaryDates.js';
import HttpError from '../exceptions/HttpError.js';
import Group from '../models/Group.js';
class GroupService {
async checkDiaryDateToClub(clubId, dateId) {
const diaryDate = await DiaryDate.findOne({
where: {
id: dateId,
clubId: clubId
}
});
if (!diaryDate) {
throw new HttpError('Datum nicht gefunden oder passt nicht zum Verein', 404);
}
}
async addGroup(userToken, clubId, dateId, name, lead) {
await checkAccess(userToken, clubId);
await this.checkDiaryDateToClub(clubId, dateId);
const group = await Group.create({
diaryDateId: dateId,
name,
lead
});
return group;
}
async getGroups(userToken, clubId, dateId) {
await checkAccess(userToken, clubId);
await this.checkDiaryDateToClub(clubId, dateId);
const groups = await Group.findAll({
where: {
diaryDateId: dateId
}
});
return groups;
}
}
export default new GroupService();

2
backend/services/matchService.js
View File

@@ -120,7 +120,7 @@ class MatchService {
const leagues = await League.findAll({
include: [{
model: Match,
as: 'leagueMatches', // Verwendung des Alias 'leagueMatches'
as: 'leagueMatches',
where: {
seasonId: season.id,
clubId: clubId