From f4c0ce50abbd398c4e3f9661d6549983716ba02f Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 2 Mar 2023 17:20:39 +0530 Subject: [PATCH] fix: api handler order correction Signed-off-by: Pranav C --- .../src/lib/controllers/dataApis/index.ts | 2 +- .../dataController/dataAliasNestedApis.ts | 291 ++++++++++++++++++ .../src/lib/services/dataService/index.ts | 6 +- 3 files changed, 295 insertions(+), 4 deletions(-) create mode 100644 packages/nocodb/src/lib/controllers/dataController/dataAliasNestedApis.ts diff --git a/packages/nocodb/src/lib/controllers/dataApis/index.ts b/packages/nocodb/src/lib/controllers/dataApis/index.ts index 34bb194ee0..3a4528a5e1 100644 --- a/packages/nocodb/src/lib/controllers/dataApis/index.ts +++ b/packages/nocodb/src/lib/controllers/dataApis/index.ts @@ -2,7 +2,7 @@ import dataApis from './dataApis'; import oldDataApis from './oldDataApis'; import dataAliasApis from './dataAliasApis'; import bulkDataAliasApis from './bulkDataAliasApis'; -import dataAliasNestedApis from './dataAliasNestedApis'; +import dataAliasNestedApis from '../../../controllers/dataController/dataAliasNestedApis'; import dataAliasExportApis from './dataAliasExportApis'; export { diff --git a/packages/nocodb/src/lib/controllers/dataController/dataAliasNestedApis.ts b/packages/nocodb/src/lib/controllers/dataController/dataAliasNestedApis.ts new file mode 100644 index 0000000000..eb11f56d45 --- /dev/null +++ b/packages/nocodb/src/lib/controllers/dataController/dataAliasNestedApis.ts @@ -0,0 +1,291 @@ +import { Request, Response, Router } from 'express'; +import Model from '../../models/Model'; +import Base from '../../models/Base'; +import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2'; +import { PagedResponseImpl } from '../../meta/helpers/PagedResponse'; +import ncMetaAclMw from '../../meta/helpers/ncMetaAclMw'; +import { + getColumnByIdOrName, + getViewAndModelFromRequestByAliasOrId, +} from '../../meta/api/dataApis/helpers'; +import { NcError } from '../../meta/helpers/catchError'; +import apiMetrics from '../../meta/helpers/apiMetrics'; + +// todo: handle case where the given column is not ltar +export async function mmList(req: Request, res: Response, next) { + const { model, view } = await getViewAndModelFromRequestByAliasOrId(req); + + if (!model) return next(new Error('Table not found')); + + const base = await Base.get(model.base_id); + + const baseModel = await Model.getBaseModelSQL({ + id: model.id, + viewId: view?.id, + dbDriver: NcConnectionMgrv2.get(base), + }); + + const column = await getColumnByIdOrName(req.params.columnName, model); + + const data = await baseModel.mmList( + { + colId: column.id, + parentId: req.params.rowId, + }, + req.query as any + ); + const count: any = await baseModel.mmListCount({ + colId: column.id, + parentId: req.params.rowId, + }); + + res.json( + new PagedResponseImpl(data, { + count, + ...req.query, + }) + ); +} + +export async function mmExcludedList(req: Request, res: Response, next) { + const { model, view } = await getViewAndModelFromRequestByAliasOrId(req); + if (!model) return next(new Error('Table not found')); + + const base = await Base.get(model.base_id); + + const baseModel = await Model.getBaseModelSQL({ + id: model.id, + viewId: view?.id, + dbDriver: NcConnectionMgrv2.get(base), + }); + const column = await getColumnByIdOrName(req.params.columnName, model); + + const data = await baseModel.getMmChildrenExcludedList( + { + colId: column.id, + pid: req.params.rowId, + }, + req.query + ); + + const count = await baseModel.getMmChildrenExcludedListCount( + { + colId: column.id, + pid: req.params.rowId, + }, + req.query + ); + + res.json( + new PagedResponseImpl(data, { + count, + ...req.query, + }) + ); +} + +export async function hmExcludedList(req: Request, res: Response, next) { + const { model, view } = await getViewAndModelFromRequestByAliasOrId(req); + + if (!model) return next(new Error('Table not found')); + + const base = await Base.get(model.base_id); + + const baseModel = await Model.getBaseModelSQL({ + id: model.id, + viewId: view?.id, + dbDriver: NcConnectionMgrv2.get(base), + }); + + const column = await getColumnByIdOrName(req.params.columnName, model); + + const data = await baseModel.getHmChildrenExcludedList( + { + colId: column.id, + pid: req.params.rowId, + }, + req.query + ); + + const count = await baseModel.getHmChildrenExcludedListCount( + { + colId: column.id, + pid: req.params.rowId, + }, + req.query + ); + + res.json( + new PagedResponseImpl(data, { + count, + ...req.query, + }) + ); +} + +export async function btExcludedList(req: Request, res: Response, next) { + const { model, view } = await getViewAndModelFromRequestByAliasOrId(req); + if (!model) return next(new Error('Table not found')); + + const base = await Base.get(model.base_id); + + const baseModel = await Model.getBaseModelSQL({ + id: model.id, + viewId: view?.id, + dbDriver: NcConnectionMgrv2.get(base), + }); + + const column = await getColumnByIdOrName(req.params.columnName, model); + + const data = await baseModel.getBtChildrenExcludedList( + { + colId: column.id, + cid: req.params.rowId, + }, + req.query + ); + + const count = await baseModel.getBtChildrenExcludedListCount( + { + colId: column.id, + cid: req.params.rowId, + }, + req.query + ); + + res.json( + new PagedResponseImpl(data, { + count, + ...req.query, + }) + ); +} + +// todo: handle case where the given column is not ltar +export async function hmList(req: Request, res: Response, next) { + const { model, view } = await getViewAndModelFromRequestByAliasOrId(req); + if (!model) return next(new Error('Table not found')); + + const base = await Base.get(model.base_id); + + const baseModel = await Model.getBaseModelSQL({ + id: model.id, + viewId: view?.id, + dbDriver: NcConnectionMgrv2.get(base), + }); + + const column = await getColumnByIdOrName(req.params.columnName, model); + + const data = await baseModel.hmList( + { + colId: column.id, + id: req.params.rowId, + }, + req.query + ); + + const count = await baseModel.hmListCount({ + colId: column.id, + id: req.params.rowId, + }); + + res.json( + new PagedResponseImpl(data, { + count, + ...req.query, + } as any) + ); +} + +//@ts-ignore +async function relationDataRemove(req, res) { + const { model, view } = await getViewAndModelFromRequestByAliasOrId(req); + + if (!model) NcError.notFound('Table not found'); + + const base = await Base.get(model.base_id); + + const baseModel = await Model.getBaseModelSQL({ + id: model.id, + viewId: view?.id, + dbDriver: NcConnectionMgrv2.get(base), + }); + + const column = await getColumnByIdOrName(req.params.columnName, model); + + await baseModel.removeChild({ + colId: column.id, + childId: req.params.refRowId, + rowId: req.params.rowId, + cookie: req, + }); + + res.json({ msg: 'success' }); +} + +//@ts-ignore +// todo: Give proper error message when reference row is already related and handle duplicate ref row id in hm +async function relationDataAdd(req, res) { + const { model, view } = await getViewAndModelFromRequestByAliasOrId(req); + if (!model) NcError.notFound('Table not found'); + + const base = await Base.get(model.base_id); + + const baseModel = await Model.getBaseModelSQL({ + id: model.id, + viewId: view?.id, + dbDriver: NcConnectionMgrv2.get(base), + }); + + const column = await getColumnByIdOrName(req.params.columnName, model); + await baseModel.addChild({ + colId: column.id, + childId: req.params.refRowId, + rowId: req.params.rowId, + cookie: req, + }); + + res.json({ msg: 'success' }); +} + +const router = Router({ mergeParams: true }); + +router.get( + '/api/v1/db/data/:orgs/:projectName/:tableName/:rowId/mm/:columnName/exclude', + apiMetrics, + ncMetaAclMw(mmExcludedList, 'mmExcludedList') +); +router.get( + '/api/v1/db/data/:orgs/:projectName/:tableName/:rowId/hm/:columnName/exclude', + apiMetrics, + ncMetaAclMw(hmExcludedList, 'hmExcludedList') +); +router.get( + '/api/v1/db/data/:orgs/:projectName/:tableName/:rowId/bt/:columnName/exclude', + apiMetrics, + ncMetaAclMw(btExcludedList, 'btExcludedList') +); + +router.post( + '/api/v1/db/data/:orgs/:projectName/:tableName/:rowId/:relationType/:columnName/:refRowId', + apiMetrics, + ncMetaAclMw(relationDataAdd, 'relationDataAdd') +); +router.delete( + '/api/v1/db/data/:orgs/:projectName/:tableName/:rowId/:relationType/:columnName/:refRowId', + apiMetrics, + ncMetaAclMw(relationDataRemove, 'relationDataRemove') +); + +router.get( + '/api/v1/db/data/:orgs/:projectName/:tableName/:rowId/mm/:columnName', + apiMetrics, + ncMetaAclMw(mmList, 'mmList') +); +router.get( + '/api/v1/db/data/:orgs/:projectName/:tableName/:rowId/hm/:columnName', + apiMetrics, + ncMetaAclMw(hmList, 'hmList') +); + +export default router; diff --git a/packages/nocodb/src/lib/services/dataService/index.ts b/packages/nocodb/src/lib/services/dataService/index.ts index 40cbddab0c..1f1d09b20a 100644 --- a/packages/nocodb/src/lib/services/dataService/index.ts +++ b/packages/nocodb/src/lib/services/dataService/index.ts @@ -19,7 +19,7 @@ export async function dataFindOne(param: PathParams & { query: any }) { export async function dataGroupBy(param: PathParams & { query: any }) { const { model, view } = await getViewAndModelByAliasOrId(param); - await getDataGroupBy({ model, view, query: param.query }); + return await getDataGroupBy({ model, view, query: param.query }); } export async function dataCount(param: PathParams & { query: any }) { @@ -245,7 +245,7 @@ export async function dataExist( dbDriver: NcConnectionMgrv2.get(base), }); - await baseModel.exist(param.rowId); + return await baseModel.exist(param.rowId); } // todo: Handle the error case where view doesnt belong to model @@ -508,7 +508,7 @@ export async function hmExcludedList(param: { param.query ); - new PagedResponseImpl(data, { + return new PagedResponseImpl(data, { count, ...param.query, });