WIP start&stop edit magazine

Step.Database/Controllers/NcToolManagerController.cs

@@ -23,9 +23,9 @@ namespace Step.Database.Controllers
             dbCtx.Dispose();
         }
 
-        public List<NcFamilyModel> FindFamilies()
+        public List<DbNcFamilyModel> FindFamilies()
         {
-            List<NcFamilyModel> families = dbCtx
+            List<DbNcFamilyModel> families = dbCtx
                 .Families
                 .Include("Tools")
                 .ToList();
@@ -35,21 +35,21 @@ namespace Step.Database.Controllers
 
         public List<DTONcFamilyModel> GetFamilies()
         {
-            List<NcFamilyModel> dbFamilies = FindFamilies();
+            List<DbNcFamilyModel> dbFamilies = FindFamilies();
 
             return dbFamilies
                 .Select(x => (DTONcFamilyModel)x)
                 .ToList();
         }
 
-        public NcToolModel FindTool(int toolId)
+        public DbNcToolModel FindTool(int toolId)
         {
             return dbCtx.Tools
                 .Where(x => x.ToolId == toolId)
                 .FirstOrDefault();
         }
 
-        public NcShankModel FindShank(int shankId)
+        public DbNcShankModel FindShank(int shankId)
         {
             return dbCtx.Shanks
                 .Include("Tools")
@@ -57,7 +57,7 @@ namespace Step.Database.Controllers
                 .FirstOrDefault();
         }
 
-        public NcFamilyModel FindFamily(int familyId)
+        public DbNcFamilyModel FindFamily(int familyId)
         {
             return dbCtx
                 .Families
@@ -65,9 +65,9 @@ namespace Step.Database.Controllers
                 .FirstOrDefault();
         }
 
-        public List<NcToolModel> FindToolsWithDependencies()
+        public List<DbNcToolModel> FindToolsWithDependencies()
         {
-            List<NcToolModel> tools = dbCtx
+            List<DbNcToolModel> tools = dbCtx
                 .Tools
                 .Include("Family")
                 .Include("Shank")
@@ -76,9 +76,9 @@ namespace Step.Database.Controllers
             return tools;
         }
 
-        public List<NcToolModel> FindTools()
+        public List<DbNcToolModel> FindTools()
         {
-            List<NcToolModel> tools = dbCtx
+            List<DbNcToolModel> tools = dbCtx
                 .Tools
                 .ToList();
 
@@ -87,16 +87,16 @@ namespace Step.Database.Controllers
 
         public List<DTONcToolModel> GetTools()
         {
-            List<NcToolModel> dbTools = FindToolsWithDependencies();
+            List<DbNcToolModel> dbTools = FindToolsWithDependencies();
 
             return dbTools
                 .Select(x => (DTONcToolModel)x)
                 .ToList();
         }
 
-        public List<NcShankModel> FindShanks()
+        public List<DbNcShankModel> FindShanks()
         {
-            List<NcShankModel> shanks = dbCtx
+            List<DbNcShankModel> shanks = dbCtx
                 .Shanks
                 .Include("MagazinePosition")
                 .ToList();
@@ -107,7 +107,7 @@ namespace Step.Database.Controllers
         public List<DTONcShankModel> GetShanks()
         {
             // Get shank from database
-            List<NcShankModel> dbShanks = dbCtx
+            List<DbNcShankModel> dbShanks = dbCtx
                 .Shanks
                 .Include("Tools")
                 .ToList();
@@ -131,7 +131,7 @@ namespace Step.Database.Controllers
         public DTONcShankModel GetShank(int shankId)
         {
             // Get shank from database
-            NcShankModel dbShank = dbCtx
+            DbNcShankModel dbShank = dbCtx
                 .Shanks
                 .Where(x => x.ShankId == shankId)
                 .Include("Tools")
@@ -143,16 +143,16 @@ namespace Step.Database.Controllers
             return dtoShanks;
         }
 
-        public List<NcMagazinePositionModel> FindPositions()
+        public List<DbNcMagazinePositionModel> FindPositions()
         {
-            List<NcMagazinePositionModel> positions = dbCtx
+            List<DbNcMagazinePositionModel> positions = dbCtx
                 .MagazinePositions
                 .ToList();
 
             return positions;
         }
 
-        public List<NcMagazinePositionModel> FindMagazinePositions(byte magId)
+        public List<DbNcMagazinePositionModel> FindMagazinePositions(byte magId)
         {
             return dbCtx
                 .MagazinePositions
@@ -166,9 +166,9 @@ namespace Step.Database.Controllers
             // Get only magazine positions that match with magazineId
             List<DTONcMagazinePositionModel> magPos = FindMagazinePositions(magId).Select(x => (DTONcMagazinePositionModel)x).ToList();
             // Get&filter shanks by magazineId in order to get only mounted shanks in the current magazineId
-            List<NcShankModel> shanks = dbCtx.Shanks.Where(x => x.MagazineId == magId).ToList();
+            List<DbNcShankModel> shanks = dbCtx.Shanks.Where(x => x.MagazineId == magId).ToList();
             
-            foreach(NcShankModel shank in shanks)
+            foreach(DbNcShankModel shank in shanks)
             {
                 // Populate magazinePosition shank Id
                 magPos
@@ -180,9 +180,9 @@ namespace Step.Database.Controllers
             return magPos;
         }
 
-        public NcMagazinePositionModel FindMagazinePosition(byte magId, byte posId)
+        public DbNcMagazinePositionModel FindMagazinePosition(byte magId, byte posId)
         {
-            NcMagazinePositionModel positions = dbCtx
+            DbNcMagazinePositionModel positions = dbCtx
                 .MagazinePositions
                 .Where(x => x.MagazineId == magId && x.PositionId == posId)
                 .FirstOrDefault();
@@ -208,9 +208,9 @@ namespace Step.Database.Controllers
             return dtoShanks;
         }
 
-        public NcToolModel AddTool(DTONewNcToolModel dtoTool)
+        public DbNcToolModel AddTool(DTONewNcToolModel dtoTool)
         {
-            NcToolModel tool = (NcToolModel)dtoTool;
+            DbNcToolModel tool = (DbNcToolModel)dtoTool;
             dbCtx.Tools.Add(tool);
 
             dbCtx.SaveChanges();
@@ -221,12 +221,11 @@ namespace Step.Database.Controllers
             return tool;
         }
 
-        public NcToolModel UpdateTool(int toolId, DTONewNcToolModel dtoTool)
+        public DbNcToolModel UpdateTool(int toolId, DTONewNcToolModel dtoTool)
         {
-            NcToolModel tool = FindTool(toolId);
+            DbNcToolModel tool = FindTool(toolId);
             // Update db model
             tool.FamilyId = dtoTool.FamilyId;
-            tool.Type = dtoTool.Type;
             tool.OffsetLength = dtoTool.OffsetLength;
             tool.ResidualLife = dtoTool.ResidualLife;
             tool.ResidualRevive = dtoTool.ResidualRevive;
@@ -241,20 +240,20 @@ namespace Step.Database.Controllers
 
         public void DeleleTool(int toolId)
         {
-            NcToolModel tool = FindTool(toolId);
+            DbNcToolModel tool = FindTool(toolId);
             DeleteTool(tool);
         }
 
-        public void DeleteTool(NcToolModel tool)
+        public void DeleteTool(DbNcToolModel tool)
         {
             dbCtx.Tools.Remove(tool);
 
             dbCtx.SaveChanges();
         }
 
-        public NcFamilyModel AddFamily(DTONewNcFamilyModel family)
+        public DbNcFamilyModel AddFamily(DTONewNcFamilyModel family)
         {
-            NcFamilyModel dbFamily = (NcFamilyModel)family;
+            DbNcFamilyModel dbFamily = (DbNcFamilyModel)family;
             dbCtx.Families.Add(dbFamily);
 
             dbCtx.SaveChanges();
@@ -263,10 +262,10 @@ namespace Step.Database.Controllers
             return dbFamily;
         }
 
-        public NcFamilyModel UpdateFamily(int familyId, DTONewNcFamilyModel family)
+        public DbNcFamilyModel UpdateFamily(int familyId, DTONewNcFamilyModel family)
         {
-            NcFamilyModel dbFamily = FindFamily(familyId);
-            dbFamily = (NcFamilyModel)family;
+            DbNcFamilyModel dbFamily = FindFamily(familyId);
+            dbFamily = (DbNcFamilyModel)family;
 
             dbCtx.SaveChanges();
             dbCtx.Families.Attach(dbFamily);
@@ -274,7 +273,7 @@ namespace Step.Database.Controllers
             return dbFamily;
         }
         
-        public void DeleteFamily(NcFamilyModel family)
+        public void DeleteFamily(DbNcFamilyModel family)
         {
             dbCtx.Families.Attach(family);
             dbCtx.Families.Remove(family);
@@ -282,9 +281,9 @@ namespace Step.Database.Controllers
             dbCtx.SaveChanges();
         }
         
-        public NcShankModel AddShank(DTONewNcShankModel shank)
+        public DbNcShankModel AddShank(DTONewNcShankModel shank)
         {
-            NcShankModel dbShank = (NcShankModel)shank;
+            DbNcShankModel dbShank = (DbNcShankModel)shank;
             dbCtx.Shanks.Add(dbShank);
 
             dbCtx.SaveChanges();
@@ -294,14 +293,14 @@ namespace Step.Database.Controllers
             return dbShank;
         }
 
-        public NcShankModel UpdateShank(int shankId, DTONewNcShankModel dtoShank)
+        public DbNcShankModel UpdateShank(int shankId, DTONewNcShankModel dtoShank)
         {
-            NcShankModel ncShank = FindShank(shankId);
+            DbNcShankModel ncShank = FindShank(shankId);
 
             return UpdateShank(ncShank, dtoShank);
         }
 
-        public NcShankModel UpdateShank(NcShankModel dbShank, DTONewNcShankModel dtoShank)
+        public DbNcShankModel UpdateShank(DbNcShankModel dbShank, DTONewNcShankModel dtoShank)
         {
             dbShank.MagazinePositionType = dtoShank.MagazinePositionType;
 
@@ -314,11 +313,11 @@ namespace Step.Database.Controllers
         
         public void DeleteShank(int shankId)
         {
-            NcShankModel shank = FindShank(shankId);
+            DbNcShankModel shank = FindShank(shankId);
             DeleteShank(shank);
         }
         
-        public void DeleteShank(NcShankModel shank)
+        public void DeleteShank(DbNcShankModel shank)
         {
             dbCtx.Shanks.Attach(shank);
             dbCtx.Shanks.Remove(shank);
@@ -326,7 +325,7 @@ namespace Step.Database.Controllers
             dbCtx.SaveChanges();
         }
 
-        public NcMagazinePositionModel UpdatePosition(NcMagazinePositionModel dbPos, DTONcMagazinePositionModel dtoPos)
+        public DbNcMagazinePositionModel UpdatePosition(DbNcMagazinePositionModel dbPos, DTONcMagazinePositionModel dtoPos)
         {
             dbPos.Type = dtoPos.Type;
             dbPos.Disabled = dtoPos.Disabled;
@@ -336,10 +335,10 @@ namespace Step.Database.Controllers
             return dbPos;
         }
 
-        public NcMagazinePositionModel LoadShankInMagazine(byte magazineId, byte positionId, NcShankModel shank)
+        public DbNcMagazinePositionModel LoadShankInMagazine(byte magazineId, byte positionId, DbNcShankModel shank)
         {
             dbCtx.Shanks.Attach(shank);
-
+            // Set ids with new positions
             shank.MagazineId = magazineId;
             shank.PositionId = positionId;
 
@@ -348,10 +347,10 @@ namespace Step.Database.Controllers
             return FindMagazinePosition(magazineId, positionId);
         }
 
-        public DTONcShankModel UnloadShankInMagazine(byte magazineId, byte positionId, NcShankModel shank)
+        public DTONcShankModel UnloadShankInMagazine(byte magazineId, byte positionId, DbNcShankModel shank)
         {
             dbCtx.Shanks.Attach(shank);
-
+            // set id to null
             shank.MagazineId = null;
             shank.PositionId = null;
 
@@ -360,10 +359,10 @@ namespace Step.Database.Controllers
             return (DTONcShankModel)shank;
         }
 
-        public DTONcShankModel LoadToolIntoShank(NcToolModel tool, int shankId)
+        public DTONcShankModel LoadToolIntoShank(DbNcToolModel tool, int shankId)
         {
             dbCtx.Tools.Attach(tool);
-
+            // Set tool shankId
             tool.ShankId = shankId;
 
             dbCtx.SaveChanges();
@@ -371,11 +370,11 @@ namespace Step.Database.Controllers
             return GetShank(shankId);
         }
 
-        public DTONcShankModel UnloadToolFromShank(NcToolModel tool)
+        public DTONcShankModel UnloadToolFromShank(DbNcToolModel tool)
         {
             dbCtx.Tools.Attach(tool);
             int? shankId = tool.ShankId;
-
+            // Set to null shankId
             tool.ShankId = null;
 
             dbCtx.SaveChanges();