Refactored tax rate. (#147)

* Refactored tax rate. * Implemented tax rate validation.
Utar94 · Apr 20, 2024 · 3604d16 · 3604d16
1 parent 8b21762
commit 3604d16
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 16 deletions.
diff --git a/backend/src/Faktur.Application/Taxes/Validators/CreateTaxValidator.cs b/backend/src/Faktur.Application/Taxes/Validators/CreateTaxValidator.cs
@@ -10,7 +10,7 @@ internal class CreateTaxValidator : AbstractValidator<CreateTaxPayload>
   public CreateTaxValidator()
   {
     RuleFor(x => x.Code).SetValidator(new TaxCodeValidator());
-    RuleFor(x => x.Rate).GreaterThan(0.0);
+    RuleFor(x => x.Rate).SetValidator(new TaxRateValidator());
 
     When(x => !string.IsNullOrWhiteSpace(x.Flags), () => RuleFor(x => x.Flags!).SetValidator(new FlagsValidator()));
   }

diff --git a/backend/src/Faktur.Application/Taxes/Validators/ReplaceTaxValidator.cs b/backend/src/Faktur.Application/Taxes/Validators/ReplaceTaxValidator.cs
@@ -10,7 +10,7 @@ internal class ReplaceTaxValidator : AbstractValidator<ReplaceTaxPayload>
   public ReplaceTaxValidator()
   {
     RuleFor(x => x.Code).SetValidator(new TaxCodeValidator());
-    RuleFor(x => x.Rate).GreaterThan(0.0);
+    RuleFor(x => x.Rate).SetValidator(new TaxRateValidator());
 
     When(x => !string.IsNullOrWhiteSpace(x.Flags), () => RuleFor(x => x.Flags!).SetValidator(new FlagsValidator()));
   }

diff --git a/backend/src/Faktur.Application/Taxes/Validators/UpdateTaxValidator.cs b/backend/src/Faktur.Application/Taxes/Validators/UpdateTaxValidator.cs
@@ -10,7 +10,7 @@ internal class UpdateTaxValidator : AbstractValidator<UpdateTaxPayload>
   public UpdateTaxValidator()
   {
     When(x => !string.IsNullOrWhiteSpace(x.Code), () => RuleFor(x => x.Code!).SetValidator(new TaxCodeValidator()));
-    When(x => x.Rate.HasValue, () => RuleFor(x => x.Rate!.Value).GreaterThan(0.0));
+    When(x => x.Rate.HasValue, () => RuleFor(x => x.Rate!.Value).SetValidator(new TaxRateValidator()));
 
     When(x => !string.IsNullOrWhiteSpace(x.Flags?.Value), () => RuleFor(x => x.Flags!.Value!).SetValidator(new FlagsValidator()));
   }

diff --git a/backend/src/Faktur.Domain/Receipts/ReceiptTaxValidator.cs b/backend/src/Faktur.Domain/Receipts/ReceiptTaxValidator.cs
@@ -1,12 +1,13 @@
-using FluentValidation;
+using Faktur.Domain.Taxes;
+using FluentValidation;
 
 namespace Faktur.Domain.Receipts;
 
 public class ReceiptTaxValidator : AbstractValidator<ReceiptTaxUnit>
 {
   public ReceiptTaxValidator()
   {
-    RuleFor(x => x.Rate).GreaterThan(0.0);
+    RuleFor(x => x.Rate).SetValidator(new TaxRateValidator());
     RuleFor(x => x.TaxableAmount).GreaterThanOrEqualTo(0m);
     RuleFor(x => x.Amount).GreaterThanOrEqualTo(0m);
   }

diff --git a/backend/src/Faktur.Domain/Taxes/TaxAggregate.cs b/backend/src/Faktur.Domain/Taxes/TaxAggregate.cs
@@ -1,6 +1,7 @@
 using Faktur.Contracts;
 using Faktur.Domain.Products;
 using Faktur.Domain.Taxes.Events;
+using FluentValidation;
 using Logitar.EventSourcing;
 
 namespace Faktur.Domain.Taxes;
@@ -24,16 +25,17 @@ public TaxCodeUnit Code
       }
     }
   }
+  private readonly TaxRateValidator _rateValidator = new(nameof(Rate));
   private double _rate = 0;
   public double Rate
   {
     get => _rate;
     set
     {
-      // TODO(fpion): validation
-
       if (value != _rate)
       {
+        _rateValidator.ValidateAndThrow(value);
+
         _rate = value;
         _updatedEvent.Rate = value;
       }
@@ -58,9 +60,9 @@ public TaxAggregate(AggregateId id) : base(id)
   {
   }
 
-  public TaxAggregate(TaxCodeUnit code, double rate = 0.0, ActorId actorId = default, TaxId? id = null) : base((id ?? TaxId.NewId()).AggregateId)
+  public TaxAggregate(TaxCodeUnit code, double rate, ActorId actorId = default, TaxId? id = null) : base((id ?? TaxId.NewId()).AggregateId)
   {
-    // TODO(fpion): validate rate
+    new TaxRateValidator(nameof(rate)).ValidateAndThrow(rate);
 
     Raise(new TaxCreatedEvent(code, rate), actorId);
   }

diff --git a/backend/src/Faktur.Domain/Taxes/TaxRateValidator.cs b/backend/src/Faktur.Domain/Taxes/TaxRateValidator.cs
@@ -0,0 +1,11 @@
+using FluentValidation;
+
+namespace Faktur.Domain.Taxes;
+
+public class TaxRateValidator : AbstractValidator<double>
+{
+  public TaxRateValidator(string? propertyName = null)
+  {
+    RuleFor(x => x).GreaterThan(0).LessThan(1).WithPropertyName(propertyName);
+  }
+}
diff --git a/frontend/src/components/taxes/TaxRateInput.vue b/frontend/src/components/taxes/TaxRateInput.vue
@@ -10,23 +10,33 @@ defineProps<{
   required?: boolean | string;
 }>();
 
-defineEmits<{
+const emit = defineEmits<{
   (e: "update:model-value", value?: number): void;
 }>();
+function onModelValueUpdate(value: any): void {
+  const number: number | undefined = parseNumber(value);
+  emit("update:model-value", number ? number / 100 : undefined);
+}
 </script>
 
 <template>
   <AppInput
     floating
     id="rate"
     label="taxes.rate"
-    min="0.00001"
-    max="1"
-    :model-value="modelValue?.toString()"
+    min="0.001"
+    max="99.999"
+    :model-value="((modelValue ?? 0) * 100).toString()"
     placeholder="taxes.rate"
     :required="required"
-    step="0.00001"
+    step="0.001"
     type="number"
-    @update:model-value="$emit('update:model-value', parseNumber($event))"
-  />
+    @update:model-value="onModelValueUpdate"
+  >
+    <template #append>
+      <span class="input-group-text">
+        <font-awesome-icon icon="fas fa-percent" />
+      </span>
+    </template>
+  </AppInput>
 </template>
diff --git a/frontend/src/fontAwesome.ts b/frontend/src/fontAwesome.ts
@@ -18,6 +18,7 @@ import {
   faFlag,
   faHome,
   faKey,
+  faPercent,
   faPlus,
   faRobot,
   faRotate,
@@ -47,6 +48,7 @@ library.add(
   faHome,
   faFlag,
   faKey,
+  faPercent,
   faPlus,
   faRobot,
   faRotate,