Merge pull request #668 from vselvarajijay/hexagonal

cleaning up account service
akello-io · Jun 9, 2024 · 1219478 · 1219478
2 parents 0e7abc7 + 8d51929
commit 1219478
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/apps/registry/src/App.tsx b/apps/registry/src/App.tsx
@@ -10,8 +10,6 @@ import {
 
 import {AccountService} from '@akello/account';
 
-
-
 interface AppProps {
   isPassedToWithAuthenticator: boolean;
 }
@@ -47,7 +45,9 @@ const App:React.FC<AppProps> = () => {
 
   /////////////////////////
   // DBUG - test the account service
-  const accountService = new AccountService()
+  const accountService = new AccountService(
+      import.meta.env.VITE_MICROSERVICE_ACCOUNT_API
+  );
   accountService.getAccount(
     "ACCESS_TOKEN",
     "ACCOUNT_ID",

diff --git a/microservices/account/account/entrypoints/api/v1/endpoints/user.py b/microservices/account/account/entrypoints/api/v1/endpoints/user.py
@@ -11,6 +11,7 @@
 
 # TODO : no logger here
 
+
 router = APIRouter()
 app_config = config.AppConfig(**config.config)
 unit_of_work = dynamodb_unit_of_work.DynamoDBUnitOfWork(

diff --git a/microservices/account/packages/account/src/lib/services/account.ts b/microservices/account/packages/account/src/lib/services/account.ts
@@ -1,19 +1,26 @@
 
 import { BaseService } from './base';
 
-// set values from environment variables
-const BASE_URL = import.meta.env.VITE_API_URL;
 
-export interface IAccountService {
+export  interface IAccountService {
     getAccount(accessToken: string, accountId: string, onSuccess: (data: any) => void, onFail?: (data: any) =>  void): void;
 }
 
 export class AccountService extends BaseService implements IAccountService {
+    baseURL: string;
+
+    constructor(
+        baseURL: string
+    ) {
+        super();
+        this.baseURL = baseURL;
+    }
 
     async getAccount(accessToken: string, accountId: string, onSuccess: (data: any) => void, onFail?: (data: any) =>  void) {
+        // set values from environment variables
         const endpoint =  "account/" + accountId;
         this.apiRequest({
-            api_url: BASE_URL!,
+            api_url: this.baseURL,
             method: 'get',
             endpoint: endpoint,
             token: accessToken!,