feat: Add cost per kilometer below soft max to transition attributes (#225)

Author: jmccollum-woolpert

application/frontend/src/app/core/components/transition-attributes-dialog/transition-attributes-dialog.component.html

@@ -169,13 +169,23 @@
                   Must be greater than zero
                 </mat-error>
               </div>
+              <div class="settings-item">
+                <mat-form-field appearance="outline" class="unpadded-form-field">
+                  <mat-label>Distance limit cost below soft max</mat-label>
+                  <input matInput type="number" formControlName="distanceLimitCostBelowSoftMax" />
+                </mat-form-field>
+                <mat-error
+                  *ngIf="transitionAttributes.get('distanceLimitCostBelowSoftMax').errors?.min">
+                  Must be greater than zero
+                </mat-error>
+              </div>
             </div>
             <mat-error
               *ngIf="
                 transitionAttributes.errors?.distanceLimitSoftCostRequired ||
                 transitionAttributes.errors?.distanceLimitSoftMaxRequired
               ">
-              <span> Soft max and cost must both be defined </span>
+              <span> Soft max and at least one cost must both be defined </span>
             </mat-error>
           </div>
           <!-- Delay -->

application/frontend/src/app/core/components/transition-attributes-dialog/transition-attributes-dialog.component.ts

@@ -19,6 +19,7 @@ import { BehaviorSubject, combineLatest } from 'rxjs';
 import {
   aRequiredIfB,
   durationMinutesSeconds,
+  oneOfARequiredIfB,
   requireAxorB,
   secondsToDuration,
 } from 'src/app/util';
@@ -52,6 +53,10 @@ export class TransitionAttributesDialogComponent {
         cost: [value?.cost, Validators.min(0)],
         costPerKilometer: [value?.costPerKilometer, Validators.min(0)],
         distanceLimitSoftMax: [value?.distanceLimit?.softMaxMeters, Validators.min(0)],
+        distanceLimitCostBelowSoftMax: [
+          value?.distanceLimit?.costPerKilometerBelowSoftMax,
+          Validators.min(0),
+        ],
         distanceLimitCostAboveSoftMax: [
           value?.distanceLimit?.costPerKilometerAboveSoftMax,
           Validators.min(0),
@@ -66,8 +71,8 @@ export class TransitionAttributesDialogComponent {
         validators: [
           requireAxorB('srcTag', 'excludedSrcTag', 'srcTagOrExcludeSrcTag'),
           requireAxorB('dstTag', 'excludedDstTag', 'dstTagOrExcludeDstTag'),
-          aRequiredIfB(
-            'distanceLimitCostAboveSoftMax',
+          oneOfARequiredIfB(
+            ['distanceLimitCostAboveSoftMax', 'distanceLimitCostBelowSoftMax'],
             'distanceLimitSoftMax',
             'distanceLimitSoftCostRequired'
           ),
@@ -76,6 +81,11 @@ export class TransitionAttributesDialogComponent {
             'distanceLimitCostAboveSoftMax',
             'distanceLimitSoftMaxRequired'
           ),
+          aRequiredIfB(
+            'distanceLimitSoftMax',
+            'distanceLimitCostBelowSoftMax',
+            'distanceLimitSoftMaxRequired'
+          ),
         ],
       }
     );
@@ -160,6 +170,7 @@ export class TransitionAttributesDialogComponent {
         costPerKilometer: transition.costPerKilometer,
         distanceLimit: {
           softMaxMeters: transition.distanceLimitSoftMax,
+          costPerKilometerBelowSoftMax: transition.distanceLimitCostBelowSoftMax,
           costPerKilometerAboveSoftMax: transition.distanceLimitCostAboveSoftMax,
         },
         delay: secondsToDuration(transition.delay.min * 60 + transition.delay.sec),

application/frontend/src/app/util/validators.ts

@@ -259,3 +259,17 @@ export function requireAxorB(a: string, b: string, id = 'requireAxorB'): Validat
     return (!aValue && !bValue) || (aValue && bValue) ? { [id]: true } : null;
   };
 }
+
+export function oneOfARequiredIfB(a: string[], b: string, id = 'oneOfARequiredIfB'): ValidatorFn {
+  return (fg: UntypedFormGroup) => {
+    const bValue = fg.get(b).value;
+    if (bValue == null) {
+      return null;
+    }
+
+    const returnVal = !a.some((element) => fg.get(element).value) && {
+      [id]: { ...a },
+    };
+    return returnVal;
+  };
+}