Merge branch 'master' of https://github.com/TunNetCom/TunNetCom-SilkRoadErp

Author: malekBHA

src/TunNetCom.SilkRoadErp.Sales.Api/Features/Commandes/GetCommande/GetCommandQueryHandler.cs

@@ -1,4 +1,4 @@
-using TunNetCom.SilkRoadErp.Sales.Contracts.Commande;
+using TunNetCom.SilkRoadErp.Sales.Contracts.Commande;
 
 namespace TunNetCom.SilkRoadErp.Sales.Api.Features.Commandes.GetCommandes;
 
@@ -61,7 +61,9 @@ public async Task<Result<FullOrderResponse>> Handle(
                     ItemDescription = lc.DesignationLi,
                     ItemQuantity = lc.QteLi,
                     UnitPriceExcludingTax = lc.PrixHt,
+                    Discount = (decimal)lc.Remise,
                     TotalExcludingTax = lc.TotHt,
+                    VatRate = (decimal)lc.Tva,
                     TotalIncludingTax = lc.TotTtc
                 }).ToList()
             })

src/TunNetCom.SilkRoadErp.Sales.Api/Features/Customers/CreateCustomer/CreateCustomerValidator.cs

@@ -1,4 +1,4 @@
-namespace TunNetCom.SilkRoadErp.Sales.Api.Features.Customers.CreateCustomer;
+namespace TunNetCom.SilkRoadErp.Sales.Api.Features.Customers.CreateCustomer;
 
 public class CreateCustomerValidator : AbstractValidator<CreateCustomerCommand>
 {
@@ -29,6 +29,7 @@ public CreateCustomerValidator()
 
         _ = RuleFor(x => x.Mail)
             .MaximumLength(50).WithMessage("mail_must_be_less_than_50_characters")
-            .EmailAddress().WithMessage("mail_must_be_a_valid_email_address");
+            .EmailAddress().WithMessage("mail_must_be_a_valid_email_address")
+            .When(x => !string.IsNullOrEmpty(x.Mail));
     }
 }

src/TunNetCom.SilkRoadErp.Sales.Api/Features/Dashboard/GetRecapVentesAchats/GetRecapVentesAchatsQueryHandler.cs

@@ -64,7 +64,7 @@ public async Task<RecapVentesAchatsResponse> Handle(GetRecapVentesAchatsQuery re
         response.AchatsNets.TotalTTC += response.AchatsFacturesDepensesTotal;
 
         // 8) Paiements clients
-        var paiementsClientResult = await mediator.Send(new GetPaiementsClientQuery(null, null, startDate, endDateInclusive, null, null, null, null, null, 1, 10000), cancellationToken);
+        var paiementsClientResult = await mediator.Send(new GetPaiementsClientQuery(null, null, null, null, startDate, endDateInclusive, null, null, null, null, null, 1, 10000), cancellationToken);
         response.PaiementsClientsTotal = paiementsClientResult.Value?.Items?.Sum(p => p.Montant) ?? 0;
 
         // 9) Paiements fournisseurs

src/TunNetCom.SilkRoadErp.Sales.Api/Features/DeliveryNote/GetDeliveryNotesBasedOnProductReference/GetDeliveryNotesBasedOnProductReferenceEndpoint.cs

@@ -1,14 +1,14 @@
-using TunNetCom.SilkRoadErp.Sales.Contracts.DeliveryNote.Responses;
+using TunNetCom.SilkRoadErp.Sales.Contracts.DeliveryNote.Responses;
 
 namespace TunNetCom.SilkRoadErp.Sales.Api.Features.DeliveryNote.GetDeliveryNotesBasedOnProductReference;
 
 public class GetDeliveryNotesBasedOnProductReferenceEndpoint : ICarterModule
 {
     public void AddRoutes(IEndpointRouteBuilder app)
     {
-        _ = app.MapGet("/deliveryNoteHistory/{productReference}", async (
+        _ = app.MapGet("/deliveryNoteHistory", async (
                 IMediator mediator,
-                string productReference,
+                [FromQuery] string? productReference,
                 [AsParameters] QueryStringParameters paginationQueryParams,
                 HttpContext httpContext,
                 CancellationToken cancellationToken) =>

src/TunNetCom.SilkRoadErp.Sales.Api/Features/FactureDepense/CreateFactureDepense/CreateFactureDepenseCommand.cs

@@ -1,9 +1,12 @@
+using TunNetCom.SilkRoadErp.Sales.Contracts.FactureDepense;
+
 namespace TunNetCom.SilkRoadErp.Sales.Api.Features.FactureDepense.CreateFactureDepense;
 
 public record CreateFactureDepenseCommand(
     int IdTiersDepenseFonctionnement,
     DateTime Date,
     string Description,
     decimal MontantTotal,
+    List<FactureDepenseLigneTvaDto> LignesTVA,
     int? AccountingYearId,
     string? DocumentBase64) : IRequest<Result<int>>;

src/TunNetCom.SilkRoadErp.Sales.Api/Features/FactureDepense/CreateFactureDepense/CreateFactureDepenseCommandHandler.cs

@@ -57,19 +57,38 @@ public async Task<Result<int>> Handle(CreateFactureDepenseCommand command, Cance
 
         var num = await _numberGeneratorService.GenerateFactureDepenseNumberAsync(accountingYearId.Value, cancellationToken);
 
+        var (baseHT0, montantTVA0, baseHT7, montantTVA7, baseHT13, montantTVA13, baseHT19, montantTVA19) = GetLignesFromDto(command.LignesTVA);
+
         var entity = Domain.Entites.FactureDepense.Create(
             num,
             command.IdTiersDepenseFonctionnement,
             command.Date,
             command.Description ?? string.Empty,
             command.MontantTotal,
             accountingYearId.Value,
-            documentStoragePath);
+            documentStoragePath,
+            baseHT0, montantTVA0, baseHT7, montantTVA7, baseHT13, montantTVA13, baseHT19, montantTVA19);
 
         _context.FactureDepense.Add(entity);
         await _context.SaveChangesAsync(cancellationToken);
 
         _logger.LogInformation("FactureDepense created with Id {Id}, Num {Num}", entity.Id, entity.Num);
         return Result.Ok(entity.Id);
     }
+
+    private static (decimal baseHT0, decimal montantTVA0, decimal baseHT7, decimal montantTVA7, decimal baseHT13, decimal montantTVA13, decimal baseHT19, decimal montantTVA19) GetLignesFromDto(List<Contracts.FactureDepense.FactureDepenseLigneTvaDto>? lignes)
+    {
+        decimal b0 = 0, t0 = 0, b7 = 0, t7 = 0, b13 = 0, t13 = 0, b19 = 0, t19 = 0;
+        if (lignes != null)
+        {
+            foreach (var l in lignes)
+            {
+                if (l.TauxTVA == 0) { b0 = l.BaseHT; t0 = l.MontantTVA; }
+                else if (l.TauxTVA == 7) { b7 = l.BaseHT; t7 = l.MontantTVA; }
+                else if (l.TauxTVA == 13) { b13 = l.BaseHT; t13 = l.MontantTVA; }
+                else if (l.TauxTVA == 19) { b19 = l.BaseHT; t19 = l.MontantTVA; }
+            }
+        }
+        return (b0, t0, b7, t7, b13, t13, b19, t19);
+    }
 }

src/TunNetCom.SilkRoadErp.Sales.Api/Features/FactureDepense/CreateFactureDepense/CreateFactureDepenseEndpoint.cs

@@ -15,6 +15,7 @@ public void AddRoutes(IEndpointRouteBuilder app)
                 request.Date,
                 request.Description ?? string.Empty,
                 request.MontantTotal,
+                request.LignesTVA ?? new(),
                 request.AccountingYearId,
                 request.DocumentBase64);
             var result = await mediator.Send(command, cancellationToken);

src/TunNetCom.SilkRoadErp.Sales.Api/Features/FactureDepense/ExportToTejXml/ExportFactureDepenseToTejXmlEndpoint.cs

@@ -0,0 +1,227 @@
+using Carter;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using TunNetCom.SilkRoadErp.Sales.Api.Features.AppParameters.GetAppParameters;
+using TunNetCom.SilkRoadErp.Sales.Api.Infrastructure.Constants;
+using TunNetCom.SilkRoadErp.Sales.Api.Infrastructure.Services;
+using TunNetCom.SilkRoadErp.Sales.Domain.Entites;
+
+namespace TunNetCom.SilkRoadErp.Sales.Api.Features.FactureDepense.ExportToTejXml;
+
+public class ExportFactureDepenseToTejXmlEndpoint : ICarterModule
+{
+    public void AddRoutes(IEndpointRouteBuilder app)
+    {
+        _ = app.MapGet("/api/factures-depenses/{id:int}/export/tej-xml", HandleExportToTejXmlAsync)
+            .RequireAuthorization($"Permission:{Permissions.ViewFactureDepense}")
+            .WithTags(EndpointTags.FactureDepense)
+            .Produces(StatusCodes.Status200OK)
+            .Produces(StatusCodes.Status400BadRequest)
+            .Produces(StatusCodes.Status404NotFound)
+            .Produces(StatusCodes.Status500InternalServerError);
+    }
+
+    public static async Task<Results<FileContentHttpResult, BadRequest<string>, NotFound<string>, StatusCodeHttpResult>> HandleExportToTejXmlAsync(
+        [FromServices] SalesContext context,
+        [FromServices] TejXmlExportService exportService,
+        [FromServices] INumberGeneratorService numberGeneratorService,
+        [FromServices] IMediator mediator,
+        [FromServices] ILogger<ExportFactureDepenseToTejXmlEndpoint> logger,
+        [FromServices] IActiveAccountingYearService activeAccountingYearService,
+        [FromServices] IAccountingYearFinancialParametersService financialParametersService,
+        int id,
+        [FromQuery] string? acteDepot = "0",
+        CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            logger.LogInformation("ExportFactureDepenseToTejXmlEndpoint called for FactureDepense Id {Id}", id);
+
+            var appParamsResult = await mediator.Send(new GetAppParametersQuery(), cancellationToken);
+            if (appParamsResult.IsFailed)
+            {
+                logger.LogError("Failed to retrieve app parameters");
+                return TypedResults.BadRequest("Impossible de récupérer les paramètres de l'application.");
+            }
+
+            var factureDepense = await context.FactureDepense
+                .Include(f => f.IdTiersDepenseFonctionnementNavigation)
+                .FirstOrDefaultAsync(f => f.Id == id, cancellationToken);
+
+            if (factureDepense == null)
+            {
+                logger.LogWarning("FactureDepense Id {Id} not found", id);
+                return TypedResults.NotFound($"Facture dépense introuvable.");
+            }
+
+            var tiers = factureDepense.IdTiersDepenseFonctionnementNavigation;
+            if (tiers == null)
+            {
+                logger.LogWarning("Tiers dépense not found for FactureDepense Id {Id}", id);
+                return TypedResults.BadRequest("Tiers dépense introuvable pour cette facture.");
+            }
+
+            if (tiers.ExonereRetenueSource)
+            {
+                logger.LogWarning("TEJ export not applicable: tiers is exempt from withholding tax for FactureDepense Id {Id}", id);
+                return TypedResults.BadRequest("Le tiers est exonéré de retenue à la source ; l'export TEJ n'est pas applicable.");
+            }
+
+            var seuilRetenueSource = await financialParametersService.GetSeuilRetenueSourceAsync(1000, cancellationToken);
+            if (factureDepense.MontantTotal < seuilRetenueSource)
+            {
+                logger.LogWarning(
+                    "Montant {MontantTotal} is below threshold {Seuil} for FactureDepense Id {Id}",
+                    factureDepense.MontantTotal, seuilRetenueSource, id);
+                return TypedResults.BadRequest(
+                    $"Le montant ({factureDepense.MontantTotal:F2}) doit être supérieur ou égal au seuil ({seuilRetenueSource:F2}) pour pouvoir exporter en XML TEJ.");
+            }
+
+            var existingAttribution = await context.TejCertificatFactureDepense
+                .AsNoTracking()
+                .FirstOrDefaultAsync(t => t.FactureDepenseId == id, cancellationToken);
+
+            string refCertifTej;
+            if (existingAttribution != null)
+            {
+                refCertifTej = existingAttribution.RefCertif;
+            }
+            else
+            {
+                var year = factureDepense.Date.Year;
+                var month = factureDepense.Date.Month;
+                refCertifTej = await numberGeneratorService.GetNextTejCertificatRefAsync(year, month, cancellationToken);
+                context.TejCertificatFactureDepense.Add(new TejCertificatFactureDepense
+                {
+                    FactureDepenseId = id,
+                    RefCertif = refCertifTej
+                });
+                await context.SaveChangesAsync(cancellationToken);
+            }
+
+            _ = await activeAccountingYearService.GetActiveAccountingYearIdAsync(cancellationToken);
+
+            var systeme = await context.Systeme
+                .AsNoTracking()
+                .FirstOrDefaultAsync(cancellationToken);
+
+            if (systeme == null)
+            {
+                logger.LogError("Systeme parameters not found");
+                return TypedResults.BadRequest("Paramètres système introuvables.");
+            }
+
+            var financialParams = await financialParametersService.GetAllFinancialParametersAsync(cancellationToken);
+            if (financialParams == null)
+            {
+                logger.LogError("No active accounting year found");
+                return TypedResults.BadRequest("Aucun exercice comptable actif trouvé.");
+            }
+
+            if (string.IsNullOrWhiteSpace(systeme.MatriculeFiscale))
+            {
+                logger.LogWarning("MatriculeFiscale is missing in systeme parameters");
+                return TypedResults.BadRequest("Le matricule fiscal de l'entreprise n'est pas configuré dans les paramètres système.");
+            }
+
+            if (string.IsNullOrWhiteSpace(tiers.Matricule))
+            {
+                logger.LogWarning("Tiers Matricule is missing for FactureDepense Id {Id}", id);
+                return TypedResults.BadRequest("Le matricule fiscal du tiers n'est pas configuré pour cette facture.");
+            }
+
+            if (string.IsNullOrWhiteSpace(tiers.Mail))
+            {
+                logger.LogWarning("Tiers Mail missing for FactureDepense Id {Id}, TEJ export blocked", id);
+                return TypedResults.BadRequest(
+                    "L'export TEJ exige l'adresse e-mail du tiers. Veuillez renseigner l'e-mail du tiers avant d'exporter.");
+            }
+
+            var telDigitsOnly = new string((tiers.Tel ?? "").Where(char.IsDigit).ToArray());
+            if (telDigitsOnly.Length != 8)
+            {
+                logger.LogWarning("Tiers Tel not in format XXXXXXXX (8 digits) for FactureDepense Id {Id}, TEJ export blocked", id);
+                return TypedResults.BadRequest(
+                    "L'export TEJ exige le téléphone du tiers au format XXXXXXXX (8 chiffres). Veuillez corriger le numéro du tiers.");
+            }
+
+            var tiersMatriculeNormalise = TryNormalizeMatriculeFiscal(tiers.Matricule.Trim());
+            if (tiersMatriculeNormalise is null)
+            {
+                logger.LogWarning("Tiers Matricule format invalid for FactureDepense Id {Id}: expected 7 digits + 1 letter", id);
+                return TypedResults.BadRequest(
+                    "Le matricule fiscal du tiers doit être au format 7 chiffres et une lettre clé (ex. 0001238L).");
+            }
+
+            var matriculeNormaliseResult = TryNormalizeMatriculeFiscal(systeme.MatriculeFiscale.Trim());
+            if (matriculeNormaliseResult is null)
+            {
+                logger.LogWarning("MatriculeFiscale format invalid: expected 7 digits + 1 letter, got {Value}", systeme.MatriculeFiscale);
+                return TypedResults.BadRequest(
+                    "Le matricule fiscal de l'entreprise doit être au format 7 chiffres et une lettre clé (ex. 0001238L).");
+            }
+
+            var acteDepotValue = acteDepot == "1" ? "1" : "0";
+
+            var xmlBytes = exportService.ExportFactureDepenseToTejXml(
+                factureDepense,
+                tiers,
+                systeme,
+                appParamsResult.Value,
+                financialParams,
+                refCertifChezDeclarant: refCertifTej,
+                normalizedDeclarantMatricule: matriculeNormaliseResult,
+                normalizedBeneficiaireMatricule: tiersMatriculeNormalise,
+                beneficiaireTel8Digits: telDigitsOnly,
+                acteDepot: acteDepotValue);
+
+            var validationErrors = TejXsdValidator.Validate(xmlBytes)
+                .Where(e => !e.Contains("introuvable", StringComparison.OrdinalIgnoreCase))
+                .ToList();
+            if (validationErrors.Count > 0)
+            {
+                logger.LogWarning("TEJ XSD validation failed for FactureDepense Id {Id}: {Errors}", id, string.Join("; ", validationErrors));
+                return TypedResults.BadRequest(
+                    "Le fichier XML n'est pas conforme au schéma TEJ: " + string.Join("; ", validationErrors));
+            }
+
+            var exercice = factureDepense.Date.Year;
+            var mois = factureDepense.Date.Month.ToString("D2");
+            var filename = $"{matriculeNormaliseResult}-{exercice}-{mois}-{acteDepotValue}.xml";
+
+            logger.LogInformation("TEJ XML export completed successfully for FactureDepense Id {Id}", id);
+
+            return TypedResults.File(
+                xmlBytes,
+                contentType: "application/xml; charset=utf-8",
+                fileDownloadName: filename);
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Error exporting FactureDepense Id {Id} to TEJ XML format", id);
+            return TypedResults.StatusCode(500);
+        }
+    }
+
+    private static string? TryNormalizeMatriculeFiscal(string matriculeFiscale)
+    {
+        if (string.IsNullOrWhiteSpace(matriculeFiscale))
+            return null;
+
+        var cleaned = new string(matriculeFiscale.Where(c => char.IsLetterOrDigit(c)).ToArray());
+        if (cleaned.Length == 0)
+            return null;
+
+        var digits = new string(cleaned.Where(char.IsDigit).Take(7).ToArray());
+        var letterPart = new string(cleaned.Where(char.IsLetter).ToArray());
+        if (letterPart.Length == 0)
+            return null;
+
+        var digitsPadded = digits.PadLeft(7, '0');
+        var letter = letterPart[0];
+        if (!char.IsLetter(letter))
+            return null;
+
+        return digitsPadded + char.ToUpperInvariant(letter);
+    }
+}

src/TunNetCom.SilkRoadErp.Sales.Api/Features/FactureDepense/GetFactureDepense/GetFactureDepenseQueryHandler.cs

@@ -13,27 +13,35 @@ public async Task<Result<FactureDepenseResponse>> Handle(GetFactureDepenseQuery
             .AsNoTracking()
             .Include(f => f.IdTiersDepenseFonctionnementNavigation)
             .Where(f => f.Id == query.Id)
-            .Select(f => new FactureDepenseResponse
-            {
-                Id = f.Id,
-                Num = f.Num,
-                IdTiersDepenseFonctionnement = f.IdTiersDepenseFonctionnement,
-                TiersDepenseFonctionnementNom = f.IdTiersDepenseFonctionnementNavigation.Nom,
-                Date = f.Date,
-                Description = f.Description,
-                MontantTotal = f.MontantTotal,
-                AccountingYearId = f.AccountingYearId,
-                Statut = f.Statut.ToString(),
-                DocumentStoragePath = f.DocumentStoragePath,
-                HasDocument = !string.IsNullOrEmpty(f.DocumentStoragePath)
-            })
             .FirstOrDefaultAsync(cancellationToken);
 
         if (entity == null)
         {
             _logger.LogWarning("FactureDepense not found: Id {Id}", query.Id);
             return Result.Fail(EntityNotFound.Error());
         }
-        return Result.Ok(entity);
+
+        var response = new FactureDepenseResponse
+        {
+            Id = entity.Id,
+            Num = entity.Num,
+            IdTiersDepenseFonctionnement = entity.IdTiersDepenseFonctionnement,
+            TiersDepenseFonctionnementNom = entity.IdTiersDepenseFonctionnementNavigation.Nom,
+            Date = entity.Date,
+            Description = entity.Description,
+            MontantTotal = entity.MontantTotal,
+            LignesTVA = new List<FactureDepenseLigneTvaDto>
+            {
+                new() { TauxTVA = 0, BaseHT = entity.BaseHT0, MontantTVA = entity.MontantTVA0 },
+                new() { TauxTVA = 7, BaseHT = entity.BaseHT7, MontantTVA = entity.MontantTVA7 },
+                new() { TauxTVA = 13, BaseHT = entity.BaseHT13, MontantTVA = entity.MontantTVA13 },
+                new() { TauxTVA = 19, BaseHT = entity.BaseHT19, MontantTVA = entity.MontantTVA19 }
+            },
+            AccountingYearId = entity.AccountingYearId,
+            Statut = entity.Statut.ToString(),
+            DocumentStoragePath = entity.DocumentStoragePath,
+            HasDocument = !string.IsNullOrEmpty(entity.DocumentStoragePath)
+        };
+        return Result.Ok(response);
     }
 }