This commit is contained in:
Benjamin Toby
2025-02-07 13:58:34 +01:00
parent 64ee344ba1
commit b8fbbd3afb
5 changed files with 56 additions and 29 deletions
+3 -2
View File
@@ -1313,9 +1313,10 @@ export type DsqlCrudTransformFunction<T extends {
[key: string]: any;
} = {
[key: string]: any;
}> = ({ data, existingData, user, }: {
}> = ({ data, query, existingData, user, }: {
user?: DATASQUIREL_LoggedInUser;
data: T;
data?: T;
query?: DsqlCrudQueryObject<T>;
existingData?: T;
reqMethod: (typeof DataCrudRequestMethods)[number];
}) => Promise<T>;
+24 -13
View File
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = dsqlMethodCrud;
const lodash_1 = __importDefault(require("lodash"));
const deserialize_query_1 = __importDefault(require("../deserialize-query"));
const ejson_1 = __importDefault(require("../ejson"));
const numberfy_1 = __importDefault(require("../numberfy"));
@@ -29,36 +30,46 @@ function dsqlMethodCrud(_a) {
let PAGE = 1;
let OFFSET = (PAGE - 1) * LIMIT;
if (finalQuery) {
Object.keys(finalQuery).forEach((key) => {
const value = finalQuery[key];
const newFinalQuery = lodash_1.default.cloneDeep(finalQuery);
Object.keys(newFinalQuery).forEach((key) => {
const value = newFinalQuery[key];
if (typeof value == "string" && value.match(/^\{|^\[/)) {
finalQuery[key] = ejson_1.default.stringify(value);
newFinalQuery[key] = ejson_1.default.stringify(value);
}
if (value == "true") {
finalQuery[key] = true;
newFinalQuery[key] = true;
}
if (value == "false") {
finalQuery[key] = false;
newFinalQuery[key] = false;
}
});
if (finalQuery.limit)
LIMIT = (0, numberfy_1.default)(finalQuery.limit);
if (finalQuery.page)
PAGE = (0, numberfy_1.default)(finalQuery.page);
if (newFinalQuery.limit)
LIMIT = (0, numberfy_1.default)(newFinalQuery.limit);
if (newFinalQuery.page)
PAGE = (0, numberfy_1.default)(newFinalQuery.page);
OFFSET = (PAGE - 1) * LIMIT;
finalQuery = newFinalQuery;
}
else {
finalQuery = {};
}
let finalData = finalBody
? Object.assign(Object.assign({}, finalBody), extraData)
: undefined;
if (finalData && (user === null || user === void 0 ? void 0 : user.id) && addUser) {
: {};
if ((user === null || user === void 0 ? void 0 : user.id) && addUser) {
finalData = Object.assign(Object.assign({}, finalData), { [addUser.field]: String(user.id) });
}
if (transform && finalData) {
finalData = yield transform({
if (transform) {
finalData = (yield transform({
data: finalData,
existingData: existingData,
user,
reqMethod: method,
}));
finalQuery = yield transform({
query: finalQuery,
user,
reqMethod: method,
});
}
switch (method) {