pangea-server 1.0.67 → 1.0.69
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/router/call-controller.js +14 -22
- package/package.json +1 -1
|
@@ -13,42 +13,34 @@ const validate_request_1 = require("../validator/validate-request");
|
|
|
13
13
|
function callController(controller, validate, authConfig) {
|
|
14
14
|
const { authMap, authCtor, accessToken } = authConfig;
|
|
15
15
|
return async function (req, res) {
|
|
16
|
-
console.log('a');
|
|
17
16
|
const headers = req.headers;
|
|
18
17
|
const inputs = (0, validate_request_1.validateRequest)(validate, req);
|
|
19
18
|
const ctx = { headers, ...inputs, file: req.file, files: req.files };
|
|
20
|
-
console.log('bb');
|
|
21
19
|
const tx = await (0, database_1.getDbClient)().transaction();
|
|
22
20
|
const db = new database_1.Db(tx);
|
|
23
|
-
|
|
21
|
+
let result;
|
|
24
22
|
try {
|
|
25
23
|
const authUsers = await (0, authentication_1.getUsersFromToken)(headers.authorization, db, accessToken, authMap);
|
|
26
24
|
const auth = new authCtor(authUsers);
|
|
27
|
-
|
|
28
|
-
const result = await controller(ctx, db, auth);
|
|
29
|
-
console.log('eeeee');
|
|
25
|
+
result = await controller(ctx, db, auth);
|
|
30
26
|
await tx.commit();
|
|
31
|
-
console.log('ffff');
|
|
32
|
-
let data = result;
|
|
33
|
-
let totalCount;
|
|
34
|
-
if (hasInstancesAndTotalCount(result)) {
|
|
35
|
-
data = result.instances;
|
|
36
|
-
totalCount = result.totalCount;
|
|
37
|
-
}
|
|
38
|
-
const jsonBody = {
|
|
39
|
-
data: data || null,
|
|
40
|
-
totalCount: typeof totalCount === 'number' ? totalCount : null,
|
|
41
|
-
successCode: (0, pangea_helpers_1.camelToUpperSnake)(controller.name),
|
|
42
|
-
};
|
|
43
|
-
console.log('ggggggg');
|
|
44
|
-
res.status(http_status_codes_1.StatusCodes.OK).json(jsonBody);
|
|
45
|
-
console.log('finish: ', jsonBody);
|
|
46
27
|
}
|
|
47
28
|
catch (err) {
|
|
48
|
-
console.log('error');
|
|
49
29
|
await tx.rollback();
|
|
50
30
|
throw err;
|
|
51
31
|
}
|
|
32
|
+
let data = result;
|
|
33
|
+
let totalCount;
|
|
34
|
+
if (hasInstancesAndTotalCount(result)) {
|
|
35
|
+
data = result.instances;
|
|
36
|
+
totalCount = result.totalCount;
|
|
37
|
+
}
|
|
38
|
+
const jsonBody = {
|
|
39
|
+
data: data || null,
|
|
40
|
+
totalCount: typeof totalCount === 'number' ? totalCount : null,
|
|
41
|
+
successCode: (0, pangea_helpers_1.camelToUpperSnake)(controller.name),
|
|
42
|
+
};
|
|
43
|
+
res.status(http_status_codes_1.StatusCodes.OK).json(jsonBody);
|
|
52
44
|
};
|
|
53
45
|
}
|
|
54
46
|
exports.callController = callController;
|