From 0328657bd78461c1970afbb6cc14d76e48028067 Mon Sep 17 00:00:00 2001
From: Roland Bernard <rolbernard@unibz.it>
Date: Mon, 24 May 2021 22:13:16 +0200
Subject: [PATCH] Fixed some api paths for postgresql
---
server/src/v1/project.ts | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/src/v1/project.ts b/server/src/v1/project.ts
index a9436ad..e592264 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',
--
GitLab