SK-1090 remove unnecessary get calls in insert batch operation

skyflowapi · Dec 20, 2023 · 6e8031a · 6e8031a
1 parent 5018e90
commit 6e8031a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 29 deletions.
diff --git a/src/vault-api/core/Collect.ts b/src/vault-api/core/Collect.ts
@@ -13,13 +13,11 @@ const getUpsertColumn = (tableName: string, options: Record<string, any>) => {
   });
   return uniqueColumn;
 };
-
 export const constructInsertRecordRequest = (
   records: IInsertRecordInput,
   options: Record<string, any> = { tokens: true },
 ) => {
   const requestBody: any = [];
-  if (options.tokens) {
     records.records.forEach((record, index) => {
       const upsertColumn = getUpsertColumn(record.table, options);
       requestBody.push({
@@ -28,26 +26,9 @@ export const constructInsertRecordRequest = (
         tableName: record.table,
         fields: record.fields,
         ...(options?.upsert ? { upsert: upsertColumn } : {}),
-      });
-      requestBody.push({
-        method: 'GET',
-        tableName: record.table,
-        ID: `$responses.${2 * index}.records.0.skyflow_id`,
-        tokenization: true,
-      });
-    });
-  } else {
-    records.records.forEach((record) => {
-      const upsertColumn = getUpsertColumn(record.table, options);
-      requestBody.push({
-        method: 'POST',
-        quorum: true,
-        tableName: record.table,
-        fields: record.fields,
-        ...(options?.upsert ? { upsert: upsertColumn } : {}),
+        ...(options?.tokens ? { tokenization: true } : {}),
       });
     });
-  }
   return requestBody;
 };
 
@@ -60,19 +41,15 @@ export const constructInsertRecordResponse = (
     return {
       records: responseBody.responses
         .map((res, index) => {
-          if (index % 2 !== 0) {
-            const skyflowId = responseBody.responses[index - 1].records[0].skyflow_id;
-            delete res.fields['*'];
+            const skyflowId = responseBody.responses[index].records[0].skyflow_id;
             return {
-              table: records[Math.floor(index/2)].table,
+              table: records[index].table,
               fields: {
                 skyflow_id: skyflowId,
-                ...res.fields,
+                ...res.tokens,
               },
             };
-          }
-          return res;
-        }).filter((res, index) => index % 2 !== 0),
+        }),
     };
   }
   return {

diff --git a/test/vault-api/Skyflow.test.js b/test/vault-api/Skyflow.test.js
@@ -131,7 +131,7 @@ const options = {
   tokens: true,
 };
 
-const insertResponse = {"vaultID":"<VaultID>","responses":[{"records":[{"skyflow_id":"id"}]},{"fields":{"card_number":"token","cvv":"token","expiry_date":"token","fullname":"token"}}]}
+const insertResponse = {"vaultID":"<VaultID>","responses":[{"records":[{"skyflow_id":"id","tokens":{"card_number":"token","cvv":"token","expiry_date":"token","fullname":"token"}}]}]}
 const insertResponseWithoutTokens = {"vaultID":"<VaultID>","responses":[{"records":[{"skyflow_id":"id"}]}]}
 const on = jest.fn();