diff --git a/server/src/v1/project.ts b/server/src/v1/project.ts index a9436ad27aff1602ec6aeb1fb4fdb7dce2174b1b..e592264cd8cdca0cefa3a8ecccc6a59757e5300e 100644 --- a/server/src/v1/project.ts +++ b/server/src/v1/project.ts @@ -61,7 +61,8 @@ project.get('/:uuid', async (req, res) => { 'team_members.user_id': req.body.token.id, 'projects.id': id, }) - .groupBy('tms.team_id'); + .groupBy('tms.team_id') + .groupBy('projects.id'); if (projects.length >= 1) { res.status(200).json({ status: 'success', @@ -248,11 +249,12 @@ project.get('/:uuid/activity', async (req, res) => { .andWhere('workhours.started', '>=', since.getTime()) .andWhere('workhours.started', '<=', to.getTime()) .groupBy('workhours.id') + .as('activity') ) .select({ - day: database.raw('(workhours.started / 1000 / 60 / 60 / 24)'), + day: database.raw('(activity.started / 1000 / 60 / 60 / 24)'), }) - .sum({ time: database.raw('(workhours.finished - workhours.started)') }) + .sum({ time: database.raw('(activity.finished - activity.started)') }) .groupBy('day'); res.status(200).json({ status: 'success', @@ -268,6 +270,7 @@ project.get('/:uuid/activity', async (req, res) => { }); } } catch (e) { + console.log(e); res.status(400).json({ status: 'error', message: 'failed get activity',