From a97dd1c2cc7425580f61aa971f7bd3a6c51a68a1 Mon Sep 17 00:00:00 2001 From: Aneliya Konarcheva <60808931+annie-prog@users.noreply.github.com> Date: Wed, 10 Mar 2021 22:32:21 +0200 Subject: [PATCH] visual studio is drunk --- LuminousSales/Business/Business.csproj | 10 ++++++++++ .../Business/{Businesses => }/DealsBusiness.cs | 4 ++-- .../{Businesses => }/PermissionsBusiness.cs | 6 ++++-- .../Business/{Businesses => }/ProductBusiness.cs | 4 +--- LuminousSales/Business/ProductContext.cs | 9 --------- .../Business/{Businesses => }/RolesBusiness.cs | 4 ++-- .../{Businesses => }/RolesToPermissionBusiness.cs | 2 +- .../Business/{Businesses => }/StocksBusiness.cs | 2 +- .../Business/{Businesses => }/UsersBusiness.cs | 4 ++-- .../{Businesses => }/UsersToRolesBusiness.cs | 6 ++++-- LuminousSales/LuminousSales/Data/DealContext.cs | 14 ++++++++++++-- .../LuminousSales/Data/PermissionContext.cs | 12 +++++++++++- LuminousSales/LuminousSales/Data/RoleContext.cs | 15 ++++++++++++--- .../Data/RolesToPermissionContext.cs | 13 ++++++++++++- LuminousSales/LuminousSales/Data/StockContext.cs | 12 +++++++++++- LuminousSales/LuminousSales/Data/UserContext.cs | 10 ++++++++++ .../LuminousSales/Data/UsersToRolesContext.cs | 9 +++++++++ LuminousSales/LuminousSales/LuminousSales.csproj | 10 ++++++++++ LuminousSales/Models/LuminousContext.cs | 3 +-- LuminousSales/Models/Models.csproj | 1 + LuminousSales/Models/Models/Deal.cs | 1 - LuminousSales/Models/Models/Role.cs | 2 +- LuminousSales/Models/Models/Stock.cs | 2 +- 23 files changed, 118 insertions(+), 37 deletions(-) rename LuminousSales/Business/{Businesses => }/DealsBusiness.cs (72%) rename LuminousSales/Business/{Businesses => }/PermissionsBusiness.cs (75%) rename LuminousSales/Business/{Businesses => }/ProductBusiness.cs (96%) delete mode 100644 LuminousSales/Business/ProductContext.cs rename LuminousSales/Business/{Businesses => }/RolesBusiness.cs (72%) rename LuminousSales/Business/{Businesses => }/RolesToPermissionBusiness.cs (89%) rename LuminousSales/Business/{Businesses => }/StocksBusiness.cs (88%) rename LuminousSales/Business/{Businesses => }/UsersBusiness.cs (65%) rename LuminousSales/Business/{Businesses => }/UsersToRolesBusiness.cs (75%) diff --git a/LuminousSales/Business/Business.csproj b/LuminousSales/Business/Business.csproj index 66ff963..e001fc0 100644 --- a/LuminousSales/Business/Business.csproj +++ b/LuminousSales/Business/Business.csproj @@ -4,6 +4,16 @@ netstandard2.0 + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/LuminousSales/Business/Businesses/DealsBusiness.cs b/LuminousSales/Business/DealsBusiness.cs similarity index 72% rename from LuminousSales/Business/Businesses/DealsBusiness.cs rename to LuminousSales/Business/DealsBusiness.cs index fcbd87f..1cecbc8 100644 --- a/LuminousSales/Business/Businesses/DealsBusiness.cs +++ b/LuminousSales/Business/DealsBusiness.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using LuminousSales.Data; -namespace LuminousSales.Business + +namespace Business { public class DealsBusiness { diff --git a/LuminousSales/Business/Businesses/PermissionsBusiness.cs b/LuminousSales/Business/PermissionsBusiness.cs similarity index 75% rename from LuminousSales/Business/Businesses/PermissionsBusiness.cs rename to LuminousSales/Business/PermissionsBusiness.cs index 5da95c7..63c4810 100644 --- a/LuminousSales/Business/Businesses/PermissionsBusiness.cs +++ b/LuminousSales/Business/PermissionsBusiness.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; using System.Text; -using LuminousSales.Data; -namespace LuminousSales.Business + +namespace Business { public class PermissionsBusiness { private PermissionContext permissionContext; + + } } diff --git a/LuminousSales/Business/Businesses/ProductBusiness.cs b/LuminousSales/Business/ProductBusiness.cs similarity index 96% rename from LuminousSales/Business/Businesses/ProductBusiness.cs rename to LuminousSales/Business/ProductBusiness.cs index d9e2435..b684c5c 100644 --- a/LuminousSales/Business/Businesses/ProductBusiness.cs +++ b/LuminousSales/Business/ProductBusiness.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using System.Linq; -using Business.Businesses; using Models.Models; - -namespace Business.Businesses +namespace Business { public class ProductBusiness { diff --git a/LuminousSales/Business/ProductContext.cs b/LuminousSales/Business/ProductContext.cs deleted file mode 100644 index d330226..0000000 --- a/LuminousSales/Business/ProductContext.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Business.Business -{ - internal class ProductContext - { - public ProductContext() - { - } - } -} \ No newline at end of file diff --git a/LuminousSales/Business/Businesses/RolesBusiness.cs b/LuminousSales/Business/RolesBusiness.cs similarity index 72% rename from LuminousSales/Business/Businesses/RolesBusiness.cs rename to LuminousSales/Business/RolesBusiness.cs index 1dbee7d..3509d4d 100644 --- a/LuminousSales/Business/Businesses/RolesBusiness.cs +++ b/LuminousSales/Business/RolesBusiness.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using LuminousSales.Data; -namespace LuminousSales.Business + +namespace Business { public class RolesBusiness { diff --git a/LuminousSales/Business/Businesses/RolesToPermissionBusiness.cs b/LuminousSales/Business/RolesToPermissionBusiness.cs similarity index 89% rename from LuminousSales/Business/Businesses/RolesToPermissionBusiness.cs rename to LuminousSales/Business/RolesToPermissionBusiness.cs index 5b33e19..c0704f9 100644 --- a/LuminousSales/Business/Businesses/RolesToPermissionBusiness.cs +++ b/LuminousSales/Business/RolesToPermissionBusiness.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using LuminousSales.Data; + namespace LuminousSales.Business { diff --git a/LuminousSales/Business/Businesses/StocksBusiness.cs b/LuminousSales/Business/StocksBusiness.cs similarity index 88% rename from LuminousSales/Business/Businesses/StocksBusiness.cs rename to LuminousSales/Business/StocksBusiness.cs index 8133d4b..e39bbcf 100644 --- a/LuminousSales/Business/Businesses/StocksBusiness.cs +++ b/LuminousSales/Business/StocksBusiness.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using LuminousSales.Data; + namespace LuminousSales.Business { diff --git a/LuminousSales/Business/Businesses/UsersBusiness.cs b/LuminousSales/Business/UsersBusiness.cs similarity index 65% rename from LuminousSales/Business/Businesses/UsersBusiness.cs rename to LuminousSales/Business/UsersBusiness.cs index 18940ea..bdbc5a1 100644 --- a/LuminousSales/Business/Businesses/UsersBusiness.cs +++ b/LuminousSales/Business/UsersBusiness.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using LuminousSales.Data; +using Microsoft.ApplicationInsights.Extensibility.Implementation; -namespace LuminousSales.Business +namespace Business { public class UsersBusiness { diff --git a/LuminousSales/Business/Businesses/UsersToRolesBusiness.cs b/LuminousSales/Business/UsersToRolesBusiness.cs similarity index 75% rename from LuminousSales/Business/Businesses/UsersToRolesBusiness.cs rename to LuminousSales/Business/UsersToRolesBusiness.cs index 8d16efe..0f08621 100644 --- a/LuminousSales/Business/Businesses/UsersToRolesBusiness.cs +++ b/LuminousSales/Business/UsersToRolesBusiness.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; using System.Text; -using LuminousSales.Data; -namespace LuminousSales.Business + +namespace Business { public class UsersToRolesBusiness { private UsersToRolesContext usersToRolesContext; + + } } diff --git a/LuminousSales/LuminousSales/Data/DealContext.cs b/LuminousSales/LuminousSales/Data/DealContext.cs index a6d3323..8f68a8b 100644 --- a/LuminousSales/LuminousSales/Data/DealContext.cs +++ b/LuminousSales/LuminousSales/Data/DealContext.cs @@ -2,14 +2,24 @@ using System.Collections.Generic; using System.Text; using Microsoft.EntityFrameworkCore; +using Models.Models; namespace LuminousSales.Data { public class DealContext : DbContext { - public DealContext() + public DealContext() : base() { } + + public DbSet Deal { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.UseSqlServer(@"Server= (localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security = true;"); + } + + } } -} + diff --git a/LuminousSales/LuminousSales/Data/PermissionContext.cs b/LuminousSales/LuminousSales/Data/PermissionContext.cs index c48f245..da5785e 100644 --- a/LuminousSales/LuminousSales/Data/PermissionContext.cs +++ b/LuminousSales/LuminousSales/Data/PermissionContext.cs @@ -2,14 +2,24 @@ using System.Collections.Generic; using System.Text; using Microsoft.EntityFrameworkCore; +using Models.Models; namespace LuminousSales.Data { public class PermissionContext: DbContext { - public PermissionContext() + public PermissionContext() : base() { } + + + public DbSet Permission { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.UseSqlServer(@"Server= (localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security = true;"); + } } } + diff --git a/LuminousSales/LuminousSales/Data/RoleContext.cs b/LuminousSales/LuminousSales/Data/RoleContext.cs index 04f4b8b..0ceae06 100644 --- a/LuminousSales/LuminousSales/Data/RoleContext.cs +++ b/LuminousSales/LuminousSales/Data/RoleContext.cs @@ -1,5 +1,5 @@ using Microsoft.EntityFrameworkCore; - +using Models.Models; namespace LuminousSales.Data { @@ -7,11 +7,20 @@ namespace LuminousSales.Data { public RoleContext():base() { - + } + + + public DbSet Role { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.UseSqlServer(@"Server= (localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security = true;"); + } + } - } } + diff --git a/LuminousSales/LuminousSales/Data/RolesToPermissionContext.cs b/LuminousSales/LuminousSales/Data/RolesToPermissionContext.cs index 96a22ab..fac79e3 100644 --- a/LuminousSales/LuminousSales/Data/RolesToPermissionContext.cs +++ b/LuminousSales/LuminousSales/Data/RolesToPermissionContext.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using Microsoft.EntityFrameworkCore; +using Models.Models; namespace LuminousSales.Data { @@ -9,8 +10,18 @@ namespace LuminousSales.Data { public RolesToPermissionContext():base() { + } + + + public DbSet RoleToPermission { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.UseSqlServer(@"Server= (localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security = true;"); + } + } } -} + diff --git a/LuminousSales/LuminousSales/Data/StockContext.cs b/LuminousSales/LuminousSales/Data/StockContext.cs index ab54cb1..eb51bf2 100644 --- a/LuminousSales/LuminousSales/Data/StockContext.cs +++ b/LuminousSales/LuminousSales/Data/StockContext.cs @@ -2,14 +2,24 @@ using System.Collections.Generic; using System.Text; using Microsoft.EntityFrameworkCore; +using Models.Models; namespace LuminousSales.Data { public class StockContext:DbContext { - public StockContext() + public StockContext():base() { + } + + public DbSet Stock { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.UseSqlServer(@"Server= (localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security = true;"); + } } } + diff --git a/LuminousSales/LuminousSales/Data/UserContext.cs b/LuminousSales/LuminousSales/Data/UserContext.cs index b9027c0..71ce98b 100644 --- a/LuminousSales/LuminousSales/Data/UserContext.cs +++ b/LuminousSales/LuminousSales/Data/UserContext.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using Microsoft.EntityFrameworkCore; +using Models.Models; namespace LuminousSales.Data { @@ -11,5 +12,14 @@ namespace LuminousSales.Data { } + + public DbSet User { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.UseSqlServer(@"Server= (localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security = true;"); + } + + } } diff --git a/LuminousSales/LuminousSales/Data/UsersToRolesContext.cs b/LuminousSales/LuminousSales/Data/UsersToRolesContext.cs index 88735eb..eec7afa 100644 --- a/LuminousSales/LuminousSales/Data/UsersToRolesContext.cs +++ b/LuminousSales/LuminousSales/Data/UsersToRolesContext.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using Microsoft.EntityFrameworkCore; +using Models.Models; namespace LuminousSales.Data { @@ -11,5 +12,13 @@ namespace LuminousSales.Data { } + public DbSet Role { get; set; } + + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security = true;"); + } + } } diff --git a/LuminousSales/LuminousSales/LuminousSales.csproj b/LuminousSales/LuminousSales/LuminousSales.csproj index 25c31e3..df20564 100644 --- a/LuminousSales/LuminousSales/LuminousSales.csproj +++ b/LuminousSales/LuminousSales/LuminousSales.csproj @@ -7,6 +7,16 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/LuminousSales/Models/LuminousContext.cs b/LuminousSales/Models/LuminousContext.cs index 248972d..a038eed 100644 --- a/LuminousSales/Models/LuminousContext.cs +++ b/LuminousSales/Models/LuminousContext.cs @@ -16,8 +16,7 @@ namespace Models public DbSet Stock { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseSqlServer( - @"Server=(localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security=True"); + optionsBuilder.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=LuminousSales;Integrated Security=True;"); } } } diff --git a/LuminousSales/Models/Models.csproj b/LuminousSales/Models/Models.csproj index 825e30b..866b85d 100644 --- a/LuminousSales/Models/Models.csproj +++ b/LuminousSales/Models/Models.csproj @@ -5,6 +5,7 @@ + diff --git a/LuminousSales/Models/Models/Deal.cs b/LuminousSales/Models/Models/Deal.cs index bd8e485..6835e79 100644 --- a/LuminousSales/Models/Models/Deal.cs +++ b/LuminousSales/Models/Models/Deal.cs @@ -1,6 +1,5 @@ using Models.Models.Interfaces; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; namespace Models.Models { diff --git a/LuminousSales/Models/Models/Role.cs b/LuminousSales/Models/Models/Role.cs index c267db3..08811ad 100644 --- a/LuminousSales/Models/Models/Role.cs +++ b/LuminousSales/Models/Models/Role.cs @@ -1,6 +1,6 @@ using Models.Models.Interfaces; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; + namespace Models.Models { diff --git a/LuminousSales/Models/Models/Stock.cs b/LuminousSales/Models/Models/Stock.cs index 1ea1f63..7c0407f 100644 --- a/LuminousSales/Models/Models/Stock.cs +++ b/LuminousSales/Models/Models/Stock.cs @@ -1,7 +1,7 @@ using Models.Models.Interfaces; using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; + using System.Text; namespace Models.Models