From 54cdb69cb05f49f264e913b0c7ff56e3f47a19e1 Mon Sep 17 00:00:00 2001
From: Lucio Maranta <lucio.maranta@cms.it>
Date: Wed, 9 May 2018 08:45:47 +0200
Subject: [PATCH] Fix families API

---
 .../Controllers/WebApi/ToolTableController.cs | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/Step/Controllers/WebApi/ToolTableController.cs b/Step/Controllers/WebApi/ToolTableController.cs
index a3ac3788..2e956088 100644
--- a/Step/Controllers/WebApi/ToolTableController.cs
+++ b/Step/Controllers/WebApi/ToolTableController.cs
@@ -147,12 +147,39 @@ namespace Step.Controllers.WebApi
         }
 
         [Route("family"), HttpPost]
-        public IHttpActionResult AddFamily([FromBody] dynamic body)
+        public IHttpActionResult AddFamily([FromBody] DTOFamilyModel family)
         {
+            if (String.IsNullOrEmpty(family.Name))
+                return BadRequest();
+
             using (NcHandler ncHandler = new NcHandler())
             {
                 ncHandler.Connect();
-                CmsError libraryError = ncHandler.AddFamily(body.name.ToString(), out FamilyModel family);
+                CmsError libraryError = ncHandler.AddFamily(family.Name, out FamilyModel newFamily);
+                if (libraryError.IsError())
+                    if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
+                        return BadRequest(libraryError.message);
+
+                return Ok(newFamily);
+            }
+        }
+
+        public struct DTOFamilyModel
+        {
+            public string Name;
+        }
+
+        [Route("family/{oldName}"), HttpPut]
+        public IHttpActionResult PutFamily(string oldName, [FromBody]DTOFamilyModel family)
+        {
+            if (String.IsNullOrEmpty(family.Name))
+                return BadRequest();
+
+            using (NcHandler ncHandler = new NcHandler())
+            {
+                ncHandler.Connect();
+
+                CmsError libraryError = ncHandler.UpdateFamilyName(oldName, family.Name);
                 if (libraryError.IsError())
                     if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
                         return BadRequest(libraryError.message);
@@ -161,22 +188,6 @@ namespace Step.Controllers.WebApi
             }
         }
 
-        [Route("family/{oldName}"), HttpPut]
-        public IHttpActionResult PutFamily(string oldName, [FromBody]dynamic body)
-        {
-            using (NcHandler ncHandler = new NcHandler())
-            {
-                ncHandler.Connect();
-
-                CmsError libraryError = ncHandler.UpdateFamilyName(oldName, body.name.ToString());
-                if (libraryError.IsError())
-                    if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
-                        return BadRequest(libraryError.message);
-
-                return Ok();
-            }
-        }
-
         [Route("family/{name}"), HttpDelete]
         public IHttpActionResult DeleteFamily(string name)
         {