Allow to be specified in request

guardian · Jul 24, 2024 · eb257d5 · eb257d5
1 parent b4d7fd0
commit eb257d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/apps/rule-manager/app/controllers/RulesController.scala b/apps/rule-manager/app/controllers/RulesController.scala
@@ -288,9 +288,14 @@ class RulesController(
         case Some(tag) => tag.head
         case None      => ""
       }
+      category = formData.dataParts.get("category") match {
+        case Some(category) => category.head
+        case None => ""
+      }
     } yield RuleManager.csvImport(
       file.ref.path.toFile,
       tag,
+      category,
       bucketRuleResource
     )
 

diff --git a/apps/rule-manager/app/service/RuleManager.scala b/apps/rule-manager/app/service/RuleManager.scala
@@ -34,7 +34,7 @@ case class AllRuleData(
 )
 
 object RuleManager extends Loggable {
-  def csvImport(toFile: File, tagName: String, bucketRuleResource: BucketRuleResource) = {
+  def csvImport(toFile: File, tagName: String, category: String, bucketRuleResource: BucketRuleResource) = {
     val reader = CSVReader.open(toFile)
     val rules = reader.all()
 
@@ -49,7 +49,7 @@ object RuleManager extends Loggable {
         id = None,
         ruleType = RuleType.regex,
         pattern = Some(pattern),
-        category = Some("Imported from CSV"),
+        category = Some(category),
         description = Some(description),
         ignore = false,
         replacement = Some(replacement),