DATA-3861 Update TS SDK to use new binary data id fields (#486)

Author: vijayvuyyuru

src/app/data-client.spec.ts

@@ -104,6 +104,8 @@ describe('DataClient tests', () => {
     locationId: 'testLocationId',
   });
 
+  const binaryDataId1 = 'testID1';
+  const binaryDataId2 = 'testID2';
   describe('exportTabularData tests', () => {
     const sharedAttributes = {
       partId: 'partId1',
@@ -417,13 +419,33 @@ describe('DataClient tests', () => {
       });
     });
 
+    it('get binary data by binary data ids', async () => {
+      const promise = await subject().binaryDataByIds([
+        binaryDataId1,
+        binaryDataId2,
+      ]);
+      expect(promise.length).toEqual(2);
+      expect(promise[0]?.binary).toEqual(bin1);
+      expect(promise[1]?.binary).toEqual(bin2);
+    });
+
     it('get binary data by ids', async () => {
       const promise = await subject().binaryDataByIds([binaryId1, binaryId2]);
       expect(promise.length).toEqual(2);
       expect(promise[0]?.binary).toEqual(bin1);
       expect(promise[1]?.binary).toEqual(bin2);
     });
 
+    it('get binary data by binary data id', async () => {
+      const expectedRequest = new BinaryDataByIDsRequest({
+        binaryDataIds: [binaryDataId1],
+        includeBinary: true,
+      });
+
+      await subject().binaryDataByIds([binaryDataId1]);
+      expect(capReq).toStrictEqual(expectedRequest);
+    });
+
     it('get binary data by id', async () => {
       const expectedRequest = new BinaryDataByIDsRequest({
         binaryIds: [binaryId1],
@@ -515,14 +537,27 @@ describe('DataClient tests', () => {
         service(DataService, {
           deleteBinaryDataByIDs: (req) => {
             return new DeleteBinaryDataByIDsResponse({
-              deletedCount: BigInt(req.binaryIds.length),
+              deletedCount: BigInt(
+                Math.max(req.binaryDataIds.length, req.binaryIds.length)
+              ),
             });
           },
         });
       });
     });
 
-    it('delete binary data', async () => {
+    it('delete binary data by binary data ids', async () => {
+      const promise1 = await subject().deleteBinaryDataByIds([binaryDataId1]);
+      expect(promise1).toEqual(1n);
+
+      const promise2 = await subject().deleteBinaryDataByIds([
+        binaryDataId1,
+        binaryDataId2,
+      ]);
+      expect(promise2).toEqual(2n);
+    });
+
+    it('delete binary data by ids', async () => {
       const promise1 = await subject().deleteBinaryDataByIds([binaryId1]);
       expect(promise1).toEqual(1n);
 
@@ -547,6 +582,19 @@ describe('DataClient tests', () => {
       });
     });
 
+    it('add tags to binary data by binary data ids', async () => {
+      const expectedRequest = new AddTagsToBinaryDataByIDsRequest({
+        binaryDataIds: [binaryDataId1, binaryDataId2],
+        tags: ['tag1', 'tag2'],
+      });
+
+      await subject().addTagsToBinaryDataByIds(
+        ['tag1', 'tag2'],
+        [binaryDataId1, binaryDataId2]
+      );
+      expect(capReq).toStrictEqual(expectedRequest);
+    });
+
     it('add tags to binary data', async () => {
       const expectedRequest = new AddTagsToBinaryDataByIDsRequest({
         binaryIds: [binaryId1, binaryId2],
@@ -600,7 +648,21 @@ describe('DataClient tests', () => {
       });
     });
 
-    it('remove tags to binary data', async () => {
+    it('remove tags to binary data by binary data ids', async () => {
+      const expectedRequest = new RemoveTagsFromBinaryDataByIDsRequest({
+        binaryDataIds: [binaryDataId1, binaryDataId2],
+        tags: ['tag1', 'tag2'],
+      });
+
+      const promise = await subject().removeTagsFromBinaryDataByIds(
+        ['tag1', 'tag2'],
+        [binaryDataId1, binaryDataId2]
+      );
+      expect(capReq).toStrictEqual(expectedRequest);
+      expect(promise).toEqual(2n);
+    });
+
+    it('remove tags to binary data by ids', async () => {
       const expectedRequest = new RemoveTagsFromBinaryDataByIDsRequest({
         binaryIds: [binaryId1, binaryId2],
         tags: ['tag1', 'tag2'],
@@ -686,7 +748,29 @@ describe('DataClient tests', () => {
       });
     });
 
-    it('add bounding box to image', async () => {
+    it('add bounding box to image by binary data id', async () => {
+      const expectedRequest = new AddBoundingBoxToImageByIDRequest({
+        binaryDataId: binaryDataId1,
+        label: 'label',
+        xMinNormalized: 0,
+        yMinNormalized: 0,
+        yMaxNormalized: 1,
+        xMaxNormalized: 1,
+      });
+
+      const promise = await subject().addBoundingBoxToImageById(
+        binaryDataId1,
+        'label',
+        0,
+        0,
+        1,
+        1
+      );
+      expect(capReq).toStrictEqual(expectedRequest);
+      expect(promise).toEqual('bboxId');
+    });
+
+    it('add bounding box to image by id', async () => {
       const expectedRequest = new AddBoundingBoxToImageByIDRequest({
         binaryId: binaryId1,
         label: 'label',
@@ -722,7 +806,17 @@ describe('DataClient tests', () => {
       });
     });
 
-    it('remove bounding box from image', async () => {
+    it('remove bounding box from image by binary data id', async () => {
+      const expectedRequest = new RemoveBoundingBoxFromImageByIDRequest({
+        binaryDataId: binaryDataId1,
+        bboxId: 'bboxId',
+      });
+
+      await subject().removeBoundingBoxFromImageById(binaryDataId1, 'bboxId');
+      expect(capReq).toStrictEqual(expectedRequest);
+    });
+
+    it('remove bounding box from image by id', async () => {
       const expectedRequest = new RemoveBoundingBoxFromImageByIDRequest({
         binaryId: binaryId1,
         bboxId: 'bboxId',
@@ -822,7 +916,20 @@ describe('DataClient tests', () => {
       });
     });
 
-    it('add binary data to dataset', async () => {
+    it('add binary data to dataset by binary data ids', async () => {
+      const expectedRequest = new AddBinaryDataToDatasetByIDsRequest({
+        binaryDataIds: [binaryDataId1, binaryDataId2],
+        datasetId: 'datasetId',
+      });
+
+      await subject().addBinaryDataToDatasetByIds(
+        [binaryDataId1, binaryDataId2],
+        'datasetId'
+      );
+      expect(capReq).toStrictEqual(expectedRequest);
+    });
+
+    it('add binary data to dataset by ids', async () => {
       const expectedRequest = new AddBinaryDataToDatasetByIDsRequest({
         binaryIds: [binaryId1, binaryId2],
         datasetId: 'datasetId',
@@ -849,7 +956,20 @@ describe('DataClient tests', () => {
       });
     });
 
-    it('remove binary data from dataset', async () => {
+    it('remove binary data from dataset by binary data ids', async () => {
+      const expectedRequest = new RemoveBinaryDataFromDatasetByIDsRequest({
+        binaryDataIds: [binaryDataId1, binaryDataId2],
+        datasetId: 'datasetId',
+      });
+
+      await subject().removeBinaryDataFromDatasetByIds(
+        [binaryDataId1, binaryDataId2],
+        'datasetId'
+      );
+      expect(capReq).toStrictEqual(expectedRequest);
+    });
+
+    it('remove binary data from dataset by ids', async () => {
       const expectedRequest = new RemoveBinaryDataFromDatasetByIDsRequest({
         binaryIds: [binaryId1, binaryId2],
         datasetId: 'datasetId',
@@ -1249,7 +1369,7 @@ describe('DataSyncClient tests', () => {
           dataCaptureUpload: (req) => {
             capReq = req;
             return new DataCaptureUploadResponse({
-              fileId: 'fileId',
+              binaryDataId: 'fileId',
             });
           },
         });