- feat: Optimize tenancy software architecture.

server/src/services/Accounts/AccountsService.js

@@ -1,22 +0,0 @@
-import { Account, AccountType } from '@/models';
-
-export default class AccountsService {
-  static async isAccountExists(accountId) {
-    const foundAccounts = await Account.tenant().query().where('id', accountId);
-    return foundAccounts.length > 0;
-  }
-
-  static async getAccountByType(accountTypeKey) {
-    const accountType = await AccountType.tenant()
-      .query()
-      .where('key', accountTypeKey)
-      .first();
-
-    const account = await Account.tenant()
-      .query()
-      .where('account_type_id', accountType.id)
-      .first();
-
-    return account;
-  }
-}

server/src/services/Accounts/AccountsService.ts

@@ -0,0 +1,29 @@
+import { Inject, Service } from 'typedi';
+import TenancyService from '@/services/Tenancy/TenancyService';
+
+@Service()
+export default class AccountsService {
+  @Inject()
+  tenancy: TenancyService;
+
+  async isAccountExists(tenantId: number, accountId: number) {
+    const { Account } = this.tenancy.models(tenantId);
+    const foundAccounts = await Account.query()
+      .where('id', accountId);
+
+    return foundAccounts.length > 0;
+  }
+
+  async getAccountByType(tenantId: number, accountTypeKey: string) {
+    const { AccountType, Account } = this.tenancy.models(tenantId);
+    const accountType = await AccountType.query()
+      .where('key', accountTypeKey)
+      .first();
+
+    const account = await Account.query()
+      .where('account_type_id', accountType.id)
+      .first();
+
+    return account;
+  }
+}