From ccf0bb196d315092bc3e9177d49662562aba8c85 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 12 Apr 2023 16:53:24 +0530 Subject: [PATCH] fix: exist api correction Signed-off-by: Pranav C --- packages/nocodb-nest/src/db/BaseModelSqlv2.ts | 9 ++- .../modules/datas/data-alias.controller.ts | 56 +++++++++---------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/packages/nocodb-nest/src/db/BaseModelSqlv2.ts b/packages/nocodb-nest/src/db/BaseModelSqlv2.ts index dcb7cdc1a4..ac86e929e1 100644 --- a/packages/nocodb-nest/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb-nest/src/db/BaseModelSqlv2.ts @@ -181,11 +181,18 @@ class BaseModelSqlv2 { public async exist(id?: any): Promise { const qb = this.dbDriver(this.tnPath); + await this.model.getColumns(); const pks = this.model.primaryKeys; + + if(!pks.length) return false; + + qb.select(pks[0].column_name) + if ((id + '').split('___').length != pks?.length) { return false; } - return !!(await qb.where(_wherePk(pks, id)).first()); + qb.where(_wherePk(pks, id)).first() + return !!(await qb); } // todo: add support for sortArrJson diff --git a/packages/nocodb-nest/src/modules/datas/data-alias.controller.ts b/packages/nocodb-nest/src/modules/datas/data-alias.controller.ts index fe177fd426..7d677e7023 100644 --- a/packages/nocodb-nest/src/modules/datas/data-alias.controller.ts +++ b/packages/nocodb-nest/src/modules/datas/data-alias.controller.ts @@ -2,27 +2,27 @@ import { Body, Controller, Delete, - Get, HttpCode, + Get, + HttpCode, Param, Patch, Post, Request, Response, UseGuards, -} from '@nestjs/common' -import { AuthGuard } from '@nestjs/passport' -import { parseHrtimeToSeconds } from '../../helpers' +} from '@nestjs/common'; +import { AuthGuard } from '@nestjs/passport'; +import { parseHrtimeToSeconds } from '../../helpers'; import { Acl, ExtractProjectIdMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware' -import { DatasService } from './datas.service' +} from '../../middlewares/extract-project-id/extract-project-id.middleware'; +import { DatasService } from './datas.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, AuthGuard('jwt')) export class DataAliasController { - constructor(private readonly datasService: DatasService) { - } + constructor(private readonly datasService: DatasService) {} // todo: Handle the error case where view doesnt belong to model @Get([ @@ -37,16 +37,16 @@ export class DataAliasController { @Param('tableName') tableName: string, @Param('viewName') viewName: string, ) { - const startTime = process.hrtime() + const startTime = process.hrtime(); const responseData = await this.datasService.dataList({ query: req.query, projectName: projectName, tableName: tableName, viewName: viewName, - }) - const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(startTime)) - res.setHeader('xc-db-response', elapsedSeconds) - res.json(responseData) + }); + const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(startTime)); + res.setHeader('xc-db-response', elapsedSeconds); + res.json(responseData); } @Get([ @@ -65,7 +65,7 @@ export class DataAliasController { projectName: projectName, tableName: tableName, viewName: viewName, - }) + }); } @Get([ @@ -84,7 +84,7 @@ export class DataAliasController { projectName: projectName, tableName: tableName, viewName: viewName, - }) + }); } @Get([ @@ -104,9 +104,9 @@ export class DataAliasController { projectName: projectName, tableName: tableName, viewName: viewName, - }) + }); - res.json(countResult) + res.json(countResult); } @Post([ @@ -128,7 +128,7 @@ export class DataAliasController { viewName: viewName, body: body, cookie: req, - }) + }); } @Patch([ @@ -150,7 +150,7 @@ export class DataAliasController { body: req.body, cookie: req, rowId: rowId, - }) + }); } @Delete([ @@ -171,7 +171,7 @@ export class DataAliasController { viewName: viewName, cookie: req, rowId: rowId, - }) + }); } @Get([ @@ -192,7 +192,7 @@ export class DataAliasController { viewName: viewName, rowId: rowId, query: req.query, - }) + }); } @Get([ @@ -214,9 +214,9 @@ export class DataAliasController { viewName: viewName, rowId: rowId, query: req.query, - }) + }); - res.json(exists) + res.json(exists); } // todo: Handle the error case where view doesnt belong to model @@ -234,16 +234,16 @@ export class DataAliasController { @Param('viewName') viewName: string, @Param('columnId') columnId: string, ) { - const startTime = process.hrtime() + const startTime = process.hrtime(); const groupedData = await this.datasService.groupedDataList({ projectName: projectName, tableName: tableName, viewName: viewName, query: req.query, columnId: columnId, - }) - const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(startTime)) - res.setHeader('xc-db-response', elapsedSeconds) - res.json(groupedData) + }); + const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(startTime)); + res.setHeader('xc-db-response', elapsedSeconds); + res.json(groupedData); } }