From 4729440761cfe608ab8935d782238ae7fe55343b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20G=C3=B3mez?= Date: Fri, 13 Oct 2023 10:52:18 +0200 Subject: [PATCH] Change relative import paths to non-relative path aliases (#749) * Change refs to path aliases * Change more refs to path aliases * Change all relative imports to non-relative * Fix bad imports --- src/app.module.e2e-spec.ts | 2 +- src/app.module.ts | 56 ++++----- .../fake.configuration.service.spec.ts | 2 +- .../__tests__/fake.configuration.service.ts | 2 +- src/config/configuration.module.spec.ts | 2 +- src/config/configuration.module.ts | 8 +- src/config/configuration.validator.spec.ts | 2 +- .../entities/__tests__/configuration.ts | 2 +- src/config/nest.configuration.service.spec.ts | 4 +- src/config/nest.configuration.service.ts | 2 +- .../__tests__/fake.cache.service.spec.ts | 4 +- .../cache/__tests__/fake.cache.service.ts | 4 +- .../cache/__tests__/test.cache.module.ts | 4 +- .../cache/cache.first.data.source.module.ts | 4 +- .../cache/cache.first.data.source.spec.ts | 14 +-- .../cache/cache.first.data.source.ts | 17 +-- src/datasources/cache/cache.module.ts | 6 +- src/datasources/cache/cache.router.ts | 2 +- .../cache/cache.service.interface.ts | 2 +- .../cache/redis.cache.service.spec.ts | 6 +- src/datasources/cache/redis.cache.service.ts | 8 +- .../config-api/config-api.module.ts | 6 +- .../config-api/config-api.service.spec.ts | 14 +-- .../config-api/config-api.service.ts | 11 +- .../errors/http-error-factory.spec.ts | 6 +- src/datasources/errors/http-error-factory.ts | 4 +- .../exchange-api/exchange-api.module.ts | 6 +- .../exchange-api/exchange-api.service.spec.ts | 8 +- .../exchange-api/exchange-api.service.ts | 10 +- .../human-description-api.module.ts | 2 +- .../human-description-api.service.spec.ts | 2 +- .../human-description-api.service.ts | 2 +- .../human-description-api/json/index.ts | 2 +- .../network/__tests__/test.network.module.ts | 5 +- .../network/axios.network.service.spec.ts | 10 +- .../network/axios.network.service.ts | 16 +-- .../network/network.module.spec.ts | 4 +- src/datasources/network/network.module.ts | 6 +- .../network/network.service.interface.ts | 4 +- .../transaction-api.manager.spec.ts | 12 +- .../transaction-api.manager.ts | 21 ++-- .../transaction-api/transaction-api.module.ts | 6 +- .../transaction-api.service.spec.ts | 18 +-- .../transaction-api.service.ts | 14 +-- src/domain.module.ts | 118 +++++++++--------- .../backbone/backbone.repository.interface.ts | 2 +- src/domain/backbone/backbone.repository.ts | 6 +- src/domain/backbone/backbone.validator.ts | 12 +- .../entities/__tests__/backbone.builder.ts | 2 +- .../entities/schemas/backbone.schema.ts | 2 +- .../balances/balances.repository.interface.ts | 2 +- src/domain/balances/balances.repository.ts | 8 +- src/domain/balances/balances.validator.ts | 12 +- .../entities/__tests__/balance.builder.ts | 4 +- .../__tests__/balance.token.builder.ts | 2 +- .../balances/entities/balance.entity.ts | 2 +- .../entities/schemas/balance.schema.ts | 2 +- .../chains/chains.repository.interface.ts | 6 +- src/domain/chains/chains.repository.ts | 16 +-- src/domain/chains/chains.validator.ts | 10 +- .../block-explorer-uri-template.builder.ts | 2 +- .../entities/__tests__/chain.builder.ts | 16 +-- .../gas-price-fixed-eip-1559.builder.ts | 2 +- .../__tests__/gas-price-fixed.builder.ts | 2 +- .../__tests__/gas-price-oracle.builder.ts | 2 +- .../entities/__tests__/master-copy.builder.ts | 2 +- .../__tests__/native.currency.builder.ts | 2 +- .../entities/__tests__/rpc-uri.builder.ts | 4 +- .../entities/__tests__/theme.builder.ts | 2 +- src/domain/chains/entities/chain.entity.ts | 14 +-- .../entities/gas-price-oracle.entity.ts | 2 +- src/domain/chains/entities/rpc-uri.entity.ts | 2 +- .../chains/entities/schemas/chain.schema.ts | 18 +-- .../entities/schemas/master-copy.schema.ts | 2 +- src/domain/chains/master-copy.validator.ts | 10 +- .../collectibles.repository.interface.ts | 4 +- .../collectibles/collectibles.repository.ts | 10 +- .../collectibles/collectibles.validator.ts | 10 +- .../entities/__tests__/collectible.builder.ts | 2 +- .../entities/schemas/collectible.schema.ts | 2 +- .../contracts.repository.interface.ts | 2 +- src/domain/contracts/contracts.repository.ts | 8 +- src/domain/contracts/contracts.validator.ts | 10 +- .../entities/__tests__/contract.builder.ts | 2 +- .../data-decoded.repository.interface.ts | 2 +- .../data-decoder/data-decoded.repository.ts | 8 +- .../data-decoder/data-decoded.validator.ts | 10 +- .../__tests__/data-decoded.builder.ts | 5 +- .../delegate/delegate.repository.interface.ts | 4 +- src/domain/delegate/delegate.repository.ts | 10 +- src/domain/delegate/delegate.validator.ts | 10 +- .../entities/__tests__/delegate.builder.ts | 2 +- .../entities/schemas/delegate.schema.ts | 2 +- src/domain/entities/__tests__/page.builder.ts | 2 +- .../entities/__tests__/estimation.builder.ts | 2 +- .../entities/get-estimation.dto.entity.ts | 2 +- .../entities/schemas/estimation.schema.ts | 2 +- .../estimations.repository.interface.ts | 4 +- .../estimations/estimations.repository.ts | 10 +- .../estimations/estimations.validator.ts | 10 +- .../__tests__/exchange-fiat-codes.builder.ts | 2 +- .../__tests__/exchange-rates.builder.ts | 2 +- .../schemas/exchange-fiat-codes.schema.ts | 2 +- .../entities/schemas/exchange-rates.schema.ts | 2 +- .../exchange/exchange-fiat-codes.validator.ts | 10 +- .../exchange/exchange-rates.validator.ts | 10 +- src/domain/exchange/exchange.repository.ts | 8 +- .../flush/flush.repository.interface.ts | 2 +- src/domain/flush/flush.repository.ts | 8 +- .../health/health.repository.interface.ts | 2 +- src/domain/health/health.repository.ts | 8 +- .../human-description-template.entity.ts | 6 +- .../human-description.repository.interface.ts | 2 +- .../human-description.repository.ts | 10 +- src/domain/interfaces/config-api.interface.ts | 6 +- .../interfaces/exchange-api.interface.ts | 4 +- .../human-description-api.interface.ts | 2 +- .../interfaces/page-validator.interface.ts | 2 +- .../interfaces/transaction-api.interface.ts | 44 +++---- .../transaction-api.manager.interface.ts | 2 +- .../__tests__/message-confirmation.builder.ts | 2 +- .../entities/__tests__/message.builder.ts | 4 +- .../messages/entities/message.entity.ts | 2 +- .../entities/schemas/message.schema.ts | 2 +- src/domain/messages/message.validator.ts | 14 +-- .../messages/messages.repository.interface.ts | 4 +- src/domain/messages/messages.repository.ts | 10 +- .../notifications.repository.interface.ts | 4 +- .../notifications/notifications.repository.ts | 8 +- src/domain/relay/limit-addresses.mapper.ts | 4 +- src/domain/relay/relay.module.ts | 2 +- src/domain/relay/relay.repository.ts | 9 +- .../safe-app-access-control.builder.ts | 2 +- .../__tests__/safe-app-provider.builder.ts | 2 +- .../safe-app-social-profile.builder.ts | 2 +- .../entities/__tests__/safe-app.builder.ts | 8 +- .../safe-apps/entities/safe-app.entity.ts | 6 +- .../entities/schemas/safe-app.schema.ts | 6 +- .../safe-apps.repository.interface.ts | 2 +- src/domain/safe-apps/safe-apps.repository.ts | 8 +- src/domain/safe-apps/safe-apps.validator.ts | 12 +- .../safe/creation-transaction.validator.ts | 12 +- .../__tests__/creation-transaction.builder.ts | 4 +- .../__tests__/erc20-transfer.builder.ts | 2 +- .../__tests__/erc721-transfer.builder.ts | 2 +- .../__tests__/ethereum-transaction.builder.ts | 2 +- .../__tests__/module-transaction.builder.ts | 4 +- ...ltisig-transaction-confirmation.builder.ts | 2 +- .../__tests__/multisig-transaction.builder.ts | 8 +- .../native-token-transfer.builder.ts | 2 +- .../safe/entities/__tests__/safe.builder.ts | 2 +- .../entities/creation-transaction.entity.ts | 2 +- .../entities/ethereum-transaction.entity.ts | 2 +- .../entities/module-transaction.entity.ts | 4 +- .../entities/multisig-transaction.entity.ts | 4 +- .../schemas/module-transaction.schema.ts | 2 +- .../schemas/multisig-transaction.schema.ts | 2 +- .../safe/entities/schemas/safe-list.schema.ts | 2 +- .../safe/entities/schemas/safe.schema.ts | 2 +- .../schemas/transaction-type.schema.ts | 2 +- .../safe/entities/schemas/transfer.schema.ts | 2 +- .../safe/entities/transaction.entity.ts | 8 +- .../safe/module-transaction.validator.ts | 16 +-- .../safe/multisig-transaction.validator.ts | 16 +-- src/domain/safe/safe-list.validator.ts | 10 +- src/domain/safe/safe.repository.interface.ts | 20 +-- src/domain/safe/safe.repository.ts | 38 +++--- src/domain/safe/safe.validator.ts | 9 +- src/domain/safe/transaction-type.validator.ts | 30 ++--- src/domain/safe/transfer.validator.ts | 24 ++-- src/domain/tokens/__tests__/token.builder.ts | 2 +- .../tokens/entities/schemas/token.schema.ts | 4 +- .../tokens/token.repository.interface.ts | 4 +- src/domain/tokens/token.repository.ts | 10 +- src/domain/tokens/token.validator.ts | 14 +-- .../propose-transaction.dto.entity.ts | 2 +- src/logging/__tests__/test.logging.module.ts | 2 +- src/logging/logging.module.ts | 4 +- src/logging/logging.service.spec.ts | 2 +- src/logging/logging.service.ts | 4 +- src/main.ts | 6 +- .../about/__tests__/get-about.e2e-spec.ts | 2 +- src/routes/about/about.controller.ts | 4 +- src/routes/about/about.module.ts | 4 +- src/routes/about/about.service.ts | 2 +- .../balances/balances.controller.spec.ts | 4 +- src/routes/balances/balances.controller.ts | 4 +- src/routes/balances/balances.module.ts | 4 +- src/routes/balances/balances.service.ts | 16 +-- .../balances/entities/balance.entity.ts | 2 +- .../balances/entities/balances.entity.ts | 2 +- src/routes/balances/entities/token.entity.ts | 2 +- .../cache-hooks.controller.spec.ts | 2 +- .../cache-hooks/cache-hooks.controller.ts | 26 ++-- src/routes/cache-hooks/cache-hooks.module.ts | 4 +- src/routes/cache-hooks/cache-hooks.service.ts | 28 ++--- .../entities/executed-transaction.entity.ts | 5 +- .../entities/incoming-ether.entity.ts | 5 +- .../entities/incoming-token.entity.ts | 5 +- .../entities/message-created.entity.ts | 5 +- .../entities/module-transaction.entity.ts | 5 +- .../entities/new-confirmation.entity.ts | 5 +- .../new-message-confirmation.entity.ts | 5 +- .../entities/outgoing-ether.entity.ts | 5 +- .../entities/outgoing-token.entity.ts | 5 +- .../entities/pending-transaction.entity.ts | 5 +- .../entities/schemas/chain-update.schema.ts | 2 +- .../schemas/executed-transaction.schema.ts | 4 +- .../entities/schemas/incoming-ether.schema.ts | 4 +- .../entities/schemas/incoming-token.schema.ts | 4 +- .../schemas/message-created.schema.ts | 4 +- .../schemas/module-transaction.schema.ts | 4 +- .../schemas/new-confirmation.schema.ts | 4 +- .../new-message-confirmation.schema.ts | 4 +- .../entities/schemas/outgoing-ether.schema.ts | 4 +- .../entities/schemas/outgoing-token.schema.ts | 4 +- .../schemas/pending-transaction.schema.ts | 4 +- .../schemas/safe-apps-update.schema.ts | 2 +- .../entities/schemas/web-hook.schema.ts | 20 +-- .../pipes/event-validation.pipe.ts | 48 +++---- src/routes/chains/chains.controller.spec.ts | 28 +++-- src/routes/chains/chains.controller.ts | 23 ++-- src/routes/chains/chains.module.ts | 4 +- src/routes/chains/chains.service.ts | 8 +- src/routes/chains/entities/backbone.entity.ts | 2 +- .../block-explorer-uri-template.entity.ts | 2 +- .../chains/entities/chain-page.entity.ts | 4 +- src/routes/chains/entities/chain.entity.ts | 20 +-- .../gas-price-fixed-eip-1559.entity.ts | 2 +- .../chains/entities/gas-price-fixed.entity.ts | 2 +- .../entities/gas-price-oracle.entity.ts | 2 +- .../chains/entities/native-currency.entity.ts | 2 +- src/routes/chains/entities/rpc-uri.entity.ts | 2 +- src/routes/chains/entities/theme.entity.ts | 2 +- .../collectibles.controller.spec.ts | 28 ++--- .../collectibles/collectibles.controller.ts | 16 +-- .../collectibles/collectibles.module.ts | 4 +- .../collectibles/collectibles.service.ts | 8 +- .../entities/collectible.entity.ts | 2 +- .../entities/collectible.page.entity.ts | 4 +- .../entities/address-info.builder.ts | 2 +- .../address-info/address-info.helper.ts | 2 +- .../address-info/address-info.module.ts | 2 +- .../pagination.data.decorator.spec.ts | 4 +- .../decorators/pagination.data.decorator.ts | 4 +- .../common/decorators/route.url.decorator.ts | 2 +- src/routes/common/decorators/utils.spec.ts | 2 +- src/routes/common/entities/page.entity.ts | 2 +- .../filters/global-error.filter.spec.ts | 4 +- .../route-logger.interceptor.spec.ts | 2 +- .../common/pagination/pagination.data.spec.ts | 4 +- .../contracts/contracts.controller.spec.ts | 2 +- src/routes/contracts/contracts.controller.ts | 4 +- src/routes/contracts/contracts.module.ts | 4 +- .../contracts/entities/contract.entity.ts | 2 +- .../__tests__/data-decode.e2e-spec.ts | 2 +- .../data-decode/data-decoded.controller.ts | 8 +- src/routes/data-decode/data-decoded.module.ts | 4 +- .../data-decode/data-decoded.service.ts | 4 +- .../__tests__/get-data-decoded.dto.builder.ts | 2 +- .../entities/data-decoded.entity.ts | 2 +- .../schemas/get-data-decoded.dto.schema.ts | 2 +- .../get-data-decoded.dto.validation.pipe.ts | 8 +- .../delegates/delegates.controller.spec.ts | 8 +- src/routes/delegates/delegates.controller.ts | 32 ++--- src/routes/delegates/delegates.module.ts | 4 +- src/routes/delegates/delegates.service.ts | 16 +-- .../__tests__/create-delegate.dto.builder.ts | 2 +- .../__tests__/delete-delegate.dto.builder.ts | 2 +- .../delete-safe-delegate.dto.builder.ts | 2 +- .../entities/delegate.page.entity.ts | 4 +- .../schemas/create-delegate.dto.schema.ts | 2 +- .../schemas/delete-delegate.dto.schema.ts | 2 +- .../delete-safe-delegate.dto.schema.ts | 2 +- .../schemas/get-delegate.dto.schema.ts | 2 +- .../create-delegate.dto.validation.pipe.ts | 8 +- .../delete-delegate.dto.validation.pipe.ts | 8 +- ...elete-safe-delegate.dto.validation.pipe.ts | 8 +- .../pipes/get-delegate.dto.validation.pipe.ts | 8 +- .../entities/get-estimation.dto.entity.ts | 2 +- .../schemas/get-estimation.dto.schema.ts | 2 +- .../estimations.controller.spec.ts | 4 +- .../estimations/estimations.controller.ts | 8 +- src/routes/estimations/estimations.module.ts | 4 +- src/routes/estimations/estimations.service.ts | 2 +- .../get-estimation.dto.validation.pipe.ts | 8 +- ...nvalidation-pattern-details.dto.builder.ts | 2 +- .../invalidation-pattern.dto.builder.ts | 4 +- src/routes/flush/flush.controller.spec.ts | 4 +- src/routes/flush/flush.controller.ts | 8 +- src/routes/flush/flush.module.ts | 4 +- src/routes/flush/flush.service.ts | 4 +- ...nvalidation-pattern.dto.validation.pipe.ts | 12 +- src/routes/health/health.controller.spec.ts | 2 +- src/routes/health/health.controller.ts | 4 +- src/routes/health/health.module.ts | 4 +- src/routes/health/health.service.ts | 4 +- .../__tests__/create-message.dto.builder.ts | 2 +- .../update-message-signature.dto.builder.ts | 2 +- .../entities/message-confirmation.entity.ts | 2 +- .../messages/entities/message-item.entity.ts | 2 +- .../messages/entities/message.entity.ts | 4 +- .../messages/entities/messages-page.entity.ts | 6 +- .../update-message-signature.dto.schema.ts | 2 +- src/routes/messages/mappers/message-mapper.ts | 15 ++- .../messages/messages.controller.spec.ts | 10 +- src/routes/messages/messages.controller.ts | 26 ++-- src/routes/messages/messages.module.ts | 8 +- src/routes/messages/messages.service.ts | 20 +-- .../create-message.dto.validation.pipe.ts | 8 +- ...e-message-signature.dto.validation.pipe.ts | 8 +- .../__tests__/register-device.dto.builder.ts | 4 +- .../__tests__/safe-registration.builder.ts | 2 +- .../entities/register-device.dto.entity.ts | 2 +- .../notifications.controller.spec.ts | 6 +- .../notifications/notifications.controller.ts | 4 +- .../notifications/notifications.module.ts | 4 +- .../notifications/notifications.service.ts | 6 +- .../owners/entities/safe-list.entity.ts | 2 +- src/routes/owners/owners.controller.spec.ts | 2 +- src/routes/owners/owners.controller.ts | 4 +- src/routes/owners/owners.module.ts | 4 +- src/routes/owners/owners.service.ts | 2 +- .../safe-app-access-control.entity.ts | 2 +- .../entities/safe-app-provider.entity.ts | 2 +- .../safe-app-social-profile.entity.ts | 2 +- .../safe-apps/entities/safe-app.entity.ts | 6 +- .../safe-apps/safe-apps.controller.spec.ts | 2 +- src/routes/safe-apps/safe-apps.controller.ts | 4 +- src/routes/safe-apps/safe-apps.module.ts | 4 +- src/routes/safe-apps/safe-apps.service.ts | 6 +- src/routes/safes/entities/safe-info.entity.ts | 2 +- src/routes/safes/safes.controller.spec.ts | 12 +- src/routes/safes/safes.controller.ts | 4 +- src/routes/safes/safes.module.ts | 6 +- src/routes/safes/safes.service.ts | 21 ++-- ...firmations.transactions.controller.spec.ts | 8 +- ...tion-by-id.transactions.controller.spec.ts | 8 +- ...rs-by-safe.transactions.controller.spec.ts | 8 +- ...ns-by-safe.transactions.controller.spec.ts | 4 +- ...ns-by-safe.transactions.controller.spec.ts | 4 +- ...ns-by-safe.transactions.controller.spec.ts | 6 +- ...ransaction.transactions.controller.spec.ts | 6 +- ...ransaction.transactions.controller.spec.ts | 8 +- .../entities/add-confirmation.dto.builder.ts | 2 +- .../preview-transaction.dto.builder.ts | 2 +- .../propose-transaction.dto.builder.ts | 2 +- .../__tests__/safe-app-info.builder.ts | 2 +- .../transfer-transaction-info.builder.ts | 6 +- .../entities/add-confirmation.dto.ts | 2 +- .../creation-transaction-info.entity.ts | 4 +- .../entities/custom-transaction.entity.ts | 4 +- .../entities/incoming-transfer-page.entity.ts | 4 +- .../entities/incoming-transfer.entity.ts | 2 +- .../entities/module-execution-info.entity.ts | 4 +- .../module-transaction-page.entity.ts | 4 +- .../entities/module-transaction.entity.ts | 4 +- .../multisig-execution-info.entity.ts | 4 +- .../multisig-transaction-page.entity.ts | 4 +- .../entities/multisig-transaction.entity.ts | 4 +- .../propose-transaction.dto.entity.ts | 2 +- .../entities/queued-item-page.entity.ts | 10 +- .../conflict-header-queued-item.entity.ts | 2 +- .../queued-items/label-queued-item.entity.ts | 2 +- .../transaction-queued-item.entity.ts | 6 +- .../schemas/add-confirmation.dto.schema.ts | 2 +- .../schemas/preview-transaction.dto.schema.ts | 2 +- .../schemas/propose-transaction.dto.schema.ts | 2 +- .../settings-change-transaction.entity.ts | 6 +- .../settings-changes/add-owner.entity.ts | 4 +- .../change-master-copy.entity.ts | 4 +- .../change-threshold.entity.ts | 2 +- .../entities/settings-changes/delete-guard.ts | 2 +- .../settings-changes/disable-module.entity.ts | 4 +- .../settings-changes/enable-module.entity.ts | 4 +- .../settings-changes/remove-owner.entity.ts | 4 +- .../set-fallback-handler.entity.ts | 4 +- .../settings-changes/set-guard.entity.ts | 4 +- .../settings-changes/swap-owner.entity.ts | 4 +- .../entities/transaction-data.entity.ts | 4 +- .../module-execution-details.entity.ts | 4 +- .../multisig-execution-details.entity.ts | 6 +- .../transaction-details.entity.ts | 12 +- .../entities/transaction-item-page.entity.ts | 6 +- .../entities/transaction-item.entity.ts | 4 +- .../entities/transaction-preview.entity.ts | 12 +- .../entities/transaction.entity.ts | 18 +-- .../transfer-transaction-info.entity.ts | 6 +- .../transfers/erc20-transfer.entity.ts | 2 +- .../transfers/erc721-transfer.entity.ts | 2 +- .../transfers/native-coin-transfer.entity.ts | 2 +- .../multisig-execution-details.builder.ts | 4 +- .../common/custom-transaction.mapper.spec.ts | 10 +- .../common/custom-transaction.mapper.ts | 12 +- .../common/data-decoded-param.helper.spec.ts | 2 +- .../mappers/common/erc20-transfer.mapper.ts | 12 +- .../mappers/common/erc721-transfer.mapper.ts | 12 +- .../common/human-description.mapper.ts | 4 +- .../common/human-descriptions.mapper.spec.ts | 10 +- .../common/native-coin-transfer.mapper.ts | 10 +- .../common/safe-app-info.mapper.spec.ts | 4 +- .../mappers/common/safe-app-info.mapper.ts | 2 +- .../common/settings-change.mapper.spec.ts | 28 ++--- .../mappers/common/settings-change.mapper.ts | 30 ++--- .../common/transaction-data.mapper.spec.ts | 12 +- .../mappers/common/transaction-data.mapper.ts | 20 +-- .../mappers/common/transaction-info.mapper.ts | 26 ++-- .../common/transfer-direction.helper.spec.ts | 4 +- .../common/transfer-direction.helper.ts | 2 +- .../creation-transaction.mapper.ts | 8 +- .../module-transaction-details.mapper.spec.ts | 18 +-- .../module-transaction-details.mapper.ts | 16 +-- .../module-transaction-status.mapper.ts | 2 +- .../module-transaction.mapper.ts | 12 +- ...ultisig-transaction-details.mapper.spec.ts | 24 ++-- .../multisig-transaction-details.mapper.ts | 20 +-- ...ansaction-execution-details.mapper.spec.ts | 12 +- ...ig-transaction-execution-details.mapper.ts | 10 +- ...-transaction-execution-info.mapper.spec.ts | 8 +- ...tisig-transaction-execution-info.mapper.ts | 6 +- ...multisig-transaction-status.mapper.spec.ts | 4 +- .../multisig-transaction-status.mapper.ts | 2 +- .../multisig-transaction.mapper.ts | 12 +- .../queued-items/queued-items.mapper.ts | 16 +-- .../mappers/transaction-preview.mapper.ts | 8 +- .../mappers/transactions-history.mapper.ts | 26 ++-- .../transfers/transfer-details.mapper.spec.ts | 6 +- .../transfers/transfer-details.mapper.ts | 11 +- .../transfers/transfer-info.mapper.spec.ts | 20 +-- .../mappers/transfers/transfer-info.mapper.ts | 16 +-- .../mappers/transfers/transfer.mapper.ts | 11 +- .../pipes/add-confirmation.validation.pipe.ts | 4 +- .../preview-transaction.validation.pipe.ts | 8 +- ...propose-transaction.dto.validation.pipe.ts | 8 +- .../transactions-history.controller.spec.ts | 12 +- .../transactions/transactions.controller.ts | 46 +++---- .../transactions/transactions.module.ts | 58 ++++----- .../transactions/transactions.service.ts | 48 +++---- .../providers/generic.validator.spec.ts | 4 +- src/validation/providers/generic.validator.ts | 2 +- .../providers/json-schema.service.ts | 2 +- .../keywords/is-date.keyword.spec.ts | 2 +- .../validation-error-factory.spec.ts | 2 +- src/validation/validation.module.ts | 6 +- 444 files changed, 1616 insertions(+), 1542 deletions(-) diff --git a/src/app.module.e2e-spec.ts b/src/app.module.e2e-spec.ts index 6a601de3be..d76dc63c09 100644 --- a/src/app.module.e2e-spec.ts +++ b/src/app.module.e2e-spec.ts @@ -1,5 +1,5 @@ import { Test } from '@nestjs/testing'; -import { AppModule } from './app.module'; +import { AppModule } from '@/app.module'; describe('Application bootstrap', () => { it('should init the app', async () => { diff --git a/src/app.module.ts b/src/app.module.ts index a81f6bbf88..152ff37f74 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -9,34 +9,34 @@ import { ClsMiddleware, ClsModule } from 'nestjs-cls'; import { v4 as uuidv4 } from 'uuid'; import { join } from 'path'; -import { ChainsModule } from './routes/chains/chains.module'; -import { BalancesModule } from './routes/balances/balances.module'; -import { NetworkModule } from './datasources/network/network.module'; -import { ConfigurationModule } from './config/configuration.module'; -import { CacheModule } from './datasources/cache/cache.module'; -import { DomainModule } from './domain.module'; -import { CacheHooksModule } from './routes/cache-hooks/cache-hooks.module'; -import { CollectiblesModule } from './routes/collectibles/collectibles.module'; -import { ContractsModule } from './routes/contracts/contracts.module'; -import { DataDecodedModule } from './routes/data-decode/data-decoded.module'; -import { DelegatesModule } from './routes/delegates/delegates.module'; -import { SafeAppsModule } from './routes/safe-apps/safe-apps.module'; -import { HealthModule } from './routes/health/health.module'; -import { OwnersModule } from './routes/owners/owners.module'; -import { AboutModule } from './routes/about/about.module'; -import { TransactionsModule } from './routes/transactions/transactions.module'; -import { SafesModule } from './routes/safes/safes.module'; -import { NotificationsModule } from './routes/notifications/notifications.module'; -import { EstimationsModule } from './routes/estimations/estimations.module'; -import { MessagesModule } from './routes/messages/messages.module'; -import { ValidationModule } from './validation/validation.module'; -import { FlushModule } from './routes/flush/flush.module'; -import { RequestScopedLoggingModule } from './logging/logging.module'; -import { RouteLoggerInterceptor } from './routes/common/interceptors/route-logger.interceptor'; -import { NotFoundLoggerMiddleware } from './middleware/not-found-logger.middleware'; -import configuration from './config/entities/configuration'; -import { GlobalErrorFilter } from './routes/common/filters/global-error.filter'; -import { DataSourceErrorFilter } from './routes/common/filters/data-source-error.filter'; +import { ChainsModule } from '@/routes/chains/chains.module'; +import { BalancesModule } from '@/routes/balances/balances.module'; +import { NetworkModule } from '@/datasources/network/network.module'; +import { ConfigurationModule } from '@/config/configuration.module'; +import { CacheModule } from '@/datasources/cache/cache.module'; +import { DomainModule } from '@/domain.module'; +import { CacheHooksModule } from '@/routes/cache-hooks/cache-hooks.module'; +import { CollectiblesModule } from '@/routes/collectibles/collectibles.module'; +import { ContractsModule } from '@/routes/contracts/contracts.module'; +import { DataDecodedModule } from '@/routes/data-decode/data-decoded.module'; +import { DelegatesModule } from '@/routes/delegates/delegates.module'; +import { SafeAppsModule } from '@/routes/safe-apps/safe-apps.module'; +import { HealthModule } from '@/routes/health/health.module'; +import { OwnersModule } from '@/routes/owners/owners.module'; +import { AboutModule } from '@/routes/about/about.module'; +import { TransactionsModule } from '@/routes/transactions/transactions.module'; +import { SafesModule } from '@/routes/safes/safes.module'; +import { NotificationsModule } from '@/routes/notifications/notifications.module'; +import { EstimationsModule } from '@/routes/estimations/estimations.module'; +import { MessagesModule } from '@/routes/messages/messages.module'; +import { ValidationModule } from '@/validation/validation.module'; +import { FlushModule } from '@/routes/flush/flush.module'; +import { RequestScopedLoggingModule } from '@/logging/logging.module'; +import { RouteLoggerInterceptor } from '@/routes/common/interceptors/route-logger.interceptor'; +import { NotFoundLoggerMiddleware } from '@/middleware/not-found-logger.middleware'; +import configuration from '@/config/entities/configuration'; +import { GlobalErrorFilter } from '@/routes/common/filters/global-error.filter'; +import { DataSourceErrorFilter } from '@/routes/common/filters/data-source-error.filter'; import { ServeStaticModule } from '@nestjs/serve-static'; // See https://github.com/nestjs/nest/issues/11967 diff --git a/src/config/__tests__/fake.configuration.service.spec.ts b/src/config/__tests__/fake.configuration.service.spec.ts index 8184e7d0e1..8f22a2eac0 100644 --- a/src/config/__tests__/fake.configuration.service.spec.ts +++ b/src/config/__tests__/fake.configuration.service.spec.ts @@ -1,4 +1,4 @@ -import { FakeConfigurationService } from './fake.configuration.service'; +import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service'; describe('FakeConfigurationService', () => { let configurationService: FakeConfigurationService; diff --git a/src/config/__tests__/fake.configuration.service.ts b/src/config/__tests__/fake.configuration.service.ts index 17dec8c028..b8b5a781ea 100644 --- a/src/config/__tests__/fake.configuration.service.ts +++ b/src/config/__tests__/fake.configuration.service.ts @@ -1,4 +1,4 @@ -import { IConfigurationService } from '../configuration.service.interface'; +import { IConfigurationService } from '@/config/configuration.service.interface'; export class FakeConfigurationService implements IConfigurationService { private configuration: Record = {}; diff --git a/src/config/configuration.module.spec.ts b/src/config/configuration.module.spec.ts index 77897498eb..803ada7a88 100644 --- a/src/config/configuration.module.spec.ts +++ b/src/config/configuration.module.spec.ts @@ -1,5 +1,5 @@ import { Test, TestingModule } from '@nestjs/testing'; -import { ConfigurationModule } from './configuration.module'; +import { ConfigurationModule } from '@/config/configuration.module'; describe('ConfigurationModule', () => { it(`ConfigurationModule is successfully created`, async () => { diff --git a/src/config/configuration.module.ts b/src/config/configuration.module.ts index 7f06146e1a..63e3ec211f 100644 --- a/src/config/configuration.module.ts +++ b/src/config/configuration.module.ts @@ -1,10 +1,10 @@ import { DynamicModule, Global, Module } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; -import { IConfigurationService } from './configuration.service.interface'; -import { NestConfigurationService } from './nest.configuration.service'; -import { validate } from './configuration.validator'; -import configuration from './entities/configuration'; import { ConfigFactory } from '@nestjs/config/dist/interfaces/config-factory.interface'; +import { IConfigurationService } from '@/config/configuration.service.interface'; +import { validate } from '@/config/configuration.validator'; +import configuration from '@/config/entities/configuration'; +import { NestConfigurationService } from '@/config/nest.configuration.service'; /** * A {@link Global} Module which provides local configuration support via {@link IConfigurationService} diff --git a/src/config/configuration.validator.spec.ts b/src/config/configuration.validator.spec.ts index 22bcb16ac0..534ab2a451 100644 --- a/src/config/configuration.validator.spec.ts +++ b/src/config/configuration.validator.spec.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; -import { validate } from './configuration.validator'; import { fakeJson } from '@/__tests__/faker'; +import { validate } from '@/config/configuration.validator'; describe('Configuration validator', () => { it('should bypass this validation on tests', () => { diff --git a/src/config/entities/__tests__/configuration.ts b/src/config/entities/__tests__/configuration.ts index 4bb67a56a0..ebe286dc09 100644 --- a/src/config/entities/__tests__/configuration.ts +++ b/src/config/entities/__tests__/configuration.ts @@ -1,5 +1,5 @@ import { faker } from '@faker-js/faker'; -import configuration from '../../entities/configuration'; +import configuration from '@/config/entities/configuration'; export default (): ReturnType => ({ about: { diff --git a/src/config/nest.configuration.service.spec.ts b/src/config/nest.configuration.service.spec.ts index 07c62dcf21..4407aba777 100644 --- a/src/config/nest.configuration.service.spec.ts +++ b/src/config/nest.configuration.service.spec.ts @@ -1,6 +1,6 @@ -import { NestConfigurationService } from './nest.configuration.service'; -import { ConfigService } from '@nestjs/config'; +import { NestConfigurationService } from '@/config/nest.configuration.service'; import { faker } from '@faker-js/faker'; +import { ConfigService } from '@nestjs/config'; const configService = { get: jest.fn(), diff --git a/src/config/nest.configuration.service.ts b/src/config/nest.configuration.service.ts index 39804c8d4b..a5bf64f0e2 100644 --- a/src/config/nest.configuration.service.ts +++ b/src/config/nest.configuration.service.ts @@ -1,6 +1,6 @@ +import { IConfigurationService } from '@/config/configuration.service.interface'; import { Injectable } from '@nestjs/common'; import { ConfigService as NestConfigService } from '@nestjs/config'; -import { IConfigurationService } from './configuration.service.interface'; @Injectable() export class NestConfigurationService implements IConfigurationService { diff --git a/src/datasources/cache/__tests__/fake.cache.service.spec.ts b/src/datasources/cache/__tests__/fake.cache.service.spec.ts index 718e361944..1791da1da0 100644 --- a/src/datasources/cache/__tests__/fake.cache.service.spec.ts +++ b/src/datasources/cache/__tests__/fake.cache.service.spec.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; import { range } from 'lodash'; -import { CacheDir } from '../entities/cache-dir.entity'; -import { FakeCacheService } from './fake.cache.service'; +import { FakeCacheService } from '@/datasources/cache/__tests__/fake.cache.service'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; describe('FakeCacheService', () => { let target: FakeCacheService; diff --git a/src/datasources/cache/__tests__/fake.cache.service.ts b/src/datasources/cache/__tests__/fake.cache.service.ts index 796c6eedd1..74841112c8 100644 --- a/src/datasources/cache/__tests__/fake.cache.service.ts +++ b/src/datasources/cache/__tests__/fake.cache.service.ts @@ -1,5 +1,5 @@ -import { ICacheService } from '../cache.service.interface'; -import { CacheDir } from '../entities/cache-dir.entity'; +import { ICacheService } from '@/datasources/cache/cache.service.interface'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; export class FakeCacheService implements ICacheService { private cache: Record> = {}; diff --git a/src/datasources/cache/__tests__/test.cache.module.ts b/src/datasources/cache/__tests__/test.cache.module.ts index 69f4dde3b2..16cb8cf657 100644 --- a/src/datasources/cache/__tests__/test.cache.module.ts +++ b/src/datasources/cache/__tests__/test.cache.module.ts @@ -1,7 +1,7 @@ import { Global, Module } from '@nestjs/common'; -import { CacheService } from '../cache.service.interface'; -import { FakeCacheService } from './fake.cache.service'; +import { FakeCacheService } from '@/datasources/cache/__tests__/fake.cache.service'; import { CacheReadiness } from '@/domain/interfaces/cache-readiness.interface'; +import { CacheService } from '@/datasources/cache/cache.service.interface'; /** * The {@link TestCacheModule} should be used whenever you want to diff --git a/src/datasources/cache/cache.first.data.source.module.ts b/src/datasources/cache/cache.first.data.source.module.ts index 2315ff585b..718c18b1d3 100644 --- a/src/datasources/cache/cache.first.data.source.module.ts +++ b/src/datasources/cache/cache.first.data.source.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { CacheFirstDataSource } from './cache.first.data.source'; -import { HttpErrorFactory } from '../errors/http-error-factory'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; @Module({ providers: [CacheFirstDataSource, HttpErrorFactory], diff --git a/src/datasources/cache/cache.first.data.source.spec.ts b/src/datasources/cache/cache.first.data.source.spec.ts index 3a8d736d37..7985b74ac1 100644 --- a/src/datasources/cache/cache.first.data.source.spec.ts +++ b/src/datasources/cache/cache.first.data.source.spec.ts @@ -1,12 +1,12 @@ import { faker } from '@faker-js/faker'; -import { ILoggingService } from '@/logging/logging.interface'; -import { NetworkResponseError } from '../network/entities/network.error.entity'; -import { CacheFirstDataSource } from './cache.first.data.source'; -import { ICacheService } from './cache.service.interface'; -import { CacheDir } from './entities/cache-dir.entity'; -import { FakeCacheService } from './__tests__/fake.cache.service'; import { fakeJson } from '@/__tests__/faker'; -import { INetworkService } from '../network/network.service.interface'; +import { FakeCacheService } from '@/datasources/cache/__tests__/fake.cache.service'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { ICacheService } from '@/datasources/cache/cache.service.interface'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; +import { NetworkResponseError } from '@/datasources/network/entities/network.error.entity'; +import { INetworkService } from '@/datasources/network/network.service.interface'; +import { ILoggingService } from '@/logging/logging.interface'; const mockLoggingService = { info: jest.fn(), diff --git a/src/datasources/cache/cache.first.data.source.ts b/src/datasources/cache/cache.first.data.source.ts index 152472d067..53caff0cd4 100644 --- a/src/datasources/cache/cache.first.data.source.ts +++ b/src/datasources/cache/cache.first.data.source.ts @@ -1,13 +1,16 @@ -import { NetworkRequest } from '../network/entities/network.request.entity'; -import { CacheService, ICacheService } from './cache.service.interface'; +import { Inject, Injectable } from '@nestjs/common'; +import { get } from 'lodash'; +import { + CacheService, + ICacheService, +} from '@/datasources/cache/cache.service.interface'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; +import { NetworkResponseError } from '@/datasources/network/entities/network.error.entity'; +import { NetworkRequest } from '@/datasources/network/entities/network.request.entity'; import { INetworkService, NetworkService, -} from '../network/network.service.interface'; -import { Inject, Injectable } from '@nestjs/common'; -import { CacheDir } from './entities/cache-dir.entity'; -import { NetworkResponseError } from '../network/entities/network.error.entity'; -import { get } from 'lodash'; +} from '@/datasources/network/network.service.interface'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; /** diff --git a/src/datasources/cache/cache.module.ts b/src/datasources/cache/cache.module.ts index a391beab22..dc8ce430fe 100644 --- a/src/datasources/cache/cache.module.ts +++ b/src/datasources/cache/cache.module.ts @@ -1,10 +1,10 @@ import { Global, Module } from '@nestjs/common'; -import { CacheService } from './cache.service.interface'; -import { RedisCacheService } from './redis.cache.service'; import { createClient } from 'redis'; import { IConfigurationService } from '@/config/configuration.service.interface'; -import { ILoggingService, LoggingService } from '@/logging/logging.interface'; +import { CacheService } from '@/datasources/cache/cache.service.interface'; +import { RedisCacheService } from '@/datasources/cache/redis.cache.service'; import { CacheReadiness } from '@/domain/interfaces/cache-readiness.interface'; +import { ILoggingService, LoggingService } from '@/logging/logging.interface'; export type RedisClientType = ReturnType; diff --git a/src/datasources/cache/cache.router.ts b/src/datasources/cache/cache.router.ts index 86634ee631..dedc839454 100644 --- a/src/datasources/cache/cache.router.ts +++ b/src/datasources/cache/cache.router.ts @@ -1,4 +1,4 @@ -import { CacheDir } from './entities/cache-dir.entity'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; export class CacheRouter { private static readonly ALL_TRANSACTIONS_KEY = 'all_transactions'; diff --git a/src/datasources/cache/cache.service.interface.ts b/src/datasources/cache/cache.service.interface.ts index 6252ce7e07..c76ab57484 100644 --- a/src/datasources/cache/cache.service.interface.ts +++ b/src/datasources/cache/cache.service.interface.ts @@ -1,4 +1,4 @@ -import { CacheDir } from './entities/cache-dir.entity'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; export const CacheService = Symbol('ICacheService'); diff --git a/src/datasources/cache/redis.cache.service.spec.ts b/src/datasources/cache/redis.cache.service.spec.ts index cdc4adc124..b6d3451134 100644 --- a/src/datasources/cache/redis.cache.service.spec.ts +++ b/src/datasources/cache/redis.cache.service.spec.ts @@ -1,8 +1,8 @@ import { faker } from '@faker-js/faker'; import { ILoggingService } from '@/logging/logging.interface'; -import { RedisClientType } from './cache.module'; -import { CacheDir } from './entities/cache-dir.entity'; -import { RedisCacheService } from './redis.cache.service'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; +import { RedisCacheService } from '@/datasources/cache/redis.cache.service'; +import { RedisClientType } from 'redis'; import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service'; import clearAllMocks = jest.clearAllMocks; import { fakeJson } from '@/__tests__/faker'; diff --git a/src/datasources/cache/redis.cache.service.ts b/src/datasources/cache/redis.cache.service.ts index 05ae1c81b8..eb541906d2 100644 --- a/src/datasources/cache/redis.cache.service.ts +++ b/src/datasources/cache/redis.cache.service.ts @@ -1,10 +1,10 @@ import { Inject, Injectable, OnModuleDestroy } from '@nestjs/common'; import { IConfigurationService } from '@/config/configuration.service.interface'; -import { ILoggingService, LoggingService } from '@/logging/logging.interface'; -import { RedisClientType } from './cache.module'; -import { ICacheService } from './cache.service.interface'; -import { CacheDir } from './entities/cache-dir.entity'; +import { RedisClientType } from '@/datasources/cache/cache.module'; +import { ICacheService } from '@/datasources/cache/cache.service.interface'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; import { ICacheReadiness } from '@/domain/interfaces/cache-readiness.interface'; +import { ILoggingService, LoggingService } from '@/logging/logging.interface'; @Injectable() export class RedisCacheService diff --git a/src/datasources/config-api/config-api.module.ts b/src/datasources/config-api/config-api.module.ts index 3f3134b039..e398ec5c9e 100644 --- a/src/datasources/config-api/config-api.module.ts +++ b/src/datasources/config-api/config-api.module.ts @@ -1,8 +1,8 @@ import { Global, Module } from '@nestjs/common'; -import { ConfigApi } from './config-api.service'; -import { CacheFirstDataSourceModule } from '../cache/cache.first.data.source.module'; import { IConfigApi } from '@/domain/interfaces/config-api.interface'; -import { HttpErrorFactory } from '../errors/http-error-factory'; +import { ConfigApi } from '@/datasources/config-api/config-api.service'; +import { CacheFirstDataSourceModule } from '@/datasources/cache/cache.first.data.source.module'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; @Global() @Module({ diff --git a/src/datasources/config-api/config-api.service.spec.ts b/src/datasources/config-api/config-api.service.spec.ts index e9a3aeff56..5ec4d839a8 100644 --- a/src/datasources/config-api/config-api.service.spec.ts +++ b/src/datasources/config-api/config-api.service.spec.ts @@ -1,13 +1,13 @@ -import { ConfigApi } from './config-api.service'; import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service'; -import { CacheFirstDataSource } from '../cache/cache.first.data.source'; -import { HttpErrorFactory } from '../errors/http-error-factory'; -import { DataSourceError } from '@/domain/errors/data-source.error'; -import { faker } from '@faker-js/faker'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { ICacheService } from '@/datasources/cache/cache.service.interface'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; +import { ConfigApi } from '@/datasources/config-api/config-api.service'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; +import { DataSourceError } from '@/domain/errors/data-source.error'; import { safeAppBuilder } from '@/domain/safe-apps/entities/__tests__/safe-app.builder'; -import { CacheDir } from '../cache/entities/cache-dir.entity'; -import { ICacheService } from '../cache/cache.service.interface'; +import { faker } from '@faker-js/faker'; const dataSource = { get: jest.fn(), diff --git a/src/datasources/config-api/config-api.service.ts b/src/datasources/config-api/config-api.service.ts index 9f322404cb..3760f46c16 100644 --- a/src/datasources/config-api/config-api.service.ts +++ b/src/datasources/config-api/config-api.service.ts @@ -1,13 +1,16 @@ import { Inject, Injectable } from '@nestjs/common'; import { IConfigurationService } from '@/config/configuration.service.interface'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { CacheRouter } from '@/datasources/cache/cache.router'; +import { + CacheService, + ICacheService, +} from '@/datasources/cache/cache.service.interface'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; import { Chain } from '@/domain/chains/entities/chain.entity'; import { Page } from '@/domain/entities/page.entity'; import { IConfigApi } from '@/domain/interfaces/config-api.interface'; import { SafeApp } from '@/domain/safe-apps/entities/safe-app.entity'; -import { CacheFirstDataSource } from '../cache/cache.first.data.source'; -import { CacheRouter } from '../cache/cache.router'; -import { HttpErrorFactory } from '../errors/http-error-factory'; -import { CacheService, ICacheService } from '../cache/cache.service.interface'; @Injectable() export class ConfigApi implements IConfigApi { diff --git a/src/datasources/errors/http-error-factory.spec.ts b/src/datasources/errors/http-error-factory.spec.ts index d1a543dfd0..806dc758b1 100644 --- a/src/datasources/errors/http-error-factory.spec.ts +++ b/src/datasources/errors/http-error-factory.spec.ts @@ -1,10 +1,10 @@ -import { faker } from '@faker-js/faker'; -import { HttpErrorFactory } from './http-error-factory'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; import { NetworkOtherError, NetworkRequestError, NetworkResponseError, -} from '../network/entities/network.error.entity'; +} from '@/datasources/network/entities/network.error.entity'; +import { faker } from '@faker-js/faker'; describe('HttpErrorFactory', () => { const httpErrorFactory: HttpErrorFactory = new HttpErrorFactory(); diff --git a/src/datasources/errors/http-error-factory.ts b/src/datasources/errors/http-error-factory.ts index da8c8e5d40..f7ee569c21 100644 --- a/src/datasources/errors/http-error-factory.ts +++ b/src/datasources/errors/http-error-factory.ts @@ -1,9 +1,9 @@ import { HttpStatus, Injectable } from '@nestjs/common'; -import { DataSourceError } from '@/domain/errors/data-source.error'; import { NetworkError, NetworkResponseError, -} from '../network/entities/network.error.entity'; +} from '@/datasources/network/entities/network.error.entity'; +import { DataSourceError } from '@/domain/errors/data-source.error'; /** * Maps a {@link NetworkError} or {@link Error} into a {@link DataSourceError} diff --git a/src/datasources/exchange-api/exchange-api.module.ts b/src/datasources/exchange-api/exchange-api.module.ts index f65935ff88..48c4124207 100644 --- a/src/datasources/exchange-api/exchange-api.module.ts +++ b/src/datasources/exchange-api/exchange-api.module.ts @@ -1,8 +1,8 @@ import { Global, Module } from '@nestjs/common'; -import { HttpErrorFactory } from '../errors/http-error-factory'; -import { ExchangeApi } from './exchange-api.service'; +import { CacheFirstDataSourceModule } from '@/datasources/cache/cache.first.data.source.module'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; +import { ExchangeApi } from '@/datasources/exchange-api/exchange-api.service'; import { IExchangeApi } from '@/domain/interfaces/exchange-api.interface'; -import { CacheFirstDataSourceModule } from '../cache/cache.first.data.source.module'; @Global() @Module({ diff --git a/src/datasources/exchange-api/exchange-api.service.spec.ts b/src/datasources/exchange-api/exchange-api.service.spec.ts index 1de1c92fac..93510dff19 100644 --- a/src/datasources/exchange-api/exchange-api.service.spec.ts +++ b/src/datasources/exchange-api/exchange-api.service.spec.ts @@ -1,10 +1,10 @@ -import { ExchangeApi } from './exchange-api.service'; -import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service'; import { faker } from '@faker-js/faker'; +import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; +import { ExchangeApi } from '@/datasources/exchange-api/exchange-api.service'; import { exchangeFiatCodesBuilder } from '@/domain/exchange/entities/__tests__/exchange-fiat-codes.builder'; import { exchangeRatesBuilder } from '@/domain/exchange/entities/__tests__/exchange-rates.builder'; -import { CacheFirstDataSource } from '../cache/cache.first.data.source'; -import { CacheDir } from '../cache/entities/cache-dir.entity'; const mockCacheFirstDataSource = jest.mocked({ get: jest.fn(), diff --git a/src/datasources/exchange-api/exchange-api.service.ts b/src/datasources/exchange-api/exchange-api.service.ts index 943b209585..fef04f56cc 100644 --- a/src/datasources/exchange-api/exchange-api.service.ts +++ b/src/datasources/exchange-api/exchange-api.service.ts @@ -1,11 +1,11 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ExchangeRates } from '@/domain/exchange/entities/exchange-rates.entity'; +import { IConfigurationService } from '@/config/configuration.service.interface'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { CacheRouter } from '@/datasources/cache/cache.router'; +import { DataSourceError } from '@/domain/errors/data-source.error'; import { ExchangeFiatCodes } from '@/domain/exchange/entities/exchange-fiat-codes.entity'; +import { ExchangeRates } from '@/domain/exchange/entities/exchange-rates.entity'; import { IExchangeApi } from '@/domain/interfaces/exchange-api.interface'; -import { DataSourceError } from '@/domain/errors/data-source.error'; -import { IConfigurationService } from '@/config/configuration.service.interface'; -import { CacheFirstDataSource } from '../cache/cache.first.data.source'; -import { CacheRouter } from '../cache/cache.router'; @Injectable() export class ExchangeApi implements IExchangeApi { diff --git a/src/datasources/human-description-api/human-description-api.module.ts b/src/datasources/human-description-api/human-description-api.module.ts index 7a79803d7f..6f8b0d51c0 100644 --- a/src/datasources/human-description-api/human-description-api.module.ts +++ b/src/datasources/human-description-api/human-description-api.module.ts @@ -1,5 +1,5 @@ import { Global, Module } from '@nestjs/common'; -import { HumanDescriptionApi } from './human-description-api.service'; +import { HumanDescriptionApi } from '@/datasources/human-description-api/human-description-api.service'; import { IHumanDescriptionApi } from '@/domain/interfaces/human-description-api.interface'; @Global() diff --git a/src/datasources/human-description-api/human-description-api.service.spec.ts b/src/datasources/human-description-api/human-description-api.service.spec.ts index 47d87d8268..5dd3b57ae1 100644 --- a/src/datasources/human-description-api/human-description-api.service.spec.ts +++ b/src/datasources/human-description-api/human-description-api.service.spec.ts @@ -1,4 +1,4 @@ -import { HumanDescriptionApi } from './human-description-api.service'; +import { HumanDescriptionApi } from '@/datasources/human-description-api/human-description-api.service'; describe('HumanDescriptionAPI', () => { it('should return descriptions from json', () => { diff --git a/src/datasources/human-description-api/human-description-api.service.ts b/src/datasources/human-description-api/human-description-api.service.ts index 54114bdbd2..2b98582ea8 100644 --- a/src/datasources/human-description-api/human-description-api.service.ts +++ b/src/datasources/human-description-api/human-description-api.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { IHumanDescriptionApi } from '@/domain/interfaces/human-description-api.interface'; import { FunctionSignature } from '@/domain/human-description/entities/human-description.entity'; -import ContractDescriptions from './json'; +import ContractDescriptions from '@/datasources/human-description-api/json'; @Injectable() export class HumanDescriptionApi implements IHumanDescriptionApi { diff --git a/src/datasources/human-description-api/json/index.ts b/src/datasources/human-description-api/json/index.ts index 100087d785..0031b56257 100644 --- a/src/datasources/human-description-api/json/index.ts +++ b/src/datasources/human-description-api/json/index.ts @@ -1,3 +1,3 @@ -import * as ContractDescriptions from './contract-descriptions.json'; +import * as ContractDescriptions from '@/datasources/human-description-api/json/contract-descriptions.json'; export default ContractDescriptions; diff --git a/src/datasources/network/__tests__/test.network.module.ts b/src/datasources/network/__tests__/test.network.module.ts index 662fad7e17..887906d97b 100644 --- a/src/datasources/network/__tests__/test.network.module.ts +++ b/src/datasources/network/__tests__/test.network.module.ts @@ -1,5 +1,8 @@ import { Global, Module } from '@nestjs/common'; -import { INetworkService, NetworkService } from '../network.service.interface'; +import { + INetworkService, + NetworkService, +} from '@/datasources/network/network.service.interface'; const networkService: INetworkService = { get: jest.fn(), diff --git a/src/datasources/network/axios.network.service.spec.ts b/src/datasources/network/axios.network.service.spec.ts index ebf9548086..b3d1fae960 100644 --- a/src/datasources/network/axios.network.service.spec.ts +++ b/src/datasources/network/axios.network.service.spec.ts @@ -1,14 +1,14 @@ -import { AxiosNetworkService } from './axios.network.service'; import { Axios } from 'axios'; import { faker } from '@faker-js/faker'; -import { NetworkRequest } from './entities/network.request.entity'; import { jest } from '@jest/globals'; +import { ILoggingService } from '@/logging/logging.interface'; +import { AxiosNetworkService } from '@/datasources/network/axios.network.service'; import { NetworkOtherError, - NetworkRequestError, NetworkResponseError, -} from './entities/network.error.entity'; -import { ILoggingService } from '@/logging/logging.interface'; + NetworkRequestError, +} from '@/datasources/network/entities/network.error.entity'; +import { NetworkRequest } from '@/datasources/network/entities/network.request.entity'; const axios = { get: jest.fn(), diff --git a/src/datasources/network/axios.network.service.ts b/src/datasources/network/axios.network.service.ts index b23a22b665..79b2175949 100644 --- a/src/datasources/network/axios.network.service.ts +++ b/src/datasources/network/axios.network.service.ts @@ -1,14 +1,14 @@ -import { Inject, Injectable } from '@nestjs/common'; -import { INetworkService } from './network.service.interface'; -import { NetworkResponse } from './entities/network.response.entity'; -import { NetworkRequest } from './entities/network.request.entity'; import { Axios } from 'axios'; +import { Inject, Injectable } from '@nestjs/common'; +import { ILoggingService, LoggingService } from '@/logging/logging.interface'; import { - NetworkOtherError, - NetworkRequestError, NetworkResponseError, -} from './entities/network.error.entity'; -import { ILoggingService, LoggingService } from '@/logging/logging.interface'; + NetworkRequestError, + NetworkOtherError, +} from '@/datasources/network/entities/network.error.entity'; +import { NetworkRequest } from '@/datasources/network/entities/network.request.entity'; +import { NetworkResponse } from '@/datasources/network/entities/network.response.entity'; +import { INetworkService } from '@/datasources/network/network.service.interface'; /** * A {@link INetworkService} which uses Axios as the main HTTP client diff --git a/src/datasources/network/network.module.spec.ts b/src/datasources/network/network.module.spec.ts index 1683996969..6792e33657 100644 --- a/src/datasources/network/network.module.spec.ts +++ b/src/datasources/network/network.module.spec.ts @@ -1,10 +1,10 @@ import { Test, TestingModule } from '@nestjs/testing'; -import { NetworkModule } from './network.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; import { ClsModule } from 'nestjs-cls'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; +import configuration from '@/config/entities/configuration'; +import { NetworkModule } from '@/datasources/network/network.module'; describe('NetworkModule', () => { it(`axios client is created with timeout`, async () => { diff --git a/src/datasources/network/network.module.ts b/src/datasources/network/network.module.ts index 6538cb7495..e45a93fd4b 100644 --- a/src/datasources/network/network.module.ts +++ b/src/datasources/network/network.module.ts @@ -1,10 +1,10 @@ import { Global, Module } from '@nestjs/common'; -import { AxiosNetworkService } from './axios.network.service'; -import { NetworkService } from './network.service.interface'; import axios, { Axios } from 'axios'; -import { IConfigurationService } from '@/config/configuration.service.interface'; import * as http from 'http'; import * as https from 'https'; +import { IConfigurationService } from '@/config/configuration.service.interface'; +import { AxiosNetworkService } from '@/datasources/network/axios.network.service'; +import { NetworkService } from '@/datasources/network/network.service.interface'; /** * Use this factory to add any default parameter to the diff --git a/src/datasources/network/network.service.interface.ts b/src/datasources/network/network.service.interface.ts index 06f4275a83..d444fe1961 100644 --- a/src/datasources/network/network.service.interface.ts +++ b/src/datasources/network/network.service.interface.ts @@ -1,5 +1,5 @@ -import { NetworkResponse } from './entities/network.response.entity'; -import { NetworkRequest } from './entities/network.request.entity'; +import { NetworkRequest } from '@/datasources/network/entities/network.request.entity'; +import { NetworkResponse } from '@/datasources/network/entities/network.response.entity'; export const NetworkService = Symbol('INetworkService'); diff --git a/src/datasources/transaction-api/transaction-api.manager.spec.ts b/src/datasources/transaction-api/transaction-api.manager.spec.ts index 364164750a..0902489857 100644 --- a/src/datasources/transaction-api/transaction-api.manager.spec.ts +++ b/src/datasources/transaction-api/transaction-api.manager.spec.ts @@ -1,11 +1,11 @@ -import { TransactionApiManager } from './transaction-api.manager'; import { IConfigurationService } from '@/config/configuration.service.interface'; -import { IConfigApi } from '@/domain/interfaces/config-api.interface'; -import { ICacheService } from '../cache/cache.service.interface'; -import { INetworkService } from '../network/network.service.interface'; -import { CacheFirstDataSource } from '../cache/cache.first.data.source'; -import { HttpErrorFactory } from '../errors/http-error-factory'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { ICacheService } from '@/datasources/cache/cache.service.interface'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; +import { INetworkService } from '@/datasources/network/network.service.interface'; +import { TransactionApiManager } from '@/datasources/transaction-api/transaction-api.manager'; import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; +import { IConfigApi } from '@/domain/interfaces/config-api.interface'; import { faker } from '@faker-js/faker'; const configurationService = { diff --git a/src/datasources/transaction-api/transaction-api.manager.ts b/src/datasources/transaction-api/transaction-api.manager.ts index 99144ad462..f4ea4fa2a5 100644 --- a/src/datasources/transaction-api/transaction-api.manager.ts +++ b/src/datasources/transaction-api/transaction-api.manager.ts @@ -1,16 +1,19 @@ import { Inject, Injectable } from '@nestjs/common'; -import { Chain } from '@/domain/chains/entities/chain.entity'; -import { TransactionApi } from './transaction-api.service'; -import { CacheFirstDataSource } from '../cache/cache.first.data.source'; -import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; -import { IConfigApi } from '@/domain/interfaces/config-api.interface'; -import { CacheService, ICacheService } from '../cache/cache.service.interface'; -import { HttpErrorFactory } from '../errors/http-error-factory'; +import { IConfigurationService } from '@/config/configuration.service.interface'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { + CacheService, + ICacheService, +} from '@/datasources/cache/cache.service.interface'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; import { INetworkService, NetworkService, -} from '../network/network.service.interface'; -import { IConfigurationService } from '@/config/configuration.service.interface'; +} from '@/datasources/network/network.service.interface'; +import { TransactionApi } from '@/datasources/transaction-api/transaction-api.service'; +import { Chain } from '@/domain/chains/entities/chain.entity'; +import { IConfigApi } from '@/domain/interfaces/config-api.interface'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class TransactionApiManager implements ITransactionApiManager { diff --git a/src/datasources/transaction-api/transaction-api.module.ts b/src/datasources/transaction-api/transaction-api.module.ts index 7061fbab98..dc4a09e6c6 100644 --- a/src/datasources/transaction-api/transaction-api.module.ts +++ b/src/datasources/transaction-api/transaction-api.module.ts @@ -1,8 +1,8 @@ import { Global, Module } from '@nestjs/common'; -import { TransactionApiManager } from './transaction-api.manager'; -import { CacheFirstDataSourceModule } from '../cache/cache.first.data.source.module'; +import { CacheFirstDataSourceModule } from '@/datasources/cache/cache.first.data.source.module'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; +import { TransactionApiManager } from '@/datasources/transaction-api/transaction-api.manager'; import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; -import { HttpErrorFactory } from '../errors/http-error-factory'; @Global() @Module({ diff --git a/src/datasources/transaction-api/transaction-api.service.spec.ts b/src/datasources/transaction-api/transaction-api.service.spec.ts index abcc983eff..5d42ed2b19 100644 --- a/src/datasources/transaction-api/transaction-api.service.spec.ts +++ b/src/datasources/transaction-api/transaction-api.service.spec.ts @@ -1,15 +1,15 @@ -import { TransactionApi } from './transaction-api.service'; -import { CacheFirstDataSource } from '../cache/cache.first.data.source'; -import { ICacheService } from '../cache/cache.service.interface'; import { faker } from '@faker-js/faker'; -import { HttpErrorFactory } from '../errors/http-error-factory'; -import { DataSourceError } from '@/domain/errors/data-source.error'; -import { AxiosNetworkService } from '../network/axios.network.service'; -import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; +import { IConfigurationService } from '@/config/configuration.service.interface'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { ICacheService } from '@/datasources/cache/cache.service.interface'; +import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; +import { AxiosNetworkService } from '@/datasources/network/axios.network.service'; +import { TransactionApi } from '@/datasources/transaction-api/transaction-api.service'; import { backboneBuilder } from '@/domain/backbone/entities/__tests__/backbone.builder'; import { balanceBuilder } from '@/domain/balances/entities/__tests__/balance.builder'; -import { CacheDir } from '../cache/entities/cache-dir.entity'; -import { IConfigurationService } from '@/config/configuration.service.interface'; +import { DataSourceError } from '@/domain/errors/data-source.error'; +import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; const dataSource = { get: jest.fn(), diff --git a/src/datasources/transaction-api/transaction-api.service.ts b/src/datasources/transaction-api/transaction-api.service.ts index ce07448bf9..834938e36f 100644 --- a/src/datasources/transaction-api/transaction-api.service.ts +++ b/src/datasources/transaction-api/transaction-api.service.ts @@ -1,3 +1,9 @@ +import { IConfigurationService } from '@/config/configuration.service.interface'; +import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source'; +import { CacheRouter } from '@/datasources/cache/cache.router'; +import { ICacheService } from '@/datasources/cache/cache.service.interface'; +import { HttpErrorFactory } from '@/datasources/errors/http-error-factory'; +import { INetworkService } from '@/datasources/network/network.service.interface'; import { Backbone } from '@/domain/backbone/entities/backbone.entity'; import { Balance } from '@/domain/balances/entities/balance.entity'; import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; @@ -19,14 +25,8 @@ import { Safe } from '@/domain/safe/entities/safe.entity'; import { Transaction } from '@/domain/safe/entities/transaction.entity'; import { Transfer } from '@/domain/safe/entities/transfer.entity'; import { Token } from '@/domain/tokens/entities/token.entity'; -import { ProposeTransactionDto } from '@/domain/transactions/entities/propose-transaction.dto.entity'; import { AddConfirmationDto } from '@/domain/transactions/entities/add-confirmation.dto.entity'; -import { CacheFirstDataSource } from '../cache/cache.first.data.source'; -import { CacheRouter } from '../cache/cache.router'; -import { ICacheService } from '../cache/cache.service.interface'; -import { HttpErrorFactory } from '../errors/http-error-factory'; -import { INetworkService } from '../network/network.service.interface'; -import { IConfigurationService } from '@/config/configuration.service.interface'; +import { ProposeTransactionDto } from '@/domain/transactions/entities/propose-transaction.dto.entity'; export class TransactionApi implements ITransactionApi { private readonly defaultExpirationTimeInSeconds: number; diff --git a/src/domain.module.ts b/src/domain.module.ts index 5a8dcde0d2..6213df38af 100644 --- a/src/domain.module.ts +++ b/src/domain.module.ts @@ -1,63 +1,63 @@ import { Global, Module } from '@nestjs/common'; -import { ExchangeApiModule } from './datasources/exchange-api/exchange-api.module'; -import { ConfigApiModule } from './datasources/config-api/config-api.module'; -import { TransactionApiModule } from './datasources/transaction-api/transaction-api.module'; -import { IBalancesRepository } from './domain/balances/balances.repository.interface'; -import { BalancesRepository } from './domain/balances/balances.repository'; -import { IChainsRepository } from './domain/chains/chains.repository.interface'; -import { ChainsRepository } from './domain/chains/chains.repository'; -import { IExchangeRepository } from './domain/exchange/exchange.repository.interface'; -import { ExchangeRepository } from './domain/exchange/exchange.repository'; -import { IBackboneRepository } from './domain/backbone/backbone.repository.interface'; -import { BackboneRepository } from './domain/backbone/backbone.repository'; -import { ICollectiblesRepository } from './domain/collectibles/collectibles.repository.interface'; -import { CollectiblesRepository } from './domain/collectibles/collectibles.repository'; -import { ISafeRepository } from './domain/safe/safe.repository.interface'; -import { SafeRepository } from './domain/safe/safe.repository'; -import { BackboneValidator } from './domain/backbone/backbone.validator'; -import { BalancesValidator } from './domain/balances/balances.validator'; -import { ChainsValidator } from './domain/chains/chains.validator'; -import { MasterCopyValidator } from './domain/chains/master-copy.validator'; -import { CollectiblesValidator } from './domain/collectibles/collectibles.validator'; -import { SafeListValidator } from './domain/safe/safe-list.validator'; -import { SafeValidator } from './domain/safe/safe.validator'; -import { IContractsRepository } from './domain/contracts/contracts.repository.interface'; -import { ContractsRepository } from './domain/contracts/contracts.repository'; -import { ContractsValidator } from './domain/contracts/contracts.validator'; -import { ExchangeRatesValidator } from './domain/exchange/exchange-rates.validator'; -import { ExchangeFiatCodesValidator } from './domain/exchange/exchange-fiat-codes.validator'; -import { DelegateValidator } from './domain/delegate/delegate.validator'; -import { IDelegateRepository } from './domain/delegate/delegate.repository.interface'; -import { DelegateRepository } from './domain/delegate/delegate.repository'; -import { IDataDecodedRepository } from './domain/data-decoder/data-decoded.repository.interface'; -import { DataDecodedRepository } from './domain/data-decoder/data-decoded.repository'; -import { DataDecodedValidator } from './domain/data-decoder/data-decoded.validator'; -import { TransferValidator } from './domain/safe/transfer.validator'; -import { MultisigTransactionValidator } from './domain/safe/multisig-transaction.validator'; -import { ISafeAppsRepository } from './domain/safe-apps/safe-apps.repository.interface'; -import { SafeAppsRepository } from './domain/safe-apps/safe-apps.repository'; -import { SafeAppsValidator } from './domain/safe-apps/safe-apps.validator'; -import { TransactionTypeValidator } from './domain/safe/transaction-type.validator'; -import { ModuleTransactionValidator } from './domain/safe/module-transaction.validator'; -import { ITokenRepository } from './domain/tokens/token.repository.interface'; -import { TokenRepository } from './domain/tokens/token.repository'; -import { TokenValidator } from './domain/tokens/token.validator'; -import { CreationTransactionValidator } from './domain/safe/creation-transaction.validator'; -import { INotificationsRepository } from './domain/notifications/notifications.repository.interface'; -import { NotificationsRepository } from './domain/notifications/notifications.repository'; -import { IEstimationsRepository } from './domain/estimations/estimations.repository.interface'; -import { EstimationsRepository } from './domain/estimations/estimations.repository'; -import { EstimationsValidator } from './domain/estimations/estimations.validator'; -import { MessagesRepository } from './domain/messages/messages.repository'; -import { IMessagesRepository } from './domain/messages/messages.repository.interface'; -import { MessageValidator } from './domain/messages/message.validator'; -import { FlushRepository } from './domain/flush/flush.repository'; -import { IFlushRepository } from './domain/flush/flush.repository.interface'; -import { IHealthRepository } from './domain/health/health.repository.interface'; -import { HealthRepository } from './domain/health/health.repository'; -import { HumanDescriptionApiModule } from './datasources/human-description-api/human-description-api.module'; -import { IHumanDescriptionRepository } from './domain/human-description/human-description.repository.interface'; -import { HumanDescriptionRepository } from './domain/human-description/human-description.repository'; +import { ExchangeApiModule } from '@/datasources/exchange-api/exchange-api.module'; +import { ConfigApiModule } from '@/datasources/config-api/config-api.module'; +import { TransactionApiModule } from '@/datasources/transaction-api/transaction-api.module'; +import { IBalancesRepository } from '@/domain/balances/balances.repository.interface'; +import { BalancesRepository } from '@/domain/balances/balances.repository'; +import { IChainsRepository } from '@/domain/chains/chains.repository.interface'; +import { ChainsRepository } from '@/domain/chains/chains.repository'; +import { IExchangeRepository } from '@/domain/exchange/exchange.repository.interface'; +import { ExchangeRepository } from '@/domain/exchange/exchange.repository'; +import { IBackboneRepository } from '@/domain/backbone/backbone.repository.interface'; +import { BackboneRepository } from '@/domain/backbone/backbone.repository'; +import { ICollectiblesRepository } from '@/domain/collectibles/collectibles.repository.interface'; +import { CollectiblesRepository } from '@/domain/collectibles/collectibles.repository'; +import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; +import { SafeRepository } from '@/domain/safe/safe.repository'; +import { BackboneValidator } from '@/domain/backbone/backbone.validator'; +import { BalancesValidator } from '@/domain/balances/balances.validator'; +import { ChainsValidator } from '@/domain/chains/chains.validator'; +import { MasterCopyValidator } from '@/domain/chains/master-copy.validator'; +import { CollectiblesValidator } from '@/domain/collectibles/collectibles.validator'; +import { SafeListValidator } from '@/domain/safe/safe-list.validator'; +import { SafeValidator } from '@/domain/safe/safe.validator'; +import { IContractsRepository } from '@/domain/contracts/contracts.repository.interface'; +import { ContractsRepository } from '@/domain/contracts/contracts.repository'; +import { ContractsValidator } from '@/domain/contracts/contracts.validator'; +import { ExchangeRatesValidator } from '@/domain/exchange/exchange-rates.validator'; +import { ExchangeFiatCodesValidator } from '@/domain/exchange/exchange-fiat-codes.validator'; +import { DelegateValidator } from '@/domain/delegate/delegate.validator'; +import { IDelegateRepository } from '@/domain/delegate/delegate.repository.interface'; +import { DelegateRepository } from '@/domain/delegate/delegate.repository'; +import { IDataDecodedRepository } from '@/domain/data-decoder/data-decoded.repository.interface'; +import { DataDecodedRepository } from '@/domain/data-decoder/data-decoded.repository'; +import { DataDecodedValidator } from '@/domain/data-decoder/data-decoded.validator'; +import { TransferValidator } from '@/domain/safe/transfer.validator'; +import { MultisigTransactionValidator } from '@/domain/safe/multisig-transaction.validator'; +import { ISafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository.interface'; +import { SafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository'; +import { SafeAppsValidator } from '@/domain/safe-apps/safe-apps.validator'; +import { TransactionTypeValidator } from '@/domain/safe/transaction-type.validator'; +import { ModuleTransactionValidator } from '@/domain/safe/module-transaction.validator'; +import { ITokenRepository } from '@/domain/tokens/token.repository.interface'; +import { TokenRepository } from '@/domain/tokens/token.repository'; +import { TokenValidator } from '@/domain/tokens/token.validator'; +import { CreationTransactionValidator } from '@/domain/safe/creation-transaction.validator'; +import { INotificationsRepository } from '@/domain/notifications/notifications.repository.interface'; +import { NotificationsRepository } from '@/domain/notifications/notifications.repository'; +import { IEstimationsRepository } from '@/domain/estimations/estimations.repository.interface'; +import { EstimationsRepository } from '@/domain/estimations/estimations.repository'; +import { EstimationsValidator } from '@/domain/estimations/estimations.validator'; +import { MessagesRepository } from '@/domain/messages/messages.repository'; +import { IMessagesRepository } from '@/domain/messages/messages.repository.interface'; +import { MessageValidator } from '@/domain/messages/message.validator'; +import { FlushRepository } from '@/domain/flush/flush.repository'; +import { IFlushRepository } from '@/domain/flush/flush.repository.interface'; +import { IHealthRepository } from '@/domain/health/health.repository.interface'; +import { HealthRepository } from '@/domain/health/health.repository'; +import { HumanDescriptionApiModule } from '@/datasources/human-description-api/human-description-api.module'; +import { IHumanDescriptionRepository } from '@/domain/human-description/human-description.repository.interface'; +import { HumanDescriptionRepository } from '@/domain/human-description/human-description.repository'; @Global() @Module({ diff --git a/src/domain/backbone/backbone.repository.interface.ts b/src/domain/backbone/backbone.repository.interface.ts index e897a39fca..1b09c07df7 100644 --- a/src/domain/backbone/backbone.repository.interface.ts +++ b/src/domain/backbone/backbone.repository.interface.ts @@ -1,4 +1,4 @@ -import { Backbone } from './entities/backbone.entity'; +import { Backbone } from '@/domain/backbone/entities/backbone.entity'; export const IBackboneRepository = Symbol('IBackboneRepository'); diff --git a/src/domain/backbone/backbone.repository.ts b/src/domain/backbone/backbone.repository.ts index a471b2020f..5f04b2206f 100644 --- a/src/domain/backbone/backbone.repository.ts +++ b/src/domain/backbone/backbone.repository.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { BackboneValidator } from './backbone.validator'; -import { Backbone } from './entities/backbone.entity'; +import { BackboneValidator } from '@/domain/backbone/backbone.validator'; +import { Backbone } from '@/domain/backbone/entities/backbone.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class BackboneRepository { diff --git a/src/domain/backbone/backbone.validator.ts b/src/domain/backbone/backbone.validator.ts index 2170add577..ba4313690b 100644 --- a/src/domain/backbone/backbone.validator.ts +++ b/src/domain/backbone/backbone.validator.ts @@ -1,13 +1,13 @@ -import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { Backbone } from './entities/backbone.entity'; +import { Injectable } from '@nestjs/common'; +import { Backbone } from '@/domain/backbone/entities/backbone.entity'; import { BACKBONE_SCHEMA_ID, backboneSchema, -} from './entities/schemas/backbone.schema'; +} from '@/domain/backbone/entities/schemas/backbone.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class BackboneValidator implements IValidator { diff --git a/src/domain/backbone/entities/__tests__/backbone.builder.ts b/src/domain/backbone/entities/__tests__/backbone.builder.ts index a5d16f330f..3a27ca4141 100644 --- a/src/domain/backbone/entities/__tests__/backbone.builder.ts +++ b/src/domain/backbone/entities/__tests__/backbone.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; -import { Backbone } from '../backbone.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; import { fakeJson } from '@/__tests__/faker'; +import { Backbone } from '@/domain/backbone/entities/backbone.entity'; export function backboneBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/backbone/entities/schemas/backbone.schema.ts b/src/domain/backbone/entities/schemas/backbone.schema.ts index 783e990a30..c536f4b994 100644 --- a/src/domain/backbone/entities/schemas/backbone.schema.ts +++ b/src/domain/backbone/entities/schemas/backbone.schema.ts @@ -1,5 +1,5 @@ +import { Backbone } from '@/domain/backbone/entities/backbone.entity'; import { JSONSchemaType } from 'ajv'; -import { Backbone } from '../backbone.entity'; export const BACKBONE_SCHEMA_ID = 'https://safe-client.safe.global/schemas/backbone/backbone.json'; diff --git a/src/domain/balances/balances.repository.interface.ts b/src/domain/balances/balances.repository.interface.ts index c417156c0f..1074167683 100644 --- a/src/domain/balances/balances.repository.interface.ts +++ b/src/domain/balances/balances.repository.interface.ts @@ -1,4 +1,4 @@ -import { Balance } from './entities/balance.entity'; +import { Balance } from '@/domain/balances/entities/balance.entity'; export const IBalancesRepository = Symbol('IBalancesRepository'); diff --git a/src/domain/balances/balances.repository.ts b/src/domain/balances/balances.repository.ts index 7929e64541..3262e939a1 100644 --- a/src/domain/balances/balances.repository.ts +++ b/src/domain/balances/balances.repository.ts @@ -1,8 +1,8 @@ -import { IBalancesRepository } from './balances.repository.interface'; -import { Balance } from './entities/balance.entity'; import { Inject, Injectable } from '@nestjs/common'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { BalancesValidator } from './balances.validator'; +import { IBalancesRepository } from '@/domain/balances/balances.repository.interface'; +import { BalancesValidator } from '@/domain/balances/balances.validator'; +import { Balance } from '@/domain/balances/entities/balance.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class BalancesRepository implements IBalancesRepository { diff --git a/src/domain/balances/balances.validator.ts b/src/domain/balances/balances.validator.ts index 715c68ce3d..3a57f3a503 100644 --- a/src/domain/balances/balances.validator.ts +++ b/src/domain/balances/balances.validator.ts @@ -1,15 +1,15 @@ -import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { Balance } from './entities/balance.entity'; +import { Injectable } from '@nestjs/common'; +import { Balance } from '@/domain/balances/entities/balance.entity'; import { BALANCE_SCHEMA_ID, BALANCE_TOKEN_SCHEMA_ID, balanceSchema, balanceTokenSchema, -} from './entities/schemas/balance.schema'; +} from '@/domain/balances/entities/schemas/balance.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class BalancesValidator implements IValidator { diff --git a/src/domain/balances/entities/__tests__/balance.builder.ts b/src/domain/balances/entities/__tests__/balance.builder.ts index e3b75457a2..d15b2c4c1b 100644 --- a/src/domain/balances/entities/__tests__/balance.builder.ts +++ b/src/domain/balances/entities/__tests__/balance.builder.ts @@ -1,7 +1,7 @@ -import { Balance } from '../balance.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { balanceTokenBuilder } from './balance.token.builder'; +import { balanceTokenBuilder } from '@/domain/balances/entities/__tests__/balance.token.builder'; +import { Balance } from '@/domain/balances/entities/balance.entity'; export function balanceBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/balances/entities/__tests__/balance.token.builder.ts b/src/domain/balances/entities/__tests__/balance.token.builder.ts index 8fc3cae9f2..fbe2d467a2 100644 --- a/src/domain/balances/entities/__tests__/balance.token.builder.ts +++ b/src/domain/balances/entities/__tests__/balance.token.builder.ts @@ -1,6 +1,6 @@ -import { BalanceToken } from '../balance.token.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { BalanceToken } from '@/domain/balances/entities/balance.token.entity'; export function balanceTokenBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/balances/entities/balance.entity.ts b/src/domain/balances/entities/balance.entity.ts index a96e6a4229..038253493a 100644 --- a/src/domain/balances/entities/balance.entity.ts +++ b/src/domain/balances/entities/balance.entity.ts @@ -1,4 +1,4 @@ -import { BalanceToken } from './balance.token.entity'; +import { BalanceToken } from '@/domain/balances/entities/balance.token.entity'; export interface Balance { tokenAddress: string | null; diff --git a/src/domain/balances/entities/schemas/balance.schema.ts b/src/domain/balances/entities/schemas/balance.schema.ts index ca39d667d2..71d2ec6c3c 100644 --- a/src/domain/balances/entities/schemas/balance.schema.ts +++ b/src/domain/balances/entities/schemas/balance.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType, Schema } from 'ajv'; -import { BalanceToken } from '../balance.token.entity'; +import { BalanceToken } from '@/domain/balances/entities/balance.token.entity'; export const BALANCE_TOKEN_SCHEMA_ID = 'https://safe-client.safe.global/schemas/balances/balance-token.json'; diff --git a/src/domain/chains/chains.repository.interface.ts b/src/domain/chains/chains.repository.interface.ts index b6ea334081..0ff7ac5d5d 100644 --- a/src/domain/chains/chains.repository.interface.ts +++ b/src/domain/chains/chains.repository.interface.ts @@ -1,6 +1,6 @@ -import { Page } from '../entities/page.entity'; -import { Chain } from './entities/chain.entity'; -import { MasterCopy } from './entities/master-copies.entity'; +import { Chain } from '@/domain/chains/entities/chain.entity'; +import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; +import { Page } from '@/domain/entities/page.entity'; export const IChainsRepository = Symbol('IChainsRepository'); diff --git a/src/domain/chains/chains.repository.ts b/src/domain/chains/chains.repository.ts index 7cd8a75fc2..5ece5652ba 100644 --- a/src/domain/chains/chains.repository.ts +++ b/src/domain/chains/chains.repository.ts @@ -1,12 +1,12 @@ -import { IChainsRepository } from './chains.repository.interface'; -import { Chain } from './entities/chain.entity'; -import { Page } from '../entities/page.entity'; import { Inject, Injectable } from '@nestjs/common'; -import { IConfigApi } from '../interfaces/config-api.interface'; -import { MasterCopy } from './entities/master-copies.entity'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { ChainsValidator } from './chains.validator'; -import { MasterCopyValidator } from './master-copy.validator'; +import { IChainsRepository } from '@/domain/chains/chains.repository.interface'; +import { ChainsValidator } from '@/domain/chains/chains.validator'; +import { Chain } from '@/domain/chains/entities/chain.entity'; +import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; +import { MasterCopyValidator } from '@/domain/chains/master-copy.validator'; +import { Page } from '@/domain/entities/page.entity'; +import { IConfigApi } from '@/domain/interfaces/config-api.interface'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class ChainsRepository implements IChainsRepository { diff --git a/src/domain/chains/chains.validator.ts b/src/domain/chains/chains.validator.ts index 0780e9cf0c..0f51b4b6ab 100644 --- a/src/domain/chains/chains.validator.ts +++ b/src/domain/chains/chains.validator.ts @@ -1,9 +1,6 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { Chain } from './entities/chain.entity'; +import { Chain } from '@/domain/chains/entities/chain.entity'; import { BLOCK_EXPLORER_URI_TEMPLATE_SCHEMA_ID, CHAIN_SCHEMA_ID, @@ -17,7 +14,10 @@ import { nativeCurrencySchema, rpcUriSchema, themeSchema, -} from './entities/schemas/chain.schema'; +} from '@/domain/chains/entities/schemas/chain.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class ChainsValidator implements IValidator { diff --git a/src/domain/chains/entities/__tests__/block-explorer-uri-template.builder.ts b/src/domain/chains/entities/__tests__/block-explorer-uri-template.builder.ts index dea7991333..73c7365878 100644 --- a/src/domain/chains/entities/__tests__/block-explorer-uri-template.builder.ts +++ b/src/domain/chains/entities/__tests__/block-explorer-uri-template.builder.ts @@ -1,6 +1,6 @@ -import { BlockExplorerUriTemplate } from '../block-explorer-uri-template.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { BlockExplorerUriTemplate } from '@/domain/chains/entities/block-explorer-uri-template.entity'; export function blockExplorerUriTemplateBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/__tests__/chain.builder.ts b/src/domain/chains/entities/__tests__/chain.builder.ts index f9b7f32720..4ca6eb42a6 100644 --- a/src/domain/chains/entities/__tests__/chain.builder.ts +++ b/src/domain/chains/entities/__tests__/chain.builder.ts @@ -1,13 +1,13 @@ import { faker } from '@faker-js/faker'; -import { Chain } from '../chain.entity'; -import { nativeCurrencyBuilder } from './native.currency.builder'; -import { blockExplorerUriTemplateBuilder } from './block-explorer-uri-template.builder'; -import { themeBuilder } from './theme.builder'; -import { gasPriceFixedBuilder } from './gas-price-fixed.builder'; -import { gasPriceOracleBuilder } from './gas-price-oracle.builder'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { rpcUriBuilder } from './rpc-uri.builder'; -import { gasPriceFixedEIP1559Builder } from './gas-price-fixed-eip-1559.builder'; +import { blockExplorerUriTemplateBuilder } from '@/domain/chains/entities/__tests__/block-explorer-uri-template.builder'; +import { gasPriceFixedEIP1559Builder } from '@/domain/chains/entities/__tests__/gas-price-fixed-eip-1559.builder'; +import { gasPriceFixedBuilder } from '@/domain/chains/entities/__tests__/gas-price-fixed.builder'; +import { gasPriceOracleBuilder } from '@/domain/chains/entities/__tests__/gas-price-oracle.builder'; +import { nativeCurrencyBuilder } from '@/domain/chains/entities/__tests__/native.currency.builder'; +import { rpcUriBuilder } from '@/domain/chains/entities/__tests__/rpc-uri.builder'; +import { themeBuilder } from '@/domain/chains/entities/__tests__/theme.builder'; +import { Chain } from '@/domain/chains/entities/chain.entity'; export function chainBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/__tests__/gas-price-fixed-eip-1559.builder.ts b/src/domain/chains/entities/__tests__/gas-price-fixed-eip-1559.builder.ts index 5a3b341449..c9af779c64 100644 --- a/src/domain/chains/entities/__tests__/gas-price-fixed-eip-1559.builder.ts +++ b/src/domain/chains/entities/__tests__/gas-price-fixed-eip-1559.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { GasPriceFixedEIP1559 } from '../gas-price-fixed-eip-1559.entity'; +import { GasPriceFixedEIP1559 } from '@/domain/chains/entities/gas-price-fixed-eip-1559.entity'; export function gasPriceFixedEIP1559Builder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/__tests__/gas-price-fixed.builder.ts b/src/domain/chains/entities/__tests__/gas-price-fixed.builder.ts index 5ca1da17fa..ad96d6b420 100644 --- a/src/domain/chains/entities/__tests__/gas-price-fixed.builder.ts +++ b/src/domain/chains/entities/__tests__/gas-price-fixed.builder.ts @@ -1,6 +1,6 @@ -import { GasPriceFixed } from '../gas-price-fixed.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { GasPriceFixed } from '@/domain/chains/entities/gas-price-fixed.entity'; export function gasPriceFixedBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/__tests__/gas-price-oracle.builder.ts b/src/domain/chains/entities/__tests__/gas-price-oracle.builder.ts index 298a371ce7..8a6c588ff3 100644 --- a/src/domain/chains/entities/__tests__/gas-price-oracle.builder.ts +++ b/src/domain/chains/entities/__tests__/gas-price-oracle.builder.ts @@ -1,6 +1,6 @@ -import { GasPriceOracle } from '../gas-price-oracle.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { GasPriceOracle } from '@/domain/chains/entities/gas-price-oracle.entity'; export function gasPriceOracleBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/__tests__/master-copy.builder.ts b/src/domain/chains/entities/__tests__/master-copy.builder.ts index 6a4e35be5f..61834fd09f 100644 --- a/src/domain/chains/entities/__tests__/master-copy.builder.ts +++ b/src/domain/chains/entities/__tests__/master-copy.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; -import { MasterCopy } from '../master-copies.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; export function masterCopyBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/__tests__/native.currency.builder.ts b/src/domain/chains/entities/__tests__/native.currency.builder.ts index 75f7be93b9..d53d0a11c6 100644 --- a/src/domain/chains/entities/__tests__/native.currency.builder.ts +++ b/src/domain/chains/entities/__tests__/native.currency.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; -import { NativeCurrency } from '../native.currency.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { NativeCurrency } from '@/domain/chains/entities/native.currency.entity'; export function nativeCurrencyBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/__tests__/rpc-uri.builder.ts b/src/domain/chains/entities/__tests__/rpc-uri.builder.ts index 6433328661..80453de7f8 100644 --- a/src/domain/chains/entities/__tests__/rpc-uri.builder.ts +++ b/src/domain/chains/entities/__tests__/rpc-uri.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; -import { RpcUriAuthentication } from '../rpc-uri-authentication.entity'; -import { RpcUri } from '../rpc-uri.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { RpcUri } from '@/domain/chains/entities/rpc-uri.entity'; +import { RpcUriAuthentication } from '@/domain/chains/entities/rpc-uri-authentication.entity'; export function rpcUriBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/__tests__/theme.builder.ts b/src/domain/chains/entities/__tests__/theme.builder.ts index 97499424ce..07874f7c36 100644 --- a/src/domain/chains/entities/__tests__/theme.builder.ts +++ b/src/domain/chains/entities/__tests__/theme.builder.ts @@ -1,6 +1,6 @@ -import { Theme } from '../theme.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { Theme } from '@/domain/chains/entities/theme.entity'; export function themeBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/chains/entities/chain.entity.ts b/src/domain/chains/entities/chain.entity.ts index 384f7fbb0a..da8500c149 100644 --- a/src/domain/chains/entities/chain.entity.ts +++ b/src/domain/chains/entities/chain.entity.ts @@ -1,10 +1,10 @@ -import { NativeCurrency } from './native.currency.entity'; -import { RpcUri } from './rpc-uri.entity'; -import { BlockExplorerUriTemplate } from './block-explorer-uri-template.entity'; -import { Theme } from './theme.entity'; -import { GasPriceOracle } from './gas-price-oracle.entity'; -import { GasPriceFixed } from './gas-price-fixed.entity'; -import { GasPriceFixedEIP1559 } from './gas-price-fixed-eip-1559.entity'; +import { BlockExplorerUriTemplate } from '@/domain/chains/entities/block-explorer-uri-template.entity'; +import { GasPriceFixedEIP1559 } from '@/domain/chains/entities/gas-price-fixed-eip-1559.entity'; +import { GasPriceFixed } from '@/domain/chains/entities/gas-price-fixed.entity'; +import { GasPriceOracle } from '@/domain/chains/entities/gas-price-oracle.entity'; +import { NativeCurrency } from '@/domain/chains/entities/native.currency.entity'; +import { RpcUri } from '@/domain/chains/entities/rpc-uri.entity'; +import { Theme } from '@/domain/chains/entities/theme.entity'; export interface Chain { chainId: string; diff --git a/src/domain/chains/entities/gas-price-oracle.entity.ts b/src/domain/chains/entities/gas-price-oracle.entity.ts index 1f5d5cab0f..c3c7e81b0f 100644 --- a/src/domain/chains/entities/gas-price-oracle.entity.ts +++ b/src/domain/chains/entities/gas-price-oracle.entity.ts @@ -1,4 +1,4 @@ -import { GasPrice } from './gas-price.entity'; +import { GasPrice } from '@/domain/chains/entities/gas-price.entity'; export interface GasPriceOracle extends GasPrice { type: 'oracle'; diff --git a/src/domain/chains/entities/rpc-uri.entity.ts b/src/domain/chains/entities/rpc-uri.entity.ts index 3af424109a..38dd7ffa0a 100644 --- a/src/domain/chains/entities/rpc-uri.entity.ts +++ b/src/domain/chains/entities/rpc-uri.entity.ts @@ -1,4 +1,4 @@ -import { RpcUriAuthentication } from './rpc-uri-authentication.entity'; +import { RpcUriAuthentication } from '@/domain/chains/entities/rpc-uri-authentication.entity'; export interface RpcUri { authentication: RpcUriAuthentication; diff --git a/src/domain/chains/entities/schemas/chain.schema.ts b/src/domain/chains/entities/schemas/chain.schema.ts index f6b54a1f32..19a18d471a 100644 --- a/src/domain/chains/entities/schemas/chain.schema.ts +++ b/src/domain/chains/entities/schemas/chain.schema.ts @@ -1,13 +1,13 @@ import { JSONSchemaType } from 'ajv'; -import { Chain } from '../chain.entity'; -import { NativeCurrency } from '../native.currency.entity'; -import { RpcUriAuthentication } from '../rpc-uri-authentication.entity'; -import { RpcUri } from '../rpc-uri.entity'; -import { BlockExplorerUriTemplate } from '../block-explorer-uri-template.entity'; -import { Theme } from '../theme.entity'; -import { GasPriceOracle } from '../gas-price-oracle.entity'; -import { GasPriceFixed } from '../gas-price-fixed.entity'; -import { GasPriceFixedEIP1559 } from '../gas-price-fixed-eip-1559.entity'; +import { BlockExplorerUriTemplate } from '@/domain/chains/entities/block-explorer-uri-template.entity'; +import { Chain } from '@/domain/chains/entities/chain.entity'; +import { GasPriceFixedEIP1559 } from '@/domain/chains/entities/gas-price-fixed-eip-1559.entity'; +import { GasPriceFixed } from '@/domain/chains/entities/gas-price-fixed.entity'; +import { GasPriceOracle } from '@/domain/chains/entities/gas-price-oracle.entity'; +import { NativeCurrency } from '@/domain/chains/entities/native.currency.entity'; +import { RpcUriAuthentication } from '@/domain/chains/entities/rpc-uri-authentication.entity'; +import { RpcUri } from '@/domain/chains/entities/rpc-uri.entity'; +import { Theme } from '@/domain/chains/entities/theme.entity'; export const NATIVE_CURRENCY_SCHEMA_ID = 'https://safe-client.safe.global/schemas/chains/native-currency.json'; diff --git a/src/domain/chains/entities/schemas/master-copy.schema.ts b/src/domain/chains/entities/schemas/master-copy.schema.ts index 40f9df586f..e0d53d3877 100644 --- a/src/domain/chains/entities/schemas/master-copy.schema.ts +++ b/src/domain/chains/entities/schemas/master-copy.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { MasterCopy } from '../master-copies.entity'; +import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; export const MASTER_COPY_SCHEMA_ID = 'https://safe-client.safe.global/schemas/chains/master-copy.json'; diff --git a/src/domain/chains/master-copy.validator.ts b/src/domain/chains/master-copy.validator.ts index 53b59ff294..396d9afc2b 100644 --- a/src/domain/chains/master-copy.validator.ts +++ b/src/domain/chains/master-copy.validator.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { MasterCopy } from './entities/master-copies.entity'; +import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; import { MASTER_COPY_SCHEMA_ID, masterCopySchema, -} from './entities/schemas/master-copy.schema'; +} from '@/domain/chains/entities/schemas/master-copy.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class MasterCopyValidator implements IValidator { diff --git a/src/domain/collectibles/collectibles.repository.interface.ts b/src/domain/collectibles/collectibles.repository.interface.ts index 02b8c6d6de..828f5fddb8 100644 --- a/src/domain/collectibles/collectibles.repository.interface.ts +++ b/src/domain/collectibles/collectibles.repository.interface.ts @@ -1,5 +1,5 @@ -import { Page } from '../entities/page.entity'; -import { Collectible } from './entities/collectible.entity'; +import { Collectible } from '@/domain/collectibles/entities/collectible.entity'; +import { Page } from '@/domain/entities/page.entity'; export const IChainsRepository = Symbol('IChainsRepository'); diff --git a/src/domain/collectibles/collectibles.repository.ts b/src/domain/collectibles/collectibles.repository.ts index 7479cdce8b..f902c17a52 100644 --- a/src/domain/collectibles/collectibles.repository.ts +++ b/src/domain/collectibles/collectibles.repository.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { Collectible } from './entities/collectible.entity'; -import { Page } from '../entities/page.entity'; -import { ICollectiblesRepository } from './collectibles.repository.interface'; -import { CollectiblesValidator } from './collectibles.validator'; +import { ICollectiblesRepository } from '@/domain/collectibles/collectibles.repository.interface'; +import { CollectiblesValidator } from '@/domain/collectibles/collectibles.validator'; +import { Collectible } from '@/domain/collectibles/entities/collectible.entity'; +import { Page } from '@/domain/entities/page.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class CollectiblesRepository implements ICollectiblesRepository { diff --git a/src/domain/collectibles/collectibles.validator.ts b/src/domain/collectibles/collectibles.validator.ts index f8444bb18a..9d002c7c0e 100644 --- a/src/domain/collectibles/collectibles.validator.ts +++ b/src/domain/collectibles/collectibles.validator.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { Collectible } from './entities/collectible.entity'; +import { Collectible } from '@/domain/collectibles/entities/collectible.entity'; import { COLLECTIBLE_SCHEMA_ID, collectibleSchema, -} from './entities/schemas/collectible.schema'; +} from '@/domain/collectibles/entities/schemas/collectible.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class CollectiblesValidator implements IValidator { diff --git a/src/domain/collectibles/entities/__tests__/collectible.builder.ts b/src/domain/collectibles/entities/__tests__/collectible.builder.ts index 5bbd8c217d..a06c3c86e8 100644 --- a/src/domain/collectibles/entities/__tests__/collectible.builder.ts +++ b/src/domain/collectibles/entities/__tests__/collectible.builder.ts @@ -1,6 +1,6 @@ -import { Collectible } from '../collectible.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { Collectible } from '@/domain/collectibles/entities/collectible.entity'; export function collectibleBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/collectibles/entities/schemas/collectible.schema.ts b/src/domain/collectibles/entities/schemas/collectible.schema.ts index 6cbb4d4a85..83b9a70db9 100644 --- a/src/domain/collectibles/entities/schemas/collectible.schema.ts +++ b/src/domain/collectibles/entities/schemas/collectible.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { Collectible } from '../collectible.entity'; +import { Collectible } from '@/domain/collectibles/entities/collectible.entity'; export const COLLECTIBLE_SCHEMA_ID = 'https://safe-client.safe.global/schemas/collectibles/collectible.json'; diff --git a/src/domain/contracts/contracts.repository.interface.ts b/src/domain/contracts/contracts.repository.interface.ts index f8a19cad90..cdc897a418 100644 --- a/src/domain/contracts/contracts.repository.interface.ts +++ b/src/domain/contracts/contracts.repository.interface.ts @@ -1,4 +1,4 @@ -import { Contract } from './entities/contract.entity'; +import { Contract } from '@/domain/contracts/entities/contract.entity'; export const IContractsRepository = Symbol('IContractsRepository'); diff --git a/src/domain/contracts/contracts.repository.ts b/src/domain/contracts/contracts.repository.ts index 3e64e2dd01..37b5793769 100644 --- a/src/domain/contracts/contracts.repository.ts +++ b/src/domain/contracts/contracts.repository.ts @@ -1,8 +1,8 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { IContractsRepository } from './contracts.repository.interface'; -import { ContractsValidator } from './contracts.validator'; -import { Contract } from './entities/contract.entity'; +import { IContractsRepository } from '@/domain/contracts/contracts.repository.interface'; +import { ContractsValidator } from '@/domain/contracts/contracts.validator'; +import { Contract } from '@/domain/contracts/entities/contract.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class ContractsRepository implements IContractsRepository { diff --git a/src/domain/contracts/contracts.validator.ts b/src/domain/contracts/contracts.validator.ts index eca0c945a9..ba16773d2e 100644 --- a/src/domain/contracts/contracts.validator.ts +++ b/src/domain/contracts/contracts.validator.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { Contract } from './entities/contract.entity'; +import { Contract } from '@/domain/contracts/entities/contract.entity'; import { CONTRACT_SCHEMA_ID, contractSchema, -} from './entities/schemas/contract.schema'; +} from '@/domain/contracts/entities/schemas/contract.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class ContractsValidator implements IValidator { diff --git a/src/domain/contracts/entities/__tests__/contract.builder.ts b/src/domain/contracts/entities/__tests__/contract.builder.ts index 9d822d1edc..859e848069 100644 --- a/src/domain/contracts/entities/__tests__/contract.builder.ts +++ b/src/domain/contracts/entities/__tests__/contract.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; -import { Contract } from '../contract.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; import { fakeJson } from '@/__tests__/faker'; +import { Contract } from '@/domain/contracts/entities/contract.entity'; export function contractBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/data-decoder/data-decoded.repository.interface.ts b/src/domain/data-decoder/data-decoded.repository.interface.ts index e9cb230557..7860595e3d 100644 --- a/src/domain/data-decoder/data-decoded.repository.interface.ts +++ b/src/domain/data-decoder/data-decoded.repository.interface.ts @@ -1,4 +1,4 @@ -import { DataDecoded } from './entities/data-decoded.entity'; +import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; export const IDataDecodedRepository = Symbol('IDataDecodedRepository'); diff --git a/src/domain/data-decoder/data-decoded.repository.ts b/src/domain/data-decoder/data-decoded.repository.ts index fce6e6aa68..65b4e842ec 100644 --- a/src/domain/data-decoder/data-decoded.repository.ts +++ b/src/domain/data-decoder/data-decoded.repository.ts @@ -1,8 +1,8 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { IDataDecodedRepository } from './data-decoded.repository.interface'; -import { DataDecodedValidator } from './data-decoded.validator'; -import { DataDecoded } from './entities/data-decoded.entity'; +import { IDataDecodedRepository } from '@/domain/data-decoder/data-decoded.repository.interface'; +import { DataDecodedValidator } from '@/domain/data-decoder/data-decoded.validator'; +import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class DataDecodedRepository implements IDataDecodedRepository { diff --git a/src/domain/data-decoder/data-decoded.validator.ts b/src/domain/data-decoder/data-decoded.validator.ts index 378d096ee5..f9681a3d35 100644 --- a/src/domain/data-decoder/data-decoded.validator.ts +++ b/src/domain/data-decoder/data-decoded.validator.ts @@ -1,15 +1,15 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { DataDecoded } from './entities/data-decoded.entity'; +import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; import { DATA_DECODED_PARAMETER_SCHEMA_ID, DATA_DECODED_SCHEMA_ID, dataDecodedParameterSchema, dataDecodedSchema, -} from './entities/schemas/data-decoded.schema'; +} from '@/domain/data-decoder/entities/schemas/data-decoded.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class DataDecodedValidator implements IValidator { diff --git a/src/domain/data-decoder/entities/__tests__/data-decoded.builder.ts b/src/domain/data-decoder/entities/__tests__/data-decoded.builder.ts index 8096d71838..39954d90d6 100644 --- a/src/domain/data-decoder/entities/__tests__/data-decoded.builder.ts +++ b/src/domain/data-decoder/entities/__tests__/data-decoded.builder.ts @@ -1,6 +1,9 @@ import { faker } from '@faker-js/faker'; -import { DataDecoded, DataDecodedParameter } from '../data-decoded.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { + DataDecoded, + DataDecodedParameter, +} from '@/domain/data-decoder/entities/data-decoded.entity'; export function dataDecodedBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/delegate/delegate.repository.interface.ts b/src/domain/delegate/delegate.repository.interface.ts index 1258f34cd9..108230647c 100644 --- a/src/domain/delegate/delegate.repository.interface.ts +++ b/src/domain/delegate/delegate.repository.interface.ts @@ -1,5 +1,5 @@ -import { Page } from '../entities/page.entity'; -import { Delegate } from './entities/delegate.entity'; +import { Delegate } from '@/domain/delegate/entities/delegate.entity'; +import { Page } from '@/domain/entities/page.entity'; export const IDelegateRepository = Symbol('IDelegateRepository'); diff --git a/src/domain/delegate/delegate.repository.ts b/src/domain/delegate/delegate.repository.ts index e704d74710..d45ee2a9df 100644 --- a/src/domain/delegate/delegate.repository.ts +++ b/src/domain/delegate/delegate.repository.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { IDelegateRepository } from './delegate.repository.interface'; -import { Delegate } from './entities/delegate.entity'; -import { Page } from '../entities/page.entity'; -import { DelegateValidator } from './delegate.validator'; +import { IDelegateRepository } from '@/domain/delegate/delegate.repository.interface'; +import { DelegateValidator } from '@/domain/delegate/delegate.validator'; +import { Delegate } from '@/domain/delegate/entities/delegate.entity'; +import { Page } from '@/domain/entities/page.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class DelegateRepository implements IDelegateRepository { diff --git a/src/domain/delegate/delegate.validator.ts b/src/domain/delegate/delegate.validator.ts index a9f5e6a0ca..f245c29ce7 100644 --- a/src/domain/delegate/delegate.validator.ts +++ b/src/domain/delegate/delegate.validator.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { DefinedError, ValidateFunction } from 'ajv'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { ValidationErrorFactory } from '@/validation/providers/validation-error-factory'; -import { IValidator } from '../interfaces/validator.interface'; -import { Delegate } from './entities/delegate.entity'; +import { Delegate } from '@/domain/delegate/entities/delegate.entity'; import { DELEGATE_SCHEMA_ID, delegateSchema, -} from './entities/schemas/delegate.schema'; +} from '@/domain/delegate/entities/schemas/delegate.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; +import { ValidationErrorFactory } from '@/validation/providers/validation-error-factory'; @Injectable() export class DelegateValidator implements IValidator { diff --git a/src/domain/delegate/entities/__tests__/delegate.builder.ts b/src/domain/delegate/entities/__tests__/delegate.builder.ts index df9149b6c8..22396bb400 100644 --- a/src/domain/delegate/entities/__tests__/delegate.builder.ts +++ b/src/domain/delegate/entities/__tests__/delegate.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; -import { Delegate } from '../delegate.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { Delegate } from '@/domain/delegate/entities/delegate.entity'; export function delegateBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/delegate/entities/schemas/delegate.schema.ts b/src/domain/delegate/entities/schemas/delegate.schema.ts index eded71ed5e..85a35677d3 100644 --- a/src/domain/delegate/entities/schemas/delegate.schema.ts +++ b/src/domain/delegate/entities/schemas/delegate.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { Delegate } from '../delegate.entity'; +import { Delegate } from '@/domain/delegate/entities/delegate.entity'; export const DELEGATE_SCHEMA_ID = 'https://safe-client.safe.global/schemas/delegates/delegate.json'; diff --git a/src/domain/entities/__tests__/page.builder.ts b/src/domain/entities/__tests__/page.builder.ts index 874de2818d..29714a85f7 100644 --- a/src/domain/entities/__tests__/page.builder.ts +++ b/src/domain/entities/__tests__/page.builder.ts @@ -1,6 +1,6 @@ -import { Page } from '../page.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { Page } from '@/domain/entities/page.entity'; export function pageBuilder(): IBuilder> { return Builder.new>() diff --git a/src/domain/estimations/entities/__tests__/estimation.builder.ts b/src/domain/estimations/entities/__tests__/estimation.builder.ts index be3626a8e6..1fe2a2efba 100644 --- a/src/domain/estimations/entities/__tests__/estimation.builder.ts +++ b/src/domain/estimations/entities/__tests__/estimation.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { Estimation } from '../estimation.entity'; +import { Estimation } from '@/domain/estimations/entities/estimation.entity'; export function estimationBuilder(): IBuilder { return Builder.new().with('safeTxGas', faker.string.numeric(5)); diff --git a/src/domain/estimations/entities/get-estimation.dto.entity.ts b/src/domain/estimations/entities/get-estimation.dto.entity.ts index 6840dc6d2d..1c11450356 100644 --- a/src/domain/estimations/entities/get-estimation.dto.entity.ts +++ b/src/domain/estimations/entities/get-estimation.dto.entity.ts @@ -1,4 +1,4 @@ -import { Operation } from '../../safe/entities/operation.entity'; +import { Operation } from '@/domain/safe/entities/operation.entity'; export class GetEstimationDto { to: string; diff --git a/src/domain/estimations/entities/schemas/estimation.schema.ts b/src/domain/estimations/entities/schemas/estimation.schema.ts index fc58ade257..0ac9c10847 100644 --- a/src/domain/estimations/entities/schemas/estimation.schema.ts +++ b/src/domain/estimations/entities/schemas/estimation.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { Estimation } from '../estimation.entity'; +import { Estimation } from '@/domain/estimations/entities/estimation.entity'; export const ESTIMATION_SCHEMA_ID = 'https://safe-client.safe.global/schemas/estimations/estimation.json'; diff --git a/src/domain/estimations/estimations.repository.interface.ts b/src/domain/estimations/estimations.repository.interface.ts index d2fcdf96bc..507f6dece5 100644 --- a/src/domain/estimations/estimations.repository.interface.ts +++ b/src/domain/estimations/estimations.repository.interface.ts @@ -1,5 +1,5 @@ -import { GetEstimationDto } from './entities/get-estimation.dto.entity'; -import { Estimation } from './entities/estimation.entity'; +import { Estimation } from '@/domain/estimations/entities/estimation.entity'; +import { GetEstimationDto } from '@/domain/estimations/entities/get-estimation.dto.entity'; export const IEstimationsRepository = Symbol('IEstimationsRepository'); diff --git a/src/domain/estimations/estimations.repository.ts b/src/domain/estimations/estimations.repository.ts index c6a88b592c..614c44f9f1 100644 --- a/src/domain/estimations/estimations.repository.ts +++ b/src/domain/estimations/estimations.repository.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { GetEstimationDto } from './entities/get-estimation.dto.entity'; -import { Estimation } from './entities/estimation.entity'; -import { IEstimationsRepository } from './estimations.repository.interface'; -import { EstimationsValidator } from './estimations.validator'; +import { Estimation } from '@/domain/estimations/entities/estimation.entity'; +import { GetEstimationDto } from '@/domain/estimations/entities/get-estimation.dto.entity'; +import { IEstimationsRepository } from '@/domain/estimations/estimations.repository.interface'; +import { EstimationsValidator } from '@/domain/estimations/estimations.validator'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; @Injectable() export class EstimationsRepository implements IEstimationsRepository { diff --git a/src/domain/estimations/estimations.validator.ts b/src/domain/estimations/estimations.validator.ts index a29d21b309..3e9e321297 100644 --- a/src/domain/estimations/estimations.validator.ts +++ b/src/domain/estimations/estimations.validator.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { Estimation } from './entities/estimation.entity'; +import { Estimation } from '@/domain/estimations/entities/estimation.entity'; import { ESTIMATION_SCHEMA_ID, estimationSchema, -} from './entities/schemas/estimation.schema'; +} from '@/domain/estimations/entities/schemas/estimation.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class EstimationsValidator implements IValidator { diff --git a/src/domain/exchange/entities/__tests__/exchange-fiat-codes.builder.ts b/src/domain/exchange/entities/__tests__/exchange-fiat-codes.builder.ts index 5d4f15d35b..8b273083ce 100644 --- a/src/domain/exchange/entities/__tests__/exchange-fiat-codes.builder.ts +++ b/src/domain/exchange/entities/__tests__/exchange-fiat-codes.builder.ts @@ -1,5 +1,5 @@ -import { ExchangeFiatCodes } from '../exchange-fiat-codes.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { ExchangeFiatCodes } from '@/domain/exchange/entities/exchange-fiat-codes.entity'; export function exchangeFiatCodesBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/exchange/entities/__tests__/exchange-rates.builder.ts b/src/domain/exchange/entities/__tests__/exchange-rates.builder.ts index b81bce74bf..cb08f14194 100644 --- a/src/domain/exchange/entities/__tests__/exchange-rates.builder.ts +++ b/src/domain/exchange/entities/__tests__/exchange-rates.builder.ts @@ -1,5 +1,5 @@ -import { ExchangeRates } from '../exchange-rates.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { ExchangeRates } from '@/domain/exchange/entities/exchange-rates.entity'; export function exchangeRatesBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/exchange/entities/schemas/exchange-fiat-codes.schema.ts b/src/domain/exchange/entities/schemas/exchange-fiat-codes.schema.ts index 8ecfc4c58a..d2fb6f21fc 100644 --- a/src/domain/exchange/entities/schemas/exchange-fiat-codes.schema.ts +++ b/src/domain/exchange/entities/schemas/exchange-fiat-codes.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { ExchangeFiatCodes } from '../exchange-fiat-codes.entity'; +import { ExchangeFiatCodes } from '@/domain/exchange/entities/exchange-fiat-codes.entity'; export const EXCHANGE_FIAT_CODES_SCHEMA_ID = 'https://safe-client.safe.global/schemas/exchange/exchange-fiat-codes.json'; diff --git a/src/domain/exchange/entities/schemas/exchange-rates.schema.ts b/src/domain/exchange/entities/schemas/exchange-rates.schema.ts index 0b8e36ac74..c264b3f3b2 100644 --- a/src/domain/exchange/entities/schemas/exchange-rates.schema.ts +++ b/src/domain/exchange/entities/schemas/exchange-rates.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { ExchangeRates } from '../exchange-rates.entity'; +import { ExchangeRates } from '@/domain/exchange/entities/exchange-rates.entity'; export const EXCHANGE_RATES_SCHEMA_ID = 'https://safe-client.safe.global/schemas/exchange/exchange-rates.json'; diff --git a/src/domain/exchange/exchange-fiat-codes.validator.ts b/src/domain/exchange/exchange-fiat-codes.validator.ts index 184d189cdb..aba29ebdc5 100644 --- a/src/domain/exchange/exchange-fiat-codes.validator.ts +++ b/src/domain/exchange/exchange-fiat-codes.validator.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { ExchangeFiatCodes } from './entities/exchange-fiat-codes.entity'; +import { ExchangeFiatCodes } from '@/domain/exchange/entities/exchange-fiat-codes.entity'; import { EXCHANGE_FIAT_CODES_SCHEMA_ID, exchangeFiatCodesSchema, -} from './entities/schemas/exchange-fiat-codes.schema'; +} from '@/domain/exchange/entities/schemas/exchange-fiat-codes.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class ExchangeFiatCodesValidator diff --git a/src/domain/exchange/exchange-rates.validator.ts b/src/domain/exchange/exchange-rates.validator.ts index 5fd54d5e49..5a578f60ab 100644 --- a/src/domain/exchange/exchange-rates.validator.ts +++ b/src/domain/exchange/exchange-rates.validator.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { ExchangeRates } from './entities/exchange-rates.entity'; +import { ExchangeRates } from '@/domain/exchange/entities/exchange-rates.entity'; import { EXCHANGE_RATES_SCHEMA_ID, exchangeRatesSchema, -} from './entities/schemas/exchange-rates.schema'; +} from '@/domain/exchange/entities/schemas/exchange-rates.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class ExchangeRatesValidator implements IValidator { diff --git a/src/domain/exchange/exchange.repository.ts b/src/domain/exchange/exchange.repository.ts index 7d1bc4743c..55889090aa 100644 --- a/src/domain/exchange/exchange.repository.ts +++ b/src/domain/exchange/exchange.repository.ts @@ -1,12 +1,12 @@ -import { IExchangeRepository } from './exchange.repository.interface'; import { Inject, Injectable, InternalServerErrorException, } from '@nestjs/common'; -import { IExchangeApi } from '../interfaces/exchange-api.interface'; -import { ExchangeFiatCodesValidator } from './exchange-fiat-codes.validator'; -import { ExchangeRatesValidator } from './exchange-rates.validator'; +import { ExchangeFiatCodesValidator } from '@/domain/exchange/exchange-fiat-codes.validator'; +import { ExchangeRatesValidator } from '@/domain/exchange/exchange-rates.validator'; +import { IExchangeRepository } from '@/domain/exchange/exchange.repository.interface'; +import { IExchangeApi } from '@/domain/interfaces/exchange-api.interface'; @Injectable() export class ExchangeRepository implements IExchangeRepository { diff --git a/src/domain/flush/flush.repository.interface.ts b/src/domain/flush/flush.repository.interface.ts index 57489ade8a..852a8b4c72 100644 --- a/src/domain/flush/flush.repository.interface.ts +++ b/src/domain/flush/flush.repository.interface.ts @@ -1,4 +1,4 @@ -import { InvalidationPatternDto } from './entities/invalidation-pattern.dto.entity'; +import { InvalidationPatternDto } from '@/domain/flush/entities/invalidation-pattern.dto.entity'; export const IFlushRepository = Symbol('IFlushRepository'); diff --git a/src/domain/flush/flush.repository.ts b/src/domain/flush/flush.repository.ts index 6d4b85e57a..abc7979d39 100644 --- a/src/domain/flush/flush.repository.ts +++ b/src/domain/flush/flush.repository.ts @@ -1,8 +1,8 @@ import { Inject, Injectable } from '@nestjs/common'; -import { IConfigApi } from '../interfaces/config-api.interface'; -import { InvalidationPatternDto } from './entities/invalidation-pattern.dto.entity'; -import { InvalidationTarget } from './entities/invalidation-target.entity'; -import { IFlushRepository } from './flush.repository.interface'; +import { InvalidationPatternDto } from '@/domain/flush/entities/invalidation-pattern.dto.entity'; +import { InvalidationTarget } from '@/domain/flush/entities/invalidation-target.entity'; +import { IFlushRepository } from '@/domain/flush/flush.repository.interface'; +import { IConfigApi } from '@/domain/interfaces/config-api.interface'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; @Injectable() diff --git a/src/domain/health/health.repository.interface.ts b/src/domain/health/health.repository.interface.ts index f13d78b00f..0d92a24666 100644 --- a/src/domain/health/health.repository.interface.ts +++ b/src/domain/health/health.repository.interface.ts @@ -1,4 +1,4 @@ -import { HealthEntity } from './entities/health.entity'; +import { HealthEntity } from '@/domain/health/entities/health.entity'; export const IHealthRepository = Symbol('IHealthRepository'); diff --git a/src/domain/health/health.repository.ts b/src/domain/health/health.repository.ts index ab916baa78..a327c12e81 100644 --- a/src/domain/health/health.repository.ts +++ b/src/domain/health/health.repository.ts @@ -1,11 +1,11 @@ import { Inject, Injectable } from '@nestjs/common'; -import { HealthEntity } from './entities/health.entity'; -import { ILoggingService, LoggingService } from '@/logging/logging.interface'; -import { IHealthRepository } from './health.repository.interface'; +import { HealthEntity } from '@/domain/health/entities/health.entity'; +import { IHealthRepository } from '@/domain/health/health.repository.interface'; import { CacheReadiness, ICacheReadiness, -} from '../interfaces/cache-readiness.interface'; +} from '@/domain/interfaces/cache-readiness.interface'; +import { ILoggingService, LoggingService } from '@/logging/logging.interface'; @Injectable() export class HealthRepository implements IHealthRepository { diff --git a/src/domain/human-description/entities/human-description-template.entity.ts b/src/domain/human-description/entities/human-description-template.entity.ts index 72cb8bfc17..3a43d9bd36 100644 --- a/src/domain/human-description/entities/human-description-template.entity.ts +++ b/src/domain/human-description/entities/human-description-template.entity.ts @@ -1,12 +1,12 @@ import { decodeFunctionData, parseAbi } from 'viem'; import { AddressFragment, - NumberFragment, HumanDescriptionFragment, + NumberFragment, + TextFragment, TokenValueFragment, ValueType, - TextFragment, -} from './human-description.entity'; +} from '@/domain/human-description/entities/human-description.entity'; type SafeRegExpMatchArray = RegExpMatchArray & { groups: NonNullable; diff --git a/src/domain/human-description/human-description.repository.interface.ts b/src/domain/human-description/human-description.repository.interface.ts index f8ea0fda08..6847eb9544 100644 --- a/src/domain/human-description/human-description.repository.interface.ts +++ b/src/domain/human-description/human-description.repository.interface.ts @@ -1,7 +1,7 @@ import { FunctionSignatureHash, HumanDescriptionFragment, -} from './entities/human-description.entity'; +} from '@/domain/human-description/entities/human-description.entity'; export const IHumanDescriptionRepository = Symbol( 'IHumanDescriptionRepository', diff --git a/src/domain/human-description/human-description.repository.ts b/src/domain/human-description/human-description.repository.ts index ecb6f3b958..52ac639bed 100644 --- a/src/domain/human-description/human-description.repository.ts +++ b/src/domain/human-description/human-description.repository.ts @@ -1,12 +1,12 @@ import { Inject, Injectable } from '@nestjs/common'; -import { IHumanDescriptionRepository } from './human-description.repository.interface'; +import { getFunctionSelector } from 'viem'; +import { HumanDescriptionTemplate } from '@/domain/human-description/entities/human-description-template.entity'; import { FunctionSignatureHash, HumanDescriptionFragment, -} from './entities/human-description.entity'; -import { IHumanDescriptionApi } from '../interfaces/human-description-api.interface'; -import { getFunctionSelector } from 'viem'; -import { HumanDescriptionTemplate } from './entities/human-description-template.entity'; +} from '@/domain/human-description/entities/human-description.entity'; +import { IHumanDescriptionRepository } from '@/domain/human-description/human-description.repository.interface'; +import { IHumanDescriptionApi } from '@/domain/interfaces/human-description-api.interface'; @Injectable() export class HumanDescriptionRepository implements IHumanDescriptionRepository { diff --git a/src/domain/interfaces/config-api.interface.ts b/src/domain/interfaces/config-api.interface.ts index 73877de2a2..84c66cd5d4 100644 --- a/src/domain/interfaces/config-api.interface.ts +++ b/src/domain/interfaces/config-api.interface.ts @@ -1,6 +1,6 @@ -import { Page } from '../entities/page.entity'; -import { Chain } from '../chains/entities/chain.entity'; -import { SafeApp } from '../safe-apps/entities/safe-app.entity'; +import { Chain } from '@/domain/chains/entities/chain.entity'; +import { Page } from '@/domain/entities/page.entity'; +import { SafeApp } from '@/domain/safe-apps/entities/safe-app.entity'; export const IConfigApi = Symbol('IConfigApi'); diff --git a/src/domain/interfaces/exchange-api.interface.ts b/src/domain/interfaces/exchange-api.interface.ts index ab9d9c6e30..750ec6f77e 100644 --- a/src/domain/interfaces/exchange-api.interface.ts +++ b/src/domain/interfaces/exchange-api.interface.ts @@ -1,5 +1,5 @@ -import { ExchangeRates } from '../exchange/entities/exchange-rates.entity'; -import { ExchangeFiatCodes } from '../exchange/entities/exchange-fiat-codes.entity'; +import { ExchangeFiatCodes } from '@/domain/exchange/entities/exchange-fiat-codes.entity'; +import { ExchangeRates } from '@/domain/exchange/entities/exchange-rates.entity'; export const IExchangeApi = Symbol('IExchangeApi'); diff --git a/src/domain/interfaces/human-description-api.interface.ts b/src/domain/interfaces/human-description-api.interface.ts index 67d7b390e4..9635ed5d86 100644 --- a/src/domain/interfaces/human-description-api.interface.ts +++ b/src/domain/interfaces/human-description-api.interface.ts @@ -1,4 +1,4 @@ -import { FunctionSignature } from '../human-description/entities/human-description.entity'; +import { FunctionSignature } from '@/domain/human-description/entities/human-description.entity'; export const IHumanDescriptionApi = Symbol('IHumanDescriptionApi'); diff --git a/src/domain/interfaces/page-validator.interface.ts b/src/domain/interfaces/page-validator.interface.ts index 526fa13b1d..730acc9af6 100644 --- a/src/domain/interfaces/page-validator.interface.ts +++ b/src/domain/interfaces/page-validator.interface.ts @@ -1,4 +1,4 @@ -import { Page } from '../entities/page.entity'; +import { Page } from '@/domain/entities/page.entity'; export interface IPageValidator { validatePage(data: unknown): Page; diff --git a/src/domain/interfaces/transaction-api.interface.ts b/src/domain/interfaces/transaction-api.interface.ts index cd50db51e7..1677ea458a 100644 --- a/src/domain/interfaces/transaction-api.interface.ts +++ b/src/domain/interfaces/transaction-api.interface.ts @@ -1,25 +1,25 @@ -import { Backbone } from '../backbone/entities/backbone.entity'; -import { Balance } from '../balances/entities/balance.entity'; -import { Page } from '../entities/page.entity'; -import { Collectible } from '../collectibles/entities/collectible.entity'; -import { MasterCopy } from '../chains/entities/master-copies.entity'; -import { Safe } from '../safe/entities/safe.entity'; -import { Contract } from '../contracts/entities/contract.entity'; -import { DataDecoded } from '../data-decoder/entities/data-decoded.entity'; -import { Delegate } from '../delegate/entities/delegate.entity'; -import { Transfer } from '../safe/entities/transfer.entity'; -import { MultisigTransaction } from '../safe/entities/multisig-transaction.entity'; -import { Transaction } from '../safe/entities/transaction.entity'; -import { Token } from '../tokens/entities/token.entity'; -import { ModuleTransaction } from '../safe/entities/module-transaction.entity'; -import { SafeList } from '../safe/entities/safe-list.entity'; -import { CreationTransaction } from '../safe/entities/creation-transaction.entity'; -import { Device } from '../notifications/entities/device.entity'; -import { GetEstimationDto } from '../estimations/entities/get-estimation.dto.entity'; -import { Estimation } from '../estimations/entities/estimation.entity'; -import { Message } from '../messages/entities/message.entity'; -import { ProposeTransactionDto } from '../transactions/entities/propose-transaction.dto.entity'; -import { AddConfirmationDto } from '../transactions/entities/add-confirmation.dto.entity'; +import { Backbone } from '@/domain/backbone/entities/backbone.entity'; +import { Balance } from '@/domain/balances/entities/balance.entity'; +import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; +import { Collectible } from '@/domain/collectibles/entities/collectible.entity'; +import { Contract } from '@/domain/contracts/entities/contract.entity'; +import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; +import { Delegate } from '@/domain/delegate/entities/delegate.entity'; +import { Page } from '@/domain/entities/page.entity'; +import { Estimation } from '@/domain/estimations/entities/estimation.entity'; +import { GetEstimationDto } from '@/domain/estimations/entities/get-estimation.dto.entity'; +import { Message } from '@/domain/messages/entities/message.entity'; +import { Device } from '@/domain/notifications/entities/device.entity'; +import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; +import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; +import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; +import { SafeList } from '@/domain/safe/entities/safe-list.entity'; +import { Safe } from '@/domain/safe/entities/safe.entity'; +import { Transaction } from '@/domain/safe/entities/transaction.entity'; +import { Transfer } from '@/domain/safe/entities/transfer.entity'; +import { Token } from '@/domain/tokens/entities/token.entity'; +import { AddConfirmationDto } from '@/domain/transactions/entities/add-confirmation.dto.entity'; +import { ProposeTransactionDto } from '@/domain/transactions/entities/propose-transaction.dto.entity'; export interface ITransactionApi { getBalances(args: { diff --git a/src/domain/interfaces/transaction-api.manager.interface.ts b/src/domain/interfaces/transaction-api.manager.interface.ts index f63b0c124f..e3848ce31a 100644 --- a/src/domain/interfaces/transaction-api.manager.interface.ts +++ b/src/domain/interfaces/transaction-api.manager.interface.ts @@ -1,4 +1,4 @@ -import { ITransactionApi } from './transaction-api.interface'; +import { ITransactionApi } from '@/domain/interfaces/transaction-api.interface'; export const ITransactionApiManager = Symbol('ITransactionApiManager'); diff --git a/src/domain/messages/entities/__tests__/message-confirmation.builder.ts b/src/domain/messages/entities/__tests__/message-confirmation.builder.ts index 7c07092dd8..7717ebf4ee 100644 --- a/src/domain/messages/entities/__tests__/message-confirmation.builder.ts +++ b/src/domain/messages/entities/__tests__/message-confirmation.builder.ts @@ -4,7 +4,7 @@ import { Builder, IBuilder } from '@/__tests__/builder'; import { MessageConfirmation, SignatureType, -} from '../message-confirmation.entity'; +} from '@/domain/messages/entities/message-confirmation.entity'; export function messageConfirmationBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/messages/entities/__tests__/message.builder.ts b/src/domain/messages/entities/__tests__/message.builder.ts index 233b7b6ac3..2ff8f848a0 100644 --- a/src/domain/messages/entities/__tests__/message.builder.ts +++ b/src/domain/messages/entities/__tests__/message.builder.ts @@ -1,11 +1,11 @@ import { faker } from '@faker-js/faker'; import { random, range } from 'lodash'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { Message } from '../message.entity'; +import { Message } from '@/domain/messages/entities/message.entity'; import { messageConfirmationBuilder, toJson as messageConfirmationToJson, -} from './message-confirmation.builder'; +} from '@/domain/messages/entities/__tests__/message-confirmation.builder'; export function messageBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/messages/entities/message.entity.ts b/src/domain/messages/entities/message.entity.ts index 6f4e1a523f..49093f4620 100644 --- a/src/domain/messages/entities/message.entity.ts +++ b/src/domain/messages/entities/message.entity.ts @@ -1,4 +1,4 @@ -import { MessageConfirmation } from './message-confirmation.entity'; +import { MessageConfirmation } from '@/domain/messages/entities/message-confirmation.entity'; export interface Message { created: Date; diff --git a/src/domain/messages/entities/schemas/message.schema.ts b/src/domain/messages/entities/schemas/message.schema.ts index 33a0dc0d71..d171ce6a1e 100644 --- a/src/domain/messages/entities/schemas/message.schema.ts +++ b/src/domain/messages/entities/schemas/message.schema.ts @@ -1,5 +1,5 @@ +import { buildPageSchema } from '@/domain/entities/schemas/page.schema.factory'; import { Schema } from 'ajv'; -import { buildPageSchema } from '../../../entities/schemas/page.schema.factory'; export const MESSAGE_CONFIRMATION_SCHEMA_ID = 'https://safe-client.safe.global/schemas/messages/message-confirmation.json'; diff --git a/src/domain/messages/message.validator.ts b/src/domain/messages/message.validator.ts index 24244cc4a8..553e42d651 100644 --- a/src/domain/messages/message.validator.ts +++ b/src/domain/messages/message.validator.ts @@ -1,11 +1,8 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { Page } from '@/routes/common/entities/page.entity'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IPageValidator } from '../interfaces/page-validator.interface'; -import { IValidator } from '../interfaces/validator.interface'; -import { Message } from './entities/message.entity'; +import { IPageValidator } from '@/domain/interfaces/page-validator.interface'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { Message } from '@/domain/messages/entities/message.entity'; import { MESSAGE_CONFIRMATION_SCHEMA_ID, MESSAGE_PAGE_SCHEMA_ID, @@ -13,7 +10,10 @@ import { messageConfirmationSchema, messagePageSchema, messageSchema, -} from './entities/schemas/message.schema'; +} from '@/domain/messages/entities/schemas/message.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; +import { Page } from '@/domain/entities/page.entity'; @Injectable() export class MessageValidator diff --git a/src/domain/messages/messages.repository.interface.ts b/src/domain/messages/messages.repository.interface.ts index d156bed5fc..0bfc0b7fa4 100644 --- a/src/domain/messages/messages.repository.interface.ts +++ b/src/domain/messages/messages.repository.interface.ts @@ -1,5 +1,5 @@ -import { Page } from '../entities/page.entity'; -import { Message } from './entities/message.entity'; +import { Page } from '@/domain/entities/page.entity'; +import { Message } from '@/domain/messages/entities/message.entity'; export const IMessagesRepository = Symbol('IMessagesRepository'); diff --git a/src/domain/messages/messages.repository.ts b/src/domain/messages/messages.repository.ts index d4bb9fbc47..619e552e35 100644 --- a/src/domain/messages/messages.repository.ts +++ b/src/domain/messages/messages.repository.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; -import { Page } from '../entities/page.entity'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { Message } from './entities/message.entity'; -import { MessageValidator } from './message.validator'; -import { IMessagesRepository } from './messages.repository.interface'; +import { Page } from '@/domain/entities/page.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; +import { Message } from '@/domain/messages/entities/message.entity'; +import { MessageValidator } from '@/domain/messages/message.validator'; +import { IMessagesRepository } from '@/domain/messages/messages.repository.interface'; @Injectable() export class MessagesRepository implements IMessagesRepository { diff --git a/src/domain/notifications/notifications.repository.interface.ts b/src/domain/notifications/notifications.repository.interface.ts index 23081c53cb..6a3e302b1a 100644 --- a/src/domain/notifications/notifications.repository.interface.ts +++ b/src/domain/notifications/notifications.repository.interface.ts @@ -1,5 +1,5 @@ -import { Device } from './entities/device.entity'; -import { SafeRegistration } from './entities/safe-registration.entity'; +import { Device } from '@/domain/notifications/entities/device.entity'; +import { SafeRegistration } from '@/domain/notifications/entities/safe-registration.entity'; export const INotificationsRepository = Symbol('INotificationsRepository'); diff --git a/src/domain/notifications/notifications.repository.ts b/src/domain/notifications/notifications.repository.ts index dcdd96d0cb..6c7429a072 100644 --- a/src/domain/notifications/notifications.repository.ts +++ b/src/domain/notifications/notifications.repository.ts @@ -1,8 +1,8 @@ import { Inject } from '@nestjs/common'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { Device } from './entities/device.entity'; -import { SafeRegistration } from './entities/safe-registration.entity'; -import { INotificationsRepository } from './notifications.repository.interface'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; +import { Device } from '@/domain/notifications/entities/device.entity'; +import { SafeRegistration } from '@/domain/notifications/entities/safe-registration.entity'; +import { INotificationsRepository } from '@/domain/notifications/notifications.repository.interface'; export class NotificationsRepository implements INotificationsRepository { constructor( diff --git a/src/domain/relay/limit-addresses.mapper.ts b/src/domain/relay/limit-addresses.mapper.ts index 6fd9c7b54a..f637735890 100644 --- a/src/domain/relay/limit-addresses.mapper.ts +++ b/src/domain/relay/limit-addresses.mapper.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from '@nestjs/common'; -import { SafeContractHelper } from './contracts/safe-contract.helper'; -import { Erc20ContractHelper } from './contracts/erc20-contract.helper'; import { Hex } from 'viem/types/misc'; +import { Erc20ContractHelper } from '@/domain/relay/contracts/erc20-contract.helper'; +import { SafeContractHelper } from '@/domain/relay/contracts/safe-contract.helper'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; export interface RelayPayload { diff --git a/src/domain/relay/relay.module.ts b/src/domain/relay/relay.module.ts index 207d608d81..68351e521e 100644 --- a/src/domain/relay/relay.module.ts +++ b/src/domain/relay/relay.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; -import { SafeContractHelper } from './contracts/safe-contract.helper'; import { LimitAddressesMapper } from '@/domain/relay/limit-addresses.mapper'; import { Erc20ContractHelper } from '@/domain/relay/contracts/erc20-contract.helper'; +import { SafeContractHelper } from '@/domain/relay/contracts/safe-contract.helper'; @Module({ providers: [LimitAddressesMapper, Erc20ContractHelper, SafeContractHelper], diff --git a/src/domain/relay/relay.repository.ts b/src/domain/relay/relay.repository.ts index e6c82888f4..550623fe7a 100644 --- a/src/domain/relay/relay.repository.ts +++ b/src/domain/relay/relay.repository.ts @@ -1,9 +1,12 @@ import { Inject, Injectable } from '@nestjs/common'; -import { RelayApi } from '../interfaces/relay-api.interface'; -import { LimitAddressesMapper, RelayPayload } from './limit-addresses.mapper'; +import { Hex } from 'viem/types/misc'; import { IConfigurationService } from '@/config/configuration.service.interface'; +import { RelayApi } from '@/domain/interfaces/relay-api.interface'; +import { + LimitAddressesMapper, + RelayPayload, +} from '@/domain/relay/limit-addresses.mapper'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; -import { Hex } from 'viem/types/misc'; class RelayLimitReachedError extends Error { constructor( diff --git a/src/domain/safe-apps/entities/__tests__/safe-app-access-control.builder.ts b/src/domain/safe-apps/entities/__tests__/safe-app-access-control.builder.ts index 31655f41fd..95a83f0629 100644 --- a/src/domain/safe-apps/entities/__tests__/safe-app-access-control.builder.ts +++ b/src/domain/safe-apps/entities/__tests__/safe-app-access-control.builder.ts @@ -4,7 +4,7 @@ import { Builder, IBuilder } from '@/__tests__/builder'; import { SafeAppAccessControl, SafeAppAccessControlPolicies, -} from '../safe-app-access-control.entity'; +} from '@/domain/safe-apps/entities/safe-app-access-control.entity'; export function safeAppAccessControlBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe-apps/entities/__tests__/safe-app-provider.builder.ts b/src/domain/safe-apps/entities/__tests__/safe-app-provider.builder.ts index fa9e1abbbc..49bbae19d1 100644 --- a/src/domain/safe-apps/entities/__tests__/safe-app-provider.builder.ts +++ b/src/domain/safe-apps/entities/__tests__/safe-app-provider.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; -import { SafeAppProvider } from '../safe-app-provider.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { SafeAppProvider } from '@/domain/safe-apps/entities/safe-app-provider.entity'; export function safeAppProviderBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe-apps/entities/__tests__/safe-app-social-profile.builder.ts b/src/domain/safe-apps/entities/__tests__/safe-app-social-profile.builder.ts index 95f3edeae9..1c3427d8b2 100644 --- a/src/domain/safe-apps/entities/__tests__/safe-app-social-profile.builder.ts +++ b/src/domain/safe-apps/entities/__tests__/safe-app-social-profile.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { SafeAppSocialProfile } from '../safe-app-social-profile.entity'; +import { SafeAppSocialProfile } from '@/domain/safe-apps/entities/safe-app-social-profile.entity'; export function safeAppSocialProfileBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe-apps/entities/__tests__/safe-app.builder.ts b/src/domain/safe-apps/entities/__tests__/safe-app.builder.ts index 1cef693d2f..87bdea8e01 100644 --- a/src/domain/safe-apps/entities/__tests__/safe-app.builder.ts +++ b/src/domain/safe-apps/entities/__tests__/safe-app.builder.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import { random, range } from 'lodash'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { SafeApp } from '../safe-app.entity'; -import { safeAppAccessControlBuilder } from './safe-app-access-control.builder'; -import { safeAppProviderBuilder } from './safe-app-provider.builder'; -import { safeAppSocialProfileBuilder } from './safe-app-social-profile.builder'; +import { safeAppAccessControlBuilder } from '@/domain/safe-apps/entities/__tests__/safe-app-access-control.builder'; +import { safeAppProviderBuilder } from '@/domain/safe-apps/entities/__tests__/safe-app-provider.builder'; +import { safeAppSocialProfileBuilder } from '@/domain/safe-apps/entities/__tests__/safe-app-social-profile.builder'; +import { SafeApp } from '@/domain/safe-apps/entities/safe-app.entity'; export function safeAppBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe-apps/entities/safe-app.entity.ts b/src/domain/safe-apps/entities/safe-app.entity.ts index 4280d867bb..ed5f690af9 100644 --- a/src/domain/safe-apps/entities/safe-app.entity.ts +++ b/src/domain/safe-apps/entities/safe-app.entity.ts @@ -1,6 +1,6 @@ -import { SafeAppAccessControl } from './safe-app-access-control.entity'; -import { SafeAppProvider } from './safe-app-provider.entity'; -import { SafeAppSocialProfile } from './safe-app-social-profile.entity'; +import { SafeAppAccessControl } from '@/domain/safe-apps/entities/safe-app-access-control.entity'; +import { SafeAppProvider } from '@/domain/safe-apps/entities/safe-app-provider.entity'; +import { SafeAppSocialProfile } from '@/domain/safe-apps/entities/safe-app-social-profile.entity'; export interface SafeApp { id: number; diff --git a/src/domain/safe-apps/entities/schemas/safe-app.schema.ts b/src/domain/safe-apps/entities/schemas/safe-app.schema.ts index 699b1fb34a..6052bd94aa 100644 --- a/src/domain/safe-apps/entities/schemas/safe-app.schema.ts +++ b/src/domain/safe-apps/entities/schemas/safe-app.schema.ts @@ -2,9 +2,9 @@ import { JSONSchemaType, Schema } from 'ajv'; import { SafeAppAccessControl, SafeAppAccessControlPolicies, -} from '../safe-app-access-control.entity'; -import { SafeAppProvider } from '../safe-app-provider.entity'; -import { SafeAppSocialProfile } from '../safe-app-social-profile.entity'; +} from '@/domain/safe-apps/entities/safe-app-access-control.entity'; +import { SafeAppProvider } from '@/domain/safe-apps/entities/safe-app-provider.entity'; +import { SafeAppSocialProfile } from '@/domain/safe-apps/entities/safe-app-social-profile.entity'; export const SAFE_APP_PROVIDER_SCHEMA_ID = 'https://safe-client.safe.global/schemas/safe-apps/safe-app-provider.json'; diff --git a/src/domain/safe-apps/safe-apps.repository.interface.ts b/src/domain/safe-apps/safe-apps.repository.interface.ts index ecc54a43a4..b0b699d3e3 100644 --- a/src/domain/safe-apps/safe-apps.repository.interface.ts +++ b/src/domain/safe-apps/safe-apps.repository.interface.ts @@ -1,4 +1,4 @@ -import { SafeApp } from './entities/safe-app.entity'; +import { SafeApp } from '@/domain/safe-apps/entities/safe-app.entity'; export const ISafeAppsRepository = Symbol('ISafeAppsRepository'); diff --git a/src/domain/safe-apps/safe-apps.repository.ts b/src/domain/safe-apps/safe-apps.repository.ts index 42ec0bf0a2..ec768d39af 100644 --- a/src/domain/safe-apps/safe-apps.repository.ts +++ b/src/domain/safe-apps/safe-apps.repository.ts @@ -1,8 +1,8 @@ import { Inject, Injectable } from '@nestjs/common'; -import { IConfigApi } from '../interfaces/config-api.interface'; -import { SafeApp } from './entities/safe-app.entity'; -import { ISafeAppsRepository } from './safe-apps.repository.interface'; -import { SafeAppsValidator } from './safe-apps.validator'; +import { IConfigApi } from '@/domain/interfaces/config-api.interface'; +import { SafeApp } from '@/domain/safe-apps/entities/safe-app.entity'; +import { ISafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository.interface'; +import { SafeAppsValidator } from '@/domain/safe-apps/safe-apps.validator'; @Injectable() export class SafeAppsRepository implements ISafeAppsRepository { diff --git a/src/domain/safe-apps/safe-apps.validator.ts b/src/domain/safe-apps/safe-apps.validator.ts index 95a9c9aba7..90721f4dee 100644 --- a/src/domain/safe-apps/safe-apps.validator.ts +++ b/src/domain/safe-apps/safe-apps.validator.ts @@ -1,19 +1,19 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { SafeApp } from './entities/safe-app.entity'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { SafeApp } from '@/domain/safe-apps/entities/safe-app.entity'; import { - SAFE_APP_SCHEMA_ID, SAFE_APP_ACCESS_CONTROL_SCHEMA_ID, SAFE_APP_PROVIDER_SCHEMA_ID, + SAFE_APP_SCHEMA_ID, SAFE_APP_SOCIAL_PROFILE_SCHEMA_ID, safeAppAccessControlSchema, safeAppProviderSchema, safeAppSchema, safeAppSocialProfileSchema, -} from './entities/schemas/safe-app.schema'; +} from '@/domain/safe-apps/entities/schemas/safe-app.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class SafeAppsValidator implements IValidator { diff --git a/src/domain/safe/creation-transaction.validator.ts b/src/domain/safe/creation-transaction.validator.ts index ab924f9e3d..6757fc5cce 100644 --- a/src/domain/safe/creation-transaction.validator.ts +++ b/src/domain/safe/creation-transaction.validator.ts @@ -1,19 +1,19 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; import { DATA_DECODED_PARAMETER_SCHEMA_ID, DATA_DECODED_SCHEMA_ID, dataDecodedParameterSchema, dataDecodedSchema, -} from '../data-decoder/entities/schemas/data-decoded.schema'; -import { IValidator } from '../interfaces/validator.interface'; -import { CreationTransaction } from './entities/creation-transaction.entity'; +} from '@/domain/data-decoder/entities/schemas/data-decoded.schema'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; import { CREATION_TRANSACTION_SCHEMA_ID, creationTransactionSchema, -} from './entities/schemas/creation-transaction.schema'; +} from '@/domain/safe/entities/schemas/creation-transaction.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class CreationTransactionValidator diff --git a/src/domain/safe/entities/__tests__/creation-transaction.builder.ts b/src/domain/safe/entities/__tests__/creation-transaction.builder.ts index ab59e3c3b4..c5d9c6135b 100644 --- a/src/domain/safe/entities/__tests__/creation-transaction.builder.ts +++ b/src/domain/safe/entities/__tests__/creation-transaction.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { CreationTransaction } from '../creation-transaction.entity'; -import { dataDecodedBuilder } from '../../../data-decoder/entities/__tests__/data-decoded.builder'; +import { dataDecodedBuilder } from '@/domain/data-decoder/entities/__tests__/data-decoded.builder'; +import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; export function creationTransactionBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe/entities/__tests__/erc20-transfer.builder.ts b/src/domain/safe/entities/__tests__/erc20-transfer.builder.ts index 98b65cd088..e524060647 100644 --- a/src/domain/safe/entities/__tests__/erc20-transfer.builder.ts +++ b/src/domain/safe/entities/__tests__/erc20-transfer.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { ERC20Transfer } from '../transfer.entity'; +import { ERC20Transfer } from '@/domain/safe/entities/transfer.entity'; export function erc20TransferBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe/entities/__tests__/erc721-transfer.builder.ts b/src/domain/safe/entities/__tests__/erc721-transfer.builder.ts index 3a0cb9ca25..75c8c5fe65 100644 --- a/src/domain/safe/entities/__tests__/erc721-transfer.builder.ts +++ b/src/domain/safe/entities/__tests__/erc721-transfer.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { ERC721Transfer } from '../transfer.entity'; +import { ERC721Transfer } from '@/domain/safe/entities/transfer.entity'; export function erc721TransferBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe/entities/__tests__/ethereum-transaction.builder.ts b/src/domain/safe/entities/__tests__/ethereum-transaction.builder.ts index 8d5e1e40b4..e82e78ec1e 100644 --- a/src/domain/safe/entities/__tests__/ethereum-transaction.builder.ts +++ b/src/domain/safe/entities/__tests__/ethereum-transaction.builder.ts @@ -1,6 +1,6 @@ -import { EthereumTransaction } from '../ethereum-transaction.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { EthereumTransaction } from '@/domain/safe/entities/ethereum-transaction.entity'; export function ethereumTransactionBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe/entities/__tests__/module-transaction.builder.ts b/src/domain/safe/entities/__tests__/module-transaction.builder.ts index a4df29211d..aee766e58b 100644 --- a/src/domain/safe/entities/__tests__/module-transaction.builder.ts +++ b/src/domain/safe/entities/__tests__/module-transaction.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; -import { dataDecodedBuilder } from '../../../data-decoder/entities/__tests__/data-decoded.builder'; +import { dataDecodedBuilder } from '@/domain/data-decoder/entities/__tests__/data-decoded.builder'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { ModuleTransaction } from '../module-transaction.entity'; +import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; export function moduleTransactionBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder.ts b/src/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder.ts index 1d75942018..b2ab94a42e 100644 --- a/src/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder.ts +++ b/src/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder.ts @@ -1,6 +1,6 @@ -import { Confirmation } from '../multisig-transaction.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { Confirmation } from '@/domain/safe/entities/multisig-transaction.entity'; export function confirmationBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe/entities/__tests__/multisig-transaction.builder.ts b/src/domain/safe/entities/__tests__/multisig-transaction.builder.ts index 7b0c7b8c44..dede984f80 100644 --- a/src/domain/safe/entities/__tests__/multisig-transaction.builder.ts +++ b/src/domain/safe/entities/__tests__/multisig-transaction.builder.ts @@ -1,13 +1,13 @@ import { faker } from '@faker-js/faker'; import { random, range } from 'lodash'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { MultisigTransaction } from '../multisig-transaction.entity'; -import { Operation } from '../operation.entity'; +import { dataDecodedBuilder } from '@/domain/data-decoder/entities/__tests__/data-decoded.builder'; import { confirmationBuilder, toJson as confirmationToJson, -} from './multisig-transaction-confirmation.builder'; -import { dataDecodedBuilder } from '../../../data-decoder/entities/__tests__/data-decoded.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder'; +import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; +import { Operation } from '@/domain/safe/entities/operation.entity'; const HASH_LENGTH = 10; diff --git a/src/domain/safe/entities/__tests__/native-token-transfer.builder.ts b/src/domain/safe/entities/__tests__/native-token-transfer.builder.ts index d9304a4e85..1ceaf8a658 100644 --- a/src/domain/safe/entities/__tests__/native-token-transfer.builder.ts +++ b/src/domain/safe/entities/__tests__/native-token-transfer.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { NativeTokenTransfer } from '../transfer.entity'; +import { NativeTokenTransfer } from '@/domain/safe/entities/transfer.entity'; export function nativeTokenTransferBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe/entities/__tests__/safe.builder.ts b/src/domain/safe/entities/__tests__/safe.builder.ts index 2dba6f64d7..c0f704a87c 100644 --- a/src/domain/safe/entities/__tests__/safe.builder.ts +++ b/src/domain/safe/entities/__tests__/safe.builder.ts @@ -1,6 +1,6 @@ -import { Safe } from '../safe.entity'; import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { Safe } from '@/domain/safe/entities/safe.entity'; export function safeBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/safe/entities/creation-transaction.entity.ts b/src/domain/safe/entities/creation-transaction.entity.ts index 605380d023..0268037473 100644 --- a/src/domain/safe/entities/creation-transaction.entity.ts +++ b/src/domain/safe/entities/creation-transaction.entity.ts @@ -1,4 +1,4 @@ -import { DataDecoded } from '../../data-decoder/entities/data-decoded.entity'; +import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; export interface CreationTransaction { created: Date; diff --git a/src/domain/safe/entities/ethereum-transaction.entity.ts b/src/domain/safe/entities/ethereum-transaction.entity.ts index 93d19c0b7f..f84a70cad4 100644 --- a/src/domain/safe/entities/ethereum-transaction.entity.ts +++ b/src/domain/safe/entities/ethereum-transaction.entity.ts @@ -1,4 +1,4 @@ -import { Transfer } from './transfer.entity'; +import { Transfer } from '@/domain/safe/entities/transfer.entity'; export interface EthereumTransaction { blockNumber: number; diff --git a/src/domain/safe/entities/module-transaction.entity.ts b/src/domain/safe/entities/module-transaction.entity.ts index 7895362e53..e5cb996b25 100644 --- a/src/domain/safe/entities/module-transaction.entity.ts +++ b/src/domain/safe/entities/module-transaction.entity.ts @@ -1,5 +1,5 @@ -import { DataDecoded } from '../../data-decoder/entities/data-decoded.entity'; -import { Operation } from './operation.entity'; +import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; +import { Operation } from '@/domain/safe/entities/operation.entity'; export interface ModuleTransaction { blockNumber: number; diff --git a/src/domain/safe/entities/multisig-transaction.entity.ts b/src/domain/safe/entities/multisig-transaction.entity.ts index e67c4d5ec0..7f6053bae8 100644 --- a/src/domain/safe/entities/multisig-transaction.entity.ts +++ b/src/domain/safe/entities/multisig-transaction.entity.ts @@ -1,5 +1,5 @@ -import { Operation } from './operation.entity'; -import { DataDecoded } from '../../data-decoder/entities/data-decoded.entity'; +import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; +import { Operation } from '@/domain/safe/entities/operation.entity'; export interface Confirmation { owner: string; diff --git a/src/domain/safe/entities/schemas/module-transaction.schema.ts b/src/domain/safe/entities/schemas/module-transaction.schema.ts index e976ffb988..07056df42f 100644 --- a/src/domain/safe/entities/schemas/module-transaction.schema.ts +++ b/src/domain/safe/entities/schemas/module-transaction.schema.ts @@ -1,5 +1,5 @@ import { Schema } from 'ajv'; -import { buildPageSchema } from '../../../entities/schemas/page.schema.factory'; +import { buildPageSchema } from '@/domain/entities/schemas/page.schema.factory'; export const MODULE_TRANSACTION_SCHEMA_ID = 'https://safe-client.safe.global/schemas/safe/module-transaction.json'; diff --git a/src/domain/safe/entities/schemas/multisig-transaction.schema.ts b/src/domain/safe/entities/schemas/multisig-transaction.schema.ts index 391e7b34c7..9834ec1d6a 100644 --- a/src/domain/safe/entities/schemas/multisig-transaction.schema.ts +++ b/src/domain/safe/entities/schemas/multisig-transaction.schema.ts @@ -1,5 +1,5 @@ import { Schema } from 'ajv'; -import { buildPageSchema } from '../../../entities/schemas/page.schema.factory'; +import { buildPageSchema } from '@/domain/entities/schemas/page.schema.factory'; export const CONFIRMATION_SCHEMA_ID = 'https://safe-client.safe.global/schemas/safe/confirmation.json'; diff --git a/src/domain/safe/entities/schemas/safe-list.schema.ts b/src/domain/safe/entities/schemas/safe-list.schema.ts index 90c2f00f48..275e6e4cbf 100644 --- a/src/domain/safe/entities/schemas/safe-list.schema.ts +++ b/src/domain/safe/entities/schemas/safe-list.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { SafeList } from '../safe-list.entity'; +import { SafeList } from '@/domain/safe/entities/safe-list.entity'; export const SAFE_LIST_SCHEMA_ID = 'https://safe-client.safe.global/schemas/safe/safe-list.json'; diff --git a/src/domain/safe/entities/schemas/safe.schema.ts b/src/domain/safe/entities/schemas/safe.schema.ts index 01fd04a5d3..cbda308bc7 100644 --- a/src/domain/safe/entities/schemas/safe.schema.ts +++ b/src/domain/safe/entities/schemas/safe.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { Safe } from '../safe.entity'; +import { Safe } from '@/domain/safe/entities/safe.entity'; export const SAFE_SCHEMA_ID = 'https://safe-client.safe.global/schemas/safe/safe.json'; diff --git a/src/domain/safe/entities/schemas/transaction-type.schema.ts b/src/domain/safe/entities/schemas/transaction-type.schema.ts index 8001c043d4..9c05d670d7 100644 --- a/src/domain/safe/entities/schemas/transaction-type.schema.ts +++ b/src/domain/safe/entities/schemas/transaction-type.schema.ts @@ -1,5 +1,5 @@ import { Schema } from 'ajv'; -import { buildPageSchema } from '../../../entities/schemas/page.schema.factory'; +import { buildPageSchema } from '@/domain/entities/schemas/page.schema.factory'; export const TRANSACTION_TYPE_SCHEMA_ID = 'https://safe-client.safe.global/schemas/safe/transaction-type.json'; diff --git a/src/domain/safe/entities/schemas/transfer.schema.ts b/src/domain/safe/entities/schemas/transfer.schema.ts index 0cc79dcfac..448f4342d0 100644 --- a/src/domain/safe/entities/schemas/transfer.schema.ts +++ b/src/domain/safe/entities/schemas/transfer.schema.ts @@ -1,5 +1,5 @@ import { Schema } from 'ajv'; -import { buildPageSchema } from '../../../entities/schemas/page.schema.factory'; +import { buildPageSchema } from '@/domain/entities/schemas/page.schema.factory'; export const TRANSFER_SCHEMA_ID = 'https://safe-client.safe.global/schemas/safe/transfer.json'; diff --git a/src/domain/safe/entities/transaction.entity.ts b/src/domain/safe/entities/transaction.entity.ts index 898449e147..ef3d7dab6b 100644 --- a/src/domain/safe/entities/transaction.entity.ts +++ b/src/domain/safe/entities/transaction.entity.ts @@ -1,7 +1,7 @@ -import { MultisigTransaction } from './multisig-transaction.entity'; -import { EthereumTransaction } from './ethereum-transaction.entity'; -import { ModuleTransaction } from './module-transaction.entity'; -import { CreationTransaction } from './creation-transaction.entity'; +import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; +import { EthereumTransaction } from '@/domain/safe/entities/ethereum-transaction.entity'; +import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; +import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; export type Transaction = | MultisigTransaction diff --git a/src/domain/safe/module-transaction.validator.ts b/src/domain/safe/module-transaction.validator.ts index 7ef4a4fe1d..5b5c52acfa 100644 --- a/src/domain/safe/module-transaction.validator.ts +++ b/src/domain/safe/module-transaction.validator.ts @@ -1,23 +1,23 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; import { DATA_DECODED_PARAMETER_SCHEMA_ID, DATA_DECODED_SCHEMA_ID, dataDecodedParameterSchema, dataDecodedSchema, -} from '../data-decoder/entities/schemas/data-decoded.schema'; -import { Page } from '../entities/page.entity'; -import { IPageValidator } from '../interfaces/page-validator.interface'; -import { IValidator } from '../interfaces/validator.interface'; -import { ModuleTransaction } from './entities/module-transaction.entity'; +} from '@/domain/data-decoder/entities/schemas/data-decoded.schema'; +import { Page } from '@/domain/entities/page.entity'; +import { IPageValidator } from '@/domain/interfaces/page-validator.interface'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; import { MODULE_TRANSACTION_PAGE_SCHEMA_ID, MODULE_TRANSACTION_SCHEMA_ID, moduleTransactionPageSchema, moduleTransactionSchema, -} from './entities/schemas/module-transaction.schema'; +} from '@/domain/safe/entities/schemas/module-transaction.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class ModuleTransactionValidator diff --git a/src/domain/safe/multisig-transaction.validator.ts b/src/domain/safe/multisig-transaction.validator.ts index 7da89b85ce..e33bcb4be6 100644 --- a/src/domain/safe/multisig-transaction.validator.ts +++ b/src/domain/safe/multisig-transaction.validator.ts @@ -1,17 +1,15 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; import { DATA_DECODED_PARAMETER_SCHEMA_ID, DATA_DECODED_SCHEMA_ID, dataDecodedParameterSchema, dataDecodedSchema, -} from '../data-decoder/entities/schemas/data-decoded.schema'; -import { Page } from '../entities/page.entity'; -import { IPageValidator } from '../interfaces/page-validator.interface'; -import { IValidator } from '../interfaces/validator.interface'; -import { MultisigTransaction } from './entities/multisig-transaction.entity'; +} from '@/domain/data-decoder/entities/schemas/data-decoded.schema'; +import { Page } from '@/domain/entities/page.entity'; +import { IPageValidator } from '@/domain/interfaces/page-validator.interface'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { CONFIRMATION_SCHEMA_ID, MULTISIG_TRANSACTION_PAGE_SCHEMA_ID, @@ -19,7 +17,9 @@ import { confirmationSchema, multisigTransactionPageSchema, multisigTransactionSchema, -} from './entities/schemas/multisig-transaction.schema'; +} from '@/domain/safe/entities/schemas/multisig-transaction.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class MultisigTransactionValidator diff --git a/src/domain/safe/safe-list.validator.ts b/src/domain/safe/safe-list.validator.ts index fee6ee4b5f..4c47a7e88d 100644 --- a/src/domain/safe/safe-list.validator.ts +++ b/src/domain/safe/safe-list.validator.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { SafeList } from './entities/safe-list.entity'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { SafeList } from '@/domain/safe/entities/safe-list.entity'; import { SAFE_LIST_SCHEMA_ID, safeListSchema, -} from './entities/schemas/safe-list.schema'; +} from '@/domain/safe/entities/schemas/safe-list.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class SafeListValidator implements IValidator { diff --git a/src/domain/safe/safe.repository.interface.ts b/src/domain/safe/safe.repository.interface.ts index a8c26fc131..50999d1013 100644 --- a/src/domain/safe/safe.repository.interface.ts +++ b/src/domain/safe/safe.repository.interface.ts @@ -1,13 +1,13 @@ -import { Safe } from './entities/safe.entity'; -import { Page } from '../entities/page.entity'; -import { Transfer } from './entities/transfer.entity'; -import { MultisigTransaction } from './entities/multisig-transaction.entity'; -import { Transaction } from './entities/transaction.entity'; -import { ModuleTransaction } from './entities/module-transaction.entity'; -import { SafeList } from './entities/safe-list.entity'; -import { CreationTransaction } from './entities/creation-transaction.entity'; -import { ProposeTransactionDto } from '../transactions/entities/propose-transaction.dto.entity'; -import { AddConfirmationDto } from '../transactions/entities/add-confirmation.dto.entity'; +import { Page } from '@/domain/entities/page.entity'; +import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; +import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; +import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; +import { SafeList } from '@/domain/safe/entities/safe-list.entity'; +import { Safe } from '@/domain/safe/entities/safe.entity'; +import { Transaction } from '@/domain/safe/entities/transaction.entity'; +import { Transfer } from '@/domain/safe/entities/transfer.entity'; +import { AddConfirmationDto } from '@/domain/transactions/entities/add-confirmation.dto.entity'; +import { ProposeTransactionDto } from '@/domain/transactions/entities/propose-transaction.dto.entity'; export const ISafeRepository = Symbol('ISafeRepository'); diff --git a/src/domain/safe/safe.repository.ts b/src/domain/safe/safe.repository.ts index b92060aa46..2d16889e36 100644 --- a/src/domain/safe/safe.repository.ts +++ b/src/domain/safe/safe.repository.ts @@ -1,24 +1,24 @@ import { Inject, Injectable } from '@nestjs/common'; import { isEmpty } from 'lodash'; -import { Safe } from './entities/safe.entity'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { ISafeRepository } from './safe.repository.interface'; -import { SafeValidator } from './safe.validator'; -import { Page } from '../entities/page.entity'; -import { Transfer } from './entities/transfer.entity'; -import { TransferValidator } from './transfer.validator'; -import { MultisigTransaction } from './entities/multisig-transaction.entity'; -import { MultisigTransactionValidator } from './multisig-transaction.validator'; -import { Transaction } from './entities/transaction.entity'; -import { TransactionTypeValidator } from './transaction-type.validator'; -import { ModuleTransaction } from './entities/module-transaction.entity'; -import { SafeList } from './entities/safe-list.entity'; -import { SafeListValidator } from './safe-list.validator'; -import { ModuleTransactionValidator } from './module-transaction.validator'; -import { CreationTransaction } from './entities/creation-transaction.entity'; -import { CreationTransactionValidator } from './creation-transaction.validator'; -import { ProposeTransactionDto } from '../transactions/entities/propose-transaction.dto.entity'; -import { AddConfirmationDto } from '../transactions/entities/add-confirmation.dto.entity'; +import { Page } from '@/domain/entities/page.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; +import { CreationTransactionValidator } from '@/domain/safe/creation-transaction.validator'; +import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; +import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; +import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; +import { SafeList } from '@/domain/safe/entities/safe-list.entity'; +import { Safe } from '@/domain/safe/entities/safe.entity'; +import { Transaction } from '@/domain/safe/entities/transaction.entity'; +import { Transfer } from '@/domain/safe/entities/transfer.entity'; +import { ModuleTransactionValidator } from '@/domain/safe/module-transaction.validator'; +import { MultisigTransactionValidator } from '@/domain/safe/multisig-transaction.validator'; +import { SafeListValidator } from '@/domain/safe/safe-list.validator'; +import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; +import { SafeValidator } from '@/domain/safe/safe.validator'; +import { TransactionTypeValidator } from '@/domain/safe/transaction-type.validator'; +import { TransferValidator } from '@/domain/safe/transfer.validator'; +import { AddConfirmationDto } from '@/domain/transactions/entities/add-confirmation.dto.entity'; +import { ProposeTransactionDto } from '@/domain/transactions/entities/propose-transaction.dto.entity'; @Injectable() export class SafeRepository implements ISafeRepository { diff --git a/src/domain/safe/safe.validator.ts b/src/domain/safe/safe.validator.ts index a337aec896..3e1a3d2897 100644 --- a/src/domain/safe/safe.validator.ts +++ b/src/domain/safe/safe.validator.ts @@ -1,10 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; +import { IValidator } from '@/domain/interfaces/validator.interface'; +import { Safe } from '@/domain/safe/entities/safe.entity'; +import { + SAFE_SCHEMA_ID, + safeSchema, +} from '@/domain/safe/entities/schemas/safe.schema'; import { GenericValidator } from '@/validation/providers/generic.validator'; import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { IValidator } from '../interfaces/validator.interface'; -import { Safe } from './entities/safe.entity'; -import { SAFE_SCHEMA_ID, safeSchema } from './entities/schemas/safe.schema'; @Injectable() export class SafeValidator implements IValidator { diff --git a/src/domain/safe/transaction-type.validator.ts b/src/domain/safe/transaction-type.validator.ts index 5b357f0bf3..46050ecaa1 100644 --- a/src/domain/safe/transaction-type.validator.ts +++ b/src/domain/safe/transaction-type.validator.ts @@ -1,51 +1,51 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; import { DATA_DECODED_PARAMETER_SCHEMA_ID, DATA_DECODED_SCHEMA_ID, dataDecodedParameterSchema, dataDecodedSchema, -} from '../data-decoder/entities/schemas/data-decoded.schema'; -import { Page } from '../entities/page.entity'; -import { IPageValidator } from '../interfaces/page-validator.interface'; -import { IValidator } from '../interfaces/validator.interface'; +} from '@/domain/data-decoder/entities/schemas/data-decoded.schema'; +import { Page } from '@/domain/entities/page.entity'; +import { IPageValidator } from '@/domain/interfaces/page-validator.interface'; +import { IValidator } from '@/domain/interfaces/validator.interface'; import { ERC20_TRANSFER_SCHEMA_ID, erc20TransferSchema, -} from './entities/schemas/erc20-transfer.schema'; +} from '@/domain/safe/entities/schemas/erc20-transfer.schema'; import { ERC721_TRANSFER_SCHEMA_ID, erc721TransferSchema, -} from './entities/schemas/erc721-transfer.schema'; +} from '@/domain/safe/entities/schemas/erc721-transfer.schema'; import { ETHEREUM_TRANSACTION_TYPE_SCHEMA_ID, ethereumTransactionTypeSchema, -} from './entities/schemas/ethereum-transaction-type.schema'; +} from '@/domain/safe/entities/schemas/ethereum-transaction-type.schema'; import { MODULE_TRANSACTION_TYPE_SCHEMA_ID, moduleTransactionTypeSchema, -} from './entities/schemas/module-transaction-type.schema'; +} from '@/domain/safe/entities/schemas/module-transaction-type.schema'; import { MULTISIG_TRANSACTION_TYPE_SCHEMA_ID, multisigTransactionTypeSchema, -} from './entities/schemas/multisig-transaction-type.schema'; +} from '@/domain/safe/entities/schemas/multisig-transaction-type.schema'; import { NATIVE_TOKEN_TRANSFER_SCHEMA_ID, nativeTokenTransferSchema, -} from './entities/schemas/native-token-transfer.schema'; +} from '@/domain/safe/entities/schemas/native-token-transfer.schema'; import { TRANSACTION_TYPE_PAGE_SCHEMA_ID, TRANSACTION_TYPE_SCHEMA_ID, transactionTypePageSchema, transactionTypeSchema, -} from './entities/schemas/transaction-type.schema'; +} from '@/domain/safe/entities/schemas/transaction-type.schema'; import { TRANSFER_SCHEMA_ID, transferSchema, -} from './entities/schemas/transfer.schema'; -import { Transaction } from './entities/transaction.entity'; +} from '@/domain/safe/entities/schemas/transfer.schema'; +import { Transaction } from '@/domain/safe/entities/transaction.entity'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class TransactionTypeValidator diff --git a/src/domain/safe/transfer.validator.ts b/src/domain/safe/transfer.validator.ts index 78d4d9c0fd..4df07584c8 100644 --- a/src/domain/safe/transfer.validator.ts +++ b/src/domain/safe/transfer.validator.ts @@ -1,29 +1,29 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { Page } from '../entities/page.entity'; -import { IPageValidator } from '../interfaces/page-validator.interface'; -import { IValidator } from '../interfaces/validator.interface'; +import { Page } from '@/domain/entities/page.entity'; +import { IPageValidator } from '@/domain/interfaces/page-validator.interface'; +import { IValidator } from '@/domain/interfaces/validator.interface'; import { ERC20_TRANSFER_SCHEMA_ID, erc20TransferSchema, -} from './entities/schemas/erc20-transfer.schema'; +} from '@/domain/safe/entities/schemas/erc20-transfer.schema'; import { ERC721_TRANSFER_SCHEMA_ID, erc721TransferSchema, -} from './entities/schemas/erc721-transfer.schema'; +} from '@/domain/safe/entities/schemas/erc721-transfer.schema'; import { NATIVE_TOKEN_TRANSFER_SCHEMA_ID, nativeTokenTransferSchema, -} from './entities/schemas/native-token-transfer.schema'; +} from '@/domain/safe/entities/schemas/native-token-transfer.schema'; import { - TRANSFER_PAGE_SCHEMA_ID, TRANSFER_SCHEMA_ID, - transferPageSchema, transferSchema, -} from './entities/schemas/transfer.schema'; -import { Transfer } from './entities/transfer.entity'; + TRANSFER_PAGE_SCHEMA_ID, + transferPageSchema, +} from '@/domain/safe/entities/schemas/transfer.schema'; +import { Transfer } from '@/domain/safe/entities/transfer.entity'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class TransferValidator diff --git a/src/domain/tokens/__tests__/token.builder.ts b/src/domain/tokens/__tests__/token.builder.ts index dfa42d5d14..065eeb91cd 100644 --- a/src/domain/tokens/__tests__/token.builder.ts +++ b/src/domain/tokens/__tests__/token.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; -import { Token, TokenType } from '../entities/token.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; +import { Token, TokenType } from '@/domain/tokens/entities/token.entity'; export function tokenBuilder(): IBuilder { return Builder.new() diff --git a/src/domain/tokens/entities/schemas/token.schema.ts b/src/domain/tokens/entities/schemas/token.schema.ts index 213c8647c0..e7c2dd370f 100644 --- a/src/domain/tokens/entities/schemas/token.schema.ts +++ b/src/domain/tokens/entities/schemas/token.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType, Schema } from 'ajv'; -import { buildPageSchema } from '../../../entities/schemas/page.schema.factory'; -import { Token, TokenType } from '../token.entity'; +import { buildPageSchema } from '@/domain/entities/schemas/page.schema.factory'; +import { Token, TokenType } from '@/domain/tokens/entities/token.entity'; export const TOKEN_SCHEMA_ID = 'https://safe-client.safe.global/schemas/tokens/token.json'; diff --git a/src/domain/tokens/token.repository.interface.ts b/src/domain/tokens/token.repository.interface.ts index 082d27a149..1fccbe88ab 100644 --- a/src/domain/tokens/token.repository.interface.ts +++ b/src/domain/tokens/token.repository.interface.ts @@ -1,5 +1,5 @@ -import { Page } from '../entities/page.entity'; -import { Token } from './entities/token.entity'; +import { Page } from '@/domain/entities/page.entity'; +import { Token } from '@/domain/tokens/entities/token.entity'; export const ITokenRepository = Symbol('ITokenRepository'); diff --git a/src/domain/tokens/token.repository.ts b/src/domain/tokens/token.repository.ts index 2d65ef0474..3f1bf7d225 100644 --- a/src/domain/tokens/token.repository.ts +++ b/src/domain/tokens/token.repository.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; -import { Page } from '../entities/page.entity'; -import { ITransactionApiManager } from '../interfaces/transaction-api.manager.interface'; -import { Token } from './entities/token.entity'; -import { ITokenRepository } from './token.repository.interface'; -import { TokenValidator } from './token.validator'; +import { Page } from '@/domain/entities/page.entity'; +import { ITransactionApiManager } from '@/domain/interfaces/transaction-api.manager.interface'; +import { Token } from '@/domain/tokens/entities/token.entity'; +import { ITokenRepository } from '@/domain/tokens/token.repository.interface'; +import { TokenValidator } from '@/domain/tokens/token.validator'; @Injectable() export class TokenRepository implements ITokenRepository { diff --git a/src/domain/tokens/token.validator.ts b/src/domain/tokens/token.validator.ts index d62ba07ac9..8bc201b0f2 100644 --- a/src/domain/tokens/token.validator.ts +++ b/src/domain/tokens/token.validator.ts @@ -1,17 +1,17 @@ import { Injectable } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { Page } from '../entities/page.entity'; -import { IPageValidator } from '../interfaces/page-validator.interface'; -import { IValidator } from '../interfaces/validator.interface'; +import { Page } from '@/domain/entities/page.entity'; +import { IPageValidator } from '@/domain/interfaces/page-validator.interface'; +import { IValidator } from '@/domain/interfaces/validator.interface'; import { TOKEN_PAGE_SCHEMA_ID, TOKEN_SCHEMA_ID, tokenPageSchema, tokenSchema, -} from './entities/schemas/token.schema'; -import { Token } from './entities/token.entity'; +} from '@/domain/tokens/entities/schemas/token.schema'; +import { Token } from '@/domain/tokens/entities/token.entity'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class TokenValidator diff --git a/src/domain/transactions/entities/propose-transaction.dto.entity.ts b/src/domain/transactions/entities/propose-transaction.dto.entity.ts index dc07464df6..c40d2d42ee 100644 --- a/src/domain/transactions/entities/propose-transaction.dto.entity.ts +++ b/src/domain/transactions/entities/propose-transaction.dto.entity.ts @@ -1,4 +1,4 @@ -import { Operation } from '../../safe/entities/operation.entity'; +import { Operation } from '@/domain/safe/entities/operation.entity'; export class ProposeTransactionDto { to: string; diff --git a/src/logging/__tests__/test.logging.module.ts b/src/logging/__tests__/test.logging.module.ts index 3078e729d8..c4c1cd94b1 100644 --- a/src/logging/__tests__/test.logging.module.ts +++ b/src/logging/__tests__/test.logging.module.ts @@ -1,6 +1,6 @@ import { Global, Inject, Module } from '@nestjs/common'; -import { ILoggingService, LoggingService } from '../logging.interface'; import { IConfigurationService } from '@/config/configuration.service.interface'; +import { ILoggingService, LoggingService } from '@/logging/logging.interface'; class TestLoggingService implements ILoggingService { private readonly isSilent: boolean; diff --git a/src/logging/logging.module.ts b/src/logging/logging.module.ts index b22531c2a8..0a249e1c1e 100644 --- a/src/logging/logging.module.ts +++ b/src/logging/logging.module.ts @@ -1,9 +1,9 @@ import { Global, Module } from '@nestjs/common'; -import { LoggingService } from './logging.interface'; -import { RequestScopedLoggingService } from './logging.service'; import * as winston from 'winston'; import * as Transport from 'winston-transport'; import { IConfigurationService } from '@/config/configuration.service.interface'; +import { LoggingService } from '@/logging/logging.interface'; +import { RequestScopedLoggingService } from '@/logging/logging.service'; /** * Provides a new instance of a Winston logger using the provided {@link transports} diff --git a/src/logging/logging.service.spec.ts b/src/logging/logging.service.spec.ts index d322bc7647..4d3ee8a70e 100644 --- a/src/logging/logging.service.spec.ts +++ b/src/logging/logging.service.spec.ts @@ -1,8 +1,8 @@ import { faker } from '@faker-js/faker'; import { ClsService } from 'nestjs-cls'; import * as winston from 'winston'; -import { RequestScopedLoggingService } from './logging.service'; import { IConfigurationService } from '@/config/configuration.service.interface'; +import { RequestScopedLoggingService } from '@/logging/logging.service'; const mockClsService = jest.mocked({ getId: jest.fn(), diff --git a/src/logging/logging.service.ts b/src/logging/logging.service.ts index bb0819065e..537fc713e3 100644 --- a/src/logging/logging.service.ts +++ b/src/logging/logging.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; -import { ClsService } from 'nestjs-cls'; -import { ILoggingService } from './logging.interface'; import { Inject } from '@nestjs/common/decorators'; +import { ClsService } from 'nestjs-cls'; import winston from 'winston'; import { IConfigurationService } from '@/config/configuration.service.interface'; +import { ILoggingService } from '@/logging/logging.interface'; /** * Implementation of ILoggingService which prepends the current time and a unique request ID to every logged message. diff --git a/src/main.ts b/src/main.ts index dee9b4f787..14b7c773c4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,6 @@ -import { AppModule } from './app.module'; -import { IConfigurationService } from './config/configuration.service.interface'; -import { DefaultAppProvider } from './app.provider'; +import { AppModule } from '@/app.module'; +import { DefaultAppProvider } from '@/app.provider'; +import { IConfigurationService } from '@/config/configuration.service.interface'; async function bootstrap() { const app = await new DefaultAppProvider().provide(AppModule); diff --git a/src/routes/about/__tests__/get-about.e2e-spec.ts b/src/routes/about/__tests__/get-about.e2e-spec.ts index 8e154ab641..26b594f9c4 100644 --- a/src/routes/about/__tests__/get-about.e2e-spec.ts +++ b/src/routes/about/__tests__/get-about.e2e-spec.ts @@ -3,7 +3,7 @@ import { Test } from '@nestjs/testing'; import * as request from 'supertest'; import { AppModule } from '@/app.module'; import { expect } from '@jest/globals'; -import '../../../__tests__/matchers/to-be-string-or-null'; +import '@/__tests__/matchers/to-be-string-or-null'; describe('Get about e2e test', () => { let app: INestApplication; diff --git a/src/routes/about/about.controller.ts b/src/routes/about/about.controller.ts index 7a8384be91..8c8e6ca6d8 100644 --- a/src/routes/about/about.controller.ts +++ b/src/routes/about/about.controller.ts @@ -1,7 +1,7 @@ import { Controller, Get } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; -import { AboutService } from './about.service'; -import { About } from './entities/about.entity'; +import { AboutService } from '@/routes/about/about.service'; +import { About } from '@/routes/about/entities/about.entity'; @ApiTags('about') @Controller({ path: 'about' }) diff --git a/src/routes/about/about.module.ts b/src/routes/about/about.module.ts index 530ff5b287..a5f09c2945 100644 --- a/src/routes/about/about.module.ts +++ b/src/routes/about/about.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { AboutController } from './about.controller'; -import { AboutService } from './about.service'; +import { AboutController } from '@/routes/about/about.controller'; +import { AboutService } from '@/routes/about/about.service'; @Module({ controllers: [AboutController], diff --git a/src/routes/about/about.service.ts b/src/routes/about/about.service.ts index 9dbe2107d9..1a50a8a507 100644 --- a/src/routes/about/about.service.ts +++ b/src/routes/about/about.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@nestjs/common'; import { IConfigurationService } from '@/config/configuration.service.interface'; -import { About } from './entities/about.entity'; +import { About } from '@/routes/about/entities/about.entity'; @Injectable() export class AboutService { diff --git a/src/routes/balances/balances.controller.spec.ts b/src/routes/balances/balances.controller.spec.ts index 54669dc9fb..8fb00ff1ee 100644 --- a/src/routes/balances/balances.controller.spec.ts +++ b/src/routes/balances/balances.controller.spec.ts @@ -9,16 +9,16 @@ import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { exchangeFiatCodesBuilder } from '@/domain/exchange/entities/__tests__/exchange-fiat-codes.builder'; import { exchangeRatesBuilder } from '@/domain/exchange/entities/__tests__/exchange-rates.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; -import { NULL_ADDRESS } from '../common/constants'; import { faker } from '@faker-js/faker'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { NetworkService } from '@/datasources/network/network.service.interface'; import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; import { NetworkModule } from '@/datasources/network/network.module'; +import { NULL_ADDRESS } from '@/routes/common/constants'; describe('Balances Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/balances/balances.controller.ts b/src/routes/balances/balances.controller.ts index 5579f6361e..40bd8b4a41 100644 --- a/src/routes/balances/balances.controller.ts +++ b/src/routes/balances/balances.controller.ts @@ -6,9 +6,9 @@ import { ParseBoolPipe, Query, } from '@nestjs/common'; -import { BalancesService } from './balances.service'; -import { Balances } from './entities/balances.entity'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; +import { BalancesService } from '@/routes/balances/balances.service'; +import { Balances } from '@/routes/balances/entities/balances.entity'; @ApiTags('balances') @Controller({ diff --git a/src/routes/balances/balances.module.ts b/src/routes/balances/balances.module.ts index 5dc2fd1537..0aa2d58894 100644 --- a/src/routes/balances/balances.module.ts +++ b/src/routes/balances/balances.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { BalancesService } from './balances.service'; -import { BalancesController } from './balances.controller'; +import { BalancesController } from '@/routes/balances/balances.controller'; +import { BalancesService } from '@/routes/balances/balances.service'; @Module({ controllers: [BalancesController], diff --git a/src/routes/balances/balances.service.ts b/src/routes/balances/balances.service.ts index 2740c70a6a..610ad3ca4f 100644 --- a/src/routes/balances/balances.service.ts +++ b/src/routes/balances/balances.service.ts @@ -1,14 +1,14 @@ import { Inject, Injectable } from '@nestjs/common'; -import { Balance as TransactionApiBalance } from '../../domain/balances/entities/balance.entity'; -import { Token } from './entities/token.entity'; -import { TokenType } from './entities/token-type.entity'; -import { Balances } from './entities/balances.entity'; -import { NativeCurrency } from '@/domain/chains/entities/native.currency.entity'; -import { Balance } from './entities/balance.entity'; import { IBalancesRepository } from '@/domain/balances/balances.repository.interface'; -import { IExchangeRepository } from '@/domain/exchange/exchange.repository.interface'; +import { Balance as TransactionApiBalance } from '@/domain/balances/entities/balance.entity'; import { IChainsRepository } from '@/domain/chains/chains.repository.interface'; -import { NULL_ADDRESS } from '../common/constants'; +import { NativeCurrency } from '@/domain/chains/entities/native.currency.entity'; +import { IExchangeRepository } from '@/domain/exchange/exchange.repository.interface'; +import { Balance } from '@/routes/balances/entities/balance.entity'; +import { Balances } from '@/routes/balances/entities/balances.entity'; +import { TokenType } from '@/routes/balances/entities/token-type.entity'; +import { Token } from '@/routes/balances/entities/token.entity'; +import { NULL_ADDRESS } from '@/routes/common/constants'; @Injectable() export class BalancesService { diff --git a/src/routes/balances/entities/balance.entity.ts b/src/routes/balances/entities/balance.entity.ts index 832e6685b3..3c818ff01a 100644 --- a/src/routes/balances/entities/balance.entity.ts +++ b/src/routes/balances/entities/balance.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { Token } from './token.entity'; +import { Token } from '@/routes/balances/entities/token.entity'; export class Balance { @ApiProperty() diff --git a/src/routes/balances/entities/balances.entity.ts b/src/routes/balances/entities/balances.entity.ts index 41f72d008b..c0f36c5308 100644 --- a/src/routes/balances/entities/balances.entity.ts +++ b/src/routes/balances/entities/balances.entity.ts @@ -1,5 +1,5 @@ import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger'; -import { Balance } from './balance.entity'; +import { Balance } from '@/routes/balances/entities/balance.entity'; @ApiExtraModels(Balance) export class Balances { diff --git a/src/routes/balances/entities/token.entity.ts b/src/routes/balances/entities/token.entity.ts index 4a5ef9d447..04c7e3061d 100644 --- a/src/routes/balances/entities/token.entity.ts +++ b/src/routes/balances/entities/token.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { TokenType } from './token-type.entity'; +import { TokenType } from '@/routes/balances/entities/token-type.entity'; export class Token { @ApiProperty() diff --git a/src/routes/cache-hooks/cache-hooks.controller.spec.ts b/src/routes/cache-hooks/cache-hooks.controller.spec.ts index adb27342ad..a52191c65e 100644 --- a/src/routes/cache-hooks/cache-hooks.controller.spec.ts +++ b/src/routes/cache-hooks/cache-hooks.controller.spec.ts @@ -7,7 +7,7 @@ import { TestNetworkModule } from '@/datasources/network/__tests__/test.network. import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity'; import { FakeCacheService } from '@/datasources/cache/__tests__/fake.cache.service'; diff --git a/src/routes/cache-hooks/cache-hooks.controller.ts b/src/routes/cache-hooks/cache-hooks.controller.ts index d94d6d2688..c4afc2972f 100644 --- a/src/routes/cache-hooks/cache-hooks.controller.ts +++ b/src/routes/cache-hooks/cache-hooks.controller.ts @@ -1,20 +1,20 @@ import { Body, Controller, HttpCode, Post, UseGuards } from '@nestjs/common'; -import { EventValidationPipe } from './pipes/event-validation.pipe'; -import { CacheHooksService } from './cache-hooks.service'; -import { BasicAuthGuard } from '../common/auth/basic-auth.guard'; -import { ExecutedTransaction } from './entities/executed-transaction.entity'; -import { NewConfirmation } from './entities/new-confirmation.entity'; -import { PendingTransaction } from './entities/pending-transaction.entity'; -import { IncomingToken } from './entities/incoming-token.entity'; -import { OutgoingToken } from './entities/outgoing-token.entity'; -import { IncomingEther } from './entities/incoming-ether.entity'; -import { OutgoingEther } from './entities/outgoing-ether.entity'; -import { ModuleTransaction } from './entities/module-transaction.entity'; import { ApiExcludeController } from '@nestjs/swagger'; -import { MessageCreated } from './entities/message-created.entity'; -import { NewMessageConfirmation } from './entities/new-message-confirmation.entity'; +import { CacheHooksService } from '@/routes/cache-hooks/cache-hooks.service'; import { ChainUpdate } from '@/routes/cache-hooks/entities/chain-update.entity'; +import { ExecutedTransaction } from '@/routes/cache-hooks/entities/executed-transaction.entity'; +import { IncomingEther } from '@/routes/cache-hooks/entities/incoming-ether.entity'; +import { IncomingToken } from '@/routes/cache-hooks/entities/incoming-token.entity'; +import { MessageCreated } from '@/routes/cache-hooks/entities/message-created.entity'; +import { ModuleTransaction } from '@/routes/cache-hooks/entities/module-transaction.entity'; +import { NewConfirmation } from '@/routes/cache-hooks/entities/new-confirmation.entity'; +import { NewMessageConfirmation } from '@/routes/cache-hooks/entities/new-message-confirmation.entity'; +import { OutgoingEther } from '@/routes/cache-hooks/entities/outgoing-ether.entity'; +import { OutgoingToken } from '@/routes/cache-hooks/entities/outgoing-token.entity'; +import { PendingTransaction } from '@/routes/cache-hooks/entities/pending-transaction.entity'; import { SafeAppsUpdate } from '@/routes/cache-hooks/entities/safe-apps-update.entity'; +import { EventValidationPipe } from '@/routes/cache-hooks/pipes/event-validation.pipe'; +import { BasicAuthGuard } from '@/routes/common/auth/basic-auth.guard'; @Controller({ path: '', diff --git a/src/routes/cache-hooks/cache-hooks.module.ts b/src/routes/cache-hooks/cache-hooks.module.ts index 68e5fac117..aca7217af7 100644 --- a/src/routes/cache-hooks/cache-hooks.module.ts +++ b/src/routes/cache-hooks/cache-hooks.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { CacheHooksController } from './cache-hooks.controller'; -import { CacheHooksService } from './cache-hooks.service'; +import { CacheHooksController } from '@/routes/cache-hooks/cache-hooks.controller'; +import { CacheHooksService } from '@/routes/cache-hooks/cache-hooks.service'; @Module({ providers: [JsonSchemaService, CacheHooksService], diff --git a/src/routes/cache-hooks/cache-hooks.service.ts b/src/routes/cache-hooks/cache-hooks.service.ts index 941280abfa..74c736cab1 100644 --- a/src/routes/cache-hooks/cache-hooks.service.ts +++ b/src/routes/cache-hooks/cache-hooks.service.ts @@ -1,23 +1,23 @@ import { Inject, Injectable } from '@nestjs/common'; -import { EventType } from './entities/event-payload.entity'; import { IBalancesRepository } from '@/domain/balances/balances.repository.interface'; -import { ExecutedTransaction } from './entities/executed-transaction.entity'; -import { NewConfirmation } from './entities/new-confirmation.entity'; -import { PendingTransaction } from './entities/pending-transaction.entity'; -import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; -import { IncomingToken } from './entities/incoming-token.entity'; -import { OutgoingToken } from './entities/outgoing-token.entity'; -import { IncomingEther } from './entities/incoming-ether.entity'; -import { OutgoingEther } from './entities/outgoing-ether.entity'; +import { IChainsRepository } from '@/domain/chains/chains.repository.interface'; import { ICollectiblesRepository } from '@/domain/collectibles/collectibles.repository.interface'; -import { ModuleTransaction } from './entities/module-transaction.entity'; -import { MessageCreated } from './entities/message-created.entity'; import { IMessagesRepository } from '@/domain/messages/messages.repository.interface'; -import { NewMessageConfirmation } from './entities/new-message-confirmation.entity'; -import { ChainUpdate } from '@/routes/cache-hooks/entities/chain-update.entity'; -import { IChainsRepository } from '@/domain/chains/chains.repository.interface'; import { ISafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository.interface'; +import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; +import { ChainUpdate } from '@/routes/cache-hooks/entities/chain-update.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { ExecutedTransaction } from '@/routes/cache-hooks/entities/executed-transaction.entity'; +import { IncomingEther } from '@/routes/cache-hooks/entities/incoming-ether.entity'; +import { IncomingToken } from '@/routes/cache-hooks/entities/incoming-token.entity'; +import { MessageCreated } from '@/routes/cache-hooks/entities/message-created.entity'; +import { NewConfirmation } from '@/routes/cache-hooks/entities/new-confirmation.entity'; +import { NewMessageConfirmation } from '@/routes/cache-hooks/entities/new-message-confirmation.entity'; +import { OutgoingEther } from '@/routes/cache-hooks/entities/outgoing-ether.entity'; +import { OutgoingToken } from '@/routes/cache-hooks/entities/outgoing-token.entity'; +import { PendingTransaction } from '@/routes/cache-hooks/entities/pending-transaction.entity'; import { SafeAppsUpdate } from '@/routes/cache-hooks/entities/safe-apps-update.entity'; +import { ModuleTransaction } from '@/routes/cache-hooks/entities/module-transaction.entity'; @Injectable() export class CacheHooksService { diff --git a/src/routes/cache-hooks/entities/executed-transaction.entity.ts b/src/routes/cache-hooks/entities/executed-transaction.entity.ts index d7ad5444a2..f8734b9399 100644 --- a/src/routes/cache-hooks/entities/executed-transaction.entity.ts +++ b/src/routes/cache-hooks/entities/executed-transaction.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface ExecutedTransaction extends EventPayload { diff --git a/src/routes/cache-hooks/entities/incoming-ether.entity.ts b/src/routes/cache-hooks/entities/incoming-ether.entity.ts index 0ff70982a9..1b457077f7 100644 --- a/src/routes/cache-hooks/entities/incoming-ether.entity.ts +++ b/src/routes/cache-hooks/entities/incoming-ether.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface IncomingEther extends EventPayload { txHash: string; diff --git a/src/routes/cache-hooks/entities/incoming-token.entity.ts b/src/routes/cache-hooks/entities/incoming-token.entity.ts index e6dffa6877..61c63033a6 100644 --- a/src/routes/cache-hooks/entities/incoming-token.entity.ts +++ b/src/routes/cache-hooks/entities/incoming-token.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface IncomingToken extends EventPayload { tokenAddress: string; diff --git a/src/routes/cache-hooks/entities/message-created.entity.ts b/src/routes/cache-hooks/entities/message-created.entity.ts index 00aa9e5c99..53c83d74e5 100644 --- a/src/routes/cache-hooks/entities/message-created.entity.ts +++ b/src/routes/cache-hooks/entities/message-created.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface MessageCreated extends EventPayload { diff --git a/src/routes/cache-hooks/entities/module-transaction.entity.ts b/src/routes/cache-hooks/entities/module-transaction.entity.ts index 0d53557b86..2e3e8b644b 100644 --- a/src/routes/cache-hooks/entities/module-transaction.entity.ts +++ b/src/routes/cache-hooks/entities/module-transaction.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface ModuleTransaction extends EventPayload { diff --git a/src/routes/cache-hooks/entities/new-confirmation.entity.ts b/src/routes/cache-hooks/entities/new-confirmation.entity.ts index 79b679ef11..5a947fca82 100644 --- a/src/routes/cache-hooks/entities/new-confirmation.entity.ts +++ b/src/routes/cache-hooks/entities/new-confirmation.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface NewConfirmation extends EventPayload { diff --git a/src/routes/cache-hooks/entities/new-message-confirmation.entity.ts b/src/routes/cache-hooks/entities/new-message-confirmation.entity.ts index 1cae3ac92c..802f275f32 100644 --- a/src/routes/cache-hooks/entities/new-message-confirmation.entity.ts +++ b/src/routes/cache-hooks/entities/new-message-confirmation.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface NewMessageConfirmation extends EventPayload { diff --git a/src/routes/cache-hooks/entities/outgoing-ether.entity.ts b/src/routes/cache-hooks/entities/outgoing-ether.entity.ts index 74d79b320e..eb31588698 100644 --- a/src/routes/cache-hooks/entities/outgoing-ether.entity.ts +++ b/src/routes/cache-hooks/entities/outgoing-ether.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface OutgoingEther extends EventPayload { txHash: string; diff --git a/src/routes/cache-hooks/entities/outgoing-token.entity.ts b/src/routes/cache-hooks/entities/outgoing-token.entity.ts index a69b4aae88..be12dda000 100644 --- a/src/routes/cache-hooks/entities/outgoing-token.entity.ts +++ b/src/routes/cache-hooks/entities/outgoing-token.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface OutgoingToken extends EventPayload { tokenAddress: string; diff --git a/src/routes/cache-hooks/entities/pending-transaction.entity.ts b/src/routes/cache-hooks/entities/pending-transaction.entity.ts index 2e9855246f..d3c79226a3 100644 --- a/src/routes/cache-hooks/entities/pending-transaction.entity.ts +++ b/src/routes/cache-hooks/entities/pending-transaction.entity.ts @@ -1,4 +1,7 @@ -import { EventPayload, EventType } from './event-payload.entity'; +import { + EventPayload, + EventType, +} from '@/routes/cache-hooks/entities/event-payload.entity'; export interface PendingTransaction extends EventPayload { diff --git a/src/routes/cache-hooks/entities/schemas/chain-update.schema.ts b/src/routes/cache-hooks/entities/schemas/chain-update.schema.ts index 25b45b319c..852b34822f 100644 --- a/src/routes/cache-hooks/entities/schemas/chain-update.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/chain-update.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; import { ChainUpdate } from '@/routes/cache-hooks/entities/chain-update.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; export const CHAIN_UPDATE_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/chain-update.json'; diff --git a/src/routes/cache-hooks/entities/schemas/executed-transaction.schema.ts b/src/routes/cache-hooks/entities/schemas/executed-transaction.schema.ts index 9e4ce938ea..cb81102954 100644 --- a/src/routes/cache-hooks/entities/schemas/executed-transaction.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/executed-transaction.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { ExecutedTransaction } from '../executed-transaction.entity'; -import { EventType } from '../event-payload.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { ExecutedTransaction } from '@/routes/cache-hooks/entities/executed-transaction.entity'; export const EXECUTED_TRANSACTION_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/executed-transaction.json'; diff --git a/src/routes/cache-hooks/entities/schemas/incoming-ether.schema.ts b/src/routes/cache-hooks/entities/schemas/incoming-ether.schema.ts index 373e29af18..62caba7353 100644 --- a/src/routes/cache-hooks/entities/schemas/incoming-ether.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/incoming-ether.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; -import { IncomingEther } from '../incoming-ether.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { IncomingEther } from '@/routes/cache-hooks/entities/incoming-ether.entity'; export const INCOMING_ETHER_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/incoming-ether.json'; diff --git a/src/routes/cache-hooks/entities/schemas/incoming-token.schema.ts b/src/routes/cache-hooks/entities/schemas/incoming-token.schema.ts index 2a0b441050..6f44ced856 100644 --- a/src/routes/cache-hooks/entities/schemas/incoming-token.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/incoming-token.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; -import { IncomingToken } from '../incoming-token.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { IncomingToken } from '@/routes/cache-hooks/entities/incoming-token.entity'; export const INCOMING_TOKEN_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/incoming-token.json'; diff --git a/src/routes/cache-hooks/entities/schemas/message-created.schema.ts b/src/routes/cache-hooks/entities/schemas/message-created.schema.ts index d851b65aa5..d2f204ef60 100644 --- a/src/routes/cache-hooks/entities/schemas/message-created.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/message-created.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { MessageCreated } from '../message-created.entity'; -import { EventType } from '../event-payload.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { MessageCreated } from '@/routes/cache-hooks/entities/message-created.entity'; export const MESSAGE_CREATED_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/message-created.json'; diff --git a/src/routes/cache-hooks/entities/schemas/module-transaction.schema.ts b/src/routes/cache-hooks/entities/schemas/module-transaction.schema.ts index da084a3a2a..e0e1af2927 100644 --- a/src/routes/cache-hooks/entities/schemas/module-transaction.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/module-transaction.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; -import { ModuleTransaction } from '../module-transaction.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { ModuleTransaction } from '@/routes/cache-hooks/entities/module-transaction.entity'; export const MODULE_TRANSACTION_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/module-transaction.json'; diff --git a/src/routes/cache-hooks/entities/schemas/new-confirmation.schema.ts b/src/routes/cache-hooks/entities/schemas/new-confirmation.schema.ts index 88c48f4170..f93777a357 100644 --- a/src/routes/cache-hooks/entities/schemas/new-confirmation.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/new-confirmation.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; -import { NewConfirmation } from '../new-confirmation.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { NewConfirmation } from '@/routes/cache-hooks/entities/new-confirmation.entity'; export const NEW_CONFIRMATION_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/new-confirmation.json'; diff --git a/src/routes/cache-hooks/entities/schemas/new-message-confirmation.schema.ts b/src/routes/cache-hooks/entities/schemas/new-message-confirmation.schema.ts index c507bbcc79..fa4fc0a931 100644 --- a/src/routes/cache-hooks/entities/schemas/new-message-confirmation.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/new-message-confirmation.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; -import { NewMessageConfirmation } from '../new-message-confirmation.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { NewMessageConfirmation } from '@/routes/cache-hooks/entities/new-message-confirmation.entity'; export const NEW_MESSAGE_CONFIRMATION_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/new-message-confirmation.json'; diff --git a/src/routes/cache-hooks/entities/schemas/outgoing-ether.schema.ts b/src/routes/cache-hooks/entities/schemas/outgoing-ether.schema.ts index f0a23f9578..1444527a5a 100644 --- a/src/routes/cache-hooks/entities/schemas/outgoing-ether.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/outgoing-ether.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; -import { OutgoingEther } from '../outgoing-ether.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { OutgoingEther } from '@/routes/cache-hooks/entities/outgoing-ether.entity'; export const OUTGOING_ETHER_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/outgoing-ether.json'; diff --git a/src/routes/cache-hooks/entities/schemas/outgoing-token.schema.ts b/src/routes/cache-hooks/entities/schemas/outgoing-token.schema.ts index b5f6305788..a49c86cc28 100644 --- a/src/routes/cache-hooks/entities/schemas/outgoing-token.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/outgoing-token.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; -import { OutgoingToken } from '../outgoing-token.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { OutgoingToken } from '@/routes/cache-hooks/entities/outgoing-token.entity'; export const OUTGOING_TOKEN_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/outgoing-token.json'; diff --git a/src/routes/cache-hooks/entities/schemas/pending-transaction.schema.ts b/src/routes/cache-hooks/entities/schemas/pending-transaction.schema.ts index 46d5e39794..f7eb273d37 100644 --- a/src/routes/cache-hooks/entities/schemas/pending-transaction.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/pending-transaction.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; -import { PendingTransaction } from '../pending-transaction.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; +import { PendingTransaction } from '@/routes/cache-hooks/entities/pending-transaction.entity'; export const PENDING_TRANSACTION_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/pending-transaction.json'; diff --git a/src/routes/cache-hooks/entities/schemas/safe-apps-update.schema.ts b/src/routes/cache-hooks/entities/schemas/safe-apps-update.schema.ts index c1600687c1..c6b0f62701 100644 --- a/src/routes/cache-hooks/entities/schemas/safe-apps-update.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/safe-apps-update.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { EventType } from '../event-payload.entity'; import { SafeAppsUpdate } from '@/routes/cache-hooks/entities/safe-apps-update.entity'; +import { EventType } from '@/routes/cache-hooks/entities/event-payload.entity'; export const SAFE_APPS_UPDATE_EVENT_SCHEMA_ID = 'https://safe-client.safe.global/schemas/cache-hooks/safe-apps-update.json'; diff --git a/src/routes/cache-hooks/entities/schemas/web-hook.schema.ts b/src/routes/cache-hooks/entities/schemas/web-hook.schema.ts index 26de5d5510..37911ffe01 100644 --- a/src/routes/cache-hooks/entities/schemas/web-hook.schema.ts +++ b/src/routes/cache-hooks/entities/schemas/web-hook.schema.ts @@ -1,15 +1,15 @@ import { JSONSchemaType } from 'ajv'; -import { ExecutedTransaction } from '../executed-transaction.entity'; -import { NewConfirmation } from '../new-confirmation.entity'; -import { PendingTransaction } from '../pending-transaction.entity'; -import { IncomingToken } from '../incoming-token.entity'; -import { OutgoingToken } from '../outgoing-token.entity'; -import { IncomingEther } from '../incoming-ether.entity'; -import { OutgoingEther } from '../outgoing-ether.entity'; -import { ModuleTransaction } from '../module-transaction.entity'; -import { MessageCreated } from '../message-created.entity'; -import { NewMessageConfirmation } from '../new-message-confirmation.entity'; import { ChainUpdate } from '@/routes/cache-hooks/entities/chain-update.entity'; +import { ExecutedTransaction } from '@/routes/cache-hooks/entities/executed-transaction.entity'; +import { IncomingEther } from '@/routes/cache-hooks/entities/incoming-ether.entity'; +import { IncomingToken } from '@/routes/cache-hooks/entities/incoming-token.entity'; +import { MessageCreated } from '@/routes/cache-hooks/entities/message-created.entity'; +import { ModuleTransaction } from '@/routes/cache-hooks/entities/module-transaction.entity'; +import { NewConfirmation } from '@/routes/cache-hooks/entities/new-confirmation.entity'; +import { NewMessageConfirmation } from '@/routes/cache-hooks/entities/new-message-confirmation.entity'; +import { OutgoingEther } from '@/routes/cache-hooks/entities/outgoing-ether.entity'; +import { OutgoingToken } from '@/routes/cache-hooks/entities/outgoing-token.entity'; +import { PendingTransaction } from '@/routes/cache-hooks/entities/pending-transaction.entity'; import { SafeAppsUpdate } from '@/routes/cache-hooks/entities/safe-apps-update.entity'; export const WEB_HOOK_SCHEMA_ID = diff --git a/src/routes/cache-hooks/pipes/event-validation.pipe.ts b/src/routes/cache-hooks/pipes/event-validation.pipe.ts index 3218ea4525..ad6b2df4ce 100644 --- a/src/routes/cache-hooks/pipes/event-validation.pipe.ts +++ b/src/routes/cache-hooks/pipes/event-validation.pipe.ts @@ -4,57 +4,53 @@ import { JsonSchemaService } from '@/validation/providers/json-schema.service'; import { EXECUTED_TRANSACTION_EVENT_SCHEMA_ID, executedTransactionEventSchema, -} from '../entities/schemas/executed-transaction.schema'; +} from '@/routes/cache-hooks/entities/schemas/executed-transaction.schema'; import { NEW_CONFIRMATION_EVENT_SCHEMA_ID, newConfirmationEventSchema, -} from '../entities/schemas/new-confirmation.schema'; +} from '@/routes/cache-hooks/entities/schemas/new-confirmation.schema'; import { PENDING_TRANSACTION_EVENT_SCHEMA_ID, pendingTransactionEventSchema, -} from '../entities/schemas/pending-transaction.schema'; +} from '@/routes/cache-hooks/entities/schemas/pending-transaction.schema'; import { WEB_HOOK_SCHEMA_ID, webHookSchema, -} from '../entities/schemas/web-hook.schema'; -import { ExecutedTransaction } from '../entities/executed-transaction.entity'; -import { NewConfirmation } from '../entities/new-confirmation.entity'; -import { PendingTransaction } from '../entities/pending-transaction.entity'; -import { IncomingEther } from '../entities/incoming-ether.entity'; +} from '@/routes/cache-hooks/entities/schemas/web-hook.schema'; +import { ExecutedTransaction } from '@/routes/cache-hooks/entities/executed-transaction.entity'; +import { NewConfirmation } from '@/routes/cache-hooks/entities/new-confirmation.entity'; +import { PendingTransaction } from '@/routes/cache-hooks/entities/pending-transaction.entity'; +import { IncomingEther } from '@/routes/cache-hooks/entities/incoming-ether.entity'; import { INCOMING_ETHER_EVENT_SCHEMA_ID, incomingEtherEventSchema, -} from '../entities/schemas/incoming-ether.schema'; +} from '@/routes/cache-hooks/entities/schemas/incoming-ether.schema'; import { INCOMING_TOKEN_EVENT_SCHEMA_ID, incomingTokenEventSchema, -} from '../entities/schemas/incoming-token.schema'; -import { IncomingToken } from '../entities/incoming-token.entity'; +} from '@/routes/cache-hooks/entities/schemas/incoming-token.schema'; +import { IncomingToken } from '@/routes/cache-hooks/entities/incoming-token.entity'; import { OUTGOING_ETHER_EVENT_SCHEMA_ID, outgoingEtherEventSchema, -} from '../entities/schemas/outgoing-ether.schema'; -import { OutgoingEther } from '../entities/outgoing-ether.entity'; +} from '@/routes/cache-hooks/entities/schemas/outgoing-ether.schema'; +import { OutgoingEther } from '@/routes/cache-hooks/entities/outgoing-ether.entity'; import { OUTGOING_TOKEN_EVENT_SCHEMA_ID, outgoingTokenEventSchema, -} from '../entities/schemas/outgoing-token.schema'; -import { OutgoingToken } from '../entities/outgoing-token.entity'; -import { ModuleTransaction } from '../entities/module-transaction.entity'; +} from '@/routes/cache-hooks/entities/schemas/outgoing-token.schema'; +import { OutgoingToken } from '@/routes/cache-hooks/entities/outgoing-token.entity'; +import { ModuleTransaction } from '@/routes/cache-hooks/entities/module-transaction.entity'; import { MODULE_TRANSACTION_EVENT_SCHEMA_ID, moduleTransactionEventSchema, -} from '../entities/schemas/module-transaction.schema'; -import { MessageCreated } from '../entities/message-created.entity'; +} from '@/routes/cache-hooks/entities/schemas/module-transaction.schema'; +import { MessageCreated } from '@/routes/cache-hooks/entities/message-created.entity'; import { MESSAGE_CREATED_EVENT_SCHEMA_ID, messageCreatedEventSchema, -} from '../entities/schemas/message-created.schema'; -import { NewMessageConfirmation } from '../entities/new-message-confirmation.entity'; -import { - NEW_MESSAGE_CONFIRMATION_EVENT_SCHEMA_ID, - newMessageConfirmationEventSchema, -} from '../entities/schemas/new-message-confirmation.schema'; +} from '@/routes/cache-hooks/entities/schemas/message-created.schema'; +import { NewMessageConfirmation } from '@/routes/cache-hooks/entities/new-message-confirmation.entity'; import { CHAIN_UPDATE_EVENT_SCHEMA_ID, chainUpdateEventSchema, @@ -65,6 +61,10 @@ import { SAFE_APPS_UPDATE_EVENT_SCHEMA_ID, safeAppsUpdateEventSchema, } from '@/routes/cache-hooks/entities/schemas/safe-apps-update.schema'; +import { + NEW_MESSAGE_CONFIRMATION_EVENT_SCHEMA_ID, + newMessageConfirmationEventSchema, +} from '@/routes/cache-hooks/entities/schemas/new-message-confirmation.schema'; @Injectable() export class EventValidationPipe diff --git a/src/routes/chains/chains.controller.spec.ts b/src/routes/chains/chains.controller.spec.ts index 84d4addcfd..3df76882ae 100644 --- a/src/routes/chains/chains.controller.spec.ts +++ b/src/routes/chains/chains.controller.spec.ts @@ -3,27 +3,29 @@ import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import * as request from 'supertest'; import { TestAppProvider } from '@/__tests__/test-app.provider'; +import { AppModule, configurationModule } from '@/app.module'; +import { ConfigurationModule } from '@/config/configuration.module'; +import { IConfigurationService } from '@/config/configuration.service.interface'; +import configuration from '@/config/entities/__tests__/configuration'; import { TestCacheModule } from '@/datasources/cache/__tests__/test.cache.module'; -import { NetworkResponseError } from '@/datasources/network/entities/network.error.entity'; +import { CacheModule } from '@/datasources/cache/cache.module'; import { TestNetworkModule } from '@/datasources/network/__tests__/test.network.module'; -import { Backbone } from '@/domain/backbone/entities/backbone.entity'; +import { NetworkResponseError } from '@/datasources/network/entities/network.error.entity'; +import { NetworkModule } from '@/datasources/network/network.module'; +import { NetworkService } from '@/datasources/network/network.service.interface'; import { backboneBuilder } from '@/domain/backbone/entities/__tests__/backbone.builder'; -import { Chain } from '@/domain/chains/entities/chain.entity'; -import { MasterCopy as DomainMasterCopy } from '../../domain/chains/entities/master-copies.entity'; +import { Backbone } from '@/domain/backbone/entities/backbone.entity'; import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { masterCopyBuilder } from '@/domain/chains/entities/__tests__/master-copy.builder'; +import { Chain } from '@/domain/chains/entities/chain.entity'; +import { + MasterCopy as DomainMasterCopy, + MasterCopy, +} from '@/domain/chains/entities/master-copies.entity'; import { Page } from '@/domain/entities/page.entity'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; -import { PaginationData } from '../common/pagination/pagination.data'; -import { MasterCopy } from './entities/master-copy.entity'; -import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; -import { IConfigurationService } from '@/config/configuration.service.interface'; -import { AppModule, configurationModule } from '@/app.module'; -import { CacheModule } from '@/datasources/cache/cache.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; -import { NetworkModule } from '@/datasources/network/network.module'; -import { NetworkService } from '@/datasources/network/network.service.interface'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; describe('Chains Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/chains/chains.controller.ts b/src/routes/chains/chains.controller.ts index 45e7974dd2..0749f7e8b5 100644 --- a/src/routes/chains/chains.controller.ts +++ b/src/routes/chains/chains.controller.ts @@ -1,15 +1,18 @@ import { Controller, Get, Param } from '@nestjs/common'; -import { ChainsService } from './chains.service'; -import { PaginationData } from '../common/pagination/pagination.data'; -import { RouteUrlDecorator } from '../common/decorators/route.url.decorator'; -import { PaginationDataDecorator } from '../common/decorators/pagination.data.decorator'; import { ApiOkResponse, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { Backbone as ApiBackbone, Backbone } from './entities/backbone.entity'; -import { ChainPage } from './entities/chain-page.entity'; -import { MasterCopy } from './entities/master-copy.entity'; -import { Page } from '../common/entities/page.entity'; -import { Chain } from './entities/chain.entity'; -import { AboutChain } from './entities/about-chain.entity'; +import { ChainsService } from '@/routes/chains/chains.service'; +import { AboutChain } from '@/routes/chains/entities/about-chain.entity'; +import { ChainPage } from '@/routes/chains/entities/chain-page.entity'; +import { Chain } from '@/routes/chains/entities/chain.entity'; +import { MasterCopy } from '@/routes/chains/entities/master-copy.entity'; +import { PaginationDataDecorator } from '@/routes/common/decorators/pagination.data.decorator'; +import { RouteUrlDecorator } from '@/routes/common/decorators/route.url.decorator'; +import { Page } from '@/routes/common/entities/page.entity'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; +import { + Backbone as ApiBackbone, + Backbone, +} from '@/routes/chains/entities/backbone.entity'; @ApiTags('chains') @Controller({ diff --git a/src/routes/chains/chains.module.ts b/src/routes/chains/chains.module.ts index bc6dc928ff..9eac6000de 100644 --- a/src/routes/chains/chains.module.ts +++ b/src/routes/chains/chains.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { ChainsService } from './chains.service'; -import { ChainsController } from './chains.controller'; +import { ChainsController } from '@/routes/chains/chains.controller'; +import { ChainsService } from '@/routes/chains/chains.service'; @Module({ controllers: [ChainsController], diff --git a/src/routes/chains/chains.service.ts b/src/routes/chains/chains.service.ts index 8ae89e6dcf..e4195cb6b2 100644 --- a/src/routes/chains/chains.service.ts +++ b/src/routes/chains/chains.service.ts @@ -5,12 +5,12 @@ import { Backbone } from '@/domain/backbone/entities/backbone.entity'; import { IChainsRepository } from '@/domain/chains/chains.repository.interface'; import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; import { Page } from '@/domain/entities/page.entity'; +import { AboutChain } from '@/routes/chains/entities/about-chain.entity'; +import { Chain } from '@/routes/chains/entities/chain.entity'; import { - cursorUrlFromLimitAndOffset, PaginationData, -} from '../common/pagination/pagination.data'; -import { AboutChain } from './entities/about-chain.entity'; -import { Chain } from './entities/chain.entity'; + cursorUrlFromLimitAndOffset, +} from '@/routes/common/pagination/pagination.data'; @Injectable() export class ChainsService { diff --git a/src/routes/chains/entities/backbone.entity.ts b/src/routes/chains/entities/backbone.entity.ts index 1c61217eab..b6b104cd5e 100644 --- a/src/routes/chains/entities/backbone.entity.ts +++ b/src/routes/chains/entities/backbone.entity.ts @@ -1,4 +1,4 @@ -import { Backbone as DomainBackbone } from '../../../domain/backbone/entities/backbone.entity'; +import { Backbone as DomainBackbone } from '@/domain/backbone/entities/backbone.entity'; import { ApiProperty } from '@nestjs/swagger'; export class Backbone implements DomainBackbone { diff --git a/src/routes/chains/entities/block-explorer-uri-template.entity.ts b/src/routes/chains/entities/block-explorer-uri-template.entity.ts index 5fd7fe4c90..859ffe5336 100644 --- a/src/routes/chains/entities/block-explorer-uri-template.entity.ts +++ b/src/routes/chains/entities/block-explorer-uri-template.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { BlockExplorerUriTemplate as DomainBlockExplorerUriTemplate } from '../../../domain/chains/entities/block-explorer-uri-template.entity'; +import { BlockExplorerUriTemplate as DomainBlockExplorerUriTemplate } from '@/domain/chains/entities/block-explorer-uri-template.entity'; export class BlockExplorerUriTemplate implements DomainBlockExplorerUriTemplate diff --git a/src/routes/chains/entities/chain-page.entity.ts b/src/routes/chains/entities/chain-page.entity.ts index e8c0ce29ca..399b442677 100644 --- a/src/routes/chains/entities/chain-page.entity.ts +++ b/src/routes/chains/entities/chain-page.entity.ts @@ -1,6 +1,6 @@ -import { Page } from '../../common/entities/page.entity'; -import { Chain } from './chain.entity'; import { ApiProperty } from '@nestjs/swagger'; +import { Chain } from '@/routes/chains/entities/chain.entity'; +import { Page } from '@/routes/common/entities/page.entity'; export class ChainPage extends Page { @ApiProperty({ type: Chain }) diff --git a/src/routes/chains/entities/chain.entity.ts b/src/routes/chains/entities/chain.entity.ts index 5b66314323..44a32a0dbe 100644 --- a/src/routes/chains/entities/chain.entity.ts +++ b/src/routes/chains/entities/chain.entity.ts @@ -7,25 +7,31 @@ import { import { NativeCurrency, NativeCurrency as ApiNativeCurrency, -} from './native-currency.entity'; +} from '@/routes/chains/entities/native-currency.entity'; import { BlockExplorerUriTemplate, BlockExplorerUriTemplate as ApiBlockExplorerUriTemplate, -} from './block-explorer-uri-template.entity'; +} from '@/routes/chains/entities/block-explorer-uri-template.entity'; import { GasPriceOracle, GasPriceOracle as ApiGasPriceOracle, -} from './gas-price-oracle.entity'; +} from '@/routes/chains/entities/gas-price-oracle.entity'; import { GasPriceFixed, GasPriceFixed as ApiGasPriceFixed, -} from './gas-price-fixed.entity'; +} from '@/routes/chains/entities/gas-price-fixed.entity'; import { GasPriceFixedEIP1559, GasPriceFixedEIP1559 as ApiGasPriceFixedEIP1559, -} from './gas-price-fixed-eip-1559.entity'; -import { RpcUri, RpcUri as ApiRpcUri } from './rpc-uri.entity'; -import { Theme, Theme as ApiTheme } from './theme.entity'; +} from '@/routes/chains/entities/gas-price-fixed-eip-1559.entity'; +import { + RpcUri, + RpcUri as ApiRpcUri, +} from '@/routes/chains/entities/rpc-uri.entity'; +import { + Theme, + Theme as ApiTheme, +} from '@/routes/chains/entities/theme.entity'; @ApiExtraModels(ApiGasPriceOracle, ApiGasPriceFixed, ApiGasPriceFixedEIP1559) export class Chain { diff --git a/src/routes/chains/entities/gas-price-fixed-eip-1559.entity.ts b/src/routes/chains/entities/gas-price-fixed-eip-1559.entity.ts index d3335e340e..c119851372 100644 --- a/src/routes/chains/entities/gas-price-fixed-eip-1559.entity.ts +++ b/src/routes/chains/entities/gas-price-fixed-eip-1559.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { GasPriceFixedEIP1559 as DomainGasPriceFixedEIP1559 } from '../../../domain/chains/entities/gas-price-fixed-eip-1559.entity'; +import { GasPriceFixedEIP1559 as DomainGasPriceFixedEIP1559 } from '@/domain/chains/entities/gas-price-fixed-eip-1559.entity'; export class GasPriceFixedEIP1559 implements DomainGasPriceFixedEIP1559 { @ApiProperty() diff --git a/src/routes/chains/entities/gas-price-fixed.entity.ts b/src/routes/chains/entities/gas-price-fixed.entity.ts index 7080e99929..8cb09a504f 100644 --- a/src/routes/chains/entities/gas-price-fixed.entity.ts +++ b/src/routes/chains/entities/gas-price-fixed.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { GasPriceFixed as DomainGasPriceFixed } from '../../../domain/chains/entities/gas-price-fixed.entity'; +import { GasPriceFixed as DomainGasPriceFixed } from '@/domain/chains/entities/gas-price-fixed.entity'; export class GasPriceFixed implements DomainGasPriceFixed { @ApiProperty() diff --git a/src/routes/chains/entities/gas-price-oracle.entity.ts b/src/routes/chains/entities/gas-price-oracle.entity.ts index 44587b1828..bb345ff86b 100644 --- a/src/routes/chains/entities/gas-price-oracle.entity.ts +++ b/src/routes/chains/entities/gas-price-oracle.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { GasPriceOracle as DomainGasPriceOracle } from '../../../domain/chains/entities/gas-price-oracle.entity'; +import { GasPriceOracle as DomainGasPriceOracle } from '@/domain/chains/entities/gas-price-oracle.entity'; export class GasPriceOracle implements DomainGasPriceOracle { @ApiProperty() diff --git a/src/routes/chains/entities/native-currency.entity.ts b/src/routes/chains/entities/native-currency.entity.ts index f2243c8f18..def930bf73 100644 --- a/src/routes/chains/entities/native-currency.entity.ts +++ b/src/routes/chains/entities/native-currency.entity.ts @@ -1,4 +1,4 @@ -import { NativeCurrency as DomainNativeCurrency } from '../../../domain/chains/entities/native.currency.entity'; +import { NativeCurrency as DomainNativeCurrency } from '@/domain/chains/entities/native.currency.entity'; import { ApiProperty } from '@nestjs/swagger'; export class NativeCurrency implements DomainNativeCurrency { diff --git a/src/routes/chains/entities/rpc-uri.entity.ts b/src/routes/chains/entities/rpc-uri.entity.ts index 1c4c69a5f2..9485ce1603 100644 --- a/src/routes/chains/entities/rpc-uri.entity.ts +++ b/src/routes/chains/entities/rpc-uri.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; import { RpcUriAuthentication } from '@/domain/chains/entities/rpc-uri-authentication.entity'; -import { RpcUri as DomainRpcUri } from '../../../domain/chains/entities/rpc-uri.entity'; +import { RpcUri as DomainRpcUri } from '@/domain/chains/entities/rpc-uri.entity'; export class RpcUri implements DomainRpcUri { @ApiProperty({ enum: Object.values(RpcUriAuthentication) }) diff --git a/src/routes/chains/entities/theme.entity.ts b/src/routes/chains/entities/theme.entity.ts index fa52a193e0..64ab1bcb5e 100644 --- a/src/routes/chains/entities/theme.entity.ts +++ b/src/routes/chains/entities/theme.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { Theme as DomainTheme } from '../../../domain/chains/entities/theme.entity'; +import { Theme as DomainTheme } from '@/domain/chains/entities/theme.entity'; export class Theme implements DomainTheme { @ApiProperty() diff --git a/src/routes/collectibles/collectibles.controller.spec.ts b/src/routes/collectibles/collectibles.controller.spec.ts index 1d1d914091..0279202592 100644 --- a/src/routes/collectibles/collectibles.controller.spec.ts +++ b/src/routes/collectibles/collectibles.controller.spec.ts @@ -1,31 +1,31 @@ -import { TestCacheModule } from '@/datasources/cache/__tests__/test.cache.module'; -import { Test, TestingModule } from '@nestjs/testing'; -import { TestNetworkModule } from '@/datasources/network/__tests__/test.network.module'; +import { faker } from '@faker-js/faker'; import { INestApplication } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; import * as request from 'supertest'; -import { faker } from '@faker-js/faker'; -import { Collectible } from '@/domain/collectibles/entities/collectible.entity'; +import { TestAppProvider } from '@/__tests__/test-app.provider'; +import { AppModule, configurationModule } from '@/app.module'; +import { ConfigurationModule } from '@/config/configuration.module'; +import { IConfigurationService } from '@/config/configuration.service.interface'; +import configuration from '@/config/entities/__tests__/configuration'; +import { TestCacheModule } from '@/datasources/cache/__tests__/test.cache.module'; +import { CacheModule } from '@/datasources/cache/cache.module'; +import { TestNetworkModule } from '@/datasources/network/__tests__/test.network.module'; import { NetworkRequestError, NetworkResponseError, } from '@/datasources/network/entities/network.error.entity'; +import { NetworkModule } from '@/datasources/network/network.module'; +import { NetworkService } from '@/datasources/network/network.service.interface'; import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { collectibleBuilder } from '@/domain/collectibles/entities/__tests__/collectible.builder'; +import { Collectible } from '@/domain/collectibles/entities/collectible.entity'; import { limitAndOffsetUrlFactory, pageBuilder, } from '@/domain/entities/__tests__/page.builder'; -import { PaginationData } from '../common/pagination/pagination.data'; -import { TestAppProvider } from '@/__tests__/test-app.provider'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; -import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; -import { IConfigurationService } from '@/config/configuration.service.interface'; -import { AppModule, configurationModule } from '@/app.module'; -import { CacheModule } from '@/datasources/cache/cache.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; -import { NetworkModule } from '@/datasources/network/network.module'; -import { NetworkService } from '@/datasources/network/network.service.interface'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; describe('Collectibles Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/collectibles/collectibles.controller.ts b/src/routes/collectibles/collectibles.controller.ts index 9165f94fed..265c49d902 100644 --- a/src/routes/collectibles/collectibles.controller.ts +++ b/src/routes/collectibles/collectibles.controller.ts @@ -1,4 +1,3 @@ -import { ApiOkResponse, ApiQuery, ApiTags } from '@nestjs/swagger'; import { Controller, DefaultValuePipe, @@ -7,13 +6,14 @@ import { ParseBoolPipe, Query, } from '@nestjs/common'; -import { CollectiblesService } from './collectibles.service'; -import { CollectiblePage } from './entities/collectible.page.entity'; -import { Collectible } from './entities/collectible.entity'; -import { RouteUrlDecorator } from '../common/decorators/route.url.decorator'; -import { PaginationDataDecorator } from '../common/decorators/pagination.data.decorator'; -import { PaginationData } from '../common/pagination/pagination.data'; -import { Page } from '../common/entities/page.entity'; +import { ApiOkResponse, ApiQuery, ApiTags } from '@nestjs/swagger'; +import { CollectiblesService } from '@/routes/collectibles/collectibles.service'; +import { Collectible } from '@/routes/collectibles/entities/collectible.entity'; +import { CollectiblePage } from '@/routes/collectibles/entities/collectible.page.entity'; +import { PaginationDataDecorator } from '@/routes/common/decorators/pagination.data.decorator'; +import { RouteUrlDecorator } from '@/routes/common/decorators/route.url.decorator'; +import { Page } from '@/routes/common/entities/page.entity'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; @ApiTags('collectibles') @Controller({ diff --git a/src/routes/collectibles/collectibles.module.ts b/src/routes/collectibles/collectibles.module.ts index 421d4d6a53..eafc9260a7 100644 --- a/src/routes/collectibles/collectibles.module.ts +++ b/src/routes/collectibles/collectibles.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { CollectiblesController } from './collectibles.controller'; -import { CollectiblesService } from './collectibles.service'; +import { CollectiblesController } from '@/routes/collectibles/collectibles.controller'; +import { CollectiblesService } from '@/routes/collectibles/collectibles.service'; @Module({ controllers: [CollectiblesController], diff --git a/src/routes/collectibles/collectibles.service.ts b/src/routes/collectibles/collectibles.service.ts index 7bc4c406f8..0b68419c44 100644 --- a/src/routes/collectibles/collectibles.service.ts +++ b/src/routes/collectibles/collectibles.service.ts @@ -1,11 +1,11 @@ import { Inject, Injectable } from '@nestjs/common'; import { ICollectiblesRepository } from '@/domain/collectibles/collectibles.repository.interface'; -import { Collectible } from './entities/collectible.entity'; -import { Page } from '../common/entities/page.entity'; +import { Collectible } from '@/routes/collectibles/entities/collectible.entity'; +import { Page } from '@/routes/common/entities/page.entity'; import { - cursorUrlFromLimitAndOffset, PaginationData, -} from '../common/pagination/pagination.data'; + cursorUrlFromLimitAndOffset, +} from '@/routes/common/pagination/pagination.data'; @Injectable() export class CollectiblesService { diff --git a/src/routes/collectibles/entities/collectible.entity.ts b/src/routes/collectibles/entities/collectible.entity.ts index bab463d959..56b39b3873 100644 --- a/src/routes/collectibles/entities/collectible.entity.ts +++ b/src/routes/collectibles/entities/collectible.entity.ts @@ -1,4 +1,4 @@ -import { Collectible as DomainCollectible } from '../../../domain/collectibles/entities/collectible.entity'; +import { Collectible as DomainCollectible } from '@/domain/collectibles/entities/collectible.entity'; import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; export class Collectible implements DomainCollectible { diff --git a/src/routes/collectibles/entities/collectible.page.entity.ts b/src/routes/collectibles/entities/collectible.page.entity.ts index bd309318a3..82ebcda870 100644 --- a/src/routes/collectibles/entities/collectible.page.entity.ts +++ b/src/routes/collectibles/entities/collectible.page.entity.ts @@ -1,6 +1,6 @@ -import { Collectible } from './collectible.entity'; import { ApiProperty } from '@nestjs/swagger'; -import { Page } from '../../common/entities/page.entity'; +import { Collectible } from '@/routes/collectibles/entities/collectible.entity'; +import { Page } from '@/routes/common/entities/page.entity'; export class CollectiblePage extends Page { @ApiProperty({ type: Collectible }) diff --git a/src/routes/common/__tests__/entities/address-info.builder.ts b/src/routes/common/__tests__/entities/address-info.builder.ts index 0f59cfe4c8..489794beff 100644 --- a/src/routes/common/__tests__/entities/address-info.builder.ts +++ b/src/routes/common/__tests__/entities/address-info.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { AddressInfo } from '../../entities/address-info.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; export function addressInfoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/common/address-info/address-info.helper.ts b/src/routes/common/address-info/address-info.helper.ts index cc38b72db7..0b12d6b178 100644 --- a/src/routes/common/address-info/address-info.helper.ts +++ b/src/routes/common/address-info/address-info.helper.ts @@ -3,8 +3,8 @@ import { ContractsRepository } from '@/domain/contracts/contracts.repository'; import { IContractsRepository } from '@/domain/contracts/contracts.repository.interface'; import { TokenRepository } from '@/domain/tokens/token.repository'; import { ITokenRepository } from '@/domain/tokens/token.repository.interface'; -import { AddressInfo } from '../entities/address-info.entity'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; export type Source = 'CONTRACT' | 'TOKEN'; diff --git a/src/routes/common/address-info/address-info.module.ts b/src/routes/common/address-info/address-info.module.ts index 366571ce41..d5543bcf8a 100644 --- a/src/routes/common/address-info/address-info.module.ts +++ b/src/routes/common/address-info/address-info.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { AddressInfoHelper } from './address-info.helper'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; @Module({ providers: [AddressInfoHelper], diff --git a/src/routes/common/decorators/pagination.data.decorator.spec.ts b/src/routes/common/decorators/pagination.data.decorator.spec.ts index 5e13fb896e..347a9988b6 100644 --- a/src/routes/common/decorators/pagination.data.decorator.spec.ts +++ b/src/routes/common/decorators/pagination.data.decorator.spec.ts @@ -1,8 +1,8 @@ -import { PaginationDataDecorator } from './pagination.data.decorator'; -import { PaginationData } from '../pagination/pagination.data'; import { Controller, Get, INestApplication, Module } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import * as request from 'supertest'; +import { PaginationDataDecorator } from '@/routes/common/decorators/pagination.data.decorator'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; describe('PaginationDataDecorator', () => { let app: INestApplication; diff --git a/src/routes/common/decorators/pagination.data.decorator.ts b/src/routes/common/decorators/pagination.data.decorator.ts index d2076b87a9..5f0d227a99 100644 --- a/src/routes/common/decorators/pagination.data.decorator.ts +++ b/src/routes/common/decorators/pagination.data.decorator.ts @@ -1,6 +1,6 @@ import { createParamDecorator, ExecutionContext } from '@nestjs/common'; -import { PaginationData } from '../pagination/pagination.data'; -import { getRouteUrl } from './utils'; +import { getRouteUrl } from '@/routes/common/decorators/utils'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; /** * Route decorator which parses {@link PaginationData} from a diff --git a/src/routes/common/decorators/route.url.decorator.ts b/src/routes/common/decorators/route.url.decorator.ts index d84c625f88..70d0f09611 100644 --- a/src/routes/common/decorators/route.url.decorator.ts +++ b/src/routes/common/decorators/route.url.decorator.ts @@ -1,5 +1,5 @@ import { createParamDecorator, ExecutionContext } from '@nestjs/common'; -import { getRouteUrl } from './utils'; +import { getRouteUrl } from '@/routes/common/decorators/utils'; /** * Route decorator which extracts the resulting diff --git a/src/routes/common/decorators/utils.spec.ts b/src/routes/common/decorators/utils.spec.ts index 544db66920..53b790da81 100644 --- a/src/routes/common/decorators/utils.spec.ts +++ b/src/routes/common/decorators/utils.spec.ts @@ -1,5 +1,5 @@ -import { getRouteUrl } from './utils'; import { faker } from '@faker-js/faker'; +import { getRouteUrl } from '@/routes/common/decorators/utils'; describe('utils tests', () => { describe('getRouteUrl tests', () => { diff --git a/src/routes/common/entities/page.entity.ts b/src/routes/common/entities/page.entity.ts index 0545c0e429..dc465e6610 100644 --- a/src/routes/common/entities/page.entity.ts +++ b/src/routes/common/entities/page.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { Page as DomainPage } from '../../../domain/entities/page.entity'; +import { Page as DomainPage } from '@/domain/entities/page.entity'; /** * The SwaggerModule cannot generate model definitions based on Generics diff --git a/src/routes/common/filters/global-error.filter.spec.ts b/src/routes/common/filters/global-error.filter.spec.ts index ad0aaa2d1b..d55d37fa76 100644 --- a/src/routes/common/filters/global-error.filter.spec.ts +++ b/src/routes/common/filters/global-error.filter.spec.ts @@ -3,10 +3,10 @@ import { Test, TestingModule } from '@nestjs/testing'; import { TestAppProvider } from '@/__tests__/test-app.provider'; import * as request from 'supertest'; import { APP_FILTER } from '@nestjs/core'; -import { GlobalErrorFilter } from './global-error.filter'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; +import { GlobalErrorFilter } from '@/routes/common/filters/global-error.filter'; @Controller({}) class TestController { diff --git a/src/routes/common/interceptors/route-logger.interceptor.spec.ts b/src/routes/common/interceptors/route-logger.interceptor.spec.ts index cb339e4883..a9f7986310 100644 --- a/src/routes/common/interceptors/route-logger.interceptor.spec.ts +++ b/src/routes/common/interceptors/route-logger.interceptor.spec.ts @@ -1,4 +1,3 @@ -import { RouteLoggerInterceptor } from './route-logger.interceptor'; import { ILoggingService } from '@/logging/logging.interface'; import { Test, TestingModule } from '@nestjs/testing'; import { @@ -11,6 +10,7 @@ import { import * as request from 'supertest'; import { DataSourceError } from '@/domain/errors/data-source.error'; import { faker } from '@faker-js/faker'; +import { RouteLoggerInterceptor } from '@/routes/common/interceptors/route-logger.interceptor'; const mockLoggingService = { info: jest.fn(), diff --git a/src/routes/common/pagination/pagination.data.spec.ts b/src/routes/common/pagination/pagination.data.spec.ts index 03c26efee1..7aaf3ea375 100644 --- a/src/routes/common/pagination/pagination.data.spec.ts +++ b/src/routes/common/pagination/pagination.data.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import { + PaginationData, buildNextPageURL, buildPreviousPageURL, cursorUrlFromLimitAndOffset, - PaginationData, -} from './pagination.data'; +} from '@/routes/common/pagination/pagination.data'; describe('PaginationData', () => { describe('fromCursor', () => { diff --git a/src/routes/contracts/contracts.controller.spec.ts b/src/routes/contracts/contracts.controller.spec.ts index 2c39e39e01..705add5f1a 100644 --- a/src/routes/contracts/contracts.controller.spec.ts +++ b/src/routes/contracts/contracts.controller.spec.ts @@ -8,7 +8,7 @@ import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { contractBuilder } from '@/domain/contracts/entities/__tests__/contract.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; diff --git a/src/routes/contracts/contracts.controller.ts b/src/routes/contracts/contracts.controller.ts index ada9c3820e..4181d8cec7 100644 --- a/src/routes/contracts/contracts.controller.ts +++ b/src/routes/contracts/contracts.controller.ts @@ -1,8 +1,8 @@ import { Controller, Get, Param } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; -import { ContractsService } from './contracts.service'; import { Contract } from '@/domain/contracts/entities/contract.entity'; -import { Contract as ApiContract } from './entities/contract.entity'; +import { ContractsService } from '@/routes/contracts/contracts.service'; +import { Contract as ApiContract } from '@/routes/contracts/entities/contract.entity'; @ApiTags('contracts') @Controller({ diff --git a/src/routes/contracts/contracts.module.ts b/src/routes/contracts/contracts.module.ts index 0127323f2f..74e6b349c0 100644 --- a/src/routes/contracts/contracts.module.ts +++ b/src/routes/contracts/contracts.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { ContractsController } from './contracts.controller'; -import { ContractsService } from './contracts.service'; +import { ContractsController } from '@/routes/contracts/contracts.controller'; +import { ContractsService } from '@/routes/contracts/contracts.service'; @Module({ controllers: [ContractsController], diff --git a/src/routes/contracts/entities/contract.entity.ts b/src/routes/contracts/entities/contract.entity.ts index 86d5a719b8..873c2ff6df 100644 --- a/src/routes/contracts/entities/contract.entity.ts +++ b/src/routes/contracts/entities/contract.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { Contract as DomainContract } from '../../../domain/contracts/entities/contract.entity'; +import { Contract as DomainContract } from '@/domain/contracts/entities/contract.entity'; export class Contract implements DomainContract { @ApiProperty() diff --git a/src/routes/data-decode/__tests__/data-decode.e2e-spec.ts b/src/routes/data-decode/__tests__/data-decode.e2e-spec.ts index f8dbb13eb9..fb4408d7a7 100644 --- a/src/routes/data-decode/__tests__/data-decode.e2e-spec.ts +++ b/src/routes/data-decode/__tests__/data-decode.e2e-spec.ts @@ -7,7 +7,7 @@ import { AppModule } from '@/app.module'; import { TestAppProvider } from '@/__tests__/test-app.provider'; import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; import { redisClientFactory } from '@/__tests__/redis-client.factory'; -import { getDataDecodedDtoBuilder } from '../entities/__tests__/get-data-decoded.dto.builder'; +import { getDataDecodedDtoBuilder } from '@/routes/data-decode/entities/__tests__/get-data-decoded.dto.builder'; describe('Data decode e2e tests', () => { let app: INestApplication; diff --git a/src/routes/data-decode/data-decoded.controller.ts b/src/routes/data-decode/data-decoded.controller.ts index f6370abf51..fbad375821 100644 --- a/src/routes/data-decode/data-decoded.controller.ts +++ b/src/routes/data-decode/data-decoded.controller.ts @@ -1,9 +1,9 @@ import { Body, Controller, HttpCode, Param, Post } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; -import { DataDecodedService } from './data-decoded.service'; -import { DataDecoded } from './entities/data-decoded.entity'; -import { GetDataDecodedDto } from './entities/get-data-decoded.dto.entity'; -import { GetDataDecodedDtoValidationPipe } from './pipes/get-data-decoded.dto.validation.pipe'; +import { DataDecodedService } from '@/routes/data-decode/data-decoded.service'; +import { DataDecoded } from '@/routes/data-decode/entities/data-decoded.entity'; +import { GetDataDecodedDto } from '@/routes/data-decode/entities/get-data-decoded.dto.entity'; +import { GetDataDecodedDtoValidationPipe } from '@/routes/data-decode/pipes/get-data-decoded.dto.validation.pipe'; @ApiTags('data-decoded') @Controller({ diff --git a/src/routes/data-decode/data-decoded.module.ts b/src/routes/data-decode/data-decoded.module.ts index 545def68cf..3bea0186be 100644 --- a/src/routes/data-decode/data-decoded.module.ts +++ b/src/routes/data-decode/data-decoded.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { DataDecodedController } from './data-decoded.controller'; -import { DataDecodedService } from './data-decoded.service'; +import { DataDecodedController } from '@/routes/data-decode/data-decoded.controller'; +import { DataDecodedService } from '@/routes/data-decode/data-decoded.service'; @Module({ controllers: [DataDecodedController], diff --git a/src/routes/data-decode/data-decoded.service.ts b/src/routes/data-decode/data-decoded.service.ts index dc156de8e1..073826f6b7 100644 --- a/src/routes/data-decode/data-decoded.service.ts +++ b/src/routes/data-decode/data-decoded.service.ts @@ -1,8 +1,8 @@ import { Inject, Injectable } from '@nestjs/common'; import { DataDecodedRepository } from '@/domain/data-decoder/data-decoded.repository'; import { IDataDecodedRepository } from '@/domain/data-decoder/data-decoded.repository.interface'; -import { DataDecoded } from './entities/data-decoded.entity'; -import { GetDataDecodedDto } from './entities/get-data-decoded.dto.entity'; +import { GetDataDecodedDto } from '@/routes/data-decode/entities/get-data-decoded.dto.entity'; +import { DataDecoded } from '@/routes/data-decode/entities/data-decoded.entity'; @Injectable() export class DataDecodedService { diff --git a/src/routes/data-decode/entities/__tests__/get-data-decoded.dto.builder.ts b/src/routes/data-decode/entities/__tests__/get-data-decoded.dto.builder.ts index 945f4e2bea..35cfcfdc68 100644 --- a/src/routes/data-decode/entities/__tests__/get-data-decoded.dto.builder.ts +++ b/src/routes/data-decode/entities/__tests__/get-data-decoded.dto.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { GetDataDecodedDto } from '../get-data-decoded.dto.entity'; +import { GetDataDecodedDto } from '@/routes/data-decode/entities/get-data-decoded.dto.entity'; export function getDataDecodedDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/data-decode/entities/data-decoded.entity.ts b/src/routes/data-decode/entities/data-decoded.entity.ts index 775214b9ef..b52c0ebe90 100644 --- a/src/routes/data-decode/entities/data-decoded.entity.ts +++ b/src/routes/data-decode/entities/data-decoded.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { DataDecodedParameter } from './data-decoded-parameter.entity'; +import { DataDecodedParameter } from '@/routes/data-decode/entities/data-decoded-parameter.entity'; export class DataDecoded { @ApiProperty() diff --git a/src/routes/data-decode/entities/schemas/get-data-decoded.dto.schema.ts b/src/routes/data-decode/entities/schemas/get-data-decoded.dto.schema.ts index ae114f1338..a34d3694c6 100644 --- a/src/routes/data-decode/entities/schemas/get-data-decoded.dto.schema.ts +++ b/src/routes/data-decode/entities/schemas/get-data-decoded.dto.schema.ts @@ -1,6 +1,6 @@ import { JSONSchemaType } from 'ajv'; -import { GetDataDecodedDto } from '../get-data-decoded.dto.entity'; import { HEX_PATTERN } from '@/validation/patterns'; +import { GetDataDecodedDto } from '@/routes/data-decode/entities/get-data-decoded.dto.entity'; export const GET_DATA_DECODED_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/delegates/get-data-decoded.dto.json'; diff --git a/src/routes/data-decode/pipes/get-data-decoded.dto.validation.pipe.ts b/src/routes/data-decode/pipes/get-data-decoded.dto.validation.pipe.ts index a4887ccb0b..069534e5b9 100644 --- a/src/routes/data-decode/pipes/get-data-decoded.dto.validation.pipe.ts +++ b/src/routes/data-decode/pipes/get-data-decoded.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { GetDataDecodedDto } from '../entities/get-data-decoded.dto.entity'; +import { GetDataDecodedDto } from '@/routes/data-decode/entities/get-data-decoded.dto.entity'; import { GET_DATA_DECODED_DTO_SCHEMA_ID, getDataDecodedDtoSchema, -} from '../entities/schemas/get-data-decoded.dto.schema'; +} from '@/routes/data-decode/entities/schemas/get-data-decoded.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class GetDataDecodedDtoValidationPipe diff --git a/src/routes/delegates/delegates.controller.spec.ts b/src/routes/delegates/delegates.controller.spec.ts index d37ac0d4eb..ffd693216a 100644 --- a/src/routes/delegates/delegates.controller.spec.ts +++ b/src/routes/delegates/delegates.controller.spec.ts @@ -10,17 +10,17 @@ import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { delegateBuilder } from '@/domain/delegate/entities/__tests__/delegate.builder'; import { pageBuilder } from '@/domain/entities/__tests__/page.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; -import { createDelegateDtoBuilder } from './entities/__tests__/create-delegate.dto.builder'; -import { deleteDelegateDtoBuilder } from './entities/__tests__/delete-delegate.dto.builder'; -import { deleteSafeDelegateDtoBuilder } from './entities/__tests__/delete-safe-delegate.dto.builder'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { NetworkService } from '@/datasources/network/network.service.interface'; import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; import { NetworkModule } from '@/datasources/network/network.module'; +import { createDelegateDtoBuilder } from '@/routes/delegates/entities/__tests__/create-delegate.dto.builder'; +import { deleteDelegateDtoBuilder } from '@/routes/delegates/entities/__tests__/delete-delegate.dto.builder'; +import { deleteSafeDelegateDtoBuilder } from '@/routes/delegates/entities/__tests__/delete-safe-delegate.dto.builder'; describe('Delegates controller', () => { let app: INestApplication; diff --git a/src/routes/delegates/delegates.controller.ts b/src/routes/delegates/delegates.controller.ts index 08a7411f88..6d6ab87f73 100644 --- a/src/routes/delegates/delegates.controller.ts +++ b/src/routes/delegates/delegates.controller.ts @@ -8,22 +8,22 @@ import { Post, Query, } from '@nestjs/common'; -import { ApiOkResponse, ApiTags, ApiQuery } from '@nestjs/swagger'; -import { PaginationDataDecorator } from '../common/decorators/pagination.data.decorator'; -import { RouteUrlDecorator } from '../common/decorators/route.url.decorator'; -import { Page } from '../common/entities/page.entity'; -import { PaginationData } from '../common/pagination/pagination.data'; -import { DelegatesService } from './delegates.service'; -import { CreateDelegateDto } from './entities/create-delegate.dto.entity'; -import { Delegate } from './entities/delegate.entity'; -import { DelegatePage } from './entities/delegate.page.entity'; -import { DeleteDelegateDto } from './entities/delete-delegate.dto.entity'; -import { DeleteSafeDelegateDto } from './entities/delete-safe-delegate.dto.entity'; -import { GetDelegateDto } from './entities/get-delegate.dto.entity'; -import { CreateDelegateDtoValidationPipe } from './pipes/create-delegate.dto.validation.pipe'; -import { DeleteDelegateDtoValidationPipe } from './pipes/delete-delegate.dto.validation.pipe'; -import { DeleteSafeDelegateDtoValidationPipe } from './pipes/delete-safe-delegate.dto.validation.pipe'; -import { GetDelegateDtoValidationPipe } from './pipes/get-delegate.dto.validation.pipe'; +import { ApiOkResponse, ApiQuery, ApiTags } from '@nestjs/swagger'; +import { PaginationDataDecorator } from '@/routes/common/decorators/pagination.data.decorator'; +import { RouteUrlDecorator } from '@/routes/common/decorators/route.url.decorator'; +import { Page } from '@/routes/common/entities/page.entity'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; +import { DelegatesService } from '@/routes/delegates/delegates.service'; +import { CreateDelegateDto } from '@/routes/delegates/entities/create-delegate.dto.entity'; +import { Delegate } from '@/routes/delegates/entities/delegate.entity'; +import { DelegatePage } from '@/routes/delegates/entities/delegate.page.entity'; +import { DeleteDelegateDto } from '@/routes/delegates/entities/delete-delegate.dto.entity'; +import { DeleteSafeDelegateDto } from '@/routes/delegates/entities/delete-safe-delegate.dto.entity'; +import { GetDelegateDto } from '@/routes/delegates/entities/get-delegate.dto.entity'; +import { CreateDelegateDtoValidationPipe } from '@/routes/delegates/pipes/create-delegate.dto.validation.pipe'; +import { DeleteDelegateDtoValidationPipe } from '@/routes/delegates/pipes/delete-delegate.dto.validation.pipe'; +import { DeleteSafeDelegateDtoValidationPipe } from '@/routes/delegates/pipes/delete-safe-delegate.dto.validation.pipe'; +import { GetDelegateDtoValidationPipe } from '@/routes/delegates/pipes/get-delegate.dto.validation.pipe'; @ApiTags('delegates') @Controller({ diff --git a/src/routes/delegates/delegates.module.ts b/src/routes/delegates/delegates.module.ts index e38e7ef729..b591bb40df 100644 --- a/src/routes/delegates/delegates.module.ts +++ b/src/routes/delegates/delegates.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { ValidationModule } from '@/validation/validation.module'; -import { DelegatesController } from './delegates.controller'; -import { DelegatesService } from './delegates.service'; +import { DelegatesController } from '@/routes/delegates/delegates.controller'; +import { DelegatesService } from '@/routes/delegates/delegates.service'; @Module({ controllers: [DelegatesController], diff --git a/src/routes/delegates/delegates.service.ts b/src/routes/delegates/delegates.service.ts index f1ace9dfef..e70e3986d5 100644 --- a/src/routes/delegates/delegates.service.ts +++ b/src/routes/delegates/delegates.service.ts @@ -1,15 +1,15 @@ import { Inject, Injectable } from '@nestjs/common'; import { IDelegateRepository } from '@/domain/delegate/delegate.repository.interface'; -import { Page } from '../common/entities/page.entity'; +import { Page } from '@/routes/common/entities/page.entity'; import { - cursorUrlFromLimitAndOffset, PaginationData, -} from '../common/pagination/pagination.data'; -import { CreateDelegateDto } from './entities/create-delegate.dto.entity'; -import { Delegate } from './entities/delegate.entity'; -import { DeleteDelegateDto } from './entities/delete-delegate.dto.entity'; -import { DeleteSafeDelegateDto } from './entities/delete-safe-delegate.dto.entity'; -import { GetDelegateDto } from './entities/get-delegate.dto.entity'; + cursorUrlFromLimitAndOffset, +} from '@/routes/common/pagination/pagination.data'; +import { CreateDelegateDto } from '@/routes/delegates/entities/create-delegate.dto.entity'; +import { Delegate } from '@/routes/delegates/entities/delegate.entity'; +import { DeleteDelegateDto } from '@/routes/delegates/entities/delete-delegate.dto.entity'; +import { DeleteSafeDelegateDto } from '@/routes/delegates/entities/delete-safe-delegate.dto.entity'; +import { GetDelegateDto } from '@/routes/delegates/entities/get-delegate.dto.entity'; @Injectable() export class DelegatesService { diff --git a/src/routes/delegates/entities/__tests__/create-delegate.dto.builder.ts b/src/routes/delegates/entities/__tests__/create-delegate.dto.builder.ts index b37519b5a8..7269b7a694 100644 --- a/src/routes/delegates/entities/__tests__/create-delegate.dto.builder.ts +++ b/src/routes/delegates/entities/__tests__/create-delegate.dto.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { CreateDelegateDto } from '../create-delegate.dto.entity'; +import { CreateDelegateDto } from '@/routes/delegates/entities/create-delegate.dto.entity'; export function createDelegateDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/delegates/entities/__tests__/delete-delegate.dto.builder.ts b/src/routes/delegates/entities/__tests__/delete-delegate.dto.builder.ts index 4dfd4b2cdc..8d56b7dbc6 100644 --- a/src/routes/delegates/entities/__tests__/delete-delegate.dto.builder.ts +++ b/src/routes/delegates/entities/__tests__/delete-delegate.dto.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { DeleteDelegateDto } from '../delete-delegate.dto.entity'; +import { DeleteDelegateDto } from '@/routes/delegates/entities/delete-delegate.dto.entity'; export function deleteDelegateDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/delegates/entities/__tests__/delete-safe-delegate.dto.builder.ts b/src/routes/delegates/entities/__tests__/delete-safe-delegate.dto.builder.ts index 985ee5ad6d..9a142d2b82 100644 --- a/src/routes/delegates/entities/__tests__/delete-safe-delegate.dto.builder.ts +++ b/src/routes/delegates/entities/__tests__/delete-safe-delegate.dto.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { DeleteSafeDelegateDto } from '../delete-safe-delegate.dto.entity'; +import { DeleteSafeDelegateDto } from '@/routes/delegates/entities/delete-safe-delegate.dto.entity'; export function deleteSafeDelegateDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/delegates/entities/delegate.page.entity.ts b/src/routes/delegates/entities/delegate.page.entity.ts index 17078d95e4..45e933f365 100644 --- a/src/routes/delegates/entities/delegate.page.entity.ts +++ b/src/routes/delegates/entities/delegate.page.entity.ts @@ -1,6 +1,6 @@ -import { Delegate } from './delegate.entity'; import { ApiProperty } from '@nestjs/swagger'; -import { Page } from '../../common/entities/page.entity'; +import { Page } from '@/routes/common/entities/page.entity'; +import { Delegate } from '@/routes/delegates/entities/delegate.entity'; export class DelegatePage extends Page { @ApiProperty({ type: Delegate }) diff --git a/src/routes/delegates/entities/schemas/create-delegate.dto.schema.ts b/src/routes/delegates/entities/schemas/create-delegate.dto.schema.ts index 29143048a4..fca47a82aa 100644 --- a/src/routes/delegates/entities/schemas/create-delegate.dto.schema.ts +++ b/src/routes/delegates/entities/schemas/create-delegate.dto.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { CreateDelegateDto } from '../create-delegate.dto.entity'; +import { CreateDelegateDto } from '@/routes/delegates/entities/create-delegate.dto.entity'; export const CREATE_DELEGATE_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/delegates/create-delegate.dto.json'; diff --git a/src/routes/delegates/entities/schemas/delete-delegate.dto.schema.ts b/src/routes/delegates/entities/schemas/delete-delegate.dto.schema.ts index ff802c6a5a..f592486294 100644 --- a/src/routes/delegates/entities/schemas/delete-delegate.dto.schema.ts +++ b/src/routes/delegates/entities/schemas/delete-delegate.dto.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { DeleteDelegateDto } from '../delete-delegate.dto.entity'; +import { DeleteDelegateDto } from '@/routes/delegates/entities/delete-delegate.dto.entity'; export const DELETE_DELEGATE_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/delegates/delete-delegate.dto.json'; diff --git a/src/routes/delegates/entities/schemas/delete-safe-delegate.dto.schema.ts b/src/routes/delegates/entities/schemas/delete-safe-delegate.dto.schema.ts index f1f9126a7d..e93c63ba96 100644 --- a/src/routes/delegates/entities/schemas/delete-safe-delegate.dto.schema.ts +++ b/src/routes/delegates/entities/schemas/delete-safe-delegate.dto.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { DeleteSafeDelegateDto } from '../delete-safe-delegate.dto.entity'; +import { DeleteSafeDelegateDto } from '@/routes/delegates/entities/delete-safe-delegate.dto.entity'; export const DELETE_SAFE_DELEGATE_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/delegates/delete-safe-delegate.dto.json'; diff --git a/src/routes/delegates/entities/schemas/get-delegate.dto.schema.ts b/src/routes/delegates/entities/schemas/get-delegate.dto.schema.ts index 30dd65e588..38c4e23f6c 100644 --- a/src/routes/delegates/entities/schemas/get-delegate.dto.schema.ts +++ b/src/routes/delegates/entities/schemas/get-delegate.dto.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { GetDelegateDto } from '../get-delegate.dto.entity'; +import { GetDelegateDto } from '@/routes/delegates/entities/get-delegate.dto.entity'; export const GET_DELEGATE_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/delegates/get-delegate.dto.json'; diff --git a/src/routes/delegates/pipes/create-delegate.dto.validation.pipe.ts b/src/routes/delegates/pipes/create-delegate.dto.validation.pipe.ts index 4d9e036da0..c96e1376db 100644 --- a/src/routes/delegates/pipes/create-delegate.dto.validation.pipe.ts +++ b/src/routes/delegates/pipes/create-delegate.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { CreateDelegateDto } from '../entities/create-delegate.dto.entity'; +import { CreateDelegateDto } from '@/routes/delegates/entities/create-delegate.dto.entity'; import { CREATE_DELEGATE_DTO_SCHEMA_ID, createDelegateDtoSchema, -} from '../entities/schemas/create-delegate.dto.schema'; +} from '@/routes/delegates/entities/schemas/create-delegate.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class CreateDelegateDtoValidationPipe diff --git a/src/routes/delegates/pipes/delete-delegate.dto.validation.pipe.ts b/src/routes/delegates/pipes/delete-delegate.dto.validation.pipe.ts index 796c90088f..a205485ce4 100644 --- a/src/routes/delegates/pipes/delete-delegate.dto.validation.pipe.ts +++ b/src/routes/delegates/pipes/delete-delegate.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { DeleteDelegateDto } from '../entities/delete-delegate.dto.entity'; +import { DeleteDelegateDto } from '@/routes/delegates/entities/delete-delegate.dto.entity'; import { DELETE_DELEGATE_DTO_SCHEMA_ID, deleteDelegateDtoSchema, -} from '../entities/schemas/delete-delegate.dto.schema'; +} from '@/routes/delegates/entities/schemas/delete-delegate.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class DeleteDelegateDtoValidationPipe diff --git a/src/routes/delegates/pipes/delete-safe-delegate.dto.validation.pipe.ts b/src/routes/delegates/pipes/delete-safe-delegate.dto.validation.pipe.ts index ccfb6e6f79..fdf2ff5df5 100644 --- a/src/routes/delegates/pipes/delete-safe-delegate.dto.validation.pipe.ts +++ b/src/routes/delegates/pipes/delete-safe-delegate.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { DeleteSafeDelegateDto } from '../entities/delete-safe-delegate.dto.entity'; +import { DeleteSafeDelegateDto } from '@/routes/delegates/entities/delete-safe-delegate.dto.entity'; import { DELETE_SAFE_DELEGATE_DTO_SCHEMA_ID, deleteSafeDelegateDtoSchema, -} from '../entities/schemas/delete-safe-delegate.dto.schema'; +} from '@/routes/delegates/entities/schemas/delete-safe-delegate.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class DeleteSafeDelegateDtoValidationPipe diff --git a/src/routes/delegates/pipes/get-delegate.dto.validation.pipe.ts b/src/routes/delegates/pipes/get-delegate.dto.validation.pipe.ts index 8f85b407e9..8739785d71 100644 --- a/src/routes/delegates/pipes/get-delegate.dto.validation.pipe.ts +++ b/src/routes/delegates/pipes/get-delegate.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { GetDelegateDto } from '../entities/get-delegate.dto.entity'; +import { GetDelegateDto } from '@/routes/delegates/entities/get-delegate.dto.entity'; import { GET_DELEGATE_DTO_SCHEMA_ID, getDelegateDtoSchema, -} from '../entities/schemas/get-delegate.dto.schema'; +} from '@/routes/delegates/entities/schemas/get-delegate.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class GetDelegateDtoValidationPipe diff --git a/src/routes/estimations/entities/get-estimation.dto.entity.ts b/src/routes/estimations/entities/get-estimation.dto.entity.ts index b5f393f4d5..d980332df0 100644 --- a/src/routes/estimations/entities/get-estimation.dto.entity.ts +++ b/src/routes/estimations/entities/get-estimation.dto.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { GetEstimationDto as DomainGetEstimationDto } from '../../../domain/estimations/entities/get-estimation.dto.entity'; +import { GetEstimationDto as DomainGetEstimationDto } from '@/domain/estimations/entities/get-estimation.dto.entity'; import { Operation } from '@/domain/safe/entities/operation.entity'; export class GetEstimationDto implements DomainGetEstimationDto { diff --git a/src/routes/estimations/entities/schemas/get-estimation.dto.schema.ts b/src/routes/estimations/entities/schemas/get-estimation.dto.schema.ts index ee9c7969fc..591bb3bb13 100644 --- a/src/routes/estimations/entities/schemas/get-estimation.dto.schema.ts +++ b/src/routes/estimations/entities/schemas/get-estimation.dto.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { GetEstimationDto } from '../get-estimation.dto.entity'; +import { GetEstimationDto } from '@/routes/estimations/entities/get-estimation.dto.entity'; export const GET_ESTIMATION_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/estimations/get-estimation.dto.json'; diff --git a/src/routes/estimations/estimations.controller.spec.ts b/src/routes/estimations/estimations.controller.spec.ts index 16f51079dc..90c4145cce 100644 --- a/src/routes/estimations/estimations.controller.spec.ts +++ b/src/routes/estimations/estimations.controller.spec.ts @@ -13,11 +13,11 @@ import { estimationBuilder } from '@/domain/estimations/entities/__tests__/estim import { multisigTransactionBuilder, toJson as multisigTransactionToJson, -} from '../../domain/safe/entities/__tests__/multisig-transaction.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; diff --git a/src/routes/estimations/estimations.controller.ts b/src/routes/estimations/estimations.controller.ts index ea38101ff2..8f788a3e5f 100644 --- a/src/routes/estimations/estimations.controller.ts +++ b/src/routes/estimations/estimations.controller.ts @@ -1,9 +1,9 @@ import { Body, Controller, HttpCode, Param, Post } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; -import { EstimationResponse } from './entities/estimation-response.entity'; -import { GetEstimationDto } from './entities/get-estimation.dto.entity'; -import { EstimationsService } from './estimations.service'; -import { GetEstimationDtoValidationPipe } from './pipes/get-estimation.dto.validation.pipe'; +import { EstimationResponse } from '@/routes/estimations/entities/estimation-response.entity'; +import { GetEstimationDto } from '@/routes/estimations/entities/get-estimation.dto.entity'; +import { EstimationsService } from '@/routes/estimations/estimations.service'; +import { GetEstimationDtoValidationPipe } from '@/routes/estimations/pipes/get-estimation.dto.validation.pipe'; @ApiTags('estimations') @Controller({ diff --git a/src/routes/estimations/estimations.module.ts b/src/routes/estimations/estimations.module.ts index f9412b8b51..c7ca829dec 100644 --- a/src/routes/estimations/estimations.module.ts +++ b/src/routes/estimations/estimations.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { EstimationsController } from './estimations.controller'; -import { EstimationsService } from './estimations.service'; +import { EstimationsController } from '@/routes/estimations/estimations.controller'; +import { EstimationsService } from '@/routes/estimations/estimations.service'; @Module({ controllers: [EstimationsController], diff --git a/src/routes/estimations/estimations.service.ts b/src/routes/estimations/estimations.service.ts index 5800ce21ee..e3a5f8be11 100644 --- a/src/routes/estimations/estimations.service.ts +++ b/src/routes/estimations/estimations.service.ts @@ -4,7 +4,7 @@ import { EstimationsRepository } from '@/domain/estimations/estimations.reposito import { IEstimationsRepository } from '@/domain/estimations/estimations.repository.interface'; import { SafeRepository } from '@/domain/safe/safe.repository'; import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; -import { EstimationResponse } from './entities/estimation-response.entity'; +import { EstimationResponse } from '@/routes/estimations/entities/estimation-response.entity'; @Injectable() export class EstimationsService { diff --git a/src/routes/estimations/pipes/get-estimation.dto.validation.pipe.ts b/src/routes/estimations/pipes/get-estimation.dto.validation.pipe.ts index c5f2ea0639..83fa6ef724 100644 --- a/src/routes/estimations/pipes/get-estimation.dto.validation.pipe.ts +++ b/src/routes/estimations/pipes/get-estimation.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { GetEstimationDto } from '../entities/get-estimation.dto.entity'; +import { GetEstimationDto } from '@/domain/estimations/entities/get-estimation.dto.entity'; import { GET_ESTIMATION_DTO_SCHEMA_ID, getEstimationDtoSchema, -} from '../entities/schemas/get-estimation.dto.schema'; +} from '@/routes/estimations/entities/schemas/get-estimation.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class GetEstimationDtoValidationPipe diff --git a/src/routes/flush/entities/__tests__/invalidation-pattern-details.dto.builder.ts b/src/routes/flush/entities/__tests__/invalidation-pattern-details.dto.builder.ts index ccc2fdc5f0..9ba06866fc 100644 --- a/src/routes/flush/entities/__tests__/invalidation-pattern-details.dto.builder.ts +++ b/src/routes/flush/entities/__tests__/invalidation-pattern-details.dto.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { InvalidationPatternDetails } from '../invalidation-pattern.dto.entity'; +import { InvalidationPatternDetails } from '@/routes/flush/entities/invalidation-pattern.dto.entity'; export function invalidationPatternDetailsBuilder(): IBuilder { return Builder.new().with( diff --git a/src/routes/flush/entities/__tests__/invalidation-pattern.dto.builder.ts b/src/routes/flush/entities/__tests__/invalidation-pattern.dto.builder.ts index 53d26996d3..f7fd610150 100644 --- a/src/routes/flush/entities/__tests__/invalidation-pattern.dto.builder.ts +++ b/src/routes/flush/entities/__tests__/invalidation-pattern.dto.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { InvalidationPatternDto } from '../invalidation-pattern.dto.entity'; -import { invalidationPatternDetailsBuilder } from './invalidation-pattern-details.dto.builder'; +import { invalidationPatternDetailsBuilder } from '@/routes/flush/entities/__tests__/invalidation-pattern-details.dto.builder'; +import { InvalidationPatternDto } from '@/routes/flush/entities/invalidation-pattern.dto.entity'; export function invalidationPatternDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/flush/flush.controller.spec.ts b/src/routes/flush/flush.controller.spec.ts index faf7a8102b..593cc47fdd 100644 --- a/src/routes/flush/flush.controller.spec.ts +++ b/src/routes/flush/flush.controller.spec.ts @@ -7,9 +7,8 @@ import { TestNetworkModule } from '@/datasources/network/__tests__/test.network. import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { pageBuilder } from '@/domain/entities/__tests__/page.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; -import { invalidationPatternDtoBuilder } from './entities/__tests__/invalidation-pattern.dto.builder'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { FakeCacheService } from '@/datasources/cache/__tests__/fake.cache.service'; import { CacheService } from '@/datasources/cache/cache.service.interface'; @@ -18,6 +17,7 @@ import { CacheModule } from '@/datasources/cache/cache.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; import { NetworkModule } from '@/datasources/network/network.module'; import { NetworkService } from '@/datasources/network/network.service.interface'; +import { invalidationPatternDtoBuilder } from '@/routes/flush/entities/__tests__/invalidation-pattern.dto.builder'; describe('Flush Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/flush/flush.controller.ts b/src/routes/flush/flush.controller.ts index 56754935ac..21ddbd3d40 100644 --- a/src/routes/flush/flush.controller.ts +++ b/src/routes/flush/flush.controller.ts @@ -1,9 +1,9 @@ import { Body, Controller, HttpCode, Post, UseGuards } from '@nestjs/common'; import { ApiExcludeController, ApiOkResponse } from '@nestjs/swagger'; -import { BasicAuthGuard } from '../common/auth/basic-auth.guard'; -import { InvalidationPatternDto } from './entities/invalidation-pattern.dto.entity'; -import { FlushService } from './flush.service'; -import { InvalidationPatternDtoValidationPipe } from './pipes/invalidation-pattern.dto.validation.pipe'; +import { BasicAuthGuard } from '@/routes/common/auth/basic-auth.guard'; +import { InvalidationPatternDto } from '@/routes/flush/entities/invalidation-pattern.dto.entity'; +import { FlushService } from '@/routes/flush/flush.service'; +import { InvalidationPatternDtoValidationPipe } from '@/routes/flush/pipes/invalidation-pattern.dto.validation.pipe'; @Controller({ path: '', diff --git a/src/routes/flush/flush.module.ts b/src/routes/flush/flush.module.ts index a97201249b..cf1188a090 100644 --- a/src/routes/flush/flush.module.ts +++ b/src/routes/flush/flush.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { FlushController } from './flush.controller'; -import { FlushService } from './flush.service'; +import { FlushController } from '@/routes/flush/flush.controller'; +import { FlushService } from '@/routes/flush/flush.service'; @Module({ controllers: [FlushController], diff --git a/src/routes/flush/flush.service.ts b/src/routes/flush/flush.service.ts index 723a13b4d7..f1d3ab236a 100644 --- a/src/routes/flush/flush.service.ts +++ b/src/routes/flush/flush.service.ts @@ -2,10 +2,10 @@ import { Inject, Injectable } from '@nestjs/common'; import { InvalidationPatternDetails, InvalidationPatternDto as DomainInvalidationPatternDto, -} from '../../domain/flush/entities/invalidation-pattern.dto.entity'; +} from '@/domain/flush/entities/invalidation-pattern.dto.entity'; import { FlushRepository } from '@/domain/flush/flush.repository'; import { IFlushRepository } from '@/domain/flush/flush.repository.interface'; -import { InvalidationPatternDto } from './entities/invalidation-pattern.dto.entity'; +import { InvalidationPatternDto } from '@/routes/flush/entities/invalidation-pattern.dto.entity'; @Injectable() export class FlushService { diff --git a/src/routes/flush/pipes/invalidation-pattern.dto.validation.pipe.ts b/src/routes/flush/pipes/invalidation-pattern.dto.validation.pipe.ts index 9eccda692c..a9182d76ac 100644 --- a/src/routes/flush/pipes/invalidation-pattern.dto.validation.pipe.ts +++ b/src/routes/flush/pipes/invalidation-pattern.dto.validation.pipe.ts @@ -1,14 +1,14 @@ -import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; -import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { InvalidationPatternDto } from '../entities/invalidation-pattern.dto.entity'; +import { InvalidationPatternDto } from '@/routes/flush/entities/invalidation-pattern.dto.entity'; import { INVALIDATION_PATTERN_DETAIL_SCHEMA_ID, INVALIDATION_PATTERN_DTO_SCHEMA_ID, invalidationPatternDetailSchema, invalidationPatternDtoSchema, -} from '../entities/schemas/invalidation-pattern.dto.schema'; +} from '@/routes/flush/entities/schemas/invalidation-pattern.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; +import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; +import { ValidateFunction } from 'ajv'; @Injectable() export class InvalidationPatternDtoValidationPipe diff --git a/src/routes/health/health.controller.spec.ts b/src/routes/health/health.controller.spec.ts index 6553d60cb2..f4202ba4ff 100644 --- a/src/routes/health/health.controller.spec.ts +++ b/src/routes/health/health.controller.spec.ts @@ -3,7 +3,7 @@ import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; import { TestCacheModule } from '@/datasources/cache/__tests__/test.cache.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { NetworkModule } from '@/datasources/network/network.module'; diff --git a/src/routes/health/health.controller.ts b/src/routes/health/health.controller.ts index 5c020750f4..e465407ccc 100644 --- a/src/routes/health/health.controller.ts +++ b/src/routes/health/health.controller.ts @@ -1,7 +1,7 @@ import { Controller, Get } from '@nestjs/common'; import { ApiExcludeController, ApiOkResponse } from '@nestjs/swagger'; -import { Health, HealthStatus } from './entities/health.entity'; -import { HealthService } from './health.service'; +import { Health, HealthStatus } from '@/routes/health/entities/health.entity'; +import { HealthService } from '@/routes/health/health.service'; @Controller({ path: 'health' }) @ApiExcludeController() diff --git a/src/routes/health/health.module.ts b/src/routes/health/health.module.ts index 79af239dd1..e5f0ae2231 100644 --- a/src/routes/health/health.module.ts +++ b/src/routes/health/health.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { HealthController } from './health.controller'; -import { HealthService } from './health.service'; +import { HealthController } from '@/routes/health/health.controller'; +import { HealthService } from '@/routes/health/health.service'; @Module({ controllers: [HealthController], diff --git a/src/routes/health/health.service.ts b/src/routes/health/health.service.ts index d72830c09e..8c180dee80 100644 --- a/src/routes/health/health.service.ts +++ b/src/routes/health/health.service.ts @@ -3,10 +3,10 @@ import { Injectable, ServiceUnavailableException, } from '@nestjs/common'; -import { IHealthRepository } from '@/domain/health/health.repository.interface'; import { HealthEntity } from '@/domain/health/entities/health.entity'; -import { Health, HealthStatus } from './entities/health.entity'; +import { IHealthRepository } from '@/domain/health/health.repository.interface'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; +import { Health, HealthStatus } from '@/routes/health/entities/health.entity'; @Injectable() export class HealthService { diff --git a/src/routes/messages/entities/__tests__/create-message.dto.builder.ts b/src/routes/messages/entities/__tests__/create-message.dto.builder.ts index 9b73d93cc3..28cd8732f2 100644 --- a/src/routes/messages/entities/__tests__/create-message.dto.builder.ts +++ b/src/routes/messages/entities/__tests__/create-message.dto.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; import { random } from 'lodash'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { CreateMessageDto } from '../create-message.dto.entity'; +import { CreateMessageDto } from '@/routes/messages/entities/create-message.dto.entity'; export function createMessageDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/messages/entities/__tests__/update-message-signature.dto.builder.ts b/src/routes/messages/entities/__tests__/update-message-signature.dto.builder.ts index f4be12cb77..60d4b55d8d 100644 --- a/src/routes/messages/entities/__tests__/update-message-signature.dto.builder.ts +++ b/src/routes/messages/entities/__tests__/update-message-signature.dto.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { UpdateMessageSignatureDto } from '../update-message-signature.entity'; +import { UpdateMessageSignatureDto } from '@/routes/messages/entities/update-message-signature.entity'; export function updateMessageSignatureDtoBuilder(): IBuilder { return Builder.new().with( diff --git a/src/routes/messages/entities/message-confirmation.entity.ts b/src/routes/messages/entities/message-confirmation.entity.ts index c8f0855b5e..06efba8d7a 100644 --- a/src/routes/messages/entities/message-confirmation.entity.ts +++ b/src/routes/messages/entities/message-confirmation.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../common/entities/address-info.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; export class MessageConfirmation { @ApiProperty() diff --git a/src/routes/messages/entities/message-item.entity.ts b/src/routes/messages/entities/message-item.entity.ts index 39201cda29..0908ae4f8d 100644 --- a/src/routes/messages/entities/message-item.entity.ts +++ b/src/routes/messages/entities/message-item.entity.ts @@ -1,5 +1,5 @@ +import { Message } from '@/routes/messages/entities/message.entity'; import { ApiProperty } from '@nestjs/swagger'; -import { Message } from './message.entity'; export class MessageItem extends Message { @ApiProperty() diff --git a/src/routes/messages/entities/message.entity.ts b/src/routes/messages/entities/message.entity.ts index 08540dcd17..d7fbf2c45f 100644 --- a/src/routes/messages/entities/message.entity.ts +++ b/src/routes/messages/entities/message.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { AddressInfo } from '../../common/entities/address-info.entity'; -import { MessageConfirmation } from './message-confirmation.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { MessageConfirmation } from '@/routes/messages/entities/message-confirmation.entity'; export enum MessageStatus { NeedsConfirmation = 'NEEDS_CONFIRMATION', diff --git a/src/routes/messages/entities/messages-page.entity.ts b/src/routes/messages/entities/messages-page.entity.ts index a1bbc61158..5276eb3dc1 100644 --- a/src/routes/messages/entities/messages-page.entity.ts +++ b/src/routes/messages/entities/messages-page.entity.ts @@ -1,7 +1,7 @@ import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger'; -import { DateLabel } from '../../common/entities/date-label.entity'; -import { Page } from '../../common/entities/page.entity'; -import { MessageItem } from './message-item.entity'; +import { DateLabel } from '@/routes/common/entities/date-label.entity'; +import { Page } from '@/routes/common/entities/page.entity'; +import { MessageItem } from '@/routes/messages/entities/message-item.entity'; @ApiExtraModels(MessageItem, DateLabel) export class MessagePage extends Page { diff --git a/src/routes/messages/entities/schemas/update-message-signature.dto.schema.ts b/src/routes/messages/entities/schemas/update-message-signature.dto.schema.ts index 7c29536e73..0bfd6cb743 100644 --- a/src/routes/messages/entities/schemas/update-message-signature.dto.schema.ts +++ b/src/routes/messages/entities/schemas/update-message-signature.dto.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { UpdateMessageSignatureDto } from '../update-message-signature.entity'; +import { UpdateMessageSignatureDto } from '@/routes/messages/entities/update-message-signature.entity'; export const UPDATE_MESSAGE_SIGNATURE_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/messages/update-message-signature.dto.json'; diff --git a/src/routes/messages/mappers/message-mapper.ts b/src/routes/messages/mappers/message-mapper.ts index 6dd7803278..3ea4ee16ba 100644 --- a/src/routes/messages/mappers/message-mapper.ts +++ b/src/routes/messages/mappers/message-mapper.ts @@ -1,13 +1,16 @@ import { Inject, Injectable } from '@nestjs/common'; -import { MessageConfirmation as DomainMessageConfirmation } from '../../../domain/messages/entities/message-confirmation.entity'; -import { Message as DomainMessage } from '../../../domain/messages/entities/message.entity'; +import { MessageConfirmation as DomainMessageConfirmation } from '@/domain/messages/entities/message-confirmation.entity'; +import { Message as DomainMessage } from '@/domain/messages/entities/message.entity'; import { SafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository'; import { ISafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository.interface'; import { Safe } from '@/domain/safe/entities/safe.entity'; -import { AddressInfoHelper } from '../../common/address-info/address-info.helper'; -import { MessageConfirmation } from '../entities/message-confirmation.entity'; -import { MessageItem } from '../entities/message-item.entity'; -import { Message, MessageStatus } from '../entities/message.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { MessageConfirmation } from '@/routes/messages/entities/message-confirmation.entity'; +import { MessageItem } from '@/routes/messages/entities/message-item.entity'; +import { + MessageStatus, + Message, +} from '@/routes/messages/entities/message.entity'; @Injectable() export class MessageMapper { diff --git a/src/routes/messages/messages.controller.spec.ts b/src/routes/messages/messages.controller.spec.ts index 2b9d1fb9d3..f6dfb2f577 100644 --- a/src/routes/messages/messages.controller.spec.ts +++ b/src/routes/messages/messages.controller.spec.ts @@ -12,21 +12,21 @@ import { messageConfirmationBuilder } from '@/domain/messages/entities/__tests__ import { messageBuilder, toJson as messageToJson, -} from '../../domain/messages/entities/__tests__/message.builder'; +} from '@/domain/messages/entities/__tests__/message.builder'; import { safeAppBuilder } from '@/domain/safe-apps/entities/__tests__/safe-app.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; -import { MessageStatus } from './entities/message.entity'; -import { createMessageDtoBuilder } from './entities/__tests__/create-message.dto.builder'; -import { updateMessageSignatureDtoBuilder } from './entities/__tests__/update-message-signature.dto.builder'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; import { NetworkModule } from '@/datasources/network/network.module'; import { NetworkService } from '@/datasources/network/network.service.interface'; +import { createMessageDtoBuilder } from '@/routes/messages/entities/__tests__/create-message.dto.builder'; +import { updateMessageSignatureDtoBuilder } from '@/routes/messages/entities/__tests__/update-message-signature.dto.builder'; +import { MessageStatus } from '@/routes/messages/entities/message.entity'; describe('Messages controller', () => { let app: INestApplication; diff --git a/src/routes/messages/messages.controller.ts b/src/routes/messages/messages.controller.ts index e5204d06a2..46f3865e57 100644 --- a/src/routes/messages/messages.controller.ts +++ b/src/routes/messages/messages.controller.ts @@ -1,18 +1,18 @@ import { Body, Controller, Get, HttpCode, Param, Post } from '@nestjs/common'; import { ApiOkResponse, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { PaginationDataDecorator } from '../common/decorators/pagination.data.decorator'; -import { RouteUrlDecorator } from '../common/decorators/route.url.decorator'; -import { DateLabel } from '../common/entities/date-label.entity'; -import { Page } from '../common/entities/page.entity'; -import { PaginationData } from '../common/pagination/pagination.data'; -import { CreateMessageDto } from './entities/create-message.dto.entity'; -import { MessageItem } from './entities/message-item.entity'; -import { Message } from './entities/message.entity'; -import { MessagePage } from './entities/messages-page.entity'; -import { UpdateMessageSignatureDto } from './entities/update-message-signature.entity'; -import { MessagesService } from './messages.service'; -import { CreateMessageDtoValidationPipe } from './pipes/create-message.dto.validation.pipe'; -import { UpdateMessageSignatureDtoValidationPipe } from './pipes/update-message-signature.dto.validation.pipe'; +import { PaginationDataDecorator } from '@/routes/common/decorators/pagination.data.decorator'; +import { RouteUrlDecorator } from '@/routes/common/decorators/route.url.decorator'; +import { DateLabel } from '@/routes/common/entities/date-label.entity'; +import { Page } from '@/routes/common/entities/page.entity'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; +import { CreateMessageDto } from '@/routes/messages/entities/create-message.dto.entity'; +import { MessageItem } from '@/routes/messages/entities/message-item.entity'; +import { Message } from '@/routes/messages/entities/message.entity'; +import { MessagePage } from '@/routes/messages/entities/messages-page.entity'; +import { UpdateMessageSignatureDto } from '@/routes/messages/entities/update-message-signature.entity'; +import { MessagesService } from '@/routes/messages/messages.service'; +import { CreateMessageDtoValidationPipe } from '@/routes/messages/pipes/create-message.dto.validation.pipe'; +import { UpdateMessageSignatureDtoValidationPipe } from '@/routes/messages/pipes/update-message-signature.dto.validation.pipe'; @ApiTags('messages') @Controller({ diff --git a/src/routes/messages/messages.module.ts b/src/routes/messages/messages.module.ts index 3883003f19..ba9c9b9998 100644 --- a/src/routes/messages/messages.module.ts +++ b/src/routes/messages/messages.module.ts @@ -1,8 +1,8 @@ import { Module } from '@nestjs/common'; -import { AddressInfoModule } from '../common/address-info/address-info.module'; -import { MessageMapper } from './mappers/message-mapper'; -import { MessagesController } from './messages.controller'; -import { MessagesService } from './messages.service'; +import { AddressInfoModule } from '@/routes/common/address-info/address-info.module'; +import { MessageMapper } from '@/routes/messages/mappers/message-mapper'; +import { MessagesController } from '@/routes/messages/messages.controller'; +import { MessagesService } from '@/routes/messages/messages.service'; @Module({ controllers: [MessagesController], diff --git a/src/routes/messages/messages.service.ts b/src/routes/messages/messages.service.ts index e72639aa91..2b306cbe0c 100644 --- a/src/routes/messages/messages.service.ts +++ b/src/routes/messages/messages.service.ts @@ -1,21 +1,21 @@ import { Inject, Injectable } from '@nestjs/common'; import { groupBy } from 'lodash'; -import { Message as DomainMessage } from '../../domain/messages/entities/message.entity'; +import { Message as DomainMessage } from '@/domain/messages/entities/message.entity'; import { MessagesRepository } from '@/domain/messages/messages.repository'; import { IMessagesRepository } from '@/domain/messages/messages.repository.interface'; import { SafeRepository } from '@/domain/safe/safe.repository'; import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; -import { DateLabel } from '../common/entities/date-label.entity'; -import { Page } from '../common/entities/page.entity'; +import { DateLabel } from '@/routes/common/entities/date-label.entity'; +import { Page } from '@/routes/common/entities/page.entity'; import { - cursorUrlFromLimitAndOffset, PaginationData, -} from '../common/pagination/pagination.data'; -import { CreateMessageDto } from './entities/create-message.dto.entity'; -import { MessageItem } from './entities/message-item.entity'; -import { Message } from './entities/message.entity'; -import { UpdateMessageSignatureDto } from './entities/update-message-signature.entity'; -import { MessageMapper } from './mappers/message-mapper'; + cursorUrlFromLimitAndOffset, +} from '@/routes/common/pagination/pagination.data'; +import { CreateMessageDto } from '@/routes/messages/entities/create-message.dto.entity'; +import { MessageItem } from '@/routes/messages/entities/message-item.entity'; +import { Message } from '@/routes/messages/entities/message.entity'; +import { UpdateMessageSignatureDto } from '@/routes/messages/entities/update-message-signature.entity'; +import { MessageMapper } from '@/routes/messages/mappers/message-mapper'; @Injectable() export class MessagesService { diff --git a/src/routes/messages/pipes/create-message.dto.validation.pipe.ts b/src/routes/messages/pipes/create-message.dto.validation.pipe.ts index 28d5bd0ef4..575fc20355 100644 --- a/src/routes/messages/pipes/create-message.dto.validation.pipe.ts +++ b/src/routes/messages/pipes/create-message.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { CreateMessageDto } from '../entities/create-message.dto.entity'; +import { CreateMessageDto } from '@/routes/messages/entities/create-message.dto.entity'; import { CREATE_MESSAGE_DTO_SCHEMA_ID, createMessageDtoSchema, -} from '../entities/schemas/create-message.dto.schema'; +} from '@/routes/messages/entities/schemas/create-message.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class CreateMessageDtoValidationPipe diff --git a/src/routes/messages/pipes/update-message-signature.dto.validation.pipe.ts b/src/routes/messages/pipes/update-message-signature.dto.validation.pipe.ts index a11d11478b..25a3d1e7f7 100644 --- a/src/routes/messages/pipes/update-message-signature.dto.validation.pipe.ts +++ b/src/routes/messages/pipes/update-message-signature.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; import { UPDATE_MESSAGE_SIGNATURE_DTO_SCHEMA_ID, updateMessageSignatureDtoSchema, -} from '../entities/schemas/update-message-signature.dto.schema'; -import { UpdateMessageSignatureDto } from '../entities/update-message-signature.entity'; +} from '@/routes/messages/entities/schemas/update-message-signature.dto.schema'; +import { UpdateMessageSignatureDto } from '@/routes/messages/entities/update-message-signature.entity'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class UpdateMessageSignatureDtoValidationPipe diff --git a/src/routes/notifications/entities/__tests__/register-device.dto.builder.ts b/src/routes/notifications/entities/__tests__/register-device.dto.builder.ts index a2bd5d58b5..caba015383 100644 --- a/src/routes/notifications/entities/__tests__/register-device.dto.builder.ts +++ b/src/routes/notifications/entities/__tests__/register-device.dto.builder.ts @@ -2,8 +2,8 @@ import { faker } from '@faker-js/faker'; import { random, range, sample } from 'lodash'; import { DeviceType } from '@/domain/notifications/entities/device.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { RegisterDeviceDto } from '../register-device.dto.entity'; -import { safeRegistrationBuilder } from './safe-registration.builder'; +import { RegisterDeviceDto } from '@/routes/notifications/entities/register-device.dto.entity'; +import { safeRegistrationBuilder } from '@/routes/notifications/entities/__tests__/safe-registration.builder'; export function registerDeviceDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/notifications/entities/__tests__/safe-registration.builder.ts b/src/routes/notifications/entities/__tests__/safe-registration.builder.ts index e5d601d330..d40a9ea005 100644 --- a/src/routes/notifications/entities/__tests__/safe-registration.builder.ts +++ b/src/routes/notifications/entities/__tests__/safe-registration.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; import { random, range } from 'lodash'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { SafeRegistration } from '../safe-registration.entity'; +import { SafeRegistration } from '@/routes/notifications/entities/safe-registration.entity'; export function safeRegistrationBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/notifications/entities/register-device.dto.entity.ts b/src/routes/notifications/entities/register-device.dto.entity.ts index fc49807398..ea9d14e475 100644 --- a/src/routes/notifications/entities/register-device.dto.entity.ts +++ b/src/routes/notifications/entities/register-device.dto.entity.ts @@ -5,7 +5,7 @@ import { getSchemaPath, } from '@nestjs/swagger'; import { DeviceType } from '@/domain/notifications/entities/device.entity'; -import { SafeRegistration } from './safe-registration.entity'; +import { SafeRegistration } from '@/routes/notifications/entities/safe-registration.entity'; @ApiExtraModels(SafeRegistration) export class RegisterDeviceDto { diff --git a/src/routes/notifications/notifications.controller.spec.ts b/src/routes/notifications/notifications.controller.spec.ts index 8903e52522..0d68e92135 100644 --- a/src/routes/notifications/notifications.controller.spec.ts +++ b/src/routes/notifications/notifications.controller.spec.ts @@ -9,16 +9,16 @@ import { NetworkResponseError } from '@/datasources/network/entities/network.err import { TestNetworkModule } from '@/datasources/network/__tests__/test.network.module'; import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; -import { registerDeviceDtoBuilder } from './entities/__tests__/register-device.dto.builder'; -import { safeRegistrationBuilder } from './entities/__tests__/safe-registration.builder'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; import { NetworkModule } from '@/datasources/network/network.module'; import { NetworkService } from '@/datasources/network/network.service.interface'; +import { registerDeviceDtoBuilder } from '@/routes/notifications/entities/__tests__/register-device.dto.builder'; +import { safeRegistrationBuilder } from '@/routes/notifications/entities/__tests__/safe-registration.builder'; describe('Notifications Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/notifications/notifications.controller.ts b/src/routes/notifications/notifications.controller.ts index 4913984e00..50c90dddab 100644 --- a/src/routes/notifications/notifications.controller.ts +++ b/src/routes/notifications/notifications.controller.ts @@ -7,8 +7,8 @@ import { Post, } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; -import { RegisterDeviceDto } from './entities/register-device.dto.entity'; -import { NotificationsService } from './notifications.service'; +import { RegisterDeviceDto } from '@/routes/notifications/entities/register-device.dto.entity'; +import { NotificationsService } from '@/routes/notifications/notifications.service'; @ApiTags('notifications') @Controller({ path: '', version: '1' }) diff --git a/src/routes/notifications/notifications.module.ts b/src/routes/notifications/notifications.module.ts index 28914c2e88..eed7d8833e 100644 --- a/src/routes/notifications/notifications.module.ts +++ b/src/routes/notifications/notifications.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { NotificationsController } from './notifications.controller'; -import { NotificationsService } from './notifications.service'; +import { NotificationsController } from '@/routes/notifications/notifications.controller'; +import { NotificationsService } from '@/routes/notifications/notifications.service'; @Module({ controllers: [NotificationsController], diff --git a/src/routes/notifications/notifications.service.ts b/src/routes/notifications/notifications.service.ts index e8abda2630..b26dd2cfaf 100644 --- a/src/routes/notifications/notifications.service.ts +++ b/src/routes/notifications/notifications.service.ts @@ -6,10 +6,10 @@ import { } from '@nestjs/common'; import { inRange } from 'lodash'; import { Device } from '@/domain/notifications/entities/device.entity'; -import { SafeRegistration as DomainSafeRegistration } from '../../domain/notifications/entities/safe-registration.entity'; +import { SafeRegistration as DomainSafeRegistration } from '@/domain/notifications/entities/safe-registration.entity'; import { INotificationsRepository } from '@/domain/notifications/notifications.repository.interface'; -import { RegisterDeviceDto } from './entities/register-device.dto.entity'; -import { SafeRegistration } from './entities/safe-registration.entity'; +import { RegisterDeviceDto } from '@/routes/notifications/entities/register-device.dto.entity'; +import { SafeRegistration } from '@/routes/notifications/entities/safe-registration.entity'; @Injectable() export class NotificationsService { diff --git a/src/routes/owners/entities/safe-list.entity.ts b/src/routes/owners/entities/safe-list.entity.ts index 2071be86ca..8a51139c34 100644 --- a/src/routes/owners/entities/safe-list.entity.ts +++ b/src/routes/owners/entities/safe-list.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { SafeList as DomainSafeList } from '../../../domain/safe/entities/safe-list.entity'; +import { SafeList as DomainSafeList } from '@/domain/safe/entities/safe-list.entity'; export class SafeList implements DomainSafeList { @ApiProperty() diff --git a/src/routes/owners/owners.controller.spec.ts b/src/routes/owners/owners.controller.spec.ts index 631eab5236..a85abaa0fd 100644 --- a/src/routes/owners/owners.controller.spec.ts +++ b/src/routes/owners/owners.controller.spec.ts @@ -8,7 +8,7 @@ import { TestNetworkModule } from '@/datasources/network/__tests__/test.network. import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { NetworkService } from '@/datasources/network/network.service.interface'; import { AppModule, configurationModule } from '@/app.module'; diff --git a/src/routes/owners/owners.controller.ts b/src/routes/owners/owners.controller.ts index 7e1a333cd1..daf46c9210 100644 --- a/src/routes/owners/owners.controller.ts +++ b/src/routes/owners/owners.controller.ts @@ -1,7 +1,7 @@ import { Controller, Get, Param } from '@nestjs/common'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; -import { SafeList } from './entities/safe-list.entity'; -import { OwnersService } from './owners.service'; +import { SafeList } from '@/routes/owners/entities/safe-list.entity'; +import { OwnersService } from '@/routes/owners/owners.service'; @ApiTags('owners') @Controller({ diff --git a/src/routes/owners/owners.module.ts b/src/routes/owners/owners.module.ts index ea5fd0b843..e6d293b175 100644 --- a/src/routes/owners/owners.module.ts +++ b/src/routes/owners/owners.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { OwnersController } from './owners.controller'; -import { OwnersService } from './owners.service'; +import { OwnersController } from '@/routes/owners/owners.controller'; +import { OwnersService } from '@/routes/owners/owners.service'; @Module({ controllers: [OwnersController], diff --git a/src/routes/owners/owners.service.ts b/src/routes/owners/owners.service.ts index 865c7da67b..0d4d15a4b7 100644 --- a/src/routes/owners/owners.service.ts +++ b/src/routes/owners/owners.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { SafeRepository } from '@/domain/safe/safe.repository'; import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; -import { SafeList } from './entities/safe-list.entity'; +import { SafeList } from '@/routes/owners/entities/safe-list.entity'; @Injectable() export class OwnersService { diff --git a/src/routes/safe-apps/entities/safe-app-access-control.entity.ts b/src/routes/safe-apps/entities/safe-app-access-control.entity.ts index 4779b38076..c180add9ea 100644 --- a/src/routes/safe-apps/entities/safe-app-access-control.entity.ts +++ b/src/routes/safe-apps/entities/safe-app-access-control.entity.ts @@ -2,7 +2,7 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { SafeAppAccessControl as DomainSafeAppAccessControl, SafeAppAccessControlPolicies, -} from '../../../domain/safe-apps/entities/safe-app-access-control.entity'; +} from '@/domain/safe-apps/entities/safe-app-access-control.entity'; export class SafeAppAccessControl implements DomainSafeAppAccessControl { @ApiProperty() diff --git a/src/routes/safe-apps/entities/safe-app-provider.entity.ts b/src/routes/safe-apps/entities/safe-app-provider.entity.ts index 5ff859eea5..c01335e5c8 100644 --- a/src/routes/safe-apps/entities/safe-app-provider.entity.ts +++ b/src/routes/safe-apps/entities/safe-app-provider.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { SafeAppProvider as DomainSafeAppProvider } from '../../../domain/safe-apps/entities/safe-app-provider.entity'; +import { SafeAppProvider as DomainSafeAppProvider } from '@/domain/safe-apps/entities/safe-app-provider.entity'; export class SafeAppProvider implements DomainSafeAppProvider { @ApiProperty() diff --git a/src/routes/safe-apps/entities/safe-app-social-profile.entity.ts b/src/routes/safe-apps/entities/safe-app-social-profile.entity.ts index 73eda36454..4b10389693 100644 --- a/src/routes/safe-apps/entities/safe-app-social-profile.entity.ts +++ b/src/routes/safe-apps/entities/safe-app-social-profile.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { SafeAppSocialProfile as DomainSafeAppSocialProfile } from '../../../domain/safe-apps/entities/safe-app-social-profile.entity'; +import { SafeAppSocialProfile as DomainSafeAppSocialProfile } from '@/domain/safe-apps/entities/safe-app-social-profile.entity'; export class SafeAppSocialProfile implements DomainSafeAppSocialProfile { @ApiProperty() diff --git a/src/routes/safe-apps/entities/safe-app.entity.ts b/src/routes/safe-apps/entities/safe-app.entity.ts index b11e72b6fa..ad3978b26e 100644 --- a/src/routes/safe-apps/entities/safe-app.entity.ts +++ b/src/routes/safe-apps/entities/safe-app.entity.ts @@ -1,7 +1,7 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { SafeAppAccessControl } from './safe-app-access-control.entity'; -import { SafeAppProvider } from './safe-app-provider.entity'; -import { SafeAppSocialProfile } from './safe-app-social-profile.entity'; +import { SafeAppAccessControl } from '@/routes/safe-apps/entities/safe-app-access-control.entity'; +import { SafeAppProvider } from '@/routes/safe-apps/entities/safe-app-provider.entity'; +import { SafeAppSocialProfile } from '@/routes/safe-apps/entities/safe-app-social-profile.entity'; export class SafeApp { @ApiProperty() diff --git a/src/routes/safe-apps/safe-apps.controller.spec.ts b/src/routes/safe-apps/safe-apps.controller.spec.ts index ba0fd29327..36a41a4bd0 100644 --- a/src/routes/safe-apps/safe-apps.controller.spec.ts +++ b/src/routes/safe-apps/safe-apps.controller.spec.ts @@ -11,7 +11,7 @@ import { safeAppAccessControlBuilder } from '@/domain/safe-apps/entities/__tests import { safeAppBuilder } from '@/domain/safe-apps/entities/__tests__/safe-app.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; diff --git a/src/routes/safe-apps/safe-apps.controller.ts b/src/routes/safe-apps/safe-apps.controller.ts index 78e27c4883..bffd0d445f 100644 --- a/src/routes/safe-apps/safe-apps.controller.ts +++ b/src/routes/safe-apps/safe-apps.controller.ts @@ -1,7 +1,7 @@ import { Controller, Get, Param, Query } from '@nestjs/common'; import { ApiOkResponse, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { SafeApp } from './entities/safe-app.entity'; -import { SafeAppsService } from './safe-apps.service'; +import { SafeApp } from '@/routes/safe-apps/entities/safe-app.entity'; +import { SafeAppsService } from '@/routes/safe-apps/safe-apps.service'; @ApiTags('safe-apps') @Controller({ diff --git a/src/routes/safe-apps/safe-apps.module.ts b/src/routes/safe-apps/safe-apps.module.ts index a3b0bdaa81..f660531451 100644 --- a/src/routes/safe-apps/safe-apps.module.ts +++ b/src/routes/safe-apps/safe-apps.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { SafeAppsController } from './safe-apps.controller'; -import { SafeAppsService } from './safe-apps.service'; +import { SafeAppsController } from '@/routes/safe-apps/safe-apps.controller'; +import { SafeAppsService } from '@/routes/safe-apps/safe-apps.service'; @Module({ controllers: [SafeAppsController], diff --git a/src/routes/safe-apps/safe-apps.service.ts b/src/routes/safe-apps/safe-apps.service.ts index e1cf66778c..e22e950476 100644 --- a/src/routes/safe-apps/safe-apps.service.ts +++ b/src/routes/safe-apps/safe-apps.service.ts @@ -1,10 +1,10 @@ import { Inject, Injectable } from '@nestjs/common'; import { SafeAppAccessControlPolicies } from '@/domain/safe-apps/entities/safe-app-access-control.entity'; -import { SafeApp as DomainSafeApp } from '../../domain/safe-apps/entities/safe-app.entity'; +import { SafeApp as DomainSafeApp } from '@/domain/safe-apps/entities/safe-app.entity'; import { SafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository'; import { ISafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository.interface'; -import { SafeAppAccessControl } from './entities/safe-app-access-control.entity'; -import { SafeApp } from './entities/safe-app.entity'; +import { SafeApp } from '@/routes/safe-apps/entities/safe-app.entity'; +import { SafeAppAccessControl } from '@/routes/safe-apps/entities/safe-app-access-control.entity'; @Injectable() export class SafeAppsService { diff --git a/src/routes/safes/entities/safe-info.entity.ts b/src/routes/safes/entities/safe-info.entity.ts index 3f79b33dbe..6f27dac233 100644 --- a/src/routes/safes/entities/safe-info.entity.ts +++ b/src/routes/safes/entities/safe-info.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { AddressInfo } from '../../common/entities/address-info.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; export enum MasterCopyVersionState { UP_TO_DATE = 'UP_TO_DATE', diff --git a/src/routes/safes/safes.controller.spec.ts b/src/routes/safes/safes.controller.spec.ts index 4820fb1fc4..6e9241d77c 100644 --- a/src/routes/safes/safes.controller.spec.ts +++ b/src/routes/safes/safes.controller.spec.ts @@ -11,31 +11,31 @@ import { pageBuilder } from '@/domain/entities/__tests__/page.builder'; import { multisigTransactionBuilder, toJson as multisigTransactionToJson, -} from '../../domain/safe/entities/__tests__/multisig-transaction.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { faker } from '@faker-js/faker'; import { erc721TransferBuilder, toJson as erc721TransferToJson, -} from '../../domain/safe/entities/__tests__/erc721-transfer.builder'; +} from '@/domain/safe/entities/__tests__/erc721-transfer.builder'; import { moduleTransactionBuilder, toJson as moduleTransactionToJson, -} from '../../domain/safe/entities/__tests__/module-transaction.builder'; +} from '@/domain/safe/entities/__tests__/module-transaction.builder'; import { TestAppProvider } from '@/__tests__/test-app.provider'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; -import { NULL_ADDRESS } from '../common/constants'; import { messageBuilder, toJson as messageToJson, -} from '../../domain/messages/entities/__tests__/message.builder'; +} from '@/domain/messages/entities/__tests__/message.builder'; import { AppModule, configurationModule } from '@/app.module'; import { CacheModule } from '@/datasources/cache/cache.module'; import { RequestScopedLoggingModule } from '@/logging/logging.module'; import { NetworkModule } from '@/datasources/network/network.module'; import { NetworkService } from '@/datasources/network/network.service.interface'; +import { NULL_ADDRESS } from '@/routes/common/constants'; describe('Safes Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/safes/safes.controller.ts b/src/routes/safes/safes.controller.ts index 268ee45541..c4c4d6d167 100644 --- a/src/routes/safes/safes.controller.ts +++ b/src/routes/safes/safes.controller.ts @@ -1,7 +1,7 @@ import { ApiTags } from '@nestjs/swagger'; import { Controller, Get, Param } from '@nestjs/common'; -import { SafesService } from './safes.service'; -import { SafeState } from './entities/safe-info.entity'; +import { SafeState } from '@/routes/safes/entities/safe-info.entity'; +import { SafesService } from '@/routes/safes/safes.service'; @ApiTags('safes') @Controller({ diff --git a/src/routes/safes/safes.module.ts b/src/routes/safes/safes.module.ts index 91c87ef1cb..ffa71d5ef1 100644 --- a/src/routes/safes/safes.module.ts +++ b/src/routes/safes/safes.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; -import { SafesController } from './safes.controller'; -import { SafesService } from './safes.service'; -import { AddressInfoModule } from '../common/address-info/address-info.module'; +import { AddressInfoModule } from '@/routes/common/address-info/address-info.module'; +import { SafesController } from '@/routes/safes/safes.controller'; +import { SafesService } from '@/routes/safes/safes.service'; @Module({ controllers: [SafesController], diff --git a/src/routes/safes/safes.service.ts b/src/routes/safes/safes.service.ts index 095742d748..a67069c82d 100644 --- a/src/routes/safes/safes.service.ts +++ b/src/routes/safes/safes.service.ts @@ -1,19 +1,22 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; -import { MasterCopyVersionState, SafeState } from './entities/safe-info.entity'; -import { IChainsRepository } from '@/domain/chains/chains.repository.interface'; +import { max } from 'lodash'; import * as semver from 'semver'; +import { IChainsRepository } from '@/domain/chains/chains.repository.interface'; import { MasterCopy } from '@/domain/chains/entities/master-copies.entity'; -import { Safe } from '@/domain/safe/entities/safe.entity'; -import { AddressInfoHelper } from '../common/address-info/address-info.helper'; -import { AddressInfo } from '../common/entities/address-info.entity'; -import { NULL_ADDRESS } from '../common/constants'; import { MessagesRepository } from '@/domain/messages/messages.repository'; import { IMessagesRepository } from '@/domain/messages/messages.repository.interface'; -import { max } from 'lodash'; -import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; +import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; +import { Safe } from '@/domain/safe/entities/safe.entity'; import { Transfer } from '@/domain/safe/entities/transfer.entity'; +import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { + SafeState, + MasterCopyVersionState, +} from '@/routes/safes/entities/safe-info.entity'; @Injectable() export class SafesService { diff --git a/src/routes/transactions/__tests__/controllers/add-transaction-confirmations.transactions.controller.spec.ts b/src/routes/transactions/__tests__/controllers/add-transaction-confirmations.transactions.controller.spec.ts index c7a563e4a3..8251314fa6 100644 --- a/src/routes/transactions/__tests__/controllers/add-transaction-confirmations.transactions.controller.spec.ts +++ b/src/routes/transactions/__tests__/controllers/add-transaction-confirmations.transactions.controller.spec.ts @@ -13,18 +13,18 @@ import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction import { multisigTransactionBuilder, toJson as multisigToJson, -} from '../../../../domain/safe/entities/__tests__/multisig-transaction.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ValidationModule } from '@/validation/validation.module'; -import { TransactionsModule } from '../../transactions.module'; -import { addConfirmationDtoBuilder } from '../entities/add-confirmation.dto.builder'; +import { TransactionsModule } from '@/routes/transactions/transactions.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; import { pageBuilder } from '@/domain/entities/__tests__/page.builder'; import { NetworkService } from '@/datasources/network/network.service.interface'; +import { addConfirmationDtoBuilder } from '@/routes/transactions/__tests__/entities/add-confirmation.dto.builder'; describe('Add transaction confirmations - Transactions Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/transactions/__tests__/controllers/get-transaction-by-id.transactions.controller.spec.ts b/src/routes/transactions/__tests__/controllers/get-transaction-by-id.transactions.controller.spec.ts index b838c60720..33a3682727 100644 --- a/src/routes/transactions/__tests__/controllers/get-transaction-by-id.transactions.controller.spec.ts +++ b/src/routes/transactions/__tests__/controllers/get-transaction-by-id.transactions.controller.spec.ts @@ -13,21 +13,21 @@ import { CALL_OPERATION } from '@/domain/safe/entities/operation.entity'; import { moduleTransactionBuilder, toJson as moduleTransactionToJson, -} from '../../../../domain/safe/entities/__tests__/module-transaction.builder'; +} from '@/domain/safe/entities/__tests__/module-transaction.builder'; import { confirmationBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder'; import { multisigTransactionBuilder, toJson as multisigToJson, -} from '../../../../domain/safe/entities/__tests__/multisig-transaction.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { nativeTokenTransferBuilder, toJson as nativeTokenTransferToJson, -} from '../../../../domain/safe/entities/__tests__/native-token-transfer.builder'; +} from '@/domain/safe/entities/__tests__/native-token-transfer.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { NetworkService } from '@/datasources/network/network.service.interface'; import { AppModule, configurationModule } from '@/app.module'; diff --git a/src/routes/transactions/__tests__/controllers/list-incoming-transfers-by-safe.transactions.controller.spec.ts b/src/routes/transactions/__tests__/controllers/list-incoming-transfers-by-safe.transactions.controller.spec.ts index 2c2c8cda08..164963a91a 100644 --- a/src/routes/transactions/__tests__/controllers/list-incoming-transfers-by-safe.transactions.controller.spec.ts +++ b/src/routes/transactions/__tests__/controllers/list-incoming-transfers-by-safe.transactions.controller.spec.ts @@ -5,7 +5,7 @@ import * as request from 'supertest'; import { TestAppProvider } from '@/__tests__/test-app.provider'; import { ConfigurationModule } from '@/config/configuration.module'; import { IConfigurationService } from '@/config/configuration.service.interface'; -import configuration from '../../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { TestCacheModule } from '@/datasources/cache/__tests__/test.cache.module'; import { TestNetworkModule } from '@/datasources/network/__tests__/test.network.module'; import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; @@ -13,15 +13,15 @@ import { pageBuilder } from '@/domain/entities/__tests__/page.builder'; import { erc20TransferBuilder, toJson as erc20TransferToJson, -} from '../../../../domain/safe/entities/__tests__/erc20-transfer.builder'; +} from '@/domain/safe/entities/__tests__/erc20-transfer.builder'; import { erc721TransferBuilder, toJson as erc721TransferToJson, -} from '../../../../domain/safe/entities/__tests__/erc721-transfer.builder'; +} from '@/domain/safe/entities/__tests__/erc721-transfer.builder'; import { nativeTokenTransferBuilder, toJson as nativeTokenTransferToJson, -} from '../../../../domain/safe/entities/__tests__/native-token-transfer.builder'; +} from '@/domain/safe/entities/__tests__/native-token-transfer.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; import { TokenType } from '@/domain/tokens/entities/token.entity'; diff --git a/src/routes/transactions/__tests__/controllers/list-module-transactions-by-safe.transactions.controller.spec.ts b/src/routes/transactions/__tests__/controllers/list-module-transactions-by-safe.transactions.controller.spec.ts index 3d19d0fffc..0420af038f 100644 --- a/src/routes/transactions/__tests__/controllers/list-module-transactions-by-safe.transactions.controller.spec.ts +++ b/src/routes/transactions/__tests__/controllers/list-module-transactions-by-safe.transactions.controller.spec.ts @@ -9,11 +9,11 @@ import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; import { moduleTransactionBuilder, toJson as moduleTransactionToJson, -} from '../../../../domain/safe/entities/__tests__/module-transaction.builder'; +} from '@/domain/safe/entities/__tests__/module-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { NetworkService } from '@/datasources/network/network.service.interface'; import { AppModule, configurationModule } from '@/app.module'; diff --git a/src/routes/transactions/__tests__/controllers/list-multisig-transactions-by-safe.transactions.controller.spec.ts b/src/routes/transactions/__tests__/controllers/list-multisig-transactions-by-safe.transactions.controller.spec.ts index 09f34a6f1a..92ee889aff 100644 --- a/src/routes/transactions/__tests__/controllers/list-multisig-transactions-by-safe.transactions.controller.spec.ts +++ b/src/routes/transactions/__tests__/controllers/list-multisig-transactions-by-safe.transactions.controller.spec.ts @@ -5,7 +5,7 @@ import * as request from 'supertest'; import { TestAppProvider } from '@/__tests__/test-app.provider'; import { ConfigurationModule } from '@/config/configuration.module'; import { IConfigurationService } from '@/config/configuration.service.interface'; -import configuration from '../../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { TestCacheModule } from '@/datasources/cache/__tests__/test.cache.module'; import { TestNetworkModule } from '@/datasources/network/__tests__/test.network.module'; import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; @@ -20,7 +20,7 @@ import { confirmationBuilder } from '@/domain/safe/entities/__tests__/multisig-t import { multisigTransactionBuilder, toJson as multisigTransactionToJson, -} from '../../../../domain/safe/entities/__tests__/multisig-transaction.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; import { TokenType } from '@/domain/tokens/entities/token.entity'; diff --git a/src/routes/transactions/__tests__/controllers/list-queued-transactions-by-safe.transactions.controller.spec.ts b/src/routes/transactions/__tests__/controllers/list-queued-transactions-by-safe.transactions.controller.spec.ts index 3db40248e0..a18d30b088 100644 --- a/src/routes/transactions/__tests__/controllers/list-queued-transactions-by-safe.transactions.controller.spec.ts +++ b/src/routes/transactions/__tests__/controllers/list-queued-transactions-by-safe.transactions.controller.spec.ts @@ -13,13 +13,13 @@ import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction import { multisigTransactionBuilder, toJson as multisigToJson, -} from '../../../../domain/safe/entities/__tests__/multisig-transaction.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ValidationModule } from '@/validation/validation.module'; -import { TransactionsModule } from '../../transactions.module'; +import { TransactionsModule } from '@/routes/transactions/transactions.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { NetworkService } from '@/datasources/network/network.service.interface'; import { pageBuilder } from '@/domain/entities/__tests__/page.builder'; diff --git a/src/routes/transactions/__tests__/controllers/preview-transaction.transactions.controller.spec.ts b/src/routes/transactions/__tests__/controllers/preview-transaction.transactions.controller.spec.ts index 89a4a679bf..37582b50fd 100644 --- a/src/routes/transactions/__tests__/controllers/preview-transaction.transactions.controller.spec.ts +++ b/src/routes/transactions/__tests__/controllers/preview-transaction.transactions.controller.spec.ts @@ -19,12 +19,12 @@ import { import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ValidationModule } from '@/validation/validation.module'; -import { previewTransactionDtoBuilder } from '../../entities/__tests__/preview-transaction.dto.builder'; -import { TransactionsModule } from '../../transactions.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { NetworkService } from '@/datasources/network/network.service.interface'; +import { TransactionsModule } from '@/routes/transactions/transactions.module'; +import { previewTransactionDtoBuilder } from '@/routes/transactions/entities/__tests__/preview-transaction.dto.builder'; describe('Preview transaction - Transactions Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/transactions/__tests__/controllers/propose-transaction.transactions.controller.spec.ts b/src/routes/transactions/__tests__/controllers/propose-transaction.transactions.controller.spec.ts index 8f2d4e563b..3442b5f4e7 100644 --- a/src/routes/transactions/__tests__/controllers/propose-transaction.transactions.controller.spec.ts +++ b/src/routes/transactions/__tests__/controllers/propose-transaction.transactions.controller.spec.ts @@ -13,17 +13,17 @@ import { pageBuilder } from '@/domain/entities/__tests__/page.builder'; import { multisigTransactionBuilder, toJson as multisigToJson, -} from '../../../../domain/safe/entities/__tests__/multisig-transaction.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { TestLoggingModule } from '@/logging/__tests__/test.logging.module'; import { ValidationModule } from '@/validation/validation.module'; -import { proposeTransactionDtoBuilder } from '../../entities/__tests__/propose-transaction.dto.builder'; -import { TransactionsModule } from '../../transactions.module'; import { ConfigurationModule } from '@/config/configuration.module'; -import configuration from '../../../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { IConfigurationService } from '@/config/configuration.service.interface'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; import { NetworkService } from '@/datasources/network/network.service.interface'; +import { TransactionsModule } from '@/routes/transactions/transactions.module'; +import { proposeTransactionDtoBuilder } from '@/routes/transactions/entities/__tests__/propose-transaction.dto.builder'; describe('Propose transaction - Transactions Controller (Unit)', () => { let app: INestApplication; diff --git a/src/routes/transactions/__tests__/entities/add-confirmation.dto.builder.ts b/src/routes/transactions/__tests__/entities/add-confirmation.dto.builder.ts index d130608043..51367d89ae 100644 --- a/src/routes/transactions/__tests__/entities/add-confirmation.dto.builder.ts +++ b/src/routes/transactions/__tests__/entities/add-confirmation.dto.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { AddConfirmationDto } from '../../entities/add-confirmation.dto'; +import { AddConfirmationDto } from '@/routes/transactions/entities/add-confirmation.dto'; export function addConfirmationDtoBuilder(): IBuilder { return Builder.new().with( diff --git a/src/routes/transactions/entities/__tests__/preview-transaction.dto.builder.ts b/src/routes/transactions/entities/__tests__/preview-transaction.dto.builder.ts index 15bd2514a8..9ffc294e8a 100644 --- a/src/routes/transactions/entities/__tests__/preview-transaction.dto.builder.ts +++ b/src/routes/transactions/entities/__tests__/preview-transaction.dto.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; import { Operation } from '@/domain/safe/entities/operation.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { PreviewTransactionDto } from '../preview-transaction.dto.entity'; +import { PreviewTransactionDto } from '@/routes/transactions/entities/preview-transaction.dto.entity'; export function previewTransactionDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/transactions/entities/__tests__/propose-transaction.dto.builder.ts b/src/routes/transactions/entities/__tests__/propose-transaction.dto.builder.ts index ed095514e4..3e2cdbfc00 100644 --- a/src/routes/transactions/entities/__tests__/propose-transaction.dto.builder.ts +++ b/src/routes/transactions/entities/__tests__/propose-transaction.dto.builder.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; import { Operation } from '@/domain/safe/entities/operation.entity'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { ProposeTransactionDto } from '../propose-transaction.dto.entity'; +import { ProposeTransactionDto } from '@/routes/transactions/entities/propose-transaction.dto.entity'; export function proposeTransactionDtoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/transactions/entities/__tests__/safe-app-info.builder.ts b/src/routes/transactions/entities/__tests__/safe-app-info.builder.ts index 4e724e3710..72c82e09d8 100644 --- a/src/routes/transactions/entities/__tests__/safe-app-info.builder.ts +++ b/src/routes/transactions/entities/__tests__/safe-app-info.builder.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; import { Builder, IBuilder } from '@/__tests__/builder'; -import { SafeAppInfo } from '../safe-app-info.entity'; +import { SafeAppInfo } from '@/routes/transactions/entities/safe-app-info.entity'; export function safeAppInfoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/transactions/entities/__tests__/transfer-transaction-info.builder.ts b/src/routes/transactions/entities/__tests__/transfer-transaction-info.builder.ts index 59a4464ce6..561e7d4491 100644 --- a/src/routes/transactions/entities/__tests__/transfer-transaction-info.builder.ts +++ b/src/routes/transactions/entities/__tests__/transfer-transaction-info.builder.ts @@ -1,11 +1,11 @@ import { sample } from 'lodash'; import { Builder, IBuilder } from '@/__tests__/builder'; import { erc20TransferBuilder } from '@/domain/safe/entities/__tests__/erc20-transfer.builder'; -import { addressInfoBuilder } from '../../../common/__tests__/entities/address-info.builder'; +import { addressInfoBuilder } from '@/routes/common/__tests__/entities/address-info.builder'; import { - TransferDirection, TransferTransactionInfo, -} from '../transfer-transaction-info.entity'; + TransferDirection, +} from '@/routes/transactions/entities/transfer-transaction-info.entity'; export function transferTransactionInfoBuilder(): IBuilder { return Builder.new() diff --git a/src/routes/transactions/entities/add-confirmation.dto.ts b/src/routes/transactions/entities/add-confirmation.dto.ts index 512bd6dc74..cff7472d58 100644 --- a/src/routes/transactions/entities/add-confirmation.dto.ts +++ b/src/routes/transactions/entities/add-confirmation.dto.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddConfirmationDto as DomainCreateConfirmationDto } from '../../../domain/transactions/entities/add-confirmation.dto.entity'; +import { AddConfirmationDto as DomainCreateConfirmationDto } from '@/domain/transactions/entities/add-confirmation.dto.entity'; export class AddConfirmationDto implements DomainCreateConfirmationDto { @ApiProperty() diff --git a/src/routes/transactions/entities/creation-transaction-info.entity.ts b/src/routes/transactions/entities/creation-transaction-info.entity.ts index 1bbeebd7d4..95350c517b 100644 --- a/src/routes/transactions/entities/creation-transaction-info.entity.ts +++ b/src/routes/transactions/entities/creation-transaction-info.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { AddressInfo } from '../../common/entities/address-info.entity'; -import { TransactionInfo } from './transaction-info.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { TransactionInfo } from '@/routes/transactions/entities/transaction-info.entity'; export class CreationTransactionInfo extends TransactionInfo { @ApiProperty() diff --git a/src/routes/transactions/entities/custom-transaction.entity.ts b/src/routes/transactions/entities/custom-transaction.entity.ts index a9b2f5bc90..ed6fda23f5 100644 --- a/src/routes/transactions/entities/custom-transaction.entity.ts +++ b/src/routes/transactions/entities/custom-transaction.entity.ts @@ -1,7 +1,7 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { AddressInfo } from '../../common/entities/address-info.entity'; -import { TransactionInfo } from './transaction-info.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; import { RichDecodedInfo } from '@/routes/transactions/entities/human-description.entity'; +import { TransactionInfo } from '@/routes/transactions/entities/transaction-info.entity'; export class CustomTransactionInfo extends TransactionInfo { @ApiProperty() diff --git a/src/routes/transactions/entities/incoming-transfer-page.entity.ts b/src/routes/transactions/entities/incoming-transfer-page.entity.ts index 0f42cbb2e0..87fe9d348c 100644 --- a/src/routes/transactions/entities/incoming-transfer-page.entity.ts +++ b/src/routes/transactions/entities/incoming-transfer-page.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { Page } from '../../common/entities/page.entity'; -import { IncomingTransfer } from './incoming-transfer.entity'; +import { Page } from '@/routes/common/entities/page.entity'; +import { IncomingTransfer } from '@/routes/transactions/entities/incoming-transfer.entity'; export class IncomingTransferPage extends Page { @ApiProperty({ type: IncomingTransfer }) diff --git a/src/routes/transactions/entities/incoming-transfer.entity.ts b/src/routes/transactions/entities/incoming-transfer.entity.ts index 29ed543fa2..b91c7b9c18 100644 --- a/src/routes/transactions/entities/incoming-transfer.entity.ts +++ b/src/routes/transactions/entities/incoming-transfer.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { Transaction } from './transaction.entity'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; export class IncomingTransfer { @ApiProperty() diff --git a/src/routes/transactions/entities/module-execution-info.entity.ts b/src/routes/transactions/entities/module-execution-info.entity.ts index c5921086fa..0e7910ad30 100644 --- a/src/routes/transactions/entities/module-execution-info.entity.ts +++ b/src/routes/transactions/entities/module-execution-info.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../common/entities/address-info.entity'; -import { ExecutionInfo } from './execution-info.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { ExecutionInfo } from '@/routes/transactions/entities/execution-info.entity'; export class ModuleExecutionInfo extends ExecutionInfo { @ApiProperty() diff --git a/src/routes/transactions/entities/module-transaction-page.entity.ts b/src/routes/transactions/entities/module-transaction-page.entity.ts index 4e73daa4de..3bbc74bb3a 100644 --- a/src/routes/transactions/entities/module-transaction-page.entity.ts +++ b/src/routes/transactions/entities/module-transaction-page.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { Page } from '../../common/entities/page.entity'; -import { ModuleTransaction } from './module-transaction.entity'; +import { Page } from '@/routes/common/entities/page.entity'; +import { ModuleTransaction } from '@/routes/transactions/entities/module-transaction.entity'; export class ModuleTransactionPage extends Page { @ApiProperty({ type: ModuleTransaction }) diff --git a/src/routes/transactions/entities/module-transaction.entity.ts b/src/routes/transactions/entities/module-transaction.entity.ts index 38772421ea..77c524781a 100644 --- a/src/routes/transactions/entities/module-transaction.entity.ts +++ b/src/routes/transactions/entities/module-transaction.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ConflictType } from './conflict-type.entity'; -import { Transaction } from './transaction.entity'; +import { ConflictType } from '@/routes/transactions/entities/conflict-type.entity'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; export class ModuleTransaction { @ApiProperty() diff --git a/src/routes/transactions/entities/multisig-execution-info.entity.ts b/src/routes/transactions/entities/multisig-execution-info.entity.ts index e26ce87f7d..0a0fa72bfa 100644 --- a/src/routes/transactions/entities/multisig-execution-info.entity.ts +++ b/src/routes/transactions/entities/multisig-execution-info.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { AddressInfo } from '../../common/entities/address-info.entity'; -import { ExecutionInfo } from './execution-info.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { ExecutionInfo } from '@/routes/transactions/entities/execution-info.entity'; export class MultisigExecutionInfo extends ExecutionInfo { @ApiProperty() diff --git a/src/routes/transactions/entities/multisig-transaction-page.entity.ts b/src/routes/transactions/entities/multisig-transaction-page.entity.ts index 2dada43c36..82d0da9a9c 100644 --- a/src/routes/transactions/entities/multisig-transaction-page.entity.ts +++ b/src/routes/transactions/entities/multisig-transaction-page.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { Page } from '../../common/entities/page.entity'; -import { MultisigTransaction } from './multisig-transaction.entity'; +import { Page } from '@/routes/common/entities/page.entity'; +import { MultisigTransaction } from '@/routes/transactions/entities/multisig-transaction.entity'; export class MultisigTransactionPage extends Page { @ApiProperty({ type: MultisigTransaction }) diff --git a/src/routes/transactions/entities/multisig-transaction.entity.ts b/src/routes/transactions/entities/multisig-transaction.entity.ts index fdbdb7a693..5f469b75da 100644 --- a/src/routes/transactions/entities/multisig-transaction.entity.ts +++ b/src/routes/transactions/entities/multisig-transaction.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ConflictType } from './conflict-type.entity'; -import { Transaction } from './transaction.entity'; +import { ConflictType } from '@/routes/transactions/entities/conflict-type.entity'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; export class MultisigTransaction { @ApiProperty() diff --git a/src/routes/transactions/entities/propose-transaction.dto.entity.ts b/src/routes/transactions/entities/propose-transaction.dto.entity.ts index e01049e486..8093358c69 100644 --- a/src/routes/transactions/entities/propose-transaction.dto.entity.ts +++ b/src/routes/transactions/entities/propose-transaction.dto.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { Operation } from '@/domain/safe/entities/operation.entity'; -import { ProposeTransactionDto as DomainProposeTransactionDto } from '../../../domain/transactions/entities/propose-transaction.dto.entity'; +import { ProposeTransactionDto as DomainProposeTransactionDto } from '@/domain/transactions/entities/propose-transaction.dto.entity'; export class ProposeTransactionDto implements DomainProposeTransactionDto { @ApiProperty() diff --git a/src/routes/transactions/entities/queued-item-page.entity.ts b/src/routes/transactions/entities/queued-item-page.entity.ts index 6173ef704b..0274ba4b8d 100644 --- a/src/routes/transactions/entities/queued-item-page.entity.ts +++ b/src/routes/transactions/entities/queued-item-page.entity.ts @@ -1,9 +1,9 @@ import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger'; -import { Page } from '../../common/entities/page.entity'; -import { QueuedItem } from './queued-item.entity'; -import { ConflictHeaderQueuedItem } from './queued-items/conflict-header-queued-item.entity'; -import { LabelQueuedItem } from './queued-items/label-queued-item.entity'; -import { TransactionQueuedItem } from './queued-items/transaction-queued-item.entity'; +import { Page } from '@/routes/common/entities/page.entity'; +import { QueuedItem } from '@/routes/transactions/entities/queued-item.entity'; +import { ConflictHeaderQueuedItem } from '@/routes/transactions/entities/queued-items/conflict-header-queued-item.entity'; +import { LabelQueuedItem } from '@/routes/transactions/entities/queued-items/label-queued-item.entity'; +import { TransactionQueuedItem } from '@/routes/transactions/entities/queued-items/transaction-queued-item.entity'; @ApiExtraModels( ConflictHeaderQueuedItem, diff --git a/src/routes/transactions/entities/queued-items/conflict-header-queued-item.entity.ts b/src/routes/transactions/entities/queued-items/conflict-header-queued-item.entity.ts index 02f9addc79..b439452496 100644 --- a/src/routes/transactions/entities/queued-items/conflict-header-queued-item.entity.ts +++ b/src/routes/transactions/entities/queued-items/conflict-header-queued-item.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { QueuedItem } from '../queued-item.entity'; +import { QueuedItem } from '@/routes/transactions/entities/queued-item.entity'; export class ConflictHeaderQueuedItem extends QueuedItem { @ApiProperty() diff --git a/src/routes/transactions/entities/queued-items/label-queued-item.entity.ts b/src/routes/transactions/entities/queued-items/label-queued-item.entity.ts index 7a59d4c1d1..eea46c18e0 100644 --- a/src/routes/transactions/entities/queued-items/label-queued-item.entity.ts +++ b/src/routes/transactions/entities/queued-items/label-queued-item.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { QueuedItem } from '../queued-item.entity'; +import { QueuedItem } from '@/routes/transactions/entities/queued-item.entity'; export enum LabelItem { Next = 'Next', diff --git a/src/routes/transactions/entities/queued-items/transaction-queued-item.entity.ts b/src/routes/transactions/entities/queued-items/transaction-queued-item.entity.ts index 78c90e6565..0a8e7c3f92 100644 --- a/src/routes/transactions/entities/queued-items/transaction-queued-item.entity.ts +++ b/src/routes/transactions/entities/queued-items/transaction-queued-item.entity.ts @@ -1,7 +1,7 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ConflictType } from '../conflict-type.entity'; -import { QueuedItem } from '../queued-item.entity'; -import { Transaction } from '../transaction.entity'; +import { ConflictType } from '@/routes/transactions/entities/conflict-type.entity'; +import { QueuedItem } from '@/routes/transactions/entities/queued-item.entity'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; export class TransactionQueuedItem extends QueuedItem { @ApiProperty() diff --git a/src/routes/transactions/entities/schemas/add-confirmation.dto.schema.ts b/src/routes/transactions/entities/schemas/add-confirmation.dto.schema.ts index f21bfe9d04..5baff5879f 100644 --- a/src/routes/transactions/entities/schemas/add-confirmation.dto.schema.ts +++ b/src/routes/transactions/entities/schemas/add-confirmation.dto.schema.ts @@ -1,5 +1,5 @@ +import { AddConfirmationDto } from '@/routes/transactions/entities/add-confirmation.dto'; import { JSONSchemaType } from 'ajv'; -import { AddConfirmationDto } from '../add-confirmation.dto'; export const ADD_CONFIRMATION_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/transactions/add-confirmation.dto.json'; diff --git a/src/routes/transactions/entities/schemas/preview-transaction.dto.schema.ts b/src/routes/transactions/entities/schemas/preview-transaction.dto.schema.ts index cd266aed0d..70fd52e168 100644 --- a/src/routes/transactions/entities/schemas/preview-transaction.dto.schema.ts +++ b/src/routes/transactions/entities/schemas/preview-transaction.dto.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { PreviewTransactionDto } from '../preview-transaction.dto.entity'; +import { PreviewTransactionDto } from '@/routes/transactions/entities/preview-transaction.dto.entity'; export const PREVIEW_TRANSACTION_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/transactions/preview-transaction.dto.json'; diff --git a/src/routes/transactions/entities/schemas/propose-transaction.dto.schema.ts b/src/routes/transactions/entities/schemas/propose-transaction.dto.schema.ts index 9bb91556e6..c4e1863cd7 100644 --- a/src/routes/transactions/entities/schemas/propose-transaction.dto.schema.ts +++ b/src/routes/transactions/entities/schemas/propose-transaction.dto.schema.ts @@ -1,5 +1,5 @@ import { JSONSchemaType } from 'ajv'; -import { ProposeTransactionDto } from '../propose-transaction.dto.entity'; +import { ProposeTransactionDto } from '@/routes/transactions/entities/propose-transaction.dto.entity'; export const PROPOSE_TRANSACTION_DTO_SCHEMA_ID = 'https://safe-client.safe.global/schemas/transactions/propose-transaction.dto.json'; diff --git a/src/routes/transactions/entities/settings-change-transaction.entity.ts b/src/routes/transactions/entities/settings-change-transaction.entity.ts index fc18e9d5f1..6d3494756e 100644 --- a/src/routes/transactions/entities/settings-change-transaction.entity.ts +++ b/src/routes/transactions/entities/settings-change-transaction.entity.ts @@ -1,8 +1,8 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { DataDecoded } from '../../data-decode/entities/data-decoded.entity'; -import { SettingsChange } from './settings-changes/settings-change.entity'; -import { TransactionInfo } from './transaction-info.entity'; +import { DataDecoded } from '@/routes/data-decode/entities/data-decoded.entity'; import { RichDecodedInfo } from '@/routes/transactions/entities/human-description.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; +import { TransactionInfo } from '@/routes/transactions/entities/transaction-info.entity'; export class SettingsChangeTransaction extends TransactionInfo { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/add-owner.entity.ts b/src/routes/transactions/entities/settings-changes/add-owner.entity.ts index 454a2ec323..df439af683 100644 --- a/src/routes/transactions/entities/settings-changes/add-owner.entity.ts +++ b/src/routes/transactions/entities/settings-changes/add-owner.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { SettingsChange } from './settings-change.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class AddOwner extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/change-master-copy.entity.ts b/src/routes/transactions/entities/settings-changes/change-master-copy.entity.ts index 2a61777d51..71da1735a4 100644 --- a/src/routes/transactions/entities/settings-changes/change-master-copy.entity.ts +++ b/src/routes/transactions/entities/settings-changes/change-master-copy.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { SettingsChange } from './settings-change.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class ChangeMasterCopy extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/change-threshold.entity.ts b/src/routes/transactions/entities/settings-changes/change-threshold.entity.ts index 4220972bdd..e1054e34a4 100644 --- a/src/routes/transactions/entities/settings-changes/change-threshold.entity.ts +++ b/src/routes/transactions/entities/settings-changes/change-threshold.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { SettingsChange } from './settings-change.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class ChangeThreshold extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/delete-guard.ts b/src/routes/transactions/entities/settings-changes/delete-guard.ts index ec42763bd8..c7831b4f53 100644 --- a/src/routes/transactions/entities/settings-changes/delete-guard.ts +++ b/src/routes/transactions/entities/settings-changes/delete-guard.ts @@ -1,4 +1,4 @@ -import { SettingsChange } from './settings-change.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class DeleteGuard extends SettingsChange { constructor() { diff --git a/src/routes/transactions/entities/settings-changes/disable-module.entity.ts b/src/routes/transactions/entities/settings-changes/disable-module.entity.ts index 9cdf1fc0e7..40ff405cd4 100644 --- a/src/routes/transactions/entities/settings-changes/disable-module.entity.ts +++ b/src/routes/transactions/entities/settings-changes/disable-module.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { SettingsChange } from './settings-change.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class DisableModule extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/enable-module.entity.ts b/src/routes/transactions/entities/settings-changes/enable-module.entity.ts index 3f3df3fa80..657765f609 100644 --- a/src/routes/transactions/entities/settings-changes/enable-module.entity.ts +++ b/src/routes/transactions/entities/settings-changes/enable-module.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { SettingsChange } from './settings-change.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class EnableModule extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/remove-owner.entity.ts b/src/routes/transactions/entities/settings-changes/remove-owner.entity.ts index 1ec6214433..fb15f71d08 100644 --- a/src/routes/transactions/entities/settings-changes/remove-owner.entity.ts +++ b/src/routes/transactions/entities/settings-changes/remove-owner.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { SettingsChange } from './settings-change.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class RemoveOwner extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/set-fallback-handler.entity.ts b/src/routes/transactions/entities/settings-changes/set-fallback-handler.entity.ts index 5547be9de3..e8a8ef88a0 100644 --- a/src/routes/transactions/entities/settings-changes/set-fallback-handler.entity.ts +++ b/src/routes/transactions/entities/settings-changes/set-fallback-handler.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { SettingsChange } from './settings-change.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class SetFallbackHandler extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/set-guard.entity.ts b/src/routes/transactions/entities/settings-changes/set-guard.entity.ts index d7d55cf2c9..b11b7c9d3f 100644 --- a/src/routes/transactions/entities/settings-changes/set-guard.entity.ts +++ b/src/routes/transactions/entities/settings-changes/set-guard.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { SettingsChange } from './settings-change.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class SetGuard extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/settings-changes/swap-owner.entity.ts b/src/routes/transactions/entities/settings-changes/swap-owner.entity.ts index 7506d5a233..72cc0766c8 100644 --- a/src/routes/transactions/entities/settings-changes/swap-owner.entity.ts +++ b/src/routes/transactions/entities/settings-changes/swap-owner.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { SettingsChange } from './settings-change.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; export class SwapOwner extends SettingsChange { @ApiProperty() diff --git a/src/routes/transactions/entities/transaction-data.entity.ts b/src/routes/transactions/entities/transaction-data.entity.ts index 692fa41778..05fca09960 100644 --- a/src/routes/transactions/entities/transaction-data.entity.ts +++ b/src/routes/transactions/entities/transaction-data.entity.ts @@ -4,8 +4,8 @@ import { ApiPropertyOptional, } from '@nestjs/swagger'; import { Operation } from '@/domain/safe/entities/operation.entity'; -import { AddressInfo } from '../../common/entities/address-info.entity'; -import { DataDecoded } from '../../data-decode/entities/data-decoded.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { DataDecoded } from '@/routes/data-decode/entities/data-decoded.entity'; @ApiExtraModels(AddressInfo, DataDecoded) export class TransactionData { diff --git a/src/routes/transactions/entities/transaction-details/module-execution-details.entity.ts b/src/routes/transactions/entities/transaction-details/module-execution-details.entity.ts index 6b05523d96..dd76428a99 100644 --- a/src/routes/transactions/entities/transaction-details/module-execution-details.entity.ts +++ b/src/routes/transactions/entities/transaction-details/module-execution-details.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { ExecutionDetails } from './execution-details.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { ExecutionDetails } from '@/routes/transactions/entities/transaction-details/execution-details.entity'; export class ModuleExecutionDetails extends ExecutionDetails { @ApiProperty() diff --git a/src/routes/transactions/entities/transaction-details/multisig-execution-details.entity.ts b/src/routes/transactions/entities/transaction-details/multisig-execution-details.entity.ts index fa2e96a0dc..7e5936b9b3 100644 --- a/src/routes/transactions/entities/transaction-details/multisig-execution-details.entity.ts +++ b/src/routes/transactions/entities/transaction-details/multisig-execution-details.entity.ts @@ -1,7 +1,7 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { Token } from '../../../balances/entities/token.entity'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { ExecutionDetails } from './execution-details.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { Token } from '@/routes/balances/entities/token.entity'; +import { ExecutionDetails } from '@/routes/transactions/entities/transaction-details/execution-details.entity'; export class MultisigConfirmationDetails { @ApiProperty() diff --git a/src/routes/transactions/entities/transaction-details/transaction-details.entity.ts b/src/routes/transactions/entities/transaction-details/transaction-details.entity.ts index 00bc5dc91f..9ad84e1e03 100644 --- a/src/routes/transactions/entities/transaction-details/transaction-details.entity.ts +++ b/src/routes/transactions/entities/transaction-details/transaction-details.entity.ts @@ -4,12 +4,12 @@ import { ApiPropertyOptional, getSchemaPath, } from '@nestjs/swagger'; -import { SafeAppInfo } from '../safe-app-info.entity'; -import { TransactionData } from '../transaction-data.entity'; -import { TransactionInfo } from '../transaction-info.entity'; -import { TransactionStatus } from '../transaction-status.entity'; -import { ModuleExecutionDetails } from './module-execution-details.entity'; -import { MultisigExecutionDetails } from './multisig-execution-details.entity'; +import { SafeAppInfo } from '@/routes/transactions/entities/safe-app-info.entity'; +import { TransactionData } from '@/routes/transactions/entities/transaction-data.entity'; +import { ModuleExecutionDetails } from '@/routes/transactions/entities/transaction-details/module-execution-details.entity'; +import { MultisigExecutionDetails } from '@/routes/transactions/entities/transaction-details/multisig-execution-details.entity'; +import { TransactionInfo } from '@/routes/transactions/entities/transaction-info.entity'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; @ApiExtraModels( TransactionInfo, diff --git a/src/routes/transactions/entities/transaction-item-page.entity.ts b/src/routes/transactions/entities/transaction-item-page.entity.ts index d2807d61f5..8d5a11c6c2 100644 --- a/src/routes/transactions/entities/transaction-item-page.entity.ts +++ b/src/routes/transactions/entities/transaction-item-page.entity.ts @@ -1,7 +1,7 @@ import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger'; -import { Page } from '../../common/entities/page.entity'; -import { DateLabel } from '../../common/entities/date-label.entity'; -import { TransactionItem } from './transaction-item.entity'; +import { Page } from '@/routes/common/entities/page.entity'; +import { DateLabel } from '@/routes/common/entities/date-label.entity'; +import { TransactionItem } from '@/routes/transactions/entities/transaction-item.entity'; @ApiExtraModels(TransactionItem, DateLabel) export class TransactionItemPage extends Page { diff --git a/src/routes/transactions/entities/transaction-item.entity.ts b/src/routes/transactions/entities/transaction-item.entity.ts index f7643d0db8..cbb15254fe 100644 --- a/src/routes/transactions/entities/transaction-item.entity.ts +++ b/src/routes/transactions/entities/transaction-item.entity.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ConflictType } from './conflict-type.entity'; -import { Transaction } from './transaction.entity'; +import { ConflictType } from '@/routes/transactions/entities/conflict-type.entity'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; export class TransactionItem { @ApiProperty() diff --git a/src/routes/transactions/entities/transaction-preview.entity.ts b/src/routes/transactions/entities/transaction-preview.entity.ts index c12737c49f..1ca432e8b6 100644 --- a/src/routes/transactions/entities/transaction-preview.entity.ts +++ b/src/routes/transactions/entities/transaction-preview.entity.ts @@ -1,10 +1,10 @@ import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger'; -import { CreationTransactionInfo } from './creation-transaction-info.entity'; -import { CustomTransactionInfo } from './custom-transaction.entity'; -import { SettingsChangeTransaction } from './settings-change-transaction.entity'; -import { TransactionData } from './transaction-data.entity'; -import { TransactionInfo } from './transaction-info.entity'; -import { TransferTransactionInfo } from './transfer-transaction-info.entity'; +import { CreationTransactionInfo } from '@/routes/transactions/entities/creation-transaction-info.entity'; +import { CustomTransactionInfo } from '@/routes/transactions/entities/custom-transaction.entity'; +import { SettingsChangeTransaction } from '@/routes/transactions/entities/settings-change-transaction.entity'; +import { TransactionData } from '@/routes/transactions/entities/transaction-data.entity'; +import { TransactionInfo } from '@/routes/transactions/entities/transaction-info.entity'; +import { TransferTransactionInfo } from '@/routes/transactions/entities/transfer-transaction-info.entity'; @ApiExtraModels( CreationTransactionInfo, diff --git a/src/routes/transactions/entities/transaction.entity.ts b/src/routes/transactions/entities/transaction.entity.ts index ff61be26a8..6e69bad5d2 100644 --- a/src/routes/transactions/entities/transaction.entity.ts +++ b/src/routes/transactions/entities/transaction.entity.ts @@ -4,15 +4,15 @@ import { ApiPropertyOptional, getSchemaPath, } from '@nestjs/swagger'; -import { CreationTransactionInfo } from './creation-transaction-info.entity'; -import { CustomTransactionInfo } from './custom-transaction.entity'; -import { ExecutionInfo } from './execution-info.entity'; -import { ModuleExecutionInfo } from './module-execution-info.entity'; -import { MultisigExecutionInfo } from './multisig-execution-info.entity'; -import { SafeAppInfo } from './safe-app-info.entity'; -import { SettingsChangeTransaction } from './settings-change-transaction.entity'; -import { TransactionInfo } from './transaction-info.entity'; -import { TransferTransactionInfo } from './transfer-transaction-info.entity'; +import { CreationTransactionInfo } from '@/routes/transactions/entities/creation-transaction-info.entity'; +import { CustomTransactionInfo } from '@/routes/transactions/entities/custom-transaction.entity'; +import { ExecutionInfo } from '@/routes/transactions/entities/execution-info.entity'; +import { ModuleExecutionInfo } from '@/routes/transactions/entities/module-execution-info.entity'; +import { MultisigExecutionInfo } from '@/routes/transactions/entities/multisig-execution-info.entity'; +import { SafeAppInfo } from '@/routes/transactions/entities/safe-app-info.entity'; +import { SettingsChangeTransaction } from '@/routes/transactions/entities/settings-change-transaction.entity'; +import { TransactionInfo } from '@/routes/transactions/entities/transaction-info.entity'; +import { TransferTransactionInfo } from '@/routes/transactions/entities/transfer-transaction-info.entity'; @ApiExtraModels( CreationTransactionInfo, diff --git a/src/routes/transactions/entities/transfer-transaction-info.entity.ts b/src/routes/transactions/entities/transfer-transaction-info.entity.ts index db2217f9af..57d8bf4317 100644 --- a/src/routes/transactions/entities/transfer-transaction-info.entity.ts +++ b/src/routes/transactions/entities/transfer-transaction-info.entity.ts @@ -1,8 +1,8 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AddressInfo } from '../../common/entities/address-info.entity'; -import { TransactionInfo } from './transaction-info.entity'; -import { Transfer } from './transfers/transfer.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; import { RichDecodedInfo } from '@/routes/transactions/entities/human-description.entity'; +import { TransactionInfo } from '@/routes/transactions/entities/transaction-info.entity'; +import { Transfer } from '@/routes/transactions/entities/transfers/transfer.entity'; export enum TransferDirection { Incoming = 'INCOMING', diff --git a/src/routes/transactions/entities/transfers/erc20-transfer.entity.ts b/src/routes/transactions/entities/transfers/erc20-transfer.entity.ts index ab67479822..d1fc0d96c8 100644 --- a/src/routes/transactions/entities/transfers/erc20-transfer.entity.ts +++ b/src/routes/transactions/entities/transfers/erc20-transfer.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { Transfer } from './transfer.entity'; +import { Transfer } from '@/routes/transactions/entities/transfers/transfer.entity'; export class Erc20Transfer extends Transfer { @ApiProperty() diff --git a/src/routes/transactions/entities/transfers/erc721-transfer.entity.ts b/src/routes/transactions/entities/transfers/erc721-transfer.entity.ts index f94efe1508..eac2678df7 100644 --- a/src/routes/transactions/entities/transfers/erc721-transfer.entity.ts +++ b/src/routes/transactions/entities/transfers/erc721-transfer.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { Transfer } from './transfer.entity'; +import { Transfer } from '@/routes/transactions/entities/transfers/transfer.entity'; export class Erc721Transfer extends Transfer { @ApiProperty() diff --git a/src/routes/transactions/entities/transfers/native-coin-transfer.entity.ts b/src/routes/transactions/entities/transfers/native-coin-transfer.entity.ts index 0b0b3bc6a7..9397b1b14a 100644 --- a/src/routes/transactions/entities/transfers/native-coin-transfer.entity.ts +++ b/src/routes/transactions/entities/transfers/native-coin-transfer.entity.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { Transfer } from './transfer.entity'; +import { Transfer } from '@/routes/transactions/entities/transfers/transfer.entity'; export class NativeCoinTransfer extends Transfer { @ApiProperty() diff --git a/src/routes/transactions/mappers/__tests__/multisig-execution-details.builder.ts b/src/routes/transactions/mappers/__tests__/multisig-execution-details.builder.ts index da08f06f87..de300fe8bc 100644 --- a/src/routes/transactions/mappers/__tests__/multisig-execution-details.builder.ts +++ b/src/routes/transactions/mappers/__tests__/multisig-execution-details.builder.ts @@ -2,11 +2,11 @@ import { faker } from '@faker-js/faker'; import { random, range, sampleSize } from 'lodash'; import { Builder, IBuilder } from '@/__tests__/builder'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; -import { addressInfoBuilder } from '../../../common/__tests__/entities/address-info.builder'; +import { addressInfoBuilder } from '@/routes/common/__tests__/entities/address-info.builder'; import { MultisigConfirmationDetails, MultisigExecutionDetails, -} from '../../entities/transaction-details/multisig-execution-details.entity'; +} from '@/routes/transactions/entities/transaction-details/multisig-execution-details.entity'; const MIN_SIGNERS = 2; const MAX_SIGNERS = 5; diff --git a/src/routes/transactions/mappers/common/custom-transaction.mapper.spec.ts b/src/routes/transactions/mappers/common/custom-transaction.mapper.spec.ts index ef8d71233b..4edb6eb636 100644 --- a/src/routes/transactions/mappers/common/custom-transaction.mapper.spec.ts +++ b/src/routes/transactions/mappers/common/custom-transaction.mapper.spec.ts @@ -1,15 +1,15 @@ import { faker } from '@faker-js/faker'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { CustomTransactionInfo } from '../../entities/custom-transaction.entity'; -import { CustomTransactionMapper } from './custom-transaction.mapper'; import { multisigTransactionBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; -import { NULL_ADDRESS } from '../../../common/constants'; import { dataDecodedBuilder, dataDecodedParameterBuilder, } from '@/domain/data-decoder/entities/__tests__/data-decoded.builder'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; import { buildHumanDescription } from '@/routes/transactions/entities/__tests__/human-description.builder'; +import { CustomTransactionInfo } from '@/routes/transactions/entities/custom-transaction.entity'; +import { CustomTransactionMapper } from '@/routes/transactions/mappers/common/custom-transaction.mapper'; const addressInfoHelper = jest.mocked({ getOrDefault: jest.fn(), diff --git a/src/routes/transactions/mappers/common/custom-transaction.mapper.ts b/src/routes/transactions/mappers/common/custom-transaction.mapper.ts index 5196304060..d251720c9e 100644 --- a/src/routes/transactions/mappers/common/custom-transaction.mapper.ts +++ b/src/routes/transactions/mappers/common/custom-transaction.mapper.ts @@ -1,15 +1,15 @@ import { Injectable } from '@nestjs/common'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { NULL_ADDRESS } from '../../../common/constants'; +import { isMultisigTransaction } from '@/domain/safe/entities/transaction.entity'; +import { RichDecodedInfo } from '@/routes/transactions/entities/human-description.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; import { MULTI_SEND_METHOD_NAME, TRANSACTIONS_PARAMETER_NAME, -} from '../../constants'; -import { CustomTransactionInfo } from '../../entities/custom-transaction.entity'; -import { isMultisigTransaction } from '@/domain/safe/entities/transaction.entity'; -import { RichDecodedInfo } from '@/routes/transactions/entities/human-description.entity'; +} from '@/routes/transactions/constants'; +import { CustomTransactionInfo } from '@/routes/transactions/entities/custom-transaction.entity'; @Injectable() export class CustomTransactionMapper { diff --git a/src/routes/transactions/mappers/common/data-decoded-param.helper.spec.ts b/src/routes/transactions/mappers/common/data-decoded-param.helper.spec.ts index cb025c6065..306dadcc51 100644 --- a/src/routes/transactions/mappers/common/data-decoded-param.helper.spec.ts +++ b/src/routes/transactions/mappers/common/data-decoded-param.helper.spec.ts @@ -3,7 +3,7 @@ import { DataDecoded, DataDecodedParameter, } from '@/domain/data-decoder/entities/data-decoded.entity'; -import { DataDecodedParamHelper } from './data-decoded-param.helper'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; describe('DataDecoded param helper (Unit)', () => { const helper = new DataDecodedParamHelper(); diff --git a/src/routes/transactions/mappers/common/erc20-transfer.mapper.ts b/src/routes/transactions/mappers/common/erc20-transfer.mapper.ts index c341f22e77..cb8e0cd1a8 100644 --- a/src/routes/transactions/mappers/common/erc20-transfer.mapper.ts +++ b/src/routes/transactions/mappers/common/erc20-transfer.mapper.ts @@ -2,13 +2,13 @@ import { Injectable } from '@nestjs/common'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Token } from '@/domain/tokens/entities/token.entity'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { NULL_ADDRESS } from '../../../common/constants'; -import { TransferTransactionInfo } from '../../entities/transfer-transaction-info.entity'; -import { Erc20Transfer } from '../../entities/transfers/erc20-transfer.entity'; -import { DataDecodedParamHelper } from './data-decoded-param.helper'; -import { getTransferDirection } from './transfer-direction.helper'; import { RichDecodedInfo } from '@/routes/transactions/entities/human-description.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; +import { TransferTransactionInfo } from '@/routes/transactions/entities/transfer-transaction-info.entity'; +import { Erc20Transfer } from '@/routes/transactions/entities/transfers/erc20-transfer.entity'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; +import { getTransferDirection } from '@/routes/transactions/mappers/common/transfer-direction.helper'; @Injectable() export class Erc20TransferMapper { diff --git a/src/routes/transactions/mappers/common/erc721-transfer.mapper.ts b/src/routes/transactions/mappers/common/erc721-transfer.mapper.ts index c1dc84e03e..b23f05419e 100644 --- a/src/routes/transactions/mappers/common/erc721-transfer.mapper.ts +++ b/src/routes/transactions/mappers/common/erc721-transfer.mapper.ts @@ -2,13 +2,13 @@ import { Injectable } from '@nestjs/common'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Token } from '@/domain/tokens/entities/token.entity'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { NULL_ADDRESS } from '../../../common/constants'; -import { TransferTransactionInfo } from '../../entities/transfer-transaction-info.entity'; -import { Erc721Transfer } from '../../entities/transfers/erc721-transfer.entity'; -import { DataDecodedParamHelper } from './data-decoded-param.helper'; -import { getTransferDirection } from './transfer-direction.helper'; import { RichDecodedInfo } from '@/routes/transactions/entities/human-description.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; +import { TransferTransactionInfo } from '@/routes/transactions/entities/transfer-transaction-info.entity'; +import { Erc721Transfer } from '@/routes/transactions/entities/transfers/erc721-transfer.entity'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; +import { getTransferDirection } from '@/routes/transactions/mappers/common/transfer-direction.helper'; @Injectable() export class Erc721TransferMapper { diff --git a/src/routes/transactions/mappers/common/human-description.mapper.ts b/src/routes/transactions/mappers/common/human-description.mapper.ts index c7ce62762a..ec86a50fb9 100644 --- a/src/routes/transactions/mappers/common/human-description.mapper.ts +++ b/src/routes/transactions/mappers/common/human-description.mapper.ts @@ -3,7 +3,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { formatUnits, isAddress, isHex } from 'viem'; import { ITokenRepository } from '@/domain/tokens/token.repository.interface'; import { TokenRepository } from '@/domain/tokens/token.repository'; -import { MAX_UINT256 } from '../../constants'; +import { MAX_UINT256 } from '@/routes/transactions/constants'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; import { IHumanDescriptionRepository } from '@/domain/human-description/human-description.repository.interface'; import { HumanDescriptionRepository } from '@/domain/human-description/human-description.repository'; @@ -15,7 +15,6 @@ import { import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; import { isMultisigTransaction } from '@/domain/safe/entities/transaction.entity'; -import { SafeAppInfoMapper } from './safe-app-info.mapper'; import { RichAddressFragment, RichDecodedInfo, @@ -24,6 +23,7 @@ import { RichTextFragment, RichTokenValueFragment, } from '@/routes/transactions/entities/human-description.entity'; +import { SafeAppInfoMapper } from '@/routes/transactions/mappers/common/safe-app-info.mapper'; @Injectable() export class HumanDescriptionMapper { diff --git a/src/routes/transactions/mappers/common/human-descriptions.mapper.spec.ts b/src/routes/transactions/mappers/common/human-descriptions.mapper.spec.ts index 085f2e8067..a439b27b91 100644 --- a/src/routes/transactions/mappers/common/human-descriptions.mapper.spec.ts +++ b/src/routes/transactions/mappers/common/human-descriptions.mapper.spec.ts @@ -1,20 +1,20 @@ import { encodeFunctionData, formatUnits, getAddress, parseAbi } from 'viem'; import { faker } from '@faker-js/faker'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { HumanDescriptionMapper } from './human-description.mapper'; import { TokenRepository } from '@/domain/tokens/token.repository'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; import { ILoggingService } from '@/logging/logging.interface'; import { HumanDescriptionApi } from '@/datasources/human-description-api/human-description-api.service'; -import { MAX_UINT256 } from '../../constants'; -import { SafeAppInfo } from '../../entities/safe-app-info.entity'; import { HumanDescriptionRepository } from '@/domain/human-description/human-description.repository'; import { multisigTransactionBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; -import { SafeAppInfoMapper } from './safe-app-info.mapper'; import { Hex } from 'viem/types/misc'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Token } from '@/domain/tokens/entities/token.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { MAX_UINT256 } from '@/routes/transactions/constants'; +import { SafeAppInfo } from '@/routes/transactions/entities/safe-app-info.entity'; +import { HumanDescriptionMapper } from '@/routes/transactions/mappers/common/human-description.mapper'; +import { SafeAppInfoMapper } from '@/routes/transactions/mappers/common/safe-app-info.mapper'; const tokenRepository = jest.mocked({ getToken: jest.fn(), diff --git a/src/routes/transactions/mappers/common/native-coin-transfer.mapper.ts b/src/routes/transactions/mappers/common/native-coin-transfer.mapper.ts index db9840961b..6ea54d3340 100644 --- a/src/routes/transactions/mappers/common/native-coin-transfer.mapper.ts +++ b/src/routes/transactions/mappers/common/native-coin-transfer.mapper.ts @@ -1,13 +1,13 @@ import { Injectable } from '@nestjs/common'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; import { - TransferDirection, TransferTransactionInfo, -} from '../../entities/transfer-transaction-info.entity'; -import { NativeCoinTransfer } from '../../entities/transfers/native-coin-transfer.entity'; + TransferDirection, +} from '@/routes/transactions/entities/transfer-transaction-info.entity'; +import { NativeCoinTransfer } from '@/routes/transactions/entities/transfers/native-coin-transfer.entity'; import { RichDecodedInfo } from '@/routes/transactions/entities/human-description.entity'; @Injectable() diff --git a/src/routes/transactions/mappers/common/safe-app-info.mapper.spec.ts b/src/routes/transactions/mappers/common/safe-app-info.mapper.spec.ts index 3ccca495b5..962bbe5b9b 100644 --- a/src/routes/transactions/mappers/common/safe-app-info.mapper.spec.ts +++ b/src/routes/transactions/mappers/common/safe-app-info.mapper.spec.ts @@ -3,8 +3,8 @@ import { safeAppBuilder } from '@/domain/safe-apps/entities/__tests__/safe-app.b import { SafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository'; import { multisigTransactionBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { ILoggingService } from '@/logging/logging.interface'; -import { SafeAppInfo } from '../../entities/safe-app-info.entity'; -import { SafeAppInfoMapper } from './safe-app-info.mapper'; +import { SafeAppInfo } from '@/routes/transactions/entities/safe-app-info.entity'; +import { SafeAppInfoMapper } from '@/routes/transactions/mappers/common/safe-app-info.mapper'; describe('SafeAppInfo mapper (Unit)', () => { const safeAppsRepositoryMock = jest.mocked({ diff --git a/src/routes/transactions/mappers/common/safe-app-info.mapper.ts b/src/routes/transactions/mappers/common/safe-app-info.mapper.ts index 26d9986fe5..5ba2576556 100644 --- a/src/routes/transactions/mappers/common/safe-app-info.mapper.ts +++ b/src/routes/transactions/mappers/common/safe-app-info.mapper.ts @@ -3,7 +3,7 @@ import { SafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository'; import { ISafeAppsRepository } from '@/domain/safe-apps/safe-apps.repository.interface'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; -import { SafeAppInfo } from '../../entities/safe-app-info.entity'; +import { SafeAppInfo } from '@/routes/transactions/entities/safe-app-info.entity'; @Injectable() export class SafeAppInfoMapper { diff --git a/src/routes/transactions/mappers/common/settings-change.mapper.spec.ts b/src/routes/transactions/mappers/common/settings-change.mapper.spec.ts index dc7f0a7477..da587b691c 100644 --- a/src/routes/transactions/mappers/common/settings-change.mapper.spec.ts +++ b/src/routes/transactions/mappers/common/settings-change.mapper.spec.ts @@ -1,23 +1,23 @@ import { faker } from '@faker-js/faker'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { AddOwner } from '../../entities/settings-changes/add-owner.entity'; -import { ChangeMasterCopy } from '../../entities/settings-changes/change-master-copy.entity'; -import { ChangeThreshold } from '../../entities/settings-changes/change-threshold.entity'; -import { DeleteGuard } from '../../entities/settings-changes/delete-guard'; -import { DisableModule } from '../../entities/settings-changes/disable-module.entity'; -import { EnableModule } from '../../entities/settings-changes/enable-module.entity'; -import { RemoveOwner } from '../../entities/settings-changes/remove-owner.entity'; -import { SetFallbackHandler } from '../../entities/settings-changes/set-fallback-handler.entity'; -import { SetGuard } from '../../entities/settings-changes/set-guard.entity'; -import { SwapOwner } from '../../entities/settings-changes/swap-owner.entity'; -import { DataDecodedParamHelper } from './data-decoded-param.helper'; -import { SettingsChangeMapper } from './settings-change.mapper'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { AddOwner } from '@/routes/transactions/entities/settings-changes/add-owner.entity'; +import { ChangeMasterCopy } from '@/routes/transactions/entities/settings-changes/change-master-copy.entity'; +import { ChangeThreshold } from '@/routes/transactions/entities/settings-changes/change-threshold.entity'; +import { DeleteGuard } from '@/routes/transactions/entities/settings-changes/delete-guard'; +import { DisableModule } from '@/routes/transactions/entities/settings-changes/disable-module.entity'; +import { EnableModule } from '@/routes/transactions/entities/settings-changes/enable-module.entity'; +import { RemoveOwner } from '@/routes/transactions/entities/settings-changes/remove-owner.entity'; +import { SetFallbackHandler } from '@/routes/transactions/entities/settings-changes/set-fallback-handler.entity'; +import { SetGuard } from '@/routes/transactions/entities/settings-changes/set-guard.entity'; +import { SwapOwner } from '@/routes/transactions/entities/settings-changes/swap-owner.entity'; import { multisigTransactionBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { dataDecodedBuilder, dataDecodedParameterBuilder, } from '@/domain/data-decoder/entities/__tests__/data-decoded.builder'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; +import { SettingsChangeMapper } from '@/routes/transactions/mappers/common/settings-change.mapper'; const addressInfoHelper = jest.mocked({ getOrDefault: jest.fn(), diff --git a/src/routes/transactions/mappers/common/settings-change.mapper.ts b/src/routes/transactions/mappers/common/settings-change.mapper.ts index 3e27f1b67d..6e1a6c9427 100644 --- a/src/routes/transactions/mappers/common/settings-change.mapper.ts +++ b/src/routes/transactions/mappers/common/settings-change.mapper.ts @@ -1,22 +1,22 @@ import { Injectable } from '@nestjs/common'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { NULL_ADDRESS } from '../../../common/constants'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { AddOwner } from '../../entities/settings-changes/add-owner.entity'; -import { ChangeMasterCopy } from '../../entities/settings-changes/change-master-copy.entity'; -import { ChangeThreshold } from '../../entities/settings-changes/change-threshold.entity'; -import { DeleteGuard } from '../../entities/settings-changes/delete-guard'; -import { EnableModule } from '../../entities/settings-changes/enable-module.entity'; -import { RemoveOwner } from '../../entities/settings-changes/remove-owner.entity'; -import { SetFallbackHandler } from '../../entities/settings-changes/set-fallback-handler.entity'; -import { SetGuard } from '../../entities/settings-changes/set-guard.entity'; -import { SettingsChange } from '../../entities/settings-changes/settings-change.entity'; -import { SwapOwner } from '../../entities/settings-changes/swap-owner.entity'; -import { DataDecodedParamHelper } from './data-decoded-param.helper'; import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; -import { DisableModule } from '../../entities/settings-changes/disable-module.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { AddOwner } from '@/routes/transactions/entities/settings-changes/add-owner.entity'; +import { ChangeMasterCopy } from '@/routes/transactions/entities/settings-changes/change-master-copy.entity'; +import { ChangeThreshold } from '@/routes/transactions/entities/settings-changes/change-threshold.entity'; +import { DeleteGuard } from '@/routes/transactions/entities/settings-changes/delete-guard'; +import { DisableModule } from '@/routes/transactions/entities/settings-changes/disable-module.entity'; +import { EnableModule } from '@/routes/transactions/entities/settings-changes/enable-module.entity'; +import { RemoveOwner } from '@/routes/transactions/entities/settings-changes/remove-owner.entity'; +import { SetFallbackHandler } from '@/routes/transactions/entities/settings-changes/set-fallback-handler.entity'; +import { SetGuard } from '@/routes/transactions/entities/settings-changes/set-guard.entity'; +import { SettingsChange } from '@/routes/transactions/entities/settings-changes/settings-change.entity'; +import { SwapOwner } from '@/routes/transactions/entities/settings-changes/swap-owner.entity'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; @Injectable() export class SettingsChangeMapper { diff --git a/src/routes/transactions/mappers/common/transaction-data.mapper.spec.ts b/src/routes/transactions/mappers/common/transaction-data.mapper.spec.ts index 6d4e787ddb..16e5dbfadf 100644 --- a/src/routes/transactions/mappers/common/transaction-data.mapper.spec.ts +++ b/src/routes/transactions/mappers/common/transaction-data.mapper.spec.ts @@ -5,13 +5,13 @@ import { dataDecodedBuilder, dataDecodedParameterBuilder, } from '@/domain/data-decoder/entities/__tests__/data-decoded.builder'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { NULL_ADDRESS } from '../../../common/constants'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { MULTI_SEND_METHOD_NAME } from '../../constants'; -import { DataDecodedParamHelper } from './data-decoded-param.helper'; -import { TransactionDataMapper } from './transaction-data.mapper'; import { DELEGATE_OPERATION } from '@/domain/safe/entities/operation.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { MULTI_SEND_METHOD_NAME } from '@/routes/transactions/constants'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; +import { TransactionDataMapper } from '@/routes/transactions/mappers/common/transaction-data.mapper'; const addressInfoHelper = jest.mocked({ get: jest.fn(), diff --git a/src/routes/transactions/mappers/common/transaction-data.mapper.ts b/src/routes/transactions/mappers/common/transaction-data.mapper.ts index 9273fa11c6..f6a7b56b8f 100644 --- a/src/routes/transactions/mappers/common/transaction-data.mapper.ts +++ b/src/routes/transactions/mappers/common/transaction-data.mapper.ts @@ -6,19 +6,19 @@ import { DELEGATE_OPERATION, Operation, } from '@/domain/safe/entities/operation.entity'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { NULL_ADDRESS } from '../../../common/constants'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { Contract } from '../../../contracts/entities/contract.entity'; -import { DataDecoded } from '../../../data-decode/entities/data-decoded.entity'; +import { Contract } from '@/domain/contracts/entities/contract.entity'; +import { DataDecoded } from '@/domain/data-decoder/entities/data-decoded.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; import { - ADDRESS_PARAMETER_TYPE, MULTI_SEND_METHOD_NAME, TRANSACTIONS_PARAMETER_NAME, -} from '../../constants'; -import { PreviewTransactionDto } from '../../entities/preview-transaction.dto.entity'; -import { TransactionData } from '../../entities/transaction-data.entity'; -import { DataDecodedParamHelper } from './data-decoded-param.helper'; + ADDRESS_PARAMETER_TYPE, +} from '@/routes/transactions/constants'; +import { PreviewTransactionDto } from '@/routes/transactions/entities/preview-transaction.dto.entity'; +import { TransactionData } from '@/routes/transactions/entities/transaction-data.entity'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; @Injectable() export class TransactionDataMapper { diff --git a/src/routes/transactions/mappers/common/transaction-info.mapper.ts b/src/routes/transactions/mappers/common/transaction-info.mapper.ts index 07b9254c34..ad8b7821ca 100644 --- a/src/routes/transactions/mappers/common/transaction-info.mapper.ts +++ b/src/routes/transactions/mappers/common/transaction-info.mapper.ts @@ -1,22 +1,22 @@ import { Inject, Injectable } from '@nestjs/common'; +import { IConfigurationService } from '@/config/configuration.service.interface'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Operation } from '@/domain/safe/entities/operation.entity'; import { TokenRepository } from '@/domain/tokens/token.repository'; import { ITokenRepository } from '@/domain/tokens/token.repository.interface'; -import { TokenType } from '../../../balances/entities/token-type.entity'; -import { SettingsChangeTransaction } from '../../entities/settings-change-transaction.entity'; -import { TransactionInfo } from '../../entities/transaction-info.entity'; -import { CustomTransactionMapper } from './custom-transaction.mapper'; -import { DataDecodedParamHelper } from './data-decoded-param.helper'; -import { Erc20TransferMapper } from './erc20-transfer.mapper'; -import { Erc721TransferMapper } from './erc721-transfer.mapper'; -import { NativeCoinTransferMapper } from './native-coin-transfer.mapper'; -import { SettingsChangeMapper } from './settings-change.mapper'; -import { DataDecoded } from '../../../data-decode/entities/data-decoded.entity'; -import { DataDecodedParameter } from '../../../data-decode/entities/data-decoded-parameter.entity'; -import { HumanDescriptionMapper } from './human-description.mapper'; -import { IConfigurationService } from '@/config/configuration.service.interface'; +import { TokenType } from '@/routes/balances/entities/token-type.entity'; +import { DataDecodedParameter } from '@/routes/data-decode/entities/data-decoded-parameter.entity'; +import { DataDecoded } from '@/routes/data-decode/entities/data-decoded.entity'; +import { SettingsChangeTransaction } from '@/routes/transactions/entities/settings-change-transaction.entity'; +import { TransactionInfo } from '@/routes/transactions/entities/transaction-info.entity'; +import { CustomTransactionMapper } from '@/routes/transactions/mappers/common/custom-transaction.mapper'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; +import { Erc20TransferMapper } from '@/routes/transactions/mappers/common/erc20-transfer.mapper'; +import { Erc721TransferMapper } from '@/routes/transactions/mappers/common/erc721-transfer.mapper'; +import { HumanDescriptionMapper } from '@/routes/transactions/mappers/common/human-description.mapper'; +import { NativeCoinTransferMapper } from '@/routes/transactions/mappers/common/native-coin-transfer.mapper'; +import { SettingsChangeMapper } from '@/routes/transactions/mappers/common/settings-change.mapper'; @Injectable() export class MultisigTransactionInfoMapper { diff --git a/src/routes/transactions/mappers/common/transfer-direction.helper.spec.ts b/src/routes/transactions/mappers/common/transfer-direction.helper.spec.ts index d1ba7d5eb8..5665402cba 100644 --- a/src/routes/transactions/mappers/common/transfer-direction.helper.spec.ts +++ b/src/routes/transactions/mappers/common/transfer-direction.helper.spec.ts @@ -1,6 +1,6 @@ import { faker } from '@faker-js/faker'; -import { TransferDirection } from '../../entities/transfer-transaction-info.entity'; -import { getTransferDirection } from './transfer-direction.helper'; +import { TransferDirection } from '@/routes/transactions/entities/transfer-transaction-info.entity'; +import { getTransferDirection } from '@/routes/transactions/mappers/common/transfer-direction.helper'; describe('Transfer direction helper (Unit)', () => { it('should return Outgoing direction when a Safe is in the from direction', () => { diff --git a/src/routes/transactions/mappers/common/transfer-direction.helper.ts b/src/routes/transactions/mappers/common/transfer-direction.helper.ts index ceed4554b2..a7e1303998 100644 --- a/src/routes/transactions/mappers/common/transfer-direction.helper.ts +++ b/src/routes/transactions/mappers/common/transfer-direction.helper.ts @@ -1,4 +1,4 @@ -import { TransferDirection } from '../../entities/transfer-transaction-info.entity'; +import { TransferDirection } from '@/routes/transactions/entities/transfer-transaction-info.entity'; export function getTransferDirection( safeAddress: string, diff --git a/src/routes/transactions/mappers/creation-transaction/creation-transaction.mapper.ts b/src/routes/transactions/mappers/creation-transaction/creation-transaction.mapper.ts index 73e746f864..135ccd4629 100644 --- a/src/routes/transactions/mappers/creation-transaction/creation-transaction.mapper.ts +++ b/src/routes/transactions/mappers/creation-transaction/creation-transaction.mapper.ts @@ -1,10 +1,10 @@ -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; import { Injectable } from '@nestjs/common'; import { Safe } from '@/domain/safe/entities/safe.entity'; -import { Transaction } from '../../entities/transaction.entity'; import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; -import { CreationTransactionInfo } from '../../entities/creation-transaction-info.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { CreationTransactionInfo } from '@/routes/transactions/entities/creation-transaction-info.entity'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; @Injectable() export class CreationTransactionMapper { diff --git a/src/routes/transactions/mappers/module-transactions/module-transaction-details.mapper.spec.ts b/src/routes/transactions/mappers/module-transactions/module-transaction-details.mapper.spec.ts index c875d7ba0a..a833fae1c2 100644 --- a/src/routes/transactions/mappers/module-transactions/module-transaction-details.mapper.spec.ts +++ b/src/routes/transactions/mappers/module-transactions/module-transaction-details.mapper.spec.ts @@ -2,15 +2,15 @@ import { faker } from '@faker-js/faker'; import { sample } from 'lodash'; import { moduleTransactionBuilder } from '@/domain/safe/entities/__tests__/module-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; -import { addressInfoBuilder } from '../../../common/__tests__/entities/address-info.builder'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { transferTransactionInfoBuilder } from '../../entities/__tests__/transfer-transaction-info.builder'; -import { ModuleExecutionDetails } from '../../entities/transaction-details/module-execution-details.entity'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; -import { TransactionDataMapper } from '../common/transaction-data.mapper'; -import { MultisigTransactionInfoMapper } from '../common/transaction-info.mapper'; -import { ModuleTransactionDetailsMapper } from './module-transaction-details.mapper'; -import { ModuleTransactionStatusMapper } from './module-transaction-status.mapper'; +import { addressInfoBuilder } from '@/routes/common/__tests__/entities/address-info.builder'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { transferTransactionInfoBuilder } from '@/routes/transactions/entities/__tests__/transfer-transaction-info.builder'; +import { ModuleExecutionDetails } from '@/routes/transactions/entities/transaction-details/module-execution-details.entity'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; +import { TransactionDataMapper } from '@/routes/transactions/mappers/common/transaction-data.mapper'; +import { MultisigTransactionInfoMapper } from '@/routes/transactions/mappers/common/transaction-info.mapper'; +import { ModuleTransactionDetailsMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction-details.mapper'; +import { ModuleTransactionStatusMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction-status.mapper'; describe('ModuleTransactionDetails mapper (Unit)', () => { let mapper: ModuleTransactionDetailsMapper; diff --git a/src/routes/transactions/mappers/module-transactions/module-transaction-details.mapper.ts b/src/routes/transactions/mappers/module-transactions/module-transaction-details.mapper.ts index 4fa4943f52..27ffcc043c 100644 --- a/src/routes/transactions/mappers/module-transactions/module-transaction-details.mapper.ts +++ b/src/routes/transactions/mappers/module-transactions/module-transaction-details.mapper.ts @@ -1,17 +1,17 @@ import { Injectable } from '@nestjs/common'; import { isEmpty } from 'lodash'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; import { MODULE_TRANSACTION_PREFIX, TRANSACTION_ID_SEPARATOR, -} from '../../constants'; -import { TransactionData } from '../../entities/transaction-data.entity'; -import { ModuleExecutionDetails } from '../../entities/transaction-details/module-execution-details.entity'; -import { TransactionDetails } from '../../entities/transaction-details/transaction-details.entity'; -import { TransactionDataMapper } from '../common/transaction-data.mapper'; -import { MultisigTransactionInfoMapper } from '../common/transaction-info.mapper'; -import { ModuleTransactionStatusMapper } from './module-transaction-status.mapper'; +} from '@/routes/transactions/constants'; +import { TransactionData } from '@/routes/transactions/entities/transaction-data.entity'; +import { ModuleExecutionDetails } from '@/routes/transactions/entities/transaction-details/module-execution-details.entity'; +import { TransactionDetails } from '@/routes/transactions/entities/transaction-details/transaction-details.entity'; +import { MultisigTransactionInfoMapper } from '@/routes/transactions/mappers/common/transaction-info.mapper'; +import { ModuleTransactionStatusMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction-status.mapper'; +import { TransactionDataMapper } from '@/routes/transactions/mappers/common/transaction-data.mapper'; @Injectable() export class ModuleTransactionDetailsMapper { diff --git a/src/routes/transactions/mappers/module-transactions/module-transaction-status.mapper.ts b/src/routes/transactions/mappers/module-transactions/module-transaction-status.mapper.ts index c14f9e19ca..4ae69a4020 100644 --- a/src/routes/transactions/mappers/module-transactions/module-transaction-status.mapper.ts +++ b/src/routes/transactions/mappers/module-transactions/module-transaction-status.mapper.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; @Injectable() export class ModuleTransactionStatusMapper { diff --git a/src/routes/transactions/mappers/module-transactions/module-transaction.mapper.ts b/src/routes/transactions/mappers/module-transactions/module-transaction.mapper.ts index 6fc0cf0515..7a08785140 100644 --- a/src/routes/transactions/mappers/module-transactions/module-transaction.mapper.ts +++ b/src/routes/transactions/mappers/module-transactions/module-transaction.mapper.ts @@ -1,14 +1,14 @@ -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; import { Injectable } from '@nestjs/common'; -import { Transaction } from '../../entities/transaction.entity'; -import { MultisigTransactionInfoMapper } from '../common/transaction-info.mapper'; -import { ModuleTransactionStatusMapper } from './module-transaction-status.mapper'; import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; -import { ModuleExecutionInfo } from '../../entities/module-execution-info.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; import { MODULE_TRANSACTION_PREFIX, TRANSACTION_ID_SEPARATOR, -} from '../../constants'; +} from '@/routes/transactions/constants'; +import { ModuleExecutionInfo } from '@/routes/transactions/entities/module-execution-info.entity'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; +import { MultisigTransactionInfoMapper } from '@/routes/transactions/mappers/common/transaction-info.mapper'; +import { ModuleTransactionStatusMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction-status.mapper'; @Injectable() export class ModuleTransactionMapper { diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper.spec.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper.spec.ts index a0b4b33b71..93dd09df02 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper.spec.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper.spec.ts @@ -2,18 +2,18 @@ import { faker } from '@faker-js/faker'; import { sample } from 'lodash'; import { multisigTransactionBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; -import { addressInfoBuilder } from '../../../common/__tests__/entities/address-info.builder'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { safeAppInfoBuilder } from '../../entities/__tests__/safe-app-info.builder'; -import { transferTransactionInfoBuilder } from '../../entities/__tests__/transfer-transaction-info.builder'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; -import { multisigExecutionDetailsBuilder } from '../__tests__/multisig-execution-details.builder'; -import { SafeAppInfoMapper } from '../common/safe-app-info.mapper'; -import { TransactionDataMapper } from '../common/transaction-data.mapper'; -import { MultisigTransactionInfoMapper } from '../common/transaction-info.mapper'; -import { MultisigTransactionDetailsMapper } from './multisig-transaction-details.mapper'; -import { MultisigTransactionExecutionDetailsMapper } from './multisig-transaction-execution-details.mapper'; -import { MultisigTransactionStatusMapper } from './multisig-transaction-status.mapper'; +import { addressInfoBuilder } from '@/routes/common/__tests__/entities/address-info.builder'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { safeAppInfoBuilder } from '@/routes/transactions/entities/__tests__/safe-app-info.builder'; +import { transferTransactionInfoBuilder } from '@/routes/transactions/entities/__tests__/transfer-transaction-info.builder'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; +import { multisigExecutionDetailsBuilder } from '@/routes/transactions/mappers/__tests__/multisig-execution-details.builder'; +import { SafeAppInfoMapper } from '@/routes/transactions/mappers/common/safe-app-info.mapper'; +import { TransactionDataMapper } from '@/routes/transactions/mappers/common/transaction-data.mapper'; +import { MultisigTransactionInfoMapper } from '@/routes/transactions/mappers/common/transaction-info.mapper'; +import { MultisigTransactionDetailsMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper'; +import { MultisigTransactionExecutionDetailsMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper'; +import { MultisigTransactionStatusMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper'; const addressInfoHelper = jest.mocked({ getOrDefault: jest.fn(), diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper.ts index bc2862cbe2..4bc50fbcf1 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper.ts @@ -2,19 +2,19 @@ import { Injectable } from '@nestjs/common'; import { isEmpty } from 'lodash'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Safe } from '@/domain/safe/entities/safe.entity'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; import { MULTISIG_TRANSACTION_PREFIX, TRANSACTION_ID_SEPARATOR, -} from '../../constants'; -import { TransactionData } from '../../entities/transaction-data.entity'; -import { TransactionDetails } from '../../entities/transaction-details/transaction-details.entity'; -import { SafeAppInfoMapper } from '../common/safe-app-info.mapper'; -import { TransactionDataMapper } from '../common/transaction-data.mapper'; -import { MultisigTransactionInfoMapper } from '../common/transaction-info.mapper'; -import { MultisigTransactionExecutionDetailsMapper } from './multisig-transaction-execution-details.mapper'; -import { MultisigTransactionStatusMapper } from './multisig-transaction-status.mapper'; +} from '@/routes/transactions/constants'; +import { TransactionData } from '@/routes/transactions/entities/transaction-data.entity'; +import { TransactionDetails } from '@/routes/transactions/entities/transaction-details/transaction-details.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { SafeAppInfoMapper } from '@/routes/transactions/mappers/common/safe-app-info.mapper'; +import { TransactionDataMapper } from '@/routes/transactions/mappers/common/transaction-data.mapper'; +import { MultisigTransactionInfoMapper } from '@/routes/transactions/mappers/common/transaction-info.mapper'; +import { MultisigTransactionExecutionDetailsMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper'; +import { MultisigTransactionStatusMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper'; @Injectable() export class MultisigTransactionDetailsMapper { diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper.spec.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper.spec.ts index 875ed4ec9a..7cc1575ada 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper.spec.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper.spec.ts @@ -8,12 +8,12 @@ import { SafeRepository } from '@/domain/safe/safe.repository'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; import { TokenRepository } from '@/domain/tokens/token.repository'; import { ILoggingService } from '@/logging/logging.interface'; -import { addressInfoBuilder } from '../../../common/__tests__/entities/address-info.builder'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { NULL_ADDRESS } from '../../../common/constants'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { MultisigConfirmationDetails } from '../../entities/transaction-details/multisig-execution-details.entity'; -import { MultisigTransactionExecutionDetailsMapper } from './multisig-transaction-execution-details.mapper'; +import { addressInfoBuilder } from '@/routes/common/__tests__/entities/address-info.builder'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { MultisigConfirmationDetails } from '@/routes/transactions/entities/transaction-details/multisig-execution-details.entity'; +import { MultisigTransactionExecutionDetailsMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper'; const addressInfoHelper = jest.mocked({ getOrDefault: jest.fn(), diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper.ts index d9b6d7583d..a3b16d05d6 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper.ts @@ -6,13 +6,13 @@ import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; import { TokenRepository } from '@/domain/tokens/token.repository'; import { ITokenRepository } from '@/domain/tokens/token.repository.interface'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { NULL_ADDRESS } from '../../../common/constants'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { NULL_ADDRESS } from '@/routes/common/constants'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; import { - MultisigConfirmationDetails, MultisigExecutionDetails, -} from '../../entities/transaction-details/multisig-execution-details.entity'; + MultisigConfirmationDetails, +} from '@/routes/transactions/entities/transaction-details/multisig-execution-details.entity'; @Injectable() export class MultisigTransactionExecutionDetailsMapper { diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper.spec.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper.spec.ts index 7c692eed05..2e966056fd 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper.spec.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper.spec.ts @@ -2,10 +2,10 @@ import { faker } from '@faker-js/faker'; import { confirmationBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder'; import { multisigTransactionBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { MultisigExecutionInfo } from '../../entities/multisig-execution-info.entity'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; -import { MultisigTransactionExecutionInfoMapper } from './multisig-transaction-execution-info.mapper'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { MultisigExecutionInfo } from '@/routes/transactions/entities/multisig-execution-info.entity'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; +import { MultisigTransactionExecutionInfoMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper'; describe('Multisig Transaction execution info mapper (Unit)', () => { let mapper: MultisigTransactionExecutionInfoMapper; diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper.ts index e6d081fe9d..87cce198d9 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Safe } from '@/domain/safe/entities/safe.entity'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { MultisigExecutionInfo } from '../../entities/multisig-execution-info.entity'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { MultisigExecutionInfo } from '@/routes/transactions/entities/multisig-execution-info.entity'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; @Injectable() export class MultisigTransactionExecutionInfoMapper { diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper.spec.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper.spec.ts index 5051384b5a..20e87f8d59 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper.spec.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper.spec.ts @@ -1,8 +1,8 @@ -import { TransactionStatus } from '../../entities/transaction-status.entity'; -import { MultisigTransactionStatusMapper } from './multisig-transaction-status.mapper'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; import { multisigTransactionBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { confirmationBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; +import { MultisigTransactionStatusMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper'; describe('Multisig Transaction status mapper (Unit)', () => { let mapper: MultisigTransactionStatusMapper; diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper.ts index 7c4860cd77..5dabeb576d 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Safe } from '@/domain/safe/entities/safe.entity'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; @Injectable() export class MultisigTransactionStatusMapper { diff --git a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction.mapper.ts b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction.mapper.ts index 10afa8ba9a..db5a7bad96 100644 --- a/src/routes/transactions/mappers/multisig-transactions/multisig-transaction.mapper.ts +++ b/src/routes/transactions/mappers/multisig-transactions/multisig-transaction.mapper.ts @@ -1,15 +1,15 @@ import { Injectable } from '@nestjs/common'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Safe } from '@/domain/safe/entities/safe.entity'; -import { Transaction } from '../../entities/transaction.entity'; -import { MultisigTransactionExecutionInfoMapper } from './multisig-transaction-execution-info.mapper'; -import { MultisigTransactionInfoMapper } from '../common/transaction-info.mapper'; -import { MultisigTransactionStatusMapper } from './multisig-transaction-status.mapper'; -import { SafeAppInfoMapper } from '../common/safe-app-info.mapper'; import { MULTISIG_TRANSACTION_PREFIX, TRANSACTION_ID_SEPARATOR, -} from '../../constants'; +} from '@/routes/transactions/constants'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; +import { SafeAppInfoMapper } from '@/routes/transactions/mappers/common/safe-app-info.mapper'; +import { MultisigTransactionInfoMapper } from '@/routes/transactions/mappers/common/transaction-info.mapper'; +import { MultisigTransactionExecutionInfoMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper'; +import { MultisigTransactionStatusMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper'; @Injectable() export class MultisigTransactionMapper { diff --git a/src/routes/transactions/mappers/queued-items/queued-items.mapper.ts b/src/routes/transactions/mappers/queued-items/queued-items.mapper.ts index 41511d3766..f11536b48d 100644 --- a/src/routes/transactions/mappers/queued-items/queued-items.mapper.ts +++ b/src/routes/transactions/mappers/queued-items/queued-items.mapper.ts @@ -2,16 +2,16 @@ import { Injectable } from '@nestjs/common'; import { flatten, groupBy } from 'lodash'; import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Safe } from '@/domain/safe/entities/safe.entity'; -import { Page } from '../../../common/entities/page.entity'; -import { ConflictType } from '../../entities/conflict-type.entity'; -import { QueuedItem } from '../../entities/queued-item.entity'; -import { ConflictHeaderQueuedItem } from '../../entities/queued-items/conflict-header-queued-item.entity'; +import { MultisigTransactionMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction.mapper'; +import { Page } from '@/domain/entities/page.entity'; +import { ConflictType } from '@/routes/transactions/entities/conflict-type.entity'; +import { QueuedItem } from '@/routes/transactions/entities/queued-item.entity'; +import { ConflictHeaderQueuedItem } from '@/routes/transactions/entities/queued-items/conflict-header-queued-item.entity'; import { - LabelItem, LabelQueuedItem, -} from '../../entities/queued-items/label-queued-item.entity'; -import { TransactionQueuedItem } from '../../entities/queued-items/transaction-queued-item.entity'; -import { MultisigTransactionMapper } from '../multisig-transactions/multisig-transaction.mapper'; + LabelItem, +} from '@/routes/transactions/entities/queued-items/label-queued-item.entity'; +import { TransactionQueuedItem } from '@/routes/transactions/entities/queued-items/transaction-queued-item.entity'; class TransactionGroup { nonce: number; diff --git a/src/routes/transactions/mappers/transaction-preview.mapper.ts b/src/routes/transactions/mappers/transaction-preview.mapper.ts index e88926bbbd..f7ed488939 100644 --- a/src/routes/transactions/mappers/transaction-preview.mapper.ts +++ b/src/routes/transactions/mappers/transaction-preview.mapper.ts @@ -4,10 +4,10 @@ import { IDataDecodedRepository } from '@/domain/data-decoder/data-decoded.repos import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { Safe } from '@/domain/safe/entities/safe.entity'; import { ILoggingService, LoggingService } from '@/logging/logging.interface'; -import { PreviewTransactionDto } from '../entities/preview-transaction.dto.entity'; -import { TransactionPreview } from '../entities/transaction-preview.entity'; -import { TransactionDataMapper } from './common/transaction-data.mapper'; -import { MultisigTransactionInfoMapper } from './common/transaction-info.mapper'; +import { PreviewTransactionDto } from '@/routes/transactions/entities/preview-transaction.dto.entity'; +import { TransactionPreview } from '@/routes/transactions/entities/transaction-preview.entity'; +import { TransactionDataMapper } from '@/routes/transactions/mappers/common/transaction-data.mapper'; +import { MultisigTransactionInfoMapper } from '@/routes/transactions/mappers/common/transaction-info.mapper'; @Injectable() export class TransactionPreviewMapper { diff --git a/src/routes/transactions/mappers/transactions-history.mapper.ts b/src/routes/transactions/mappers/transactions-history.mapper.ts index 424dbabb2d..88e0a90605 100644 --- a/src/routes/transactions/mappers/transactions-history.mapper.ts +++ b/src/routes/transactions/mappers/transactions-history.mapper.ts @@ -1,24 +1,24 @@ import { Injectable } from '@nestjs/common'; +import { groupBy } from 'lodash'; +import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; +import { EthereumTransaction } from '@/domain/safe/entities/ethereum-transaction.entity'; +import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; +import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; +import { Safe } from '@/domain/safe/entities/safe.entity'; import { isCreationTransaction, isEthereumTransaction, isModuleTransaction, isMultisigTransaction, Transaction as TransactionDomain, -} from '../../../domain/safe/entities/transaction.entity'; -import { Safe } from '@/domain/safe/entities/safe.entity'; -import { ModuleTransactionMapper } from './module-transactions/module-transaction.mapper'; -import { MultisigTransactionMapper } from './multisig-transactions/multisig-transaction.mapper'; -import { MultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; -import { ModuleTransaction } from '@/domain/safe/entities/module-transaction.entity'; -import { EthereumTransaction } from '@/domain/safe/entities/ethereum-transaction.entity'; -import { groupBy } from 'lodash'; -import { IncomingTransferMapper } from './transfers/transfer.mapper'; -import { TransactionItem } from '../entities/transaction-item.entity'; -import { DateLabel } from '../../common/entities/date-label.entity'; +} from '@/domain/safe/entities/transaction.entity'; import { Transfer } from '@/domain/safe/entities/transfer.entity'; -import { CreationTransaction } from '@/domain/safe/entities/creation-transaction.entity'; -import { CreationTransactionMapper } from './creation-transaction/creation-transaction.mapper'; +import { DateLabel } from '@/routes/common/entities/date-label.entity'; +import { TransactionItem } from '@/routes/transactions/entities/transaction-item.entity'; +import { CreationTransactionMapper } from '@/routes/transactions/mappers/creation-transaction/creation-transaction.mapper'; +import { ModuleTransactionMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction.mapper'; +import { MultisigTransactionMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction.mapper'; +import { IncomingTransferMapper } from '@/routes/transactions/mappers/transfers/transfer.mapper'; class TransactionDomainGroup { timestamp: number; diff --git a/src/routes/transactions/mappers/transfers/transfer-details.mapper.spec.ts b/src/routes/transactions/mappers/transfers/transfer-details.mapper.spec.ts index f416c8fc0f..bd46bd6054 100644 --- a/src/routes/transactions/mappers/transfers/transfer-details.mapper.spec.ts +++ b/src/routes/transactions/mappers/transfers/transfer-details.mapper.spec.ts @@ -1,9 +1,9 @@ import { faker } from '@faker-js/faker'; import { erc20TransferBuilder } from '@/domain/safe/entities/__tests__/erc20-transfer.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; -import { transferTransactionInfoBuilder } from '../../entities/__tests__/transfer-transaction-info.builder'; -import { TransferDetailsMapper } from './transfer-details.mapper'; -import { TransferInfoMapper } from './transfer-info.mapper'; +import { transferTransactionInfoBuilder } from '@/routes/transactions/entities/__tests__/transfer-transaction-info.builder'; +import { TransferDetailsMapper } from '@/routes/transactions/mappers/transfers/transfer-details.mapper'; +import { TransferInfoMapper } from '@/routes/transactions/mappers/transfers/transfer-info.mapper'; const transferInfoMapper = jest.mocked({ mapTransferInfo: jest.fn(), diff --git a/src/routes/transactions/mappers/transfers/transfer-details.mapper.ts b/src/routes/transactions/mappers/transfers/transfer-details.mapper.ts index 50ccdda43c..430a2b21ef 100644 --- a/src/routes/transactions/mappers/transfers/transfer-details.mapper.ts +++ b/src/routes/transactions/mappers/transfers/transfer-details.mapper.ts @@ -1,10 +1,13 @@ import { Injectable } from '@nestjs/common'; import { Safe } from '@/domain/safe/entities/safe.entity'; import { Transfer } from '@/domain/safe/entities/transfer.entity'; -import { TRANSACTION_ID_SEPARATOR, TRANSFER_PREFIX } from '../../constants'; -import { TransactionDetails } from '../../entities/transaction-details/transaction-details.entity'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; -import { TransferInfoMapper } from './transfer-info.mapper'; +import { + TRANSFER_PREFIX, + TRANSACTION_ID_SEPARATOR, +} from '@/routes/transactions/constants'; +import { TransactionDetails } from '@/routes/transactions/entities/transaction-details/transaction-details.entity'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; +import { TransferInfoMapper } from '@/routes/transactions/mappers/transfers/transfer-info.mapper'; @Injectable() export class TransferDetailsMapper { diff --git a/src/routes/transactions/mappers/transfers/transfer-info.mapper.spec.ts b/src/routes/transactions/mappers/transfers/transfer-info.mapper.spec.ts index 25a94b69be..ae4f6e8edd 100644 --- a/src/routes/transactions/mappers/transfers/transfer-info.mapper.spec.ts +++ b/src/routes/transactions/mappers/transfers/transfer-info.mapper.spec.ts @@ -1,20 +1,20 @@ import { faker } from '@faker-js/faker'; import { TokenRepository } from '@/domain/tokens/token.repository'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { AddressInfo } from '../../../common/entities/address-info.entity'; -import { - TransferDirection, - TransferTransactionInfo, -} from '../../entities/transfer-transaction-info.entity'; -import { Erc20Transfer } from '../../entities/transfers/erc20-transfer.entity'; -import { Erc721Transfer } from '../../entities/transfers/erc721-transfer.entity'; -import { NativeCoinTransfer } from '../../entities/transfers/native-coin-transfer.entity'; -import { TransferInfoMapper } from './transfer-info.mapper'; import { erc20TransferBuilder } from '@/domain/safe/entities/__tests__/erc20-transfer.builder'; import { erc721TransferBuilder } from '@/domain/safe/entities/__tests__/erc721-transfer.builder'; import { nativeTokenTransferBuilder } from '@/domain/safe/entities/__tests__/native-token-transfer.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { AddressInfo } from '@/routes/common/entities/address-info.entity'; +import { + TransferTransactionInfo, + TransferDirection, +} from '@/routes/transactions/entities/transfer-transaction-info.entity'; +import { Erc20Transfer } from '@/routes/transactions/entities/transfers/erc20-transfer.entity'; +import { Erc721Transfer } from '@/routes/transactions/entities/transfers/erc721-transfer.entity'; +import { NativeCoinTransfer } from '@/routes/transactions/entities/transfers/native-coin-transfer.entity'; +import { TransferInfoMapper } from '@/routes/transactions/mappers/transfers/transfer-info.mapper'; const addressInfoHelper = jest.mocked({ getOrDefault: jest.fn(), diff --git a/src/routes/transactions/mappers/transfers/transfer-info.mapper.ts b/src/routes/transactions/mappers/transfers/transfer-info.mapper.ts index c45ef2c7d4..ab25f07b62 100644 --- a/src/routes/transactions/mappers/transfers/transfer-info.mapper.ts +++ b/src/routes/transactions/mappers/transfers/transfer-info.mapper.ts @@ -5,17 +5,17 @@ import { isERC721Transfer, isNativeTokenTransfer, Transfer as DomainTransfer, -} from '../../../../domain/safe/entities/transfer.entity'; +} from '@/domain/safe/entities/transfer.entity'; import { Token } from '@/domain/tokens/entities/token.entity'; import { TokenRepository } from '@/domain/tokens/token.repository'; import { ITokenRepository } from '@/domain/tokens/token.repository.interface'; -import { AddressInfoHelper } from '../../../common/address-info/address-info.helper'; -import { TransferTransactionInfo } from '../../entities/transfer-transaction-info.entity'; -import { Erc20Transfer } from '../../entities/transfers/erc20-transfer.entity'; -import { Erc721Transfer } from '../../entities/transfers/erc721-transfer.entity'; -import { NativeCoinTransfer } from '../../entities/transfers/native-coin-transfer.entity'; -import { Transfer } from '../../entities/transfers/transfer.entity'; -import { getTransferDirection } from '../common/transfer-direction.helper'; +import { AddressInfoHelper } from '@/routes/common/address-info/address-info.helper'; +import { TransferTransactionInfo } from '@/routes/transactions/entities/transfer-transaction-info.entity'; +import { Erc20Transfer } from '@/routes/transactions/entities/transfers/erc20-transfer.entity'; +import { Erc721Transfer } from '@/routes/transactions/entities/transfers/erc721-transfer.entity'; +import { NativeCoinTransfer } from '@/routes/transactions/entities/transfers/native-coin-transfer.entity'; +import { getTransferDirection } from '@/routes/transactions/mappers/common/transfer-direction.helper'; +import { Transfer } from '@/routes/transactions/entities/transfers/transfer.entity'; @Injectable() export class TransferInfoMapper { diff --git a/src/routes/transactions/mappers/transfers/transfer.mapper.ts b/src/routes/transactions/mappers/transfers/transfer.mapper.ts index 29e6f004f9..a45560ad48 100644 --- a/src/routes/transactions/mappers/transfers/transfer.mapper.ts +++ b/src/routes/transactions/mappers/transfers/transfer.mapper.ts @@ -1,10 +1,13 @@ import { Injectable } from '@nestjs/common'; import { Safe } from '@/domain/safe/entities/safe.entity'; import { Transfer } from '@/domain/safe/entities/transfer.entity'; -import { TRANSACTION_ID_SEPARATOR, TRANSFER_PREFIX } from '../../constants'; -import { TransactionStatus } from '../../entities/transaction-status.entity'; -import { Transaction } from '../../entities/transaction.entity'; -import { TransferInfoMapper } from './transfer-info.mapper'; +import { + TRANSFER_PREFIX, + TRANSACTION_ID_SEPARATOR, +} from '@/routes/transactions/constants'; +import { TransactionStatus } from '@/routes/transactions/entities/transaction-status.entity'; +import { TransferInfoMapper } from '@/routes/transactions/mappers/transfers/transfer-info.mapper'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; @Injectable() export class IncomingTransferMapper { diff --git a/src/routes/transactions/pipes/add-confirmation.validation.pipe.ts b/src/routes/transactions/pipes/add-confirmation.validation.pipe.ts index 661ffa5af3..90c32a9047 100644 --- a/src/routes/transactions/pipes/add-confirmation.validation.pipe.ts +++ b/src/routes/transactions/pipes/add-confirmation.validation.pipe.ts @@ -2,11 +2,11 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; import { GenericValidator } from '@/validation/providers/generic.validator'; import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { AddConfirmationDto } from '../entities/add-confirmation.dto'; import { ADD_CONFIRMATION_DTO_SCHEMA_ID, addConfirmationDtoSchema, -} from '../entities/schemas/add-confirmation.dto.schema'; +} from '@/routes/transactions/entities/schemas/add-confirmation.dto.schema'; +import { AddConfirmationDto } from '@/routes/transactions/entities/add-confirmation.dto'; @Injectable() export class AddConfirmationDtoValidationPipe diff --git a/src/routes/transactions/pipes/preview-transaction.validation.pipe.ts b/src/routes/transactions/pipes/preview-transaction.validation.pipe.ts index 55a53fd6cc..51271d44ca 100644 --- a/src/routes/transactions/pipes/preview-transaction.validation.pipe.ts +++ b/src/routes/transactions/pipes/preview-transaction.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { PreviewTransactionDto } from '../entities/preview-transaction.dto.entity'; +import { PreviewTransactionDto } from '@/routes/transactions/entities/preview-transaction.dto.entity'; import { PREVIEW_TRANSACTION_DTO_SCHEMA_ID, previewTransactionDtoSchema, -} from '../entities/schemas/preview-transaction.dto.schema'; +} from '@/routes/transactions/entities/schemas/preview-transaction.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class PreviewTransactionDtoValidationPipe diff --git a/src/routes/transactions/pipes/propose-transaction.dto.validation.pipe.ts b/src/routes/transactions/pipes/propose-transaction.dto.validation.pipe.ts index 6d5457c4fb..bcebe6f1b0 100644 --- a/src/routes/transactions/pipes/propose-transaction.dto.validation.pipe.ts +++ b/src/routes/transactions/pipes/propose-transaction.dto.validation.pipe.ts @@ -1,12 +1,12 @@ import { HttpStatus, Injectable, PipeTransform } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from '@/validation/providers/generic.validator'; -import { JsonSchemaService } from '@/validation/providers/json-schema.service'; -import { ProposeTransactionDto } from '../entities/propose-transaction.dto.entity'; +import { ProposeTransactionDto } from '@/routes/transactions/entities/propose-transaction.dto.entity'; import { PROPOSE_TRANSACTION_DTO_SCHEMA_ID, proposeTransactionDtoSchema, -} from '../entities/schemas/propose-transaction.dto.schema'; +} from '@/routes/transactions/entities/schemas/propose-transaction.dto.schema'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; @Injectable() export class ProposeTransactionDtoValidationPipe diff --git a/src/routes/transactions/transactions-history.controller.spec.ts b/src/routes/transactions/transactions-history.controller.spec.ts index a61fd0afa9..c0b18b9978 100644 --- a/src/routes/transactions/transactions-history.controller.spec.ts +++ b/src/routes/transactions/transactions-history.controller.spec.ts @@ -5,7 +5,7 @@ import * as request from 'supertest'; import { TestAppProvider } from '@/__tests__/test-app.provider'; import { ConfigurationModule } from '@/config/configuration.module'; import { IConfigurationService } from '@/config/configuration.service.interface'; -import configuration from '../../config/entities/__tests__/configuration'; +import configuration from '@/config/entities/__tests__/configuration'; import { TestCacheModule } from '@/datasources/cache/__tests__/test.cache.module'; import { TestNetworkModule } from '@/datasources/network/__tests__/test.network.module'; import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder'; @@ -17,24 +17,24 @@ import { pageBuilder } from '@/domain/entities/__tests__/page.builder'; import { creationTransactionBuilder, toJson as creationTransactionToJson, -} from '../../domain/safe/entities/__tests__/creation-transaction.builder'; +} from '@/domain/safe/entities/__tests__/creation-transaction.builder'; import { ethereumTransactionBuilder, toJson as ethereumTransactionToJson, -} from '../../domain/safe/entities/__tests__/ethereum-transaction.builder'; +} from '@/domain/safe/entities/__tests__/ethereum-transaction.builder'; import { moduleTransactionBuilder, toJson as moduleTransactionToJson, -} from '../../domain/safe/entities/__tests__/module-transaction.builder'; +} from '@/domain/safe/entities/__tests__/module-transaction.builder'; import { confirmationBuilder } from '@/domain/safe/entities/__tests__/multisig-transaction-confirmation.builder'; import { multisigTransactionBuilder, toJson as multisigTransactionToJson, -} from '../../domain/safe/entities/__tests__/multisig-transaction.builder'; +} from '@/domain/safe/entities/__tests__/multisig-transaction.builder'; import { nativeTokenTransferBuilder, toJson as nativeTokenTransferToJson, -} from '../../domain/safe/entities/__tests__/native-token-transfer.builder'; +} from '@/domain/safe/entities/__tests__/native-token-transfer.builder'; import { safeBuilder } from '@/domain/safe/entities/__tests__/safe.builder'; import { tokenBuilder } from '@/domain/tokens/__tests__/token.builder'; import { TokenType } from '@/domain/tokens/entities/token.entity'; diff --git a/src/routes/transactions/transactions.controller.ts b/src/routes/transactions/transactions.controller.ts index f0afcfbcd2..96258e4e68 100644 --- a/src/routes/transactions/transactions.controller.ts +++ b/src/routes/transactions/transactions.controller.ts @@ -11,29 +11,29 @@ import { Query, } from '@nestjs/common'; import { ApiOkResponse, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { PaginationDataDecorator } from '../common/decorators/pagination.data.decorator'; -import { RouteUrlDecorator } from '../common/decorators/route.url.decorator'; -import { Page } from '../common/entities/page.entity'; -import { PaginationData } from '../common/pagination/pagination.data'; -import { AddConfirmationDto } from './entities/add-confirmation.dto'; -import { IncomingTransferPage } from './entities/incoming-transfer-page.entity'; -import { IncomingTransfer } from './entities/incoming-transfer.entity'; -import { ModuleTransactionPage } from './entities/module-transaction-page.entity'; -import { ModuleTransaction } from './entities/module-transaction.entity'; -import { MultisigTransactionPage } from './entities/multisig-transaction-page.entity'; -import { MultisigTransaction } from './entities/multisig-transaction.entity'; -import { PreviewTransactionDto } from './entities/preview-transaction.dto.entity'; -import { QueuedItemPage } from './entities/queued-item-page.entity'; -import { QueuedItem } from './entities/queued-item.entity'; -import { TransactionItemPage } from './entities/transaction-item-page.entity'; -import { TransactionPreview } from './entities/transaction-preview.entity'; -import { PreviewTransactionDtoValidationPipe } from './pipes/preview-transaction.validation.pipe'; -import { ProposeTransactionDto } from './entities/propose-transaction.dto.entity'; -import { ProposeTransactionDtoValidationPipe } from './pipes/propose-transaction.dto.validation.pipe'; -import { AddConfirmationDtoValidationPipe } from './pipes/add-confirmation.validation.pipe'; -import { TransactionsService } from './transactions.service'; -import { Transaction } from './entities/transaction.entity'; -import { TransactionDetails } from './entities/transaction-details/transaction-details.entity'; +import { PaginationDataDecorator } from '@/routes/common/decorators/pagination.data.decorator'; +import { RouteUrlDecorator } from '@/routes/common/decorators/route.url.decorator'; +import { Page } from '@/routes/common/entities/page.entity'; +import { PaginationData } from '@/routes/common/pagination/pagination.data'; +import { AddConfirmationDto } from '@/routes/transactions/entities/add-confirmation.dto'; +import { IncomingTransferPage } from '@/routes/transactions/entities/incoming-transfer-page.entity'; +import { IncomingTransfer } from '@/routes/transactions/entities/incoming-transfer.entity'; +import { ModuleTransactionPage } from '@/routes/transactions/entities/module-transaction-page.entity'; +import { ModuleTransaction } from '@/routes/transactions/entities/module-transaction.entity'; +import { MultisigTransactionPage } from '@/routes/transactions/entities/multisig-transaction-page.entity'; +import { MultisigTransaction } from '@/routes/transactions/entities/multisig-transaction.entity'; +import { PreviewTransactionDto } from '@/routes/transactions/entities/preview-transaction.dto.entity'; +import { ProposeTransactionDto } from '@/routes/transactions/entities/propose-transaction.dto.entity'; +import { QueuedItemPage } from '@/routes/transactions/entities/queued-item-page.entity'; +import { QueuedItem } from '@/routes/transactions/entities/queued-item.entity'; +import { TransactionDetails } from '@/routes/transactions/entities/transaction-details/transaction-details.entity'; +import { TransactionItemPage } from '@/routes/transactions/entities/transaction-item-page.entity'; +import { TransactionPreview } from '@/routes/transactions/entities/transaction-preview.entity'; +import { Transaction } from '@/routes/transactions/entities/transaction.entity'; +import { AddConfirmationDtoValidationPipe } from '@/routes/transactions/pipes/add-confirmation.validation.pipe'; +import { PreviewTransactionDtoValidationPipe } from '@/routes/transactions/pipes/preview-transaction.validation.pipe'; +import { ProposeTransactionDtoValidationPipe } from '@/routes/transactions/pipes/propose-transaction.dto.validation.pipe'; +import { TransactionsService } from '@/routes/transactions/transactions.service'; @ApiTags('transactions') @Controller({ diff --git a/src/routes/transactions/transactions.module.ts b/src/routes/transactions/transactions.module.ts index ac2cfcdc77..4672badb0b 100644 --- a/src/routes/transactions/transactions.module.ts +++ b/src/routes/transactions/transactions.module.ts @@ -1,33 +1,33 @@ import { Module } from '@nestjs/common'; -import { AddressInfoModule } from '../common/address-info/address-info.module'; -import { DataDecodedModule } from '../data-decode/data-decoded.module'; -import { CustomTransactionMapper } from './mappers/common/custom-transaction.mapper'; -import { DataDecodedParamHelper } from './mappers/common/data-decoded-param.helper'; -import { Erc20TransferMapper } from './mappers/common/erc20-transfer.mapper'; -import { Erc721TransferMapper } from './mappers/common/erc721-transfer.mapper'; -import { NativeCoinTransferMapper } from './mappers/common/native-coin-transfer.mapper'; -import { SafeAppInfoMapper } from './mappers/common/safe-app-info.mapper'; -import { SettingsChangeMapper } from './mappers/common/settings-change.mapper'; -import { TransactionDataMapper } from './mappers/common/transaction-data.mapper'; -import { MultisigTransactionInfoMapper } from './mappers/common/transaction-info.mapper'; -import { CreationTransactionMapper } from './mappers/creation-transaction/creation-transaction.mapper'; -import { ModuleTransactionDetailsMapper } from './mappers/module-transactions/module-transaction-details.mapper'; -import { ModuleTransactionStatusMapper } from './mappers/module-transactions/module-transaction-status.mapper'; -import { ModuleTransactionMapper } from './mappers/module-transactions/module-transaction.mapper'; -import { MultisigTransactionDetailsMapper } from './mappers/multisig-transactions/multisig-transaction-details.mapper'; -import { MultisigTransactionExecutionInfoMapper } from './mappers/multisig-transactions/multisig-transaction-execution-info.mapper'; -import { MultisigTransactionStatusMapper } from './mappers/multisig-transactions/multisig-transaction-status.mapper'; -import { MultisigTransactionMapper } from './mappers/multisig-transactions/multisig-transaction.mapper'; -import { QueuedItemsMapper } from './mappers/queued-items/queued-items.mapper'; -import { TransactionPreviewMapper } from './mappers/transaction-preview.mapper'; -import { TransactionsHistoryMapper } from './mappers/transactions-history.mapper'; -import { TransferDetailsMapper } from './mappers/transfers/transfer-details.mapper'; -import { TransferInfoMapper } from './mappers/transfers/transfer-info.mapper'; -import { IncomingTransferMapper } from './mappers/transfers/transfer.mapper'; -import { TransactionsController } from './transactions.controller'; -import { TransactionsService } from './transactions.service'; -import { MultisigTransactionExecutionDetailsMapper } from './mappers/multisig-transactions/multisig-transaction-execution-details.mapper'; -import { HumanDescriptionMapper } from './mappers/common/human-description.mapper'; +import { AddressInfoModule } from '@/routes/common/address-info/address-info.module'; +import { DataDecodedModule } from '@/routes/data-decode/data-decoded.module'; +import { CustomTransactionMapper } from '@/routes/transactions/mappers/common/custom-transaction.mapper'; +import { DataDecodedParamHelper } from '@/routes/transactions/mappers/common/data-decoded-param.helper'; +import { Erc20TransferMapper } from '@/routes/transactions/mappers/common/erc20-transfer.mapper'; +import { Erc721TransferMapper } from '@/routes/transactions/mappers/common/erc721-transfer.mapper'; +import { HumanDescriptionMapper } from '@/routes/transactions/mappers/common/human-description.mapper'; +import { NativeCoinTransferMapper } from '@/routes/transactions/mappers/common/native-coin-transfer.mapper'; +import { SafeAppInfoMapper } from '@/routes/transactions/mappers/common/safe-app-info.mapper'; +import { SettingsChangeMapper } from '@/routes/transactions/mappers/common/settings-change.mapper'; +import { TransactionDataMapper } from '@/routes/transactions/mappers/common/transaction-data.mapper'; +import { MultisigTransactionInfoMapper } from '@/routes/transactions/mappers/common/transaction-info.mapper'; +import { CreationTransactionMapper } from '@/routes/transactions/mappers/creation-transaction/creation-transaction.mapper'; +import { ModuleTransactionDetailsMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction-details.mapper'; +import { ModuleTransactionStatusMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction-status.mapper'; +import { ModuleTransactionMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction.mapper'; +import { MultisigTransactionDetailsMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper'; +import { MultisigTransactionExecutionDetailsMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-details.mapper'; +import { MultisigTransactionExecutionInfoMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-execution-info.mapper'; +import { MultisigTransactionStatusMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-status.mapper'; +import { MultisigTransactionMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction.mapper'; +import { QueuedItemsMapper } from '@/routes/transactions/mappers/queued-items/queued-items.mapper'; +import { TransactionPreviewMapper } from '@/routes/transactions/mappers/transaction-preview.mapper'; +import { TransactionsHistoryMapper } from '@/routes/transactions/mappers/transactions-history.mapper'; +import { TransferDetailsMapper } from '@/routes/transactions/mappers/transfers/transfer-details.mapper'; +import { TransferInfoMapper } from '@/routes/transactions/mappers/transfers/transfer-info.mapper'; +import { IncomingTransferMapper } from '@/routes/transactions/mappers/transfers/transfer.mapper'; +import { TransactionsController } from '@/routes/transactions/transactions.controller'; +import { TransactionsService } from '@/routes/transactions/transactions.service'; @Module({ controllers: [TransactionsController], diff --git a/src/routes/transactions/transactions.service.ts b/src/routes/transactions/transactions.service.ts index c217fe52b4..d2f452b725 100644 --- a/src/routes/transactions/transactions.service.ts +++ b/src/routes/transactions/transactions.service.ts @@ -1,41 +1,41 @@ import { Inject, Injectable } from '@nestjs/common'; import { head, last } from 'lodash'; -import { MultisigTransaction as DomainMultisigTransaction } from '../../domain/safe/entities/multisig-transaction.entity'; +import { MultisigTransaction as DomainMultisigTransaction } from '@/domain/safe/entities/multisig-transaction.entity'; import { SafeRepository } from '@/domain/safe/safe.repository'; import { ISafeRepository } from '@/domain/safe/safe.repository.interface'; import { AddConfirmationDto } from '@/domain/transactions/entities/add-confirmation.dto.entity'; -import { Page } from '../common/entities/page.entity'; +import { ProposeTransactionDto } from '@/domain/transactions/entities/propose-transaction.dto.entity'; +import { Page } from '@/routes/common/entities/page.entity'; import { + PaginationData, buildNextPageURL, buildPreviousPageURL, cursorUrlFromLimitAndOffset, - PaginationData, -} from '../common/pagination/pagination.data'; -import { ConflictType } from './entities/conflict-type.entity'; -import { IncomingTransfer } from './entities/incoming-transfer.entity'; -import { ModuleTransaction } from './entities/module-transaction.entity'; -import { MultisigTransaction } from './entities/multisig-transaction.entity'; -import { PreviewTransactionDto } from './entities/preview-transaction.dto.entity'; -import { QueuedItem } from './entities/queued-item.entity'; -import { TransactionItemPage } from './entities/transaction-item-page.entity'; -import { TransactionPreview } from './entities/transaction-preview.entity'; -import { ModuleTransactionMapper } from './mappers/module-transactions/module-transaction.mapper'; -import { MultisigTransactionMapper } from './mappers/multisig-transactions/multisig-transaction.mapper'; -import { QueuedItemsMapper } from './mappers/queued-items/queued-items.mapper'; -import { TransactionPreviewMapper } from './mappers/transaction-preview.mapper'; -import { ProposeTransactionDto } from './entities/propose-transaction.dto.entity'; -import { TransactionsHistoryMapper } from './mappers/transactions-history.mapper'; -import { IncomingTransferMapper } from './mappers/transfers/transfer.mapper'; +} from '@/routes/common/pagination/pagination.data'; import { MODULE_TRANSACTION_PREFIX, MULTISIG_TRANSACTION_PREFIX, TRANSACTION_ID_SEPARATOR, TRANSFER_PREFIX, -} from './constants'; -import { ModuleTransactionDetailsMapper } from './mappers/module-transactions/module-transaction-details.mapper'; -import { TransactionDetails } from './entities/transaction-details/transaction-details.entity'; -import { TransferDetailsMapper } from './mappers/transfers/transfer-details.mapper'; -import { MultisigTransactionDetailsMapper } from './mappers/multisig-transactions/multisig-transaction-details.mapper'; +} from '@/routes/transactions/constants'; +import { ConflictType } from '@/routes/transactions/entities/conflict-type.entity'; +import { IncomingTransfer } from '@/routes/transactions/entities/incoming-transfer.entity'; +import { ModuleTransaction } from '@/routes/transactions/entities/module-transaction.entity'; +import { MultisigTransaction } from '@/routes/transactions/entities/multisig-transaction.entity'; +import { PreviewTransactionDto } from '@/routes/transactions/entities/preview-transaction.dto.entity'; +import { QueuedItem } from '@/routes/transactions/entities/queued-item.entity'; +import { TransactionDetails } from '@/routes/transactions/entities/transaction-details/transaction-details.entity'; +import { TransactionItemPage } from '@/routes/transactions/entities/transaction-item-page.entity'; +import { TransactionPreview } from '@/routes/transactions/entities/transaction-preview.entity'; +import { ModuleTransactionDetailsMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction-details.mapper'; +import { ModuleTransactionMapper } from '@/routes/transactions/mappers/module-transactions/module-transaction.mapper'; +import { MultisigTransactionDetailsMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction-details.mapper'; +import { MultisigTransactionMapper } from '@/routes/transactions/mappers/multisig-transactions/multisig-transaction.mapper'; +import { QueuedItemsMapper } from '@/routes/transactions/mappers/queued-items/queued-items.mapper'; +import { TransactionPreviewMapper } from '@/routes/transactions/mappers/transaction-preview.mapper'; +import { TransactionsHistoryMapper } from '@/routes/transactions/mappers/transactions-history.mapper'; +import { TransferDetailsMapper } from '@/routes/transactions/mappers/transfers/transfer-details.mapper'; +import { IncomingTransferMapper } from '@/routes/transactions/mappers/transfers/transfer.mapper'; @Injectable() export class TransactionsService { diff --git a/src/validation/providers/generic.validator.spec.ts b/src/validation/providers/generic.validator.spec.ts index 5b90195bcd..9748de0f04 100644 --- a/src/validation/providers/generic.validator.spec.ts +++ b/src/validation/providers/generic.validator.spec.ts @@ -1,8 +1,8 @@ import { faker } from '@faker-js/faker'; import { HttpException } from '@nestjs/common'; import { ValidateFunction } from 'ajv'; -import { GenericValidator } from './generic.validator'; -import { ValidationErrorFactory } from './validation-error-factory'; +import { ValidationErrorFactory } from '@/validation/providers/validation-error-factory'; +import { GenericValidator } from '@/validation/providers/generic.validator'; const mockValidationErrorFactory = jest.mocked({ from: jest.fn(), diff --git a/src/validation/providers/generic.validator.ts b/src/validation/providers/generic.validator.ts index 221d873c5e..86d1b2c108 100644 --- a/src/validation/providers/generic.validator.ts +++ b/src/validation/providers/generic.validator.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { DefinedError, ValidateFunction } from 'ajv'; -import { ValidationErrorFactory } from './validation-error-factory'; +import { ValidationErrorFactory } from '@/validation/providers/validation-error-factory'; @Injectable() export class GenericValidator { diff --git a/src/validation/providers/json-schema.service.ts b/src/validation/providers/json-schema.service.ts index 100caf8b23..cad89707bb 100644 --- a/src/validation/providers/json-schema.service.ts +++ b/src/validation/providers/json-schema.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import Ajv, { JSONSchemaType, Schema, ValidateFunction } from 'ajv'; import addFormats from 'ajv-formats'; -import { addIsDate } from './keywords/is-date.keyword'; +import { addIsDate } from '@/validation/providers/keywords/is-date.keyword'; @Injectable() export class JsonSchemaService { diff --git a/src/validation/providers/keywords/is-date.keyword.spec.ts b/src/validation/providers/keywords/is-date.keyword.spec.ts index fa1b06bdc8..3c706594d9 100644 --- a/src/validation/providers/keywords/is-date.keyword.spec.ts +++ b/src/validation/providers/keywords/is-date.keyword.spec.ts @@ -1,6 +1,6 @@ import Ajv, { Schema, ValidateFunction } from 'ajv'; -import { addIsDate } from './is-date.keyword'; import { faker } from '@faker-js/faker'; +import { addIsDate } from '@/validation/providers/keywords/is-date.keyword'; describe('AJV Keyword – isDate', () => { let ajv: Ajv; diff --git a/src/validation/providers/validation-error-factory.spec.ts b/src/validation/providers/validation-error-factory.spec.ts index 18ab6a3b56..e4b5b719a6 100644 --- a/src/validation/providers/validation-error-factory.spec.ts +++ b/src/validation/providers/validation-error-factory.spec.ts @@ -1,6 +1,6 @@ import { DefinedError } from 'ajv'; import { faker } from '@faker-js/faker'; -import { ValidationErrorFactory } from './validation-error-factory'; +import { ValidationErrorFactory } from '@/validation/providers/validation-error-factory'; import { ILoggingService } from '@/logging/logging.interface'; const mockLoggingService = { diff --git a/src/validation/validation.module.ts b/src/validation/validation.module.ts index 0765e7859e..666248199c 100644 --- a/src/validation/validation.module.ts +++ b/src/validation/validation.module.ts @@ -1,7 +1,7 @@ import { Global, Module } from '@nestjs/common'; -import { GenericValidator } from './providers/generic.validator'; -import { JsonSchemaService } from './providers/json-schema.service'; -import { ValidationErrorFactory } from './providers/validation-error-factory'; +import { GenericValidator } from '@/validation/providers/generic.validator'; +import { JsonSchemaService } from '@/validation/providers/json-schema.service'; +import { ValidationErrorFactory } from '@/validation/providers/validation-error-factory'; @Global() @Module({