From 901bcf5c188ea79350fecd499ad76460b866617b Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 7 Apr 2022 10:53:35 +0200
Subject: Add ability to set start/end date to timeserie

---
 shared/core-utils/common/date.ts                                      | 2 ++
 shared/models/videos/stats/index.ts                                   | 4 +++-
 .../models/videos/stats/video-stats-timeserie-group-interval.type.ts  | 1 +
 shared/models/videos/stats/video-stats-timeserie-query.model.ts       | 4 ++++
 shared/models/videos/stats/video-stats-timeserie.model.ts             | 4 ++++
 shared/server-commands/videos/video-stats-command.ts                  | 4 ++++
 6 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 shared/models/videos/stats/video-stats-timeserie-group-interval.type.ts
 create mode 100644 shared/models/videos/stats/video-stats-timeserie-query.model.ts

(limited to 'shared')

diff --git a/shared/core-utils/common/date.ts b/shared/core-utils/common/date.ts
index 3e4a3c08c..f0684ff86 100644
--- a/shared/core-utils/common/date.ts
+++ b/shared/core-utils/common/date.ts
@@ -43,6 +43,8 @@ function isLastWeek (d: Date) {
   return getDaysDifferences(now, d) <= 7
 }
 
+// ---------------------------------------------------------------------------
+
 function timeToInt (time: number | string) {
   if (!time) return 0
   if (typeof time === 'number') return time
diff --git a/shared/models/videos/stats/index.ts b/shared/models/videos/stats/index.ts
index d1e9c167c..5c4c9df2a 100644
--- a/shared/models/videos/stats/index.ts
+++ b/shared/models/videos/stats/index.ts
@@ -1,4 +1,6 @@
 export * from './video-stats-overall.model'
 export * from './video-stats-retention.model'
-export * from './video-stats-timeserie.model'
+export * from './video-stats-timeserie-group-interval.type'
+export * from './video-stats-timeserie-query.model'
 export * from './video-stats-timeserie-metric.type'
+export * from './video-stats-timeserie.model'
diff --git a/shared/models/videos/stats/video-stats-timeserie-group-interval.type.ts b/shared/models/videos/stats/video-stats-timeserie-group-interval.type.ts
new file mode 100644
index 000000000..9609ecb72
--- /dev/null
+++ b/shared/models/videos/stats/video-stats-timeserie-group-interval.type.ts
@@ -0,0 +1 @@
+export type VideoStatsTimeserieGroupInterval = 'one_day' | 'one_hour' | 'ten_minutes' | 'one_minute'
diff --git a/shared/models/videos/stats/video-stats-timeserie-query.model.ts b/shared/models/videos/stats/video-stats-timeserie-query.model.ts
new file mode 100644
index 000000000..f3a8430e1
--- /dev/null
+++ b/shared/models/videos/stats/video-stats-timeserie-query.model.ts
@@ -0,0 +1,4 @@
+export interface VideoStatsTimeserieQuery {
+  startDate?: string
+  endDate?: string
+}
diff --git a/shared/models/videos/stats/video-stats-timeserie.model.ts b/shared/models/videos/stats/video-stats-timeserie.model.ts
index d95e34f1d..99bbbe2e3 100644
--- a/shared/models/videos/stats/video-stats-timeserie.model.ts
+++ b/shared/models/videos/stats/video-stats-timeserie.model.ts
@@ -1,4 +1,8 @@
+import { VideoStatsTimeserieGroupInterval } from './video-stats-timeserie-group-interval.type'
+
 export interface VideoStatsTimeserie {
+  groupInterval: VideoStatsTimeserieGroupInterval
+
   data: {
     date: string
     value: number
diff --git a/shared/server-commands/videos/video-stats-command.ts b/shared/server-commands/videos/video-stats-command.ts
index 90f7ffeaf..bd4808f63 100644
--- a/shared/server-commands/videos/video-stats-command.ts
+++ b/shared/server-commands/videos/video-stats-command.ts
@@ -1,3 +1,4 @@
+import { pick } from '@shared/core-utils'
 import { HttpStatusCode, VideoStatsOverall, VideoStatsRetention, VideoStatsTimeserie, VideoStatsTimeserieMetric } from '@shared/models'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
@@ -20,6 +21,8 @@ export class VideoStatsCommand extends AbstractCommand {
   getTimeserieStats (options: OverrideCommandOptions & {
     videoId: number | string
     metric: VideoStatsTimeserieMetric
+    startDate?: Date
+    endDate?: Date
   }) {
     const path = '/api/v1/videos/' + options.videoId + '/stats/timeseries/' + options.metric
 
@@ -27,6 +30,7 @@ export class VideoStatsCommand extends AbstractCommand {
       ...options,
       path,
 
+      query: pick(options, [ 'startDate', 'endDate' ]),
       implicitToken: true,
       defaultExpectedStatus: HttpStatusCode.OK_200
     })
-- 
cgit v1.2.3