working?

viamrobotics · Dec 6, 2024 · 1e8a276 · 1e8a276
1 parent df91fe2
commit 1e8a276
Show file tree

Hide file tree

Showing 3 changed files with 800 additions and 75 deletions.
diff --git a/lib/src/app/data.dart b/lib/src/app/data.dart
@@ -538,7 +538,7 @@ class DataClient {
   /// as long as it was synced within the last year.
   ///
   /// For more information, see [Data Client API](https://docs.viam.com/appendix/apis/data-client/).
-  Future<(DateTime, DateTime, Map<String, dynamic>)?> getLatestTabularData(
+  Future<({DateTime timeCaptured, DateTime timeSynced, Map<String, dynamic> payload})?> getLatestTabularData(
     String partId,
     String resourceName,
     String resourceSubtype,
@@ -557,9 +557,9 @@ class DataClient {
     }
 
     return (
-      response.timeCaptured.toDateTime(),
-      response.timeSynced.toDateTime(),
-      response.payload.toMap(),
+      timeCaptured: response.timeCaptured.toDateTime(),
+      timeSynced: response.timeSynced.toDateTime(),
+      payload: response.payload.toMap(),
     );
   }
 }

diff --git a/test/unit_test/app/data_client_test.dart b/test/unit_test/app/data_client_test.dart
@@ -14,6 +14,7 @@ import 'package:viam_sdk/src/gen/app/data/v1/data.pb.dart';
 import 'package:viam_sdk/src/gen/app/data/v1/data.pbgrpc.dart';
 import 'package:viam_sdk/src/gen/google/protobuf/timestamp.pb.dart';
 import 'package:viam_sdk/src/media/image.dart';
+import 'package:viam_sdk/src/utils.dart';
 
 import '../mocks/mock_response_future.dart';
 import '../mocks/service_clients_mocks.mocks.dart';
@@ -295,27 +296,27 @@ void main() {
         verify(serviceClient.removeBinaryDataFromDatasetByIDs(any)).called(1);
       });
       test('getLatestTabularData', () async {
-        final timeCaptured = DateTime(2023, 1, 1);
-        final timeSynced = DateTime(2023, 1, 2);
-        final payload = Struct()..fields.addAll({'key': Value()..stringValue = 'value'});
+        final timeCaptured = DateTime.utc(2023, 1, 1);
+        final timeSynced = DateTime.utc(2023, 1, 2);
+        final Map<String, dynamic> payload = {'key': 'value'};
 
-        when(serviceClient.getLatestTabularData(any)).thenAnswer((_) => MockResponseFuture.value(GetLatestTabularDataResponse()
-          ..timeCaptured = Timestamp.fromDateTime(timeCaptured)
-          ..timeSynced = Timestamp.fromDateTime(timeSynced)
-          ..payload = payload));
+        when(serviceClient.getLatestTabularData(any)).thenAnswer((_) => MockResponseFuture.value(GetLatestTabularDataResponse(
+            timeCaptured: Timestamp.fromDateTime(timeCaptured),
+            timeSynced: Timestamp.fromDateTime(timeSynced),
+            payload: payload.toStruct())));
 
         final response = await dataClient.getLatestTabularData('part-id', 'resource-name', 'resource-subtype', 'method-name');
 
-        expect(response?.$1, equals(timeCaptured));
-        expect(response?.$2, equals(timeSynced));
-        expect(response?.$3, equals({'key': 'value'}));
+        expect(response?.timeCaptured, equals(timeCaptured));
+        expect(response?.timeSynced, equals(timeSynced));
+        expect(response?.payload, equals({'key': 'value'}));
 
         verify(serviceClient.getLatestTabularData(any)).called(1);
 
         // Test null response
         when(serviceClient.getLatestTabularData(any)).thenAnswer((_) => MockResponseFuture.value(GetLatestTabularDataResponse()));
 
-        final nullResponse = await serviceClient.getLatestTabularData('part-id', 'resource-name', 'resource-subtype', 'method-name');
+        final nullResponse = await dataClient.getLatestTabularData('part-id', 'resource-name', 'resource-subtype', 'method-name');
 
         expect(nullResponse, isNull);
       });
@@ -434,13 +435,9 @@ void main() {
         final response = await dataClient.listDatasetsByIDs(['dataset-id']);
         expect(response, equals(expected));
       });
-
-
     });
   });
 
-
-
   group('Filter Utils Tests', () {
     test('setDateTimeCaptureInterval', () {
       final filter = Filter();