Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-18 20:59:44 +02:00
Code Issues Releases Activity

Fix api transformers, intercept by error message instead of undefined

Browse source
This commit is contained in:
Maksim Eltyshev 2019-10-25 21:38:14 +05:00
parent 8e0e819309
commit 4a6553d241
3 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/src/api/cards.js
View file

@ -4,11 +4,17 @@ import socket from './socket';
export const transformCard = (card) => ({ export const transformCard = (card) => ({
...card, ...card,
dueDate: card.dueDate && new Date(card.dueDate), ...(card.dueDate && {
timer: card.timer && { dueDate: new Date(card.dueDate),
...card.timer, }),
startedAt: card.timer.startedAt && new Date(card.timer.startedAt), ...(card.timer && {
}, timer: {
...card.timer,
...(card.timer.startedAt && {
startedAt: new Date(card.timer.startedAt),
}),
},
}),
}); });
export const transformCardData = (data) => ({ export const transformCardData = (data) => ({
@ -17,10 +23,12 @@ export const transformCardData = (data) => ({
dueDate: data.dueDate.toISOString(), dueDate: data.dueDate.toISOString(),
}), }),
...(data.timer && { ...(data.timer && {
...data.timer, timer: {
...(data.timer.startedAt && { ...data.timer,
startedAt: data.timer.startedAt.toISOString(), ...(data.timer.startedAt && {
}), startedAt: data.timer.startedAt.toISOString(),
}),
},
}), }),
}); });

4
server/api/helpers/create-user.js
View file

@ -25,7 +25,9 @@ module.exports = {
email: inputs.values.email.toLowerCase(), email: inputs.values.email.toLowerCase(),
password: bcrypt.hashSync(inputs.values.password, 10) password: bcrypt.hashSync(inputs.values.password, 10)
}) })
.intercept(undefined, 'conflict') .intercept({
message: 'Unexpected error from database adapter: conflicting key value violates exclusion constraint "user_email_unique"'
}, 'conflict')
.fetch(); .fetch();
const userIds = await sails.helpers.getAdminUserIds(); const userIds = await sails.helpers.getAdminUserIds();

4
server/api/helpers/update-user.js
View file

@ -45,7 +45,9 @@ module.exports = {
deletedAt: null deletedAt: null
}) })
.set(inputs.values) .set(inputs.values)
.intercept(undefined, 'conflict'); .intercept({
message: 'Unexpected error from database adapter: conflicting key value violates exclusion constraint "user_email_unique"'
}, 'conflict');
if (user) { if (user) {
if (inputs.record.avatar && user.avatar !== inputs.record.avatar) { if (inputs.record.avatar && user.avatar !== inputs.record.avatar) {