Merge branch 'test' of https://gitea.tzbre.dev/admin/ShopSolution-backend into test

Reviewed-on: #1

Webshop.Api/Controllers/Admin/AdminProductsController.cs

@@ -77,15 +77,12 @@ namespace Webshop.Api.Controllers.Admin
         [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status409Conflict)]
         public async Task<IActionResult> UpdateAdminProduct(Guid id, [FromForm] UpdateAdminProductDto productDto)
         {
-            if (id != productDto.Id)
+            // ==============================================================================
-            {
+            // DEINE PERFEKTE L<>SUNG: URL-ID erzwingen
-                return BadRequest(new { Message = "ID in der URL und im Body stimmen nicht <20>berein." });
+            // ==============================================================================
-            }
+            productDto.Id = id;
-            if (!ModelState.IsValid)
-            {
-                return BadRequest(ModelState);
-            }
 
+            // Jetzt den Service mit dem garantiert korrekten DTO aufrufen.
             var result = await _adminProductService.UpdateAdminProductAsync(productDto);
 
             return result.Type switch
@@ -93,8 +90,7 @@ namespace Webshop.Api.Controllers.Admin
                 ServiceResultType.Success => NoContent(),
                 ServiceResultType.NotFound => NotFound(new { Message = result.ErrorMessage }),
                 ServiceResultType.Conflict => Conflict(new { Message = result.ErrorMessage }),
-                ServiceResultType.InvalidInput => BadRequest(new { Message = result.ErrorMessage }),
+                _ => BadRequest(new { Message = result.ErrorMessage ?? "Ein Fehler ist aufgetreten." })
-                _ => StatusCode(StatusCodes.Status500InternalServerError, new { Message = result.ErrorMessage ?? "Ein unerwarteter Fehler ist aufgetreten." })
             };
         }
 

Webshop.Api/Controllers/Customers/CheckoutController.cs

@@ -4,9 +4,11 @@ using Microsoft.AspNetCore.Authorization;
 using System.Threading.Tasks;
 using Webshop.Application.Services.Customers.Interfaces;
 using Webshop.Application.DTOs.Orders;
+using Webshop.Application.DTOs.Shipping; // Neu
 using System.Security.Claims;
 using Microsoft.AspNetCore.Http;
 using Webshop.Application;
+using System.Collections.Generic;
 
 namespace Webshop.Api.Controllers.Customer
 {
@@ -22,11 +24,26 @@ namespace Webshop.Api.Controllers.Customer
             _checkoutService = checkoutService;
         }
 
+        // --- NEU: Endpoint um verf<72>gbare Versandmethoden basierend auf dem Warenkorb zu holen ---
+        [HttpPost("available-shipping-methods")]
+        [ProducesResponseType(typeof(IEnumerable<ShippingMethodDto>), StatusCodes.Status200OK)]
+        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+        public async Task<IActionResult> GetAvailableShippingMethods([FromBody] ShippingCalculationRequestDto request)
+        {
+            var result = await _checkoutService.GetCompatibleShippingMethodsAsync(request.Items);
+
+            return result.Type switch
+            {
+                ServiceResultType.Success => Ok(result.Value),
+                ServiceResultType.InvalidInput => BadRequest(new { Message = result.ErrorMessage }),
+                _ => StatusCode(StatusCodes.Status500InternalServerError, new { Message = "Fehler beim Laden der Versandmethoden." })
+            };
+        }
+
         [HttpPost("create-order")]
         [ProducesResponseType(typeof(OrderDetailDto), StatusCodes.Status201Created)]
         [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
         [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status401Unauthorized)]
-        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status403Forbidden)]
         [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status409Conflict)]
         public async Task<IActionResult> CreateOrder([FromBody] CreateOrderDto orderDto)
         {
@@ -35,7 +52,6 @@ namespace Webshop.Api.Controllers.Customer
                 return BadRequest(ModelState);
             }
 
-            // UserId aus dem JWT-Token des eingeloggten Kunden extrahieren
             var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (string.IsNullOrEmpty(userId))
             {
@@ -50,7 +66,7 @@ namespace Webshop.Api.Controllers.Customer
                 ServiceResultType.InvalidInput => BadRequest(new { Message = result.ErrorMessage }),
                 ServiceResultType.Conflict => Conflict(new { Message = result.ErrorMessage }),
                 ServiceResultType.Unauthorized => Unauthorized(new { Message = result.ErrorMessage }),
-                ServiceResultType.Forbidden => Forbid(), // Forbid returns 403 without a body
+                ServiceResultType.Forbidden => Forbid(),
                 _ => StatusCode(StatusCodes.Status500InternalServerError, new { Message = result.ErrorMessage ?? "Ein unerwarteter Fehler ist aufgetreten." })
             };
         }

Webshop.Api/Controllers/Customers/CustomerController.cs

@@ -10,6 +10,7 @@ using Webshop.Application.DTOs.Auth;
 using Webshop.Application.DTOs.Customers;
 using Webshop.Application.DTOs.Email;
 using Webshop.Application.Services.Customers;
+using Webshop.Application.Services.Customers.Interfaces;
 
 namespace Webshop.Api.Controllers.Customer
 {

Webshop.Api/Program.cs

@@ -12,6 +12,7 @@ using System.Text.Json.Serialization;
 
 // --- Eigene Namespaces ---
 using Webshop.Api.SwaggerFilters;
+using Webshop.Application.DTOs.Email;
 using Webshop.Application.Services.Admin;
 using Webshop.Application.Services.Admin.Interfaces;
 using Webshop.Application.Services.Auth;
@@ -26,6 +27,7 @@ using Webshop.Infrastructure.Data;
 using Webshop.Infrastructure.Repositories;
 using Webshop.Infrastructure.Services;
 
+
 var options = new WebApplicationOptions
 {
     Args = args,
@@ -111,8 +113,9 @@ builder.Services.Configure<ResendClientOptions>(options =>
     options.ApiToken = builder.Configuration["Resend:ApiToken"]!;
 });
 builder.Services.AddTransient<IResend, ResendClient>();
+builder.Services.Configure<EmailSettings>(builder.Configuration.GetSection("EmailSettings"));
 
-// Repositories
+// --- Repositories ---
 builder.Services.AddScoped<IProductRepository, ProductRepository>();
 builder.Services.AddScoped<ISupplierRepository, SupplierRepository>();
 builder.Services.AddScoped<ICustomerRepository, CustomerRepository>();
@@ -121,17 +124,32 @@ builder.Services.AddScoped<ICategorieRepository, CategorieRepository>();
 builder.Services.AddScoped<IOrderRepository, OrderRepository>();
 builder.Services.AddScoped<IShippingMethodRepository, ShippingMethodRepository>();
 builder.Services.AddScoped<IAddressRepository, AddressRepository>();
-builder.Services.AddScoped<IDiscountRepository, DiscountRepository>();
+builder.Services.AddScoped<IDiscountRepository, DiscountRepository>(); // War doppelt
 builder.Services.AddScoped<ISettingRepository, SettingRepository>();
 builder.Services.AddScoped<IShopInfoRepository, ShopInfoRepository>();
-builder.Services.AddScoped<IDiscountRepository, DiscountRepository>();
 builder.Services.AddScoped<IReviewRepository, ReviewRepository>();
 
-// Services
+// --- Services ---
+// Public & Core
 builder.Services.AddScoped<IAuthService, AuthService>();
 builder.Services.AddScoped<IProductService, ProductService>();
-builder.Services.AddScoped<IPaymentMethodService, PaymentMethodService>();
 builder.Services.AddScoped<ICategorieService, CategorieService>();
+builder.Services.AddScoped<IPaymentMethodService, PaymentMethodService>();
+builder.Services.AddScoped<IShopInfoService, ShopInfoService>();
+builder.Services.AddScoped<ISettingService, SettingService>();
+builder.Services.AddScoped<IDiscountService, DiscountService>();
+builder.Services.AddScoped<IReviewService, ReviewService>();
+builder.Services.AddScoped<IEmailService, EmailService>(); // WICHTIG: F<>r Auth & Checkout
+
+// Customer Scope
+builder.Services.AddScoped<ICustomerService, CustomerService>();
+builder.Services.AddScoped<IOrderService, OrderService>();
+builder.Services.AddScoped<IAddressService, AddressService>();
+builder.Services.AddScoped<ICheckoutService, CheckoutService>(); // War doppelt
+builder.Services.AddScoped<ICartService, CartService>(); // WICHTIG: F<>r Checkout Cleanup
+builder.Services.AddScoped<ICustomerReviewService, CustomerReviewService>();
+
+// Admin Scope
 builder.Services.AddScoped<IAdminUserService, AdminUserService>();
 builder.Services.AddScoped<IAdminProductService, AdminProductService>();
 builder.Services.AddScoped<IAdminSupplierService, AdminSupplierService>();
@@ -139,21 +157,9 @@ builder.Services.AddScoped<IAdminPaymentMethodService, AdminPaymentMethodService
 builder.Services.AddScoped<IAdminCategorieService, AdminCategorieService>();
 builder.Services.AddScoped<IAdminOrderService, AdminOrderService>();
 builder.Services.AddScoped<IAdminShippingMethodService, AdminShippingMethodService>();
-builder.Services.AddScoped<IAdminDiscountService, AdminDiscountService>();
+builder.Services.AddScoped<IAdminDiscountService, AdminDiscountService>(); // War doppelt
-builder.Services.AddScoped<IAdminSettingService, AdminSettingService>();
+builder.Services.AddScoped<IAdminSettingService, AdminSettingService>(); // War doppelt
-builder.Services.AddScoped<ICustomerService, CustomerService>();
-builder.Services.AddScoped<IOrderService, OrderService>();
-builder.Services.AddScoped<IAddressService, AddressService>();
-builder.Services.AddScoped<ICheckoutService, CheckoutService>();
 builder.Services.AddScoped<IAdminShopInfoService, AdminShopInfoService>();
-builder.Services.AddScoped<IShopInfoService, ShopInfoService>();
-builder.Services.AddScoped<ISettingService, SettingService>();
-builder.Services.AddScoped<IAdminSettingService, AdminSettingService>();
-builder.Services.AddScoped<IAdminDiscountService, AdminDiscountService>();
-builder.Services.AddScoped<ICheckoutService, CheckoutService>();
-builder.Services.AddScoped<IDiscountService, DiscountService>();
-builder.Services.AddScoped<IReviewService, ReviewService>();
-builder.Services.AddScoped<ICustomerReviewService, CustomerReviewService>();
 builder.Services.AddScoped<IAdminReviewService, AdminReviewService>();
 builder.Services.AddScoped<IAdminAnalyticsService, AdminAnalyticsService>();
 builder.Services.AddScoped<IAdminAddressService, AdminAddressService>();
@@ -163,6 +169,8 @@ builder.Services.AddControllers()
     .AddJsonOptions(options =>
     {
         options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
+        options.JsonSerializerOptions.DefaultIgnoreCondition =
+            System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull;
     });
 builder.Services.AddEndpointsApiExplorer();
 
@@ -209,7 +217,7 @@ builder.Services.AddSwaggerGen(c =>
     c.SchemaFilter<AddExampleSchemaFilter>();
     c.OperationFilter<AuthorizeOperationFilter>();
     c.OperationFilter<LoginExampleOperationFilter>();
-    c.OperationFilter<PaymentMethodExampleOperationFilter>();
+    //c.OperationFilter<PaymentMethodExampleOperationFilter>();
     c.OperationFilter<SupplierExampleOperationFilter>();
     c.OperationFilter<ShippingMethodExampleOperationFilter>();
     c.OperationFilter<AdminProductExampleOperationFilter>();
@@ -327,6 +335,6 @@ app.Run();
 
 
 
-//new git
+//new image build
 
 

Webshop.Api/appsettings.Development.json

@@ -16,7 +16,19 @@
     "ExpirationMinutes": 120
   },
   "Resend": {
-    "ApiToken": "re_Zd6aFcvz_CqSa9Krs7WCHXjngDVLTYhGv"
+    "ApiToken": "re_Zd6aFcvz_CqSa9Krs7WCHXjngDVLTYhGv",
+    "FromEmail": "onboarding@resend.dev"
   },
-  "App:BaseUrl": "https://shopsolution-backend.tzbre.dev"
+  "App": {
+    "BaseUrl": "https://shopsolution-backend.tzbre.dev",
+    "ClientUrl": "https://shopsolution-frontend.tzbre.dev",
+    "FrontendUrl": "https://shopsolution-frontend.tzbre.dev"
+  },
+  "ShopInfo": {
+    "Name": "Mein Webshop"
+  },
+  "EmailSettings": {
+    "SenderName": "Mein Webshop Support",
+    "SenderEmail": "noreply@shopsolution-frontend.tzbre.dev"
+  }
 }

Webshop.Application/DTOs/Email/EmailSettings.cs

@@ -0,0 +1,12 @@
+namespace Webshop.Application.DTOs.Email
+{
+    public class EmailSettings
+    {
+        public string SmtpServer { get; set; } = "smtp.example.com";
+        public int Port { get; set; } = 587;
+        public string SenderName { get; set; } = "Mein Webshop";
+        public string SenderEmail { get; set; } = "noreply@meinwebshop.de";
+        public string Username { get; set; } = "user";
+        public string Password { get; set; } = "pass";
+    }
+}

Webshop.Application/DTOs/Products/AdminProductDto.cs

@@ -27,5 +27,6 @@ namespace Webshop.Application.DTOs.Products
         // << NEU >>
         public bool IsFeatured { get; set; }
         public int FeaturedDisplayOrder { get; set; }
+        public byte[] RowVersion { get; set; }
     }
 }

Webshop.Application/DTOs/Products/UpdateAdminProductDto.cs

@@ -22,12 +22,13 @@ namespace Webshop.Application.DTOs.Products
         [Required]
         public string Slug { get; set; }
 
-        // << ZURÜCK ZU IFormFile >>
         public IFormFile? MainImageFile { get; set; }
         public List<IFormFile>? AdditionalImageFiles { get; set; }
         public List<Guid>? ImagesToDelete { get; set; }
 
-        public List<Guid> CategorieIds { get; set; } = new List<Guid>();
+        public Guid? SetMainImageId { get; set; }
+
+        public List<Guid>? CategorieIds { get; set; } = new List<Guid>();
 
         public decimal? Weight { get; set; }
         public decimal? OldPrice { get; set; }
@@ -35,5 +36,7 @@ namespace Webshop.Application.DTOs.Products
         public decimal? PurchasePrice { get; set; }
         public bool IsFeatured { get; set; }
         public int FeaturedDisplayOrder { get; set; }
+
+        public string? RowVersion { get; set; }
     }
 }

Webshop.Application/DTOs/Shipping/CartItemDto.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Webshop.Application.DTOs.Shipping
+{
+    public class CartItemDto
+    {
+        public Guid ProductId { get; set; }
+        public int Quantity { get; set; }
+
+        // +++ DIESE ZEILE HAT GEFEHLT +++
+        public Guid? ProductVariantId { get; set; }
+    }
+}

Webshop.Application/DTOs/Shipping/ShippingCalculationRequestDto.cs

@@ -0,0 +1,13 @@
+// src/Webshop.Application/DTOs/Shipping/ShippingCalculationRequestDto.cs
+using System;
+using System.Collections.Generic;
+
+namespace Webshop.Application.DTOs.Shipping
+{
+    public class ShippingCalculationRequestDto
+    {
+        public List<CartItemDto> Items { get; set; } = new();
+    }
+
+  
+}

Webshop.Application/DTOs/Shipping/ShippingMethodDto.cs

@@ -1,8 +1,4 @@
-// Auto-generiert von CreateWebshopFiles.ps1
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
 
 namespace Webshop.Application.DTOs.Shipping
 {
@@ -15,5 +11,9 @@ namespace Webshop.Application.DTOs.Shipping
         public bool IsActive { get; set; }
         public int MinDeliveryDays { get; set; }
         public int MaxDeliveryDays { get; set; }
+
+        // NEU: Gewichtsgrenzen f<>r diese Methode
+        public decimal MinWeight { get; set; }
+        public decimal MaxWeight { get; set; }
     }
 }

Webshop.Application/Services/Admin/AdminProductService.cs

@@ -100,7 +100,8 @@ namespace Webshop.Application.Services.Admin
                 IsFeatured = productDto.IsFeatured,
                 FeaturedDisplayOrder = productDto.FeaturedDisplayOrder,
                 Images = images,
-                Productcategories = productDto.CategorieIds.Select(cId => new Productcategorie { categorieId = cId }).ToList()
+                Productcategories = productDto.CategorieIds.Select(cId => new Productcategorie { categorieId = cId }).ToList(),
+                 RowVersion = Guid.NewGuid().ToByteArray()
             };
 
             await _productRepository.AddProductAsync(newProduct);
@@ -109,20 +110,208 @@ namespace Webshop.Application.Services.Admin
 
         // ... (UpdateAdminProductAsync und DeleteAdminProductAsync und MapToAdminDto bleiben unver<65>ndert) ...
         #region Unchanged Methods
+        // src/Webshop.Application/Services/Admin/AdminProductService.cs
+
         public async Task<ServiceResult> UpdateAdminProductAsync(UpdateAdminProductDto productDto)
         {
-            var existingProduct = await _context.Products.Include(p => p.Images).Include(p => p.Productcategories).FirstOrDefaultAsync(p => p.Id == productDto.Id);
+            Console.WriteLine($"---- UPDATE START: Produkt-ID {productDto.Id} ----");
-            if (existingProduct == null) { return ServiceResult.Fail(ServiceResultType.NotFound, $"Produkt mit ID '{productDto.Id}' nicht gefunden."); }
+
-            var skuExists = await _context.Products.AnyAsync(p => p.SKU == productDto.SKU && p.Id != productDto.Id);
+            // 1. Produkt laden (nur um sicherzugehen, dass es existiert und f<>r alte Bilder)
-            if (skuExists) { return ServiceResult.Fail(ServiceResultType.Conflict, $"Ein anderes Produkt mit der SKU '{productDto.SKU}' existiert bereits."); }
+            var existingProduct = await _context.Products
-            var slugExists = await _context.Products.AnyAsync(p => p.Slug == productDto.Slug && p.Id != productDto.Id);
+                .Include(p => p.Images)
-            if (slugExists) { return ServiceResult.Fail(ServiceResultType.Conflict, $"Ein anderes Produkt mit dem Slug '{productDto.Slug}' existiert bereits."); }
+                .Include(p => p.Productcategories)
-            if (productDto.ImagesToDelete != null && productDto.ImagesToDelete.Any()) { var imagesToRemove = existingProduct.Images.Where(img => productDto.ImagesToDelete.Contains(img.Id)).ToList(); _context.ProductImages.RemoveRange(imagesToRemove); }
+                .FirstOrDefaultAsync(p => p.Id == productDto.Id);
-            if (productDto.MainImageFile != null) { var existingMainImage = existingProduct.Images.FirstOrDefault(img => img.IsMainImage); if (existingMainImage != null) _context.ProductImages.Remove(existingMainImage); await using var stream = productDto.MainImageFile.OpenReadStream(); var url = await _fileStorageService.SaveFileAsync(stream, productDto.MainImageFile.FileName, productDto.MainImageFile.ContentType); existingProduct.Images.Add(new ProductImage { Url = url, IsMainImage = true, DisplayOrder = 1 }); }
+
-            if (productDto.AdditionalImageFiles != null && productDto.AdditionalImageFiles.Any()) { int displayOrder = (existingProduct.Images.Any() ? existingProduct.Images.Max(i => i.DisplayOrder) : 0) + 1; foreach (var file in productDto.AdditionalImageFiles) { await using var stream = file.OpenReadStream(); var url = await _fileStorageService.SaveFileAsync(stream, file.FileName, file.ContentType); existingProduct.Images.Add(new ProductImage { Url = url, IsMainImage = false, DisplayOrder = displayOrder++ }); } }
+            if (existingProduct == null)
-            existingProduct.Name = productDto.Name; existingProduct.Description = productDto.Description; existingProduct.SKU = productDto.SKU; existingProduct.Price = productDto.Price; existingProduct.IsActive = productDto.IsActive; existingProduct.StockQuantity = productDto.StockQuantity; existingProduct.Slug = productDto.Slug; existingProduct.Weight = productDto.Weight; existingProduct.OldPrice = productDto.OldPrice; existingProduct.SupplierId = productDto.SupplierId; existingProduct.PurchasePrice = productDto.PurchasePrice; existingProduct.LastModifiedDate = DateTimeOffset.UtcNow; existingProduct.IsFeatured = productDto.IsFeatured; existingProduct.FeaturedDisplayOrder = productDto.FeaturedDisplayOrder;
+            {
-            existingProduct.Productcategories.Clear(); if (productDto.CategorieIds != null) { foreach (var categorieId in productDto.CategorieIds) { existingProduct.Productcategories.Add(new Productcategorie { categorieId = categorieId }); } }
+                return ServiceResult.Fail(ServiceResultType.NotFound, $"Produkt nicht gefunden.");
-            await _productRepository.UpdateProductAsync(existingProduct); return ServiceResult.Ok();
+            }
+
+            // 2. Optionaler Concurrency Check
+            if (!string.IsNullOrEmpty(productDto.RowVersion))
+            {
+                string dbRowVersion = Convert.ToBase64String(existingProduct.RowVersion ?? new byte[0]);
+                string incomingRowVersion = productDto.RowVersion.Trim().Replace(" ", "+");
+
+                if (dbRowVersion != incomingRowVersion)
+                {
+                    Console.WriteLine("!!! KONFLIKT: Versionen unterschiedlich !!!");
+                    return ServiceResult.Fail(ServiceResultType.Conflict, "Das Produkt wurde zwischenzeitlich bearbeitet.");
+                }
+            }
+
+            // -----------------------------------------------------------------------
+            // SCHRITT A: BILDER UPDATE (DIREKT AM CONTEXT)
+            // -----------------------------------------------------------------------
+            bool imagesChanged = false;
+
+            // A1. Bilder l<>schen
+            if (productDto.ImagesToDelete != null && productDto.ImagesToDelete.Any())
+            {
+                // Wir suchen die zu l<>schenden Bilder direkt im Context
+                var imagesToRemove = existingProduct.Images.Where(img => productDto.ImagesToDelete.Contains(img.Id)).ToList();
+                if (imagesToRemove.Any())
+                {
+                    _context.ProductImages.RemoveRange(imagesToRemove);
+                    imagesChanged = true;
+                }
+            }
+
+            // Hilfsfunktion um saubere neue Bilder zu erstellen
+            ProductImage CreateNewImage(string url, bool isMain, int order)
+            {
+                return new ProductImage
+                {
+                    Id = Guid.NewGuid(),          // WICHTIG: Neue ID client-seitig generieren
+                    ProductId = existingProduct.Id, // WICHTIG: Explizite Zuordnung zum Produkt
+                    Url = url,
+                    IsMainImage = isMain,
+                    DisplayOrder = order
+                };
+            }
+
+            // A2. Hauptbild
+            if (productDto.MainImageFile != null)
+            {
+                // Altes Hauptbild finden und l<>schen
+                var existingMainImage = existingProduct.Images.FirstOrDefault(img => img.IsMainImage);
+                if (existingMainImage != null)
+                {
+                    _context.ProductImages.Remove(existingMainImage);
+                }
+
+                await using var stream = productDto.MainImageFile.OpenReadStream();
+                var url = await _fileStorageService.SaveFileAsync(stream, productDto.MainImageFile.FileName, productDto.MainImageFile.ContentType);
+
+                // NEU: Direktes Hinzuf<75>gen zum Context (Umgeht Collection-Tracking Probleme)
+                var newMainImage = CreateNewImage(url, true, 1);
+                _context.ProductImages.Add(newMainImage);
+
+                imagesChanged = true;
+            }
+            // >>> NEU: A2.5 Szenario: BESTEHENDES Bild als Hauptbild <<<
+            else if (productDto.SetMainImageId.HasValue)
+            {
+                // Wir suchen das Bild in der Liste, die wir schon aus der DB geladen haben
+                var targetImage = existingProduct.Images.FirstOrDefault(img => img.Id == productDto.SetMainImageId.Value);
+
+                // Nur ausf<73>hren, wenn Bild existiert und noch nicht Main ist
+                if (targetImage != null && !targetImage.IsMainImage)
+                {
+                    Console.WriteLine($"---- Setze existierendes Bild {targetImage.Id} als MAIN ----");
+
+                    // 1. Alle Bilder auf "Nicht-Main" setzen
+                    foreach (var img in existingProduct.Images)
+                    {
+                        img.IsMainImage = false;
+                        // Optional: Ordnung korrigieren, damit Main immer vorne ist
+                        if (img.DisplayOrder == 1) img.DisplayOrder = 2;
+                    }
+
+                    // 2. Das gew<65>hlte Bild auf Main setzen
+                    targetImage.IsMainImage = true;
+                    targetImage.DisplayOrder = 1;
+
+                    // Da wir hier getrackte Entities <20>ndern, generiert EF Core automatisch UPDATEs
+                    imagesChanged = true;
+                }
+            }
+
+            // A3. Zusatzbilder
+            if (productDto.AdditionalImageFiles != null && productDto.AdditionalImageFiles.Any())
+            {
+                // H<>chste DisplayOrder ermitteln (sicher gegen NullReference)
+                int currentMaxOrder = existingProduct.Images.Any() ? existingProduct.Images.Max(i => i.DisplayOrder) : 0;
+                int displayOrder = currentMaxOrder + 1;
+
+                foreach (var file in productDto.AdditionalImageFiles)
+                {
+                    await using var stream = file.OpenReadStream();
+                    var url = await _fileStorageService.SaveFileAsync(stream, file.FileName, file.ContentType);
+
+                    // NEU: Direktes Hinzuf<75>gen zum Context
+                    var newAdditionalImage = CreateNewImage(url, false, displayOrder++);
+                    _context.ProductImages.Add(newAdditionalImage);
+                }
+                imagesChanged = true;
+            }
+
+            // -----------------------------------------------------------------------
+            // SCHRITT A SPEICHERN
+            // -----------------------------------------------------------------------
+            if (imagesChanged)
+            {
+                try
+                {
+                    Console.WriteLine("---- SPEICHERE BILDER (Context Add) ----");
+                    await _context.SaveChangesAsync();
+
+                    // WICHTIG: State neu laden f<>r Schritt B
+                    // Wir m<>ssen dem Context sagen, dass existingProduct neu geladen werden soll,
+                    // damit die Navigations-Properties (Images) wieder aktuell sind.
+                    await _context.Entry(existingProduct).ReloadAsync();
+
+                    // Da wir die Collection umgangen haben, m<>ssen wir sie explizit neu laden
+                    await _context.Entry(existingProduct).Collection(p => p.Images).LoadAsync();
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Fehler Bild-Save: {ex.Message}");
+                    // Inner Exception loggen, falls vorhanden
+                    if (ex.InnerException != null) Console.WriteLine($"Inner: {ex.InnerException.Message}");
+
+                    return ServiceResult.Fail(ServiceResultType.Failure, "Fehler beim Speichern der Bilder.");
+                }
+            }
+
+            // -----------------------------------------------------------------------
+            // SCHRITT B: PRODUKT EIGENSCHAFTEN
+            // -----------------------------------------------------------------------
+
+            // Kategorien update
+            if (productDto.CategorieIds != null)
+            {
+                var currentIds = existingProduct.Productcategories.Select(pc => pc.categorieId).ToList();
+                if (!new HashSet<Guid>(currentIds).SetEquals(productDto.CategorieIds))
+                {
+                    existingProduct.Productcategories.Clear();
+                    foreach (var cId in productDto.CategorieIds)
+                    {
+                        existingProduct.Productcategories.Add(new Productcategorie { categorieId = cId });
+                    }
+                }
+            }
+
+            // Mapping
+            existingProduct.Name = productDto.Name;
+            existingProduct.Description = productDto.Description;
+            existingProduct.SKU = productDto.SKU;
+            existingProduct.Price = productDto.Price;
+            existingProduct.IsActive = productDto.IsActive;
+            existingProduct.StockQuantity = productDto.StockQuantity;
+            existingProduct.Slug = productDto.Slug;
+            existingProduct.Weight = productDto.Weight;
+            existingProduct.OldPrice = productDto.OldPrice;
+            existingProduct.SupplierId = productDto.SupplierId;
+            existingProduct.PurchasePrice = productDto.PurchasePrice;
+            existingProduct.IsFeatured = productDto.IsFeatured;
+            existingProduct.FeaturedDisplayOrder = productDto.FeaturedDisplayOrder;
+
+            // Metadaten
+            existingProduct.LastModifiedDate = DateTimeOffset.UtcNow;
+            existingProduct.RowVersion = Guid.NewGuid().ToByteArray();
+
+            try
+            {
+                Console.WriteLine("---- SPEICHERE PRODUKT-DATEN ----");
+                await _context.SaveChangesAsync();
+            }
+            catch (DbUpdateConcurrencyException)
+            {
+                return ServiceResult.Fail(ServiceResultType.Conflict, "Konflikt beim Speichern der Produktdaten.");
+            }
+
+            return ServiceResult.Ok();
         }
 
         public async Task<ServiceResult> DeleteAdminProductAsync(Guid id)
@@ -134,7 +323,7 @@ namespace Webshop.Application.Services.Admin
 
         private AdminProductDto MapToAdminDto(Product product)
         {
-            return new AdminProductDto { Id = product.Id, Name = product.Name, Description = product.Description, SKU = product.SKU, Price = product.Price, OldPrice = product.OldPrice, IsActive = product.IsActive, IsInStock = product.IsInStock, StockQuantity = product.StockQuantity, Weight = product.Weight, Slug = product.Slug, CreatedDate = product.CreatedDate, LastModifiedDate = product.LastModifiedDate, SupplierId = product.SupplierId, PurchasePrice = product.PurchasePrice, IsFeatured = product.IsFeatured, FeaturedDisplayOrder = product.FeaturedDisplayOrder, categorieIds = product.Productcategories.Select(pc => pc.categorieId).ToList(), Images = product.Images.OrderBy(i => i.DisplayOrder).Select(img => new ProductImageDto { Id = img.Id, Url = img.Url, IsMainImage = img.IsMainImage, DisplayOrder = img.DisplayOrder }).ToList() };
+            return new AdminProductDto { Id = product.Id, Name = product.Name, Description = product.Description, SKU = product.SKU, Price = product.Price, OldPrice = product.OldPrice, IsActive = product.IsActive, IsInStock = product.IsInStock, StockQuantity = product.StockQuantity, Weight = product.Weight, Slug = product.Slug, CreatedDate = product.CreatedDate, LastModifiedDate = product.LastModifiedDate, SupplierId = product.SupplierId, PurchasePrice = product.PurchasePrice, IsFeatured = product.IsFeatured, FeaturedDisplayOrder = product.FeaturedDisplayOrder, categorieIds = product.Productcategories.Select(pc => pc.categorieId).ToList(), Images = product.Images.OrderBy(i => i.DisplayOrder).Select(img => new ProductImageDto { Id = img.Id, Url = img.Url, IsMainImage = img.IsMainImage, DisplayOrder = img.DisplayOrder }).ToList(), RowVersion = product.RowVersion };
         }
         #endregion
     }

Webshop.Application/Services/Admin/AdminShippingMethodService.cs

@@ -1,14 +1,13 @@
-// src/Webshop.Application/Services/Admin/AdminShippingMethodService.cs
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore; // Hinzufügen für .AnyAsync
+using Microsoft.EntityFrameworkCore;
 using Webshop.Application;
 using Webshop.Application.DTOs.Shipping;
 using Webshop.Domain.Entities;
 using Webshop.Domain.Interfaces;
-using Webshop.Infrastructure.Data; // Hinzufügen für DbContext
+using Webshop.Infrastructure.Data;
 
 namespace Webshop.Application.Services.Admin
 {
@@ -55,14 +54,15 @@ namespace Webshop.Application.Services.Admin
                 Description = shippingMethodDto.Description,
                 BaseCost = shippingMethodDto.Cost,
                 IsActive = shippingMethodDto.IsActive,
-                // +++ KORREKTUR +++
                 MinDeliveryDays = shippingMethodDto.MinDeliveryDays,
-                MaxDeliveryDays = shippingMethodDto.MaxDeliveryDays
+                MaxDeliveryDays = shippingMethodDto.MaxDeliveryDays,
+                // NEU: Gewichte mappen
+                MinWeight = shippingMethodDto.MinWeight,
+                MaxWeight = shippingMethodDto.MaxWeight
             };
 
             await _shippingMethodRepository.AddAsync(newMethod);
 
-            // Verwende MapToDto, um eine konsistente Antwort zu gewährleisten
             return ServiceResult.Ok(MapToDto(newMethod));
         }
 
@@ -75,6 +75,7 @@ namespace Webshop.Application.Services.Admin
             }
 
             var allMethods = await _shippingMethodRepository.GetAllAsync();
+            // Prüfen, ob der Name von einer ANDEREN Methode bereits verwendet wird
             if (allMethods.Any(sm => sm.Name.Equals(shippingMethodDto.Name, StringComparison.OrdinalIgnoreCase) && sm.Id != shippingMethodDto.Id))
             {
                 return ServiceResult.Fail(ServiceResultType.Conflict, $"Eine andere Versandmethode mit dem Namen '{shippingMethodDto.Name}' existiert bereits.");
@@ -84,9 +85,11 @@ namespace Webshop.Application.Services.Admin
             existingMethod.Description = shippingMethodDto.Description;
             existingMethod.BaseCost = shippingMethodDto.Cost;
             existingMethod.IsActive = shippingMethodDto.IsActive;
-            // +++ KORREKTUR +++
             existingMethod.MinDeliveryDays = shippingMethodDto.MinDeliveryDays;
             existingMethod.MaxDeliveryDays = shippingMethodDto.MaxDeliveryDays;
+            // NEU: Gewichte aktualisieren
+            existingMethod.MinWeight = shippingMethodDto.MinWeight;
+            existingMethod.MaxWeight = shippingMethodDto.MaxWeight;
 
             await _shippingMethodRepository.UpdateAsync(existingMethod);
             return ServiceResult.Ok();
@@ -119,9 +122,11 @@ namespace Webshop.Application.Services.Admin
                 Description = sm.Description,
                 Cost = sm.BaseCost,
                 IsActive = sm.IsActive,
-                // +++ KORREKTUR +++
                 MinDeliveryDays = sm.MinDeliveryDays,
-                MaxDeliveryDays = sm.MaxDeliveryDays
+                MaxDeliveryDays = sm.MaxDeliveryDays,
+                // NEU: Gewichte ins DTO übertragen
+                MinWeight = sm.MinWeight,
+                MaxWeight = sm.MaxWeight
             };
         }
     }

Webshop.Application/Services/Auth/AuthService.cs

@@ -2,39 +2,37 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
-using Resend;
 using System;
-using System.IO;
+using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
-using System.Web;
+using Webshop.Application;
 using Webshop.Application.DTOs.Auth;
+using Webshop.Application.Services.Public.Interfaces;
 using Webshop.Domain.Identity;
 using Webshop.Infrastructure.Data;
-using Webshop.Application;
-using System.Collections.Generic;
 
 namespace Webshop.Application.Services.Auth
 {
     public class AuthService : IAuthService
     {
         private readonly UserManager<ApplicationUser> _userManager;
+        private readonly IEmailService _emailService;
         private readonly IConfiguration _configuration;
-        private readonly IResend _resend;
         private readonly ApplicationDbContext _context;
 
         public AuthService(
             UserManager<ApplicationUser> userManager,
+            IEmailService emailService,
             IConfiguration configuration,
-            IResend resend,
             ApplicationDbContext context)
         {
             _userManager = userManager;
+            _emailService = emailService;
             _configuration = configuration;
-            _resend = resend;
             _context = context;
         }
 
@@ -66,7 +64,9 @@ namespace Webshop.Application.Services.Auth
             _context.Customers.Add(customerProfile);
             await _context.SaveChangesAsync();
 
-            await SendEmailConfirmationEmail(user);
+            // Link generieren und Service aufrufen
+            await SendConfirmationLinkAsync(user);
+
             return ServiceResult.Ok();
         }
 
@@ -102,18 +102,16 @@ namespace Webshop.Application.Services.Auth
             var loginResult = await LoginUserAsync(request);
             if (loginResult.Type != ServiceResultType.Success)
             {
-                // Propagate the specific login failure (e.g., Unauthorized)
                 return ServiceResult.Fail<AuthResponseDto>(loginResult.Type, loginResult.ErrorMessage!);
             }
 
             var user = await _userManager.FindByEmailAsync(request.Email);
-            // This check is belt-and-suspenders, but good practice
             if (user == null || !await _userManager.IsInRoleAsync(user, "Admin"))
             {
                 return ServiceResult.Fail<AuthResponseDto>(ServiceResultType.Forbidden, "Keine Berechtigung für den Admin-Zugang.");
             }
 
-            return loginResult; // Return the successful login result
+            return loginResult;
         }
 
         public async Task<ServiceResult> ConfirmEmailAsync(string userId, string token)
@@ -126,11 +124,10 @@ namespace Webshop.Application.Services.Auth
             var user = await _userManager.FindByIdAsync(userId);
             if (user == null)
             {
-                // Do not reveal that the user does not exist
                 return ServiceResult.Fail(ServiceResultType.NotFound, "Ungültiger Bestätigungsversuch.");
             }
 
-            var result = await _userManager.ConfirmEmailAsync(user, token); // The token from the URL is already decoded by ASP.NET Core
+            var result = await _userManager.ConfirmEmailAsync(user, token);
             return result.Succeeded
                 ? ServiceResult.Ok()
                 : ServiceResult.Fail(ServiceResultType.Failure, "E-Mail-Bestätigung fehlgeschlagen.");
@@ -139,48 +136,33 @@ namespace Webshop.Application.Services.Auth
         public async Task<ServiceResult> ResendEmailConfirmationAsync(string email)
         {
             var user = await _userManager.FindByEmailAsync(email);
-
+            if (user == null) return ServiceResult.Ok();
-            if (user == null)
-            {
-                return ServiceResult.Ok(); // Do not reveal user existence
-            }
 
             if (user.EmailConfirmed)
             {
                 return ServiceResult.Fail(ServiceResultType.InvalidInput, "Diese E-Mail-Adresse ist bereits bestätigt.");
             }
 
-            await SendEmailConfirmationEmail(user);
+            await SendConfirmationLinkAsync(user);
             return ServiceResult.Ok();
         }
 
         public async Task<ServiceResult> ForgotPasswordAsync(ForgotPasswordRequestDto request)
         {
             var user = await _userManager.FindByEmailAsync(request.Email);
-            if (user == null || !(await _userManager.IsEmailConfirmedAsync(user)))
+            if (user != null)
             {
-                return ServiceResult.Ok(); // Do not reveal user existence or status
+                var token = await _userManager.GeneratePasswordResetTokenAsync(user);
+                var clientUrl = _configuration["App:ClientUrl"];
+
+                // Sicherstellen, dass URL-Parameter escaped sind
+                var resetLink = $"{clientUrl}/reset-password?token={Uri.EscapeDataString(token)}&email={Uri.EscapeDataString(request.Email)}";
+
+                await _emailService.SendPasswordResetAsync(user.Email!, resetLink);
             }
 
-            var token = await _userManager.GeneratePasswordResetTokenAsync(user);
+            // WICHTIG: Wir geben IMMER Ok zurück, auch wenn der User nicht existiert.
-            var clientUrl = _configuration["App:ClientUrl"] ?? "http://localhost:3000";
+            // Das verhindert "User Enumeration" (Hacker können nicht prüfen, welche E-Mails existieren).
-            // Important: URL-encode components separately to avoid encoding the whole URL structure
-            var resetLink = $"{clientUrl}/reset-password?email={HttpUtility.UrlEncode(request.Email)}&token={HttpUtility.UrlEncode(token)}";
-
-            var emailHtmlBody = await LoadAndFormatEmailTemplate(
-                "Setzen Sie Ihr Passwort zurück",
-                "Sie haben eine Anfrage zum Zurücksetzen Ihres Passworts gesendet. Klicken Sie auf den Button unten, um ein neues Passwort festzulegen.",
-                "Passwort zurücksetzen",
-                resetLink
-            );
-
-            var message = new EmailMessage();
-            message.To.Add(request.Email);
-            message.From = _configuration["Resend:FromEmail"]!;
-            message.Subject = "Anleitung zum Zurücksetzen Ihres Passworts";
-            message.HtmlBody = emailHtmlBody;
-            await _resend.EmailSendAsync(message);
-
             return ServiceResult.Ok();
         }
 
@@ -189,7 +171,6 @@ namespace Webshop.Application.Services.Auth
             var user = await _userManager.FindByEmailAsync(request.Email);
             if (user == null)
             {
-                // Don't reveal user non-existence, but the error message will be generic
                 return ServiceResult.Fail(ServiceResultType.InvalidInput, "Fehler beim Zurücksetzen des Passworts.");
             }
 
@@ -200,26 +181,17 @@ namespace Webshop.Application.Services.Auth
                 : ServiceResult.Fail(ServiceResultType.InvalidInput, string.Join(" ", result.Errors.Select(e => e.Description)));
         }
 
-        private async Task SendEmailConfirmationEmail(ApplicationUser user)
+        // --- Helper Methods ---
+
+        private async Task SendConfirmationLinkAsync(ApplicationUser user)
         {
             var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
-            var encodedToken = HttpUtility.UrlEncode(token);
+            var clientUrl = _configuration["App:ClientUrl"]; // z.B. https://localhost:5001/api/v1/Auth
-            var clientUrl = _configuration["App:ClientUrl"]!;
-            var confirmationLink = $"{clientUrl}/confirm-email?userId={user.Id}&token={encodedToken}";
 
-            var emailHtmlBody = await LoadAndFormatEmailTemplate(
+            // WICHTIG: Uri.EscapeDataString ist sicherer für Token in URLs als HttpUtility
-                "Bestätigen Sie Ihre E-Mail-Adresse",
+            var confirmationLink = $"{clientUrl}/confirm-email?userId={user.Id}&token={Uri.EscapeDataString(token)}";
-                "Vielen Dank für Ihre Registrierung! Bitte klicken Sie auf den Button unten, um Ihr Konto zu aktivieren.",
-                "Konto aktivieren",
-                confirmationLink
-            );
 
-            var message = new EmailMessage();
+            await _emailService.SendEmailConfirmationAsync(user.Email!, confirmationLink);
-            message.To.Add(user.Email!);
-            message.From = _configuration["Resend:FromEmail"]!;
-            message.Subject = "Willkommen! Bitte bestätigen Sie Ihre E-Mail-Adresse";
-            message.HtmlBody = emailHtmlBody;
-            await _resend.EmailSendAsync(message);
         }
 
         private string GenerateJwtToken(ApplicationUser user, IList<string> roles)
@@ -251,22 +223,5 @@ namespace Webshop.Application.Services.Auth
 
             return new JwtSecurityTokenHandler().WriteToken(token);
         }
-
-        private async Task<string> LoadAndFormatEmailTemplate(string titel, string haupttext, string callToActionText, string callToActionLink)
-        {
-            var templatePath = Path.Combine(AppContext.BaseDirectory, "Templates", "_EmailTemplate.html");
-            if (!File.Exists(templatePath))
-            {
-                return $"<h1>{titel}</h1><p>{haupttext}</p><a href='{callToActionLink}'>{callToActionText}</a>";
-            }
-            var template = await File.ReadAllTextAsync(templatePath);
-            template = template.Replace("{{ShopName}}", _configuration["ShopInfo:Name"] ?? "Ihr Webshop");
-            template = template.Replace("{{Titel}}", titel);
-            template = template.Replace("{{Haupttext}}", haupttext);
-            template = template.Replace("{{CallToActionText}}", callToActionText);
-            template = template.Replace("{{CallToActionLink}}", callToActionLink);
-            template = template.Replace("{{Jahr}}", DateTime.UtcNow.Year.ToString());
-            return template;
-        }
     }
 }

Webshop.Application/Services/Customers/CartService.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Threading.Tasks;
+using Webshop.Application.Services.Customers.Interfaces;
+using Webshop.Infrastructure.Data;
+
+namespace Webshop.Application.Services.Customers
+{
+    public class CartService : ICartService
+    {
+        private readonly ApplicationDbContext _context;
+
+        public CartService(ApplicationDbContext context)
+        {
+            _context = context;
+        }
+
+        public async Task ClearCartAsync(string userId)
+        {
+            // Wir suchen den Warenkorb des Users
+            // Annahme: Es gibt eine 'Carts' Tabelle und 'CartItems'
+            var cart = await _context.Carts
+                .Include(c => c.Items)
+                .FirstOrDefaultAsync(c => c.UserId == userId);
+
+            if (cart != null && cart.Items.Any())
+            {
+                // Option A: Nur Items löschen, Warenkorb behalten
+                _context.CartItems.RemoveRange(cart.Items);
+
+                // Option B: Ganzen Warenkorb löschen (dann wird er beim nächsten AddToCart neu erstellt)
+                // _context.Carts.Remove(cart);
+
+                await _context.SaveChangesAsync();
+            }
+        }
+    }
+}

Webshop.Application/Services/Customers/CheckoutService.cs

@@ -1,15 +1,19 @@
-// /src/Webshop.Application/Services/Customers/CheckoutService.cs
+// src/Webshop.Application/Services/Customers/CheckoutService.cs
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Webshop.Application;
 using Webshop.Application.DTOs.Customers;
 using Webshop.Application.DTOs.Orders;
+using Webshop.Application.DTOs.Shipping;
 using Webshop.Application.Services.Customers.Interfaces;
 using Webshop.Application.Services.Public.Interfaces;
+using Webshop.Application.Services.Public; // Für DiscountCalculationResult
 using Webshop.Domain.Entities;
 using Webshop.Domain.Enums;
 using Webshop.Domain.Interfaces;
@@ -25,10 +29,20 @@ namespace Webshop.Application.Services.Customers
         private readonly IShippingMethodRepository _shippingMethodRepository;
         private readonly ISettingService _settingService;
         private readonly IDiscountService _discountService;
+        private readonly ICartService _cartService;
+        private readonly IEmailService _emailService;
+        private readonly ILogger<CheckoutService> _logger;
 
         public CheckoutService(
-            ApplicationDbContext context, IOrderRepository orderRepository, ICustomerRepository customerRepository,
+            ApplicationDbContext context,
-            IShippingMethodRepository shippingMethodRepository, ISettingService settingService, IDiscountService discountService)
+            IOrderRepository orderRepository,
+            ICustomerRepository customerRepository,
+            IShippingMethodRepository shippingMethodRepository,
+            ISettingService settingService,
+            IDiscountService discountService,
+            ICartService cartService,
+            IEmailService emailService,
+            ILogger<CheckoutService> logger)
         {
             _context = context;
             _orderRepository = orderRepository;
@@ -36,6 +50,63 @@ namespace Webshop.Application.Services.Customers
             _shippingMethodRepository = shippingMethodRepository;
             _settingService = settingService;
             _discountService = discountService;
+            _cartService = cartService;
+            _emailService = emailService;
+            _logger = logger;
+        }
+
+        // =================================================================================
+        // FIX: Überladung für CartItemDto (Löst den Konvertierungsfehler im Controller)
+        // =================================================================================
+        public async Task<ServiceResult<IEnumerable<ShippingMethodDto>>> GetCompatibleShippingMethodsAsync(List<CartItemDto> items)
+        {
+            // Mappe CartItemDto zu CreateOrderItemDto, damit wir die Logik wiederverwenden können
+            var mappedItems = items.Select(x => new CreateOrderItemDto
+            {
+                ProductId = x.ProductId,
+                Quantity = x.Quantity,
+                ProductVariantId = x.ProductVariantId
+            });
+            return await GetCompatibleShippingMethodsAsync(mappedItems);
+        }
+
+        // Die Hauptlogik basierend auf CreateOrderItemDto (für den Checkout)
+        public async Task<ServiceResult<IEnumerable<ShippingMethodDto>>> GetCompatibleShippingMethodsAsync(IEnumerable<CreateOrderItemDto> items)
+        {
+            if (items == null || !items.Any())
+                return ServiceResult.Ok<IEnumerable<ShippingMethodDto>>(new List<ShippingMethodDto>());
+
+            var productIds = items.Select(i => i.ProductId).ToList();
+            var products = await _context.Products.Where(p => productIds.Contains(p.Id)).ToListAsync();
+
+            decimal totalWeight = 0;
+            foreach (var item in items)
+            {
+                var product = products.FirstOrDefault(p => p.Id == item.ProductId);
+                if (product != null)
+                {
+                    totalWeight += (decimal)(product.Weight ?? 0) * item.Quantity;
+                }
+            }
+
+            var allMethods = await _shippingMethodRepository.GetAllAsync();
+            var compatibleMethods = allMethods
+                .Where(sm => sm.IsActive && totalWeight >= sm.MinWeight && totalWeight <= sm.MaxWeight)
+                .Select(sm => new ShippingMethodDto
+                {
+                    Id = sm.Id,
+                    Name = sm.Name,
+                    Description = sm.Description,
+                    Cost = sm.BaseCost,
+                    IsActive = sm.IsActive,
+                    MinDeliveryDays = sm.MinDeliveryDays,
+                    MaxDeliveryDays = sm.MaxDeliveryDays,
+                    MinWeight = sm.MinWeight,
+                    MaxWeight = sm.MaxWeight
+                })
+                .ToList();
+
+            return ServiceResult.Ok<IEnumerable<ShippingMethodDto>>(compatibleMethods);
         }
 
         public async Task<ServiceResult<OrderDetailDto>> CreateOrderAsync(CreateOrderDto orderDto, string? userId)
@@ -43,47 +114,67 @@ namespace Webshop.Application.Services.Customers
             await using var transaction = await _context.Database.BeginTransactionAsync();
             try
             {
-                // --- 1. Validierung von Kunde, Adressen und Methoden ---
+                // 1.1 Kunde Validieren
                 var customer = await _customerRepository.GetByUserIdAsync(userId!);
                 if (customer == null)
                     return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Unauthorized, "Kundenprofil nicht gefunden.");
 
-                if (!await _context.Addresses.AnyAsync(a => a.Id == orderDto.ShippingAddressId && a.CustomerId == customer.Id) ||
+                // =================================================================================
-                    !await _context.Addresses.AnyAsync(a => a.Id == orderDto.BillingAddressId && a.CustomerId == customer.Id))
+                // FIX: E-Mail holen (Passend zu deiner Entity Customer.cs)
+                // Customer hat keine Email, aber eine AspNetUserId. Wir holen die Mail aus der Users Tabelle.
+                // =================================================================================
+                var userEmail = await _context.Users
+                    .Where(u => u.Id == userId) // userId entspricht customer.AspNetUserId
+                    .Select(u => u.Email)
+                    .FirstOrDefaultAsync();
+
+                if (string.IsNullOrEmpty(userEmail))
                 {
-                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Forbidden, "Ungültige oder nicht zugehörige Liefer- oder Rechnungsadresse.");
+                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Failure, "Keine E-Mail-Adresse für den Benutzer gefunden.");
                 }
 
+                // 1.2 Adressen Validieren
+                var addresses = await _context.Addresses
+                    .Where(a => (a.Id == orderDto.ShippingAddressId || a.Id == orderDto.BillingAddressId) && a.CustomerId == customer.Id)
+                    .ToListAsync();
+
+                if (!addresses.Any(a => a.Id == orderDto.ShippingAddressId) || !addresses.Any(a => a.Id == orderDto.BillingAddressId))
+                {
+                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Forbidden, "Die angegebenen Adressen sind ungültig oder gehören nicht zu diesem Konto.");
+                }
+
+                // 1.3 Methoden Validieren
                 var shippingMethod = await _shippingMethodRepository.GetByIdAsync(orderDto.ShippingMethodId);
                 if (shippingMethod == null || !shippingMethod.IsActive)
-                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.InvalidInput, "Ungültige oder inaktive Versandmethode.");
+                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.InvalidInput, "Versandmethode ungültig.");
 
                 var paymentMethod = await _context.PaymentMethods.FindAsync(orderDto.PaymentMethodId);
                 if (paymentMethod == null || !paymentMethod.IsActive)
-                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.InvalidInput, "Ungültige oder inaktive Zahlungsmethode.");
+                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.InvalidInput, "Zahlungsmethode ungültig.");
 
-                // --- 2. Artikel verarbeiten und Lagerbestand prüfen ---
+                // 1.4 Produkte Validieren
-                var orderItems = new List<OrderItem>();
+                if (orderDto.Items == null || !orderDto.Items.Any())
-                var productIds = orderDto.Items.Select(i => i.ProductId).ToList();
+                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.InvalidInput, "Warenkorb ist leer.");
+
+                var productIds = orderDto.Items.Select(i => i.ProductId).Distinct().ToList();
                 var products = await _context.Products.Where(p => productIds.Contains(p.Id)).ToListAsync();
+
+                var validationErrors = new StringBuilder();
+                decimal totalOrderWeight = 0;
                 decimal itemsTotal = 0;
+                var preparedOrderItems = new List<OrderItem>();
 
                 foreach (var itemDto in orderDto.Items)
                 {
                     var product = products.FirstOrDefault(p => p.Id == itemDto.ProductId);
-                    if (product == null || !product.IsActive)
-                    {
-                        await transaction.RollbackAsync();
-                        return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Conflict, "Ein Produkt im Warenkorb ist nicht mehr verfügbar.");
-                    }
-                    if (product.StockQuantity < itemDto.Quantity)
-                    {
-                        await transaction.RollbackAsync();
-                        return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Conflict, $"Nicht genügend Lagerbestand für '{product.Name}'. Verfügbar: {product.StockQuantity}, benötigt: {itemDto.Quantity}.");
-                    }
 
-                    product.StockQuantity -= itemDto.Quantity;
+                    if (product == null) { validationErrors.AppendLine($"- Produkt {itemDto.ProductId} fehlt."); continue; }
+                    if (!product.IsActive) validationErrors.AppendLine($"- '{product.Name}' ist nicht verfügbar.");
+                    if (product.StockQuantity < itemDto.Quantity) validationErrors.AppendLine($"- '{product.Name}': Zu wenig Bestand.");
 
+                    if (validationErrors.Length == 0)
+                    {
+                        totalOrderWeight += (decimal)(product.Weight ?? 0) * itemDto.Quantity;
                         var orderItem = new OrderItem
                         {
                             ProductId = product.Id,
@@ -94,51 +185,64 @@ namespace Webshop.Application.Services.Customers
                             UnitPrice = product.Price,
                             TotalPrice = product.Price * itemDto.Quantity
                         };
-                    orderItems.Add(orderItem);
+                        preparedOrderItems.Add(orderItem);
                         itemsTotal += orderItem.TotalPrice;
                     }
+                }
 
-                // --- 3. Preise, Rabatte, Steuern und Gesamtbetrag berechnen ---
+                if (validationErrors.Length > 0)
+                {
+                    await transaction.RollbackAsync();
+                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Conflict, $"Fehler:\n{validationErrors}");
+                }
+
+                if (totalOrderWeight < shippingMethod.MinWeight || totalOrderWeight > shippingMethod.MaxWeight)
+                {
+                    await transaction.RollbackAsync();
+                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.InvalidInput, $"Gesamtgewicht ({totalOrderWeight} kg) passt nicht zur Versandart.");
+                }
+
+                // 2. Preise & Rabatte
                 decimal discountAmount = 0;
                 var discountResult = new DiscountCalculationResult();
 
                 if (!string.IsNullOrWhiteSpace(orderDto.CouponCode))
                 {
-                    discountResult = await _discountService.CalculateDiscountAsync(orderItems, orderDto.CouponCode);
+                    discountResult = await _discountService.CalculateDiscountAsync(preparedOrderItems, orderDto.CouponCode);
+
+                    if (!discountResult.IsValid)
+                    {
+                        await transaction.RollbackAsync();
+                        return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.InvalidInput, $"Gutscheinfehler: {discountResult.ErrorMessage ?? "Code ungültig."}");
+                    }
                     discountAmount = discountResult.TotalDiscountAmount;
-
-                    if (discountAmount <= 0)
-                    {
-                        await transaction.RollbackAsync();
-                        return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.InvalidInput, "Der angegebene Gutscheincode ist ungültig, abgelaufen oder nicht auf die Produkte im Warenkorb anwendbar.");
-                    }
-
-                    if (discountResult.AppliedDiscountIds.Count > 1)
-                    {
-                        await transaction.RollbackAsync();
-                        return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Failure, "Es können nicht mehrere Rabatte gleichzeitig angewendet werden.");
-                    }
                 }
 
                 decimal shippingCost = shippingMethod.BaseCost;
                 decimal subTotalBeforeDiscount = itemsTotal + shippingCost;
-
+                if (discountAmount > subTotalBeforeDiscount) discountAmount = subTotalBeforeDiscount;
-                if (discountAmount > subTotalBeforeDiscount)
-                {
-                    discountAmount = subTotalBeforeDiscount;
-                }
 
                 decimal subTotalAfterDiscount = subTotalBeforeDiscount - discountAmount;
-
                 decimal taxRate = await _settingService.GetSettingValueAsync<decimal>("GlobalTaxRate", 0.19m);
-                decimal taxAmount = subTotalAfterDiscount * taxRate;
+                decimal taxAmount = subTotalAfterDiscount * taxRate; // Steuer auf reduzierten Betrag
                 decimal orderTotal = subTotalAfterDiscount + taxAmount;
 
-                // --- 4. Bestellung erstellen ---
+                // 3. Ausführung (Execution)
+                foreach (var itemDto in orderDto.Items)
+                {
+                    var product = products.First(p => p.Id == itemDto.ProductId);
+                    if (product.StockQuantity < itemDto.Quantity)
+                    {
+                        await transaction.RollbackAsync();
+                        return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Conflict, "Lagerbestand hat sich während des Vorgangs geändert.");
+                    }
+                    product.StockQuantity -= itemDto.Quantity;
+                }
+
                 var newOrder = new Order
                 {
                     CustomerId = customer.Id,
-                    OrderNumber = $"WS-{DateTime.UtcNow:yyyyMMdd}-{new Random().Next(1000, 9999)}",
+                    OrderNumber = GenerateOrderNumber(),
                     OrderDate = DateTimeOffset.UtcNow,
                     OrderStatus = OrderStatus.Pending.ToString(),
                     PaymentStatus = PaymentStatus.Pending.ToString(),
@@ -151,33 +255,58 @@ namespace Webshop.Application.Services.Customers
                     ShippingMethodId = shippingMethod.Id,
                     BillingAddressId = orderDto.BillingAddressId,
                     ShippingAddressId = orderDto.ShippingAddressId,
-                    OrderItems = orderItems
+                    OrderItems = preparedOrderItems
                 };
+
                 await _orderRepository.AddAsync(newOrder);
 
-                // --- 5. Rabattnutzung erhöhen ---
                 if (discountResult.AppliedDiscountIds.Any())
                 {
-                    var appliedDiscounts = await _context.Discounts.Where(d => discountResult.AppliedDiscountIds.Contains(d.Id)).ToListAsync();
+                    var appliedDiscounts = await _context.Discounts
-                    foreach (var discount in appliedDiscounts) { discount.CurrentUsageCount++; }
+                        .Where(d => discountResult.AppliedDiscountIds.Contains(d.Id))
+                        .ToListAsync();
+                    foreach (var d in appliedDiscounts) d.CurrentUsageCount++;
                 }
 
+                try
+                {
                     await _context.SaveChangesAsync();
                     await transaction.CommitAsync();
+                }
+                catch (DbUpdateConcurrencyException ex)
+                {
+                    await transaction.RollbackAsync();
+                    _logger.LogWarning(ex, "Concurrency Konflikt bei Bestellung.");
+                    return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Conflict, "Artikel wurden soeben von einem anderen Kunden gekauft.");
+                }
 
-                // --- 6. Erfolgreiche Antwort erstellen ---
+                // 4. Post-Processing (Warenkorb & Email)
-                var createdOrder = await _orderRepository.GetByIdAsync(newOrder.Id);
+                try { await _cartService.ClearCartAsync(userId!); }
-                return ServiceResult.Ok(MapToOrderDetailDto(createdOrder!));
+                catch (Exception ex) { _logger.LogError(ex, "Warenkorb konnte nicht geleert werden."); }
+
+                try { await _emailService.SendOrderConfirmationAsync(newOrder.Id, userEmail); }
+                catch (Exception ex) { _logger.LogError(ex, "Bestätigungs-Email fehlgeschlagen."); }
+
+                // Manuelles Setzen der Navigation Properties für das Mapping
+                newOrder.PaymentMethodInfo = paymentMethod;
+                newOrder.ShippingAddress = addresses.First(a => a.Id == orderDto.ShippingAddressId);
+                newOrder.BillingAddress = addresses.First(a => a.Id == orderDto.BillingAddressId);
+
+                return ServiceResult.Ok(MapToOrderDetailDto(newOrder));
             }
             catch (Exception ex)
             {
                 await transaction.RollbackAsync();
-                // Log the full exception for debugging purposes
+                _logger.LogError(ex, "Checkout Exception");
-                // _logger.LogError(ex, "An unexpected error occurred in CreateOrderAsync.");
+                return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Failure, "Ein unerwarteter Fehler ist aufgetreten.");
-                return ServiceResult.Fail<OrderDetailDto>(ServiceResultType.Failure, "Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es erneut.");
             }
         }
 
+        private string GenerateOrderNumber()
+        {
+            return $"WS-{DateTime.UtcNow:yyyyMMdd}-{Guid.NewGuid().ToString().Substring(0, 6).ToUpper()}";
+        }
+
         private OrderDetailDto MapToOrderDetailDto(Order order)
         {
             return new OrderDetailDto
@@ -212,11 +341,8 @@ namespace Webshop.Application.Services.Customers
                     Country = order.BillingAddress.Country,
                     Type = order.BillingAddress.Type
                 },
-                PaymentMethod = order.PaymentMethodInfo?.Name,
+                PaymentMethod = order.PaymentMethodInfo?.Name ?? order.PaymentMethod,
                 PaymentStatus = Enum.TryParse<PaymentStatus>(order.PaymentStatus, true, out var ps) ? ps : PaymentStatus.Pending,
-                ShippingTrackingNumber = order.ShippingTrackingNumber,
-                ShippedDate = order.ShippedDate,
-                DeliveredDate = order.DeliveredDate,
                 OrderItems = order.OrderItems.Select(oi => new OrderItemDto
                 {
                     Id = oi.Id,

Webshop.Application/Services/Customers/CustomerService.cs

@@ -1,13 +1,14 @@
-// src/Webshop.Application/Services/Customers/CustomerService.cs
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Configuration;
-using Resend;
+using System; // Für Uri
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web;
+using Webshop.Application; // Für ServiceResult
-using Webshop.Application.DTOs;
 using Webshop.Application.DTOs.Auth;
 using Webshop.Application.DTOs.Customers;
+using Webshop.Application.Services.Customers.Interfaces; // Namespace korrigiert
+using Webshop.Application.Services.Public.Interfaces; // WICHTIG: Für IEmailService
+using Webshop.Domain.Entities;
 using Webshop.Domain.Identity;
 using Webshop.Domain.Interfaces;
 
@@ -18,14 +19,18 @@ namespace Webshop.Application.Services.Customers
         private readonly ICustomerRepository _customerRepository;
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly IConfiguration _configuration;
-        private readonly IResend _resend;
+        private readonly IEmailService _emailService; // NEU: Statt IResend
 
-        public CustomerService(ICustomerRepository customerRepository, UserManager<ApplicationUser> userManager, IConfiguration configuration, IResend resend)
+        public CustomerService(
+            ICustomerRepository customerRepository,
+            UserManager<ApplicationUser> userManager,
+            IConfiguration configuration,
+            IEmailService emailService) // NEU: Injected
         {
             _customerRepository = customerRepository;
             _userManager = userManager;
             _configuration = configuration;
-            _resend = resend;
+            _emailService = emailService;
         }
 
         public async Task<ServiceResult<CustomerDto>> GetMyProfileAsync(string userId)
@@ -60,17 +65,20 @@ namespace Webshop.Application.Services.Customers
             var identityUser = await _userManager.FindByIdAsync(userId);
             if (identityUser == null) return ServiceResult.Fail(ServiceResultType.NotFound, "Benutzerkonto nicht gefunden.");
 
+            // Sicherheitscheck: Passwort prüfen
             if (!await _userManager.CheckPasswordAsync(identityUser, profileDto.CurrentPassword))
             {
                 return ServiceResult.Fail(ServiceResultType.InvalidInput, "Das zur Bestätigung eingegebene Passwort ist falsch.");
             }
 
+            // Customer Daten aktualisieren
             customer.FirstName = profileDto.FirstName;
             customer.LastName = profileDto.LastName;
             customer.DefaultShippingAddressId = profileDto.DefaultShippingAddressId;
             customer.DefaultBillingAddressId = profileDto.DefaultBillingAddressId;
             await _customerRepository.UpdateAsync(customer);
 
+            // User Daten (Telefon) aktualisieren
             if (!string.IsNullOrEmpty(profileDto.PhoneNumber) && identityUser.PhoneNumber != profileDto.PhoneNumber)
             {
                 identityUser.PhoneNumber = profileDto.PhoneNumber;
@@ -103,28 +111,29 @@ namespace Webshop.Application.Services.Customers
             var user = await _userManager.FindByIdAsync(userId);
             if (user == null) return ServiceResult.Fail(ServiceResultType.NotFound, "Benutzer nicht gefunden.");
 
+            // Passwort prüfen
             if (!await _userManager.CheckPasswordAsync(user, currentPassword))
             {
                 return ServiceResult.Fail(ServiceResultType.InvalidInput, "Das zur Bestätigung eingegebene Passwort ist falsch.");
             }
 
+            // Prüfen, ob neue Email schon existiert (außer es ist die eigene)
             if (user.Email != newEmail && await _userManager.FindByEmailAsync(newEmail) != null)
             {
                 return ServiceResult.Fail(ServiceResultType.Conflict, "Die neue E-Mail-Adresse ist bereits registriert.");
             }
 
+            // Token generieren
             var token = await _userManager.GenerateChangeEmailTokenAsync(user, newEmail);
-            var clientUrl = _configuration["App:ClientUrl"]!;
+            var clientUrl = _configuration["App:ClientUrl"]; // Hier stand vorher ! , besser prüfen oder Null-Check
-            var confirmationLink = $"{clientUrl}/confirm-email-change?userId={user.Id}&newEmail={HttpUtility.UrlEncode(newEmail)}&token={HttpUtility.UrlEncode(token)}";
 
-            var message = new EmailMessage();
+            // Link bauen (Uri.EscapeDataString ist sicherer in URLs als HttpUtility)
-            message.From = _configuration["Resend:FromEmail"]!;
+            var confirmationLink = $"{clientUrl}/confirm-email-change?userId={user.Id}&newEmail={Uri.EscapeDataString(newEmail)}&token={Uri.EscapeDataString(token)}";
-            message.To.Add(newEmail);
-            message.Subject = "Bestätigen Sie Ihre neue E-Mail-Adresse";
-            message.HtmlBody = $"<h1>E-Mail-Änderung Bestätigung</h1><p>Bitte klicken Sie auf den folgenden Link, um Ihre neue E-Mail-Adresse zu bestätigen:</p><p><a href='{confirmationLink}'>Neue E-Mail-Adresse bestätigen</a></p>";
-            await _resend.EmailSendAsync(message);
 
-            // Die Erfolgsmeldung wird hier als Teil des "Ok"-Results übermittelt
+            // --- REFACTORED: Nutzung des EmailService ---
+            await _emailService.SendEmailChangeConfirmationAsync(newEmail, confirmationLink);
+
+            // Wir geben die Erfolgsmeldung im Result zurück (passend zu deinem Controller)
             return ServiceResult.Ok("Bestätigungs-E-Mail wurde an die neue Adresse gesendet. Bitte prüfen Sie Ihr Postfach.");
         }
     }

Webshop.Application/Services/Customers/Interfaces/ICartService.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Webshop.Application.Services.Customers.Interfaces
+{
+    public interface ICartService
+    {
+        Task ClearCartAsync(string userId);
+    }
+}

Webshop.Application/Services/Customers/Interfaces/ICheckoutService.cs

@@ -1,13 +1,20 @@
-// src/Webshop.Application/Services/Customers/Interfaces/ICheckoutService.cs
+using System.Collections.Generic;
-using System;
 using System.Threading.Tasks;
-using Webshop.Application;
 using Webshop.Application.DTOs.Orders;
+using Webshop.Application.DTOs.Shipping;
+using Webshop.Application; // F<>r ServiceResult
 
 namespace Webshop.Application.Services.Customers.Interfaces
 {
     public interface ICheckoutService
     {
+        // Methode 1: F<>r den Checkout (interne Verarbeitung)
+        Task<ServiceResult<IEnumerable<ShippingMethodDto>>> GetCompatibleShippingMethodsAsync(IEnumerable<CreateOrderItemDto> items);
+
+        // +++ METHODE 2: DIESE FEHLTE +++ 
+        // F<>r den Warenkorb-Check (kommt vom Controller als List<CartItemDto>)
+        Task<ServiceResult<IEnumerable<ShippingMethodDto>>> GetCompatibleShippingMethodsAsync(List<CartItemDto> items);
+
         Task<ServiceResult<OrderDetailDto>> CreateOrderAsync(CreateOrderDto orderDto, string? userId);
     }
 }

Webshop.Application/Services/Customers/Interfaces/ICustomerService.cs

@@ -1,11 +1,9 @@
-// src/Webshop.Application/Services/Customers/ICustomerService.cs
+using System.Threading.Tasks;
-using System.Threading.Tasks;
+using Webshop.Application; // Für ServiceResult
-using Webshop.Application;
-using Webshop.Application.DTOs;
 using Webshop.Application.DTOs.Auth;
 using Webshop.Application.DTOs.Customers;
 
-namespace Webshop.Application.Services.Customers
+namespace Webshop.Application.Services.Customers.Interfaces // Namespace angepasst auf .Interfaces
 {
     public interface ICustomerService
     {

Webshop.Application/Services/Public/DiscountCalculationResult.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Webshop.Application.Services.Public
+{
+    public class DiscountCalculationResult
+    {
+        public decimal TotalDiscountAmount { get; set; } = 0;
+        public List<Guid> AppliedDiscountIds { get; set; } = new List<Guid>();
+        public string? ErrorMessage { get; set; }
+
+        // FIX: IsValid existierte nicht. Wir definieren es hier:
+        // Ein Resultat ist gültig, wenn es keine Fehlermeldung gibt.
+        // (Oder alternativ: wenn der Betrag > 0 ist, je nach Logik)
+        public bool IsValid => string.IsNullOrEmpty(ErrorMessage);
+    }
+}

Webshop.Application/Services/Public/EmailService.cs

@@ -0,0 +1,133 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration; // Für Absender-Config
+using Resend;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Webshop.Application.Services.Public.Interfaces;
+
+namespace Webshop.Application.Services.Public
+{
+    public class EmailService : IEmailService
+    {
+        private readonly IResend _resend;
+        private readonly IWebHostEnvironment _env;
+        private readonly ILogger<EmailService> _logger;
+        private readonly IConfiguration _configuration;
+
+        public EmailService(
+            IResend resend,
+            IWebHostEnvironment env,
+            ILogger<EmailService> logger,
+            IConfiguration configuration)
+        {
+            _resend = resend;
+            _env = env;
+            _logger = logger;
+            _configuration = configuration;
+        }
+
+        public async Task SendEmailConfirmationAsync(string toEmail, string confirmationLink)
+        {
+            var subject = "Willkommen! Bitte bestätigen Sie Ihre E-Mail-Adresse";
+            var title = "E-Mail bestätigen";
+            var body = "Vielen Dank für Ihre Registrierung! Bitte klicken Sie auf den Button unten, um Ihr Konto zu aktivieren.";
+            var btnText = "Konto aktivieren";
+
+            await SendEmailInternalAsync(toEmail, subject, title, body, btnText, confirmationLink);
+        }
+
+        public async Task SendPasswordResetAsync(string toEmail, string resetLink)
+        {
+            var subject = "Passwort zurücksetzen";
+            var title = "Passwort vergessen?";
+            var body = "Wir haben eine Anfrage zum Zurücksetzen Ihres Passworts erhalten. Klicken Sie hier:";
+            var btnText = "Passwort zurücksetzen";
+
+            await SendEmailInternalAsync(toEmail, subject, title, body, btnText, resetLink);
+        }
+
+        public async Task SendOrderConfirmationAsync(Guid orderId, string toEmail)
+        {
+            // Link zur Bestellübersicht (anpassen an dein Frontend Routing)
+            var orderLink = $"{_configuration["App:FrontendUrl"]}/orders/{orderId}";
+
+            var subject = $"Bestellbestätigung #{orderId.ToString().Substring(0, 8).ToUpper()}";
+            var title = "Vielen Dank für Ihre Bestellung!";
+            var body = $"Wir haben Ihre Bestellung #{orderId} erhalten und bearbeiten sie umgehend.";
+            var btnText = "Bestellung ansehen";
+
+            await SendEmailInternalAsync(toEmail, subject, title, body, btnText, orderLink);
+        }
+
+        public async Task SendEmailChangeConfirmationAsync(string toEmail, string confirmationLink)
+        {
+            var subject = "Änderung Ihrer E-Mail-Adresse bestätigen";
+            var title = "Neue E-Mail bestätigen";
+            var body = "Sie haben eine Änderung Ihrer E-Mail-Adresse angefordert. Bitte bestätigen Sie dies:";
+            var btnText = "E-Mail bestätigen";
+
+            await SendEmailInternalAsync(toEmail, subject, title, body, btnText, confirmationLink);
+        }
+
+        // --- Interne Methode für Resend ---
+        private async Task SendEmailInternalAsync(string toEmail, string subject, string title, string body, string btnText, string btnLink)
+        {
+            try
+            {
+                // 1. Template laden
+                string htmlContent = await LoadAndFormatTemplate(title, body, btnText, btnLink);
+
+                // 2. Resend Message bauen
+                var message = new EmailMessage();
+                message.To.Add(toEmail);
+                // Hole Absender aus Config oder Fallback
+                message.From = _configuration["Resend:FromEmail"] ?? "noreply@deinwebshop.com";
+                message.Subject = subject;
+                message.HtmlBody = htmlContent;
+
+                // 3. Senden
+                await _resend.EmailSendAsync(message);
+
+                _logger.LogInformation($"E-Mail '{subject}' erfolgreich an {toEmail} gesendet via Resend.");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, $"Fehler beim Senden der E-Mail an {toEmail} via Resend.");
+                // Optional: Exception werfen, wenn der Prozess abbrechen soll. 
+                // Meistens besser: Loggen und "Silent Fail", damit z.B. der Checkout nicht abbricht.
+            }
+        }
+
+        private async Task<string> LoadAndFormatTemplate(string title, string body, string btnText, string btnLink)
+        {
+            // Pfad: wwwroot/templates/email-template.html
+            var templatePath = Path.Combine(AppContext.BaseDirectory, "Templates", "_EmailTemplate.html");
+
+            string template;
+
+            if (File.Exists(templatePath))
+            {
+                template = await File.ReadAllTextAsync(templatePath);
+            }
+            else
+            {
+                // Fallback HTML, falls Datei fehlt
+                _logger.LogWarning($"Template nicht gefunden unter {templatePath}");
+                template = "<html><body><h1>{{ShopName}}</h1><h2>{{Titel}}</h2><p>{{Haupttext}}</p><p><a href='{{CallToActionLink}}'>{{CallToActionText}}</a></p></body></html>";
+            }
+
+            // Platzhalter ersetzen
+            var shopName = _configuration["ShopInfo:Name"] ?? "Webshop";
+
+            return template
+                .Replace("{{ShopName}}", shopName)
+                .Replace("{{Titel}}", title)
+                .Replace("{{Haupttext}}", body)
+                .Replace("{{CallToActionText}}", btnText)
+                .Replace("{{CallToActionLink}}", btnLink)
+                .Replace("{{Jahr}}", DateTime.UtcNow.Year.ToString());
+        }
+    }
+}

Webshop.Application/Services/Public/Interfaces/IDiscountService.cs

@@ -6,21 +6,7 @@ using Webshop.Domain.Entities;
 
 namespace Webshop.Application.Services.Public.Interfaces
 {
-    /// <summary>
-    /// Stellt das Ergebnis der Rabattberechnung dar.
-    /// </summary>
-    public class DiscountCalculationResult
-    {
-        /// <summary>
-        /// Der gesamte berechnete Rabattbetrag.
-        /// </summary>
-        public decimal TotalDiscountAmount { get; set; } = 0;
 
-        /// <summary>
-        /// Die IDs der Rabatte, die erfolgreich angewendet wurden.
-        /// </summary>
-        public List<Guid> AppliedDiscountIds { get; set; } = new List<Guid>();
-    }
 
     public interface IDiscountService
     {

Webshop.Application/Services/Public/Interfaces/IEmailService.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Webshop.Application.Services.Public.Interfaces
+{
+    public interface IEmailService
+    {
+        /// <summary>
+        /// Sendet den Link zur Bestätigung der Registrierung.
+        /// </summary>
+        Task SendEmailConfirmationAsync(string toEmail, string confirmationLink);
+
+        /// <summary>
+        /// Sendet den Link zum Zurücksetzen des Passworts.
+        /// </summary>
+        Task SendPasswordResetAsync(string toEmail, string resetLink);
+
+        /// <summary>
+        /// Sendet eine Bestellbestätigung.
+        /// </summary>
+        Task SendOrderConfirmationAsync(Guid orderId, string toEmail);
+
+        /// <summary>
+        /// Sendet einen Bestätigungslink bei E-Mail-Änderung.
+        /// </summary>
+        Task SendEmailChangeConfirmationAsync(string toEmail, string confirmationLink);
+    }
+}

Webshop.Domain/Entities/Cart.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Webshop.Domain.Entities
+{
+    public class Cart
+    {
+        [Key]
+        public Guid Id { get; set; }
+
+        // Verknüpfung zum User (String, da Identity User Id ein String ist)
+        public string? UserId { get; set; }
+
+        // Falls du auch Gast-Warenkörbe ohne Login unterstützt:
+        public string? SessionId { get; set; }
+
+        public DateTime LastModified { get; set; } = DateTime.UtcNow;
+
+        public virtual ICollection<CartItem> Items { get; set; } = new List<CartItem>();
+    }
+}

Webshop.Domain/Entities/CartItem.cs

@@ -0,0 +1,26 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Webshop.Domain.Entities
+{
+    public class CartItem
+    {
+        [Key]
+        public Guid Id { get; set; }
+
+        public Guid CartId { get; set; }
+
+        [ForeignKey("CartId")]
+        public virtual Cart Cart { get; set; } = default!;
+
+        public Guid ProductId { get; set; }
+
+        [ForeignKey("ProductId")]
+        public virtual Product Product { get; set; } = default!;
+
+        public Guid? ProductVariantId { get; set; } // Optional, falls du Varianten nutzt
+
+        public int Quantity { get; set; }
+    }
+}

Webshop.Domain/Entities/Product.cs

@@ -53,5 +53,7 @@ namespace Webshop.Domain.Entities
         public virtual ICollection<ProductDiscount> ProductDiscounts { get; set; } = new List<ProductDiscount>();
         public virtual ICollection<Productcategorie> Productcategories { get; set; } = new List<Productcategorie>();
         public virtual ICollection<ProductImage> Images { get; set; } = new List<ProductImage>();
+        [ConcurrencyCheck]
+        public byte[] RowVersion { get; set; }
     }
 }

Webshop.Domain/Entities/ShippingMethod.cs

@@ -1,8 +1,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Webshop.Domain.Entities;
+namespace Webshop.Domain.Entities
-
+{
     /// <summary>
     /// Konfigurierbare Versandoptionen für den Checkout.
     /// </summary>
@@ -13,15 +13,16 @@ public class ShippingMethod
 
         [Required]
         [MaxLength(100)]
-    public string Name { get; set; }
+        public string Name { get; set; } = string.Empty;
 
         [MaxLength(500)]
         public string? Description { get; set; }
 
-    // Precision wird via Fluent API konfiguriert
+        // Grundkosten der Versandmethode
         [Required]
         public decimal BaseCost { get; set; }
 
+        // Optional: Mindestbestellwert (für kostenlosen Versand etc.)
         public decimal? MinimumOrderAmount { get; set; }
 
         [Required]
@@ -35,4 +36,11 @@ public class ShippingMethod
 
         public int MinDeliveryDays { get; set; }
         public int MaxDeliveryDays { get; set; }
+
+        // NEU: Gewichtsbasierte Berechnung
+        // Einheit: kg (oder die Standardeinheit deines Shops)
+        public decimal MinWeight { get; set; } = 0;
+
+        public decimal MaxWeight { get; set; } = 0;
+    }
 }

Webshop.Domain/Interfaces/IProductRepository.cs

@@ -13,6 +13,7 @@ namespace Webshop.Domain.Interfaces
         Task<Product?> GetBySlugAsync(string slug);
         Task AddProductAsync(Product product);
         Task UpdateProductAsync(Product product);
+        Task SaveChangesAsync();
         Task DeleteProductAsync(Guid id);
     }
 }

Webshop.Infrastructure/Data/ApplicationDbContext.cs

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Webshop.Domain.Entities;
 using Webshop.Domain.Identity;
@@ -26,12 +25,16 @@ namespace Webshop.Infrastructure.Data
         public DbSet<PaymentMethod> PaymentMethods { get; set; } = default!;
         public DbSet<Setting> Settings { get; set; } = default!;
 
+        // Verknüpfungstabellen und Details
         public DbSet<Productcategorie> Productcategories { get; set; } = default!;
         public DbSet<ProductDiscount> ProductDiscounts { get; set; } = default!;
         public DbSet<CategorieDiscount> categorieDiscounts { get; set; } = default!;
         public DbSet<ProductImage> ProductImages { get; set; } = default!;
         public DbSet<ShopInfo> ShopInfos { get; set; } = default!;
 
+        // +++ NEU: Warenkorb Tabellen +++
+        public DbSet<Cart> Carts { get; set; } = default!;
+        public DbSet<CartItem> CartItems { get; set; } = default!;
 
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -48,6 +51,17 @@ namespace Webshop.Infrastructure.Data
                 }
             }
 
+            // +++ NEU: Warenkorb Konfiguration +++
+            modelBuilder.Entity<Cart>(entity =>
+            {
+                // Wenn ein Warenkorb gelöscht wird, lösche alle Items darin automatisch
+                entity.HasMany(c => c.Items)
+                      .WithOne(i => i.Cart)
+                      .HasForeignKey(i => i.CartId)
+                      .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            // Bestehende Konfigurationen (bleiben unverändert)
             modelBuilder.Entity<Productcategorie>().HasKey(pc => new { pc.ProductId, pc.categorieId });
             modelBuilder.Entity<ProductDiscount>().HasKey(pd => new { pd.ProductId, pd.DiscountId });
             modelBuilder.Entity<CategorieDiscount>().HasKey(cd => new { cd.categorieId, cd.DiscountId });
@@ -143,8 +157,8 @@ namespace Webshop.Infrastructure.Data
                 .OnDelete(DeleteBehavior.Restrict);
 
             modelBuilder.Entity<ApplicationUser>()
-                .HasOne(a => a.Customer) // Ein ApplicationUser hat ein optionales Customer-Profil
+                .HasOne(a => a.Customer)
-                .WithOne(c => c.User)     // Ein Customer-Profil ist mit genau einem User verknüpft
+                .WithOne(c => c.User)
                 .HasForeignKey<Customer>(c => c.AspNetUserId);
 
             modelBuilder.Entity<ProductDiscount>(entity =>
@@ -158,8 +172,6 @@ namespace Webshop.Infrastructure.Data
                       .HasForeignKey(pd => pd.DiscountId);
             });
 
-
-            // << NEU: Beziehungskonfiguration für CategorieDiscount >>
             modelBuilder.Entity<CategorieDiscount>(entity =>
             {
                 entity.HasOne(cd => cd.categorie)
@@ -173,20 +185,16 @@ namespace Webshop.Infrastructure.Data
 
             modelBuilder.Entity<Review>(entity =>
             {
-                // Beziehung zu Product
                 entity.HasOne(r => r.Product)
                       .WithMany(p => p.Reviews)
                       .HasForeignKey(r => r.ProductId)
-                      .OnDelete(DeleteBehavior.Cascade); // Lösche Bewertungen, wenn das Produkt gelöscht wird
+                      .OnDelete(DeleteBehavior.Cascade);
 
-                // Beziehung zu Customer
                 entity.HasOne(r => r.Customer)
                       .WithMany(c => c.Reviews)
                       .HasForeignKey(r => r.CustomerId)
-                      .OnDelete(DeleteBehavior.SetNull); // Setze CustomerId auf NULL, wenn der Kunde gelöscht wird
+                      .OnDelete(DeleteBehavior.SetNull);
             });
-
-
         }
     }
 }

Webshop.Infrastructure/Migrations/20251107143106_row.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Webshop.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class row : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<byte[]>(
+                name: "RowVersion",
+                table: "Products",
+                type: "bytea",
+                rowVersion: true,
+                nullable: false,
+                defaultValue: new byte[0]);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RowVersion",
+                table: "Products");
+        }
+    }
+}

Webshop.Infrastructure/Migrations/20251120140457_rowversion.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Webshop.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class rowversion : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

Webshop.Infrastructure/Migrations/20251120141425_rowversion2.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Webshop.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class rowversion2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

Webshop.Infrastructure/Migrations/20251120141924_rowversion3.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Webshop.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class rowversion3 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

Webshop.Infrastructure/Migrations/20251120143728_rowversion4.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Webshop.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class rowversion4 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

Webshop.Infrastructure/Migrations/20251126085553_shippingmethodWeight.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Webshop.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class shippingmethodWeight : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "MaxWeight",
+                table: "ShippingMethods",
+                type: "numeric",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "MinWeight",
+                table: "ShippingMethods",
+                type: "numeric",
+                nullable: false,
+                defaultValue: 0m);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "MaxWeight",
+                table: "ShippingMethods");
+
+            migrationBuilder.DropColumn(
+                name: "MinWeight",
+                table: "ShippingMethods");
+        }
+    }
+}

Webshop.Infrastructure/Migrations/20251126100815_checkout.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Webshop.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class checkout : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

Webshop.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -613,6 +613,11 @@ namespace Webshop.Infrastructure.Migrations
                         .HasPrecision(18, 2)
                         .HasColumnType("numeric(18,2)");
 
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasColumnType("bytea");
+
                     b.Property<string>("SKU")
                         .IsRequired()
                         .HasMaxLength(50)
@@ -850,9 +855,15 @@ namespace Webshop.Infrastructure.Migrations
                     b.Property<int>("MaxDeliveryDays")
                         .HasColumnType("integer");
 
+                    b.Property<decimal>("MaxWeight")
+                        .HasColumnType("numeric");
+
                     b.Property<int>("MinDeliveryDays")
                         .HasColumnType("integer");
 
+                    b.Property<decimal>("MinWeight")
+                        .HasColumnType("numeric");
+
                     b.Property<decimal?>("MinimumOrderAmount")
                         .HasPrecision(18, 2)
                         .HasColumnType("numeric(18,2)");

Webshop.Infrastructure/Repositories/ProductRepository.cs

@@ -55,5 +55,9 @@ namespace Webshop.Infrastructure.Repositories
                 await _context.SaveChangesAsync();
             }
         }
+        public async Task SaveChangesAsync()
+        {
+            await _context.SaveChangesAsync();
+        }
     }
 }