Bugfix
This commit is contained in:
parent
94d15ecb30
commit
38abc55870
@ -1,3 +1,4 @@
|
|||||||
|
import sqlGenerator from "../../functions/dsql/sql/sql-generator";
|
||||||
import { DsqlMethodCrudParam, ServerQueryParam } from "../../types";
|
import { DsqlMethodCrudParam, ServerQueryParam } from "../../types";
|
||||||
export type APIDataCrudQuery = ServerQueryParam & {
|
export type APIDataCrudQuery = ServerQueryParam & {
|
||||||
page?: number;
|
page?: number;
|
||||||
@ -7,6 +8,7 @@ export type CRUDResponseObject<P extends any = any> = {
|
|||||||
payload?: P;
|
payload?: P;
|
||||||
msg?: string;
|
msg?: string;
|
||||||
error?: string;
|
error?: string;
|
||||||
|
queryObject?: ReturnType<Awaited<typeof sqlGenerator>>;
|
||||||
};
|
};
|
||||||
export default function dsqlMethodCrud<T extends {
|
export default function dsqlMethodCrud<T extends {
|
||||||
[key: string]: any;
|
[key: string]: any;
|
||||||
|
@ -19,6 +19,7 @@ const numberfy_1 = __importDefault(require("../numberfy"));
|
|||||||
const crud_1 = __importDefault(require("./crud"));
|
const crud_1 = __importDefault(require("./crud"));
|
||||||
function dsqlMethodCrud(_a) {
|
function dsqlMethodCrud(_a) {
|
||||||
return __awaiter(this, arguments, void 0, function* ({ method, tableName, addUser, user, extraData, transform, existingData, body, query, targetId, sanitize, }) {
|
return __awaiter(this, arguments, void 0, function* ({ method, tableName, addUser, user, extraData, transform, existingData, body, query, targetId, sanitize, }) {
|
||||||
|
var _b;
|
||||||
let result = {
|
let result = {
|
||||||
success: false,
|
success: false,
|
||||||
};
|
};
|
||||||
@ -67,11 +68,13 @@ function dsqlMethodCrud(_a) {
|
|||||||
action: "get",
|
action: "get",
|
||||||
table: tableName,
|
table: tableName,
|
||||||
query: finalQuery
|
query: finalQuery
|
||||||
? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), { user_id: user
|
? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), { user_id: ((_b = finalQuery.query) === null || _b === void 0 ? void 0 : _b.user_id)
|
||||||
|
? finalQuery.query.user_id
|
||||||
|
: user && addUser
|
||||||
? {
|
? {
|
||||||
value: String(user.id),
|
value: String(user.id),
|
||||||
}
|
}
|
||||||
: undefined }), limit: LIMIT, offset: OFFSET || undefined })
|
: undefined }), limit: LIMIT, offset: OFFSET })
|
||||||
: undefined,
|
: undefined,
|
||||||
sanitize,
|
sanitize,
|
||||||
});
|
});
|
||||||
@ -80,6 +83,7 @@ function dsqlMethodCrud(_a) {
|
|||||||
payload: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.payload,
|
payload: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.payload,
|
||||||
msg: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.msg,
|
msg: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.msg,
|
||||||
error: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.error,
|
error: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.error,
|
||||||
|
queryObject: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.queryObject,
|
||||||
};
|
};
|
||||||
break;
|
break;
|
||||||
case "POST":
|
case "POST":
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import sqlGenerator from "../../functions/dsql/sql/sql-generator";
|
||||||
import {
|
import {
|
||||||
DsqlCrudQueryObject,
|
DsqlCrudQueryObject,
|
||||||
DsqlMethodCrudParam,
|
DsqlMethodCrudParam,
|
||||||
@ -17,6 +18,7 @@ export type CRUDResponseObject<P extends any = any> = {
|
|||||||
payload?: P;
|
payload?: P;
|
||||||
msg?: string;
|
msg?: string;
|
||||||
error?: string;
|
error?: string;
|
||||||
|
queryObject?: ReturnType<Awaited<typeof sqlGenerator>>;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default async function dsqlMethodCrud<
|
export default async function dsqlMethodCrud<
|
||||||
@ -101,14 +103,16 @@ export default async function dsqlMethodCrud<
|
|||||||
...finalQuery,
|
...finalQuery,
|
||||||
query: {
|
query: {
|
||||||
...finalQuery.query,
|
...finalQuery.query,
|
||||||
user_id: user
|
user_id: finalQuery.query?.user_id
|
||||||
|
? finalQuery.query.user_id
|
||||||
|
: user && addUser
|
||||||
? {
|
? {
|
||||||
value: String(user.id),
|
value: String(user.id),
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
},
|
},
|
||||||
limit: LIMIT,
|
limit: LIMIT,
|
||||||
offset: OFFSET || undefined,
|
offset: OFFSET,
|
||||||
} as any)
|
} as any)
|
||||||
: undefined,
|
: undefined,
|
||||||
sanitize,
|
sanitize,
|
||||||
@ -119,6 +123,7 @@ export default async function dsqlMethodCrud<
|
|||||||
payload: GET_RESULT?.payload,
|
payload: GET_RESULT?.payload,
|
||||||
msg: GET_RESULT?.msg,
|
msg: GET_RESULT?.msg,
|
||||||
error: GET_RESULT?.error,
|
error: GET_RESULT?.error,
|
||||||
|
queryObject: GET_RESULT?.queryObject,
|
||||||
};
|
};
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@moduletrace/datasquirel",
|
"name": "@moduletrace/datasquirel",
|
||||||
"version": "3.9.3",
|
"version": "3.9.4",
|
||||||
"description": "Cloud-based SQL data management tool",
|
"description": "Cloud-based SQL data management tool",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
Loading…
Reference in New Issue
Block a user