Skip to content

Commit 3642111

Browse files
[OGE-3027] Improve error messages, fix err.errors not iterable (#529)
* [OGE-3027] Improve error messages, fix err.errors not iterable * [OGE-3027] Remove circleCI docker-version * [OGE-3027] Merge unknown/other errors
1 parent 4f1cb21 commit 3642111

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

.circleci/config.yml

-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ workflows:
2323
name: docker-build
2424
context: org-global
2525
dockerfile: Dockerfile
26-
docker-version: "20.10.2"
2726
extra-docker-args: "--build-arg VERSION=$(git describe --tags)"
2827
repo: rdoc-app
2928
executor: datacamp-artifactory/buildkit
@@ -49,7 +48,6 @@ workflows:
4948
artifactory-url: artifactory-proxy-public.ops.datacamp.com
5049
context: org-global
5150
dockerfile: Dockerfile
52-
docker-version: "20.10.2"
5351
extra-docker-args: "--build-arg VERSION=$(git describe --tags)"
5452
repo: rdoc-app
5553
executor: datacamp-artifactory/buildkit

api/controllers/WorkerController.js

+16-7
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,27 @@ module.exports = {
2222
result.then(function(value) {
2323
var key = 'view_topic_' + value.id;
2424
RedisService.invalidateTopicById(key);
25-
// console.log(value);
2625
res.json(value);
2726
})
2827
.catch(Sequelize.UniqueConstraintError, function (err) {
29-
console.log('SequelizeError - UniqueConstraintError:', err.errors);
30-
return res.send(409, err.errors);
28+
console.log('SequelizeError - UniqueConstraintError:', err);
29+
var errorResponse = err.errors || [{message: 'Unique constraint violation'}];
30+
return res.send(409, errorResponse);
3131
}).catch(Sequelize.ValidationError, function (err) {
32-
console.log('SequelizeError - ValidationError:', err.errors);
33-
return res.send(400, err.errors);
32+
console.log('SequelizeError - ValidationError:', err);
33+
var errorResponse = err.errors || [{message: 'Validation error'}];
34+
return res.send(400, errorResponse);
3435
}).catch(function(err){
35-
console.log(err.errors);
36-
return res.negotiate([...err.errors, "Other"]);
36+
console.log('Unhandled error in Topic.createWithRdFile:', err);
37+
var errorResponse = [];
38+
if (err.errors && Array.isArray(err.errors)) {
39+
errorResponse = [...err.errors, "Other"];
40+
} else if (err.errors) {
41+
errorResponse = [{message: String(err.errors)}, "Other"];
42+
} else {
43+
errorResponse = [{message: err.message || "Unknown error occurred"}, "Other"];
44+
}
45+
return res.negotiate(errorResponse);
3746
});
3847

3948
} else if (type === 'version') {

0 commit comments

Comments
 (0)