Skip to content

Commit 5fde7f6

Browse files
authored
RSDK-8156: binaryDataCaptureUpload and tabularDataCaptureUpload actually do require dataRequestTimes (#351)
1 parent 035a73c commit 5fde7f6

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

src/app/data-client.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,8 +1036,8 @@ describe('DataSyncClient tests', () => {
10361036
componentType,
10371037
componentName,
10381038
methodName,
1039-
tags,
1040-
[dataRequestTimes1, dataRequestTimes2]
1039+
[dataRequestTimes1, dataRequestTimes2],
1040+
tags
10411041
);
10421042
expect(methodSpy).toHaveBeenCalledWith(
10431043
expectedRequest,
@@ -1080,8 +1080,8 @@ describe('DataSyncClient tests', () => {
10801080
componentName,
10811081
methodName,
10821082
fileExtension,
1083-
tags,
1084-
dataRequestTimes1
1083+
dataRequestTimes1,
1084+
tags
10851085
);
10861086
expect(methodSpy).toHaveBeenCalledWith(
10871087
expectedRequest,

src/app/data-client.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -793,10 +793,10 @@ export class DataClient {
793793
componentType: string,
794794
componentName: string,
795795
methodName: string,
796-
tags?: string[],
797-
dataRequestTimes?: [Date, Date][]
796+
dataRequestTimes: [Date, Date][],
797+
tags?: string[]
798798
) {
799-
if (dataRequestTimes?.length !== tabularData.length) {
799+
if (dataRequestTimes.length !== tabularData.length) {
800800
throw new Error('dataRequestTimes and data lengths must be equal.');
801801
}
802802

@@ -868,8 +868,8 @@ export class DataClient {
868868
componentName: string,
869869
methodName: string,
870870
fileExtension: string,
871-
tags?: string[],
872-
dataRequestTimes?: [Date, Date]
871+
dataRequestTimes: [Date, Date],
872+
tags?: string[]
873873
) {
874874
const { dataSyncService: service } = this;
875875

@@ -886,10 +886,8 @@ export class DataClient {
886886

887887
const sensorData = new dataSyncPb.SensorData();
888888
const sensorMetadata = new dataSyncPb.SensorMetadata();
889-
if (dataRequestTimes) {
890-
sensorMetadata.setTimeRequested(Timestamp.fromDate(dataRequestTimes[0]));
891-
sensorMetadata.setTimeReceived(Timestamp.fromDate(dataRequestTimes[1]));
892-
}
889+
sensorMetadata.setTimeRequested(Timestamp.fromDate(dataRequestTimes[0]));
890+
sensorMetadata.setTimeReceived(Timestamp.fromDate(dataRequestTimes[1]));
893891
sensorData.setMetadata(sensorMetadata);
894892
sensorData.setBinary(binaryData);
895893

0 commit comments

Comments
 (0)