fixed service-rate model

Author: roncodes

addon/models/service-rate.js

@@ -1,5 +1,4 @@
 import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
-import { tracked } from '@glimmer/tracking';
 import { computed, action } from '@ember/object';
 import { getOwner } from '@ember/application';
 import { format as formatDate, formatDistanceToNow } from 'date-fns';
@@ -20,8 +19,6 @@ export default class ServiceRate extends Model {
     @belongsTo('zone') zone;
     @hasMany('custom-field-value', { async: false }) custom_field_values;
 
-
-
     /** @attributes */
     @attr('string') service_area_name;
     @attr('string') zone_name;
@@ -119,21 +116,15 @@ export default class ServiceRate extends Model {
         return this.cod_calculation_method === 'percentage';
     }
 
-    @computed('rate_fees.[]', 'rate_fees.@each.distance', 'max_distance') get rateFees() {
+    @computed('rate_fees.@each.distance', 'max_distance') get rateFees() {
         const n = Math.max(0, Number(this.max_distance) || 0);
-        const existing = (this.rate_fees?.toArray?.() ?? [])
-            .filter(r => r.distance !== null && r.distance !== undefined && !r.isDeleted);
-        
+        const existing = (this.rate_fees?.toArray?.() ?? []).filter((r) => r.distance !== null && r.distance !== undefined && !r.isDeleted);
+
         // Return existing fees sorted by distance, filtered by max_distance
-        return existing
-            .filter(r => r.distance >= 0 && r.distance < n)
-            .sort((a, b) => a.distance - b.distance);
+        return existing.filter((r) => r.distance >= 0 && r.distance < n).sort((a, b) => a.distance - b.distance);
     }
 
     /** @methods */
-
-
-
     @action createDefaultPerDropFee(attributes = {}) {
         const store = getOwner(this).lookup('service:store');
         return store.createRecord('service-rate-fee', {
@@ -173,13 +164,13 @@ export default class ServiceRate extends Model {
     @action resetPerDropFees() {
         // Remove all existing per-drop fees
         const existingFees = this.rate_fees?.toArray?.() ?? [];
-        existingFees.forEach(fee => {
+        existingFees.forEach((fee) => {
             if (fee.unit === 'waypoint') {
                 this.rate_fees.removeObject(fee);
                 fee.destroyRecord();
             }
         });
-        
+
         // Add a new default per-drop fee
         const defaultFee = this.createDefaultPerDropFee();
         this.rate_fees.addObject(defaultFee);

addon/models/vehicle.js

@@ -272,4 +272,4 @@ export default class VehicleModel extends Model {
 
         return devices;
     }
-}
+}

addon/serializers/service-rate.js

@@ -24,26 +24,25 @@ export default class ServiceRateSerializer extends ApplicationSerializer.extend(
      */
     normalizeSaveResponse(store, primaryModelClass, payload, id, requestType) {
         const normalized = super.normalizeSaveResponse(store, primaryModelClass, payload, id, requestType);
-        
+
         // After normalization, replace rate_fees with only the saved records from backend
         if (normalized.data && normalized.data.type === 'service-rate') {
             const serviceRateId = normalized.data.id;
-            const rateFeeIds = normalized.data.relationships?.rate_fees?.data || [];
-            
+
             // Schedule after store update using Ember run loop
             next(() => {
                 const serviceRate = store.peekRecord('service-rate', serviceRateId);
                 if (serviceRate) {
                     // Cleanup rate_fees duplicates (for Fixed Rate and Per-Drop)
                     const allRateFees = serviceRate.get('rate_fees').toArray();
-                    const savedRateFees = allRateFees.filter(f => !f.isNew);
-                    const unsavedRateFees = allRateFees.filter(f => f.isNew);
-                    
+                    const savedRateFees = allRateFees.filter((f) => !f.isNew);
+                    const unsavedRateFees = allRateFees.filter((f) => f.isNew);
+
                     // Create a map of saved fees by distance
-                    const savedByDistance = new Map(savedRateFees.map(f => [f.distance, f]));
-                    
+                    const savedByDistance = new Map(savedRateFees.map((f) => [f.distance, f]));
+
                     // Only remove unsaved fees that duplicate saved fees
-                    unsavedRateFees.forEach(fee => {
+                    unsavedRateFees.forEach((fee) => {
                         if (savedByDistance.has(fee.distance)) {
                             serviceRate.get('rate_fees').removeObject(fee);
                             fee.unloadRecord();
@@ -52,24 +51,21 @@ export default class ServiceRateSerializer extends ApplicationSerializer.extend(
 
                     // Cleanup parcel_fees duplicates
                     const allParcelFees = serviceRate.get('parcel_fees').toArray();
-                    const savedParcelFees = allParcelFees.filter(f => !f.isNew);
-                    const unsavedParcelFees = allParcelFees.filter(f => f.isNew);
-                    
-                    // Create a map of saved parcel fees by uuid (or another unique key)
-                    const savedParcelByUuid = new Map(savedParcelFees.map(f => [f.get('id'), f]));
-                    
+                    const savedParcelFees = allParcelFees.filter((f) => !f.isNew);
+                    const unsavedParcelFees = allParcelFees.filter((f) => f.isNew);
+
+                    // // Create a map of saved parcel fees by uuid (or another unique key)
+                    // const savedParcelByUuid = new Map(savedParcelFees.map((f) => [f.get('id'), f]));
+
                     // Remove unsaved parcel fees that have a saved version
-                    unsavedParcelFees.forEach(fee => {
+                    unsavedParcelFees.forEach((fee) => {
                         // For parcel fees, we need to check if there's a duplicate based on attributes
                         // Since they don't have a simple key like distance, we'll just remove all unsaved ones
                         // that don't have unique identifying attributes
-                        const hasDuplicate = savedParcelFees.some(saved => 
-                            saved.size === fee.size && 
-                            saved.length === fee.length && 
-                            saved.width === fee.width && 
-                            saved.height === fee.height
+                        const hasDuplicate = savedParcelFees.some(
+                            (saved) => saved.size === fee.size && saved.length === fee.length && saved.width === fee.width && saved.height === fee.height
                         );
-                        
+
                         if (hasDuplicate) {
                             serviceRate.get('parcel_fees').removeObject(fee);
                             fee.unloadRecord();
@@ -78,7 +74,7 @@ export default class ServiceRateSerializer extends ApplicationSerializer.extend(
                 }
             });
         }
-        
+
         return normalized;
     }
 }