feat: response structure substrate countries (#436)

debionetwork · Aug 18, 2022 · 049a69f · 049a69f
1 parent ea7dc6d
commit 049a69f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/endpoints/substrate-endpoint/interface/service-request.interface.ts b/src/endpoints/substrate-endpoint/interface/service-request.interface.ts
@@ -1,13 +1,14 @@
 export interface RequestsByCountry {
+  countryId: string;
   country: string;
   totalRequests: number;
-  totalValue: string;
+  totalValue: CurrencyValueInterface;
   services: Array<ServiceInterface>;
 }
 export interface CurrencyValueInterface {
   dbio: number;
-  dai: number;
-  usd: number;
+  dai: number | string;
+  usd: number | string;
 }
 export interface ServiceInterface {
   countryId: string;
@@ -19,7 +20,7 @@ export interface ServiceInterface {
 }
 export interface RequestByCountryDictInterface {
   totalRequests: number;
-  totalValue: string | number;
+  totalValue: number;
   services: {
     [id: string]: ServiceInterface;
   };

diff --git a/src/endpoints/substrate-endpoint/services/service-request.service.ts b/src/endpoints/substrate-endpoint/services/service-request.service.ts
@@ -138,10 +138,15 @@ export class ServiceRequestService {
         }));
 
         const requestByCountry: RequestsByCountry = {
+          countryId: countryCode,
           country: name,
           services: servicesArr,
           totalRequests: totalRequests,
-          totalValue: totalValue as string,
+          totalValue: {
+            dbio: totalValue,
+            dai: totalValue * oneDbioEqualToDai || 'Conversion Error',
+            usd: totalValue * oneDbioEqualToUsd || 'Conversion Error',
+          },
         };
 
         requestByCountryList.push(requestByCountry);