admin/ShopSolution-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

order

Browse Source
This commit is contained in:
Tizian.Breuch
2025-07-31 16:12:48 +02:00
parent 4a24f4559d
commit 2d93fda7e9
10 changed files with 264 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Webshop.Api/Controllers/Admin/AdminOrdersController.cs
View File

@@ -1,18 +1,57 @@
// Auto-generiert von CreateWebshopFiles.ps1
using Microsoft.AspNetCore.Mvc;
// src/Webshop.Api/Controllers/Admin/AdminOrdersController.cs
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Webshop.Application.DTOs.Orders;
using Webshop.Application.Services.Admin;
using Webshop.Domain.Enums;
namespace Webshop.Api.Controllers.Admin
{
[ApiController]
[Route("api/v1/admin/[controller]")]
[Route("api/v1/admin/orders")]
[Authorize(Roles = "Admin")]
public class AdminOrdersController : ControllerBase
{
private readonly IAdminOrderService _adminOrderService;
public AdminOrdersController(IAdminOrderService adminOrderService)
{
_adminOrderService = adminOrderService;
}
[HttpGet]
public async Task<ActionResult<IEnumerable<OrderSummaryDto>>> GetAllOrders()
{
var orders = await _adminOrderService.GetAllOrdersAsync();
return Ok(orders);
}
[HttpGet("{id}")]
public async Task<ActionResult<OrderDetailDto>> GetOrderById(Guid id)
{
var order = await _adminOrderService.GetOrderByIdAsync(id);
if (order == null) return NotFound();
return Ok(order);
}
[HttpPut("{id}/status")]
public async Task<IActionResult> UpdateOrderStatus(Guid id, [FromBody] UpdateOrderStatusRequest request)
{
var (success, errorMessage) = await _adminOrderService.UpdateOrderStatusAsync(id, request.NewStatus);
if (!success)
{
return BadRequest(new { Message = errorMessage });
}
return NoContent();
}
// Ein kleines DTO f<>r die Status-Update-Anfrage
public class UpdateOrderStatusRequest
{
public OrderStatus NewStatus { get; set; }
}
}
}

2
Webshop.Api/Program.cs
View File

@@ -82,6 +82,7 @@ builder.Services.AddScoped<ISupplierRepository, SupplierRepository>();
builder.Services.AddScoped<ICustomerRepository, CustomerRepository>();
builder.Services.AddScoped<IPaymentMethodRepository, PaymentMethodRepository>();
builder.Services.AddScoped<ICategoryRepository, CategoryRepository>();
builder.Services.AddScoped<IOrderRepository, OrderRepository>();
// AUTH Services
builder.Services.AddScoped<IAuthService, AuthService>();
@@ -98,6 +99,7 @@ builder.Services.AddScoped<IAdminProductService, AdminProductService>();
builder.Services.AddScoped<IAdminSupplierService, AdminSupplierService>();
builder.Services.AddScoped<IAdminPaymentMethodService, AdminPaymentMethodService>();
builder.Services.AddScoped<IAdminCategoryService, AdminCategoryService>(); // Hinzugef<65>gt f<>r Konsistenz
builder.Services.AddScoped<IAdminOrderService, AdminOrderService>();
//builder.Services.AddScoped<IAdminDiscountService, AdminDiscountService>(); // Hinzugef<65>gt f<>r Konsistenz
//builder.Services.AddScoped<IAdminOrderService, AdminOrderService>(); // Hinzugef<65>gt f<>r Konsistenz
//builder.Services.AddScoped<IAdminSettingService, AdminSettingService>(); // Hinzugef<65>gt f<>r Konsistenz

6
Webshop.Application/DTOs/Orders/OrderDetailDto.cs
View File

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Webshop.Domain.Entities;
@@ -11,7 +12,7 @@ namespace Webshop.Application.DTOs.Orders
{
public Guid Id { get; set; }
public string OrderNumber { get; set; } = string.Empty;
public Guid CustomerId { get; set; }
public Guid? CustomerId { get; set; }
public DateTimeOffset OrderDate { get; set; }
public OrderStatus Status { get; set; }
public decimal TotalAmount { get; set; }
@@ -23,5 +24,8 @@ namespace Webshop.Application.DTOs.Orders
public DateTimeOffset? DeliveredDate { get; set; }
public PaymentStatus PaymentStatus { get; set; }
public List<OrderItemDto> OrderItems { get; set; } = new List<OrderItemDto>();
public Address ShippingAddress { get; set; } = default!; // << HINZUF<55>GEN >>
public Address BillingAddress { get; set; } = default!; // << HINZUF<55>GEN >>
public string PaymentMethod { get; set; } = string.Empty; // << HINZUF<55>GEN >>
}
}

2
Webshop.Application/DTOs/Orders/OrderItemDto.cs
View File

@@ -10,7 +10,7 @@ namespace Webshop.Application.DTOs.Orders
{
public Guid Id { get; set; }
public Guid OrderId { get; set; } // Foreign Key zu Order
public Guid ProductId { get; set; }
public Guid? ProductId { get; set; }
public Guid? ProductVariantId { get; set; }
public string ProductName { get; set; } = string.Empty;
public string ProductSKU { get; set; } = string.Empty;

1
Webshop.Application/DTOs/Orders/OrderSummaryDto.cs
View File

@@ -17,5 +17,6 @@ namespace Webshop.Application.DTOs.Orders
public PaymentStatus PaymentStatus { get; set; }
public string PaymentMethodName { get; set; } = string.Empty;
public string ShippingMethodName { get; set; } = string.Empty;
public string CustomerName { get; set; } = string.Empty;
}
}

84
Webshop.Application/Services/Admin/AdminOrderService.cs
View File

@@ -1,18 +1,90 @@
// Auto-generiert von CreateWebshopFiles.ps1
// src/Webshop.Application/Services/Admin/AdminOrderService.cs
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Webshop.Application.Services.Admin.Interfaces;
using Webshop.Application.DTOs.Orders;
using Webshop.Domain.Enums; // Wichtig für Enum-Konvertierung
using Webshop.Domain.Interfaces;
namespace Webshop.Application.Services.Admin
{
public class AdminOrderService : IAdminOrderService
{
// Fügen Sie hier Abhängigkeiten per Dependency Injection hinzu (z.B. Repositories)
private readonly IOrderRepository _orderRepository;
// public AdminOrderService(IYourRepository repository) { }
public AdminOrderService(IOrderRepository orderRepository)
{
_orderRepository = orderRepository;
}
// Fügen Sie hier Service-Methoden hinzu
public async Task<IEnumerable<OrderSummaryDto>> GetAllOrdersAsync()
{
var orders = await _orderRepository.GetAllAsync();
return orders.Select(o => new OrderSummaryDto
{
Id = o.Id,
OrderNumber = o.OrderNumber,
OrderDate = o.OrderDate,
CustomerName = o.Customer != null ? $"{o.Customer.FirstName} {o.Customer.LastName}" : o.GuestEmail ?? "Gastbestellung",
TotalAmount = o.OrderTotal,
// << KORREKTUR: String zu Enum parsen >>
Status = Enum.TryParse<OrderStatus>(o.OrderStatus, true, out var orderStatus) ? orderStatus : OrderStatus.Pending,
PaymentStatus = Enum.TryParse<PaymentStatus>(o.PaymentStatus, true, out var paymentStatus) ? paymentStatus : PaymentStatus.Pending
}).ToList();
}
public async Task<OrderDetailDto?> GetOrderByIdAsync(Guid id)
{
var order = await _orderRepository.GetByIdAsync(id);
if (order == null) return null;
return new OrderDetailDto
{
Id = order.Id,
OrderNumber = order.OrderNumber,
OrderDate = order.OrderDate,
CustomerId = order.CustomerId,
// << KORREKTUR: String zu Enum parsen >>
Status = Enum.TryParse<OrderStatus>(order.OrderStatus, true, out var orderStatus) ? orderStatus : OrderStatus.Pending,
TotalAmount = order.OrderTotal,
ShippingAddress = order.ShippingAddress, // Annahme: Address DTO Mapping
BillingAddress = order.BillingAddress, // Annahme: Address DTO Mapping
PaymentMethod = order.PaymentMethod,
// << KORREKTUR: String zu Enum parsen >>
PaymentStatus = Enum.TryParse<PaymentStatus>(order.PaymentStatus, true, out var paymentStatus) ? paymentStatus : PaymentStatus.Pending,
OrderItems = order.OrderItems.Select(oi => new OrderItemDto
{
Id = oi.Id,
ProductId = oi.ProductId,
ProductVariantId = oi.ProductVariantId,
ProductName = oi.ProductName,
ProductSKU = oi.ProductSKU,
Quantity = oi.Quantity,
UnitPrice = oi.UnitPrice,
TotalPrice = oi.TotalPrice
}).ToList()
};
}
public async Task<(bool Success, string? ErrorMessage)> UpdateOrderStatusAsync(Guid id, OrderStatus newStatus)
{
var order = await _orderRepository.GetByIdAsync(id);
if (order == null)
{
return (false, "Bestellung nicht gefunden.");
}
// << KORREKTUR: Enum zu String konvertieren >>
order.OrderStatus = newStatus.ToString();
if (newStatus == OrderStatus.Shipped && string.IsNullOrEmpty(order.ShippingTrackingNumber))
{
// Hier könnten Sie Logik hinzufügen, um eine Tracking-Nummer zu verlangen
}
await _orderRepository.UpdateAsync(order);
return (true, null);
}
}
}

14
Webshop.Application/Services/Admin/Interfaces/IAdminOrderService.cs
View File

@@ -1,16 +1,16 @@
// Auto-generiert von CreateWebshopFiles.ps1
// src/Webshop.Application/Services/Admin/IAdminOrderService.cs
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Webshop.Application.DTOs;
using Webshop.Application.DTOs.Auth;
using Webshop.Application.DTOs.Users;
using Webshop.Application.DTOs.Orders;
using Webshop.Domain.Enums;
namespace Webshop.Application.Services.Admin.Interfaces
namespace Webshop.Application.Services.Admin
{
public interface IAdminOrderService
{
// Fügen Sie hier Methodensignaturen hinzu
Task<IEnumerable<OrderSummaryDto>> GetAllOrdersAsync();
Task<OrderDetailDto?> GetOrderByIdAsync(Guid id);
Task<(bool Success, string? ErrorMessage)> UpdateOrderStatusAsync(Guid id, OrderStatus newStatus);
}
}

41
Webshop.Domain/Entities/Order.cs
View File

@@ -1,22 +1,19 @@
using System;
// src/Webshop.Domain/Entities/Order.cs
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Webshop.Domain.Entities;
/// <summary>
/// Die Details jeder Kundenbestellung, inklusive Gastbestellungen.
/// </summary>
public class Order
namespace Webshop.Domain.Entities
{
public class Order
{
[Key]
public Guid Id { get; set; }
public Guid Id { get; set; } = Guid.NewGuid();
// Unique-Constraint wird via Fluent API konfiguriert
[Required]
[MaxLength(50)]
public string OrderNumber { get; set; }
public string OrderNumber { get; set; } = string.Empty;
[ForeignKey(nameof(Customer))]
public Guid? CustomerId { get; set; }
@@ -30,32 +27,28 @@ public class Order
public string? GuestPhoneNumber { get; set; }
[Required]
public DateTimeOffset OrderDate { get; set; }
public DateTimeOffset OrderDate { get; set; } = DateTimeOffset.UtcNow;
[Required]
[MaxLength(50)]
public string OrderStatus { get; set; }
public string OrderStatus { get; set; } = string.Empty;
// Precision wird via Fluent API konfiguriert
[Required]
public decimal OrderTotal { get; set; }
[Required]
public decimal ShippingCost { get; set; }
[Required]
public decimal TaxAmount { get; set; }
[Required]
public decimal DiscountAmount { get; set; }
[Required]
[MaxLength(50)]
public string PaymentStatus { get; set; }
public string PaymentStatus { get; set; } = string.Empty;
[Required]
[MaxLength(100)]
public string PaymentMethod { get; set; }
public string PaymentMethod { get; set; } = string.Empty;
[ForeignKey(nameof(PaymentMethodInfo))]
public Guid? PaymentMethodId { get; set; }
@@ -66,6 +59,13 @@ public class Order
[MaxLength(255)]
public string? TransactionId { get; set; }
// << NEUE FELDER HINZUFÜGEN >>
[MaxLength(255)]
public string? ShippingTrackingNumber { get; set; }
public DateTimeOffset? ShippedDate { get; set; }
public DateTimeOffset? DeliveredDate { get; set; }
// << ENDE NEUE FELDER >>
[Required]
[ForeignKey(nameof(BillingAddress))]
public Guid BillingAddressId { get; set; }
@@ -82,9 +82,10 @@ public class Order
// Navigation Properties
public virtual Customer? Customer { get; set; }
public virtual Address BillingAddress { get; set; }
public virtual Address ShippingAddress { get; set; }
public virtual Address BillingAddress { get; set; } = default!;
public virtual Address ShippingAddress { get; set; } = default!;
public virtual PaymentMethod? PaymentMethodInfo { get; set; }
public virtual ShippingMethod? ShippingMethodInfo { get; set; }
public virtual ICollection<OrderItem> OrderItems { get; set; } = new List<OrderItem>();
}
}

9
Webshop.Domain/Interfaces/IOrderRepository.cs
View File

@@ -1,14 +1,17 @@
// Auto-generiert von CreateWebshopFiles.ps1
// src/Webshop.Domain/Interfaces/IOrderRepository.cs
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Webshop.Domain.Entities;
namespace Webshop.Domain.Interfaces
{
public interface IOrderRepository
{
// Fügen Sie hier Methodensignaturen hinzu
Task<IEnumerable<Order>> GetAllAsync();
Task<Order?> GetByIdAsync(Guid id);
Task AddAsync(Order order);
Task UpdateAsync(Order order);
Task DeleteAsync(Guid id);
}
}

60
Webshop.Infrastructure/Repositories/OrderRepository.cs
View File

@@ -1,11 +1,12 @@
// Auto-generiert von CreateWebshopFiles.ps1
// src/Webshop.Infrastructure/Repositories/OrderRepository.cs
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Webshop.Domain.Entities;
using Webshop.Domain.Interfaces;
using Webshop.Infrastructure.Data;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Webshop.Infrastructure.Repositories
{
@@ -18,12 +19,49 @@ namespace Webshop.Infrastructure.Repositories
_context = context;
}
// Fügen Sie hier Repository-Methoden hinzu
// Beispiel:
// public async Task<IEnumerable<T>> GetAllAsync() { return await _context.Set<T>().ToListAsync(); }
// public async Task<T?> GetByIdAsync(Guid id) { return await _context.Set<T>().FindAsync(id); }
// public async Task AddAsync(T entity) { _context.Set<T>().Add(entity); await _context.SaveChangesAsync(); }
// public async Task UpdateAsync(T entity) { _context.Set<T>().Update(entity); await _context.SaveChangesAsync(); }
// public async Task DeleteAsync(Guid id) { var entity = await _context.Set<T>().FindAsync(id); if (entity != null) { _context.Set<T>().Remove(entity); await _context.SaveChangesAsync(); } }
public async Task<IEnumerable<Order>> GetAllAsync()
{
// Lade Bestellungen und zugehörige Kunden, um den Kundennamen anzeigen zu können
return await _context.Orders
.Include(o => o.Customer)
.OrderByDescending(o => o.OrderDate)
.ToListAsync();
}
public async Task<Order?> GetByIdAsync(Guid id)
{
// Lade eine einzelne Bestellung mit allen relevanten Details
return await _context.Orders
.Include(o => o.Customer)
.Include(o => o.BillingAddress)
.Include(o => o.ShippingAddress)
.Include(o => o.PaymentMethodInfo) // << KORREKTUR: Name der Navigation Property >>
.Include(o => o.ShippingMethodInfo) // << KORREKTUR: Name der Navigation Property >>
.Include(o => o.OrderItems)
.ThenInclude(oi => oi.Product)
.FirstOrDefaultAsync(o => o.Id == id);
}
public async Task AddAsync(Order order)
{
_context.Orders.Add(order);
await _context.SaveChangesAsync();
}
public async Task UpdateAsync(Order order)
{
_context.Orders.Update(order);
await _context.SaveChangesAsync();
}
public async Task DeleteAsync(Guid id)
{
var order = await _context.Orders.FindAsync(id);
if (order != null)
{
_context.Orders.Remove(order);
await _context.SaveChangesAsync();
}
}
}
}