From 0d1a128e0a74c2adabc14cc24a9e710a891fe1ba Mon Sep 17 00:00:00 2001
From: Kirisu <56469224+rubenkristian@users.noreply.github.com>
Date: Fri, 25 Nov 2022 16:45:41 +0700
Subject: [PATCH] feat: menstrual subscription scheduler (#218)
menstrual subscription scheduler
/*
add path in tsconfig for simple path import
add path in jest config for simple path import
*/
---
src/app.module.ts | 18 ++-
src/common/caches/index.ts | 2 +-
src/common/common.module.ts | 2 +-
.../debio-conversion.module.ts | 2 +-
.../debio-conversion.service.ts | 2 +-
src/common/escrow/escrow.module.ts | 2 +-
src/common/escrow/escrow.service.ts | 2 +-
src/common/ethereum/ethereum.module.ts | 2 +-
src/common/ethereum/ethereum.service.ts | 2 +-
src/common/mailer/mailer.manager.ts | 2 +-
src/common/mailer/mailer.module.ts | 2 +-
src/common/substrate/index.ts | 2 +-
src/common/substrate/substrate.service.ts | 2 +-
src/indexer/indexer.handler.ts | 4 +-
src/indexer/indexer.module.ts | 4 +-
.../ethereum-listener.handler.ts | 6 +-
.../ethereum-listener.module.ts | 8 +-
...enetic-analysis-order-cancelled.handler.ts | 4 +-
...enetic-analysis-order-fulfilled.handler.ts | 6 +-
.../genetic-analysis-order-paid.handler.ts | 8 +-
...genetic-analysis-order-refunded.handler.ts | 6 +-
.../genetic-analysis-order-created.handler.ts | 6 +-
.../genetic-analysis-rejected.handler.ts | 4 +-
.../genetic-analysis-result-ready.handler.ts | 4 +-
...genetic-analyst-service-created.handler.ts | 4 +-
.../genetic-analyst-registered.handler.ts | 4 +-
.../genetic-analyst-staked.handler.ts | 7 +-
.../genetic-analyst-unstaked.handler.ts | 7 +-
...tic-analyst-verification-status.handler.ts | 6 +-
.../data-staked/data-staked.handler.ts | 4 +-
.../dna-sample-rejected.handler.ts | 4 +-
.../dna-sample-result-ready.handler.ts | 4 +-
.../labs/registered/lab-registered.handler.ts | 6 +-
.../retrieve-unstake-amount.handler.ts | 7 +-
.../stake-successful.handler.ts | 7 +-
.../unstaked-successful.handler.ts | 7 +-
.../update-verification-status.handler.ts | 6 +-
.../order-cancelled.handler.ts | 6 +-
.../order-created/order-created.handler.ts | 6 +-
.../order-failed/order-failed.handler.ts | 6 +-
.../order-fulfilled.handler.ts | 8 +-
.../orders/order-paid/order-paid.handler.ts | 8 +-
.../order-refunded/order-refunded.handler.ts | 6 +-
.../service-request-created.handler.ts | 12 +-
.../service-request-excess.handler.ts | 6 +-
...request-staking-amount-refunded.handler.ts | 4 +-
.../service-request-updated.handler.ts | 6 +-
.../service-created.handler.ts | 6 +-
.../substrate-listener.handler.ts | 4 +-
.../substrate-listener.module.ts | 8 +-
.../unstaked.service.ts | 4 +-
.../lab-unstake/lab-unstake.service.ts | 4 +-
src/schedulers/mailer/mailer.service.ts | 6 +-
.../menstrual-subscription.service.ts | 123 ++++++++++++++++++
src/schedulers/schedulers.module.ts | 12 +-
src/schedulers/unstaked/unstaked.service.ts | 4 +-
test/e2e/fixture.ts | 12 +-
.../events/certification-events.spec.ts | 14 +-
.../events/genetic-analysis-events.spec.ts | 8 +-
.../genetic-analysis-order-events.spec.ts | 8 +-
.../events/genetic-analyst-events.spec.ts | 12 +-
...netic-analyst-qualification-events.spec.ts | 8 +-
.../genetic-analyst-service-events.spec.ts | 8 +-
.../events/genetic-data-events.spec.ts | 10 +-
.../events/genetic-testing-events.spec.ts | 10 +-
test/e2e/indexer/events/labs-events.spec.ts | 14 +-
.../events/menstrual-calendar-events.spec.ts | 14 +-
test/e2e/indexer/events/orders-events.spec.ts | 10 +-
.../e2e/indexer/events/service-events.spec.ts | 12 +-
.../events/service-request-events.spec.ts | 16 +--
.../genetic-analysis-events.spec.ts | 23 ++--
.../genetic-analysis-events.spec.ts | 16 +--
.../genetic-analyst-service-events.spec.ts | 14 +-
.../genetic-analyst-events.spec.ts | 16 +--
.../genetic-testing-events.spec.ts | 18 +--
.../commands/labs/labs-events.spec.ts | 18 +--
.../commands/orders/orders-events.spec.ts | 23 ++--
.../service-request-events.spec.ts | 16 +--
.../commands/services/services-events.spec.ts | 14 +-
test/e2e/schedulers/lab-unstake.spec.ts | 6 +-
test/e2e/schedulers/mailer.spec.ts | 10 +-
test/e2e/schedulers/unstaked.spec.ts | 6 +-
.../error-logging.service.spec.ts | 8 +-
.../modules/escrow/escrow.service.spec.ts | 6 +-
.../certifications.command.spec.ts | 8 +-
.../certifications.handler.spec.ts | 10 +-
.../genetic-analysis-order.command.spec.ts | 10 +-
.../genetic-analysis-order.handler.spec.ts | 16 +--
.../genetic-analysis.command.spec.ts | 10 +-
.../genetic-analysis.handler.spec.ts | 12 +-
...tic-analyst-qualifications.command.spec.ts | 8 +-
...tic-analyst-qualifications.handler.spec.ts | 10 +-
.../genetic-analyst-services.command.spec.ts | 8 +-
.../genetic-analyst-services.handler.spec.ts | 10 +-
.../genetic-analysts.command.spec.ts | 10 +-
.../genetic-analysts.handler.spec.ts | 24 ++--
.../genetic-data/genetic-data.command.spec.ts | 8 +-
.../genetic-data/genetic-data.handler.spec.ts | 10 +-
.../genetic-testing.command.spec.ts | 8 +-
.../genetic-testing.handler.spec.ts | 6 +-
.../indexer/events/labs/labs.command.spec.ts | 18 +--
.../indexer/events/labs/labs.handler.spec.ts | 20 +--
.../events/orders/orders.command.spec.ts | 12 +-
.../events/orders/orders.handler.spec.ts | 20 +--
.../service-request.command.spec.ts | 14 +-
.../service-request.handler.spec.ts | 8 +-
.../events/services/services.command.spec.ts | 10 +-
.../events/services/services.handler.spec.ts | 12 +-
test/unit/indexer/indexer.spec.ts | 8 +-
test/unit/jest-unit.json | 6 +-
.../ethereum-listener.handler.spec.ts | 9 +-
...c-analysis-order-cancelled.command.spec.ts | 2 +-
...c-analysis-order-cancelled.handler.spec.ts | 6 +-
...tic-analysis-order-created.command.spec.ts | 2 +-
...tic-analysis-order-created.handler.spec.ts | 11 +-
...c-analysis-order-fulfilled.command.spec.ts | 2 +-
...c-analysis-order-fulfilled.handler.spec.ts | 11 +-
...enetic-analysis-order-paid.command.spec.ts | 2 +-
...enetic-analysis-order-paid.handler.spec.ts | 8 +-
...ic-analysis-order-refunded.command.spec.ts | 2 +-
...ic-analysis-order-refunded.handler.spec.ts | 11 +-
.../genetic-analysis-rejected.handler.spec.ts | 11 +-
.../genetic-anaysis-rejected.command.spec.ts | 2 +-
...etic-analysis-result-ready.handler.spec.ts | 11 +-
...netic-anaysis-result-ready.command.spec.ts | 2 +-
...ic-analyst-service-created.command.spec.ts | 2 +-
...ic-analyst-service-created.handler.spec.ts | 8 +-
.../genetic-analyst-staked.command.spec.ts | 2 +-
.../genetic-analyst-staked.handler.spec.ts | 9 +-
.../genetic-analyst-unstaked.command.spec.ts | 2 +-
.../genetic-analyst-unstaked.handler.spec.ts | 9 +-
...nalyst-verification-status.command.spec.ts | 2 +-
...nalyst-verification-status.handler.spec.ts | 6 +-
.../dna-sample-rejected.command.spec.ts | 2 +-
.../dna-sample-rejected.handler.spec.ts | 8 +-
.../dna-sample-result-ready.command.spec.ts | 2 +-
.../dna-sample-result-ready.handler.spec.ts | 8 +-
.../lab-registered.command.spec.ts | 2 +-
.../lab-registered.handler.spec.ts | 11 +-
...b-retrieve-unstaked-amount.command.spec.ts | 2 +-
...b-retrieve-unstaked-amount.handler.spec.ts | 9 +-
.../lab-stake-successful.command.spec.ts | 2 +-
.../lab-staked-successful.handler.spec.ts | 9 +-
.../lab-unstaked-successful.command.spec.ts | 2 +-
.../lab-unstaked-successful.handler.spec.ts | 11 +-
.../order-cancelled.command.spec.ts | 2 +-
.../order-cancelled.handler.spec.ts | 10 +-
.../order-created.command.spec.ts | 2 +-
.../order-created.handler.spec.ts | 13 +-
.../order-failed/order-failed.command.spec.ts | 2 +-
.../order-failed/order-failed.handler.spec.ts | 10 +-
.../order-fulfilled.command.spec.ts | 2 +-
.../order-fulfilled.handler.spec.ts | 14 +-
.../order-paid/order-paid.command.spec.ts | 2 +-
.../order-paid/order-paid.handler.spec.ts | 12 +-
.../order-refunded.command.spec.ts | 2 +-
.../order-refunded.handler.spec.ts | 15 +--
.../service-request-created.command.spec.ts | 4 +-
.../service-request-created.handler.spec.ts | 14 +-
...st-staking-amount-refunded.command.spec.ts | 4 +-
...st-staking-amount-refunded.handler.spec.ts | 10 +-
.../service-created.command.spec.ts | 4 +-
.../service-created.handler.spec.ts | 8 +-
.../substrate-listener.handler.spec.ts | 6 +-
test/unit/mock.ts | 16 +--
.../genetic-analyst-unstaked.service.spec.ts | 4 +-
.../lab/lab-unstake.service.spec.ts | 4 +-
.../schedulers/mailer/mailer.service.spec.ts | 4 +-
.../unstaked/unstaked.service.spec.ts | 4 +-
tsconfig.json | 8 +-
170 files changed, 756 insertions(+), 680 deletions(-)
create mode 100644 src/schedulers/menstrual-subscription/menstrual-subscription.service.ts
diff --git a/src/app.module.ts b/src/app.module.ts
index 9b3b1679..82dfd1d7 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -6,13 +6,17 @@ import { MailerModule } from '@nestjs-modules/mailer';
import { Module } from '@nestjs/common';
import { ScheduleModule } from '@nestjs/schedule';
import { TypeOrmModule } from '@nestjs/typeorm';
-import { LocationEntities, ProcessEnvModule, ProcessEnvProxy } from './common';
-import { EscrowAccounts } from './common/escrow/models/deposit.entity';
-import { IndexerModule } from './indexer/indexer.module';
-import { EthereumListenerModule } from './listeners/ethereum-listener/ethereum-listener.module';
-import { SubstrateListenerModule } from './listeners/substrate-listener/substrate-listener.module';
-import { SchedulersModule } from './schedulers/schedulers.module';
-import { keyList, SecretKeyList } from './common/secrets';
+import {
+ LocationEntities,
+ ProcessEnvModule,
+ ProcessEnvProxy,
+} from '@common/index';
+import { EscrowAccounts } from '@common/escrow/models/deposit.entity';
+import { IndexerModule } from '@indexer/indexer.module';
+import { EthereumListenerModule } from '@listeners/ethereum-listener/ethereum-listener.module';
+import { SubstrateListenerModule } from '@listeners/substrate-listener/substrate-listener.module';
+import { SchedulersModule } from '@schedulers/schedulers.module';
+import { keyList, SecretKeyList } from '@common/secrets';
// eslint-disable-next-line @typescript-eslint/no-var-requires
require('dotenv').config();
diff --git a/src/common/caches/index.ts b/src/common/caches/index.ts
index 44af9844..9cc3e576 100644
--- a/src/common/caches/index.ts
+++ b/src/common/caches/index.ts
@@ -5,7 +5,7 @@ import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList, SecretKeyList } from '../../common/secrets';
+import { keyList, SecretKeyList } from '@common/secrets';
require('dotenv').config(); // eslint-disable-line
diff --git a/src/common/common.module.ts b/src/common/common.module.ts
index 9f7c5925..8107d9d1 100644
--- a/src/common/common.module.ts
+++ b/src/common/common.module.ts
@@ -5,7 +5,7 @@ import {
import { Module } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { ElasticsearchModule } from '@nestjs/elasticsearch';
-import { keyList, SecretKeyList } from '../common/secrets';
+import { keyList, SecretKeyList } from '@common/secrets';
// eslint-disable-next-line @typescript-eslint/no-var-requires
require('dotenv').config();
diff --git a/src/common/debio-conversion/debio-conversion.module.ts b/src/common/debio-conversion/debio-conversion.module.ts
index e8cb3ed1..8b5eebb1 100644
--- a/src/common/debio-conversion/debio-conversion.module.ts
+++ b/src/common/debio-conversion/debio-conversion.module.ts
@@ -1,7 +1,7 @@
import { GCloudSecretManagerModule } from '@debionetwork/nestjs-gcloud-secret-manager';
import { Module } from '@nestjs/common';
import { DebioConversionService } from './debio-conversion.service';
-import { SecretKeyList } from '../../common/secrets';
+import { SecretKeyList } from '@common/secrets';
@Module({
imports: [
diff --git a/src/common/debio-conversion/debio-conversion.service.ts b/src/common/debio-conversion/debio-conversion.service.ts
index eb0be3ee..e6c5c221 100644
--- a/src/common/debio-conversion/debio-conversion.service.ts
+++ b/src/common/debio-conversion/debio-conversion.service.ts
@@ -1,7 +1,7 @@
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
import { Injectable, Logger } from '@nestjs/common';
import axios from 'axios';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
export class DebioConversionService {
diff --git a/src/common/escrow/escrow.module.ts b/src/common/escrow/escrow.module.ts
index c9ba3a3d..fa997d59 100644
--- a/src/common/escrow/escrow.module.ts
+++ b/src/common/escrow/escrow.module.ts
@@ -5,7 +5,7 @@ import { EscrowService } from './escrow.service';
import { EthereumModule, SubstrateModule } from '../index';
import { ErrorLoggingModule } from '../error-logging';
import { GCloudSecretManagerModule } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { SecretKeyList } from '../../common/secrets';
+import { SecretKeyList } from '@common/secrets';
require('dotenv').config(); // eslint-disable-line
@Module({
diff --git a/src/common/escrow/escrow.service.ts b/src/common/escrow/escrow.service.ts
index 589a6a50..ec20ea59 100644
--- a/src/common/escrow/escrow.service.ts
+++ b/src/common/escrow/escrow.service.ts
@@ -7,7 +7,7 @@ import AsyncLock from 'async-lock';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
import { ErrorLoggingService } from '../error-logging';
import { ErrorLoggingDto } from '../error-logging/dto/error-logging.dto';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
const lock = new AsyncLock();
const ESCROW_WALLET_LOCK_KEY = 'escrow-wallet-lock';
diff --git a/src/common/ethereum/ethereum.module.ts b/src/common/ethereum/ethereum.module.ts
index 7d31b581..1a1cb743 100644
--- a/src/common/ethereum/ethereum.module.ts
+++ b/src/common/ethereum/ethereum.module.ts
@@ -7,7 +7,7 @@ import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { SecretKeyList, keyList } from '../../common/secrets';
+import { SecretKeyList, keyList } from '@common/secrets';
@Module({
imports: [
diff --git a/src/common/ethereum/ethereum.service.ts b/src/common/ethereum/ethereum.service.ts
index 01e3f8a3..ebb2c7b0 100644
--- a/src/common/ethereum/ethereum.service.ts
+++ b/src/common/ethereum/ethereum.service.ts
@@ -10,7 +10,7 @@ import escrowContract from './utils/Escrow.json';
import { ethers } from 'ethers';
import { CachesService } from '../caches';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
export class EthereumService {
diff --git a/src/common/mailer/mailer.manager.ts b/src/common/mailer/mailer.manager.ts
index bbf1ea54..553cd13f 100644
--- a/src/common/mailer/mailer.manager.ts
+++ b/src/common/mailer/mailer.manager.ts
@@ -1,7 +1,7 @@
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
import { MailerService } from '@nestjs-modules/mailer';
import { Injectable, Logger } from '@nestjs/common';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
import { CustomerStakingRequestService, LabRegister } from './models';
import { NewOrderGA } from './models/new-order-ga.model';
import { NewOrderLab } from './models/new-order-lab.model';
diff --git a/src/common/mailer/mailer.module.ts b/src/common/mailer/mailer.module.ts
index a18aff36..61ccf254 100644
--- a/src/common/mailer/mailer.module.ts
+++ b/src/common/mailer/mailer.module.ts
@@ -7,7 +7,7 @@ import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handleba
import { Module } from '@nestjs/common';
import { join } from 'path';
import { MailerManager } from './mailer.manager';
-import { SecretKeyList, keyList } from '../../common/secrets';
+import { SecretKeyList, keyList } from '@common/secrets';
@Module({
imports: [
diff --git a/src/common/substrate/index.ts b/src/common/substrate/index.ts
index ec34cffb..5685398e 100644
--- a/src/common/substrate/index.ts
+++ b/src/common/substrate/index.ts
@@ -1,7 +1,7 @@
import { GCloudSecretManagerModule } from '@debionetwork/nestjs-gcloud-secret-manager';
import { Module } from '@nestjs/common';
import { SubstrateService } from './substrate.service';
-import { SecretKeyList } from '../../common/secrets';
+import { SecretKeyList } from '@common/secrets';
@Module({
imports: [
diff --git a/src/common/substrate/substrate.service.ts b/src/common/substrate/substrate.service.ts
index 13203c8e..35fcc931 100644
--- a/src/common/substrate/substrate.service.ts
+++ b/src/common/substrate/substrate.service.ts
@@ -2,7 +2,7 @@ import { ApiPromise, Keyring, WsProvider } from '@polkadot/api';
import { Injectable, OnModuleInit, Logger } from '@nestjs/common';
import { waitReady } from '@polkadot/wasm-crypto';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
export class SubstrateService implements OnModuleInit {
diff --git a/src/indexer/indexer.handler.ts b/src/indexer/indexer.handler.ts
index b4a94c2a..cc8f7497 100644
--- a/src/indexer/indexer.handler.ts
+++ b/src/indexer/indexer.handler.ts
@@ -10,13 +10,13 @@ import {
DeleteAllIndexesCommand,
GetLastSubstrateBlockQueryIndexer,
} from './blocks';
-import { ProcessEnvProxy } from '../common/proxies/process-env/process-env.proxy';
+import { ProcessEnvProxy } from '@common/proxies/process-env/process-env.proxy';
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { u32 } from '@polkadot/types';
import { SchedulerRegistry } from '@nestjs/schedule';
import { eventRoutes } from './indexer.routes';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
export class IndexerHandler
diff --git a/src/indexer/indexer.module.ts b/src/indexer/indexer.module.ts
index 16dfd673..c8f0e507 100644
--- a/src/indexer/indexer.module.ts
+++ b/src/indexer/indexer.module.ts
@@ -1,14 +1,14 @@
import { Module } from '@nestjs/common';
import { LabCommandHandlers } from './events/labs';
import { ServiceCommandHandlers } from './events/services';
-import { CommonModule } from '../common/common.module';
+import { CommonModule } from '@common/common.module';
import { BlockCommandHandlers, BlockQueryHandlers } from './blocks';
import { IndexerHandler } from './indexer.handler';
import { OrderCommandHandlers } from './events/orders';
import { GeneticTestingCommandHandlers } from './events/genetic-testing';
import { RequestServiceCommandHandlers } from './events/service-request';
import { CertificationsCommandHandlers } from './events/certifications';
-import { ProcessEnvModule } from '../common/proxies/process-env/process-env.module';
+import { ProcessEnvModule } from '@common/proxies/process-env/process-env.module';
import { GeneticDataCommandHandlers } from './events/genetic-data';
import { GeneticAnalystQualificationsCommandHandlers } from './events/genetic-analyst-qualifications';
import { GeneticAnalystServicesCommandHandlers } from './events/genetic-analyst-services';
diff --git a/src/listeners/ethereum-listener/ethereum-listener.handler.ts b/src/listeners/ethereum-listener/ethereum-listener.handler.ts
index f4dc8f5a..52c2abfd 100644
--- a/src/listeners/ethereum-listener/ethereum-listener.handler.ts
+++ b/src/listeners/ethereum-listener/ethereum-listener.handler.ts
@@ -1,7 +1,7 @@
import { Injectable, OnModuleInit, Logger } from '@nestjs/common';
-import { EthereumService } from '../../common/ethereum/ethereum.service';
-import { EscrowService } from '../../common/escrow/escrow.service';
-import { TransactionLoggingService } from '../../common';
+import { EthereumService } from '@common/ethereum/ethereum.service';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { TransactionLoggingService } from '@common/index';
@Injectable()
export class EthereumListenerHandler implements OnModuleInit {
diff --git a/src/listeners/ethereum-listener/ethereum-listener.module.ts b/src/listeners/ethereum-listener/ethereum-listener.module.ts
index 50da19b7..ff38238b 100644
--- a/src/listeners/ethereum-listener/ethereum-listener.module.ts
+++ b/src/listeners/ethereum-listener/ethereum-listener.module.ts
@@ -1,9 +1,9 @@
import { Module } from '@nestjs/common';
-import { EthereumModule } from '../../common/ethereum';
-import { EscrowModule } from '../../common/escrow/escrow.module';
+import { EthereumModule } from '@common/ethereum';
+import { EscrowModule } from '@common/escrow/escrow.module';
import { EthereumListenerHandler } from './ethereum-listener.handler';
-import { TransactionLoggingModule } from '../../common';
-import { ErrorLoggingModule } from '../../common/error-logging';
+import { TransactionLoggingModule } from '@common/index';
+import { ErrorLoggingModule } from '@common/error-logging';
@Module({
imports: [
diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.ts
index fbe759eb..98d2f94e 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.ts
@@ -1,7 +1,7 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
-import { TransactionLoggingService } from '../../../../../common';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingService } from '@common/index';
import { GeneticAnalysisOrderCancelledCommand } from './genetic-analysis-order-cancelled.command';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.ts
index b297dc18..d2ed8b7b 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.ts
@@ -1,13 +1,13 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
DateTimeProxy,
NotificationService,
TransactionLoggingService,
-} from '../../../../../common';
+} from '@common/index';
import { GeneticAnalysisOrderFulfilledCommand } from './genetic-analysis-order-fulfilled.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import currencyUnit from '../../../models/currencyUnit';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.ts
index 86cd6813..27196529 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.ts
@@ -1,21 +1,21 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
DateTimeProxy,
MailerManager,
NotificationService,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../common';
+} from '@common/index';
import { GeneticAnalysisOrderPaidCommand } from './genetic-analysis-order-paid.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import {
queryGeneticAnalystByAccountId,
queryGeneticAnalystServicesByHashId,
} from '@debionetwork/polkadot-provider';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../../../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
@CommandHandler(GeneticAnalysisOrderPaidCommand)
diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.ts
index f6830263..ee1125f5 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.ts
@@ -1,13 +1,13 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
DateTimeProxy,
NotificationService,
TransactionLoggingService,
-} from '../../../../../common';
+} from '@common/index';
import { GeneticAnalysisOrderRefundedCommand } from './genetic-analysis-order-refunded.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(GeneticAnalysisOrderRefundedCommand)
export class GeneticAnalysisOrderRefundedHandler
diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler.ts
index 62feef59..d1519984 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler.ts
@@ -1,13 +1,13 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
TransactionLoggingService,
DateTimeProxy,
NotificationService,
-} from '../../../../../common';
+} from '@common/index';
import { GeneticAnalysisOrderCreatedCommand } from './genetic-analysis-order-created.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(GeneticAnalysisOrderCreatedCommand)
diff --git a/src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler.ts
index beceffb6..6cbac985 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler.ts
@@ -4,10 +4,10 @@ import {
DateTimeProxy,
NotificationService,
SubstrateService,
-} from '../../../../../common';
+} from '@common/index';
import { setGeneticAnalysisOrderRefunded } from '@debionetwork/polkadot-provider';
import { GeneticAnalysisRejectedCommand } from './genetic-analysis-rejected.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(GeneticAnalysisRejectedCommand)
diff --git a/src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-resultready/genetic-analysis-result-ready.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-resultready/genetic-analysis-result-ready.handler.ts
index 0e7ade61..c839fe3c 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-resultready/genetic-analysis-result-ready.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-resultready/genetic-analysis-result-ready.handler.ts
@@ -4,10 +4,10 @@ import {
DateTimeProxy,
NotificationService,
SubstrateService,
-} from '../../../../../common';
+} from '@common/index';
import { setGeneticAnalysisOrderFulfilled } from '@debionetwork/polkadot-provider';
import { GeneticAnalysisResultReadyCommand } from './genetic-analysis-result-ready.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(GeneticAnalysisResultReadyCommand)
diff --git a/src/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler.ts b/src/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler.ts
index e28bf97d..01aabd31 100644
--- a/src/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler.ts
@@ -1,8 +1,8 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { DateTimeProxy, NotificationService } from '../../../../../common';
+import { DateTimeProxy, NotificationService } from '@common/index';
import { GeneticAnalystServiceCreatedCommand } from './genetic-analyst-service-created.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(GeneticAnalystServiceCreatedCommand)
diff --git a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-registered/genetic-analyst-registered.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-registered/genetic-analyst-registered.handler.ts
index 84d7668e..641fe350 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-registered/genetic-analyst-registered.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-registered/genetic-analyst-registered.handler.ts
@@ -1,8 +1,8 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { GeneticAnalystRegisteredCommand } from './genetic-analyst-registered.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
-import { DateTimeProxy, NotificationService } from '../../../../../common';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
+import { DateTimeProxy, NotificationService } from '@common/index';
@Injectable()
@CommandHandler(GeneticAnalystRegisteredCommand)
diff --git a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler.ts
index 3dc84885..3021b3ff 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler.ts
@@ -1,10 +1,7 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../common';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
import { GeneticAnalystStakedCommand } from './genetic-analyst-staked.command';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler.ts
index 08143b94..303e3bd0 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler.ts
@@ -1,10 +1,7 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../common';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
import { GeneticAnalystUnstakedCommand } from './genetic-analyst-unstaked.command';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.ts
index 4480b380..c4eb1f1b 100644
--- a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.ts
@@ -1,13 +1,13 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
DateTimeProxy,
NotificationService,
TransactionLoggingService,
-} from '../../../../../common';
+} from '@common/index';
import { GeneticAnalystVerificationStatusCommand } from './genetic-analyst-verification-status.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler.ts b/src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler.ts
index 84f1029e..3f28af41 100644
--- a/src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler.ts
@@ -4,14 +4,14 @@ import {
DebioConversionService,
TransactionLoggingService,
SubstrateService,
-} from '../../../../../common';
+} from '@common/index';
import {
convertToDbioUnitString,
queryOrderDetailByOrderID,
sendRewards,
} from '@debionetwork/polkadot-provider';
import { DataStakedCommand } from './data-staked.command';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
@Injectable()
@CommandHandler(DataStakedCommand)
diff --git a/src/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler.ts b/src/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler.ts
index a4f4f7a0..6f08b0b1 100644
--- a/src/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler.ts
@@ -1,8 +1,8 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { DnaSampleRejectedCommand } from './dna-sample-rejected.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
-import { DateTimeProxy, NotificationService } from '../../../../../common';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
+import { DateTimeProxy, NotificationService } from '@common/index';
@Injectable()
@CommandHandler(DnaSampleRejectedCommand)
diff --git a/src/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler.ts b/src/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler.ts
index 51e95cf8..2ec484ce 100644
--- a/src/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler.ts
+++ b/src/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler.ts
@@ -1,7 +1,7 @@
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { DnaSampleResultReadyCommand } from './dna-sample-result-ready.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
-import { DateTimeProxy, NotificationService } from '../../../../../common';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
+import { DateTimeProxy, NotificationService } from '@common/index';
import { Injectable } from '@nestjs/common';
import { eventTypes } from '@debionetwork/polkadot-provider';
diff --git a/src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler.ts b/src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler.ts
index 0372f3b4..147f280f 100644
--- a/src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler.ts
+++ b/src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler.ts
@@ -1,13 +1,13 @@
import { Logger, Injectable } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { LabRegisteredCommand } from './lab-registered.command';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
DateTimeProxy,
NotificationService,
TransactionLoggingService,
-} from '../../../../../common';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+} from '@common/index';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(LabRegisteredCommand)
diff --git a/src/listeners/substrate-listener/commands/labs/retrieve-unstake-amount/retrieve-unstake-amount.handler.ts b/src/listeners/substrate-listener/commands/labs/retrieve-unstake-amount/retrieve-unstake-amount.handler.ts
index b0582eba..379a48ae 100644
--- a/src/listeners/substrate-listener/commands/labs/retrieve-unstake-amount/retrieve-unstake-amount.handler.ts
+++ b/src/listeners/substrate-listener/commands/labs/retrieve-unstake-amount/retrieve-unstake-amount.handler.ts
@@ -1,10 +1,7 @@
import { Logger, Injectable } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../common';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import { LabRetrieveUnstakeAmountCommand } from './retrieve-unstake-amount.command';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler.ts b/src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler.ts
index 93c42a54..e405270f 100644
--- a/src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler.ts
+++ b/src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler.ts
@@ -1,11 +1,8 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import {
- TransactionLoggingService,
- DateTimeProxy,
-} from '../../../../../common';
+import { TransactionLoggingService, DateTimeProxy } from '@common/index';
import { LabStakeSuccessfulCommand } from './stake-successful.command';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
@Injectable()
@CommandHandler(LabStakeSuccessfulCommand)
diff --git a/src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler.ts b/src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler.ts
index a6cff835..50ecf227 100644
--- a/src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler.ts
+++ b/src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler.ts
@@ -1,10 +1,7 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../common';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
import { LabUnstakedCommand } from './unstaked-successful.command';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/labs/update-verification-status/update-verification-status.handler.ts b/src/listeners/substrate-listener/commands/labs/update-verification-status/update-verification-status.handler.ts
index 20cb6946..cdcb6382 100644
--- a/src/listeners/substrate-listener/commands/labs/update-verification-status/update-verification-status.handler.ts
+++ b/src/listeners/substrate-listener/commands/labs/update-verification-status/update-verification-status.handler.ts
@@ -1,9 +1,9 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { DateTimeProxy } from '../../../../../common';
+import { DateTimeProxy } from '@common/index';
import { LabUpdateVerificationStatusCommand } from './update-verification-status.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
-import { NotificationService } from '../../../../../common/notification/notification.service';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
+import { NotificationService } from '@common/notification/notification.service';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
@Injectable()
@CommandHandler(LabUpdateVerificationStatusCommand)
diff --git a/src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.ts b/src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.ts
index 7af3493c..4d86b66e 100644
--- a/src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.ts
+++ b/src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.ts
@@ -1,9 +1,9 @@
import { Logger, Injectable } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { OrderCancelledCommand } from './order-cancelled.command';
-import { TransactionLoggingService } from '../../../../../common';
-import { EscrowService } from '../../../../../common/escrow/escrow.service';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingService } from '@common/index';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import { Order } from '@debionetwork/polkadot-provider';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/orders/order-created/order-created.handler.ts b/src/listeners/substrate-listener/commands/orders/order-created/order-created.handler.ts
index 0dc081b4..81c4476e 100644
--- a/src/listeners/substrate-listener/commands/orders/order-created/order-created.handler.ts
+++ b/src/listeners/substrate-listener/commands/orders/order-created/order-created.handler.ts
@@ -5,10 +5,10 @@ import {
DateTimeProxy,
NotificationService,
TransactionLoggingService,
-} from '../../../../../common';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+} from '@common/index';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import { Order } from '@debionetwork/polkadot-provider';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(OrderCreatedCommand)
diff --git a/src/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler.ts b/src/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler.ts
index 7cd4360d..dc3999a9 100644
--- a/src/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler.ts
+++ b/src/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler.ts
@@ -1,13 +1,13 @@
import { Injectable, Logger } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { OrderFailedCommand } from './order-failed.command';
-import { EscrowService } from '../../../../../common/escrow/escrow.service';
+import { EscrowService } from '@common/escrow/escrow.service';
import {
DateTimeProxy,
NotificationService,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../common';
+} from '@common/index';
import {
Order,
setOrderRefunded,
@@ -15,7 +15,7 @@ import {
sendRewards,
eventTypes,
} from '@debionetwork/polkadot-provider';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(OrderFailedCommand)
diff --git a/src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.ts b/src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.ts
index eb14718a..7fa63e14 100644
--- a/src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.ts
+++ b/src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.ts
@@ -8,7 +8,7 @@ import {
NotificationService,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../common';
+} from '@common/index';
import {
finalizeRequest,
Order,
@@ -17,9 +17,9 @@ import {
sendRewards,
ServiceFlow,
} from '@debionetwork/polkadot-provider';
-import { EscrowService } from '../../../../../common/escrow/escrow.service';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import currencyUnit from '../../../models/currencyUnit';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.ts b/src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.ts
index b14e971a..2e14cbd4 100644
--- a/src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.ts
+++ b/src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.ts
@@ -7,16 +7,16 @@ import {
NotificationService,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../common';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+} from '@common/index';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
Order,
queryLabById,
queryServiceById,
} from '@debionetwork/polkadot-provider';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../../../../common/secrets';
+import { keyList } from '@common/secrets';
import currencyUnit from '../../../models/currencyUnit';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.ts b/src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.ts
index 9833adc5..127c91c4 100644
--- a/src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.ts
+++ b/src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.ts
@@ -5,10 +5,10 @@ import {
DateTimeProxy,
NotificationService,
TransactionLoggingService,
-} from '../../../../../common';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+} from '@common/index';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import { Order } from '@debionetwork/polkadot-provider';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import currencyUnit from '../../../models/currencyUnit';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.ts b/src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.ts
index 9b8ce70f..7f6a690b 100644
--- a/src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.ts
+++ b/src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.ts
@@ -1,18 +1,18 @@
import { Logger, Injectable } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { ServiceRequestCreatedCommand } from './service-request-created.command';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
DateTimeProxy,
MailerManager,
NotificationService,
TransactionLoggingService,
-} from '../../../../../common';
-import { CountryService } from '../../../../../common/location/country.service';
-import { StateService } from '../../../../../common/location/state.service';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+} from '@common/index';
+import { CountryService } from '@common/location/country.service';
+import { StateService } from '@common/location/state.service';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../../../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
@CommandHandler(ServiceRequestCreatedCommand)
diff --git a/src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler.ts b/src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler.ts
index 196e5f12..8f18d026 100644
--- a/src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler.ts
+++ b/src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler.ts
@@ -1,13 +1,13 @@
import { Logger, Injectable } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { ServiceRequestStakingAmountExcessRefundedCommand } from './service-request-excess.command';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import {
DateTimeProxy,
NotificationService,
TransactionLoggingService,
-} from '../../../../../common';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+} from '@common/index';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(ServiceRequestStakingAmountExcessRefundedCommand)
diff --git a/src/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler.ts b/src/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler.ts
index aae6ef50..2c6361bd 100644
--- a/src/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler.ts
+++ b/src/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler.ts
@@ -1,8 +1,8 @@
import { Injectable } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { DateTimeProxy, NotificationService } from '../../../../../common';
+import { DateTimeProxy, NotificationService } from '@common/index';
import { ServiceRequestStakingAmountRefundedCommand } from './service-request-staking-amount-refunded.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
@Injectable()
@CommandHandler(ServiceRequestStakingAmountRefundedCommand)
diff --git a/src/listeners/substrate-listener/commands/service-request/service-request-updated/service-request-updated.handler.ts b/src/listeners/substrate-listener/commands/service-request/service-request-updated/service-request-updated.handler.ts
index ce3dc467..7c26b7b7 100644
--- a/src/listeners/substrate-listener/commands/service-request/service-request-updated/service-request-updated.handler.ts
+++ b/src/listeners/substrate-listener/commands/service-request/service-request-updated/service-request-updated.handler.ts
@@ -6,14 +6,14 @@ import {
} from '@debionetwork/polkadot-provider';
import { Logger, Injectable } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { NotificationDto } from 'src/common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import {
DateTimeProxy,
NotificationService,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../common';
-import { TransactionLoggingDto } from '../../../../../common/transaction-logging/dto/transaction-logging.dto';
+} from '@common/index';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
import { ServiceRequestUpdatedCommand } from './service-request-updated.command';
@Injectable()
diff --git a/src/listeners/substrate-listener/commands/services/service-created/service-created.handler.ts b/src/listeners/substrate-listener/commands/services/service-created/service-created.handler.ts
index 186cdc25..0b4207c5 100644
--- a/src/listeners/substrate-listener/commands/services/service-created/service-created.handler.ts
+++ b/src/listeners/substrate-listener/commands/services/service-created/service-created.handler.ts
@@ -7,12 +7,12 @@ import {
MailerManager,
NotificationService,
SubstrateService,
-} from '../../../../../common';
+} from '@common/index';
import { Lab, queryLabById, Service } from '@debionetwork/polkadot-provider';
import { ServiceCreatedCommand } from './service-created.command';
-import { NotificationDto } from '../../../../../common/notification/dto/notification.dto';
+import { NotificationDto } from '@common/notification/dto/notification.dto';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../../../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
@CommandHandler(ServiceCreatedCommand)
diff --git a/src/listeners/substrate-listener/substrate-listener.handler.ts b/src/listeners/substrate-listener/substrate-listener.handler.ts
index e8c68c3e..bfb33ec4 100644
--- a/src/listeners/substrate-listener/substrate-listener.handler.ts
+++ b/src/listeners/substrate-listener/substrate-listener.handler.ts
@@ -4,7 +4,7 @@ import {
Logger,
OnModuleDestroy,
} from '@nestjs/common';
-import { SubstrateService } from '../../common';
+import { SubstrateService } from '@common/index';
import { Header, Event } from '@polkadot/types/interfaces';
import {
SetLastSubstrateBlockCommand,
@@ -57,7 +57,7 @@ import {
DnaSampleRejectedCommand,
DnaSampleResultReadyCommand,
} from './commands/genetic-testing';
-import { ProcessEnvProxy } from '../../common/proxies/process-env/process-env.proxy';
+import { ProcessEnvProxy } from '@common/proxies/process-env/process-env.proxy';
const eventRoutes = {
services: {
diff --git a/src/listeners/substrate-listener/substrate-listener.module.ts b/src/listeners/substrate-listener/substrate-listener.module.ts
index 05889d7b..17621440 100644
--- a/src/listeners/substrate-listener/substrate-listener.module.ts
+++ b/src/listeners/substrate-listener/substrate-listener.module.ts
@@ -1,5 +1,5 @@
import { Module } from '@nestjs/common';
-import { EscrowModule } from '../../common/escrow/escrow.module';
+import { EscrowModule } from '@common/escrow/escrow.module';
import {
DateTimeModule,
DebioConversionModule,
@@ -8,7 +8,7 @@ import {
ProcessEnvModule,
SubstrateModule,
TransactionLoggingModule,
-} from '../../common';
+} from '@common/index';
import { GeneticTestingCommandHandlers } from './commands/genetic-testing';
import { ServiceRequestCommandHandlers } from './commands/service-request';
import { GeneticAnalystCommandHandlers } from './commands/genetic-analysts';
@@ -18,7 +18,7 @@ import { ServiceCommandHandlers } from './commands/services';
import { SubstrateListenerHandler } from './substrate-listener.handler';
import { OrderCommandHandlers } from './commands/orders';
import { CqrsModule } from '@nestjs/cqrs';
-import { LocationModule } from '../../common/location/location.module';
+import { LocationModule } from '@common/location/location.module';
import { LabCommandHandlers } from './commands/labs';
import { ElasticsearchModule } from '@nestjs/elasticsearch';
import { BlockCommandHandlers, BlockQueryHandlers } from './blocks';
@@ -30,7 +30,7 @@ import {
import { MailerModule } from '@nestjs-modules/mailer';
import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
import { join } from 'path';
-import { SecretKeyList, keyList } from '../../common/secrets';
+import { SecretKeyList, keyList } from '@common/secrets';
@Module({
imports: [
diff --git a/src/schedulers/genetic-analyst-unstaked/unstaked.service.ts b/src/schedulers/genetic-analyst-unstaked/unstaked.service.ts
index 67bc9d5d..73543b0e 100644
--- a/src/schedulers/genetic-analyst-unstaked/unstaked.service.ts
+++ b/src/schedulers/genetic-analyst-unstaked/unstaked.service.ts
@@ -1,13 +1,13 @@
import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { SchedulerRegistry } from '@nestjs/schedule';
-import { SubstrateService } from '../../common';
+import { SubstrateService } from '@common/index';
import {
queryGeneticAnalystByAccountId,
retrieveGeneticAnalystUnstakeAmount,
} from '@debionetwork/polkadot-provider';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
export class GeneticAnalystUnstakedService implements OnModuleInit {
diff --git a/src/schedulers/lab-unstake/lab-unstake.service.ts b/src/schedulers/lab-unstake/lab-unstake.service.ts
index 02e2bb42..df51f3b6 100644
--- a/src/schedulers/lab-unstake/lab-unstake.service.ts
+++ b/src/schedulers/lab-unstake/lab-unstake.service.ts
@@ -1,13 +1,13 @@
import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { SchedulerRegistry } from '@nestjs/schedule';
-import { SubstrateService } from '../../common';
+import { SubstrateService } from '@common/index';
import {
queryLabById,
retrieveLabUnstakeAmount,
} from '@debionetwork/polkadot-provider';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
export class LabUnstakedService implements OnModuleInit {
diff --git a/src/schedulers/mailer/mailer.service.ts b/src/schedulers/mailer/mailer.service.ts
index f73e4104..b232a4d9 100644
--- a/src/schedulers/mailer/mailer.service.ts
+++ b/src/schedulers/mailer/mailer.service.ts
@@ -1,15 +1,15 @@
import { Injectable, Logger } from '@nestjs/common';
import { Interval } from '@nestjs/schedule';
-import { EmailNotificationService } from '../../common/database';
+import { EmailNotificationService } from '@common/database';
import {
MailerManager,
SubstrateService,
labToLabRegister,
LabRegister,
-} from '../../common';
+} from '@common/index';
import { queryLabById } from '@debionetwork/polkadot-provider';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
export class MailerService {
diff --git a/src/schedulers/menstrual-subscription/menstrual-subscription.service.ts b/src/schedulers/menstrual-subscription/menstrual-subscription.service.ts
new file mode 100644
index 00000000..672513dd
--- /dev/null
+++ b/src/schedulers/menstrual-subscription/menstrual-subscription.service.ts
@@ -0,0 +1,123 @@
+import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
+import { Injectable, Logger } from '@nestjs/common';
+import { ElasticsearchService } from '@nestjs/elasticsearch';
+import { SchedulerRegistry } from '@nestjs/schedule';
+import { SubstrateService } from '@common/index';
+import { keyList } from '@common/secrets';
+
+@Injectable()
+export class MenstrualSubscriptionService {
+ private logger: Logger = new Logger(MenstrualSubscriptionService.name);
+ private isRunning = false;
+ private timer: number;
+ constructor(
+ private readonly gCloudSecretManagerService: GCloudSecretManagerService<keyList>,
+ private readonly elasticsearchService: ElasticsearchService,
+ private readonly subtrateService: SubstrateService,
+ private readonly schedulerRegistry: SchedulerRegistry,
+ ) {}
+
+ onModuleInit() {
+ this.timer = this.strToMilisecond(
+ this.gCloudSecretManagerService.getSecret('UNSTAKE_TIMER').toString(),
+ );
+ const unstakeInterval: number = this.strToMilisecond(
+ this.gCloudSecretManagerService.getSecret('UNSTAKE_INTERVAL').toString(),
+ );
+
+ const unstaked = setInterval(async () => {
+ await this.handleWaitingUnstaked();
+ }, unstakeInterval);
+ this.schedulerRegistry.addInterval('unstaked-interval', unstaked);
+ }
+
+ async handleWaitingUnstaked() {
+ try {
+ if (this.isRunning) return;
+
+ this.isRunning = true;
+ const menstrualSubscription = await this.elasticsearchService.search({
+ index: 'menstrual-subscription',
+ allow_no_indices: true,
+ body: {
+ query: {
+ match: {
+ status: {
+ query: 'Active',
+ },
+ },
+ },
+ sort: [
+ {
+ 'created_at.keyword': {
+ unmapped_type: 'keyword',
+ order: 'asc',
+ },
+ },
+ ],
+ },
+ from: 0,
+ size: 10,
+ });
+
+ const currtime = new Date().getTime();
+
+ const listMenstrualSubscription = menstrualSubscription.body.hits.hits;
+ for (const menstrualSubscription of listMenstrualSubscription) {
+ const menstrualSubscriptionId = menstrualSubscription['_source']['id'];
+ const duration = menstrualSubscription['_source']['duration'];
+ const date = menstrualSubscription['_source']['updated_at'];
+
+ if (this.checkTimeDurationEnd(currtime, date, duration)) {
+ await this.subtrateService.api.tx.menstrualSubscription
+ .changeMenstrualSubscriptionStatus(
+ menstrualSubscriptionId,
+ 'Inactive',
+ )
+ .signAndSend(this.subtrateService.pair, { nonce: -1 });
+ }
+ }
+ } catch (err) {
+ this.logger.error(`inactive menstrual subscription error ${err}`);
+ } finally {
+ this.isRunning = false;
+ }
+ }
+
+ private milisecondsConverter = {
+ Monthly: 30 * 24 * 60 * 60 * 1000,
+ Quarterly: 3 * 30 * 24 * 60 * 60 * 1000,
+ Yearly: 12 * 30 * 24 * 60 * 60 * 1000,
+ };
+
+ checkTimeDurationEnd(
+ currtime: number,
+ date: number,
+ duration: string,
+ ): boolean {
+ return currtime <= date + this.milisecondsConverter[duration];
+ }
+
+ strToMilisecond(timeFormat: string): number {
+ // time format must DD:HH:MM:SS
+ const splitTimeFormat = timeFormat.split(':');
+
+ const d = Number(splitTimeFormat[0]);
+ const h = Number(splitTimeFormat[1]);
+ const m = Number(splitTimeFormat[2]);
+ const s = Number(splitTimeFormat[3]);
+
+ const dayToMilisecond = d * 24 * 60 * 60 * 1000;
+ const hourToMilisecond = h * 60 * 60 * 1000;
+ const minuteToMilisecond = m * 60 * 1000;
+ const secondToMilisecond = s * 1000;
+
+ const result =
+ dayToMilisecond +
+ hourToMilisecond +
+ minuteToMilisecond +
+ secondToMilisecond;
+
+ return result;
+ }
+}
diff --git a/src/schedulers/schedulers.module.ts b/src/schedulers/schedulers.module.ts
index 30ea9662..83c2be7a 100644
--- a/src/schedulers/schedulers.module.ts
+++ b/src/schedulers/schedulers.module.ts
@@ -4,16 +4,17 @@ import {
} from '@debionetwork/nestjs-gcloud-secret-manager';
import { Module } from '@nestjs/common';
import { ElasticsearchModule } from '@nestjs/elasticsearch';
-import { SecretKeyList, keyList } from '../common/secrets';
+import { SecretKeyList, keyList } from '@common/secrets';
import {
EmailNotificationModule,
MailModule,
ProcessEnvModule,
SubstrateModule,
SubstrateService,
-} from '../common';
+} from '@common/index';
import { MailerService } from './mailer/mailer.service';
import { UnstakedService } from './unstaked/unstaked.service';
+import { MenstrualSubscriptionService } from './menstrual-subscription/menstrual-subscription.service';
@Module({
imports: [
@@ -46,6 +47,11 @@ import { UnstakedService } from './unstaked/unstaked.service';
EmailNotificationModule,
],
exports: [ElasticsearchModule],
- providers: [UnstakedService, SubstrateService, MailerService],
+ providers: [
+ UnstakedService,
+ SubstrateService,
+ MailerService,
+ MenstrualSubscriptionService,
+ ],
})
export class SchedulersModule {}
diff --git a/src/schedulers/unstaked/unstaked.service.ts b/src/schedulers/unstaked/unstaked.service.ts
index 16ee9fa8..3259be6b 100644
--- a/src/schedulers/unstaked/unstaked.service.ts
+++ b/src/schedulers/unstaked/unstaked.service.ts
@@ -1,13 +1,13 @@
import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { SchedulerRegistry } from '@nestjs/schedule';
-import { SubstrateService } from '../../common';
+import { SubstrateService } from '@common/index';
import {
queryServiceRequestById,
retrieveUnstakedAmount,
} from '@debionetwork/polkadot-provider';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { keyList } from '../../common/secrets';
+import { keyList } from '@common/secrets';
@Injectable()
export class UnstakedService implements OnModuleInit {
diff --git a/test/e2e/fixture.ts b/test/e2e/fixture.ts
index ed20a591..dd9ab35e 100644
--- a/test/e2e/fixture.ts
+++ b/test/e2e/fixture.ts
@@ -1,14 +1,14 @@
import { connectionRetries, dummyCredentials } from './config';
import { Connection, createConnection } from 'typeorm';
import { LabRating } from '../mock/models/rating/rating.entity';
-import { LocationEntities } from '../../src/common/location/models';
-import { TransactionRequest } from '../../src/common/transaction-logging/models/transaction-request.entity';
+import { LocationEntities } from '@common/location/models';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { DataStakingEvents } from '../mock/models/bounty/data-staking-events.entity';
import { DataTokenToDatasetMapping } from '../mock/models/bounty/data-token-to-dataset-mapping.entity';
-import { EmailNotification } from '../../src/common/database/email-notification';
-import { Country } from '../../src/common/location/models/country.entity';
-import { State } from '../../src/common/location/models/state.entity';
-import { City } from '../../src/common/location/models/city.entity';
+import { EmailNotification } from '@common/database/email-notification';
+import { Country } from '@common/location/models/country.entity';
+import { State } from '@common/location/models/state.entity';
+import { City } from '@common/location/models/city.entity';
import { EmrCategory } from '../mock/models/category/emr.entity';
import { ServiceCategory } from '../mock/models/category/service-category.service';
import { SpecializationCategory } from '../mock/models/category/specialization.entity';
diff --git a/test/e2e/indexer/events/certification-events.spec.ts b/test/e2e/indexer/events/certification-events.spec.ts
index b7e9852c..a7165aee 100644
--- a/test/e2e/indexer/events/certification-events.spec.ts
+++ b/test/e2e/indexer/events/certification-events.spec.ts
@@ -18,16 +18,16 @@ import { ElasticsearchService } from '@nestjs/elasticsearch';
import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
-import { CommonModule } from '../../../../src/common/common.module';
-import { ProcessEnvModule } from '../../../../src/common/proxies/process-env/process-env.module';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { CertificationsCommandHandlers } from '../../../../src/indexer/events/certifications';
-import { LabCommandHandlers } from '../../../../src/indexer/events/labs';
+import { CommonModule } from '@common/common.module';
+import { ProcessEnvModule } from '@common/proxies/process-env/process-env.module';
+import { IndexerModule } from '@indexer/indexer.module';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { CertificationsCommandHandlers } from '@indexer/events/certifications';
+import { LabCommandHandlers } from '@indexer/events/labs';
import { initializeApi } from '../../polkadot-init';
import { labDataMock } from '../../../mock/models/labs/labs.mock';
import { certificationDataMock } from '../../../mock/models/certifications/certification-mock';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Certification Event', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/genetic-analysis-events.spec.ts b/test/e2e/indexer/events/genetic-analysis-events.spec.ts
index ac69442c..4b053679 100644
--- a/test/e2e/indexer/events/genetic-analysis-events.spec.ts
+++ b/test/e2e/indexer/events/genetic-analysis-events.spec.ts
@@ -30,11 +30,11 @@ import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
import { initializeApi } from '../../../e2e/polkadot-init';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { IndexerModule } from '@indexer/indexer.module';
import { geneticAnalystServiceDataMock } from '../../../mock/models/genetic-analysts/genetic-analyst-service.mock';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Genetic Analysis Events', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/genetic-analysis-order-events.spec.ts b/test/e2e/indexer/events/genetic-analysis-order-events.spec.ts
index 9e017498..1272e77d 100644
--- a/test/e2e/indexer/events/genetic-analysis-order-events.spec.ts
+++ b/test/e2e/indexer/events/genetic-analysis-order-events.spec.ts
@@ -36,12 +36,12 @@ import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
import { initializeApi } from '../../../e2e/polkadot-init';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { IndexerModule } from '@indexer/indexer.module';
import { geneticAnalystServiceDataMock } from '../../../mock/models/genetic-analysts/genetic-analyst-service.mock';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Genetic Analysis Events', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/genetic-analyst-events.spec.ts b/test/e2e/indexer/events/genetic-analyst-events.spec.ts
index 46d2faec..c6750dae 100644
--- a/test/e2e/indexer/events/genetic-analyst-events.spec.ts
+++ b/test/e2e/indexer/events/genetic-analyst-events.spec.ts
@@ -22,15 +22,15 @@ import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
import { initializeApi } from '../../polkadot-init';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { GeneticAnalystsCommandHandlers } from '../../../../src/indexer/events/genetic-analysts';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { GeneticAnalystsCommandHandlers } from '@indexer/events/genetic-analysts';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { IndexerModule } from '@indexer/indexer.module';
import { geneticAnalystsDataMock } from '../../../mock/models/genetic-analysts/genetic-analysts.mock';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
import { AvailabilityStatus } from '@debionetwork/polkadot-provider/lib/primitives/availability-status';
-import { StakeStatus } from '../../../../src/indexer/models/stake-status';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { StakeStatus } from '@indexer/models/stake-status';
+import { SecretKeyList } from '@common/secrets';
describe('Genetic Analyst Events', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/genetic-analyst-qualification-events.spec.ts b/test/e2e/indexer/events/genetic-analyst-qualification-events.spec.ts
index a31cebd3..fdd489ac 100644
--- a/test/e2e/indexer/events/genetic-analyst-qualification-events.spec.ts
+++ b/test/e2e/indexer/events/genetic-analyst-qualification-events.spec.ts
@@ -18,11 +18,11 @@ import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
import { initializeApi } from '../../polkadot-init';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { IndexerModule } from '@indexer/indexer.module';
import { geneticAnalystQualificationsDataMock } from '../../../mock/models/genetic-analysts/genetic-analyst-qualifications.mock';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Genetic Analyst Qualification Events', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/genetic-analyst-service-events.spec.ts b/test/e2e/indexer/events/genetic-analyst-service-events.spec.ts
index deaf5328..fc8fe676 100644
--- a/test/e2e/indexer/events/genetic-analyst-service-events.spec.ts
+++ b/test/e2e/indexer/events/genetic-analyst-service-events.spec.ts
@@ -21,12 +21,12 @@ import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
import { initializeApi } from '../../polkadot-init';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { IndexerModule } from '@indexer/indexer.module';
import { geneticAnalystsDataMock } from '../../../mock/models/genetic-analysts/genetic-analysts.mock';
import { geneticAnalystServiceDataMock } from '../../../mock/models/genetic-analysts/genetic-analyst-service.mock';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Genetic Analyst Service Events', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/genetic-data-events.spec.ts b/test/e2e/indexer/events/genetic-data-events.spec.ts
index 38f38e38..741bda3c 100644
--- a/test/e2e/indexer/events/genetic-data-events.spec.ts
+++ b/test/e2e/indexer/events/genetic-data-events.spec.ts
@@ -16,12 +16,12 @@ import { ElasticsearchService } from '@nestjs/elasticsearch';
import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { GeneticDataCommandHandlers } from '../../../../src/indexer/events/genetic-data';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { GeneticDataCommandHandlers } from '@indexer/events/genetic-data';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { IndexerModule } from '@indexer/indexer.module';
import { initializeApi } from '../../polkadot-init';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Genetic Data Events', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/genetic-testing-events.spec.ts b/test/e2e/indexer/events/genetic-testing-events.spec.ts
index 53b6d540..8a079512 100644
--- a/test/e2e/indexer/events/genetic-testing-events.spec.ts
+++ b/test/e2e/indexer/events/genetic-testing-events.spec.ts
@@ -8,10 +8,10 @@ import { ElasticsearchService } from '@nestjs/elasticsearch';
import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
-import { GeneticTestingCommandHandlers } from '../../../../src/indexer/events/genetic-testing';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { GeneticTestingCommandHandlers } from '@indexer/events/genetic-testing';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { IndexerModule } from '@indexer/indexer.module';
import { initializeApi } from '../../polkadot-init';
import {
createOrder,
@@ -35,7 +35,7 @@ import {
import { labDataMock } from '../../../mock/models/labs/labs.mock';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
import { serviceDataMock } from '../../../mock/models/labs/services.mock';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Indexer Genetic Testing Event', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/labs-events.spec.ts b/test/e2e/indexer/events/labs-events.spec.ts
index feb1bcf0..9654614f 100644
--- a/test/e2e/indexer/events/labs-events.spec.ts
+++ b/test/e2e/indexer/events/labs-events.spec.ts
@@ -15,20 +15,20 @@ import { ElasticsearchService } from '@nestjs/elasticsearch';
import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
-import { CommonModule } from '../../../../src/common/common.module';
-import { ProcessEnvModule } from '../../../../src/common/proxies/process-env/process-env.module';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
+import { CommonModule } from '@common/common.module';
+import { ProcessEnvModule } from '@common/proxies/process-env/process-env.module';
+import { IndexerHandler } from '@indexer/indexer.handler';
import { initializeApi } from '../../polkadot-init';
import { labDataMock } from '../../../mock/models/labs/labs.mock';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
-import { LabCommandHandlers } from '../../../../src/indexer/events/labs';
+import { IndexerModule } from '@indexer/indexer.module';
+import { LabCommandHandlers } from '@indexer/events/labs';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
-import { StakeStatus } from '../../../../src/indexer/models/stake-status';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { StakeStatus } from '@indexer/models/stake-status';
+import { SecretKeyList } from '@common/secrets';
describe('Event Command Service Request Claimed', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/menstrual-calendar-events.spec.ts b/test/e2e/indexer/events/menstrual-calendar-events.spec.ts
index f3117874..d6e0a102 100644
--- a/test/e2e/indexer/events/menstrual-calendar-events.spec.ts
+++ b/test/e2e/indexer/events/menstrual-calendar-events.spec.ts
@@ -1,19 +1,19 @@
import { INestApplication } from '@nestjs/common';
import { ApiPromise } from '@polkadot/api';
-// import { MenstrualCycleLog } from '../../../../src/indexer/models/menstrual-calendar/menstrual-cycle-log';
-// import { MenstrualCalendar } from '../../../../src/indexer/models/menstrual-calendar/menstrual-calendar';
+// import { MenstrualCycleLog } from '@indexer/models/menstrual-calendar/menstrual-cycle-log';
+// import { MenstrualCalendar } from '@indexer/models/menstrual-calendar/menstrual-calendar';
import { Test, TestingModule } from '@nestjs/testing';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { SecretKeyList } from '../../../../src/common/secrets';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
+import { SecretKeyList } from '@common/secrets';
+import { CommonModule, ProcessEnvModule } from '@common/index';
import { CqrsModule } from '@nestjs/cqrs';
import { ScheduleModule } from '@nestjs/schedule';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { MenstrualCalendarCommandHandlers } from '../../../../src/indexer/events/menstrual-calendar';
+import { IndexerModule } from '@indexer/indexer.module';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { MenstrualCalendarCommandHandlers } from '@indexer/events/menstrual-calendar';
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { initializeApi } from '../../polkadot-init';
diff --git a/test/e2e/indexer/events/orders-events.spec.ts b/test/e2e/indexer/events/orders-events.spec.ts
index c8e5b7f6..0f0d4904 100644
--- a/test/e2e/indexer/events/orders-events.spec.ts
+++ b/test/e2e/indexer/events/orders-events.spec.ts
@@ -9,9 +9,9 @@ import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
import { initializeApi } from '../../polkadot-init';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { IndexerModule } from '@indexer/indexer.module';
import {
cancelOrder,
createOrder,
@@ -30,9 +30,9 @@ import {
setOrderRefunded,
submitTestResult,
} from '@debionetwork/polkadot-provider';
-import { OrderCommandHandlers } from '../../../../src/indexer/events/orders';
+import { OrderCommandHandlers } from '@indexer/events/orders';
import { DnaSample } from '@debionetwork/polkadot-provider/lib/models/labs/genetic-testing/dna-sample';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Orders Events', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/service-events.spec.ts b/test/e2e/indexer/events/service-events.spec.ts
index 0601f3b5..64b9c552 100644
--- a/test/e2e/indexer/events/service-events.spec.ts
+++ b/test/e2e/indexer/events/service-events.spec.ts
@@ -18,14 +18,14 @@ import { ScheduleModule } from '@nestjs/schedule';
import { Test, TestingModule } from '@nestjs/testing';
import { ApiPromise } from '@polkadot/api';
import { initializeApi } from '../../polkadot-init';
-import { CommonModule, ProcessEnvModule } from '../../../../src/common';
-import { LabCommandHandlers } from '../../../../src/indexer/events/labs';
-import { ServiceCommandHandlers } from '../../../../src/indexer/events/services';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { CommonModule, ProcessEnvModule } from '@common/index';
+import { LabCommandHandlers } from '@indexer/events/labs';
+import { ServiceCommandHandlers } from '@indexer/events/services';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { IndexerModule } from '@indexer/indexer.module';
import { labDataMock } from '../../../mock/models/labs/labs.mock';
import { serviceDataMock } from '../../../mock/models/labs/services.mock';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Service Event', () => {
let app: INestApplication;
diff --git a/test/e2e/indexer/events/service-request-events.spec.ts b/test/e2e/indexer/events/service-request-events.spec.ts
index b7c4729f..236fe284 100644
--- a/test/e2e/indexer/events/service-request-events.spec.ts
+++ b/test/e2e/indexer/events/service-request-events.spec.ts
@@ -1,8 +1,8 @@
import { Test, TestingModule } from '@nestjs/testing';
-import { IndexerHandler } from '../../../../src/indexer/indexer.handler';
-import { CommonModule } from '../../../../src/common/common.module';
-import { ProcessEnvModule } from '../../../../src/common/proxies/process-env/process-env.module';
-import { ServiceCommandHandlers } from '../../../../src/indexer/events/services';
+import { IndexerHandler } from '@indexer/indexer.handler';
+import { CommonModule } from '@common/common.module';
+import { ProcessEnvModule } from '@common/proxies/process-env/process-env.module';
+import { ServiceCommandHandlers } from '@indexer/events/services';
import { INestApplication } from '@nestjs/common';
import { initializeApi } from '../../polkadot-init';
import { ApiPromise } from '@polkadot/api';
@@ -29,16 +29,16 @@ import { CqrsModule } from '@nestjs/cqrs';
import { labDataMock } from '../../../mock/models/labs/labs.mock';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
import { serviceDataMock } from '../../../mock/models/labs/services.mock';
-import { LabCommandHandlers } from '../../../../src/indexer/events/labs';
-import { RequestServiceCommandHandlers } from '../../../../src/indexer/events/service-request';
+import { LabCommandHandlers } from '@indexer/events/labs';
+import { RequestServiceCommandHandlers } from '@indexer/events/service-request';
import { ScheduleModule } from '@nestjs/schedule';
-import { IndexerModule } from '../../../../src/indexer/indexer.module';
+import { IndexerModule } from '@indexer/indexer.module';
import { serviceRequestMock } from '../../../mock/models/service-request/service-request.mock';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { SecretKeyList } from '../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Event Command Service Request Claimed', () => {
let app: INestApplication;
diff --git a/test/e2e/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-events.spec.ts
index 489eccd2..3cba9222 100644
--- a/test/e2e/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-events.spec.ts
@@ -6,9 +6,9 @@ import { INestApplication } from '@nestjs/common/interfaces/nest-application.int
import { initializeApi } from '../../../../polkadot-init';
import { TypeOrmModule } from '@nestjs/typeorm/dist/typeorm.module';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { dummyCredentials } from '../../../../config';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
+import { EscrowService } from '@common/escrow/escrow.service';
import {
escrowServiceMockFactory,
mailerManagerMockFactory,
@@ -20,9 +20,9 @@ import {
ProcessEnvModule,
SubstrateModule,
TransactionLoggingModule,
-} from '../../../../../../src/common';
+} from '@common/index';
import { CqrsModule } from '@nestjs/cqrs';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
import {
GeneticAnalysis,
GeneticAnalysisOrder,
@@ -56,16 +56,16 @@ import {
import { geneticAnalystsDataMock } from '../../../../../mock/models/genetic-analysts/genetic-analysts.mock';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
import { geneticAnalystServiceDataMock } from '../../../../../mock/models/genetic-analysts/genetic-analyst-service.mock';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
+import { Notification } from '@common/notification/models/notification.entity';
import { createConnection } from 'typeorm';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { GeneticAnalysisOrderCreatedHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler';
-import { GeneticAnalysisOrderFulfilledHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler';
-import { GeneticAnalysisOrderPaidHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler';
-import { keyList, SecretKeyList } from '../../../../../../src/common/secrets';
+import { GeneticAnalysisOrderCreatedHandler } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler';
+import { GeneticAnalysisOrderFulfilledHandler } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler';
+import { GeneticAnalysisOrderPaidHandler } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler';
+import { keyList, SecretKeyList } from '@common/secrets';
import { MailerModule } from '@nestjs-modules/mailer';
import { join } from 'path';
import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
@@ -148,10 +148,7 @@ describe('Genetic Analysis Order Created Integration Test', () => {
},
},
template: {
- dir: join(
- __dirname,
- '../../../../../../src/listeners/substrate-listener/templates',
- ),
+ dir: join(__dirname, '@listeners/substrate-listener/templates'),
adapter: new HandlebarsAdapter({
colNum: (value) => parseInt(value) + 1,
}), // or new PugAdapter() or new EjsAdapter()
diff --git a/test/e2e/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-events.spec.ts
index e8994994..6dbfe09f 100644
--- a/test/e2e/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-events.spec.ts
@@ -6,19 +6,19 @@ import { INestApplication } from '@nestjs/common/interfaces/nest-application.int
import { initializeApi } from '../../../../polkadot-init';
import { TypeOrmModule } from '@nestjs/typeorm/dist/typeorm.module';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
-import { LocationEntities } from '../../../../../../src/common/location/models';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
+import { LocationEntities } from '@common/location/models';
import { dummyCredentials } from '../../../../config';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
+import { EscrowService } from '@common/escrow/escrow.service';
import { escrowServiceMockFactory } from '../../../../../unit/mock';
import {
DateTimeModule,
NotificationModule,
ProcessEnvModule,
SubstrateModule,
-} from '../../../../../../src/common';
+} from '@common/index';
import { CqrsModule } from '@nestjs/cqrs';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
import {
GeneticAnalysis,
GeneticAnalysisOrder,
@@ -49,14 +49,14 @@ import {
import { geneticAnalystsDataMock } from '../../../../../mock/models/genetic-analysts/genetic-analysts.mock';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
import { geneticAnalystServiceDataMock } from '../../../../../mock/models/genetic-analysts/genetic-analyst-service.mock';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
+import { Notification } from '@common/notification/models/notification.entity';
import { createConnection } from 'typeorm';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { GeneticAnalysisRejectedHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler';
-import { SecretKeyList } from '../../../../../../src/common/secrets';
+import { GeneticAnalysisRejectedHandler } from '@listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler';
+import { SecretKeyList } from '@common/secrets';
describe('Genetic Analysis Order Created Integration Test', () => {
let app: INestApplication;
diff --git a/test/e2e/listeners/substrate-listener/commands/genetic-analyst-service/genetic-analyst-service-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/genetic-analyst-service/genetic-analyst-service-events.spec.ts
index 39acc070..5f0b582c 100644
--- a/test/e2e/listeners/substrate-listener/commands/genetic-analyst-service/genetic-analyst-service-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/genetic-analyst-service/genetic-analyst-service-events.spec.ts
@@ -6,18 +6,18 @@ import { INestApplication } from '@nestjs/common/interfaces/nest-application.int
import { initializeApi } from '../../../../polkadot-init';
import { TypeOrmModule } from '@nestjs/typeorm/dist/typeorm.module';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { dummyCredentials } from '../../../../config';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
+import { EscrowService } from '@common/escrow/escrow.service';
import { escrowServiceMockFactory } from '../../../../../unit/mock';
import {
DateTimeModule,
NotificationModule,
ProcessEnvModule,
SubstrateModule,
-} from '../../../../../../src/common';
+} from '@common/index';
import { CqrsModule } from '@nestjs/cqrs';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
import {
GeneticAnalyst,
GeneticAnalystService,
@@ -36,14 +36,14 @@ import {
import { geneticAnalystsDataMock } from '../../../../../mock/models/genetic-analysts/genetic-analysts.mock';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
import { geneticAnalystServiceDataMock } from '../../../../../mock/models/genetic-analysts/genetic-analyst-service.mock';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
+import { Notification } from '@common/notification/models/notification.entity';
import { createConnection } from 'typeorm';
-import { GeneticAnalystServiceCommandHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-analyst-services';
+import { GeneticAnalystServiceCommandHandler } from '@listeners/substrate-listener/commands/genetic-analyst-services';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { SecretKeyList } from '../../../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Genetic Analyst Service Created Event', () => {
let app: INestApplication;
diff --git a/test/e2e/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-events.spec.ts
index 6cebea91..b82d473f 100644
--- a/test/e2e/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-events.spec.ts
@@ -18,26 +18,26 @@ import {
ProcessEnvModule,
SubstrateModule,
TransactionLoggingModule,
-} from '../../../../../../src/common';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+} from '@common/index';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
import { dummyCredentials } from '../../../../config';
import { escrowServiceMockFactory } from '../../../../../unit/mock';
import { initializeApi } from '../../../../polkadot-init';
import { geneticAnalystsDataMock } from '../../../../../mock/models/genetic-analysts/genetic-analysts.mock';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
+import { Notification } from '@common/notification/models/notification.entity';
import { createConnection } from 'typeorm';
import { StakeStatus } from '@debionetwork/polkadot-provider/lib/primitives/stake-status';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { GeneticAnalystRegisteredHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-registered/genetic-analyst-registered.handler';
-import { SecretKeyList } from '../../../../../../src/common/secrets';
+import { GeneticAnalystRegisteredHandler } from '@listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-registered/genetic-analyst-registered.handler';
+import { SecretKeyList } from '@common/secrets';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
-import { GeneticAnalystVerificationStatusHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler';
+import { GeneticAnalystVerificationStatusHandler } from '@listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler';
describe('Genetic analyst verification status', () => {
let app: INestApplication;
diff --git a/test/e2e/listeners/substrate-listener/commands/genetic-testing/genetic-testing-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/genetic-testing/genetic-testing-events.spec.ts
index b189d852..0d9963a4 100644
--- a/test/e2e/listeners/substrate-listener/commands/genetic-testing/genetic-testing-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/genetic-testing/genetic-testing-events.spec.ts
@@ -42,9 +42,9 @@ import { INestApplication } from '@nestjs/common/interfaces/nest-application.int
import { initializeApi } from '../../../../polkadot-init';
import { TypeOrmModule } from '@nestjs/typeorm/dist/typeorm.module';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { dummyCredentials } from '../../../../config';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
+import { EscrowService } from '@common/escrow/escrow.service';
import { escrowServiceMockFactory } from '../../../../../unit/mock';
import {
DateTimeModule,
@@ -53,21 +53,21 @@ import {
ProcessEnvModule,
SubstrateModule,
TransactionLoggingModule,
-} from '../../../../../../src/common';
+} from '@common/index';
import { CqrsModule } from '@nestjs/cqrs';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
import { createConnection } from 'typeorm';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { DataStakedHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler';
-import { SecretKeyList } from '../../../../../../src/common/secrets';
+import { DataStakedHandler } from '@listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler';
+import { SecretKeyList } from '@common/secrets';
import { DnaSample } from '@debionetwork/polkadot-provider/lib/models/labs/genetic-testing/dna-sample';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
-import { DnaSampleRejectedCommandHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler';
-import { DnaSampleResultReadyCommandHandler } from '../../../../../../src/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler';
+import { Notification } from '@common/notification/models/notification.entity';
+import { DnaSampleRejectedCommandHandler } from '@listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler';
+import { DnaSampleResultReadyCommandHandler } from '@listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler';
describe('Data Staked Integration Tests', () => {
let app: INestApplication;
diff --git a/test/e2e/listeners/substrate-listener/commands/labs/labs-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/labs/labs-events.spec.ts
index c30c9d4b..e4710cf4 100644
--- a/test/e2e/listeners/substrate-listener/commands/labs/labs-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/labs/labs-events.spec.ts
@@ -16,9 +16,9 @@ import { INestApplication } from '@nestjs/common/interfaces/nest-application.int
import { initializeApi } from '../../../../polkadot-init';
import { TypeOrmModule } from '@nestjs/typeorm/dist/typeorm.module';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { dummyCredentials } from '../../../../config';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
+import { EscrowService } from '@common/escrow/escrow.service';
import { escrowServiceMockFactory } from '../../../../../unit/mock';
import {
DateTimeModule,
@@ -26,21 +26,21 @@ import {
ProcessEnvModule,
SubstrateModule,
TransactionLoggingModule,
-} from '../../../../../../src/common';
+} from '@common/index';
import { CqrsModule } from '@nestjs/cqrs';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
-import { LabStakeSuccessfullHandler } from '../../../../../../src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
+import { LabStakeSuccessfullHandler } from '@listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler';
import { createConnection } from 'typeorm';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
import { StakeStatus } from '@debionetwork/polkadot-provider/lib/primitives/stake-status';
-import { SecretKeyList } from '../../../../../../src/common/secrets';
-import { labUnstakedHandler } from '../../../../../../src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler';
-import { LabUpdateVerificationStatusHandler } from '../../../../../../src/listeners/substrate-listener/commands/labs/update-verification-status/update-verification-status.handler';
+import { SecretKeyList } from '@common/secrets';
+import { labUnstakedHandler } from '@listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler';
+import { LabUpdateVerificationStatusHandler } from '@listeners/substrate-listener/commands/labs/update-verification-status/update-verification-status.handler';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
+import { Notification } from '@common/notification/models/notification.entity';
describe('lab staking Integration Tests', () => {
let app: INestApplication;
diff --git a/test/e2e/listeners/substrate-listener/commands/orders/orders-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/orders/orders-events.spec.ts
index 3bfdc7a6..f19e4950 100644
--- a/test/e2e/listeners/substrate-listener/commands/orders/orders-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/orders/orders-events.spec.ts
@@ -37,9 +37,9 @@ import { INestApplication } from '@nestjs/common/interfaces/nest-application.int
import { initializeApi } from '../../../../polkadot-init';
import { TypeOrmModule } from '@nestjs/typeorm/dist/typeorm.module';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { dummyCredentials } from '../../../../config';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
+import { EscrowService } from '@common/escrow/escrow.service';
import {
escrowServiceMockFactory,
mailerManagerMockFactory,
@@ -52,21 +52,21 @@ import {
ProcessEnvModule,
SubstrateModule,
TransactionLoggingModule,
-} from '../../../../../../src/common';
+} from '@common/index';
import { CqrsModule } from '@nestjs/cqrs';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
+import { Notification } from '@common/notification/models/notification.entity';
import { createConnection } from 'typeorm';
import { DnaSample } from '@debionetwork/polkadot-provider/lib/models/labs/genetic-testing/dna-sample';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { OrderFailedHandler } from '../../../../../../src/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler';
-import { keyList, SecretKeyList } from '../../../../../../src/common/secrets';
+import { OrderFailedHandler } from '@listeners/substrate-listener/commands/orders/order-failed/order-failed.handler';
+import { keyList, SecretKeyList } from '@common/secrets';
import { deleteService, deregisterLab } from '@debionetwork/polkadot-provider';
-import { OrderFulfilledHandler } from '../../../../../../src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler';
-import { OrderPaidHandler } from '../../../../../../src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler';
+import { OrderFulfilledHandler } from '@listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler';
+import { OrderPaidHandler } from '@listeners/substrate-listener/commands/orders/order-paid/order-paid.handler';
import { MailerModule } from '@nestjs-modules/mailer';
import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
import { join } from 'path';
@@ -159,10 +159,7 @@ describe('Order Failed Integration Tests', () => {
},
},
template: {
- dir: join(
- __dirname,
- '../../../../../../src/listeners/substrate-listener/templates',
- ),
+ dir: join(__dirname, '@listeners/substrate-listener/templates'),
adapter: new HandlebarsAdapter({
colNum: (value) => parseInt(value) + 1,
}), // or new PugAdapter() or new EjsAdapter()
diff --git a/test/e2e/listeners/substrate-listener/commands/service-request/service-request-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/service-request/service-request-events.spec.ts
index 8a98d189..569fa38b 100644
--- a/test/e2e/listeners/substrate-listener/commands/service-request/service-request-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/service-request/service-request-events.spec.ts
@@ -10,11 +10,11 @@ import {
ProcessEnvModule,
SubstrateModule,
TransactionLoggingModule,
-} from '../../../../../../src/common';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+} from '@common/index';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
import { dummyCredentials } from '../../../../config';
import { escrowServiceMockFactory } from '../../../../../unit/mock';
import { initializeApi } from '../../../../polkadot-init';
@@ -46,15 +46,15 @@ import { labDataMock } from '../../../../../mock/models/labs/labs.mock';
import { serviceDataMock } from '../../../../../mock/models/labs/services.mock';
import { serviceRequestMock } from '../../../../../mock/models/labs/service-request.mock';
import { createConnection } from 'typeorm';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
+import { Notification } from '@common/notification/models/notification.entity';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { ServiceRequestStakingAmountExcessRefunded } from '../../../../../../src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler';
-import { SecretKeyList } from '../../../../../../src/common/secrets';
-import { ServiceRequestStakingAmountRefundedHandler } from '../../../../../../src/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler';
+import { ServiceRequestStakingAmountExcessRefunded } from '@listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler';
+import { SecretKeyList } from '@common/secrets';
+import { ServiceRequestStakingAmountRefundedHandler } from '@listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler';
describe('Service Request Excess Integration Tests', () => {
let app: INestApplication;
diff --git a/test/e2e/listeners/substrate-listener/commands/services/services-events.spec.ts b/test/e2e/listeners/substrate-listener/commands/services/services-events.spec.ts
index 7554ac58..b6d42535 100644
--- a/test/e2e/listeners/substrate-listener/commands/services/services-events.spec.ts
+++ b/test/e2e/listeners/substrate-listener/commands/services/services-events.spec.ts
@@ -18,26 +18,26 @@ import {
ProcessEnvModule,
SubstrateModule,
TransactionLoggingModule,
-} from '../../../../../../src/common';
-import { EscrowService } from '../../../../../../src/common/escrow/escrow.service';
-import { TransactionRequest } from '../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+} from '@common/index';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import { LabRating } from '../../../../../mock/models/rating/rating.entity';
-import { ServiceCommandHandlers } from '../../../../../../src/listeners/substrate-listener/commands/services';
-import { SubstrateListenerHandler } from '../../../../../../src/listeners/substrate-listener/substrate-listener.handler';
+import { ServiceCommandHandlers } from '@listeners/substrate-listener/commands/services';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
import { dummyCredentials } from '../../../../config';
import { escrowServiceMockFactory } from '../../../../../unit/mock';
import { ApiPromise } from '@polkadot/api';
import { initializeApi } from '../../../../polkadot-init';
import { labDataMock } from '../../../../../mock/models/labs/labs.mock';
import { serviceDataMock } from '../../../../../mock/models/labs/services.mock';
-import { Notification } from '../../../../../../src/common/notification/models/notification.entity';
+import { Notification } from '@common/notification/models/notification.entity';
import { createConnection } from 'typeorm';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status';
-import { SecretKeyList } from '../../../../../../src/common/secrets';
+import { SecretKeyList } from '@common/secrets';
describe('Service Created Integration Tests', () => {
let app: INestApplication;
diff --git a/test/e2e/schedulers/lab-unstake.spec.ts b/test/e2e/schedulers/lab-unstake.spec.ts
index 624da5b5..f29eaa4c 100644
--- a/test/e2e/schedulers/lab-unstake.spec.ts
+++ b/test/e2e/schedulers/lab-unstake.spec.ts
@@ -5,13 +5,13 @@ import {
ProcessEnvModule,
SubstrateModule,
SubstrateService,
-} from '../../../src/common';
+} from '@common/index';
import {
ElasticsearchModule,
ElasticsearchService,
} from '@nestjs/elasticsearch';
import { ScheduleModule, SchedulerRegistry } from '@nestjs/schedule';
-import { LabUnstakedService } from '../../../src/schedulers/lab-unstake/lab-unstake.service';
+import { LabUnstakedService } from '@schedulers/lab-unstake/lab-unstake.service';
import * as labQuery from '@debionetwork/polkadot-provider/lib/query/labs';
import { Lab } from '@debionetwork/polkadot-provider';
import { StakeStatus } from '@debionetwork/polkadot-provider/lib/primitives/stake-status';
@@ -19,7 +19,7 @@ import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { SecretKeyList, keyList } from '../../../src/common/secrets';
+import { SecretKeyList, keyList } from '@common/secrets';
describe('Lab Unstaked Scheduler (e2e)', () => {
let schedulerRegistry: SchedulerRegistry;
diff --git a/test/e2e/schedulers/mailer.spec.ts b/test/e2e/schedulers/mailer.spec.ts
index cbff9b98..f566dcec 100644
--- a/test/e2e/schedulers/mailer.spec.ts
+++ b/test/e2e/schedulers/mailer.spec.ts
@@ -5,24 +5,24 @@ import {
EmailNotification,
EmailNotificationModule,
EmailNotificationService,
-} from '../../../src/common/database';
+} from '@common/database';
import {
SubstrateModule,
MailModule,
MailerManager,
ProcessEnvModule,
-} from '../../../src/common';
-import { MailerService } from '../../../src/schedulers/mailer/mailer.service';
+} from '@common/index';
+import { MailerService } from '@schedulers/mailer/mailer.service';
import { Keyring } from '@polkadot/api';
import { TypeOrmModule } from '@nestjs/typeorm';
import { dummyCredentials } from '../config';
-import { SubstrateService } from '../../../src/common/substrate/substrate.service';
+import { SubstrateService } from '@common/substrate/substrate.service';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
import { ElasticsearchModule } from '@nestjs/elasticsearch';
-import { SecretKeyList, keyList } from '../../../src/common/secrets';
+import { SecretKeyList, keyList } from '@common/secrets';
describe('Mailer Scheduler (e2e)', () => {
let service: MailerService;
diff --git a/test/e2e/schedulers/unstaked.spec.ts b/test/e2e/schedulers/unstaked.spec.ts
index 295706f3..096ca4d8 100644
--- a/test/e2e/schedulers/unstaked.spec.ts
+++ b/test/e2e/schedulers/unstaked.spec.ts
@@ -5,20 +5,20 @@ import {
ProcessEnvModule,
SubstrateModule,
SubstrateService,
-} from '../../../src/common';
+} from '@common/index';
import {
ElasticsearchModule,
ElasticsearchService,
} from '@nestjs/elasticsearch';
import { ScheduleModule, SchedulerRegistry } from '@nestjs/schedule';
-import { UnstakedService } from '../../../src/schedulers/unstaked/unstaked.service';
+import { UnstakedService } from '@schedulers/unstaked/unstaked.service';
import * as serviceRequestQuery from '@debionetwork/polkadot-provider/lib/query/service-request';
import { ServiceRequest } from '@debionetwork/polkadot-provider';
import {
GCloudSecretManagerModule,
GCloudSecretManagerService,
} from '@debionetwork/nestjs-gcloud-secret-manager';
-import { SecretKeyList, keyList } from '../../../src/common/secrets';
+import { SecretKeyList, keyList } from '@common/secrets';
describe('Unstaked Scheduler (e2e)', () => {
let schedulerRegistry: SchedulerRegistry;
diff --git a/test/unit/common/modules/error-logging/error-logging.service.spec.ts b/test/unit/common/modules/error-logging/error-logging.service.spec.ts
index 14d55ef0..0199a7f7 100644
--- a/test/unit/common/modules/error-logging/error-logging.service.spec.ts
+++ b/test/unit/common/modules/error-logging/error-logging.service.spec.ts
@@ -1,15 +1,15 @@
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
-import { ErrorLoggingService } from '../../../../../src/common/error-logging/error-logging.service';
-import { ErrorLogging } from '../../../../../src/common/error-logging/models/error-logging.entity';
+import { ErrorLoggingService } from '@common/error-logging/error-logging.service';
+import { ErrorLogging } from '@common/error-logging/models/error-logging.entity';
import {
dateTimeProxyMockFactory,
MockType,
repositoryMockFactory,
} from '../../../mock';
import { Repository } from 'typeorm';
-import { ErrorLoggingDto } from '../../../../../src/common/error-logging/dto/error-logging.dto';
-import { DateTimeProxy } from '../../../../../src/common/proxies/date-time/date-time.proxy';
+import { ErrorLoggingDto } from '@common/error-logging/dto/error-logging.dto';
+import { DateTimeProxy } from '@common/proxies/date-time/date-time.proxy';
describe('ErrorLogging Service Unit Tests', () => {
let errorLoggingService: ErrorLoggingService;
diff --git a/test/unit/common/modules/escrow/escrow.service.spec.ts b/test/unit/common/modules/escrow/escrow.service.spec.ts
index 3b0557db..f5277cd6 100644
--- a/test/unit/common/modules/escrow/escrow.service.spec.ts
+++ b/test/unit/common/modules/escrow/escrow.service.spec.ts
@@ -1,16 +1,16 @@
import { Test, TestingModule } from '@nestjs/testing';
-import { EthereumService, SubstrateService } from '../../../../../src/common';
+import { EthereumService, SubstrateService } from '@common/index';
import {
errorLoggingServiceMockFactory,
ethereumServiceMockFactory,
MockType,
substrateServiceMockFactory,
} from '../../../mock';
-import { EscrowService } from '../../../../../src/common/escrow/escrow.service';
+import { EscrowService } from '@common/escrow/escrow.service';
import { ethers } from 'ethers';
import { setOrderPaid } from '@debionetwork/polkadot-provider';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { ErrorLoggingService } from '../../../../../src/common/error-logging/error-logging.service';
+import { ErrorLoggingService } from '@common/error-logging/error-logging.service';
jest.mock('@debionetwork/polkadot-provider', () => ({
setOrderPaid: jest.fn(),
diff --git a/test/unit/indexer/events/certifications/certifications.command.spec.ts b/test/unit/indexer/events/certifications/certifications.command.spec.ts
index fb904a67..82680fa0 100644
--- a/test/unit/indexer/events/certifications/certifications.command.spec.ts
+++ b/test/unit/indexer/events/certifications/certifications.command.spec.ts
@@ -1,12 +1,12 @@
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
import {
CertificationCreatedCommandIndexer,
CertificationDeletedCommandIndexer,
CertificationUpdatedCommandIndexer,
-} from '../../../../../src/indexer/events/certifications';
-import { Certification } from '../../../../../src/indexer/models/certification/certification';
+} from '@indexer/events/certifications';
+import { Certification } from '@indexer/models/certification/certification';
-jest.mock('../../../../../src/indexer/models/certification/certification');
+jest.mock('@indexer/models/certification/certification');
describe('Certifications Substrate Event Handler', () => {
const createMockCertifications = () => {
diff --git a/test/unit/indexer/events/certifications/certifications.handler.spec.ts b/test/unit/indexer/events/certifications/certifications.handler.spec.ts
index 2756578b..c19e964f 100644
--- a/test/unit/indexer/events/certifications/certifications.handler.spec.ts
+++ b/test/unit/indexer/events/certifications/certifications.handler.spec.ts
@@ -4,16 +4,16 @@ import {
createObjectSearchLab,
ElasticSearchServiceProvider,
} from '../../../mock';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
import {
CertificationCreatedCommandIndexer,
CertificationDeletedCommandIndexer,
CertificationsCommandHandlers,
CertificationUpdatedCommandIndexer,
-} from '../../../../../src/indexer/events/certifications';
-import { CertificationCreatedHandler } from '../../../../../src/indexer/events/certifications/commands/certification-created/certification-created.handler';
-import { CertificationUpdatedHandler } from '../../../../../src/indexer/events/certifications/commands/certification-updated/certification-updated.handler';
-import { CertificationDeletedHandler } from '../../../../../src/indexer/events/certifications/commands/certification-deleted/certification-deleted.handler';
+} from '@indexer/events/certifications';
+import { CertificationCreatedHandler } from '@indexer/events/certifications/commands/certification-created/certification-created.handler';
+import { CertificationUpdatedHandler } from '@indexer/events/certifications/commands/certification-updated/certification-updated.handler';
+import { CertificationDeletedHandler } from '@indexer/events/certifications/commands/certification-deleted/certification-deleted.handler';
import { when } from 'jest-when';
let certificationsCreatedHandler: CertificationCreatedHandler;
diff --git a/test/unit/indexer/events/genetic-analysis-order/genetic-analysis-order.command.spec.ts b/test/unit/indexer/events/genetic-analysis-order/genetic-analysis-order.command.spec.ts
index c1a9601c..e98ecb8c 100644
--- a/test/unit/indexer/events/genetic-analysis-order/genetic-analysis-order.command.spec.ts
+++ b/test/unit/indexer/events/genetic-analysis-order/genetic-analysis-order.command.spec.ts
@@ -4,13 +4,13 @@ import {
GeneticAnalysisOrderFulfilledCommandIndexer,
GeneticAnalysisOrderPaidCommandIndexer,
GeneticAnalysisOrderRefundedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analysis-order';
-import { GeneticAnalysisOrderFailedCommandIndexer } from '../../../../../src/indexer/events/genetic-analysis-order/commands/genetic-analysis-order-failed/genetic-analysis-order-failed.command';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { GeneticAnalysisOrderModel } from '../../../../../src/indexer/models/genetic-analysis-order/genetic-analysis-order.model';
+} from '@indexer/events/genetic-analysis-order';
+import { GeneticAnalysisOrderFailedCommandIndexer } from '@indexer/events/genetic-analysis-order/commands/genetic-analysis-order-failed/genetic-analysis-order-failed.command';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { GeneticAnalysisOrderModel } from '@indexer/models/genetic-analysis-order/genetic-analysis-order.model';
jest.mock(
- '../../../../../src/indexer/models/genetic-analysis-order/genetic-analysis-order.model',
+ '@indexer/models/genetic-analysis-order/genetic-analysis-order.model',
);
describe('Orders Substrate Event Handler', () => {
diff --git a/test/unit/indexer/events/genetic-analysis-order/genetic-analysis-order.handler.spec.ts b/test/unit/indexer/events/genetic-analysis-order/genetic-analysis-order.handler.spec.ts
index b4ae2933..da9c28e0 100644
--- a/test/unit/indexer/events/genetic-analysis-order/genetic-analysis-order.handler.spec.ts
+++ b/test/unit/indexer/events/genetic-analysis-order/genetic-analysis-order.handler.spec.ts
@@ -8,19 +8,19 @@ import {
GeneticAnalysisOrderFulfilledCommandIndexer,
GeneticAnalysisOrderPaidCommandIndexer,
GeneticAnalysisOrderRefundedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analysis-order';
+} from '@indexer/events/genetic-analysis-order';
import {
createObjectSearchGeneticAnalysts,
createObjectSearchGeneticAnalystsService,
ElasticSearchServiceProvider,
} from '../../../mock';
-import { GeneticAnalysisOrderCancelledHandler } from '../../../../../src/indexer/events/genetic-analysis-order/commands/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler';
-import { GeneticAnalysisOrderCreatedHandler } from '../../../../../src/indexer/events/genetic-analysis-order/commands/genetic-analysis-order-created/genetic-analysis-order-created.handler';
-import { GeneticAnalysisOrderFailedHandler } from '../../../../../src/indexer/events/genetic-analysis-order/commands/genetic-analysis-order-failed/genetic-analysis-order-failed.handler';
-import { GeneticAnalysisOrderFulfilledHandler } from '../../../../../src/indexer/events/genetic-analysis-order/commands/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler';
-import { GeneticAnalysisOrderPaidHandler } from '../../../../../src/indexer/events/genetic-analysis-order/commands/genetic-analysis-order-paid/genetic-analysis-order-paid.handler';
-import { GeneticAnalysisOrderRefundedHandler } from '../../../../../src/indexer/events/genetic-analysis-order/commands/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+import { GeneticAnalysisOrderCancelledHandler } from '@indexer/events/genetic-analysis-order/commands/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler';
+import { GeneticAnalysisOrderCreatedHandler } from '@indexer/events/genetic-analysis-order/commands/genetic-analysis-order-created/genetic-analysis-order-created.handler';
+import { GeneticAnalysisOrderFailedHandler } from '@indexer/events/genetic-analysis-order/commands/genetic-analysis-order-failed/genetic-analysis-order-failed.handler';
+import { GeneticAnalysisOrderFulfilledHandler } from '@indexer/events/genetic-analysis-order/commands/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler';
+import { GeneticAnalysisOrderPaidHandler } from '@indexer/events/genetic-analysis-order/commands/genetic-analysis-order-paid/genetic-analysis-order-paid.handler';
+import { GeneticAnalysisOrderRefundedHandler } from '@indexer/events/genetic-analysis-order/commands/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
import { when } from 'jest-when';
describe('Genetic Analysis Order Substrate Event Handler', () => {
diff --git a/test/unit/indexer/events/genetic-analysis/genetic-analysis.command.spec.ts b/test/unit/indexer/events/genetic-analysis/genetic-analysis.command.spec.ts
index 0fdb5bfe..15a8cafa 100644
--- a/test/unit/indexer/events/genetic-analysis/genetic-analysis.command.spec.ts
+++ b/test/unit/indexer/events/genetic-analysis/genetic-analysis.command.spec.ts
@@ -3,13 +3,11 @@ import {
GeneticAnalysisRejectedCommandIndexer,
GeneticAnalysisResultReadyCommandIndexer,
GeneticAnalysisSubmittedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analysis';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { GeneticAnalysisModel } from '../../../../../src/indexer/models/genetic-analysis/genetic-analysis.model';
+} from '@indexer/events/genetic-analysis';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { GeneticAnalysisModel } from '@indexer/models/genetic-analysis/genetic-analysis.model';
-jest.mock(
- '../../../../../src/indexer/models/genetic-analysis/genetic-analysis.model',
-);
+jest.mock('@indexer/models/genetic-analysis/genetic-analysis.model');
describe('Genetic Analysis Substrate Event Command', () => {
const createMockGeneticAnalysis = () => {
diff --git a/test/unit/indexer/events/genetic-analysis/genetic-analysis.handler.spec.ts b/test/unit/indexer/events/genetic-analysis/genetic-analysis.handler.spec.ts
index d305c5e3..d59920a9 100644
--- a/test/unit/indexer/events/genetic-analysis/genetic-analysis.handler.spec.ts
+++ b/test/unit/indexer/events/genetic-analysis/genetic-analysis.handler.spec.ts
@@ -6,14 +6,14 @@ import {
GeneticAnalysisRejectedCommandIndexer,
GeneticAnalysisResultReadyCommandIndexer,
GeneticAnalysisSubmittedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analysis';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+} from '@indexer/events/genetic-analysis';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
import { ElasticSearchServiceProvider } from '../../../mock';
-import { GeneticAnalysisInProgressHandler } from '../../../../../src/indexer/events/genetic-analysis/commands/genetic-analysis-in-progress/genetic-analysis-in-progress.handler';
-import { GeneticAnalysisRejectedHandler } from '../../../../../src/indexer/events/genetic-analysis/commands/genetic-analysis-rejected/genetic-analysis-rejected.handler';
-import { GeneticAnalysisResultReadyHandler } from '../../../../../src/indexer/events/genetic-analysis/commands/genetic-analysis-result-ready/genetic-analysis-result-ready.handler';
-import { GeneticAnalysisSubmittedHandler } from '../../../../../src/indexer/events/genetic-analysis/commands/genetic-analysis-submitted/genetic-analysis-submitted.handler';
+import { GeneticAnalysisInProgressHandler } from '@indexer/events/genetic-analysis/commands/genetic-analysis-in-progress/genetic-analysis-in-progress.handler';
+import { GeneticAnalysisRejectedHandler } from '@indexer/events/genetic-analysis/commands/genetic-analysis-rejected/genetic-analysis-rejected.handler';
+import { GeneticAnalysisResultReadyHandler } from '@indexer/events/genetic-analysis/commands/genetic-analysis-result-ready/genetic-analysis-result-ready.handler';
+import { GeneticAnalysisSubmittedHandler } from '@indexer/events/genetic-analysis/commands/genetic-analysis-submitted/genetic-analysis-submitted.handler';
describe('Genetic Analysis Substrate Event Handler', () => {
let elasticsearchService: ElasticsearchService;
diff --git a/test/unit/indexer/events/genetic-analyst-qualifications/genetic-analyst-qualifications.command.spec.ts b/test/unit/indexer/events/genetic-analyst-qualifications/genetic-analyst-qualifications.command.spec.ts
index 8b1b2ec2..cf8ef347 100644
--- a/test/unit/indexer/events/genetic-analyst-qualifications/genetic-analyst-qualifications.command.spec.ts
+++ b/test/unit/indexer/events/genetic-analyst-qualifications/genetic-analyst-qualifications.command.spec.ts
@@ -2,12 +2,12 @@ import {
GeneticAnalystsQualificationCreatedCommandIndexer,
GeneticAnalystsQualificationDeletedCommandIndexer,
GeneticAnalystsQualificationUpdatedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analyst-qualifications';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { GeneticAnalystsQualificationModel } from '../../../../../src/indexer/models/genetic-analysts-qualifications/genetic-analysts-qualifications.model';
+} from '@indexer/events/genetic-analyst-qualifications';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { GeneticAnalystsQualificationModel } from '@indexer/models/genetic-analysts-qualifications/genetic-analysts-qualifications.model';
jest.mock(
- '../../../../../src/indexer/models/genetic-analysts-qualifications/genetic-analysts-qualifications.model',
+ '@indexer/models/genetic-analysts-qualifications/genetic-analysts-qualifications.model',
);
describe('Genetic Analysts Qualifications Substrate Event Handler', () => {
diff --git a/test/unit/indexer/events/genetic-analyst-qualifications/genetic-analyst-qualifications.handler.spec.ts b/test/unit/indexer/events/genetic-analyst-qualifications/genetic-analyst-qualifications.handler.spec.ts
index 94b0ca72..585daed9 100644
--- a/test/unit/indexer/events/genetic-analyst-qualifications/genetic-analyst-qualifications.handler.spec.ts
+++ b/test/unit/indexer/events/genetic-analyst-qualifications/genetic-analyst-qualifications.handler.spec.ts
@@ -9,13 +9,13 @@ import {
GeneticAnalystsQualificationCreatedCommandIndexer,
GeneticAnalystsQualificationDeletedCommandIndexer,
GeneticAnalystsQualificationUpdatedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analyst-qualifications';
-import { GeneticAnalystsQualificationCreatedHandler } from '../../../../../src/indexer/events/genetic-analyst-qualifications/commands/genetic-analysts-qualification-created/genetic-analysts-qualification-created.handler';
-import { GeneticAnalystsQualificationDeletedHandler } from '../../../../../src/indexer/events/genetic-analyst-qualifications/commands/genetic-analysts-qualification-deleted/genetic-analysts-qualification-deleted.handler';
-import { GeneticAnalystsQualificationUpdatedHandler } from '../../../../../src/indexer/events/genetic-analyst-qualifications/commands/genetic-analysts-qualification-updated/genetic-analysts-qualification-updated.handler';
+} from '@indexer/events/genetic-analyst-qualifications';
+import { GeneticAnalystsQualificationCreatedHandler } from '@indexer/events/genetic-analyst-qualifications/commands/genetic-analysts-qualification-created/genetic-analysts-qualification-created.handler';
+import { GeneticAnalystsQualificationDeletedHandler } from '@indexer/events/genetic-analyst-qualifications/commands/genetic-analysts-qualification-deleted/genetic-analysts-qualification-deleted.handler';
+import { GeneticAnalystsQualificationUpdatedHandler } from '@indexer/events/genetic-analyst-qualifications/commands/genetic-analysts-qualification-updated/genetic-analysts-qualification-updated.handler';
import { when } from 'jest-when';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
describe('Genetic Anlaysts Qualificatioins Substrate Event Handler', () => {
let elasticsearchService: ElasticsearchService;
diff --git a/test/unit/indexer/events/genetic-analyst-services/genetic-analyst-services.command.spec.ts b/test/unit/indexer/events/genetic-analyst-services/genetic-analyst-services.command.spec.ts
index d5cc9958..b34715e7 100644
--- a/test/unit/indexer/events/genetic-analyst-services/genetic-analyst-services.command.spec.ts
+++ b/test/unit/indexer/events/genetic-analyst-services/genetic-analyst-services.command.spec.ts
@@ -2,12 +2,12 @@ import {
GeneticAnalystServicesCreatedCommandIndexer,
GeneticAnalystServicesUpdatedCommandIndexer,
GeneticAnalystServicesDeletedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analyst-services';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { GeneticAnalystsServicesModel } from '../../../../../src/indexer/models/genetic-analysts-services/genetic-analysts-services.model';
+} from '@indexer/events/genetic-analyst-services';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { GeneticAnalystsServicesModel } from '@indexer/models/genetic-analysts-services/genetic-analysts-services.model';
jest.mock(
- '../../../../../src/indexer/models/genetic-analysts-services/genetic-analysts-services.model',
+ '@indexer/models/genetic-analysts-services/genetic-analysts-services.model',
);
describe('Genetic Analysts Services Substrate Event Handler', () => {
diff --git a/test/unit/indexer/events/genetic-analyst-services/genetic-analyst-services.handler.spec.ts b/test/unit/indexer/events/genetic-analyst-services/genetic-analyst-services.handler.spec.ts
index 2e03c9ff..3f2fa6d0 100644
--- a/test/unit/indexer/events/genetic-analyst-services/genetic-analyst-services.handler.spec.ts
+++ b/test/unit/indexer/events/genetic-analyst-services/genetic-analyst-services.handler.spec.ts
@@ -9,13 +9,13 @@ import {
GeneticAnalystServicesCreatedCommandIndexer,
GeneticAnalystServicesDeletedCommandIndexer,
GeneticAnalystServicesUpdatedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analyst-services';
-import { GeneticAnalystServicesCreatedHandler } from '../../../../../src/indexer/events/genetic-analyst-services/commands/genetic-analyst-services-created/genetic-analyst-services-created.handler';
-import { GeneticAnalystServicesDeletedHandler } from '../../../../../src/indexer/events/genetic-analyst-services/commands/genetic-analyst-services-deleted/genetic-analyst-services-deleted.handler';
-import { GeneticAnalystServicesUpdatedHandler } from '../../../../../src/indexer/events/genetic-analyst-services/commands/genetic-analyst-services-updated/genetic-analyst-services-updated.handler';
+} from '@indexer/events/genetic-analyst-services';
+import { GeneticAnalystServicesCreatedHandler } from '@indexer/events/genetic-analyst-services/commands/genetic-analyst-services-created/genetic-analyst-services-created.handler';
+import { GeneticAnalystServicesDeletedHandler } from '@indexer/events/genetic-analyst-services/commands/genetic-analyst-services-deleted/genetic-analyst-services-deleted.handler';
+import { GeneticAnalystServicesUpdatedHandler } from '@indexer/events/genetic-analyst-services/commands/genetic-analyst-services-updated/genetic-analyst-services-updated.handler';
import { when } from 'jest-when';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
describe('Genetic Anlaysts Services Substrate Event Handler', () => {
let elasticsearchService: ElasticsearchService;
diff --git a/test/unit/indexer/events/genetic-analysts/genetic-analysts.command.spec.ts b/test/unit/indexer/events/genetic-analysts/genetic-analysts.command.spec.ts
index 83ea835c..cf21cf51 100644
--- a/test/unit/indexer/events/genetic-analysts/genetic-analysts.command.spec.ts
+++ b/test/unit/indexer/events/genetic-analysts/genetic-analysts.command.spec.ts
@@ -8,13 +8,11 @@ import {
GeneticAnalystsRetrieveUnstakeAmountCommandIndexer,
GeneticAnalystVerificationFailedCommandIndexer,
GeneticAnalystUnstakeSuccessfulCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analysts';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { GeneticAnalystsModel } from '../../../../../src/indexer/models/genetic-analysts/genetic-analysts.model';
+} from '@indexer/events/genetic-analysts';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { GeneticAnalystsModel } from '@indexer/models/genetic-analysts/genetic-analysts.model';
-jest.mock(
- '../../../../../src/indexer/models/genetic-analysts/genetic-analysts.model',
-);
+jest.mock('@indexer/models/genetic-analysts/genetic-analysts.model');
describe('Genetic Analysts Substrate Event Handler', () => {
const createMockGeneticAnalysts = () => {
diff --git a/test/unit/indexer/events/genetic-analysts/genetic-analysts.handler.spec.ts b/test/unit/indexer/events/genetic-analysts/genetic-analysts.handler.spec.ts
index df9498c1..ab831763 100644
--- a/test/unit/indexer/events/genetic-analysts/genetic-analysts.handler.spec.ts
+++ b/test/unit/indexer/events/genetic-analysts/genetic-analysts.handler.spec.ts
@@ -12,18 +12,18 @@ import {
GeneticAnalystsUpdateAvailabilityStatusCommandIndexer,
GeneticAnalystUnstakeSuccessfulCommandIndexer,
GeneticAnalystVerificationFailedCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-analysts';
-import { GeneticAnalystsRegisteredHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-registered/genetic-analysts-registered.handler';
-import { GeneticAnalystsDeletedHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-deleted/genetic-analysts-deleted.handler';
-import { GeneticAnalystsUpdatedHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-updated/genetic-analysts-updated.handler';
-
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { GeneticAnalystsStakeSuccessfulHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-stake-successful/genetic-analysts-stake-successful.handler';
-import { GeneticAnalystsUpdateVerificationStatusHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-update-verification-status/genetic-analysts-update-verification-status.handler';
-import { GeneticAnalystsRetrieveUnstakeAmountHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-retrieve-unstake-amount/genetic-analysts-retrieve-unstake-amount.handler';
-import { GeneticAnalystsUpdateAvailabilityStatusHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-update-availability-status/genetic-analysts-update-availability-status.handler';
-import { GeneticAnalystUnstakeSuccessfulHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-unstake-successful/genetic-analysts-unstake-successful.handler';
-import { GeneticAnalystVerificationFailedHandler } from '../../../../../src/indexer/events/genetic-analysts/commands/genetic-analysts-verification-failed/genetic-analysts-verification-failed.handler';
+} from '@indexer/events/genetic-analysts';
+import { GeneticAnalystsRegisteredHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-registered/genetic-analysts-registered.handler';
+import { GeneticAnalystsDeletedHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-deleted/genetic-analysts-deleted.handler';
+import { GeneticAnalystsUpdatedHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-updated/genetic-analysts-updated.handler';
+
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { GeneticAnalystsStakeSuccessfulHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-stake-successful/genetic-analysts-stake-successful.handler';
+import { GeneticAnalystsUpdateVerificationStatusHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-update-verification-status/genetic-analysts-update-verification-status.handler';
+import { GeneticAnalystsRetrieveUnstakeAmountHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-retrieve-unstake-amount/genetic-analysts-retrieve-unstake-amount.handler';
+import { GeneticAnalystsUpdateAvailabilityStatusHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-update-availability-status/genetic-analysts-update-availability-status.handler';
+import { GeneticAnalystUnstakeSuccessfulHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-unstake-successful/genetic-analysts-unstake-successful.handler';
+import { GeneticAnalystVerificationFailedHandler } from '@indexer/events/genetic-analysts/commands/genetic-analysts-verification-failed/genetic-analysts-verification-failed.handler';
describe('Genetic Anlaysts Substrate Event Handler', () => {
let elasticsearchService: ElasticsearchService;
diff --git a/test/unit/indexer/events/genetic-data/genetic-data.command.spec.ts b/test/unit/indexer/events/genetic-data/genetic-data.command.spec.ts
index 7c1ae081..daba2c8c 100644
--- a/test/unit/indexer/events/genetic-data/genetic-data.command.spec.ts
+++ b/test/unit/indexer/events/genetic-data/genetic-data.command.spec.ts
@@ -2,11 +2,11 @@ import {
AddGeneticDataCommandIndexer,
RemoveGeneticDataCommandIndexer,
UpdateGeneticDataCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-data';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { GeneticDataModel } from '../../../../../src/indexer/models/genetic-data/genetic-data.model';
+} from '@indexer/events/genetic-data';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { GeneticDataModel } from '@indexer/models/genetic-data/genetic-data.model';
-jest.mock('../../../../../src/indexer/models/genetic-data/genetic-data.model');
+jest.mock('@indexer/models/genetic-data/genetic-data.model');
describe('Genetic Data Substrate Event Handler', () => {
const createMockGeneticData = () => {
diff --git a/test/unit/indexer/events/genetic-data/genetic-data.handler.spec.ts b/test/unit/indexer/events/genetic-data/genetic-data.handler.spec.ts
index 7e468f49..343c0a01 100644
--- a/test/unit/indexer/events/genetic-data/genetic-data.handler.spec.ts
+++ b/test/unit/indexer/events/genetic-data/genetic-data.handler.spec.ts
@@ -5,12 +5,12 @@ import {
GeneticDataCommandHandlers,
RemoveGeneticDataCommandIndexer,
UpdateGeneticDataCommandIndexer,
-} from '../../../../../src/indexer/events/genetic-data';
+} from '@indexer/events/genetic-data';
import { ElasticSearchServiceProvider } from '../../../mock';
-import { AddGeneticDataHandler } from '../../../../../src/indexer/events/genetic-data/commands/add-genetic-data/add-genetic-data.handler';
-import { RemoveGeneticDataHandler } from '../../../../../src/indexer/events/genetic-data/commands/remove-genetic-data/remove-genetic-data.handler';
-import { UpdateGeneticDataHandler } from '../../../../../src/indexer/events/genetic-data/commands/update-genetic-data/update-genetic-data.handler';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+import { AddGeneticDataHandler } from '@indexer/events/genetic-data/commands/add-genetic-data/add-genetic-data.handler';
+import { RemoveGeneticDataHandler } from '@indexer/events/genetic-data/commands/remove-genetic-data/remove-genetic-data.handler';
+import { UpdateGeneticDataHandler } from '@indexer/events/genetic-data/commands/update-genetic-data/update-genetic-data.handler';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
describe('Genetic Data Substate Event Handler', () => {
let elasticsearchService: ElasticsearchService;
diff --git a/test/unit/indexer/events/genetic-testing/genetic-testing.command.spec.ts b/test/unit/indexer/events/genetic-testing/genetic-testing.command.spec.ts
index f59bf52e..23acf500 100644
--- a/test/unit/indexer/events/genetic-testing/genetic-testing.command.spec.ts
+++ b/test/unit/indexer/events/genetic-testing/genetic-testing.command.spec.ts
@@ -1,8 +1,8 @@
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { DataStakedCommandIndexer } from '../../../../../src/indexer/events/genetic-testing';
-import { DataStaked } from '../../../../../src/indexer/models/genetic-testing/data-staked';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { DataStakedCommandIndexer } from '@indexer/events/genetic-testing';
+import { DataStaked } from '@indexer/models/genetic-testing/data-staked';
-jest.mock('../../../../../src/indexer/models/genetic-testing/data-staked');
+jest.mock('@indexer/models/genetic-testing/data-staked');
describe('Genetic Testing Substrate Event Handler', () => {
const createMockDataStaked = () => {
diff --git a/test/unit/indexer/events/genetic-testing/genetic-testing.handler.spec.ts b/test/unit/indexer/events/genetic-testing/genetic-testing.handler.spec.ts
index 9229a4c7..127dc28e 100644
--- a/test/unit/indexer/events/genetic-testing/genetic-testing.handler.spec.ts
+++ b/test/unit/indexer/events/genetic-testing/genetic-testing.handler.spec.ts
@@ -1,11 +1,11 @@
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { Test, TestingModule } from '@nestjs/testing';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { DataStakedHandler } from '../../../../../src/indexer/events/genetic-testing/commands/data-staked/data-staked.handler';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { DataStakedHandler } from '@indexer/events/genetic-testing/commands/data-staked/data-staked.handler';
import {
DataStakedCommandIndexer,
GeneticTestingCommandHandlers,
-} from '../../../../../src/indexer/events/genetic-testing';
+} from '@indexer/events/genetic-testing';
import { ElasticSearchServiceProvider } from '../../../mock';
let dataStakedHandler: DataStakedHandler;
diff --git a/test/unit/indexer/events/labs/labs.command.spec.ts b/test/unit/indexer/events/labs/labs.command.spec.ts
index 165a9f2c..d4549c47 100644
--- a/test/unit/indexer/events/labs/labs.command.spec.ts
+++ b/test/unit/indexer/events/labs/labs.command.spec.ts
@@ -3,15 +3,15 @@ import {
LabRegisteredCommandIndexer,
LabUpdatedCommandIndexer,
LabUpdateVerificationStatusCommandIndexer,
-} from '../../../../../src/indexer/events/labs';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { Lab } from '../../../../../src/indexer/models/lab/lab';
-import { StakeStatus } from '../../../../../src/indexer/models/stake-status';
-import { LabRetrieveUnstakeAmountCommandIndexer } from '../../../../../src/indexer/events/labs/commands/lab-retrieve-unstake-amount/lab-retrieve-unstake-amount.command';
-import { LabStakeSuccessfulCommandIndexer } from '../../../../../src/indexer/events/labs/commands/lab-stake-successful/lab-stake-successful.command';
-import { LabUnstakeSuccessfulCommandIndexer } from '../../../../../src/indexer/events/labs/commands/lab-unstake-successful/lab-unstake-successful.command';
-
-jest.mock('../../../../../src/indexer/models/lab/lab');
+} from '@indexer/events/labs';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { Lab } from '@indexer/models/lab/lab';
+import { StakeStatus } from '@indexer/models/stake-status';
+import { LabRetrieveUnstakeAmountCommandIndexer } from '@indexer/events/labs/commands/lab-retrieve-unstake-amount/lab-retrieve-unstake-amount.command';
+import { LabStakeSuccessfulCommandIndexer } from '@indexer/events/labs/commands/lab-stake-successful/lab-stake-successful.command';
+import { LabUnstakeSuccessfulCommandIndexer } from '@indexer/events/labs/commands/lab-unstake-successful/lab-unstake-successful.command';
+
+jest.mock('@indexer/models/lab/lab');
describe('Labs Substrate Event Handler', () => {
const createMockLab = () => {
diff --git a/test/unit/indexer/events/labs/labs.handler.spec.ts b/test/unit/indexer/events/labs/labs.handler.spec.ts
index 798e0952..25afc9f4 100644
--- a/test/unit/indexer/events/labs/labs.handler.spec.ts
+++ b/test/unit/indexer/events/labs/labs.handler.spec.ts
@@ -8,18 +8,18 @@ import {
LabUnstakeSuccessfulCommandIndexer,
LabUpdatedCommandIndexer,
LabUpdateVerificationStatusCommandIndexer,
-} from '../../../../../src/indexer/events/labs';
-import { LabDeregisteredHandler } from '../../../../../src/indexer/events/labs/commands/lab-deregistered/lab-deregistered.handler';
-import { LabRegisteredHandler } from '../../../../../src/indexer/events/labs/commands/lab-registered/lab-registered.handler';
-import { LabUpdatedHandler } from '../../../../../src/indexer/events/labs/commands/lab-updated/lab-updated.handler';
-import { LabUpdateVerificationStatusHandler } from '../../../../../src/indexer/events/labs/commands/lab-update-verification-status/lab-update-verification-status.handler';
+} from '@indexer/events/labs';
+import { LabDeregisteredHandler } from '@indexer/events/labs/commands/lab-deregistered/lab-deregistered.handler';
+import { LabRegisteredHandler } from '@indexer/events/labs/commands/lab-registered/lab-registered.handler';
+import { LabUpdatedHandler } from '@indexer/events/labs/commands/lab-updated/lab-updated.handler';
+import { LabUpdateVerificationStatusHandler } from '@indexer/events/labs/commands/lab-update-verification-status/lab-update-verification-status.handler';
import { ElasticsearchService } from '@nestjs/elasticsearch';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
import { ElasticSearchServiceProvider } from '../../../mock';
-import { StakeStatus } from '../../../../../src/indexer/models/stake-status';
-import { LabRetrieveUnstakeAmountHandler } from '../../../../../src/indexer/events/labs/commands/lab-retrieve-unstake-amount/lab-retrieve-unstake-amount.handler';
-import { LabStakeSuccessfulHandler } from '../../../../../src/indexer/events/labs/commands/lab-stake-successful/lab-stake-successful.handler';
-import { LabUnstakeSuccessfulHandler } from '../../../../../src/indexer/events/labs/commands/lab-unstake-successful/lab-unstake-successful.handler';
+import { StakeStatus } from '@indexer/models/stake-status';
+import { LabRetrieveUnstakeAmountHandler } from '@indexer/events/labs/commands/lab-retrieve-unstake-amount/lab-retrieve-unstake-amount.handler';
+import { LabStakeSuccessfulHandler } from '@indexer/events/labs/commands/lab-stake-successful/lab-stake-successful.handler';
+import { LabUnstakeSuccessfulHandler } from '@indexer/events/labs/commands/lab-unstake-successful/lab-unstake-successful.handler';
let labDeregisteredHandler: LabDeregisteredHandler;
let labRegisteredHandler: LabRegisteredHandler;
diff --git a/test/unit/indexer/events/orders/orders.command.spec.ts b/test/unit/indexer/events/orders/orders.command.spec.ts
index a83d3cd0..6dffb917 100644
--- a/test/unit/indexer/events/orders/orders.command.spec.ts
+++ b/test/unit/indexer/events/orders/orders.command.spec.ts
@@ -5,13 +5,13 @@ import {
OrderFulfilledCommandIndexer,
OrderPaidCommandIndexer,
OrderRefundedCommandIndexer,
-} from '../../../../../src/indexer/events/orders';
-import { OrderStatus } from '../../../../../src/indexer/models/order/order-status';
-import { Currency } from '../../../../../src/indexer/models/order/currency';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { Orders } from '../../../../../src/indexer/models/order/orders';
+} from '@indexer/events/orders';
+import { OrderStatus } from '@indexer/models/order/order-status';
+import { Currency } from '@indexer/models/order/currency';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { Orders } from '@indexer/models/order/orders';
-jest.mock('../../../../../src/indexer/models/order/orders');
+jest.mock('@indexer/models/order/orders');
describe('Orders Substrate Event Handler', () => {
function createMockOrder(status: OrderStatus) {
diff --git a/test/unit/indexer/events/orders/orders.handler.spec.ts b/test/unit/indexer/events/orders/orders.handler.spec.ts
index 42bb1c01..ec4b19dd 100644
--- a/test/unit/indexer/events/orders/orders.handler.spec.ts
+++ b/test/unit/indexer/events/orders/orders.handler.spec.ts
@@ -6,16 +6,16 @@ import {
OrderFulfilledCommandIndexer,
OrderPaidCommandIndexer,
OrderRefundedCommandIndexer,
-} from '../../../../../src/indexer/events/orders';
-import { OrderCancelledHandler } from '../../../../../src/indexer/events/orders/commands/order-cancelled/order-cancelled.handler';
-import { OrderCreatedHandler } from '../../../../../src/indexer/events/orders/commands/order-created/order-created.handler';
-import { OrderFailedHandler } from '../../../../../src/indexer/events/orders/commands/order-failed/order-failed.handler';
-import { OrderFulfilledHandler } from '../../../../../src/indexer/events/orders/commands/order-fulfilled/order-fulfilled.handler';
-import { OrderPaidHandler } from '../../../../../src/indexer/events/orders/commands/order-paid/order-paid.handler';
-import { OrderRefundedHandler } from '../../../../../src/indexer/events/orders/commands/order-refunded/order-refunded.handler';
-import { OrderStatus } from '../../../../../src/indexer/models/order/order-status';
-import { Currency } from '../../../../../src/indexer/models/order/currency';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+} from '@indexer/events/orders';
+import { OrderCancelledHandler } from '@indexer/events/orders/commands/order-cancelled/order-cancelled.handler';
+import { OrderCreatedHandler } from '@indexer/events/orders/commands/order-created/order-created.handler';
+import { OrderFailedHandler } from '@indexer/events/orders/commands/order-failed/order-failed.handler';
+import { OrderFulfilledHandler } from '@indexer/events/orders/commands/order-fulfilled/order-fulfilled.handler';
+import { OrderPaidHandler } from '@indexer/events/orders/commands/order-paid/order-paid.handler';
+import { OrderRefundedHandler } from '@indexer/events/orders/commands/order-refunded/order-refunded.handler';
+import { OrderStatus } from '@indexer/models/order/order-status';
+import { Currency } from '@indexer/models/order/currency';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { Test, TestingModule } from '@nestjs/testing';
import {
diff --git a/test/unit/indexer/events/service-request/service-request.command.spec.ts b/test/unit/indexer/events/service-request/service-request.command.spec.ts
index 653d9727..ac751b09 100644
--- a/test/unit/indexer/events/service-request/service-request.command.spec.ts
+++ b/test/unit/indexer/events/service-request/service-request.command.spec.ts
@@ -1,11 +1,11 @@
-import { RequestModel } from '../../../../../src/indexer/models/service-request/request';
-import { CreateServiceRequestCommandIndexer } from '../../../../../src/indexer/events/service-request';
-import { RequestStatus } from '../../../../../src/indexer/models/service-request/request-status';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+import { RequestModel } from '@indexer/models/service-request/request';
+import { CreateServiceRequestCommandIndexer } from '@indexer/events/service-request';
+import { RequestStatus } from '@indexer/models/service-request/request-status';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
-jest.mock('../../../../../src/indexer/models/service-request/request');
-jest.mock('../../../../../src/indexer/models/service-request/claim-request');
-jest.mock('../../../../../src/indexer/models/service-request/service-invoice');
+jest.mock('@indexer/models/service-request/request');
+jest.mock('@indexer/models/service-request/claim-request');
+jest.mock('@indexer/models/service-request/service-invoice');
describe('Service Request Substrate Event Handler', () => {
const createMockRequest = (requestStatus: RequestStatus) => {
diff --git a/test/unit/indexer/events/service-request/service-request.handler.spec.ts b/test/unit/indexer/events/service-request/service-request.handler.spec.ts
index d0e792ae..d50c2c8c 100644
--- a/test/unit/indexer/events/service-request/service-request.handler.spec.ts
+++ b/test/unit/indexer/events/service-request/service-request.handler.spec.ts
@@ -1,12 +1,12 @@
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { Test, TestingModule } from '@nestjs/testing';
-import { CreateServiceRequestHandler } from '../../../../../src/indexer/events/service-request/commands/create-service-request/create-service-request.handler';
+import { CreateServiceRequestHandler } from '@indexer/events/service-request/commands/create-service-request/create-service-request.handler';
import {
CreateServiceRequestCommandIndexer,
RequestServiceCommandHandlers,
-} from '../../../../../src/indexer/events/service-request';
-import { RequestStatus } from '../../../../../src/indexer/models/service-request/request-status';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
+} from '@indexer/events/service-request';
+import { RequestStatus } from '@indexer/models/service-request/request-status';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
import {
createObjectSearchCountryServiceRequest,
ElasticSearchServiceProvider,
diff --git a/test/unit/indexer/events/services/services.command.spec.ts b/test/unit/indexer/events/services/services.command.spec.ts
index 622d55bf..09269faa 100644
--- a/test/unit/indexer/events/services/services.command.spec.ts
+++ b/test/unit/indexer/events/services/services.command.spec.ts
@@ -2,12 +2,12 @@ import {
ServiceCreatedCommandIndexer,
ServiceDeletedCommandIndexer,
ServiceUpdatedCommandIndexer,
-} from '../../../../../src/indexer/events/services';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { ServiceFlow } from '../../../../../src/indexer/models/service-flow';
-import { Service } from '../../../../../src/indexer/models/service/service';
+} from '@indexer/events/services';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { ServiceFlow } from '@indexer/models/service-flow';
+import { Service } from '@indexer/models/service/service';
-jest.mock('../../../../../src/indexer/models/service/service');
+jest.mock('@indexer/models/service/service');
describe('Services Substrate Event Handler', () => {
function createMockService() {
diff --git a/test/unit/indexer/events/services/services.handler.spec.ts b/test/unit/indexer/events/services/services.handler.spec.ts
index bfc130a7..8d04cd9d 100644
--- a/test/unit/indexer/events/services/services.handler.spec.ts
+++ b/test/unit/indexer/events/services/services.handler.spec.ts
@@ -5,12 +5,12 @@ import {
ServiceCreatedCommandIndexer,
ServiceDeletedCommandIndexer,
ServiceUpdatedCommandIndexer,
-} from '../../../../../src/indexer/events/services';
-import { BlockMetaData } from '../../../../../src/indexer/models/block-meta-data';
-import { ServiceFlow } from '../../../../../src/indexer/models/service-flow';
-import { ServiceCreatedHandler } from '../../../../../src/indexer/events/services/commands/service-created/service-created.handler';
-import { ServiceDeletedHandler } from '../../../../../src/indexer/events/services/commands/service-deleted/service-deleted.handler';
-import { ServiceUpdatedHandler } from '../../../../../src/indexer/events/services/commands/service-updated/service-updated.handler';
+} from '@indexer/events/services';
+import { BlockMetaData } from '@indexer/models/block-meta-data';
+import { ServiceFlow } from '@indexer/models/service-flow';
+import { ServiceCreatedHandler } from '@indexer/events/services/commands/service-created/service-created.handler';
+import { ServiceDeletedHandler } from '@indexer/events/services/commands/service-deleted/service-deleted.handler';
+import { ServiceUpdatedHandler } from '@indexer/events/services/commands/service-updated/service-updated.handler';
import {
createObjectSearchLab,
ElasticSearchServiceProvider,
diff --git a/test/unit/indexer/indexer.spec.ts b/test/unit/indexer/indexer.spec.ts
index 4ed70e1b..1ab10096 100644
--- a/test/unit/indexer/indexer.spec.ts
+++ b/test/unit/indexer/indexer.spec.ts
@@ -1,10 +1,10 @@
import { CommandBus } from '@nestjs/cqrs';
import { Test, TestingModule } from '@nestjs/testing';
-import { IndexerHandler } from '../../../src/indexer/indexer.handler';
+import { IndexerHandler } from '@indexer/indexer.handler';
import { ElasticsearchService } from '@nestjs/elasticsearch';
-import { ServiceCommandHandlers } from '../../../src/indexer/events/services';
-import { LabCommandHandlers } from '../../../src/indexer/events/labs';
-import { OrderCommandHandlers } from '../../../src/indexer/events/orders';
+import { ServiceCommandHandlers } from '@indexer/events/services';
+import { LabCommandHandlers } from '@indexer/events/labs';
+import { OrderCommandHandlers } from '@indexer/events/orders';
import {
CommandBusProvider,
ElasticSearchServiceProvider,
diff --git a/test/unit/jest-unit.json b/test/unit/jest-unit.json
index 5fdc75a3..75148b4f 100644
--- a/test/unit/jest-unit.json
+++ b/test/unit/jest-unit.json
@@ -12,7 +12,11 @@
"coverageDirectory": "../coverage",
"moduleNameMapper": {
"@polkadot/api(.*)$": "<rootDir>../../src/indexer/indexer.handler.ts",
- "@polkadot/rpc-provider/ws(.*)$": "<rootDir>../../src/indexer/indexer.handler.ts"
+ "@polkadot/rpc-provider/ws(.*)$": "<rootDir>../../src/indexer/indexer.handler.ts",
+ "@common/(.*)$": "<rootDir>../../src/common/$1",
+ "@indexer/(.*)$": "<rootDir>../../src/indexer/$1",
+ "@listeners/(.*)$": "<rootDir>../../src/listeners/$1",
+ "@schedulers/(.*)$": "<rootDir>../../src/schedulers/$1"
},
"setupFiles": ["dotenv/config"]
}
diff --git a/test/unit/listeners/ethereum-listener/ethereum-listener.handler.spec.ts b/test/unit/listeners/ethereum-listener/ethereum-listener.handler.spec.ts
index ae762f90..7e96a35b 100644
--- a/test/unit/listeners/ethereum-listener/ethereum-listener.handler.spec.ts
+++ b/test/unit/listeners/ethereum-listener/ethereum-listener.handler.spec.ts
@@ -1,10 +1,7 @@
import { Test, TestingModule } from '@nestjs/testing';
-import { EscrowService } from '../../../../src/common/escrow/escrow.service';
-import { EthereumListenerHandler } from '../../../../src/listeners/ethereum-listener/ethereum-listener.handler';
-import {
- EthereumService,
- TransactionLoggingService,
-} from '../../../../src/common';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { EthereumListenerHandler } from '@listeners/ethereum-listener/ethereum-listener.handler';
+import { EthereumService, TransactionLoggingService } from '@common/index';
import { transactionLoggingServiceMockFactory } from '../../../../test/unit/mock';
describe('Ethereum Listener Handler Unit Test', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.command.spec.ts
index f52a737e..e8020e2d 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalysisOrderCancelledCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { GeneticAnalysisOrderCancelledCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import {
createMockGeneticAnalysisOrder,
mockBlockNumber,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.spec.ts
index 72912729..fb65b255 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.spec.ts
@@ -1,6 +1,6 @@
import { GeneticAnalysisOrderStatus } from '@debionetwork/polkadot-provider';
-import { TransactionLoggingService } from '../../../../../../../src/common';
-import { GeneticAnalysisOrderCancelledCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.command';
+import { TransactionLoggingService } from '@common/index';
+import { GeneticAnalysisOrderCancelledCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.command';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockGeneticAnalysisOrder,
@@ -8,7 +8,7 @@ import {
MockType,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { GeneticAnalysisOrderCancelledHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler';
+import { GeneticAnalysisOrderCancelledHandler } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler';
import { when } from 'jest-when';
describe('Genetic Analysis Order Cancelled Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-created/genetic-analysis-order-created.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-created/genetic-analysis-order-created.command.spec.ts
index 56687515..52f308d6 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-created/genetic-analysis-order-created.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-created/genetic-analysis-order-created.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalysisOrderCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { GeneticAnalysisOrderCreatedCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import {
createMockGeneticAnalysisOrder,
mockBlockNumber,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-created/genetic-analysis-order-created.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-created/genetic-analysis-order-created.handler.spec.ts
index d4655017..dfa5977d 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-created/genetic-analysis-order-created.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-created/genetic-analysis-order-created.handler.spec.ts
@@ -1,11 +1,8 @@
import { GeneticAnalysisOrderStatus } from '@debionetwork/polkadot-provider';
-import {
- TransactionLoggingService,
- DateTimeProxy,
-} from '../../../../../../../src/common';
-import { GeneticAnalysisOrderCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { TransactionLoggingService, DateTimeProxy } from '@common/index';
+import { GeneticAnalysisOrderCreatedCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import { Test, TestingModule } from '@nestjs/testing';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { NotificationService } from '@common/notification/notification.service';
import {
createMockGeneticAnalysisOrder,
dateTimeProxyMockFactory,
@@ -14,7 +11,7 @@ import {
notificationServiceMockFactory,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { GeneticAnalysisOrderCreatedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler';
+import { GeneticAnalysisOrderCreatedHandler } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler';
import { when } from 'jest-when';
describe('Genetic Analysis Order Created Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.command.spec.ts
index e7b4d736..4a65bb7c 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalysisOrderFulfilledCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { GeneticAnalysisOrderFulfilledCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import {
createMockGeneticAnalysisOrder,
mockBlockNumber,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.spec.ts
index 240cf127..a445f571 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.spec.ts
@@ -1,9 +1,6 @@
import { GeneticAnalysisOrderStatus } from '@debionetwork/polkadot-provider';
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { GeneticAnalysisOrderFulfilledCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { GeneticAnalysisOrderFulfilledCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockGeneticAnalysisOrder,
@@ -13,9 +10,9 @@ import {
notificationServiceMockFactory,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { GeneticAnalysisOrderFulfilledHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler';
+import { GeneticAnalysisOrderFulfilledHandler } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler';
import { when } from 'jest-when';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { NotificationService } from '@common/notification/notification.service';
describe('Genetic Analysis Order Fulfilled Handler Event', () => {
let notificationServiceMock: MockType<NotificationService>;
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.command.spec.ts
index 66d47649..355e7b26 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalysisOrderPaidCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { GeneticAnalysisOrderPaidCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import {
createMockGeneticAnalysisOrder,
mockBlockNumber,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.spec.ts
index 404989e2..18eed7f7 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.spec.ts
@@ -4,9 +4,9 @@ import {
ProcessEnvProxy,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../../../src/common';
+} from '@common/index';
import { GeneticAnalysisOrderStatus } from '@debionetwork/polkadot-provider';
-import { GeneticAnalysisOrderPaidCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { GeneticAnalysisOrderPaidCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockGeneticAnalysisOrder,
@@ -18,9 +18,9 @@ import {
substrateServiceMockFactory,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { GeneticAnalysisOrderPaidHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler';
+import { GeneticAnalysisOrderPaidHandler } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler';
import { when } from 'jest-when';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { NotificationService } from '@common/notification/notification.service';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
describe('Genetic Analysis Order Paid Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.command.spec.ts
index 96c14a05..bcbf916c 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalysisOrderRefundedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { GeneticAnalysisOrderRefundedCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import {
createMockGeneticAnalysisOrder,
mockBlockNumber,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.spec.ts
index 3fb8a959..b6cd3dff 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.spec.ts
@@ -1,11 +1,8 @@
import { GeneticAnalysisOrderStatus } from '@debionetwork/polkadot-provider';
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { GeneticAnalysisOrderRefundedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { GeneticAnalysisOrderRefundedCommand } from '@listeners/substrate-listener/commands/genetic-analysis-order';
import { Test, TestingModule } from '@nestjs/testing';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { NotificationService } from '@common/notification/notification.service';
import {
createMockGeneticAnalysisOrder,
dateTimeProxyMockFactory,
@@ -14,7 +11,7 @@ import {
notificationServiceMockFactory,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { GeneticAnalysisOrderRefundedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler';
+import { GeneticAnalysisOrderRefundedHandler } from '@listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler';
import { when } from 'jest-when';
describe('Genetic Analysis Order Refunded Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler.spec.ts
index f71f9e98..71e37ff3 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler.spec.ts
@@ -1,9 +1,6 @@
-import {
- DateTimeProxy,
- SubstrateService,
-} from '../../../../../../../src/common';
+import { DateTimeProxy, SubstrateService } from '@common/index';
import { GeneticAnalysisStatus } from '@debionetwork/polkadot-provider';
-import { GeneticAnalysisRejectedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis';
+import { GeneticAnalysisRejectedCommand } from '@listeners/substrate-listener/commands/genetic-analysis';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockGeneticAnalysis,
@@ -13,10 +10,10 @@ import {
notificationServiceMockFactory,
substrateServiceMockFactory,
} from '../../../../../mock';
-import { GeneticAnalysisRejectedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler';
+import { GeneticAnalysisRejectedHandler } from '@listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-analysis-rejected.handler';
import * as geneticAnalysisOrderCommand from '@debionetwork/polkadot-provider/lib/command/genetic-analyst/genetic-analysis-orders';
import { when } from 'jest-when';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { NotificationService } from '@common/notification/notification.service';
jest.mock(
'@debionetwork/polkadot-provider/lib/command/genetic-analyst/genetic-analysis-orders',
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-anaysis-rejected.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-anaysis-rejected.command.spec.ts
index 50ed5e72..ec5d404e 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-anaysis-rejected.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-rejected/genetic-anaysis-rejected.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalysisRejectedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis';
+import { GeneticAnalysisRejectedCommand } from '@listeners/substrate-listener/commands/genetic-analysis';
import {
createMockGeneticAnalysis,
mockBlockNumber,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis/geneticn-analysis-result-ready/genetic-analysis-result-ready.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis/geneticn-analysis-result-ready/genetic-analysis-result-ready.handler.spec.ts
index 4bc84801..7da2df89 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis/geneticn-analysis-result-ready/genetic-analysis-result-ready.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis/geneticn-analysis-result-ready/genetic-analysis-result-ready.handler.spec.ts
@@ -1,9 +1,6 @@
-import {
- DateTimeProxy,
- SubstrateService,
-} from '../../../../../../../src/common';
+import { DateTimeProxy, SubstrateService } from '@common/index';
import { GeneticAnalysisStatus } from '@debionetwork/polkadot-provider';
-import { GeneticAnalysisResultReadyCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis';
+import { GeneticAnalysisResultReadyCommand } from '@listeners/substrate-listener/commands/genetic-analysis';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockGeneticAnalysis,
@@ -13,8 +10,8 @@ import {
notificationServiceMockFactory,
substrateServiceMockFactory,
} from '../../../../../mock';
-import { GeneticAnalysisResultReadyHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-resultready/genetic-analysis-result-ready.handler';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { GeneticAnalysisResultReadyHandler } from '@listeners/substrate-listener/commands/genetic-analysis/genetic-analysis-resultready/genetic-analysis-result-ready.handler';
+import { NotificationService } from '@common/notification/notification.service';
import * as geneticAnalysisOrderCommand from '@debionetwork/polkadot-provider/lib/command/genetic-analyst/genetic-analysis-orders';
import { when } from 'jest-when';
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analysis/geneticn-analysis-result-ready/genetic-anaysis-result-ready.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analysis/geneticn-analysis-result-ready/genetic-anaysis-result-ready.command.spec.ts
index 3238959d..68c04e05 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analysis/geneticn-analysis-result-ready/genetic-anaysis-result-ready.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analysis/geneticn-analysis-result-ready/genetic-anaysis-result-ready.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalysisResultReadyCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysis';
+import { GeneticAnalysisResultReadyCommand } from '@listeners/substrate-listener/commands/genetic-analysis';
import {
createMockGeneticAnalysis,
mockBlockNumber,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.command.spec.ts
index 79dfcf88..fc6c821c 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.command.spec.ts
@@ -1,5 +1,5 @@
import { GeneticAnalystService } from '@debionetwork/polkadot-provider';
-import { GeneticAnalystServiceCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.command';
+import { GeneticAnalystServiceCreatedCommand } from '@listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.command';
import {
createMockGeneticAnalystService,
mockBlockNumber,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler.spec.ts
index ab3149bc..805ff408 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler.spec.ts
@@ -1,8 +1,8 @@
import { Test, TestingModule } from '@nestjs/testing';
-import { DateTimeProxy } from '../../../../../../../src/common';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
-import { GeneticAnalystServiceCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.command';
-import { GeneticAnalystServiceCreatedCommandHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler';
+import { DateTimeProxy } from '@common/index';
+import { NotificationService } from '@common/notification/notification.service';
+import { GeneticAnalystServiceCreatedCommand } from '@listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.command';
+import { GeneticAnalystServiceCreatedCommandHandler } from '@listeners/substrate-listener/commands/genetic-analyst-services/genetic-analyst-service-created/genetic-analyst-service-created.handler';
import {
createMockGeneticAnalystService,
dateTimeProxyMockFactory,
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-staked/genetic-analyst-staked.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-staked/genetic-analyst-staked.command.spec.ts
index 78ec26e2..6528e3b9 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-staked/genetic-analyst-staked.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-staked/genetic-analyst-staked.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalystStakedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts';
+import { GeneticAnalystStakedCommand } from '@listeners/substrate-listener/commands/genetic-analysts';
import { createMockGeneticAnalyst, mockBlockNumber } from '../../../../../mock';
import { GeneticAnalyst } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-staked/genetic-analyst-staked.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-staked/genetic-analyst-staked.handler.spec.ts
index 26ca889e..c522da3d 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-staked/genetic-analyst-staked.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-staked/genetic-analyst-staked.handler.spec.ts
@@ -1,8 +1,5 @@
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { GeneticAnalystStakedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { GeneticAnalystStakedCommand } from '@listeners/substrate-listener/commands/genetic-analysts';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockGeneticAnalyst,
@@ -11,7 +8,7 @@ import {
transactionLoggingServiceMockFactory,
dateTimeProxyMockFactory,
} from '../../../../../mock';
-import { GeneticAnalystStakedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler';
+import { GeneticAnalystStakedHandler } from '@listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler';
import { when } from 'jest-when';
describe('Genetic Analyst Staked Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-unstaked/genetic-analyst-unstaked.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-unstaked/genetic-analyst-unstaked.command.spec.ts
index 78ec26e2..6528e3b9 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-unstaked/genetic-analyst-unstaked.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-unstaked/genetic-analyst-unstaked.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalystStakedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts';
+import { GeneticAnalystStakedCommand } from '@listeners/substrate-listener/commands/genetic-analysts';
import { createMockGeneticAnalyst, mockBlockNumber } from '../../../../../mock';
import { GeneticAnalyst } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-unstaked/genetic-analyst-unstaked.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-unstaked/genetic-analyst-unstaked.handler.spec.ts
index 8896e751..2fc3f4ce 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-unstaked/genetic-analyst-unstaked.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-unstaked/genetic-analyst-unstaked.handler.spec.ts
@@ -1,8 +1,5 @@
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { GeneticAnalystUnstakedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { GeneticAnalystUnstakedCommand } from '@listeners/substrate-listener/commands/genetic-analysts';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockGeneticAnalyst,
@@ -11,7 +8,7 @@ import {
transactionLoggingServiceMockFactory,
dateTimeProxyMockFactory,
} from '../../../../../mock';
-import { GeneticAnalystUnstakedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler';
+import { GeneticAnalystUnstakedHandler } from '@listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler';
import { when } from 'jest-when';
describe('Genetic Analyst Staked Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.command.spec.ts
index 7e064b2b..b09409fd 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.command.spec.ts
@@ -1,4 +1,4 @@
-import { GeneticAnalystVerificationStatusCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts';
+import { GeneticAnalystVerificationStatusCommand } from '@listeners/substrate-listener/commands/genetic-analysts';
import { createMockGeneticAnalyst, mockBlockNumber } from '../../../../../mock';
import { GeneticAnalyst } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.spec.ts
index 0b267d57..5bce15f1 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.spec.ts
@@ -2,8 +2,8 @@ import {
DateTimeProxy,
NotificationService,
TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { GeneticAnalystVerificationStatusCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts';
+} from '@common/index';
+import { GeneticAnalystVerificationStatusCommand } from '@listeners/substrate-listener/commands/genetic-analysts';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockGeneticAnalyst,
@@ -13,7 +13,7 @@ import {
transactionLoggingServiceMockFactory,
notificationServiceMockFactory,
} from '../../../../../mock';
-import { GeneticAnalystVerificationStatusHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler';
+import { GeneticAnalystVerificationStatusHandler } from '@listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler';
import { when } from 'jest-when';
describe('Genetic Analyst Verification Status Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.command.spec.ts
index 89c561f1..c5092af3 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.command.spec.ts
@@ -1,5 +1,5 @@
import { DnaSample } from '@debionetwork/polkadot-provider/lib/models/labs/genetic-testing/dna-sample';
-import { DnaSampleRejectedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-testing';
+import { DnaSampleRejectedCommand } from '@listeners/substrate-listener/commands/genetic-testing';
import { createMockDnaSample, mockBlockNumber } from '../../../../../mock';
jest.mock(
'@debionetwork/polkadot-provider/lib/models/labs/genetic-testing/dna-sample',
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler.spec.ts
index 2fcf94ca..ba4a8de8 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler.spec.ts
@@ -1,5 +1,5 @@
-import { DateTimeProxy } from '../../../../../../../src/common';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { DateTimeProxy } from '@common/index';
+import { NotificationService } from '@common/notification/notification.service';
import {
createMockDnaSample,
dateTimeProxyMockFactory,
@@ -7,9 +7,9 @@ import {
MockType,
notificationServiceMockFactory,
} from '../../../../../mock';
-import { DnaSampleRejectedCommandHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler';
+import { DnaSampleRejectedCommandHandler } from '@listeners/substrate-listener/commands/genetic-testing/dna-sample-rejected/dna-sample-rejected.handler';
import { Test, TestingModule } from '@nestjs/testing';
-import { DnaSampleRejectedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-testing';
+import { DnaSampleRejectedCommand } from '@listeners/substrate-listener/commands/genetic-testing';
describe('DNA Sample Rejected Handler Event', () => {
let notificationServiceMock: MockType<NotificationService>;
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.command.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.command.spec.ts
index 7f549f35..e82f36d8 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.command.spec.ts
@@ -1,5 +1,5 @@
import { DnaSample } from '@debionetwork/polkadot-provider/lib/models/labs/genetic-testing/dna-sample';
-import { DnaSampleResultReadyCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-testing';
+import { DnaSampleResultReadyCommand } from '@listeners/substrate-listener/commands/genetic-testing';
import { createMockDnaSample, mockBlockNumber } from '../../../../../mock';
jest.mock(
'@debionetwork/polkadot-provider/lib/models/labs/genetic-testing/dna-sample',
diff --git a/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler.spec.ts
index 05a4254b..cae766af 100644
--- a/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler.spec.ts
@@ -1,5 +1,5 @@
-import { DateTimeProxy } from '../../../../../../../src/common';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { DateTimeProxy } from '@common/index';
+import { NotificationService } from '@common/notification/notification.service';
import {
createMockDnaSample,
dateTimeProxyMockFactory,
@@ -7,9 +7,9 @@ import {
MockType,
notificationServiceMockFactory,
} from '../../../../../mock';
-import { DnaSampleResultReadyCommandHandler } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler';
+import { DnaSampleResultReadyCommandHandler } from '@listeners/substrate-listener/commands/genetic-testing/dna-sample-result-ready/dna-sample-result-ready.handler';
import { Test, TestingModule } from '@nestjs/testing';
-import { DnaSampleResultReadyCommand } from '../../../../../../../src/listeners/substrate-listener/commands/genetic-testing';
+import { DnaSampleResultReadyCommand } from '@listeners/substrate-listener/commands/genetic-testing';
describe('DNA Sample Result Ready Handler Event', () => {
let notificationServiceMock: MockType<NotificationService>;
diff --git a/test/unit/listeners/substrate-listener/commands/lab/lab-registered/lab-registered.command.spec.ts b/test/unit/listeners/substrate-listener/commands/lab/lab-registered/lab-registered.command.spec.ts
index 2e6f255d..e0591068 100644
--- a/test/unit/listeners/substrate-listener/commands/lab/lab-registered/lab-registered.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/lab/lab-registered/lab-registered.command.spec.ts
@@ -1,4 +1,4 @@
-import { LabRegisteredCommand } from '../../../../../../../src/listeners/substrate-listener/commands/labs';
+import { LabRegisteredCommand } from '@listeners/substrate-listener/commands/labs';
import { createMockLab, mockBlockNumber } from '../../../../../mock';
import { Lab } from '@debionetwork/polkadot-provider';
jest.mock('@debionetwork/polkadot-provider');
diff --git a/test/unit/listeners/substrate-listener/commands/lab/lab-registered/lab-registered.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/lab/lab-registered/lab-registered.handler.spec.ts
index df660179..083770ef 100644
--- a/test/unit/listeners/substrate-listener/commands/lab/lab-registered/lab-registered.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/lab/lab-registered/lab-registered.handler.spec.ts
@@ -1,9 +1,6 @@
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
-import { LabRegisteredCommand } from '../../../../../../../src/listeners/substrate-listener/commands/labs';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { NotificationService } from '@common/notification/notification.service';
+import { LabRegisteredCommand } from '@listeners/substrate-listener/commands/labs';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockLab,
@@ -13,7 +10,7 @@ import {
notificationServiceMockFactory,
dateTimeProxyMockFactory,
} from '../../../../../mock';
-import { LabRegisteredHandler } from '../../../../../../../src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler';
+import { LabRegisteredHandler } from '@listeners/substrate-listener/commands/labs/registered/lab-registered.handler';
import { when } from 'jest-when';
describe('Lab Registered Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/lab/lab-retrieve-unstaked-amount/lab-retrieve-unstaked-amount.command.spec.ts b/test/unit/listeners/substrate-listener/commands/lab/lab-retrieve-unstaked-amount/lab-retrieve-unstaked-amount.command.spec.ts
index 8474b0a8..4bf0641f 100644
--- a/test/unit/listeners/substrate-listener/commands/lab/lab-retrieve-unstaked-amount/lab-retrieve-unstaked-amount.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/lab/lab-retrieve-unstaked-amount/lab-retrieve-unstaked-amount.command.spec.ts
@@ -1,4 +1,4 @@
-import { LabRetrieveUnstakeAmountCommand } from '../../../../../../../src/listeners/substrate-listener/commands/labs';
+import { LabRetrieveUnstakeAmountCommand } from '@listeners/substrate-listener/commands/labs';
import { createMockLab, mockBlockNumber } from '../../../../../mock';
import { Lab } from '@debionetwork/polkadot-provider';
jest.mock('@debionetwork/polkadot-provider');
diff --git a/test/unit/listeners/substrate-listener/commands/lab/lab-retrieve-unstaked-amount/lab-retrieve-unstaked-amount.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/lab/lab-retrieve-unstaked-amount/lab-retrieve-unstaked-amount.handler.spec.ts
index 33a60a2e..5e8f54d7 100644
--- a/test/unit/listeners/substrate-listener/commands/lab/lab-retrieve-unstaked-amount/lab-retrieve-unstaked-amount.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/lab/lab-retrieve-unstaked-amount/lab-retrieve-unstaked-amount.handler.spec.ts
@@ -1,8 +1,5 @@
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { LabRetrieveUnstakeAmountCommand } from '../../../../../../../src/listeners/substrate-listener/commands/labs';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { LabRetrieveUnstakeAmountCommand } from '@listeners/substrate-listener/commands/labs';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockLab,
@@ -11,7 +8,7 @@ import {
transactionLoggingServiceMockFactory,
dateTimeProxyMockFactory,
} from '../../../../../mock';
-import { labUnstakedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler';
+import { labUnstakedHandler } from '@listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler';
import { when } from 'jest-when';
describe('Lab Retrieve Untaked Amount Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/lab/lab-staked-successful/lab-stake-successful.command.spec.ts b/test/unit/listeners/substrate-listener/commands/lab/lab-staked-successful/lab-stake-successful.command.spec.ts
index c71cb344..33299fd9 100644
--- a/test/unit/listeners/substrate-listener/commands/lab/lab-staked-successful/lab-stake-successful.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/lab/lab-staked-successful/lab-stake-successful.command.spec.ts
@@ -1,4 +1,4 @@
-import { LabStakeSuccessfulCommand } from '../../../../../../../src/listeners/substrate-listener/commands/labs';
+import { LabStakeSuccessfulCommand } from '@listeners/substrate-listener/commands/labs';
import { createMockLab, mockBlockNumber } from '../../../../../mock';
import { Lab } from '@debionetwork/polkadot-provider';
jest.mock('@debionetwork/polkadot-provider');
diff --git a/test/unit/listeners/substrate-listener/commands/lab/lab-staked-successful/lab-staked-successful.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/lab/lab-staked-successful/lab-staked-successful.handler.spec.ts
index f71b65cd..4070715b 100644
--- a/test/unit/listeners/substrate-listener/commands/lab/lab-staked-successful/lab-staked-successful.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/lab/lab-staked-successful/lab-staked-successful.handler.spec.ts
@@ -1,8 +1,5 @@
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { LabStakeSuccessfulCommand } from '../../../../../../../src/listeners/substrate-listener/commands/labs';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { LabStakeSuccessfulCommand } from '@listeners/substrate-listener/commands/labs';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockLab,
@@ -11,7 +8,7 @@ import {
transactionLoggingServiceMockFactory,
dateTimeProxyMockFactory,
} from '../../../../../mock';
-import { LabStakeSuccessfullHandler } from '../../../../../../../src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler';
+import { LabStakeSuccessfullHandler } from '@listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler';
import { when } from 'jest-when';
describe('Lab Staked Successful Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/lab/lab-unstaked-successful/lab-unstaked-successful.command.spec.ts b/test/unit/listeners/substrate-listener/commands/lab/lab-unstaked-successful/lab-unstaked-successful.command.spec.ts
index 8cd82daf..edec420d 100644
--- a/test/unit/listeners/substrate-listener/commands/lab/lab-unstaked-successful/lab-unstaked-successful.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/lab/lab-unstaked-successful/lab-unstaked-successful.command.spec.ts
@@ -1,4 +1,4 @@
-import { LabUnstakedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/labs';
+import { LabUnstakedCommand } from '@listeners/substrate-listener/commands/labs';
import { createMockLab, mockBlockNumber } from '../../../../../mock';
import { Lab } from '@debionetwork/polkadot-provider';
jest.mock('@debionetwork/polkadot-provider');
diff --git a/test/unit/listeners/substrate-listener/commands/lab/lab-unstaked-successful/lab-unstaked-successful.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/lab/lab-unstaked-successful/lab-unstaked-successful.handler.spec.ts
index 473dd7ee..55eb6826 100644
--- a/test/unit/listeners/substrate-listener/commands/lab/lab-unstaked-successful/lab-unstaked-successful.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/lab/lab-unstaked-successful/lab-unstaked-successful.handler.spec.ts
@@ -1,8 +1,5 @@
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { LabUnstakedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/labs';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
+import { LabUnstakedCommand } from '@listeners/substrate-listener/commands/labs';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockLab,
@@ -11,9 +8,9 @@ import {
transactionLoggingServiceMockFactory,
dateTimeProxyMockFactory,
} from '../../../../../mock';
-import { labUnstakedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler';
+import { labUnstakedHandler } from '@listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler';
import { when } from 'jest-when';
-import { TransactionRequest } from '../../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
describe('Lab Untaked Successful Handler Event', () => {
let transactionLoggingServiceMock: MockType<TransactionLoggingService>;
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.command.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.command.spec.ts
index 95fd6b55..93e583e9 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.command.spec.ts
@@ -1,4 +1,4 @@
-import { OrderCancelledCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderCancelledCommand } from '@listeners/substrate-listener/commands/orders';
import { createMockOrder, mockBlockNumber } from '../../../../../mock';
import { Order, OrderStatus } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.spec.ts
index bbe96361..90da3f21 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.spec.ts
@@ -1,6 +1,6 @@
-import { TransactionLoggingService } from '../../../../../../../src/common';
+import { TransactionLoggingService } from '@common/index';
import { OrderStatus } from '@debionetwork/polkadot-provider';
-import { OrderCancelledCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderCancelledCommand } from '@listeners/substrate-listener/commands/orders';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockOrder,
@@ -9,10 +9,10 @@ import {
MockType,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { OrderCancelledHandler } from '../../../../../../../src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler';
-import { EscrowService } from '../../../../../../../src/common/escrow/escrow.service';
+import { OrderCancelledHandler } from '@listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler';
+import { EscrowService } from '@common/escrow/escrow.service';
import { when } from 'jest-when';
-import { TransactionRequest } from '../../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
describe('Order Cancelled Handler Event', () => {
let orderCancelledHandler: OrderCancelledHandler;
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-created/order-created.command.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-created/order-created.command.spec.ts
index 13654202..d1dcd44a 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-created/order-created.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-created/order-created.command.spec.ts
@@ -1,4 +1,4 @@
-import { OrderCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderCreatedCommand } from '@listeners/substrate-listener/commands/orders';
import { createMockOrder, mockBlockNumber } from '../../../../../mock';
import { Order, OrderStatus } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-created/order-created.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-created/order-created.handler.spec.ts
index 807d39d6..64147a2b 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-created/order-created.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-created/order-created.handler.spec.ts
@@ -1,10 +1,7 @@
-import {
- TransactionLoggingService,
- DateTimeProxy,
-} from '../../../../../../../src/common';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { TransactionLoggingService, DateTimeProxy } from '@common/index';
+import { NotificationService } from '@common/notification/notification.service';
import { OrderStatus } from '@debionetwork/polkadot-provider';
-import { OrderCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderCreatedCommand } from '@listeners/substrate-listener/commands/orders';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockOrder,
@@ -14,9 +11,9 @@ import {
notificationServiceMockFactory,
dateTimeProxyMockFactory,
} from '../../../../../mock';
-import { OrderCreatedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/orders/order-created/order-created.handler';
+import { OrderCreatedHandler } from '@listeners/substrate-listener/commands/orders/order-created/order-created.handler';
import { when } from 'jest-when';
-import { TransactionRequest } from '../../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
describe('Order Created Handler Event', () => {
let orderCreatedHandler: OrderCreatedHandler;
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-failed/order-failed.command.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-failed/order-failed.command.spec.ts
index da3e7221..74e83861 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-failed/order-failed.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-failed/order-failed.command.spec.ts
@@ -1,4 +1,4 @@
-import { OrderFailedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderFailedCommand } from '@listeners/substrate-listener/commands/orders';
import { createMockOrder, mockBlockNumber } from '../../../../../mock';
import { Order, OrderStatus } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler.spec.ts
index 5e2a4ab1..d1bbb5e6 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler.spec.ts
@@ -2,8 +2,8 @@ import {
DateTimeProxy,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../../../src/common';
-import { OrderCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+} from '@common/index';
+import { OrderCreatedCommand } from '@listeners/substrate-listener/commands/orders';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockOrder,
@@ -16,10 +16,10 @@ import {
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
import { OrderStatus } from '@debionetwork/polkadot-provider';
-import { OrderFailedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/orders/order-failed/order-failed.handler';
-import { EscrowService } from '../../../../../../../src/common/escrow/escrow.service';
+import { OrderFailedHandler } from '@listeners/substrate-listener/commands/orders/order-failed/order-failed.handler';
+import { EscrowService } from '@common/escrow/escrow.service';
import * as ordersCommand from '@debionetwork/polkadot-provider/lib/command/labs/orders';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { NotificationService } from '@common/notification/notification.service';
describe('Order Failed Handler Event', () => {
let orderFailedHandler: OrderFailedHandler;
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.command.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.command.spec.ts
index e848cafe..29c11ac0 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.command.spec.ts
@@ -1,4 +1,4 @@
-import { OrderFulfilledCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderFulfilledCommand } from '@listeners/substrate-listener/commands/orders';
import { createMockOrder, mockBlockNumber } from '../../../../../mock';
import { Order, OrderStatus } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.spec.ts
index b8b448da..a10da17e 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.spec.ts
@@ -3,9 +3,9 @@ import {
DebioConversionService,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../../../src/common';
+} from '@common/index';
import { Order, OrderStatus } from '@debionetwork/polkadot-provider';
-import { OrderCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderCreatedCommand } from '@listeners/substrate-listener/commands/orders';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockOrder,
@@ -18,12 +18,12 @@ import {
substrateServiceMockFactory,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { OrderFulfilledHandler } from '../../../../../../../src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler';
-import { EscrowService } from '../../../../../../../src/common/escrow/escrow.service';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { OrderFulfilledHandler } from '@listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { NotificationService } from '@common/notification/notification.service';
import { when } from 'jest-when';
-import { TransactionLoggingDto } from '../../../../../../../src/common/transaction-logging/dto/transaction-logging.dto';
-import { TransactionRequest } from '../../../../../../../src/common/transaction-logging/models/transaction-request.entity';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
import * as globalProviderMethods from '@debionetwork/polkadot-provider/lib/index';
import * as rewardCommand from '@debionetwork/polkadot-provider/lib/command/rewards';
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.command.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.command.spec.ts
index 9245ed81..bce9b76b 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.command.spec.ts
@@ -1,4 +1,4 @@
-import { OrderPaidCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderPaidCommand } from '@listeners/substrate-listener/commands/orders';
import { createMockOrder, mockBlockNumber } from '../../../../../mock';
import { Order, OrderStatus } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.spec.ts
index f032a743..56c4aef2 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.spec.ts
@@ -4,9 +4,9 @@ import {
ProcessEnvProxy,
SubstrateService,
TransactionLoggingService,
-} from '../../../../../../../src/common';
+} from '@common/index';
import { OrderStatus } from '@debionetwork/polkadot-provider';
-import { OrderPaidCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderPaidCommand } from '@listeners/substrate-listener/commands/orders';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockOrder,
@@ -18,11 +18,11 @@ import {
substrateServiceMockFactory,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { OrderPaidHandler } from '../../../../../../../src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler';
+import { OrderPaidHandler } from '@listeners/substrate-listener/commands/orders/order-paid/order-paid.handler';
import { when } from 'jest-when';
-import { TransactionLoggingDto } from '../../../../../../../src/common/transaction-logging/dto/transaction-logging.dto';
-import { TransactionRequest } from '../../../../../../../src/common/transaction-logging/models/transaction-request.entity';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
+import { NotificationService } from '@common/notification/notification.service';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
describe('Order Paid Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.command.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.command.spec.ts
index 4d1bc956..4076359d 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.command.spec.ts
@@ -1,4 +1,4 @@
-import { OrderRefundedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderRefundedCommand } from '@listeners/substrate-listener/commands/orders';
import { createMockOrder, mockBlockNumber } from '../../../../../mock';
import { Order, OrderStatus } from '@debionetwork/polkadot-provider';
diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.spec.ts
index 57adf6d0..0fbd240b 100644
--- a/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.spec.ts
@@ -1,9 +1,6 @@
-import {
- DateTimeProxy,
- TransactionLoggingService,
-} from '../../../../../../../src/common';
+import { DateTimeProxy, TransactionLoggingService } from '@common/index';
import { OrderStatus } from '@debionetwork/polkadot-provider';
-import { OrderRefundedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/orders';
+import { OrderRefundedCommand } from '@listeners/substrate-listener/commands/orders';
import { Test, TestingModule } from '@nestjs/testing';
import {
createMockOrder,
@@ -13,11 +10,11 @@ import {
notificationServiceMockFactory,
transactionLoggingServiceMockFactory,
} from '../../../../../mock';
-import { OrderRefundedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler';
+import { OrderRefundedHandler } from '@listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler';
import { when } from 'jest-when';
-import { TransactionLoggingDto } from '../../../../../../../src/common/transaction-logging/dto/transaction-logging.dto';
-import { TransactionRequest } from '../../../../../../../src/common/transaction-logging/models/transaction-request.entity';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
+import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto';
+import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity';
+import { NotificationService } from '@common/notification/notification.service';
describe('Order Refunded Handler Event', () => {
let orderRefundedHandler: OrderRefundedHandler;
diff --git a/test/unit/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.command.spec.ts b/test/unit/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.command.spec.ts
index 8a39799e..b100149a 100644
--- a/test/unit/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.command.spec.ts
@@ -1,5 +1,5 @@
-import { ServiceRequestCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/service-request';
-import { BlockMetaData } from '../../../../../../../src/listeners/substrate-listener/models/block-metadata.event-model';
+import { ServiceRequestCreatedCommand } from '@listeners/substrate-listener/commands/service-request';
+import { BlockMetaData } from '@listeners/substrate-listener/models/block-metadata.event-model';
import { ServiceRequest, RequestStatus } from '@debionetwork/polkadot-provider';
jest.mock('@debionetwork/polkadot-provider');
diff --git a/test/unit/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.spec.ts
index 7ced142f..b5cfb380 100644
--- a/test/unit/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.spec.ts
@@ -14,14 +14,14 @@ import {
ProcessEnvProxy,
TransactionLoggingService,
DateTimeProxy,
-} from '../../../../../../../src/common';
+} from '@common/index';
import { RequestStatus } from '@debionetwork/polkadot-provider';
-import { ServiceRequestCreatedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler';
-import { CountryService } from '../../../../../../../src/common/location/country.service';
-import { StateService } from '../../../../../../../src/common/location/state.service';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
-import { BlockMetaData } from '../../../../../../../src/listeners/substrate-listener/models/block-metadata.event-model';
-import { ServiceRequestCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/service-request';
+import { ServiceRequestCreatedHandler } from '@listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler';
+import { CountryService } from '@common/location/country.service';
+import { StateService } from '@common/location/state.service';
+import { NotificationService } from '@common/notification/notification.service';
+import { BlockMetaData } from '@listeners/substrate-listener/models/block-metadata.event-model';
+import { ServiceRequestCreatedCommand } from '@listeners/substrate-listener/commands/service-request';
import { when } from 'jest-when';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
diff --git a/test/unit/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.command.spec.ts b/test/unit/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.command.spec.ts
index 8238d68c..8f390c12 100644
--- a/test/unit/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.command.spec.ts
@@ -1,5 +1,5 @@
-import { ServiceRequestStakingAmountRefundedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/service-request';
-import { BlockMetaData } from '../../../../../../../src/listeners/substrate-listener/models/block-metadata.event-model';
+import { ServiceRequestStakingAmountRefundedCommand } from '@listeners/substrate-listener/commands/service-request';
+import { BlockMetaData } from '@listeners/substrate-listener/models/block-metadata.event-model';
jest.mock('@debionetwork/polkadot-provider');
diff --git a/test/unit/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler.spec.ts
index 7d2c5692..adab69d4 100644
--- a/test/unit/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler.spec.ts
@@ -4,11 +4,11 @@ import {
MockType,
notificationServiceMockFactory,
} from '../../../../../mock';
-import { BlockMetaData } from '../../../../../../../src/listeners/substrate-listener/models/block-metadata.event-model';
-import { ServiceRequestStakingAmountRefundedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
-import { ServiceRequestStakingAmountRefundedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.command';
-import { DateTimeProxy } from '../../../../../../../src/common';
+import { BlockMetaData } from '@listeners/substrate-listener/models/block-metadata.event-model';
+import { ServiceRequestStakingAmountRefundedHandler } from '@listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.handler';
+import { NotificationService } from '@common/notification/notification.service';
+import { ServiceRequestStakingAmountRefundedCommand } from '@listeners/substrate-listener/commands/service-request/service-request-staking-amount-refunded/service-request-staking-amount-refunded.command';
+import { DateTimeProxy } from '@common/index';
describe('Service Request Staking Amount Refunded Handler Event', () => {
let serviceRequesStakingAmountRefundedHandler: ServiceRequestStakingAmountRefundedHandler;
diff --git a/test/unit/listeners/substrate-listener/commands/services/service-created/service-created.command.spec.ts b/test/unit/listeners/substrate-listener/commands/services/service-created/service-created.command.spec.ts
index 3ec357a8..f1975234 100644
--- a/test/unit/listeners/substrate-listener/commands/services/service-created/service-created.command.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/services/service-created/service-created.command.spec.ts
@@ -1,5 +1,5 @@
-import { ServiceCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/services';
-import { BlockMetaData } from '../../../../../../../src/listeners/substrate-listener/models/block-metadata.event-model';
+import { ServiceCreatedCommand } from '@listeners/substrate-listener/commands/services';
+import { BlockMetaData } from '@listeners/substrate-listener/models/block-metadata.event-model';
import {
Service,
ServiceFlow,
diff --git a/test/unit/listeners/substrate-listener/commands/services/service-created/service-created.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/services/service-created/service-created.handler.spec.ts
index eb4d6fb0..bef84be6 100644
--- a/test/unit/listeners/substrate-listener/commands/services/service-created/service-created.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/commands/services/service-created/service-created.handler.spec.ts
@@ -4,9 +4,9 @@ import {
MailerManager,
ProcessEnvProxy,
SubstrateService,
-} from '../../../../../../../src/common';
+} from '@common/index';
import { ServiceFlow, ServiceInfo } from '@debionetwork/polkadot-provider';
-import { ServiceCreatedHandler } from '../../../../../../../src/listeners/substrate-listener/commands/services/service-created/service-created.handler';
+import { ServiceCreatedHandler } from '@listeners/substrate-listener/commands/services/service-created/service-created.handler';
import {
dateTimeProxyMockFactory,
googleSecretManagerServiceMockFactory,
@@ -18,8 +18,8 @@ import {
} from '../../../../../mock';
import * as labQuery from '@debionetwork/polkadot-provider/lib/query/labs';
import { when } from 'jest-when';
-import { NotificationService } from '../../../../../../../src/common/notification/notification.service';
-import { ServiceCreatedCommand } from '../../../../../../../src/listeners/substrate-listener/commands/services';
+import { NotificationService } from '@common/notification/notification.service';
+import { ServiceCreatedCommand } from '@listeners/substrate-listener/commands/services';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
describe('Service Created Handler Event', () => {
diff --git a/test/unit/listeners/substrate-listener/substrate-listener.handler.spec.ts b/test/unit/listeners/substrate-listener/substrate-listener.handler.spec.ts
index b35c70b1..eb203b52 100644
--- a/test/unit/listeners/substrate-listener/substrate-listener.handler.spec.ts
+++ b/test/unit/listeners/substrate-listener/substrate-listener.handler.spec.ts
@@ -1,6 +1,6 @@
import { Test, TestingModule } from '@nestjs/testing';
-import { SubstrateListenerHandler } from '../../../../src/listeners/substrate-listener/substrate-listener.handler';
-import { ProcessEnvProxy, SubstrateService } from '../../../../src/common';
+import { SubstrateListenerHandler } from '@listeners/substrate-listener/substrate-listener.handler';
+import { ProcessEnvProxy, SubstrateService } from '@common/index';
import { MockType, substrateServiceMockFactory } from '../../mock';
import { CommandBus, QueryBus } from '@nestjs/cqrs';
import {
@@ -17,7 +17,7 @@ import {
TO_HUMAN_MOCK,
} from './substrate-listener.mock.data';
import { Logger } from '@nestjs/common';
-import { BlockMetaData } from '../../../../src/listeners/substrate-listener/models/block-metadata.event-model';
+import { BlockMetaData } from '@listeners/substrate-listener/models/block-metadata.event-model';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
const eventsSpy = jest.spyOn(API_MOCK.query.system, 'events');
diff --git a/test/unit/mock.ts b/test/unit/mock.ts
index 022f8893..1922e586 100644
--- a/test/unit/mock.ts
+++ b/test/unit/mock.ts
@@ -1,6 +1,6 @@
import { CommandBus } from '@nestjs/cqrs';
-import { BlockMetaData } from '../../src/listeners/substrate-listener/models/block-metadata.event-model';
-import { IndexerHandler } from '../../src/indexer/indexer.handler';
+import { BlockMetaData } from '@listeners/substrate-listener/models/block-metadata.event-model';
+import { IndexerHandler } from '@indexer/indexer.handler';
import {
DateTimeProxy,
EthereumService,
@@ -9,7 +9,7 @@ import {
DebioConversionService,
MailerManager,
EmailNotificationService,
-} from '../../src/common';
+} from '@common/index';
import {
OrderStatus,
GeneticAnalysisStatus,
@@ -20,13 +20,13 @@ import { Cache as CacheManager } from 'cache-manager';
import { File, Bucket } from '@google-cloud/storage';
import { ElasticsearchService } from '@nestjs/elasticsearch';
import { MailerService } from '@nestjs-modules/mailer';
-import { EscrowService } from '../../src/common/escrow/escrow.service';
-import { CountryService } from '../../src/common/location/country.service';
-import { StateService } from '../../src/common/location/state.service';
+import { EscrowService } from '@common/escrow/escrow.service';
+import { CountryService } from '@common/location/country.service';
+import { StateService } from '@common/location/state.service';
import { SchedulerRegistry } from '@nestjs/schedule';
-import { NotificationService } from '../../src/common/notification/notification.service';
+import { NotificationService } from '@common/notification/notification.service';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
-import { ErrorLoggingService } from '../../src/common/error-logging/error-logging.service';
+import { ErrorLoggingService } from '@common/error-logging/error-logging.service';
export function mockFunction(args) {} // eslint-disable-line
diff --git a/test/unit/schedulers/genetic-analyst-unstaked/genetic-analyst-unstaked.service.spec.ts b/test/unit/schedulers/genetic-analyst-unstaked/genetic-analyst-unstaked.service.spec.ts
index 7b59aace..d61f16bc 100644
--- a/test/unit/schedulers/genetic-analyst-unstaked/genetic-analyst-unstaked.service.spec.ts
+++ b/test/unit/schedulers/genetic-analyst-unstaked/genetic-analyst-unstaked.service.spec.ts
@@ -7,14 +7,14 @@ import {
MockLogger,
schedulerRegistryMockFactory,
} from '../../mock';
-import { ProcessEnvProxy, SubstrateService } from '../../../../src/common';
+import { ProcessEnvProxy, SubstrateService } from '@common/index';
import { GeneticAnalyst } from '@debionetwork/polkadot-provider';
import * as geneticAnalystQuery from '@debionetwork/polkadot-provider/lib/query/genetic-analysts';
import * as geneticAnalystCommand from '@debionetwork/polkadot-provider/lib/command/genetic-analyst';
import { when } from 'jest-when';
import { SchedulerRegistry } from '@nestjs/schedule';
-import { GeneticAnalystUnstakedService } from '../../../../src/schedulers/genetic-analyst-unstaked/unstaked.service';
+import { GeneticAnalystUnstakedService } from '@schedulers/genetic-analyst-unstaked/unstaked.service';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
jest.useFakeTimers();
diff --git a/test/unit/schedulers/lab/lab-unstake.service.spec.ts b/test/unit/schedulers/lab/lab-unstake.service.spec.ts
index 93d001cf..ce7d49a9 100644
--- a/test/unit/schedulers/lab/lab-unstake.service.spec.ts
+++ b/test/unit/schedulers/lab/lab-unstake.service.spec.ts
@@ -7,11 +7,11 @@ import {
MockLogger,
schedulerRegistryMockFactory,
} from '../../mock';
-import { SubstrateService } from '../../../../src/common';
+import { SubstrateService } from '@common/index';
import { Lab } from '@debionetwork/polkadot-provider';
import { SchedulerRegistry } from '@nestjs/schedule';
-import { LabUnstakedService } from '../../../../src/schedulers/lab-unstake/lab-unstake.service';
+import { LabUnstakedService } from '@schedulers/lab-unstake/lab-unstake.service';
import * as labQuery from '@debionetwork/polkadot-provider/lib/query/labs';
import * as labCommand from '@debionetwork/polkadot-provider/lib/command/labs';
import { when } from 'jest-when';
diff --git a/test/unit/schedulers/mailer/mailer.service.spec.ts b/test/unit/schedulers/mailer/mailer.service.spec.ts
index 1cad3b43..c1667346 100644
--- a/test/unit/schedulers/mailer/mailer.service.spec.ts
+++ b/test/unit/schedulers/mailer/mailer.service.spec.ts
@@ -7,12 +7,12 @@ import {
substrateServiceMockFactory,
googleSecretManagerServiceMockFactory,
} from '../../mock';
-import { MailerService } from '../../../../src/schedulers/mailer/mailer.service';
+import { MailerService } from '@schedulers/mailer/mailer.service';
import {
EmailNotificationService,
MailerManager,
SubstrateService,
-} from '../../../../src/common';
+} from '@common/index';
import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager';
describe('MailerService', () => {
diff --git a/test/unit/schedulers/unstaked/unstaked.service.spec.ts b/test/unit/schedulers/unstaked/unstaked.service.spec.ts
index 3590cd51..fee04359 100644
--- a/test/unit/schedulers/unstaked/unstaked.service.spec.ts
+++ b/test/unit/schedulers/unstaked/unstaked.service.spec.ts
@@ -7,8 +7,8 @@ import {
MockLogger,
schedulerRegistryMockFactory,
} from '../../mock';
-import { UnstakedService } from '../../../../src/schedulers/unstaked/unstaked.service';
-import { SubstrateService } from '../../../../src/common';
+import { UnstakedService } from '@schedulers/unstaked/unstaked.service';
+import { SubstrateService } from '@common/index';
import { ServiceRequest } from '@debionetwork/polkadot-provider';
import * as serviceRequestQuery from '@debionetwork/polkadot-provider/lib/query/service-request';
diff --git a/tsconfig.json b/tsconfig.json
index 7782cfce..fda70ae8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,6 +13,12 @@
"incremental": true,
"skipLibCheck": true,
"resolveJsonModule": true,
- "esModuleInterop": true
+ "esModuleInterop": true,
+ "paths": {
+ "@common/*": ["src/common/*"],
+ "@indexer/*": ["src/indexer/*"],
+ "@listeners/*": ["src/listeners/*"],
+ "@schedulers/*": ["src/schedulers/*"]
+ }
}
}