Skip to content

Refactor code structure for improved readability and maintainability #1602

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 4 commits into from
Feb 16, 2026
Merged

Refactor code structure for improved readability and maintainability #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82061b7
Refactor code structure for improved readability and maintainability
Artuomka Feb 16, 2026
689577a
fix: ensure await is used for asynchronous provider calls in AICoreSe…
Artuomka Feb 16, 2026
1562e6b
Merge branch 'main' into backend_biome_up
Artuomka Feb 16, 2026
c065693
biome imports fixes
Artuomka Feb 16, 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 autoadmin-ws-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"zod": "^4.3.6"
},
"devDependencies": {
"@biomejs/biome": "2.3.14",
"@biomejs/biome": "2.4.0",
"@types/jsonwebtoken": "^9.0.10",
"@types/node": "^22.10.2",
"@types/ws": "^8.18.1",
Expand Down
74 changes: 37 additions & 37 deletions autoadmin-ws-server/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ __metadata:
version: 6
cacheKey: 8

"@biomejs/biome@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/biome@npm:2.3.14"
"@biomejs/biome@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/biome@npm:2.4.0"
dependencies:
"@biomejs/cli-darwin-arm64": 2.3.14
"@biomejs/cli-darwin-x64": 2.3.14
"@biomejs/cli-linux-arm64": 2.3.14
"@biomejs/cli-linux-arm64-musl": 2.3.14
"@biomejs/cli-linux-x64": 2.3.14
"@biomejs/cli-linux-x64-musl": 2.3.14
"@biomejs/cli-win32-arm64": 2.3.14
"@biomejs/cli-win32-x64": 2.3.14
"@biomejs/cli-darwin-arm64": 2.4.0
"@biomejs/cli-darwin-x64": 2.4.0
"@biomejs/cli-linux-arm64": 2.4.0
"@biomejs/cli-linux-arm64-musl": 2.4.0
"@biomejs/cli-linux-x64": 2.4.0
"@biomejs/cli-linux-x64-musl": 2.4.0
"@biomejs/cli-win32-arm64": 2.4.0
"@biomejs/cli-win32-x64": 2.4.0
dependenciesMeta:
"@biomejs/cli-darwin-arm64":
optional: true
Expand All @@ -36,62 +36,62 @@ __metadata:
optional: true
bin:
biome: bin/biome
checksum: 05bc8b81e5c9f0b395e40cbcf2d0645776100fb9d10e5cebbadd9c5290fa8f05948c4bb1f685c65e9b4a9ad9d70a2320ab387a3a53d59818328a49ecb73b6cf8
checksum: 4712b7ce8513e4c26d2508c9c45297cb2622e4b9fc1fdf9132ebf53f2a55667df39e2f0bc270d65c070fdc7bc22cc12baadee11de44acc52733916759aa3c596
languageName: node
linkType: hard

"@biomejs/cli-darwin-arm64@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/cli-darwin-arm64@npm:2.3.14"
"@biomejs/cli-darwin-arm64@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/cli-darwin-arm64@npm:2.4.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@biomejs/cli-darwin-x64@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/cli-darwin-x64@npm:2.3.14"
"@biomejs/cli-darwin-x64@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/cli-darwin-x64@npm:2.4.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@biomejs/cli-linux-arm64-musl@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/cli-linux-arm64-musl@npm:2.3.14"
"@biomejs/cli-linux-arm64-musl@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/cli-linux-arm64-musl@npm:2.4.0"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@biomejs/cli-linux-arm64@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/cli-linux-arm64@npm:2.3.14"
"@biomejs/cli-linux-arm64@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/cli-linux-arm64@npm:2.4.0"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@biomejs/cli-linux-x64-musl@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/cli-linux-x64-musl@npm:2.3.14"
"@biomejs/cli-linux-x64-musl@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/cli-linux-x64-musl@npm:2.4.0"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@biomejs/cli-linux-x64@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/cli-linux-x64@npm:2.3.14"
"@biomejs/cli-linux-x64@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/cli-linux-x64@npm:2.4.0"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@biomejs/cli-win32-arm64@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/cli-win32-arm64@npm:2.3.14"
"@biomejs/cli-win32-arm64@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/cli-win32-arm64@npm:2.4.0"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@biomejs/cli-win32-x64@npm:2.3.14":
version: 2.3.14
resolution: "@biomejs/cli-win32-x64@npm:2.3.14"
"@biomejs/cli-win32-x64@npm:2.4.0":
version: 2.4.0
resolution: "@biomejs/cli-win32-x64@npm:2.4.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
Expand Down Expand Up @@ -1087,7 +1087,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "rocketadmin-ws-server@workspace:."
dependencies:
"@biomejs/biome": 2.3.14
"@biomejs/biome": 2.4.0
"@hono/node-server": ^1.19.9
"@types/jsonwebtoken": ^9.0.10
"@types/node": ^22.10.2
Expand Down
24 changes: 12 additions & 12 deletions backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
},
"dependencies": {
"@amplitude/node": "1.10.2",
"@aws-sdk/client-bedrock-runtime": "^3.987.0",
"@aws-sdk/client-s3": "^3.987.0",
"@aws-sdk/lib-dynamodb": "^3.987.0",
"@aws-sdk/s3-request-presigner": "^3.987.0",
"@aws-sdk/client-bedrock-runtime": "^3.990.0",
"@aws-sdk/client-s3": "^3.990.0",
"@aws-sdk/lib-dynamodb": "^3.990.0",
"@aws-sdk/s3-request-presigner": "^3.990.0",
Comment on lines +28 to +31

Copilot AI Feb 16, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aws-sdk/lib-dynamodb v3.990.0 has a required peer dependency on @aws-sdk/client-dynamodb ^3.990.0 (see yarn.lock entry). backend/package.json bumps @aws-sdk/lib-dynamodb to ^3.990.0 but does not add a matching @aws-sdk/client-dynamodb, and the repo currently provides @aws-sdk/client-dynamodb ^3.987.0 via the shared workspace. This leaves the peer dependency unsatisfied/incompatible, which can trigger Yarn peer dependency errors/warnings and potentially load mismatched AWS SDK versions at runtime. Add @aws-sdk/client-dynamodb ^3.990.0 to backend (and ideally align the shared workspace AWS SDK versions too).

Copilot uses AI. Check for mistakes.
"@electric-sql/pglite": "^0.3.15",
"@faker-js/faker": "^10.3.0",
"@langchain/aws": "^1.2.2",
"@langchain/core": "^1.1.22",
"@langchain/aws": "^1.2.3",
"@langchain/core": "^1.1.24",
"@langchain/openai": "^1.2.7",
"@nestjs/common": "11.1.13",
"@nestjs/config": "4.0.3",
Expand All @@ -45,11 +45,11 @@
"@nestjsx/crud": "4.6.2",
"@rocketadmin/shared-code": "workspace:*",
"@sentry/minimal": "^6.19.7",
"@sentry/node": "10.38.0",
"@sentry/node": "10.39.0",
"@types/crypto-js": "^4.2.2",
"@types/jsonwebtoken": "^9.0.10",
"@types/multer": "^2.0.0",
"@types/nodemailer": "^7.0.9",
"@types/nodemailer": "^7.0.10",
"@types/nunjucks": "^3.2.6",
"@types/qrcode": "^1.5.6",
"@zapier/secret-scrubber": "^1.1.6",
Expand All @@ -65,7 +65,7 @@
"crc": "^4.3.2",
"crypto-js": "4.2.0",
"csv": "^6.4.1",
"dotenv": "17.2.4",
"dotenv": "17.3.1",
"express": "5.2.1",
"fetch-blob": "^4.0.0",
"helmet": "8.1.0",
Expand All @@ -74,20 +74,20 @@
"json2csv": "^5.0.7",
"jsonwebtoken": "^9.0.3",
"knex": "3.1.0",
"langchain": "^1.2.21",
"langchain": "^1.2.24",
"lru-cache": "^11.2.6",
"nanoid": "5.1.6",
"nodemailer": "^8.0.1",
"nunjucks": "^3.2.4",
"openai": "^6.21.0",
"openai": "^6.22.0",
"otplib": "^12.0.1",
"p-queue": "9.1.0",
"pg": "^8.18.0",
"pg-connection-string": "^2.11.0",
"qrcode": "^1.5.4",
"query-string": "^9.3.1",
"reflect-metadata": "0.2.2",
"rimraf": "6.1.2",
"rimraf": "6.1.3",
"rxjs": "7.8.2",
"safe-regex2": "^5.0.0",
"secure-json-parse": "4.1.0",
Expand Down
1 change: 1 addition & 0 deletions backend/public/email-templates/rocketadmin-reminder-email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- biome-ignore-all lint/a11y/useHtmlLang: <explanation> -->
<!doctype html>
<html>
<head>
Expand Down
24 changes: 12 additions & 12 deletions backend/src/ai-core/services/ai-core.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,50 +35,50 @@ export class AICoreService implements IAIService {
}

public async complete(prompt: string, config?: AIProviderConfig): Promise<string> {
return this.getProvider().generateCompletion(prompt, config);
return await this.getProvider().generateCompletion(prompt, config);
}

public async completeWithProvider(
provider: AIProviderType,
prompt: string,
config?: AIProviderConfig,
): Promise<string> {
return this.getProvider(provider).generateCompletion(prompt, config);
return await this.getProvider(provider).generateCompletion(prompt, config);
}

public async chat(messages: BaseMessage[], config?: AIProviderConfig): Promise<AICompletionResult> {
return this.getProvider().generateChatCompletion(messages, config);
return await this.getProvider().generateChatCompletion(messages, config);
}

public async chatWithProvider(
provider: AIProviderType,
messages: BaseMessage[],
config?: AIProviderConfig,
): Promise<AICompletionResult> {
return this.getProvider(provider).generateChatCompletion(messages, config);
return await this.getProvider(provider).generateChatCompletion(messages, config);
}

public async streamChat(
messages: BaseMessage[],
config?: AIProviderConfig,
): Promise<IterableReadableStream<AIStreamChunk>> {
return this.getProvider().generateStreamingCompletion(messages, config);
return await this.getProvider().generateStreamingCompletion(messages, config);
}

public async streamChatWithProvider(
provider: AIProviderType,
messages: BaseMessage[],
config?: AIProviderConfig,
): Promise<IterableReadableStream<AIStreamChunk>> {
return this.getProvider(provider).generateStreamingCompletion(messages, config);
return await this.getProvider(provider).generateStreamingCompletion(messages, config);
}

public async chatWithTools(
messages: BaseMessage[],
tools: AIToolDefinition[],
config?: AIProviderConfig,
): Promise<AICompletionResult> {
return this.getProvider().generateWithTools(messages, tools, config);
return await this.getProvider().generateWithTools(messages, tools, config);
}

public async chatWithToolsAndProvider(
Expand All @@ -87,15 +87,15 @@ export class AICoreService implements IAIService {
tools: AIToolDefinition[],
config?: AIProviderConfig,
): Promise<AICompletionResult> {
return this.getProvider(provider).generateWithTools(messages, tools, config);
return await this.getProvider(provider).generateWithTools(messages, tools, config);
}

public async streamChatWithTools(
messages: BaseMessage[],
tools: AIToolDefinition[],
config?: AIProviderConfig,
): Promise<IterableReadableStream<AIStreamChunk>> {
return this.getProvider().generateStreamingWithTools(messages, tools, config);
return await this.getProvider().generateStreamingWithTools(messages, tools, config);
}

public async streamChatWithToolsAndProvider(
Expand All @@ -104,7 +104,7 @@ export class AICoreService implements IAIService {
tools: AIToolDefinition[],
config?: AIProviderConfig,
): Promise<IterableReadableStream<AIStreamChunk>> {
return this.getProvider(provider).generateStreamingWithTools(messages, tools, config);
return await this.getProvider(provider).generateStreamingWithTools(messages, tools, config);
}

public async continueAfterToolCall(
Expand All @@ -113,7 +113,7 @@ export class AICoreService implements IAIService {
tools: AIToolDefinition[],
config?: AIProviderConfig,
): Promise<AICompletionResult> {
return this.getProvider().continueWithToolResults(messages, toolResults, tools, config);
return await this.getProvider().continueWithToolResults(messages, toolResults, tools, config);
}

public async continueStreamingAfterToolCall(
Expand All @@ -122,7 +122,7 @@ export class AICoreService implements IAIService {
tools: AIToolDefinition[],
config?: AIProviderConfig,
): Promise<IterableReadableStream<AIStreamChunk>> {
return this.getProvider().continueStreamingWithToolResults(messages, toolResults, tools, config);
return await this.getProvider().continueStreamingWithToolResults(messages, toolResults, tools, config);
}

public getDefaultProvider(): AIProviderType {
Expand Down
6 changes: 3 additions & 3 deletions backend/src/entities/table-categories/table-categories.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ import { UseCaseType } from '../../common/data-injection.tokens.js';
import { MasterPassword } from '../../decorators/master-password.decorator.js';
import { SlugUuid } from '../../decorators/slug-uuid.decorator.js';
import { Timeout } from '../../decorators/timeout.decorator.js';
import { UserId } from '../../decorators/user-id.decorator.js';
import { InTransactionEnum } from '../../enums/in-transaction.enum.js';
import { ConnectionEditGuard } from '../../guards/connection-edit.guard.js';
import { TablesReceiveGuard } from '../../guards/tables-receive.guard.js';
import { SentryInterceptor } from '../../interceptors/sentry.interceptor.js';
import { FindTablesDs } from '../table/application/data-structures/find-tables.ds.js';
import { CreateOrUpdateTableCategoriesDS } from './data-sctructures/create-or-update-table-categories.ds.js';
import { CreateTableCategoryDto } from './dto/create-table-category.dto.js';
import { FoundTableCategoriesWithTablesRo } from './dto/found-table-categories-with-tables.ro.js';
import { FoundTableCategoryRo } from './dto/found-table-category.ro.js';
import {
ICreateTableCategories,
IFindTableCategories,
IFindTableCategoriesWithTables,
} from './use-cases/table-categories-use-cases.interface.js';
import { FoundTableCategoriesWithTablesRo } from './dto/found-table-categories-with-tables.ro.js';
import { UserId } from '../../decorators/user-id.decorator.js';
import { FindTablesDs } from '../table/application/data-structures/find-tables.ds.js';

@UseInterceptors(SentryInterceptor)
@Timeout()
Expand Down
2 changes: 1 addition & 1 deletion ...end/src/entities/table-categories/use-cases/find-table-categories-with-tables.use.case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import { isConnectionTypeAgent } from '../../../helpers/is-connection-entity-age
import { isObjectPropertyExists } from '../../../helpers/validators/is-object-property-exists-validator.js';
import { ConnectionEntity } from '../../connection/connection.entity.js';
import { ITableAndViewPermissionData } from '../../permission/permission.interface.js';
import { TableSettingsEntity } from '../../table-settings/common-table-settings/table-settings.entity.js';
import { FindTablesDs } from '../../table/application/data-structures/find-tables.ds.js';
import { FoundTableDs } from '../../table/application/data-structures/found-table.ds.js';
import { TableSettingsEntity } from '../../table-settings/common-table-settings/table-settings.entity.js';
import { FoundTableCategoriesWithTablesRo } from '../dto/found-table-categories-with-tables.ro.js';
import { IFindTableCategoriesWithTables } from './table-categories-use-cases.interface.js';

Expand Down
2 changes: 1 addition & 1 deletion backend/src/entities/table/use-cases/find-tables-in-connection.use.case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
import { TableDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table.ds.js';
import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js';
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
import * as Sentry from '@sentry/node';
import PQueue from 'p-queue';
import AbstractUseCase from '../../../common/abstract-use.case.js';
Expand Down
2 changes: 1 addition & 1 deletion backend/src/entities/table/use-cases/get-row-by-primary-key.use.case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* eslint-disable prefer-const */
import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js';
import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js';
import { ReferencedTableNamesAndColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/referenced-table-names-columns.ds.js';
import { buildDAOsTableSettingsDs } from '@rocketadmin/shared-code/dist/src/helpers/data-structures-builders/table-settings.ds.builder.js';
import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
import JSON5 from 'json5';
import AbstractUseCase from '../../../common/abstract-use.case.js';
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
Expand Down
2 changes: 1 addition & 1 deletion backend/src/entities/table/use-cases/get-table-rows.use.case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { BadRequestException, HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js';
import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js';
Expand All @@ -8,7 +9,6 @@ import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/en
import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
import { FoundRowsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/found-rows.ds.js';
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
import Sentry from '@sentry/minimal';
import JSON5 from 'json5';
import AbstractUseCase from '../../../common/abstract-use.case.js';
Expand Down
2 changes: 1 addition & 1 deletion backend/src/entities/table/use-cases/get-table-structure.use.case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js';
import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js';
import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
import JSON5 from 'json5';
import AbstractUseCase from '../../../common/abstract-use.case.js';
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
Expand Down
Loading
Loading