From fd6931108d91d561777ae79be686947c78815e37 Mon Sep 17 00:00:00 2001 From: Zhihe Li Date: Tue, 23 May 2023 18:57:47 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20times/duration?= =?UTF-8?q?s=20to=20more=20accurately=20reflect=20api=20(#277)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/mirage/factories/channel-recording.js | 6 ++++++ .../mirage/factories/connection-recording.js | 1 + .../api/mirage/factories/session-recording.js | 21 ++++++++++++------- .../generated/factories/channel-recording.js | 5 ----- .../factories/connection-recording.js | 1 - .../generated/factories/session-recording.js | 1 - 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/addons/api/mirage/factories/channel-recording.js b/addons/api/mirage/factories/channel-recording.js index ecc72d2ec..75ad07dcc 100644 --- a/addons/api/mirage/factories/channel-recording.js +++ b/addons/api/mirage/factories/channel-recording.js @@ -5,7 +5,13 @@ import factory from '../generated/factories/channel-recording'; import generateId from '../helpers/id'; +import { faker } from '@faker-js/faker'; export default factory.extend({ id: () => generateId('chr_'), + start_time(i) { + return i % 3 === 2 ? null : faker.date.recent(3, this.end_time); + }, + end_time: (i) => (i % 3 === 2 ? null : faker.date.recent()), + duration: (i) => (i % 3 === 2 ? null : `${faker.datatype.number()}s`), }); diff --git a/addons/api/mirage/factories/connection-recording.js b/addons/api/mirage/factories/connection-recording.js index 76145d661..c8196a4b8 100644 --- a/addons/api/mirage/factories/connection-recording.js +++ b/addons/api/mirage/factories/connection-recording.js @@ -14,4 +14,5 @@ export default factory.extend({ return i % 3 === 2 ? null : faker.date.recent(3, this.end_time); }, end_time: (i) => (i % 3 === 2 ? null : faker.date.recent()), + duration: (i) => (i % 3 === 2 ? null : `${faker.datatype.number()}s`), }); diff --git a/addons/api/mirage/factories/session-recording.js b/addons/api/mirage/factories/session-recording.js index 3086c4aea..2612e9cc4 100644 --- a/addons/api/mirage/factories/session-recording.js +++ b/addons/api/mirage/factories/session-recording.js @@ -16,8 +16,8 @@ import { } from 'api/models/session-recording'; const states = [ - STATE_SESSION_RECORDING_STARTED, STATE_SESSION_RECORDING_AVAILABLE, + STATE_SESSION_RECORDING_STARTED, STATE_SESSION_RECORDING_UNKNOWN, ]; const pickRandomElement = (arr) => faker.helpers.arrayElement(arr); @@ -26,14 +26,21 @@ export default factory.extend({ // Cycle through available types type: (i) => types[i % types.length], - state: (i) => states[i % states.length], - - start_time(i) { - return i % 4 === 3 ? null : faker.date.recent(3, this.end_time); + start_time() { + return this.state === STATE_SESSION_RECORDING_AVAILABLE + ? faker.date.recent(3, this.end_time) + : null; }, - end_time(i) { - return i % 4 === 3 ? null : faker.date.recent(1, this.updated_time); + end_time() { + return this.state === STATE_SESSION_RECORDING_AVAILABLE + ? faker.date.recent(1, this.updated_time) + : null; + }, + duration() { + return this.state === STATE_SESSION_RECORDING_AVAILABLE + ? `${faker.datatype.number()}s` + : null; }, authorized_actions: () => diff --git a/addons/api/mirage/generated/factories/channel-recording.js b/addons/api/mirage/generated/factories/channel-recording.js index 6c9b2875d..27ea5539f 100644 --- a/addons/api/mirage/generated/factories/channel-recording.js +++ b/addons/api/mirage/generated/factories/channel-recording.js @@ -16,10 +16,5 @@ export default Factory.extend({ bytes_down: () => faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), errors: () => faker.datatype.number({ max: 10 }), - start_time() { - return faker.date.recent(3, this.end_time); - }, - end_time: () => faker.date.recent(), - duration: () => `${faker.datatype.number()}s`, mime_types: () => [MIME_TYPE_ASCIICAST], }); diff --git a/addons/api/mirage/generated/factories/connection-recording.js b/addons/api/mirage/generated/factories/connection-recording.js index 62837e435..f0b50e501 100644 --- a/addons/api/mirage/generated/factories/connection-recording.js +++ b/addons/api/mirage/generated/factories/connection-recording.js @@ -15,5 +15,4 @@ export default Factory.extend({ bytes_down: () => faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), errors: () => faker.datatype.number({ max: 10 }), - duration: () => `${faker.datatype.number()}s`, }); diff --git a/addons/api/mirage/generated/factories/session-recording.js b/addons/api/mirage/generated/factories/session-recording.js index 8de3cfb64..5fc563d94 100644 --- a/addons/api/mirage/generated/factories/session-recording.js +++ b/addons/api/mirage/generated/factories/session-recording.js @@ -17,5 +17,4 @@ export default Factory.extend({ errors: () => faker.datatype.number({ max: 10 }), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - duration: () => `${faker.datatype.number()}s`, });