Refactor report interface

3 files changed, 25 insertions, 13 deletions

diff --git a/src/models/report-stat.model.ts b/src/models/report-stat.model.ts
new file mode 100644
index 0000000..e55005c
--- /dev/null
+++ b/src/models/report-stat.model.ts
@@ -0,0 +1,10 @@
+/**
+ * Report interface used to model a single data
+ * point reported by this app. Each time a test is performed,
+ * this is the result that will be reported.
+ */
+export interface ReportStat {
+  download: number // speeds defined in kbits/s
+  upload: number
+  datetime: number // unix epoch seconds
+}
diff --git a/src/models/report-test.model.ts b/src/models/report-test.model.ts
new file mode 100644
index 0000000..c29bde9
--- /dev/null
+++ b/src/models/report-test.model.ts
@@ -0,0 +1,6 @@
+import { ReportStat } from './report-stat.model'
+
+export interface ReportTest {
+  testServiceName: string
+  stats: ReportStat[]
+}
diff --git a/src/models/report.model.ts b/src/models/report.model.ts
index 902d4a3..ff1964d 100644
--- a/src/models/report.model.ts
+++ b/src/models/report.model.ts
@@ -1,15 +1,11 @@
-/**
- * Report interface used to model a single data
- * point reported by this app. Each time a test is performed,
- * this is the result that will be reported.
- */
+import { ReportTest } from './report-test.model'
+
 export interface Report {
-  download: number // speeds defined in kbits/s
-  upload: number
-  nConnectedClients: number
-  uptime: number
-  leaseTime: number
-  datetime: number // unix epoch seconds
-  service: string
-  adapter: string
+  isOnline?: boolean
+  nConnectedClients?: number
+  uptime?: number
+  leaseTime?: number
+  adapterName?: string
+  datetime: number
+  tests: ReportTest[]
 }