From 49c54d59d53316dcd21a8eca9fd1625a39ad0179 Mon Sep 17 00:00:00 2001 From: Mariano Ruiz Date: Fri, 14 May 2021 13:07:56 -0300 Subject: [PATCH] Remove unnecessary check of docs count --- webapp/src/ts/services/telemetry.service.ts | 15 +++------------ .../karma/ts/services/telemetry.service.spec.ts | 1 - 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/webapp/src/ts/services/telemetry.service.ts b/webapp/src/ts/services/telemetry.service.ts index 09b13045c5d..daa2631da41 100644 --- a/webapp/src/ts/services/telemetry.service.ts +++ b/webapp/src/ts/services/telemetry.service.ts @@ -81,7 +81,6 @@ export class TelemetryService { // moment when the aggregation starts (the beginning of the current day) private aggregateStartsAt() { return moment().startOf('day'); - //return moment().startOf('minute'); } // if there is telemetry data from previous days, aggregation is performed and the data destroyed @@ -90,13 +89,9 @@ export class TelemetryService { const dbDate = moment(this.getFirstAggregatedDate()); if (dbDate.isBefore(startOf)) { - return db.info() - .then(info => { - if (info.doc_count > 0) { - return this.aggregate(db) - .then(() => this.reset(db)); - } - }); + return this + .aggregate(db) + .then(() => this.reset(db)); } } @@ -114,8 +109,6 @@ export class TelemetryService { metadata.year, metadata.month, metadata.day, - //metadata.hour, - //metadata.minute, metadata.user, metadata.deviceId, ].join('-'); @@ -140,8 +133,6 @@ export class TelemetryService { year: date.year(), month: date.month() + 1, day: date.date(), - //hour: date.hour(), - //minute: date.minute(), user: this.sessionService.userCtx().name, deviceId: this.getUniqueDeviceId(), versions: { diff --git a/webapp/tests/karma/ts/services/telemetry.service.spec.ts b/webapp/tests/karma/ts/services/telemetry.service.spec.ts index 208a2785ebf..1a7a301690a 100644 --- a/webapp/tests/karma/ts/services/telemetry.service.spec.ts +++ b/webapp/tests/karma/ts/services/telemetry.service.spec.ts @@ -76,7 +76,6 @@ describe('TelemetryService', () => { dbService = { get: () => dbInstance }; consoleErrorSpy = sinon.spy(console, 'error'); pouchDb = { - info: sinon.stub().resolves({doc_count: 10}), post: sinon.stub().resolves(), close: sinon.stub(), destroy: sinon.stub().callsFake(() => {