diff --git a/SushiBar/SushiBarDatabaseImplement/Migrations/20230326132549_AddClient.Designer.cs b/SushiBar/SushiBarDatabaseImplement/Migrations/20230326132549_AddClient.Designer.cs
deleted file mode 100644
index 224f558..0000000
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/20230326132549_AddClient.Designer.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-//
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SushiBarDatabaseImplement;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
- [DbContext(typeof(SushiBarDatabase))]
- [Migration("20230326132549_AddClient")]
- partial class AddClient
- {
- ///
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "7.0.3")
- .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
- SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("ClientFio")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Email")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Password")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.ToTable("Clients");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("ComponentName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Cost")
- .HasColumnType("float");
-
- b.HasKey("Id");
-
- b.ToTable("Components");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("ClientId")
- .HasColumnType("int");
-
- b.Property("Count")
- .HasColumnType("int");
-
- b.Property("DateCreate")
- .HasColumnType("datetime2");
-
- b.Property("DateImplement")
- .HasColumnType("datetime2");
-
- b.Property("Status")
- .HasColumnType("int");
-
- b.Property("Sum")
- .HasColumnType("float");
-
- b.Property("SushiId")
- .HasColumnType("int");
-
- b.Property("SushiName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.HasIndex("ClientId");
-
- b.HasIndex("SushiId");
-
- b.ToTable("Orders");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("Price")
- .HasColumnType("float");
-
- b.Property("SushiName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.ToTable("Sushi");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("ComponentId")
- .HasColumnType("int");
-
- b.Property("Count")
- .HasColumnType("int");
-
- b.Property("SushiId")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("ComponentId");
-
- b.HasIndex("SushiId");
-
- b.ToTable("SushiComponents");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
- {
- b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
- .WithMany()
- .HasForeignKey("ClientId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
- .WithMany("Orders")
- .HasForeignKey("SushiId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("Client");
-
- b.Navigation("Sushi");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
- {
- b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
- .WithMany("SushiComponent")
- .HasForeignKey("ComponentId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
- .WithMany("Components")
- .HasForeignKey("SushiId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("Component");
-
- b.Navigation("Sushi");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
- {
- b.Navigation("SushiComponent");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
- {
- b.Navigation("Components");
-
- b.Navigation("Orders");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/SushiBar/SushiBarDatabaseImplement/Migrations/20230326132549_AddClient.cs b/SushiBar/SushiBarDatabaseImplement/Migrations/20230326132549_AddClient.cs
deleted file mode 100644
index 83da700..0000000
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/20230326132549_AddClient.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
- ///
- public partial class AddClient : Migration
- {
- ///
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AddColumn(
- name: "ClientId",
- table: "Orders",
- type: "int",
- nullable: false,
- defaultValue: 0);
-
- migrationBuilder.CreateTable(
- name: "Clients",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- ClientFio = table.Column(type: "nvarchar(max)", nullable: false),
- Email = table.Column(type: "nvarchar(max)", nullable: false),
- Password = table.Column(type: "nvarchar(max)", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Clients", x => x.Id);
- });
-
- migrationBuilder.CreateIndex(
- name: "IX_Orders_ClientId",
- table: "Orders",
- column: "ClientId");
-
- migrationBuilder.AddForeignKey(
- name: "FK_Orders_Clients_ClientId",
- table: "Orders",
- column: "ClientId",
- principalTable: "Clients",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- }
-
- ///
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropForeignKey(
- name: "FK_Orders_Clients_ClientId",
- table: "Orders");
-
- migrationBuilder.DropTable(
- name: "Clients");
-
- migrationBuilder.DropIndex(
- name: "IX_Orders_ClientId",
- table: "Orders");
-
- migrationBuilder.DropColumn(
- name: "ClientId",
- table: "Orders");
- }
- }
-}
diff --git a/SushiBar/SushiBarDatabaseImplement/Migrations/20230328054704_init.Designer.cs b/SushiBar/SushiBarDatabaseImplement/Migrations/20230328054704_init.Designer.cs
deleted file mode 100644
index 583d64e..0000000
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/20230328054704_init.Designer.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-//
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SushiBarDatabaseImplement;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
- [DbContext(typeof(SushiBarDatabase))]
- [Migration("20230328054704_init")]
- partial class init
- {
- ///
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "7.0.3")
- .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
- SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("ComponentName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Cost")
- .HasColumnType("float");
-
- b.HasKey("Id");
-
- b.ToTable("Components");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("Count")
- .HasColumnType("int");
-
- b.Property("DateCreate")
- .HasColumnType("datetime2");
-
- b.Property("DateImplement")
- .HasColumnType("datetime2");
-
- b.Property("Status")
- .HasColumnType("int");
-
- b.Property("Sum")
- .HasColumnType("float");
-
- b.Property("SushiId")
- .HasColumnType("int");
-
- b.Property("SushiName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.HasIndex("SushiId");
-
- b.ToTable("Orders");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Store", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("OpeningDate")
- .HasColumnType("datetime2");
-
- b.Property("StoreAddress")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("StoreName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("maxSushi")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.ToTable("Stores");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.StoreSushi", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("Count")
- .HasColumnType("int");
-
- b.Property("StoreId")
- .HasColumnType("int");
-
- b.Property("SushiId")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("StoreId");
-
- b.HasIndex("SushiId");
-
- b.ToTable("StoreSushis");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("Price")
- .HasColumnType("float");
-
- b.Property("SushiName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("Id");
-
- b.ToTable("Sushis");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
-
- b.Property("ComponentId")
- .HasColumnType("int");
-
- b.Property("Count")
- .HasColumnType("int");
-
- b.Property("SushiId")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.HasIndex("ComponentId");
-
- b.HasIndex("SushiId");
-
- b.ToTable("SushiComponents");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
- {
- b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
- .WithMany("Orders")
- .HasForeignKey("SushiId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("Sushi");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.StoreSushi", b =>
- {
- b.HasOne("SushiBarDatabaseImplement.Models.Store", "Store")
- .WithMany("StoreSushi")
- .HasForeignKey("StoreId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
- .WithMany()
- .HasForeignKey("SushiId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("Store");
-
- b.Navigation("Sushi");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
- {
- b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
- .WithMany("SushiComponent")
- .HasForeignKey("ComponentId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
- .WithMany("Components")
- .HasForeignKey("SushiId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("Component");
-
- b.Navigation("Sushi");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
- {
- b.Navigation("SushiComponent");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Store", b =>
- {
- b.Navigation("StoreSushi");
- });
-
- modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
- {
- b.Navigation("Components");
-
- b.Navigation("Orders");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/SushiBar/SushiBarDatabaseImplement/Migrations/20230328054704_init.cs b/SushiBar/SushiBarDatabaseImplement/Migrations/20230328054704_init.cs
deleted file mode 100644
index d34ae99..0000000
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/20230328054704_init.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
- ///
- public partial class init : Migration
- {
- ///
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "Components",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- ComponentName = table.Column(type: "nvarchar(max)", nullable: false),
- Cost = table.Column(type: "float", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Components", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Stores",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- StoreName = table.Column(type: "nvarchar(max)", nullable: false),
- StoreAddress = table.Column(type: "nvarchar(max)", nullable: false),
- OpeningDate = table.Column(type: "datetime2", nullable: false),
- maxSushi = table.Column(type: "int", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Stores", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Sushis",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- SushiName = table.Column(type: "nvarchar(max)", nullable: false),
- Price = table.Column(type: "float", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Sushis", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Orders",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- SushiId = table.Column(type: "int", nullable: false),
- SushiName = table.Column(type: "nvarchar(max)", nullable: false),
- Count = table.Column(type: "int", nullable: false),
- Sum = table.Column(type: "float", nullable: false),
- Status = table.Column(type: "int", nullable: false),
- DateCreate = table.Column(type: "datetime2", nullable: false),
- DateImplement = table.Column(type: "datetime2", nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Orders", x => x.Id);
- table.ForeignKey(
- name: "FK_Orders_Sushis_SushiId",
- column: x => x.SushiId,
- principalTable: "Sushis",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateTable(
- name: "StoreSushis",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- SushiId = table.Column(type: "int", nullable: false),
- StoreId = table.Column(type: "int", nullable: false),
- Count = table.Column(type: "int", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_StoreSushis", x => x.Id);
- table.ForeignKey(
- name: "FK_StoreSushis_Stores_StoreId",
- column: x => x.StoreId,
- principalTable: "Stores",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- table.ForeignKey(
- name: "FK_StoreSushis_Sushis_SushiId",
- column: x => x.SushiId,
- principalTable: "Sushis",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateTable(
- name: "SushiComponents",
- columns: table => new
- {
- Id = table.Column(type: "int", nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- SushiId = table.Column(type: "int", nullable: false),
- ComponentId = table.Column(type: "int", nullable: false),
- Count = table.Column(type: "int", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_SushiComponents", x => x.Id);
- table.ForeignKey(
- name: "FK_SushiComponents_Components_ComponentId",
- column: x => x.ComponentId,
- principalTable: "Components",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- table.ForeignKey(
- name: "FK_SushiComponents_Sushis_SushiId",
- column: x => x.SushiId,
- principalTable: "Sushis",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateIndex(
- name: "IX_Orders_SushiId",
- table: "Orders",
- column: "SushiId");
-
- migrationBuilder.CreateIndex(
- name: "IX_StoreSushis_StoreId",
- table: "StoreSushis",
- column: "StoreId");
-
- migrationBuilder.CreateIndex(
- name: "IX_StoreSushis_SushiId",
- table: "StoreSushis",
- column: "SushiId");
-
- migrationBuilder.CreateIndex(
- name: "IX_SushiComponents_ComponentId",
- table: "SushiComponents",
- column: "ComponentId");
-
- migrationBuilder.CreateIndex(
- name: "IX_SushiComponents_SushiId",
- table: "SushiComponents",
- column: "SushiId");
- }
-
- ///
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "Orders");
-
- migrationBuilder.DropTable(
- name: "StoreSushis");
-
- migrationBuilder.DropTable(
- name: "SushiComponents");
-
- migrationBuilder.DropTable(
- name: "Stores");
-
- migrationBuilder.DropTable(
- name: "Components");
-
- migrationBuilder.DropTable(
- name: "Sushis");
- }
- }
-}
diff --git a/SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs b/SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs
index 579e5fd..e1e78e8 100644
--- a/SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs
@@ -179,7 +179,7 @@ namespace SushiBarDatabaseImplement.Migrations
b.HasKey("Id");
- b.ToTable("Sushis");
+ b.ToTable("Sushi");
});
modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
diff --git a/SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs b/SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
index 9250a63..1e37579 100644
--- a/SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
+++ b/SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
@@ -9,7 +9,7 @@ namespace SushiBarDatabaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
- optionsBuilder.UseSqlServer(@"Data Source=LAPTOP-QKSH4DCA\SQLEXPRESS;Initial Catalog=SushiBarDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+ optionsBuilder.UseSqlServer(@"Data Source=LAPTOP-QKSH4DCA\SQLEXPRESS;Initial Catalog=SushiBarDataBaseHard;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
}
base.OnConfiguring(optionsBuilder);
}
diff --git a/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj b/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj
index f03ad14..af97e9f 100644
--- a/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj
+++ b/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj
@@ -19,8 +19,4 @@
-
-
-
-
diff --git a/SushiBar/SushiBarRestApi/Program.cs b/SushiBar/SushiBarRestApi/Program.cs
index 362984c..49164cd 100644
--- a/SushiBar/SushiBarRestApi/Program.cs
+++ b/SushiBar/SushiBarRestApi/Program.cs
@@ -14,10 +14,12 @@ builder.Logging.AddLog4Net("log4net.config");
builder.Services.AddTransient();
builder.Services.AddTransient();
builder.Services.AddTransient();
+builder.Services.AddTransient();
builder.Services.AddTransient();
builder.Services.AddTransient();
builder.Services.AddTransient();
+builder.Services.AddTransient();
builder.Services.AddControllers();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
diff --git a/SushiBar/SushiBarStoresMvc/ApiStores.cs b/SushiBar/SushiBarStoresMvc/ApiStores.cs
index e241fea..b9858b1 100644
--- a/SushiBar/SushiBarStoresMvc/ApiStores.cs
+++ b/SushiBar/SushiBarStoresMvc/ApiStores.cs
@@ -5,15 +5,15 @@ using SushiBarContracts.ViewModels;
namespace SushiBarStoresMvc;
-public class ApiStores
+public static class ApiStores
{
private static readonly HttpClient _client = new();
- public static string Password { get; private set; } = string.Empty;
- public static bool Access { get; set; } = false;
+ private static string _password = string.Empty;
+ public static bool Access { get; private set; }
public static void Connect(IConfiguration configuration)
{
- Password = configuration["PasswordStore"];
+ _password = configuration["PasswordStore"];
_client.BaseAddress = new Uri(configuration["IPAddress"]);
_client.DefaultRequestHeaders.Accept.Clear();
_client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
@@ -39,4 +39,9 @@ public class ApiStores
throw new Exception(result);
}
}
+
+ public static void GetAccess(string password)
+ {
+ Access = _password == password;
+ }
}
\ No newline at end of file
diff --git a/SushiBar/SushiBarStoresMvc/Controllers/HomeController.cs b/SushiBar/SushiBarStoresMvc/Controllers/HomeController.cs
index 84840c6..51e3aa2 100644
--- a/SushiBar/SushiBarStoresMvc/Controllers/HomeController.cs
+++ b/SushiBar/SushiBarStoresMvc/Controllers/HomeController.cs
@@ -18,7 +18,11 @@ public class HomeController : Controller
public IActionResult Index()
{
- return View();
+ if (!ApiStores.Access)
+ {
+ return Redirect("~/Home/Enter");
+ }
+ return View(ApiStores.GetRequest>($"api/Store/GetStores"));
}
[HttpGet]
@@ -33,10 +37,10 @@ public class HomeController : Controller
{
throw new Exception("Enter password");
}
- ApiStores.Access = password.Equals(ApiStores.Password);
- if (ApiStores.Access == false)
+ ApiStores.GetAccess(password);
+ if (!ApiStores.Access)
{
- throw new Exception("Invalid password");
+ throw new Exception($"Invalid password {password}");
}
Response.Redirect("Index");
}
diff --git a/SushiBar/SushiBarStoresMvc/Program.cs b/SushiBar/SushiBarStoresMvc/Program.cs
index 5cd7c7e..1f37fa2 100644
--- a/SushiBar/SushiBarStoresMvc/Program.cs
+++ b/SushiBar/SushiBarStoresMvc/Program.cs
@@ -1,9 +1,12 @@
+using SushiBarStoresMvc;
+
var builder = WebApplication.CreateBuilder(args);
// Add services to the container.
builder.Services.AddControllersWithViews();
var app = builder.Build();
+ApiStores.Connect(builder.Configuration);
// Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment())
diff --git a/SushiBar/SushiBarStoresMvc/appsettings.json b/SushiBar/SushiBarStoresMvc/appsettings.json
index 72ae546..f3d5839 100644
--- a/SushiBar/SushiBarStoresMvc/appsettings.json
+++ b/SushiBar/SushiBarStoresMvc/appsettings.json
@@ -7,6 +7,6 @@
},
"AllowedHosts": "*",
- "IPAddress": "https://localhost:7218/",
+ "IPAddress": "https://localhost:5168/",
"PasswordStore": "123"
}