use Api delete keys part #1

Author: mariasergeenko

tests/e2e/helpers/api/api-keys.ts

@@ -151,14 +151,14 @@ export async function addListKeyApi(
  */
 export async function searchKeyByNameApi(
     keyName: string,
-    databaseParameters: AddNewDatabaseParameters
+    databaseName: string
 ): Promise<string[]> {
     const requestBody = {
         cursor: '0',
         match: keyName
     };
     const databaseId = await databaseAPIRequests.getDatabaseIdByName(
-        databaseParameters.databaseName
+        databaseName
     );
     const response = await sendPostRequest(
         bufferPathMask.replace('databaseId', databaseId),
@@ -175,12 +175,12 @@ export async function searchKeyByNameApi(
  */
 export async function deleteKeyByNameApi(
     keyName: string,
-    databaseParameters: AddNewDatabaseParameters
+    databaseName: string
 ): Promise<void> {
     const databaseId = await databaseAPIRequests.getDatabaseIdByName(
-        databaseParameters.databaseName
+        databaseName
     );
-    const isKeyExist = await searchKeyByNameApi(keyName, databaseParameters);
+    const isKeyExist = await searchKeyByNameApi(keyName, databaseName);
     if (isKeyExist.length > 0) {
         const requestBody = { keyNames: [Buffer.from(keyName, 'utf-8')] };
         const response = await sendDeleteRequest(
@@ -200,10 +200,10 @@ export async function deleteKeyByNameApi(
  */
 export async function deleteKeysApi(
     keyNames: string[],
-    databaseParameters: AddNewDatabaseParameters
+    databaseName: string
 ): Promise<void> {
     const databaseId = await databaseAPIRequests.getDatabaseIdByName(
-        databaseParameters.databaseName
+        databaseName
     );
     const bufferKeyNames = keyNames.forEach((key) => Buffer.from(key, 'utf-8'));
     const requestBody = { keyNames: bufferKeyNames };

tests/e2e/tests/critical-path/browser/consumer-group.e2e.ts

@@ -3,10 +3,11 @@ import { DatabaseHelper } from '../../../helpers/database';
 import { BrowserPage } from '../../../pageObjects';
 import {
     commonUrl,
-    ossStandaloneConfig
+    ossStandaloneConfig, ossStandaloneRedisGears
 } from '../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -33,7 +34,7 @@ fixture `Consumer group`
         if (await browserPage.closeKeyButton.exists, { timeout: 500 }) {
             await t.click(browserPage.closeKeyButton);
         }
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that user can create a new Consumer Group in the current Stream', async t => {

tests/e2e/tests/critical-path/browser/filtering.e2e.ts

@@ -3,12 +3,13 @@ import { BrowserPage } from '../../../pageObjects';
 import {
     commonUrl,
     ossStandaloneBigConfig,
-    ossStandaloneConfig
+    ossStandaloneConfig, ossStandaloneRedisGears
 } from '../../../helpers/conf';
 import { keyLength, KeyTypesTexts, rte } from '../../../helpers/constants';
 import { addKeysViaCli, deleteKeysViaCli, keyTypes } from '../../../helpers/keys';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -31,7 +32,7 @@ fixture `Filtering per key name in Browser page`
 test
     .after(async() => {
         // Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     })('Verify that user can search a key with selected data type is filters', async t => {
         keyName = Common.generateWord(10);

tests/e2e/tests/critical-path/browser/hash-field.e2e.ts

@@ -4,6 +4,7 @@ import { BrowserPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -22,7 +23,7 @@ fixture `Hash Key fields verification`
     })
     .afterEach(async() => {
         // Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that user can search by full field name in Hash', async t => {

tests/e2e/tests/critical-path/browser/json-key.e2e.ts

@@ -4,6 +4,7 @@ import { BrowserPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -21,7 +22,7 @@ fixture `JSON Key verification`
     })
     .afterEach(async() => {
         // Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that user can not add invalid JSON structure inside of created JSON', async t => {

tests/e2e/tests/critical-path/browser/large-data.e2e.ts

@@ -4,6 +4,7 @@ import { rte } from '../../../helpers/constants';
 import { BrowserPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -19,7 +20,7 @@ fixture `Cases with large data`
     })
     .afterEach(async() => {
         // Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that user can see relevant information about key size', async t => {

tests/e2e/tests/critical-path/browser/list-key.e2e.ts

@@ -9,6 +9,7 @@ import {
 } from '../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -26,7 +27,7 @@ fixture `List Key verification`
     })
     .afterEach(async() => {
         // Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that user can search List element by index', async t => {
@@ -48,7 +49,7 @@ test
     })
     .after(async() => {
         //Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneV5Config.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV5Config);
     })('Verify that user can remove only one element for List for Redis v. <6.2', async t => {
         keyName = Common.generateWord(10);

tests/e2e/tests/critical-path/browser/search-capabilities.e2e.ts

@@ -11,6 +11,7 @@ import { rte } from '../../../helpers/constants';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
 import { verifyKeysDisplayedInTheList, verifyKeysNotDisplayedInTheList } from '../../../helpers/keys';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const myRedisDatabasePage = new MyRedisDatabasePage();
@@ -51,7 +52,7 @@ test
     })
     .after(async() => {
         // Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await browserPage.Cli.sendCommandsInCli([`DEL ${keyNames.join(' ')}`, `FT.DROPINDEX ${indexName}`]);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     })('RediSearch capabilities in Browser view to search per Hashes or JSONs', async t => {

tests/e2e/tests/critical-path/browser/set-key.e2e.ts

@@ -4,6 +4,7 @@ import { BrowserPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -21,7 +22,7 @@ fixture `Set Key fields verification`
     })
     .afterEach(async() => {
         // Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that user can search by full member name in Set', async t => {

tests/e2e/tests/critical-path/browser/stream-key-entry-deletion.e2e.ts

@@ -4,6 +4,7 @@ import { BrowserPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -28,7 +29,7 @@ fixture `Stream key entry deletion`
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
     })
     .afterEach(async() => {
-        await browserPage.deleteKeyByName(keyName);
+        await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that the Stream information is refreshed and the deleted entry is removed when user confirm the deletion of an entry', async t => {