Config reorganization

General refactor

Step.Database/Controllers/UsersController.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Data.Entity.Migrations;
+using Step.Model.DatabaseModels;
+using Step.Model.DTOModels;
+using System;
 using System.Globalization;
 using System.Linq;
 using System.Web.Helpers;
-using Step.Model.DatabaseModels;
-using Step.Model.DTOModels;
 using static Step.Config.ServerConfig;
 
 namespace Step.Database.Controllers
@@ -48,6 +47,7 @@ namespace Step.Database.Controllers
                 Language = language
             };
         }
+
         public static UserModel CreateUserModel(string username, string password, string firstName, string lastName, CultureInfo language)
         {
             return CreateUserModel(0, username, password, firstName, lastName, language);
@@ -59,12 +59,13 @@ namespace Step.Database.Controllers
             UserModel userDatabaseModel = dbCtx.Users.Where(u => u.UserId == userId).FirstOrDefault();
             DTORoleModel roleModel = null;
 
+            // Find user role through machineUser table
             using (MachinesUsersController machinesUsersControler = new MachinesUsersController())
             {
                 roleModel = machinesUsersControler.GetUserRole(MachineConfig.MachineId, userId);
             }
 
-            return new DTOUserModel()
+            return new DTOUserModel() // Return DTOUserModel
             {
                 Id = userDatabaseModel.UserId,
                 Username = userDatabaseModel.Username,
@@ -106,9 +107,11 @@ namespace Step.Database.Controllers
 
         public void CreateCmsDefaultUserIfNotExists(int machineId)
         {
+            // Find if there is a cms standard user
             UserModel user = FindByUsername("cms");
             if (user == null)
             {
+                // If not exist add new user
                 user = dbCtx.Users.Add(
                     CreateUserModel("cms", "cms", "cms", "cms", new CultureInfo("en"))
                 );
@@ -116,7 +119,7 @@ namespace Step.Database.Controllers
                 // Commit changes
                 dbCtx.SaveChanges();
             }
-
+            // Add user to local machine users if not exists
             using (MachinesUsersController machinesUsersController = new MachinesUsersController())
             {
                 MachineUserModel machineUser = machinesUsersController.FindByUserId(machineId, user.UserId);
@@ -130,11 +133,11 @@ namespace Step.Database.Controllers
         {
             UserModel user = FindById(userId);
 
-            if(user != null)
+            if (user != null)
             {
                 user.Language = newLanguage;
                 dbCtx.SaveChanges();
             }
         }
     }
-}
+}