Create/assign/edit labels now working

Author: bodom0015

app/api/Extractions.scala

@@ -675,25 +675,45 @@ class Extractions @Inject()(
   }
 
   def createExtractorsLabel() = ServerAdminAction(parse.json) { implicit request =>
-    val name = (request.body \ "name").as[String]
-    val category = (request.body \ "category").asOpt[String]
-    val assignedExtractors = (request.body \ "extractors").as[List[String]]
+    // Fetch parameters from request body
+    val (name, category, assignedExtractors) = parseExtractorsLabel(request)
+
+    // Perform validation
+    validateExtractorsLabel(name, category, assignedExtractors)
 
+    // Create new label
     extractors.createExtractorsLabel(name, category, assignedExtractors) match {
-      case Some(lbl) => { Ok(Json.toJson(lbl)) }
-      case None => { BadRequest("Failed to create new label") }
+      case Some(lbl) => Ok(Json.toJson(lbl))
+      case None => BadRequest("Failed to create new label")
     }
   }
 
   def updateExtractorsLabel(id: UUID) = ServerAdminAction(parse.json) { implicit request =>
+    // Fetch parameters from request body
+    val (name, category, assignedExtractors) = parseExtractorsLabel(request)
+
+    // Perform validation
+    validateExtractorsLabel(name, category, assignedExtractors)
+
+    // Update existing label
+    val label = ExtractorsLabel(id, name, category, assignedExtractors)
+    extractors.updateExtractorsLabel(label) match {
+      case Some(lbl) => Ok(Json.toJson(lbl))
+      case None => BadRequest("Failed to update existing label")
+    }
+  }
+
+  def parseExtractorsLabel(request: UserRequest[JsValue]): (String, Option[String], List[String]) = {
     val name = (request.body \ "name").as[String]
     val category = (request.body \ "category").asOpt[String]
     val assignedExtractors = (request.body \ "extractors").as[List[String]]
 
-    val label = ExtractorsLabel(id, name, category, assignedExtractors)
-    extractors.updateExtractorsLabel(label) match {
-      case Some(lbl) => { Ok(Json.toJson(lbl)) }
-      case None => { BadRequest("Failed to update existing label") }
+    (name, category, assignedExtractors)
+  }
+
+  def validateExtractorsLabel(name: String, category: Option[String], assignedExtractors: List[String]): Unit = {
+    if (name.isEmpty) {
+      BadRequest("Label Name cannot be empty")
     }
   }
 }

app/services/mongodb/MongoDBExtractorService.scala

@@ -222,21 +222,12 @@ class MongoDBExtractorService extends ExtractorService {
   }
 
   def createExtractorsLabel(name: String, category: Option[String], assignedExtractors: List[String]): Option[ExtractorsLabel] = {
-    val id = UUID.generate()
-    val label = ExtractorsLabel(id, name, category, assignedExtractors)
-    ExtractorsLabelDAO.save(label)
-    Some(label)
+    updateExtractorsLabel(ExtractorsLabel(UUID.generate, name, category, assignedExtractors))
   }
 
   def updateExtractorsLabel(updated: ExtractorsLabel): Option[ExtractorsLabel] = {
-    val query = MongoDBObject("id" -> updated.id)
-    ExtractorsLabelDAO.findOne(query) match {
-      case Some(old) => {
-        ExtractorsLabelDAO.update(query, updated, false, false, WriteConcern.Safe)
-        Some(updated)
-      }
-      case None => None
-    }
+    ExtractorsLabelDAO.save(updated, WriteConcern.Safe)
+    Some(updated)
   }
 }
 

public/javascripts/extractors/extractors.js

@@ -108,3 +108,37 @@ function changeMaturity(extractorName, newMaturity) {
 
     return false;
 }
+
+
+// Save current modal info based on selection
+function saveExtractorsLabel(label) {
+    let request;
+    if (label.id) {    // Update existing label
+        console.log('Saving label updates:', label);
+        request = jsRoutes.api.Extractions.updateExtractorsLabel(label.id).ajax({
+            data: JSON.stringify(label),
+            type: 'PUT',
+            contentType: 'application/json',
+            dataType: 'json'
+        });
+    } else {    // Create new label
+        console.log("Creating new label:", label);
+        request = jsRoutes.api.Extractions.createExtractorsLabel().ajax({
+            data: JSON.stringify(label),
+            type: 'POST',
+            contentType: 'application/json',
+            dataType: 'json'
+        });
+    }
+
+    request.done(function (response, textStatus, jqXHR){
+        setModalValues("", "", "", []);
+        notify("Label has been updated", "success");
+    });
+
+    request.fail(function (jqXHR, textStatus, errorThrown){
+        console.error("The following error occured: " + textStatus, errorThrown);
+    });
+
+    return request;
+}