Merge pull request #39 from axone-protocol/refactor/supply-charts

refactor: merged supply charts into one endpoint

src/modules/supply/enums/supply-endpoints.enum.ts

@@ -3,4 +3,5 @@ export enum SupplyEndpoints {
   CHANGE = '/change',
   BURNT = '/burnt',
   GROWTH = '/growth',
+  CHARTS = '/charts',
 }

src/modules/supply/schemas/charts-range.schema.ts

@@ -0,0 +1,6 @@
+import { Range } from "@core/enums/range.enum";
+import * as Joi from "joi";
+
+export const ChartsRangeSchema = Joi.string()
+  .valid(Range.FIVE_MIN, Range.HOUR, Range.DAY, Range.WEEK, Range.MONTH)
+  .required();

src/modules/supply/services/supply.service.ts

@@ -184,4 +184,16 @@ export class SupplyService implements OnModuleInit {
 
     return 0;
   }
+
+  async getCharts(range: Range) {
+    const issuance = await this.getSupplyChange(range);
+    const growth = await this.getSupplyGrowth(range);
+    const burnt = 0;
+
+    return {
+      issuance,
+      growth,
+      burnt,
+    }
+  }
 }

src/modules/supply/supply.controller.ts

@@ -8,19 +8,19 @@ import { HistoricalRangeSchema } from "./schemas/historical-range.schema";
 import { SupplyService } from "./services/supply.service";
 import { ChangeRangeSchema } from "./schemas/change-range.schema";
 import { Range } from "@core/enums/range.enum";
-import { GrowthRangeSchema } from "./schemas/growth-range.schema";
+import { ChartsRangeSchema } from "./schemas/charts-range.schema";
 
 @Controller(Routes.SUPPLY)
 export class SupplyController {
   constructor(
     private readonly cache: SupplyCache,
     private readonly service: SupplyService,
   ) {}
-    
+
   @Get(SupplyEndpoints.HISTORICAL)
   async getHistoricalSupply(
     @Query(QueryParam.RANGE, new SchemaValidatePipe(HistoricalRangeSchema))
-      range: Range,
+      range: Range
   ) {
     return this.cache.getSupplyHistorical(range);
   }
@@ -33,21 +33,16 @@ export class SupplyController {
   @Get(SupplyEndpoints.CHANGE)
   async getSupplyChange(
     @Query(QueryParam.RANGE, new SchemaValidatePipe(ChangeRangeSchema))
-      range: Range,
+      range: Range
   ) {
     return this.service.getSupplyChange(range);
   }
 
-  @Get(SupplyEndpoints.BURNT)
-  async getSupplyBurnt() {
-    return 0;
-  }
-
-  @Get(SupplyEndpoints.GROWTH)
-  async getSupplyGrowth(
-    @Query(QueryParam.RANGE, new SchemaValidatePipe(GrowthRangeSchema))
-      range: Range,
+  @Get(SupplyEndpoints.CHARTS)
+  async getCharts(
+    @Query(QueryParam.RANGE, new SchemaValidatePipe(ChartsRangeSchema))
+      range: Range
   ) {
-    return this.service.getSupplyGrowth(range);
+    return this.service.getCharts(range);
   }
-}
+}