@openforis/arena-server 2.5.3 → 2.6.1
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/api/auth/login.js +11 -8
- package/dist/api/auth/login.js.map +1 -1
- package/dist/api/middleware/auth.d.ts +7 -7
- package/dist/api/middleware/auth.js +3 -3
- package/dist/api/middleware/auth.js.map +1 -1
- package/dist/api/user2FAAuth/index.js +4 -4
- package/dist/api/user2FAAuth/index.js.map +1 -1
- package/dist/clusterBus/clusterLock.js +1 -1
- package/dist/clusterBus/clusterLock.js.map +1 -1
- package/dist/db/db.js +2 -3
- package/dist/db/db.js.map +1 -1
- package/dist/db/dbMigrator/dbMigrate.js +2 -2
- package/dist/db/dbMigrator/dbMigrate.js.map +1 -1
- package/dist/db/dbMigrator/dbMigrator.js +2 -2
- package/dist/db/dbMigrator/dbMigrator.js.map +1 -1
- package/dist/db/dbMigrator/migration/create.js +2 -2
- package/dist/db/dbMigrator/migration/create.js.map +1 -1
- package/dist/db/dbs/transformCallback.js +1 -1
- package/dist/db/dbs/transformCallback.js.map +1 -1
- package/dist/db/sql/sqlDeleteBuilder.d.ts +1 -1
- package/dist/db/sql/sqlDeleteBuilder.js +1 -1
- package/dist/db/sql/sqlDeleteBuilder.js.map +1 -1
- package/dist/db/sql/sqlInsertBuilder.d.ts +1 -1
- package/dist/db/sql/sqlInsertBuilder.js +1 -1
- package/dist/db/sql/sqlInsertBuilder.js.map +1 -1
- package/dist/db/sql/sqlJoinBuilder.d.ts +2 -2
- package/dist/db/sql/sqlJoinBuilder.js +1 -1
- package/dist/db/sql/sqlJoinBuilder.js.map +1 -1
- package/dist/db/sql/sqlSelectBuilder.d.ts +6 -6
- package/dist/db/sql/sqlSelectBuilder.js.map +1 -1
- package/dist/db/sql/sqlUpdateBuilder.d.ts +3 -3
- package/dist/db/sql/sqlUpdateBuilder.js +4 -2
- package/dist/db/sql/sqlUpdateBuilder.js.map +1 -1
- package/dist/fileStorage/s3Storage.js +9 -7
- package/dist/fileStorage/s3Storage.js.map +1 -1
- package/dist/job/jobManager.d.ts +1 -1
- package/dist/job/jobManager.js +2 -2
- package/dist/job/jobManager.js.map +1 -1
- package/dist/job/jobThread.d.ts +1 -1
- package/dist/job/jobThread.js +12 -7
- package/dist/job/jobThread.js.map +1 -1
- package/dist/job/tests/testJobs.js +4 -5
- package/dist/job/tests/testJobs.js.map +1 -1
- package/dist/log/logFileS3Upload.js +4 -4
- package/dist/log/logFileS3Upload.js.map +1 -1
- package/dist/repository/authGroup/getMany.js +1 -1
- package/dist/repository/authGroup/getMany.js.map +1 -1
- package/dist/repository/dataQuery/delete.js +1 -1
- package/dist/repository/dataQuery/delete.js.map +1 -1
- package/dist/repository/dataQuery/insert.js +1 -1
- package/dist/repository/dataQuery/insert.js.map +1 -1
- package/dist/repository/dataQuery/read.js +2 -2
- package/dist/repository/dataQuery/read.js.map +1 -1
- package/dist/repository/dataQuery/update.js +1 -1
- package/dist/repository/dataQuery/update.js.map +1 -1
- package/dist/repository/info/read.js +1 -1
- package/dist/repository/info/read.js.map +1 -1
- package/dist/repository/message/read.js +1 -1
- package/dist/repository/message/read.js.map +1 -1
- package/dist/repository/nodeDef/read.js +1 -1
- package/dist/repository/nodeDef/read.js.map +1 -1
- package/dist/repository/record/get.js +5 -5
- package/dist/repository/record/get.js.map +1 -1
- package/dist/repository/survey/get.js +1 -1
- package/dist/repository/survey/get.js.map +1 -1
- package/dist/repository/survey/getAllIds.js +1 -1
- package/dist/repository/survey/getAllIds.js.map +1 -1
- package/dist/repository/survey/getAllIdsAndAppVersions.js +1 -1
- package/dist/repository/survey/getAllIdsAndAppVersions.js.map +1 -1
- package/dist/repository/user/get.js +1 -1
- package/dist/repository/user/get.js.map +1 -1
- package/dist/repository/user/updateUserPrefs.js +1 -1
- package/dist/repository/user/updateUserPrefs.js.map +1 -1
- package/dist/repository/user2FADevice/getByDeviceUuid.js +1 -1
- package/dist/repository/user2FADevice/getByDeviceUuid.js.map +1 -1
- package/dist/repository/user2FADevice/getByUserUuid.js +2 -2
- package/dist/repository/user2FADevice/getByUserUuid.js.map +1 -1
- package/dist/repository/user2FADevice/insert.js +1 -1
- package/dist/repository/user2FADevice/insert.js.map +1 -1
- package/dist/repository/user2FADevice/update.js +1 -1
- package/dist/repository/user2FADevice/update.js.map +1 -1
- package/dist/repository/userRefreshToken/getByUuid.js +1 -1
- package/dist/repository/userRefreshToken/getByUuid.js.map +1 -1
- package/dist/repository/userResetPassword/hasValidResetPassword.js +1 -1
- package/dist/repository/userResetPassword/hasValidResetPassword.js.map +1 -1
- package/dist/repository/userTempAuthToken/deleteByTokenHash.js +1 -1
- package/dist/repository/userTempAuthToken/deleteByTokenHash.js.map +1 -1
- package/dist/repository/userTempAuthToken/getByTokenHash.js +1 -1
- package/dist/repository/userTempAuthToken/getByTokenHash.js.map +1 -1
- package/dist/repository/userTempAuthToken/getByUserUuid.js +1 -1
- package/dist/repository/userTempAuthToken/getByUserUuid.js.map +1 -1
- package/dist/repository/userTempAuthToken/insert.js +1 -1
- package/dist/repository/userTempAuthToken/insert.js.map +1 -1
- package/dist/server/arenaServer/start.d.ts +1 -1
- package/dist/server/arenaServer/start.js +2 -2
- package/dist/server/arenaServer/start.js.map +1 -1
- package/dist/server/arenaServer/stop.d.ts +1 -1
- package/dist/service/info/index.js +1 -1
- package/dist/service/info/index.js.map +1 -1
- package/dist/service/survey/docExport/SurveyDocWalker.d.ts +1 -1
- package/dist/service/survey/docExport/SurveyDocWalker.js +41 -24
- package/dist/service/survey/docExport/SurveyDocWalker.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderBoolean.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderBoolean.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderCode.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderCode.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderCoordinate.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderCoordinate.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderDate.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderDate.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderFormHeader.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderFormHeader.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderGeo.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderGeo.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderNumber.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderNumber.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderTaxon.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderTaxon.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderText.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderText.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderTime.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderTime.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/types.d.ts +1 -1
- package/dist/service/user2FA/user2FAService.js +2 -2
- package/dist/service/user2FA/user2FAService.js.map +1 -1
- package/dist/service/userAuthToken/index.js +2 -2
- package/dist/service/userAuthToken/index.js.map +1 -1
- package/dist/thread/thread.js +6 -6
- package/dist/thread/thread.js.map +1 -1
- package/dist/thread/worker.d.ts +1 -1
- package/dist/thread/worker.js +2 -2
- package/dist/thread/worker.js.map +1 -1
- package/dist/webSocket/server.d.ts +5 -5
- package/dist/webSocket/server.js.map +1 -1
- package/package.json +1 -1
package/dist/api/auth/login.js
CHANGED
|
@@ -65,17 +65,20 @@ const authenticationSuccessful = ({ req, res, next, user, callback, }) => req.lo
|
|
|
65
65
|
const serviceRegistry = arena_core_1.ServiceRegistry.getInstance();
|
|
66
66
|
const userAuthTokenService = serviceRegistry.getService(arena_core_1.ServiceType.userAuthToken);
|
|
67
67
|
const refreshTokenProps = (0, authApiCommon_1.extractRefreshTokenProps)({ req });
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
68
|
+
try {
|
|
69
|
+
const { authToken, refreshToken } = await userAuthTokenService.createUserAuthTokens({
|
|
70
|
+
userUuid,
|
|
71
|
+
props: refreshTokenProps,
|
|
72
|
+
});
|
|
71
73
|
(0, authApiCommon_1.setRefreshTokenCookie)({ res, refreshToken });
|
|
72
|
-
sendUser({ res, req, user, authToken: authToken.token });
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
.catch((error) => {
|
|
74
|
+
await sendUser({ res, req, user, authToken: authToken.token });
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
76
77
|
next(error);
|
|
78
|
+
}
|
|
79
|
+
finally {
|
|
77
80
|
callback?.();
|
|
78
|
-
}
|
|
81
|
+
}
|
|
79
82
|
}
|
|
80
83
|
});
|
|
81
84
|
const getUser2FAService = () => arena_core_1.ServiceRegistry.getInstance().getService(server_1.ServerServiceType.user2FA);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/api/auth/login.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/api/auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { NextFunction, Request, Response } from 'express';
|
|
2
2
|
export declare const ApiAuthMiddleware: {
|
|
3
|
-
requireLoggedInUser: (req: Request, _res: Response, next: NextFunction) =>
|
|
4
|
-
requireAdminPermission: (req: Request, _res: Response, next: NextFunction) =>
|
|
3
|
+
requireLoggedInUser: (req: Request, _res: Response, next: NextFunction) => void;
|
|
4
|
+
requireAdminPermission: (req: Request, _res: Response, next: NextFunction) => void;
|
|
5
5
|
requireSurveyViewPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
6
6
|
requireSurveyEditPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
7
7
|
requireRecordCleansePermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
8
8
|
requireSurveyConfigEditPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
9
9
|
requireSurveyOwnerEditPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
10
|
-
requireSurveyRdbRefreshPermission: (req: Request, _res: Response, next: NextFunction) =>
|
|
11
|
-
requireCanExportSurveysList: (req: Request, _res: Response, next: NextFunction) =>
|
|
10
|
+
requireSurveyRdbRefreshPermission: (req: Request, _res: Response, next: NextFunction) => void;
|
|
11
|
+
requireCanExportSurveysList: (req: Request, _res: Response, next: NextFunction) => void;
|
|
12
12
|
requireRecordListViewPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
13
13
|
requireRecordCreatePermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
14
14
|
requireRecordEditPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
@@ -21,14 +21,14 @@ export declare const ApiAuthMiddleware: {
|
|
|
21
21
|
requireRecordsExportPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
22
22
|
requireMapUsePermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
23
23
|
requireUserNameViewPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
24
|
-
requireUsersAllViewPermission: (req: Request, _res: Response, next: NextFunction) =>
|
|
24
|
+
requireUsersAllViewPermission: (req: Request, _res: Response, next: NextFunction) => void;
|
|
25
25
|
requireUserCreatePermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
26
26
|
requireUserInvitePermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
27
27
|
requireUserViewPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
28
28
|
requireUserEditPermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
29
29
|
requireUserRemovePermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
30
|
-
requireCanViewAccessRequestsPermission: (req: Request, _res: Response, next: NextFunction) =>
|
|
31
|
-
requireCanEditAccessRequestsPermission: (req: Request, _res: Response, next: NextFunction) =>
|
|
30
|
+
requireCanViewAccessRequestsPermission: (req: Request, _res: Response, next: NextFunction) => void;
|
|
31
|
+
requireCanEditAccessRequestsPermission: (req: Request, _res: Response, next: NextFunction) => void;
|
|
32
32
|
requireUserGroupManagePermission: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
|
|
33
33
|
requireDownloadToken: (req: Request, res: Response, next: NextFunction) => void;
|
|
34
34
|
};
|
|
@@ -10,7 +10,7 @@ const sendUnauthorizedError = ({ req = null, next }) => {
|
|
|
10
10
|
const userName = user?.name ?? 'anonymous';
|
|
11
11
|
next(new error_1.UnauthorizedError(userName));
|
|
12
12
|
};
|
|
13
|
-
const requireAdminPermission =
|
|
13
|
+
const requireAdminPermission = (req, _res, next) => {
|
|
14
14
|
const user = utils_1.Requests.getUser(req);
|
|
15
15
|
if (arena_core_1.Users.isSystemAdmin(user)) {
|
|
16
16
|
next();
|
|
@@ -28,7 +28,7 @@ const checkPermission = (req, next, permissionFn, ...args) => {
|
|
|
28
28
|
sendUnauthorizedError({ req, next });
|
|
29
29
|
}
|
|
30
30
|
};
|
|
31
|
-
const requirePermission = (permissionFn) =>
|
|
31
|
+
const requirePermission = (permissionFn) => (req, _res, next) => {
|
|
32
32
|
try {
|
|
33
33
|
checkPermission(req, next, permissionFn);
|
|
34
34
|
}
|
|
@@ -101,7 +101,7 @@ const canManageUserGroups = (user, surveyInfo) => {
|
|
|
101
101
|
const authGroup = arena_core_1.Users.getAuthGroupBySurveyUuid(surveyInfo.uuid)(user);
|
|
102
102
|
return authGroup?.name === arena_core_1.AuthGroupName.surveyAdmin;
|
|
103
103
|
};
|
|
104
|
-
const requireLoggedInUser =
|
|
104
|
+
const requireLoggedInUser = (req, _res, next) => {
|
|
105
105
|
try {
|
|
106
106
|
const user = utils_1.Requests.getUser(req);
|
|
107
107
|
return user ? next() : sendUnauthorizedError({ req, next });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/api/middleware/auth.ts"],"names":[],"mappings":";;;AACA,sDAY8B;AAC9B,8CAAsD;AACtD,uCAAsC;AACtC,yDAAiE;AAIjE,MAAM,qBAAqB,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,EAAE,IAAI,EAAgD,EAAE,EAAE;IACnG,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/C,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,IAAI,WAAW,CAAA;IAC1C,IAAI,CAAC,IAAI,yBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAA;AACvC,CAAC,CAAA;AAGD,MAAM,sBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/api/middleware/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const service_1 = require("../../service");
|
|
|
7
7
|
const utils_1 = require("../../utils");
|
|
8
8
|
const endpoint_1 = require("../endpoint");
|
|
9
9
|
const getUser2FAService = () => arena_core_1.ServiceRegistry.getInstance().getService(server_1.ServerServiceType.user2FA);
|
|
10
|
-
const checkDeviceUuid =
|
|
10
|
+
const checkDeviceUuid = (req, res) => {
|
|
11
11
|
const { deviceUuid } = utils_1.Requests.getParams(req);
|
|
12
12
|
if (!deviceUuid) {
|
|
13
13
|
res.status(400).json({ message: 'Device UUID is required' });
|
|
@@ -43,7 +43,7 @@ exports.User2FAAuthApi = {
|
|
|
43
43
|
try {
|
|
44
44
|
const user = utils_1.Requests.getUser(req);
|
|
45
45
|
const { deviceUuid } = utils_1.Requests.getParams(req);
|
|
46
|
-
if (!
|
|
46
|
+
if (!checkDeviceUuid(req, res))
|
|
47
47
|
return;
|
|
48
48
|
const service = getUser2FAService();
|
|
49
49
|
const device = await service.getDevice({ deviceUuid, userUuid: user.uuid });
|
|
@@ -92,7 +92,7 @@ exports.User2FAAuthApi = {
|
|
|
92
92
|
try {
|
|
93
93
|
const user = utils_1.Requests.getUser(req);
|
|
94
94
|
const { deviceUuid } = utils_1.Requests.getParams(req);
|
|
95
|
-
if (!
|
|
95
|
+
if (!checkDeviceUuid(req, res))
|
|
96
96
|
return;
|
|
97
97
|
const service = getUser2FAService();
|
|
98
98
|
await service.removeDevice({ deviceUuid, userUuid: user.uuid });
|
|
@@ -117,7 +117,7 @@ exports.User2FAAuthApi = {
|
|
|
117
117
|
try {
|
|
118
118
|
const user = utils_1.Requests.getUser(req);
|
|
119
119
|
const { deviceUuid } = utils_1.Requests.getParams(req);
|
|
120
|
-
if (!
|
|
120
|
+
if (!checkDeviceUuid(req, res))
|
|
121
121
|
return;
|
|
122
122
|
const service = getUser2FAService();
|
|
123
123
|
const backupCodes = await service.regenerateBackupCodes({ deviceUuid, userUuid: user.uuid });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/user2FAAuth/index.ts"],"names":[],"mappings":";;;AAEA,sDAA6D;AAE7D,yCAAoE;AACpE,2CAA8E;AAC9E,uCAAiD;AACjD,0CAAyC;AAEzC,MAAM,iBAAiB,GAAG,GAAmB,EAAE,CAC7C,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,0BAAiB,CAAC,OAAO,CAAmB,CAAA;AAEvF,MAAM,eAAe,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/user2FAAuth/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.runWithClusterLock = void 0;
|
|
|
4
4
|
const db_1 = require("../db");
|
|
5
5
|
const log_1 = require("../log");
|
|
6
6
|
const logger = new log_1.Logger('ClusterLock');
|
|
7
|
-
const runWithClusterLock =
|
|
7
|
+
const runWithClusterLock = (params) => {
|
|
8
8
|
const { lockName, fn } = params;
|
|
9
9
|
return db_1.DB.task(async (task) => {
|
|
10
10
|
const { locked } = await task.one('SELECT pg_try_advisory_lock(hashtext($1)) AS locked', [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterLock.js","sourceRoot":"","sources":["../../src/clusterBus/clusterLock.ts"],"names":[],"mappings":";;;AAAA,8BAA0B;AAC1B,gCAA+B;AAE/B,MAAM,MAAM,GAAW,IAAI,YAAM,CAAC,aAAa,CAAC,CAAA;AAUzC,MAAM,kBAAkB,GAAG,
|
|
1
|
+
{"version":3,"file":"clusterLock.js","sourceRoot":"","sources":["../../src/clusterBus/clusterLock.ts"],"names":[],"mappings":";;;AAAA,8BAA0B;AAC1B,gCAA+B;AAE/B,MAAM,MAAM,GAAW,IAAI,YAAM,CAAC,aAAa,CAAC,CAAA;AAUzC,MAAM,kBAAkB,GAAG,CAAC,MAAqD,EAAoB,EAAE;IAC5G,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,MAAM,CAAA;IAE/B,OAAO,OAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAsB,qDAAqD,EAAE;YAC5G,QAAQ;SACT,CAAC,CAAA;QACF,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAEzB,IAAI,CAAC;YACH,MAAM,EAAE,EAAE,CAAA;YACV,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,0CAA0C,QAAQ,MAAM,KAAK,EAAE,CAAC,CAAA;YAC7E,MAAM,KAAK,CAAA;QACb,CAAC;gBAAS,CAAC;YACT,MAAM,IAAI,CAAC,GAAG,CAAC,yCAAyC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;QACvE,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAnBY,QAAA,kBAAkB,sBAmB9B"}
|
package/dist/db/db.js
CHANGED
|
@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.DB = void 0;
|
|
7
7
|
require("dotenv/config");
|
|
8
8
|
const pg_promise_1 = __importDefault(require("pg-promise"));
|
|
9
|
+
const log_1 = require("../log");
|
|
9
10
|
const processEnv_1 = require("../processEnv");
|
|
10
|
-
const logger =
|
|
11
|
-
debug: console.debug,
|
|
12
|
-
};
|
|
11
|
+
const logger = new log_1.Logger('DB');
|
|
13
12
|
const debugOptions = {
|
|
14
13
|
query: (e) => {
|
|
15
14
|
logger.debug(`QUERY: ${e.query}`);
|
package/dist/db/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/db/db.ts"],"names":[],"mappings":";;;;;;AAAA,yBAAsB;AAEtB,4DAAkC;AAClC,8CAA0C;
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/db/db.ts"],"names":[],"mappings":";;;;;;AAAA,yBAAsB;AAEtB,4DAAkC;AAClC,gCAA+B;AAC/B,8CAA0C;AAE1C,MAAM,MAAM,GAAG,IAAI,YAAM,CAAC,IAAI,CAAC,CAAA;AAE/B,MAAM,YAAY,GAAG;IACnB,KAAK,EAAE,CAAC,CAA0B,EAAE,EAAE;QACpC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QACjC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACrD,CAAC;IACH,CAAC;CACF,CAAA;AAED,MAAM,WAAW,GAAG;IAClB,GAAG,CAAC,uBAAU,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;CAC1C,CAAA;AAED,MAAM,GAAG,GAAG,IAAA,oBAAS,EAAC,WAAW,CAAC,CAAA;AAIlC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAA;AAGzE,MAAM,SAAS,GAAG,uBAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,uBAAU,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAA;AAEvG,MAAM,YAAY,GAAG;IAEnB,iBAAiB,EAAE,KAAK;IAExB,uBAAuB,EAAE,uBAAU,CAAC,yBAAyB;IAE7D,GAAG,EAAE,EAAE;IACP,GAAG,EAAE,SAAS;CACf,CAAA;AAED,MAAM,MAAM,GAAG,uBAAU,CAAC,KAAK;IAC7B,CAAC,CAAC;QACE,gBAAgB,EAAE,uBAAU,CAAC,KAAK;QAClC,GAAG,YAAY;KAChB;IACH,CAAC,CAAC;QACE,IAAI,EAAE,uBAAU,CAAC,MAAM;QACvB,QAAQ,EAAE,uBAAU,CAAC,UAAU;QAC/B,QAAQ,EAAE,uBAAU,CAAC,UAAU;QAC/B,IAAI,EAAE,uBAAU,CAAC,MAAM;QACvB,IAAI,EAAE,uBAAU,CAAC,MAAM;QACvB,GAAG,YAAY;KAChB,CAAA;AAIQ,QAAA,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DBMigrate = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
8
|
const db_migrate_1 = __importDefault(require("db-migrate"));
|
|
9
9
|
const processEnv_1 = require("../../processEnv");
|
|
10
10
|
const schemata_1 = require("../schemata");
|
|
@@ -38,7 +38,7 @@ const getInstance = (schema, cwd = __dirname) => {
|
|
|
38
38
|
const folder = schema === schemata_1.Schemata.PUBLIC ? MigrationFolder.public : MigrationFolder.survey;
|
|
39
39
|
const options = {
|
|
40
40
|
config: getConfig(schema),
|
|
41
|
-
cwd: `${
|
|
41
|
+
cwd: `${node_path_1.default.join(cwd, 'migration', folder)}`,
|
|
42
42
|
env: processEnv_1.ProcessEnv.nodeEnv,
|
|
43
43
|
throwUncatched: true,
|
|
44
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbMigrate.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrate.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbMigrate.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrate.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,4DAAkC;AAElC,iDAA6C;AAC7C,0CAAsC;AAEtC,IAAK,eAGJ;AAHD,WAAK,eAAe;IAClB,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;AACnB,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAED,MAAM,UAAU,GAAG;IACjB,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,uBAAU,CAAC,MAAM;IACvB,QAAQ,EAAE,uBAAU,CAAC,UAAU;IAC/B,IAAI,EAAE,uBAAU,CAAC,MAAM;IACvB,QAAQ,EAAE,uBAAU,CAAC,UAAU;IAC/B,GAAG,EAAE,uBAAU,CAAC,KAAK;QACnB,CAAC,CAAC;YACE,kBAAkB,EAAE,CAAC,uBAAU,CAAC,sBAAsB;SACvD;QACH,CAAC,CAAC,KAAK;IACT,MAAM,EAAE,EAAE;CACX,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,MAAc,EAAO,EAAE;IACxC,MAAM,MAAM,GAAG,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,CAAA;IACxC,OAAO;QACL,WAAW,EAAE,MAAM;QACnB,UAAU,EAAE,MAAM;QAClB,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,MAAc,SAAS,EAAa,EAAE;IACzE,MAAM,MAAM,GAAG,MAAM,KAAK,mBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAA;IAE3F,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC;QACzB,GAAG,EAAE,GAAG,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE;QAC7C,GAAG,EAAE,uBAAU,CAAC,OAAO;QAGvB,cAAc,EAAE,IAAI;KACrB,CAAA;IACD,OAAO,oBAAS,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC7C,CAAC,CAAA;AAEY,QAAA,SAAS,GAAG;IACvB,WAAW;CACZ,CAAA"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DBMigrator = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
8
|
const arena_core_1 = require("@openforis/arena-core");
|
|
9
9
|
const log_1 = require("../../log");
|
|
10
10
|
const repository_1 = require("../../repository");
|
|
@@ -17,7 +17,7 @@ const surveySchemaMigrationRequired = (appVersion) => appVersion === null ||
|
|
|
17
17
|
[...APP_VERSIONS_REQUIRING_SURVEY_SCHEMA_MIGRATION].some((version) => arena_core_1.Versions.isGreaterThan(version, appVersion));
|
|
18
18
|
const migrateSchema = async (params = {}) => {
|
|
19
19
|
const { schema = schemata_1.Schemata.PUBLIC, migrationsFolder = __dirname } = params;
|
|
20
|
-
if (!
|
|
20
|
+
if (!node_fs_1.default.existsSync(migrationsFolder))
|
|
21
21
|
return;
|
|
22
22
|
if (schema !== schemata_1.Schemata.PUBLIC) {
|
|
23
23
|
await db_1.DB.none(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbMigrator.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrator.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbMigrator.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
7
7
|
const schemata_1 = require("../../schemata");
|
|
8
8
|
const dbMigrate_1 = require("../dbMigrate");
|
|
9
9
|
var ArgName;
|
|
@@ -27,7 +27,7 @@ const getArgv = (name, defaultValue) => {
|
|
|
27
27
|
};
|
|
28
28
|
const name = getArgv(ArgName.name);
|
|
29
29
|
const schema = getArgv(ArgName.schema, schemata_1.Schemata.PUBLIC);
|
|
30
|
-
const cwd = getArgv(ArgName.cwd,
|
|
30
|
+
const cwd = getArgv(ArgName.cwd, node_path_1.default.resolve(__dirname, '..'));
|
|
31
31
|
const dbMigrate = dbMigrate_1.DBMigrate.getInstance(schema, cwd);
|
|
32
32
|
dbMigrate.create(name);
|
|
33
33
|
//# sourceMappingURL=create.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/db/dbMigrator/migration/create.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/db/dbMigrator/migration/create.ts"],"names":[],"mappings":";;;;;AAAA,0DAA4B;AAE5B,6CAAyC;AACzC,4CAAwC;AAExC,IAAK,OAIJ;AAJD,WAAK,OAAO;IACV,wBAAa,CAAA;IACb,sBAAW,CAAA;IACX,4BAAiB,CAAA;AACnB,CAAC,EAJI,OAAO,KAAP,OAAO,QAIX;AAED,MAAM,KAAK,GAAG,2BAA2B,OAAO,CAAC,IAAI,aAAa,OAAO,CAAC,MAAM,eAAe,OAAO,CAAC,GAAG,QAAQ,CAAA;AAElH,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,YAAqB,EAAU,EAAE;IAC/D,MAAM,WAAW,GAAG,KAAK,IAAI,GAAG,CAAA;IAChC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAA;IACnE,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,IAAI,YAAY;YAAE,OAAO,YAAY,CAAA;QAErC,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,cAAc,CAAC,CAAA;QAC7C,OAAO,CAAC,KAAK,CAAC,UAAU,KAAK,EAAE,CAAC,CAAA;QAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAClC,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAQ,CAAC,MAAM,CAAC,CAAA;AACvD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAA;AAE/D,MAAM,SAAS,GAAG,qBAAS,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AACpD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA"}
|
|
@@ -8,7 +8,7 @@ const mergeProps = (options) => {
|
|
|
8
8
|
return null;
|
|
9
9
|
}
|
|
10
10
|
const { props = {}, props_draft: propsDraft = {}, ...rest } = row;
|
|
11
|
-
const propsUpdate = draft ? { ...
|
|
11
|
+
const propsUpdate = draft ? { ...props, ...propsDraft } : props;
|
|
12
12
|
return { ...rest, props: propsUpdate };
|
|
13
13
|
};
|
|
14
14
|
const _assocPublishedDraft = (row) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformCallback.js","sourceRoot":"","sources":["../../../src/db/dbs/transformCallback.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,MAAM,UAAU,GAAG,CAAC,OAAqC,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAA;IACjE,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"transformCallback.js","sourceRoot":"","sources":["../../../src/db/dbs/transformCallback.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,MAAM,UAAU,GAAG,CAAC,OAAqC,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAA;IACjE,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAA;IAC/D,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AACxC,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;IAC1C,GAAG,GAAG;IACN,SAAS,EAAE,CAAC,oBAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;IACtC,KAAK,EAAE,CAAC,oBAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;CACzC,CAAC,CAAA;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAMjC,EAAO,EAAE;IACR,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,KAAK,EAAE,mBAAmB,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;IAC9F,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IAGD,MAAM,UAAU,GAAG,MAAM,IAAI,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IAClF,MAAM,UAAU,GAAG,oBAAO,CAAC,QAAQ,CAAC,UAAU,EAAE;QAC9C,IAAI,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QACrD,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC;QAC9C,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,UAAU,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;IAC/C,CAAC;IAGD,UAAU,CAAC,UAAU,GAAG,GAAG,CAAC,WAAW,CAAA;IACvC,OAAO,UAAU,CAAC,WAAW,CAAA;IAC7B,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AA/BY,QAAA,iBAAiB,qBA+B7B;AAEM,MAAM,sBAAsB,GAAG,CAAC,GAAQ,EAAU,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AAAjE,QAAA,sBAAsB,0BAA2C"}
|
|
@@ -8,7 +8,7 @@ export declare class SqlDeleteBuilder extends SqlBuilder {
|
|
|
8
8
|
private _table;
|
|
9
9
|
private _whereRaw;
|
|
10
10
|
private _whereValues;
|
|
11
|
-
private _returning;
|
|
11
|
+
private readonly _returning;
|
|
12
12
|
deleteFrom(table: Table): this;
|
|
13
13
|
whereRaw(condition: string): this;
|
|
14
14
|
where(values: ValuesByColumn): this;
|
|
@@ -32,7 +32,7 @@ class SqlDeleteBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
32
32
|
}
|
|
33
33
|
build() {
|
|
34
34
|
if (arena_core_1.Objects.isEmpty(this._table) || (arena_core_1.Objects.isEmpty(this._whereValues) && arena_core_1.Objects.isEmpty(this._whereRaw)))
|
|
35
|
-
throw new Error(`missingParams, ${this._table}, ${this._whereValues}`);
|
|
35
|
+
throw new Error(`missingParams, ${this._table}, ${JSON.stringify(this._whereValues)}`);
|
|
36
36
|
const whereCondition = this._whereRaw ??
|
|
37
37
|
Object.keys(this._whereValues)
|
|
38
38
|
.map((columnName) => `${columnName} = $/${columnName}/`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlDeleteBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlDeleteBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,SAAS,GAAkB,IAAI,CAAA;IAC/B,YAAY,GAAmB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlDeleteBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlDeleteBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,SAAS,GAAkB,IAAI,CAAA;IAC/B,YAAY,GAAmB,EAAE,CAAA;IACxB,UAAU,GAAa,EAAE,CAAA;IAE1C,UAAU,CAAC,KAAY;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ,CAAC,SAAiB;QACxB,IAAI,oBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAClE,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,MAAsB;QAC1B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;QACzE,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,GAAG,MAAqB;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACzG,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;QAExF,MAAM,cAAc,GAClB,IAAI,CAAC,SAAS;YACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;iBAC3B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,QAAQ,UAAU,GAAG,CAAC;iBACvD,IAAI,CAAC,OAAO,CAAC,CAAA;QAElB,IAAI,GAAG,GAAG,eAAe,IAAI,CAAC,MAAM,UAAU,cAAc,EAAE,CAAA;QAC9D,IAAI,oBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC/E,GAAG,IAAI,cAAc,eAAe,EAAE,CAAA;QACxC,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AAjDD,4CAiDC"}
|
|
@@ -7,7 +7,7 @@ interface ValuesByColumn {
|
|
|
7
7
|
export declare class SqlInsertBuilder extends SqlBuilder {
|
|
8
8
|
private _table;
|
|
9
9
|
private _valuesByColumn;
|
|
10
|
-
private _returning;
|
|
10
|
+
private readonly _returning;
|
|
11
11
|
insertInto(table: Table): this;
|
|
12
12
|
valuesByColumn(valuesByColumn: ValuesByColumn): this;
|
|
13
13
|
returning(...fields: Array<Column>): this;
|
|
@@ -21,7 +21,7 @@ class SqlInsertBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
21
21
|
}
|
|
22
22
|
build() {
|
|
23
23
|
if (arena_core_1.Objects.isEmpty(this._table) || arena_core_1.Objects.isEmpty(this._valuesByColumn))
|
|
24
|
-
throw new Error(`missingParams, ${this._table}, ${this._valuesByColumn}`);
|
|
24
|
+
throw new Error(`missingParams, ${this._table}, ${JSON.stringify(this._valuesByColumn)}`);
|
|
25
25
|
const columnNames = [];
|
|
26
26
|
const valuesParams = [];
|
|
27
27
|
for (const columnName of Object.keys(this._valuesByColumn)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlInsertBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlInsertBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,eAAe,GAAmB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlInsertBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlInsertBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,eAAe,GAAmB,EAAE,CAAA;IAC3B,UAAU,GAAa,EAAE,CAAA;IAE1C,UAAU,CAAC,KAAY;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,cAAc,CAAC,cAA8B;QAC3C,IAAI,CAAC,eAAe,GAAG,cAAc,CAAA;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,GAAG,MAAqB;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC;YACvE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAE3F,MAAM,WAAW,GAAa,EAAE,CAAA;QAChC,MAAM,YAAY,GAAa,EAAE,CAAA;QAEjC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YAC3D,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC5B,YAAY,CAAC,IAAI,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;QACvC,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,eAAe,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAElH,IAAI,CAAC,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACvD,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;CACF;AAvCD,4CAuCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Table } from '../table';
|
|
2
2
|
import { SqlBuilder } from './sqlBuilder';
|
|
3
3
|
export declare class SqlJoinBuilder extends SqlBuilder {
|
|
4
|
-
private _tables;
|
|
5
|
-
private _on;
|
|
4
|
+
private readonly _tables;
|
|
5
|
+
private readonly _on;
|
|
6
6
|
join(table: Table): this;
|
|
7
7
|
on(condition: string): this;
|
|
8
8
|
build(): string;
|
|
@@ -16,7 +16,7 @@ class SqlJoinBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
16
16
|
}
|
|
17
17
|
build() {
|
|
18
18
|
if (arena_core_1.Objects.isEmpty(this._tables) || arena_core_1.Objects.isEmpty(this._on))
|
|
19
|
-
throw new Error(`missingParams:
|
|
19
|
+
throw new Error(`missingParams: tables: [${this._tables.join(', ')}], on: [${this._on.join(', ')}]`);
|
|
20
20
|
return `JOIN ${this._tables.join(' ')} ON ${this._on.join(' ')}`;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlJoinBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlJoinBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,6CAAyC;AAEzC,MAAa,cAAe,SAAQ,uBAAU;
|
|
1
|
+
{"version":3,"file":"sqlJoinBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlJoinBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,6CAAyC;AAEzC,MAAa,cAAe,SAAQ,uBAAU;IAC3B,OAAO,GAAiB,EAAE,CAAA;IAC1B,GAAG,GAAkB,EAAE,CAAA;IAExC,IAAI,CAAC,KAAY;QACf,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,EAAE,CAAC,SAAiB;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACtG,OAAO,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IAClE,CAAC;CACF;AAnBD,wCAmBC"}
|
|
@@ -3,14 +3,14 @@ import { Table } from '../table';
|
|
|
3
3
|
import { SqlBuilder } from './sqlBuilder';
|
|
4
4
|
import { SqlJoinBuilder } from './sqlJoinBuilder';
|
|
5
5
|
export declare class SqlSelectBuilder extends SqlBuilder {
|
|
6
|
-
private _select;
|
|
7
|
-
private _from;
|
|
8
|
-
private _join;
|
|
9
|
-
private _where;
|
|
10
|
-
private _groupBy;
|
|
6
|
+
private readonly _select;
|
|
7
|
+
private readonly _from;
|
|
8
|
+
private readonly _join;
|
|
9
|
+
private readonly _where;
|
|
10
|
+
private readonly _groupBy;
|
|
11
11
|
private _offset;
|
|
12
12
|
private _limit;
|
|
13
|
-
private _orderBy;
|
|
13
|
+
private readonly _orderBy;
|
|
14
14
|
select(...fields: Array<Column | string>): this;
|
|
15
15
|
from(...tables: Array<Table>): this;
|
|
16
16
|
join(...joins: Array<SqlJoinBuilder>): this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlSelectBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlSelectBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAI/C,6CAAyC;AAGzC,MAAa,gBAAiB,SAAQ,uBAAU;
|
|
1
|
+
{"version":3,"file":"sqlSelectBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlSelectBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { Table } from '../table';
|
|
|
3
3
|
import { Column } from '../column';
|
|
4
4
|
export declare class SqlUpdateBuilder extends SqlBuilder {
|
|
5
5
|
private _update;
|
|
6
|
-
private _set;
|
|
7
|
-
private _where;
|
|
8
|
-
private _returning;
|
|
6
|
+
private readonly _set;
|
|
7
|
+
private readonly _where;
|
|
8
|
+
private readonly _returning;
|
|
9
9
|
update(table: Table): this;
|
|
10
10
|
set(column: Column | string, value: string): this;
|
|
11
11
|
setColumnNames(columnNames: string[]): this;
|
|
@@ -31,8 +31,10 @@ class SqlUpdateBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
31
31
|
return this;
|
|
32
32
|
}
|
|
33
33
|
build() {
|
|
34
|
-
if (arena_core_1.Objects.isEmpty(this._update) || arena_core_1.Objects.isEmpty(this._set))
|
|
35
|
-
|
|
34
|
+
if (arena_core_1.Objects.isEmpty(this._update) || arena_core_1.Objects.isEmpty(this._set)) {
|
|
35
|
+
const setSummary = this._set.map(({ column, value }) => [String(column), value].join(' = ')).join(', ');
|
|
36
|
+
throw new Error(`missingParams, ${this._update}, ${setSummary}`);
|
|
37
|
+
}
|
|
36
38
|
const _getColumnName = (column) => (typeof column === 'string' ? column : column.columnName);
|
|
37
39
|
const _buildSetValue = (params) => {
|
|
38
40
|
const { column, value } = params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlUpdateBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlUpdateBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAMzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,OAAO,GAAiB,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlUpdateBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlUpdateBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,11 +47,12 @@ class S3Storage {
|
|
|
47
47
|
const files = [];
|
|
48
48
|
let continuationToken;
|
|
49
49
|
do {
|
|
50
|
-
const
|
|
50
|
+
const command = new client_s3_1.ListObjectsV2Command({
|
|
51
51
|
Bucket: this.options.bucketName,
|
|
52
52
|
Prefix: prefix,
|
|
53
53
|
ContinuationToken: continuationToken,
|
|
54
|
-
})
|
|
54
|
+
});
|
|
55
|
+
const response = await this.client.send(command);
|
|
55
56
|
for (const object of response.Contents ?? []) {
|
|
56
57
|
if (object.Key) {
|
|
57
58
|
files.push({ key: object.Key, lastModified: object.LastModified });
|
|
@@ -62,13 +63,14 @@ class S3Storage {
|
|
|
62
63
|
return files;
|
|
63
64
|
}
|
|
64
65
|
async deleteFiles(keys) {
|
|
66
|
+
const batches = [];
|
|
65
67
|
for (let i = 0; i < keys.length; i += deleteObjectsBatchSize) {
|
|
66
|
-
|
|
67
|
-
await this.client.send(new client_s3_1.DeleteObjectsCommand({
|
|
68
|
-
Bucket: this.options.bucketName,
|
|
69
|
-
Delete: { Objects: batch.map((key) => ({ Key: key })) },
|
|
70
|
-
}));
|
|
68
|
+
batches.push(keys.slice(i, i + deleteObjectsBatchSize));
|
|
71
69
|
}
|
|
70
|
+
await Promise.all(batches.map((batch) => this.client.send(new client_s3_1.DeleteObjectsCommand({
|
|
71
|
+
Bucket: this.options.bucketName,
|
|
72
|
+
Delete: { Objects: batch.map((key) => ({ Key: key })) },
|
|
73
|
+
}))));
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
76
|
exports.S3Storage = S3Storage;
|