Skip to content

Refactor table use cases and utilities for improved readability and maintainability #1687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artuomka merged 2 commits into from
Mar 25, 2026
Merged

Refactor table use cases and utilities for improved readability and maintainability #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8bf8da
Refactor table use cases and utilities for improved readability and m…
Artuomka Mar 24, 2026
b16f227
Merge branch 'main' into backend_refactoring_ts
Artuomka Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/src/entities/table/application/data-structures/found-table-rows.ds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export class FoundTableRowsDs {
table_settings: TableSettingsInRowsDS;
}

export class OrderingFiledDs {
export class OrderingFieldDs {
@ApiProperty()
field: string;

Expand Down
2 changes: 1 addition & 1 deletion backend/src/entities/table/application/data-structures/import-scv-in-table.ds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ export class ImportCSVInTableDs {
file: Express.Multer.File;
tableName: string;
connectionId: string;
materPwd: string;
masterPwd: string;
userId: string;
}
2 changes: 1 addition & 1 deletion backend/src/entities/table/table-datastructures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export class StructureRowInfoDs {
column_name: string;

@ApiProperty()
column_default: any;
column_default: string | number | boolean | null;

@ApiProperty()
data_type: string;
Expand Down
70 changes: 38 additions & 32 deletions backend/src/entities/table/table.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ export class TableController {
@Get('/table/rows/:connectionId')
async findAllRows(
@QueryTableName() tableName: string,
@Query('page') page: any,
@Query('perPage') perPage: any,
@Query('page') page: string,
@Query('perPage') perPage: string,
@Query('search') searchingFieldValue: string,
@Query() query,
@Query() query: Record<string, string>,
@SlugUuid('connectionId') connectionId: string,
@UserId() userId: string,
@MasterPassword() masterPwd: string,
Expand All @@ -205,10 +205,12 @@ export class TableController {
HttpStatus.BAD_REQUEST,
);
}
let parsedPage: number;
let parsedPerPage: number;
if (page && perPage) {
page = parseInt(page, 10);
perPage = parseInt(perPage, 10);
if ((page && page <= 0) || (perPage && perPage <= 0)) {
parsedPage = parseInt(page, 10);
parsedPerPage = parseInt(perPage, 10);
if ((parsedPage && parsedPage <= 0) || (parsedPerPage && parsedPerPage <= 0)) {
throw new HttpException(
{
message: Messages.PAGE_AND_PERPAGE_INVALID,
Expand All @@ -220,8 +222,8 @@ export class TableController {
const inputData: GetTableRowsDs = {
connectionId: connectionId,
masterPwd: masterPwd,
page: page,
perPage: perPage,
page: parsedPage,
perPage: parsedPerPage,
query: query,
searchingFieldValue: searchingFieldValue,
tableName: tableName,
Expand Down Expand Up @@ -249,10 +251,10 @@ export class TableController {
@Post('/table/rows/find/:connectionId')
async findAllRowsWithBodyFilter(
@QueryTableName() tableName: string,
@Query('page') page: any,
@Query('perPage') perPage: any,
@Query('page') page: string,
@Query('perPage') perPage: string,
@Query('search') searchingFieldValue: string,
@Query() query,
@Query() query: Record<string, string>,
@SlugUuid('connectionId') connectionId: string,
@UserId() userId: string,
@MasterPassword() masterPwd: string,
Expand All @@ -266,10 +268,12 @@ export class TableController {
HttpStatus.BAD_REQUEST,
);
}
let parsedPage: number;
let parsedPerPage: number;
if (page && perPage) {
page = parseInt(page, 10);
perPage = parseInt(perPage, 10);
if ((page && page <= 0) || (perPage && perPage <= 0)) {
parsedPage = parseInt(page, 10);
parsedPerPage = parseInt(perPage, 10);
if ((parsedPage && parsedPage <= 0) || (parsedPerPage && parsedPerPage <= 0)) {
throw new HttpException(
{
message: Messages.PAGE_AND_PERPAGE_INVALID,
Expand All @@ -281,8 +285,8 @@ export class TableController {
const inputData: GetTableRowsDs = {
connectionId: connectionId,
masterPwd: masterPwd,
page: page,
perPage: perPage,
page: parsedPage,
perPage: parsedPerPage,
query: query,
searchingFieldValue: searchingFieldValue,
tableName: tableName,
Expand Down Expand Up @@ -378,8 +382,8 @@ export class TableController {
@UseGuards(TableEditGuard)
@Put('/table/row/:connectionId')
async updateRowInTable(
@Body() body: string,
@Query() query: string,
@Body() body: Record<string, unknown>,
@Query() query: Record<string, string>,
@UserId() userId: string,
@MasterPassword() masterPwd: string,
@SlugUuid('connectionId') connectionId: string,
Expand All @@ -403,7 +407,7 @@ export class TableController {
connectionId: connectionId,
masterPwd: masterPwd,
primaryKey: primaryKey,
row: body as unknown as Record<string, unknown>,
row: body,
tableName: tableName,
userId: userId,
};
Expand All @@ -423,7 +427,7 @@ export class TableController {
@UseGuards(TableDeleteGuard)
@Delete('/table/row/:connectionId')
async deleteRowInTable(
@Query() query: string,
@Query() query: Record<string, string>,
@MasterPassword() masterPwd: string,
@SlugUuid('connectionId') connectionId: string,
@UserId() userId: string,
Expand Down Expand Up @@ -553,7 +557,7 @@ export class TableController {
@UseGuards(TableReadGuard)
@Get('/table/row/:connectionId')
async getRowByPrimaryKey(
@Query() query: string,
@Query() query: Record<string, string>,
@MasterPassword() masterPwd: string,
@SlugUuid('connectionId') connectionId: string,
@UserId() userId: string,
Expand Down Expand Up @@ -610,10 +614,10 @@ export class TableController {
@Post('/table/csv/export/:connectionId')
async exportCSVFromTable(
@QueryTableName() tableName: string,
@Query('page') page: any,
@Query('perPage') perPage: any,
@Query('page') page: string,
@Query('perPage') perPage: string,
@Query('search') searchingFieldValue: string,
@Query() query,
@Query() query: Record<string, string>,
@SlugUuid('connectionId') connectionId: string,
@UserId() userId: string,
@MasterPassword() masterPwd: string,
Expand All @@ -627,10 +631,12 @@ export class TableController {
HttpStatus.BAD_REQUEST,
);
}
let parsedPage: number;
let parsedPerPage: number;
if (page && perPage) {
page = parseInt(page, 10);
perPage = parseInt(perPage, 10);
if ((page && page <= 0) || (perPage && perPage <= 0)) {
parsedPage = parseInt(page, 10);
parsedPerPage = parseInt(perPage, 10);
if ((parsedPage && parsedPage <= 0) || (parsedPerPage && parsedPerPage <= 0)) {
throw new HttpException(
{
message: Messages.PAGE_AND_PERPAGE_INVALID,
Expand All @@ -642,8 +648,8 @@ export class TableController {
const inputData: GetTableRowsDs = {
connectionId: connectionId,
masterPwd: masterPwd,
page: page,
perPage: perPage,
page: parsedPage,
perPage: parsedPerPage,
query: query,
searchingFieldValue: searchingFieldValue,
tableName: tableName,
Expand Down Expand Up @@ -692,7 +698,7 @@ export class TableController {
connectionId: connectionId,
file: file,
tableName: tableName,
materPwd: masterPwd,
masterPwd: masterPwd,
userId: userId,
};
await this.importCSVToTableUseCase.execute(inputData, InTransactionEnum.OFF);
Expand All @@ -705,9 +711,9 @@ export class TableController {
userId: string,
connectionId: string,
tableName: string,
query: string,
query: Record<string, string>,
masterPwd: string,
): Promise<Array<any>> {
): Promise<Array<Record<string, unknown>>> {
const primaryKeys = [];
const connection = await this._dbContext.connectionRepository.findAndDecryptConnection(connectionId, masterPwd);
let userEmail: string;
Expand Down
Loading
Loading