Edit Seed data class

6 files changed, 38 insertions, 30 deletions

diff --git a/Migrations/20230201044832_Init.Designer.cs b/Migrations/20230201062503_Init.Designer.cs
index 6b0762e..18bb01e 100644
--- a/Migrations/20230201044832_Init.Designer.cs
+++ b/Migrations/20230201062503_Init.Designer.cs
@@ -11,7 +11,7 @@ using MyDarling.Models;
 namespace MyDarling.Migrations
 {
     [DbContext(typeof(DataContext))]
-    [Migration("20230201044832_Init")]
+    [Migration("20230201062503_Init")]
     partial class Init
     {
         /// <inheritdoc />
diff --git a/Migrations/20230201044832_Init.cs b/Migrations/20230201062503_Init.cs
index fe709a8..fe709a8 100644
--- a/Migrations/20230201044832_Init.cs
+++ b/Migrations/20230201062503_Init.cs
diff --git a/Models/DataContext.cs b/Models/DataContext.cs
index c874420..23e80ab 100644
--- a/Models/DataContext.cs
+++ b/Models/DataContext.cs
@@ -15,10 +15,10 @@ namespace MyDarling.Models
 			opts.UseSqlite(configuration.GetConnectionString("MyDarlingDb"));
 		}
 		
-		protected override void OnModelCreating(ModelBuilder builder)
-		{
-			builder.Entity<UnderwearBundle>().HasMany(b => b.Figures).WithOne();			
-		}
+		// protected override void OnModelCreating(ModelBuilder builder)
+		// {
+		// 	builder.Entity<UnderwearBundle>().HasMany(b => b.Figures).WithOne();			
+		// }
 		
 		public DbSet<UnderwearBundle> UnderwearBundles => Set<UnderwearBundle>();
 		public DbSet<Figure> Figures => Set<Figure>();
diff --git a/Models/SeedData.cs b/Models/SeedData.cs
index 1f0ff76..c7b8692 100644
--- a/Models/SeedData.cs
+++ b/Models/SeedData.cs
@@ -8,20 +8,38 @@ namespace MyDarling.Models
 			context.Database.Migrate();
 			if (context.UnderwearBundles.Count() == 0)
 			{
-				var alice = new UnderwearBundle
+				var aliceFigures = new List<Figure>
 				{
-					Name = "Alice",
-					Figures = new List<Figure>
+					new Figure()
+					{
+						FilePath = "/content/0/img/IMG_4896.JPG"
+					},
+					new Figure()
+					{
+						FilePath = "/content/0/img/IMG_4902.JPG"
+					}
+				};
+				
+				var nikkiFigures = new List<Figure>
+				{
+					new Figure()
 					{
-						new Figure()
-						{
-							FilePath = "/content/0/img/IMG_4896.JPG"
-						},
-						new Figure()
-						{
-							FilePath = "/content/0/img/IMG_4902.JPG"
-						}
+						FilePath = "/content/1/img/IMG_4897.JPG"
 					},
+					new Figure()
+					{
+						FilePath = "/content/1/img/IMG_4898.JPG"
+					}
+				};				
+				
+				context.Figures.AddRange(aliceFigures);
+				context.Figures.AddRange(nikkiFigures);
+				context.SaveChanges();
+				
+				var alice = new UnderwearBundle
+				{
+					Name = "Alice",
+					Figures = aliceFigures,
 					Description = @"Комплект из бежевого эластичного кружева с голубой отделкой.
 					В комплект входит бра, 2 трусиков (на высокой посадке и стандартной на регуляции) и чокер.
 					Низ можно сделать на выбор стринги/бразильянки.",
@@ -31,23 +49,13 @@ namespace MyDarling.Models
 				var nikki = new UnderwearBundle
 				{
 					Name = "Nikki",
-					Figures = new List<Figure>
-					{
-						new Figure()
-						{
-							FilePath = "/content/1/img/IMG_4897.JPG"
-						},
-						new Figure()
-						{
-							FilePath = "/content/1/img/IMG_4898.JPG"
-						}
-					},
+					Figures = nikkiFigures,
 					Description = @"Базовый сет из мягкой эластичной сетки.
 					В комплект входит лиф на косточках и 2 трусиков – бразильянки на высокой посадке и стринги на стандартной посадке с регуляцией.
 					Доступен в цветах: желтый, черный, бежевый молочный.",
 					Price = 3800
 				};
-				
+
 				context.UnderwearBundles.AddRange(alice, nikki);
 				context.SaveChanges();
 			}
diff --git a/Models/UnderwearBundle.cs b/Models/UnderwearBundle.cs
index 5617b07..1f451e6 100644
--- a/Models/UnderwearBundle.cs
+++ b/Models/UnderwearBundle.cs
@@ -4,7 +4,7 @@ namespace MyDarling.Models
 	{
 		public int Id { get; set; }
 		public string Name { get; set; } = "My Darling Bundle";
-		public ICollection<Figure> Figures { get; set; } = new List<Figure>();
+		public List<Figure> Figures { get; set; } = new List<Figure>();
 		public string Description { get; set; } = string.Empty;
 		public decimal Price { get; set; }
 	}
diff --git a/Program.cs b/Program.cs
index 91c4c5d..7a4bd1d 100644
--- a/Program.cs
+++ b/Program.cs
@@ -17,6 +17,6 @@ app.MapControllers();
 app.MapDefaultControllerRoute();
 
 var context = app.Services.CreateScope().ServiceProvider.GetRequiredService<DataContext>();
-
+SeedData.SeedDatabase(context);
 
 app.Run();
\ No newline at end of file