FIx query and returned data

First shank option management

Step.Database/Controllers/NcToolManagerController.cs

@@ -23,19 +23,25 @@ namespace Step.Database.Controllers
             dbCtx.Dispose();
         }
 
-        public List<NcFamilyModel> GetFamilies()
+        public List<NcFamilyModel> FindFamilies()
         {
-            List<NcFamilyModel> families = dbCtx.Families.ToList();
-
-            List<NcToolModel> tools = dbCtx.Tools.ToList();
-            //foreach (NcFamilyModel family in families)
-            //{
-            //    family.Tools = tools.Where(x => x.FamilyId == family.FamilyId).ToList();
-            //}
+            List<NcFamilyModel> families = dbCtx
+                .Families
+                .Include("Tools")
+                .ToList();
 
             return families;
         }
 
+        public List<DTONcFamilyModel> GetFamilies()
+        {
+            List<NcFamilyModel> dbFamilies = FindFamilies();
+
+            return dbFamilies
+                .Select(x => (DTONcFamilyModel)x)
+                .ToList();
+        }
+
         public NcToolModel FindTool(int toolId)
         {
             return dbCtx.Tools
@@ -58,7 +64,7 @@ namespace Step.Database.Controllers
                 .FirstOrDefault();
         }
 
-        public List<NcToolModel> GetToolsWithDependencies()
+        public List<NcToolModel> FindToolsWithDependencies()
         {
             List<NcToolModel> tools = dbCtx
                 .Tools
@@ -78,9 +84,21 @@ namespace Step.Database.Controllers
             return tools;
         }
 
+        public List<DTONcToolModel> GetTools()
+        {
+            List<NcToolModel> dbTools = FindToolsWithDependencies();
+
+            return dbTools
+                .Select(x => (DTONcToolModel)x)
+                .ToList();
+        }
+
         public List<NcShankModel> FindShanks()
         {
-            List<NcShankModel> shanks = dbCtx.Shanks.Include("MagazinePosition").ToList();
+            List<NcShankModel> shanks = dbCtx
+                .Shanks
+                .Include("MagazinePosition")
+                .ToList();
 
             return shanks;
         }
@@ -94,26 +112,32 @@ namespace Step.Database.Controllers
                 .ToList();
 
             // Populate db shanks
-            List<DTONcShankModel> dtoShanks = new List<DTONcShankModel>();
-            foreach (var shank in dbShanks)
-            {
-                //dbCtx.Shanks.Attach(shank);
-                DTONcShankModel dtoShank = (DTONcShankModel)shank;
+            List<DTONcShankModel> dtoShanks = dbShanks
+                .Select(x => (DTONcShankModel)x)
+                .ToList();
+            //    new List<DTONcShankModel>();
+            //foreach (var shank in dbShanks)
+            //{
+            //    //dbCtx.Shanks.Attach(shank);
+            //    DTONcShankModel dtoShank = (DTONcShankModel)shank;
 
-                dtoShanks.Add(dtoShank);
-            }
+            //    dtoShanks.Add(dtoShank);
+            //}
 
             return dtoShanks;
         }
 
-        public List<NcMagazinePositionModel> GetPositions()
+        public List<NcMagazinePositionModel> FindPositions()
         {
-            List<NcMagazinePositionModel> positions = dbCtx.MagazinePositions.ToList();
+            List<NcMagazinePositionModel> positions = dbCtx
+                .MagazinePositions
+                .Include("Shank")
+                .ToList();
 
             return positions;
         }
 
-        public List<NcMagazinePositionModel> GetMagazinePositions(byte magId)
+        public List<NcMagazinePositionModel> FindMagazinePositions(byte magId)
         {
             return dbCtx
                 .MagazinePositions
@@ -121,7 +145,7 @@ namespace Step.Database.Controllers
                 .ToList();
         }
 
-        public NcMagazinePositionModel GetMagazinePosition(byte magId, byte posId)
+        public NcMagazinePositionModel FindMagazinePosition(byte magId, byte posId)
         {
             NcMagazinePositionModel positions = dbCtx
                 .MagazinePositions
@@ -197,12 +221,13 @@ namespace Step.Database.Controllers
 
         public NcFamilyModel AddFamily(DTONcFamilyModel family)
         {
-            NcFamilyModel familyModel = (NcFamilyModel)family;
-            dbCtx.Families.Add(familyModel);
+            NcFamilyModel dbFamily = (NcFamilyModel)family;
+            dbCtx.Families.Add(dbFamily);
 
             dbCtx.SaveChanges();
+            dbCtx.Families.Attach(dbFamily);
 
-            return familyModel;
+            return dbFamily;
         }
 
         public NcShankModel AddShank(DTONcShankModel shank)
@@ -212,6 +237,7 @@ namespace Step.Database.Controllers
 
             dbCtx.SaveChanges();
 
+            dbCtx.Shanks.Attach(dbShank);
             return dbShank;
         }
 
@@ -257,7 +283,7 @@ namespace Step.Database.Controllers
         }
 
 
-        public DTONcShankModel LoadShankInMagazine(byte magazineId, byte positionId, NcShankModel shank)
+        public NcMagazinePositionModel LoadShankInMagazine(byte magazineId, byte positionId, NcShankModel shank)
         {
             dbCtx.Shanks.Attach(shank);
 
@@ -266,7 +292,7 @@ namespace Step.Database.Controllers
 
             dbCtx.SaveChanges();
 
-            return (DTONcShankModel)shank;
+            return FindMagazinePosition(magazineId, positionId);
         }
 
         public DTONcShankModel UnloadShankInMagazine(byte magazineId, byte positionId, NcShankModel shank)