fix issues

apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts

@@ -83,6 +83,7 @@ export class RatesService {
    */
   private async assertNoDuplicatePattern(pattern: {
     rateType: string;
+    rateUnit: string;
     containerTypeId: string | null;
     cargoTypeId: string | null;
     tradeDirection: string | null;
@@ -115,7 +116,7 @@ export class RatesService {
     });
     const rateUnit = this.resolveRateUnit(appliesTo, trigger, dto.rateUnit as Rate['rateUnit']);
 
-    await this.assertNoDuplicatePattern({ rateType, containerTypeId, cargoTypeId, tradeDirection });
+    await this.assertNoDuplicatePattern({ rateType, rateUnit, containerTypeId, cargoTypeId, tradeDirection });
 
     return this.repository.create({
       appliesTo,
@@ -183,6 +184,7 @@ export class RatesService {
     // Guard the pattern uniqueness for the new identity, ignoring this row.
     await this.assertNoDuplicatePattern({
       rateType,
+      rateUnit: updates.rateUnit,
       containerTypeId: updates.containerTypeId,
       cargoTypeId: updates.cargoTypeId,
       tradeDirection: updates.tradeDirection,

apps/edr-freight-api/src/modules/rule-engine/services/weight-limit-rules.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable, NotFoundException } from '@nestjs/common';
+import { ConflictException, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { CreateWeightLimitRuleDto } from '../dto/create-weight-limit-rule.dto';
 import { UpdateWeightLimitRuleDto } from '../dto/update-weight-limit-rule.dto';
 import { WeightLimitRule } from '../entities/weight-limit-rule.entity';
@@ -30,7 +30,7 @@ export class WeightLimitRulesService {
     const [data, total] = await this.repository.findAndCount({
       where,
       relations: { containerType: true },
-      order: { effectiveFrom: 'DESC' },
+      order: { createdAt: 'DESC' },
       skip: (page - 1) * pageSize,
       take: pageSize,
     });
@@ -44,26 +44,51 @@ export class WeightLimitRulesService {
     return entity;
   }
 
+  /**
+   * Reject a second rule for the same container + direction. One VGM limit per
+   * (container, direction) — otherwise the booking engine can't tell which
+   * applies.
+   */
+  private async assertNoDuplicate(
+    containerTypeId: string,
+    tradeDirection: string,
+    ignoreId?: string,
+  ): Promise<void> {
+    const existing = await this.repository.findByPattern(containerTypeId, tradeDirection, ignoreId);
+    if (existing) {
+      throw new ConflictException(
+        'A weight limit rule for this container type and trade direction already exists. Edit the existing rule instead.',
+      );
+    }
+  }
+
   /** Create a new weight limit rule. */
   async create(dto: CreateWeightLimitRuleDto): Promise<WeightLimitRule> {
+    await this.assertNoDuplicate(dto.containerTypeId, dto.tradeDirection);
     return this.repository.create({
       containerTypeId: dto.containerTypeId,
       tradeDirection: dto.tradeDirection,
       maxVgmTons: dto.maxVgmTons,
-      effectiveFrom: new Date(dto.effectiveFrom),
-      effectiveTo: dto.effectiveTo ? new Date(dto.effectiveTo) : null,
     });
   }
 
   /** Update an existing weight limit rule. */
   async update(id: string, dto: UpdateWeightLimitRuleDto): Promise<WeightLimitRule> {
-    await this.findById(id);
+    const existing = await this.findById(id);
     const patch: Partial<WeightLimitRule> = {};
     if (dto.containerTypeId !== undefined) patch.containerTypeId = dto.containerTypeId;
     if (dto.tradeDirection !== undefined) patch.tradeDirection = dto.tradeDirection;
     if (dto.maxVgmTons !== undefined) patch.maxVgmTons = dto.maxVgmTons;
-    if (dto.effectiveFrom !== undefined) patch.effectiveFrom = new Date(dto.effectiveFrom);
-    if (dto.effectiveTo !== undefined) patch.effectiveTo = new Date(dto.effectiveTo);
+
+    // Re-check uniqueness when the identity (container/direction) changes.
+    if (dto.containerTypeId !== undefined || dto.tradeDirection !== undefined) {
+      await this.assertNoDuplicate(
+        patch.containerTypeId ?? existing.containerTypeId,
+        patch.tradeDirection ?? existing.tradeDirection,
+        id,
+      );
+    }
+
     const updated = await this.repository.update(id, patch);
     if (!updated) throw new NotFoundException(`Weight limit rule ${id} not found`);
     return updated;