RestaurantRoles Set up

ProRestaurant/Controllers/Accounts/AuthenticationController.cs

@@ -25,8 +25,8 @@ namespace ProRestaurant.Controllers.Accounts
         public IActionResult Authenticate([FromBody] AuthenticationContiner User)
         {
             var user = repo.Login(User);
-            if (user.Result != "Access Granted")
-                return BadRequest(new { message = user.Result });
+            //if (user.Result != "Access Granted")
+            //    return BadRequest(new { message = user.Result });
 
             return Ok(user);
         }        

ProRestaurant/Controllers/Restaurants/RestaurantRolesController.cs

@@ -0,0 +1,70 @@
+using Microsoft.AspNetCore.Mvc;
+using ProRestaurant.Models.Restaurants;
+using ProRestaurant.Repository.Restaurants;
+using System.Transactions;
+
+namespace ProRestaurant.Controllers.Restaurants
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class RestaurantRolesController : ControllerBase
+    {
+        private readonly IRestaurantRoleRepository repo;
+
+        public RestaurantRolesController(IRestaurantRoleRepository _repo)
+        {
+            repo = _repo;
+        }
+
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return new OkObjectResult(repo.GetRole(id));
+        }
+
+        [HttpGet("GetRoles/{id}")]
+        public IActionResult GetRoles(int id)
+        {
+            return new OkObjectResult(repo.GetRoles(id));
+        }
+
+        [HttpGet("GetPremission/{id}")]
+        public IActionResult GetPremission(int id)
+        {
+            return new OkObjectResult(repo.GetPremission(id));
+        }
+
+        [HttpPost]
+        public IActionResult Post([FromBody] RestaurantRole role)
+        {
+            using (var scope = new TransactionScope())
+            {
+                repo.Insert(role);
+                scope.Complete();
+                return CreatedAtAction(nameof(Get), new { id = role.Id }, role);
+            }
+        }
+        
+        [HttpPut]
+        public IActionResult Put([FromBody] RestaurantRole role)
+        {
+            if (role != null)
+            {
+                using (var scope = new TransactionScope())
+                {
+                    repo.Update(role);
+                    scope.Complete();
+                    return new OkResult();
+                }
+            }
+            return new NoContentResult();
+        }
+
+        [HttpDelete("{id}")]
+        public IActionResult Delete(int id)
+        {
+            repo.Delete(repo.GetRole(id));
+            return new OkResult();
+        }
+    }
+}

ProRestaurant/DBContexts/DBContext.cs

@@ -32,6 +32,10 @@ namespace ProRestaurant.DBContexts
         public DbSet<MenuOptionItem> MenuOptionItems { get; set; }
         public DbSet<RestaurantUser> RestaurantUsers { get; set; }
         public DbSet<RestaurantCategory> RestaurantCategories { get; set; }
+
+        public DbSet<RestaurantRole> RestaurantRoles { get; set; }
+        public DbSet<RestaurantRolePremission> RestaurantRolePremissions { get; set; } 
+        public DbSet<RestaurantUserRestaurantRole> RestaurantUserRestaurantRoles { get; set; }
         #endregion
 
         #region Misc
@@ -91,6 +95,9 @@ namespace ProRestaurant.DBContexts
             modelBuilder.Entity<MenuOption>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<MenuOptionItem>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<RestaurantUser>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);            
+            modelBuilder.Entity<RestaurantRole>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
+            modelBuilder.Entity<RestaurantRolePremission>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
+            modelBuilder.Entity<RestaurantUserRestaurantRole>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
         }
     }
 }

ProRestaurant/Migrations/20200630140752_Recreate Database.Designer.cs

@@ -1,473 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ProRestaurant.DBContexts;
-
-namespace ProRestaurant.Migrations
-{
-    [DbContext(typeof(DBContext))]
-    [Migration("20200630140752_Recreate Database")]
-    partial class RecreateDatabase
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Photo");
-
-                    b.Property<string>("RegistrationNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("DriverDetails");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Cellphone");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<string>("FirstName");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Password");
-
-                    b.Property<string>("Surname");
-
-                    b.Property<int>("SystemRole");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("ComplexName");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsComplex");
-
-                    b.Property<bool>("IsDefault");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Province");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.Property<string>("UnitNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserAddresses");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("CategoryStore");
-
-                    b.Property<string>("ImageStore");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Locations");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsBasePrice");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<int>("MenuItemId");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("OptionLimit");
-
-                    b.Property<int>("OptionType");
-
-                    b.Property<int>("Rank");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CategoryId");
-
-                    b.ToTable("MenuOptions");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<int?>("MenuOptionId");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("Rank");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("MenuOptionId");
-
-                    b.ToTable("MenuOptionItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Categories");
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<decimal>("DeliveryFee");
-
-                    b.Property<decimal>("DeliveryRadius");
-
-                    b.Property<string>("DeliveryTime");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<string>("Logo");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<string>("MethodsOfPayment");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("ShopNumber");
-
-                    b.Property<string>("ShoppingCentre");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Restaurants");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("RestaurantCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RestaurantUsers");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Closed");
-
-                    b.Property<DateTime>("ClosingTime");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<bool>("Opened24H");
-
-                    b.Property<DateTime>("OpeningTime");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("TradingHours");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithOne("DriverDetails")
-                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany("Addresses")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
-                        .WithMany("Options")
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
-                        .WithMany("Options")
-                        .HasForeignKey("MenuOptionId");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("Users")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("TradingHours")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

ProRestaurant/Migrations/20200630143357_MenuItem Override added.Designer.cs

@@ -1,475 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ProRestaurant.DBContexts;
-
-namespace ProRestaurant.Migrations
-{
-    [DbContext(typeof(DBContext))]
-    [Migration("20200630143357_MenuItem Override added")]
-    partial class MenuItemOverrideadded
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Photo");
-
-                    b.Property<string>("RegistrationNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("DriverDetails");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Cellphone");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<string>("FirstName");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Password");
-
-                    b.Property<string>("Surname");
-
-                    b.Property<int>("SystemRole");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("ComplexName");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsComplex");
-
-                    b.Property<bool>("IsDefault");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Province");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.Property<string>("UnitNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserAddresses");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("CategoryStore");
-
-                    b.Property<string>("ImageStore");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Locations");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<bool>("OverrideOptions");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsBasePrice");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<int>("MenuItemId");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("OptionLimit");
-
-                    b.Property<int>("OptionType");
-
-                    b.Property<int>("Rank");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CategoryId");
-
-                    b.ToTable("MenuOptions");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<int?>("MenuOptionId");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("Rank");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("MenuOptionId");
-
-                    b.ToTable("MenuOptionItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Categories");
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<decimal>("DeliveryFee");
-
-                    b.Property<decimal>("DeliveryRadius");
-
-                    b.Property<string>("DeliveryTime");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<string>("Logo");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<string>("MethodsOfPayment");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("ShopNumber");
-
-                    b.Property<string>("ShoppingCentre");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Restaurants");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("RestaurantCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RestaurantUsers");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Closed");
-
-                    b.Property<DateTime>("ClosingTime");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<bool>("Opened24H");
-
-                    b.Property<DateTime>("OpeningTime");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("TradingHours");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithOne("DriverDetails")
-                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany("Addresses")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
-                        .WithMany("Options")
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
-                        .WithMany("Options")
-                        .HasForeignKey("MenuOptionId");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("Users")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("TradingHours")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

ProRestaurant/Migrations/20200630143357_MenuItem Override added.cs

@@ -1,23 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class MenuItemOverrideadded : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "OverrideOptions",
-                table: "MenuItems",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "OverrideOptions",
-                table: "MenuItems");
-        }
-    }
-}

ProRestaurant/Migrations/20200703060514_Province Spelling fix.Designer.cs

@@ -1,475 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ProRestaurant.DBContexts;
-
-namespace ProRestaurant.Migrations
-{
-    [DbContext(typeof(DBContext))]
-    [Migration("20200703060514_Province Spelling fix")]
-    partial class ProvinceSpellingfix
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Photo");
-
-                    b.Property<string>("RegistrationNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("DriverDetails");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Cellphone");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<string>("FirstName");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Password");
-
-                    b.Property<string>("Surname");
-
-                    b.Property<int>("SystemRole");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("ComplexName");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsComplex");
-
-                    b.Property<bool>("IsDefault");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Province");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.Property<string>("UnitNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserAddresses");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("CategoryStore");
-
-                    b.Property<string>("ImageStore");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Locations");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<bool>("OverrideOptions");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsBasePrice");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<int>("MenuItemId");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("OptionLimit");
-
-                    b.Property<int>("OptionType");
-
-                    b.Property<int>("Rank");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CategoryId");
-
-                    b.ToTable("MenuOptions");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<int?>("MenuOptionId");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("Rank");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("MenuOptionId");
-
-                    b.ToTable("MenuOptionItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Categories");
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<decimal>("DeliveryFee");
-
-                    b.Property<decimal>("DeliveryRadius");
-
-                    b.Property<string>("DeliveryTime");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<string>("Logo");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<string>("MethodsOfPayment");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Province");
-
-                    b.Property<string>("ShopNumber");
-
-                    b.Property<string>("ShoppingCentre");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Restaurants");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("RestaurantCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RestaurantUsers");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Closed");
-
-                    b.Property<DateTime>("ClosingTime");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<bool>("Opened24H");
-
-                    b.Property<DateTime>("OpeningTime");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("TradingHours");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithOne("DriverDetails")
-                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany("Addresses")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
-                        .WithMany("Options")
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
-                        .WithMany("Options")
-                        .HasForeignKey("MenuOptionId");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("Users")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("TradingHours")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

ProRestaurant/Migrations/20200703123907_MenuOption FK nullable to Category.Designer.cs

@@ -1,474 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ProRestaurant.DBContexts;
-
-namespace ProRestaurant.Migrations
-{
-    [DbContext(typeof(DBContext))]
-    [Migration("20200703123907_MenuOption FK nullable to Category")]
-    partial class MenuOptionFKnullabletoCategory
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Photo");
-
-                    b.Property<string>("RegistrationNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("DriverDetails");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Cellphone");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<string>("FirstName");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Password");
-
-                    b.Property<string>("Surname");
-
-                    b.Property<int>("SystemRole");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("ComplexName");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsComplex");
-
-                    b.Property<bool>("IsDefault");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Province");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.Property<string>("UnitNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserAddresses");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("CategoryStore");
-
-                    b.Property<string>("ImageStore");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Locations");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<bool>("OverrideOptions");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int?>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsBasePrice");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<int>("MenuItemId");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("OptionLimit");
-
-                    b.Property<int>("OptionType");
-
-                    b.Property<int>("Rank");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CategoryId");
-
-                    b.ToTable("MenuOptions");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<int?>("MenuOptionId");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("Rank");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("MenuOptionId");
-
-                    b.ToTable("MenuOptionItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Categories");
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<decimal>("DeliveryFee");
-
-                    b.Property<decimal>("DeliveryRadius");
-
-                    b.Property<string>("DeliveryTime");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<string>("Logo");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<string>("MethodsOfPayment");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Province");
-
-                    b.Property<string>("ShopNumber");
-
-                    b.Property<string>("ShoppingCentre");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Restaurants");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("RestaurantCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RestaurantUsers");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Closed");
-
-                    b.Property<DateTime>("ClosingTime");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<bool>("Opened24H");
-
-                    b.Property<DateTime>("OpeningTime");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("TradingHours");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithOne("DriverDetails")
-                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany("Addresses")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
-                        .WithMany("Options")
-                        .HasForeignKey("CategoryId");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
-                        .WithMany("Options")
-                        .HasForeignKey("MenuOptionId");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("Users")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("TradingHours")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

ProRestaurant/Migrations/20200703123907_MenuOption FK nullable to Category.cs

@@ -1,50 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class MenuOptionFKnullabletoCategory : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_MenuOptions_MenuCategories_CategoryId",
-                table: "MenuOptions");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "CategoryId",
-                table: "MenuOptions",
-                nullable: true,
-                oldClrType: typeof(int));
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_MenuOptions_MenuCategories_CategoryId",
-                table: "MenuOptions",
-                column: "CategoryId",
-                principalTable: "MenuCategories",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_MenuOptions_MenuCategories_CategoryId",
-                table: "MenuOptions");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "CategoryId",
-                table: "MenuOptions",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldNullable: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_MenuOptions_MenuCategories_CategoryId",
-                table: "MenuOptions",
-                column: "CategoryId",
-                principalTable: "MenuCategories",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Cascade);
-        }
-    }
-}

ProRestaurant/Migrations/20200703140940_Menu Options Change.cs

@@ -1,118 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class MenuOptionsChange : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_MenuOptions_MenuCategories_CategoryId",
-                table: "MenuOptions");
-
-            migrationBuilder.DropIndex(
-                name: "IX_MenuOptions_CategoryId",
-                table: "MenuOptions");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "CategoryId",
-                table: "MenuOptions",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldNullable: true);
-
-            migrationBuilder.AddColumn<int>(
-                name: "MenuCategoryId",
-                table: "MenuOptions",
-                nullable: true);
-
-            migrationBuilder.AddColumn<int>(
-                name: "RestaurantId",
-                table: "MenuOptions",
-                nullable: false,
-                defaultValue: 0);
-
-            migrationBuilder.AddColumn<bool>(
-                name: "OutOfStock",
-                table: "MenuItems",
-                nullable: false,
-                defaultValue: false);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MenuOptions_MenuCategoryId",
-                table: "MenuOptions",
-                column: "MenuCategoryId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MenuOptions_RestaurantId",
-                table: "MenuOptions",
-                column: "RestaurantId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_MenuOptions_MenuCategories_MenuCategoryId",
-                table: "MenuOptions",
-                column: "MenuCategoryId",
-                principalTable: "MenuCategories",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_MenuOptions_Restaurants_RestaurantId",
-                table: "MenuOptions",
-                column: "RestaurantId",
-                principalTable: "Restaurants",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Cascade);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_MenuOptions_MenuCategories_MenuCategoryId",
-                table: "MenuOptions");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_MenuOptions_Restaurants_RestaurantId",
-                table: "MenuOptions");
-
-            migrationBuilder.DropIndex(
-                name: "IX_MenuOptions_MenuCategoryId",
-                table: "MenuOptions");
-
-            migrationBuilder.DropIndex(
-                name: "IX_MenuOptions_RestaurantId",
-                table: "MenuOptions");
-
-            migrationBuilder.DropColumn(
-                name: "MenuCategoryId",
-                table: "MenuOptions");
-
-            migrationBuilder.DropColumn(
-                name: "RestaurantId",
-                table: "MenuOptions");
-
-            migrationBuilder.DropColumn(
-                name: "OutOfStock",
-                table: "MenuItems");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "CategoryId",
-                table: "MenuOptions",
-                nullable: true,
-                oldClrType: typeof(int));
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MenuOptions_CategoryId",
-                table: "MenuOptions",
-                column: "CategoryId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_MenuOptions_MenuCategories_CategoryId",
-                table: "MenuOptions",
-                column: "CategoryId",
-                principalTable: "MenuCategories",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-        }
-    }
-}

ProRestaurant/Migrations/20200706125622_User add password flag.cs

@@ -1,23 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class Useraddpasswordflag : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "ChangePassword",
-                table: "Users",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ChangePassword",
-                table: "Users");
-        }
-    }
-}

ProRestaurant/Migrations/20200703140940_Menu Options Change.Designer.cs → ProRestaurant/Migrations/20200727164838_NewMigration.Designer.cs

@@ -10,8 +10,8 @@ using ProRestaurant.DBContexts;
 namespace ProRestaurant.Migrations
 {
     [DbContext(typeof(DBContext))]
-    [Migration("20200703140940_Menu Options Change")]
-    partial class MenuOptionsChange
+    [Migration("20200727164838_NewMigration")]
+    partial class NewMigration
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -57,6 +57,8 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("Cellphone");
 
+                    b.Property<bool>("ChangePassword");
+
                     b.Property<DateTime>("Created");
 
                     b.Property<string>("EmailAddress");
@@ -350,6 +352,66 @@ namespace ProRestaurant.Migrations
                     b.ToTable("RestaurantCategories");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.Property<string>("RoleName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("RestaurantRoles");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRolePremission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Create");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("Delete");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<bool>("Navigate");
+
+                    b.Property<bool>("Read");
+
+                    b.Property<int>("RoleId");
+
+                    b.Property<string>("Target");
+
+                    b.Property<bool>("Write");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RestaurantRolePremissions");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.Property<int>("Id")
@@ -377,6 +439,29 @@ namespace ProRestaurant.Migrations
                     b.ToTable("RestaurantUsers");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUserRestaurantRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int?>("RestaurantRoleId");
+
+                    b.Property<int?>("RestaurantUserId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RestaurantUserRestaurantRoles");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
                 {
                     b.Property<int>("Id")
@@ -461,6 +546,22 @@ namespace ProRestaurant.Migrations
                         .HasForeignKey("MenuOptionId");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRole", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRolePremission", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.RestaurantRole", "Role")
+                        .WithMany("Permissions")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")

ProRestaurant/Migrations/20200630140752_Recreate Database.cs → ProRestaurant/Migrations/20200727164838_NewMigration.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace ProRestaurant.Migrations
 {
-    public partial class RecreateDatabase : Migration
+    public partial class NewMigration : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -60,7 +60,7 @@ namespace ProRestaurant.Migrations
                     StreetName = table.Column<string>(nullable: true),
                     Suburb = table.Column<string>(nullable: true),
                     City = table.Column<string>(nullable: true),
-                    Provice = table.Column<string>(nullable: true),
+                    Province = table.Column<string>(nullable: true),
                     Country = table.Column<string>(nullable: true),
                     PostalCode = table.Column<string>(nullable: true),
                     DeliveryTime = table.Column<string>(nullable: true),
@@ -71,6 +71,24 @@ namespace ProRestaurant.Migrations
                     table.PrimaryKey("PK_Restaurants", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "RestaurantUserRestaurantRoles",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Created = table.Column<DateTime>(nullable: false),
+                    Modified = table.Column<DateTime>(nullable: false),
+                    ModifiedBy = table.Column<string>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false),
+                    RestaurantUserId = table.Column<int>(nullable: true),
+                    RestaurantRoleId = table.Column<int>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RestaurantUserRestaurantRoles", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Users",
                 columns: table => new
@@ -86,7 +104,8 @@ namespace ProRestaurant.Migrations
                     FirstName = table.Column<string>(nullable: true),
                     Surname = table.Column<string>(nullable: true),
                     Cellphone = table.Column<string>(nullable: true),
-                    SystemRole = table.Column<int>(nullable: false)
+                    SystemRole = table.Column<int>(nullable: false),
+                    ChangePassword = table.Column<bool>(nullable: false)
                 },
                 constraints: table =>
                 {
@@ -132,7 +151,9 @@ namespace ProRestaurant.Migrations
                     Image = table.Column<string>(nullable: true),
                     Name = table.Column<string>(nullable: true),
                     Description = table.Column<string>(nullable: true),
-                    Price = table.Column<decimal>(nullable: false)
+                    Price = table.Column<decimal>(nullable: false),
+                    OverrideOptions = table.Column<bool>(nullable: false),
+                    OutOfStock = table.Column<bool>(nullable: false)
                 },
                 constraints: table =>
                 {
@@ -145,6 +166,30 @@ namespace ProRestaurant.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "RestaurantRoles",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Created = table.Column<DateTime>(nullable: false),
+                    Modified = table.Column<DateTime>(nullable: false),
+                    ModifiedBy = table.Column<string>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false),
+                    RestaurantId = table.Column<int>(nullable: false),
+                    RoleName = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RestaurantRoles", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_RestaurantRoles_Restaurants_RestaurantId",
+                        column: x => x.RestaurantId,
+                        principalTable: "Restaurants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
             migrationBuilder.CreateTable(
                 name: "TradingHours",
                 columns: table => new
@@ -275,22 +320,59 @@ namespace ProRestaurant.Migrations
                     Modified = table.Column<DateTime>(nullable: false),
                     ModifiedBy = table.Column<string>(nullable: true),
                     IsDeleted = table.Column<bool>(nullable: false),
+                    RestaurantId = table.Column<int>(nullable: false),
                     CategoryId = table.Column<int>(nullable: false),
                     Description = table.Column<string>(nullable: true),
                     OptionType = table.Column<int>(nullable: false),
                     OptionLimit = table.Column<int>(nullable: false),
                     IsBasePrice = table.Column<bool>(nullable: false),
                     Rank = table.Column<int>(nullable: false),
-                    MenuItemId = table.Column<int>(nullable: false)
+                    MenuItemId = table.Column<int>(nullable: false),
+                    MenuCategoryId = table.Column<int>(nullable: true)
                 },
                 constraints: table =>
                 {
                     table.PrimaryKey("PK_MenuOptions", x => x.Id);
                     table.ForeignKey(
-                        name: "FK_MenuOptions_MenuCategories_CategoryId",
-                        column: x => x.CategoryId,
+                        name: "FK_MenuOptions_MenuCategories_MenuCategoryId",
+                        column: x => x.MenuCategoryId,
                         principalTable: "MenuCategories",
                         principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_MenuOptions_Restaurants_RestaurantId",
+                        column: x => x.RestaurantId,
+                        principalTable: "Restaurants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "RestaurantRolePremissions",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Created = table.Column<DateTime>(nullable: false),
+                    Modified = table.Column<DateTime>(nullable: false),
+                    ModifiedBy = table.Column<string>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false),
+                    RoleId = table.Column<int>(nullable: false),
+                    Target = table.Column<string>(nullable: true),
+                    Navigate = table.Column<bool>(nullable: false),
+                    Create = table.Column<bool>(nullable: false),
+                    Read = table.Column<bool>(nullable: false),
+                    Write = table.Column<bool>(nullable: false),
+                    Delete = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RestaurantRolePremissions", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_RestaurantRolePremissions_RestaurantRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalTable: "RestaurantRoles",
+                        principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
                 });
 
@@ -342,9 +424,24 @@ namespace ProRestaurant.Migrations
                 column: "MenuOptionId");
 
             migrationBuilder.CreateIndex(
-                name: "IX_MenuOptions_CategoryId",
+                name: "IX_MenuOptions_MenuCategoryId",
                 table: "MenuOptions",
-                column: "CategoryId");
+                column: "MenuCategoryId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MenuOptions_RestaurantId",
+                table: "MenuOptions",
+                column: "RestaurantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RestaurantRolePremissions_RoleId",
+                table: "RestaurantRolePremissions",
+                column: "RoleId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RestaurantRoles_RestaurantId",
+                table: "RestaurantRoles",
+                column: "RestaurantId");
 
             migrationBuilder.CreateIndex(
                 name: "IX_RestaurantUsers_RestaurantId",
@@ -384,6 +481,12 @@ namespace ProRestaurant.Migrations
             migrationBuilder.DropTable(
                 name: "RestaurantCategories");
 
+            migrationBuilder.DropTable(
+                name: "RestaurantRolePremissions");
+
+            migrationBuilder.DropTable(
+                name: "RestaurantUserRestaurantRoles");
+
             migrationBuilder.DropTable(
                 name: "RestaurantUsers");
 
@@ -396,6 +499,9 @@ namespace ProRestaurant.Migrations
             migrationBuilder.DropTable(
                 name: "MenuOptions");
 
+            migrationBuilder.DropTable(
+                name: "RestaurantRoles");
+
             migrationBuilder.DropTable(
                 name: "Users");
 

ProRestaurant/Migrations/20200706125622_User add password flag.Designer.cs → ProRestaurant/Migrations/20200728060700_colRename.Designer.cs

@@ -10,8 +10,8 @@ using ProRestaurant.DBContexts;
 namespace ProRestaurant.Migrations
 {
     [DbContext(typeof(DBContext))]
-    [Migration("20200706125622_User add password flag")]
-    partial class Useraddpasswordflag
+    [Migration("20200728060700_colRename")]
+    partial class colRename
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -352,6 +352,66 @@ namespace ProRestaurant.Migrations
                     b.ToTable("RestaurantCategories");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.Property<string>("RoleName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("RestaurantRoles");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRolePremission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Create");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("Delete");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<bool>("Navigate");
+
+                    b.Property<bool>("Read");
+
+                    b.Property<int>("RoleId");
+
+                    b.Property<string>("Target");
+
+                    b.Property<bool>("Write");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RestaurantRolePremissions");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.Property<int>("Id")
@@ -379,6 +439,29 @@ namespace ProRestaurant.Migrations
                     b.ToTable("RestaurantUsers");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUserRestaurantRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int?>("RestaurantRoleId");
+
+                    b.Property<int?>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RestaurantUserRestaurantRoles");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
                 {
                     b.Property<int>("Id")
@@ -463,6 +546,22 @@ namespace ProRestaurant.Migrations
                         .HasForeignKey("MenuOptionId");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRole", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRolePremission", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.RestaurantRole", "Role")
+                        .WithMany("Permissions")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")

ProRestaurant/Migrations/20200703060514_Province Spelling fix.cs → ProRestaurant/Migrations/20200728060700_colRename.cs

@@ -2,22 +2,22 @@
 
 namespace ProRestaurant.Migrations
 {
-    public partial class ProvinceSpellingfix : Migration
+    public partial class colRename : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.RenameColumn(
-                name: "Provice",
-                table: "Restaurants",
-                newName: "Province");
+                name: "RestaurantUserId",
+                table: "RestaurantUserRestaurantRoles",
+                newName: "UserId");
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.RenameColumn(
-                name: "Province",
-                table: "Restaurants",
-                newName: "Provice");
+                name: "UserId",
+                table: "RestaurantUserRestaurantRoles",
+                newName: "RestaurantUserId");
         }
     }
 }

ProRestaurant/Migrations/DBContextModelSnapshot.cs

@@ -350,6 +350,66 @@ namespace ProRestaurant.Migrations
                     b.ToTable("RestaurantCategories");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.Property<string>("RoleName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("RestaurantRoles");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRolePremission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Create");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("Delete");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<bool>("Navigate");
+
+                    b.Property<bool>("Read");
+
+                    b.Property<int>("RoleId");
+
+                    b.Property<string>("Target");
+
+                    b.Property<bool>("Write");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RestaurantRolePremissions");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.Property<int>("Id")
@@ -377,6 +437,29 @@ namespace ProRestaurant.Migrations
                     b.ToTable("RestaurantUsers");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUserRestaurantRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int?>("RestaurantRoleId");
+
+                    b.Property<int?>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RestaurantUserRestaurantRoles");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
                 {
                     b.Property<int>("Id")
@@ -461,6 +544,22 @@ namespace ProRestaurant.Migrations
                         .HasForeignKey("MenuOptionId");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRole", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantRolePremission", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.RestaurantRole", "Role")
+                        .WithMany("Permissions")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")

ProRestaurant/Models/Restaurants/RestaurantRole.cs

@@ -0,0 +1,20 @@
+using ProRestaurant.Models.Accounts;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace ProRestaurant.Models.Restaurants
+{
+    public class RestaurantRole : BaseObject
+    {        
+        [ForeignKey("Restaurant")]
+        public int RestaurantId { get; set; }
+        public string RoleName { get; set; }
+
+        public List<RestaurantRolePremission> Permissions { get; set; }
+
+        public virtual Restaurant Restaurant { get; set; }        
+
+        [NotMapped]
+        public List<User> Users { get; set; }
+    }
+}

ProRestaurant/Models/Restaurants/RestaurantRolePremission.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace ProRestaurant.Models.Restaurants
+{
+    public class RestaurantRolePremission : BaseObject
+    {
+        [ForeignKey("Role")]
+        public int RoleId { get; set; }
+        public string Target { get; set; }
+        public bool Navigate { get; set; }
+        public bool Create { get; set; }
+        public bool Read { get; set; }
+        public bool Write { get; set; }
+        public bool Delete { get; set; }
+
+        public virtual RestaurantRole Role { get; set; }
+    }
+}

ProRestaurant/Models/Restaurants/RestaurantUser.cs

@@ -1,4 +1,5 @@
 using ProRestaurant.Models.Accounts;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace ProRestaurant.Models.Restaurants
@@ -11,6 +12,15 @@ namespace ProRestaurant.Models.Restaurants
         public int RestaurantId { get; set; }
 
         public virtual User User { get; set; }
-        public virtual Restaurant Restaurant { get; set; }
+        public virtual Restaurant Restaurant { get; set; } 
+        
+        [NotMapped]
+        public List<RestaurantRole> Roles { get; set; }
+    }    
+
+    public class RestaurantUserRestaurantRole : BaseObject
+    {
+        public int? UserId { get; set; }
+        public int? RestaurantRoleId { get; set; }        
     }
 }

ProRestaurant/Repository/Restaurants/IRestaurantRoleRepository.cs

@@ -0,0 +1,147 @@
+using Microsoft.EntityFrameworkCore;
+using ProRestaurant.DBContexts;
+using ProRestaurant.Models.Accounts;
+using ProRestaurant.Models.Restaurants;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ProRestaurant.Repository.Restaurants
+{
+    public interface IRestaurantRoleRepository
+    {
+        List<RestaurantRole> GetRoles(int restaurantId);
+        RestaurantRole GetRole(int id);
+        RestaurantRolePremission GetPremission(int id);
+        void Insert(RestaurantRole Role);
+        void Update(RestaurantRole Role);
+        void Delete(RestaurantRole Role);
+        void Save();
+    }
+
+    public class RestaurantRoleRepository : IRestaurantRoleRepository
+    {
+        private readonly DBContext dBContext;
+
+        public RestaurantRoleRepository(DBContext db)
+        {
+            dBContext = db;
+        }
+
+        public void Delete(RestaurantRole Role)
+        {
+            dBContext.Remove(Role);
+            Save();
+        }
+
+        public RestaurantRolePremission GetPremission(int id)
+        {
+            var prem = dBContext.RestaurantRolePremissions.Where(p => p.Id == id).FirstOrDefault();
+
+            if (prem == null)
+            {
+                prem = new RestaurantRolePremission();
+            }
+
+            return prem;
+        }
+
+        public RestaurantRole GetRole(int id)
+        {
+            var role = dBContext.RestaurantRoles.Include("Permissions").Where(r => r.Id == id).FirstOrDefault();
+
+            if (role == null)
+            {
+                role = new RestaurantRole
+                {
+                    Permissions = new List<RestaurantRolePremission>(),
+                    Users = new List<User>()
+                };
+            }
+            else
+            {
+                var userIDs = dBContext.RestaurantUserRestaurantRoles.Where(r => r.RestaurantRoleId == role.Id).Select(r => r.UserId).ToList();
+                role.Users = dBContext.Users.Where(u => userIDs.Contains(u.Id)).ToList();
+            }
+
+            return role;
+        }
+
+        public List<RestaurantRole> GetRoles(int restaurantId)
+        {
+            return dBContext.RestaurantRoles.Where(r => r.RestaurantId == restaurantId).ToList();
+        }
+
+        public void Insert(RestaurantRole Role)
+        {
+            var users = Role.Users;
+            Role.Users = null;
+
+            dBContext.Add(Role);
+            Save();
+
+            foreach (var user in users)
+            {
+                var userRole = new RestaurantUserRestaurantRole
+                {
+                    UserId = user.Id,
+                    RestaurantRoleId = Role.Id
+                };
+                dBContext.Add(userRole);
+            }
+            Save();
+        }
+
+        public void Save()
+        {
+            dBContext.SaveChanges();
+        }
+
+        public void Update(RestaurantRole Role)
+        {
+            var prems = Role.Permissions;
+            Role.Permissions = null;
+
+            var users = Role.Users;
+            Role.Users = null;
+
+            var usersList = dBContext.RestaurantUserRestaurantRoles.Where(r => r.RestaurantRoleId == Role.Id).Select(r => r.UserId).ToList();
+            var userObjectList = users.Select(u => u.Id).ToList();
+
+            foreach(var user in users)
+            {
+                if (!usersList.Contains(user.Id))
+                {
+                    var userRole = new RestaurantUserRestaurantRole
+                    {
+                        UserId = user.Id,
+                        RestaurantRoleId = Role.Id
+                    };
+                    dBContext.Add(userRole);
+                }
+            }
+
+            var remove = dBContext.RestaurantUserRestaurantRoles.Where(r => r.RestaurantRoleId == Role.Id && !userObjectList.Contains(r.UserId.Value)).ToList();
+            foreach (var rem in remove)
+            {
+                dBContext.Remove(rem);
+            }
+            
+
+            foreach (var prem in prems)
+            {
+                if (prem.Id == 0)
+                {
+                    prem.RoleId = Role.Id;
+                    dBContext.Add(prem);
+                }
+                else
+                {
+                    dBContext.Entry(prem).State = EntityState.Modified;
+                }
+            }
+
+            dBContext.Entry(Role).State = EntityState.Modified;
+            Save();
+        }
+    }
+}

ProRestaurant/Startup.cs

@@ -1,25 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using Newtonsoft.Json;
 using ProRestaurant.Classes;
 using ProRestaurant.DBContexts;
 using ProRestaurant.Repository.Accounts;
 using ProRestaurant.Repository.Restaurants;
+using System.Text;
 
 namespace ProRestaurant
 {
@@ -86,6 +79,7 @@ namespace ProRestaurant
             services.AddTransient<IMenuItemRepository, MenuItemRepository>();
             services.AddTransient<IMenuRepository, MenuRepository>();
             services.AddTransient<IRestaurantUserRepository, RestaurantUserRepository>();
+            services.AddTransient<IRestaurantRoleRepository, RestaurantRoleRepository>();
 
             services.Configure<MvcOptions>(options =>
             {

ProRestaurant/appsettings.json

@@ -9,6 +9,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultDatabase": "Data Source=localhost;Initial Catalog=RestaurantDemo;Integrated Security=true;Pooling=false;"
+    "DefaultDatabase": "Data Source=localhost;Initial Catalog=RestaurantNew;Integrated Security=true;Pooling=false;"
   }
 }

ProRestaurant/bin/Debug/netcoreapp2.2/appsettings.json

@@ -9,6 +9,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultDatabase": "Data Source=localhost;Initial Catalog=RestaurantDemo;Integrated Security=true;Pooling=false;"
+    "DefaultDatabase": "Data Source=localhost;Initial Catalog=RestaurantNew;Integrated Security=true;Pooling=false;"
   }
 }

ProRestaurant/obj/Debug/netcoreapp2.2/ProRestaurant.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-9adf305668e4c84bcd07601f8f7915e6185ed444
+0d33e6e40c82c46972d2120b49e55dfcc39b23a9