refator: use TimeOptions for TopArtists report

src/reports/dto/get-top-artists-report.dto.ts

@@ -1,18 +1,10 @@
-import { IsEnum, IsISO8601, ValidateIf } from "class-validator";
+import { ValidateNested } from "class-validator";
 import { User } from "../../users/user.entity";
-import { TimePreset } from "../timePreset.enum";
+import { ReportTimeDto } from "./report-time.dto";
 
 export class GetTopArtistsReportDto {
   user: User;
 
-  @IsEnum(TimePreset)
-  timePreset: TimePreset;
-
-  @ValidateIf((o) => o.timePreset === TimePreset.CUSTOM)
-  @IsISO8601()
-  customTimeStart: string;
-
-  @ValidateIf((o) => o.timePreset === TimePreset.CUSTOM)
-  @IsISO8601()
-  customTimeEnd: string;
+  @ValidateNested()
+  time: ReportTimeDto;
 }

src/reports/dto/report-time.dto.ts

@@ -0,0 +1,15 @@
+import { IsEnum, IsISO8601, ValidateIf } from "class-validator";
+import { TimePreset } from "../timePreset.enum";
+
+export class ReportTimeDto {
+  @IsEnum(TimePreset)
+  timePreset: TimePreset;
+
+  @ValidateIf((o) => o.timePreset === TimePreset.CUSTOM)
+  @IsISO8601()
+  customTimeStart: string;
+
+  @ValidateIf((o) => o.timePreset === TimePreset.CUSTOM)
+  @IsISO8601()
+  customTimeEnd: string;
+}

src/reports/reports.controller.ts

@@ -24,9 +24,9 @@ export class ReportsController {
   @Get("top-artists")
   @Auth()
   async getTopArtists(
-    @Query() options: Omit<GetTopArtistsReportDto, "user">,
+    @Query() time: ReportTimeDto,
     @ReqUser() user: User
   ): Promise<TopArtistsReportDto> {
-    return this.reportsService.getTopArtists({ ...options, user });
+    return this.reportsService.getTopArtists({ user, time });
   }
 }

src/reports/reports.service.ts

@@ -100,13 +100,9 @@ export class ReportsService {
   async getTopArtists(
     options: GetTopArtistsReportDto
   ): Promise<TopArtistsReportDto> {
-    const { user, timePreset, customTimeStart, customTimeEnd } = options;
+    const { user, time: timePreset } = options;
 
-    const interval = this.getIntervalFromPreset({
-      timePreset,
-      customTimeStart,
-      customTimeEnd,
-    });
+    const interval = this.getIntervalFromPreset(timePreset);
 
     const getArtistsWithCountQB = this.listensService
       .getScopedQueryBuilder()