getDuplicate returns empty array instead of null, removes unnecessary…

… return logic
elastic · Feb 12, 2020 · ad56892 · ad56892
1 parent e2609c1
commit ad56892
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -54,7 +54,7 @@ export const createCreateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRou
 
       const rules = await Promise.all(
         ruleDefinitions
-          .filter(rule => !dupes?.includes(rule.rule_id ?? ''))
+          .filter(rule => !dupes.includes(rule.rule_id ?? ''))
           .map(async payloadRule => {
             const {
               description,
@@ -141,19 +141,16 @@ export const createCreateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRou
             }
           })
       );
-      if (dupes) {
-        return [
-          ...rules,
-          ...dupes.map(ruleId =>
-            createBulkErrorObject({
-              ruleId,
-              statusCode: 409,
-              message: `rule_id: "${ruleId}" already exists`,
-            })
-          ),
-        ];
-      }
-      return [...rules];
+      return [
+        ...rules,
+        ...dupes.map(ruleId =>
+          createBulkErrorObject({
+            ruleId,
+            statusCode: 409,
+            message: `rule_id: "${ruleId}" already exists`,
+          })
+        ),
+      ];
     },
   };
 };

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts
@@ -1220,7 +1220,7 @@ describe('utils', () => {
         value2: 1,
         value3: 1,
       });
-      const expected = null;
+      const expected: string[] = [];
       expect(output).toEqual(expected);
     });
   });

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
@@ -217,10 +217,10 @@ export const transformOrImportError = (
   }
 };
 
-export const getDuplicates = (lodashDict: Dictionary<number>): string[] | null => {
+export const getDuplicates = (lodashDict: Dictionary<number>): string[] => {
   const hasDuplicates = Object.values(lodashDict).some(i => i > 1);
   if (hasDuplicates) {
     return Object.keys(lodashDict).filter(key => lodashDict[key] > 1);
   }
-  return null;
+  return [];
 };