Exercise archivation fixed

This commit is contained in:
AG
2025-11-25 23:32:47 +02:00
parent e3efc84250
commit 701d217c89
4 changed files with 21 additions and 13 deletions

View File

@@ -6,6 +6,7 @@ const router = express.Router();
const prisma = new PrismaClient();
const JWT_SECRET = process.env.JWT_SECRET || 'secret';
// Middleware to check auth
// Middleware to check auth
const authenticate = (req: any, res: any, next: any) => {
const token = req.headers.authorization?.split(' ')[1];
@@ -31,10 +32,10 @@ router.get('/', async (req: any, res) => {
OR: [
{ userId: null }, // System default
{ userId } // User custom
],
isArchived: false
]
}
});
console.log('GET /exercises - Returning:', exercises.map(e => ({ id: e.id, name: e.name, isArchived: e.isArchived })));
res.json(exercises);
} catch (error) {
res.status(500).json({ error: 'Server error' });
@@ -45,7 +46,9 @@ router.get('/', async (req: any, res) => {
router.post('/', async (req: any, res) => {
try {
const userId = req.user.userId;
const { id, name, type, bodyWeightPercentage } = req.body;
const { id, name, type, bodyWeightPercentage, isArchived } = req.body;
console.log('POST /exercises - Received:', { id, name, type, bodyWeightPercentage, isArchived });
// If id exists and belongs to user, update. Else create.
// Note: We can't update system exercises directly. If user edits a system exercise,
@@ -56,10 +59,12 @@ router.post('/', async (req: any, res) => {
// Check if it exists and belongs to user
const existing = await prisma.exercise.findUnique({ where: { id } });
if (existing && existing.userId === userId) {
console.log('Updating existing exercise with:', { name, type, bodyWeightPercentage, isArchived });
const updated = await prisma.exercise.update({
where: { id },
data: { name, type, bodyWeightPercentage }
data: { name, type, bodyWeightPercentage, isArchived }
});
console.log('Updated exercise:', updated);
return res.json(updated);
}
}
@@ -70,7 +75,8 @@ router.post('/', async (req: any, res) => {
userId,
name,
type,
bodyWeightPercentage
bodyWeightPercentage,
isArchived: isArchived || false
}
});
res.json(newExercise);