#492 - Fix snakeCase producing wrong column name for pldAUMs/crownAUMs

The custom snakeCase function used regex /([A-Z])/g to insert underscores
before each capital letter, producing 'pld_a_u_ms' from 'pldAUMs'. The
sort-special-case check in fetchGrazingSchedulesEntries expected
'pld_au_ms', so the mismatch caused the code to use 'pld_a_u_ms' as
a database ORDER BY column name, crashing with:
  column "pld_a_u_ms" does not exist

Fix: use a two-regex approach that groups consecutive uppercase letters
(/[A-Z]+(?=[A-Z][a-z])/) before splitting on camelCase boundaries
(/([a-z0-9])([A-Z])/). This produces 'pld_au_ms' and 'crown_au_ms',
matching the existing checks in grazingschedule.ts.

Author: Brijesh

__tests__/utils.spec.js

@@ -51,12 +51,12 @@ describe('utility helpers', () => {
     expect(isNumeric(isAnumber)).toBe(true);
   });
 
-  test('snakeCase converts pldAUMs to pld_au_ms', async () => {
-    expect(snakeCase('pldAUMs')).toBe('pld_au_ms');
+  test('snakeCase converts pldAUMs to pld_aums', async () => {
+    expect(snakeCase('pldAUMs')).toBe('pld_aums');
   });
 
-  test('snakeCase converts crownAUMs to crown_au_ms', async () => {
-    expect(snakeCase('crownAUMs')).toBe('crown_au_ms');
+  test('snakeCase converts crownAUMs to crown_aums', async () => {
+    expect(snakeCase('crownAUMs')).toBe('crown_aums');
   });
 
   test('snakeCase converts standard camelCase correctly', async () => {
@@ -78,8 +78,8 @@ describe('utility helpers', () => {
 
   test('objPathToSnakeCase converts dotted paths', async () => {
     expect(objPathToSnakeCase('ref_livestock.name')).toBe('ref_livestock.name');
-    expect(objPathToSnakeCase('pldAUMs')).toBe('pld_au_ms');
-    expect(objPathToSnakeCase('crownAUMs')).toBe('crown_au_ms');
+    expect(objPathToSnakeCase('pldAUMs')).toBe('pld_aums');
+    expect(objPathToSnakeCase('crownAUMs')).toBe('crown_aums');
   });
 
   test('objPathToCamelCase converts snake paths to camelCase', async () => {

src/libs/db2/model/grazingschedule.ts

@@ -45,24 +45,19 @@ export default class Schedule extends KyselyModel {
     }
     const where = { haycutting_schedule_id: this.id };
     this.scheduleEntries = await HayCuttingScheduleEntry.findWithOrder(db, where, order, orderRaw);
-    this.scheduleEntries = this.scheduleEntries.map(
-      (entry: any) =>
-        new HayCuttingScheduleEntry(
-          {
-            ...entry,
-            dateIn: entry.dateIn ? new Date(entry.dateIn).toISOString().split('T')[0] : null,
-            dateOut: entry.dateOut ? new Date(entry.dateOut).toISOString().split('T')[0] : null,
-          },
-          db,
-        ),
-    );
+    this.scheduleEntries = this.scheduleEntries.map((entry: any) => {
+      const formatted = { ...entry };
+      formatted.date_in = formatted.date_in ? new Date(formatted.date_in).toISOString().split('T')[0] : null;
+      formatted.date_out = formatted.date_out ? new Date(formatted.date_out).toISOString().split('T')[0] : null;
+      return new HayCuttingScheduleEntry(formatted, db);
+    });
   }
 
   async fetchGrazingSchedulesEntries(_db?: any) {
     const db = _db || kyselyDb;
     let order: any;
     let orderRaw = false;
-    if (this.sortBy !== 'pld_au_ms' && this.sortBy !== 'crown_au_ms') {
+    if (this.sortBy !== 'pld_aums' && this.sortBy !== 'crown_aums') {
       if (this.sortBy === 'days') {
         order = `date_out - date_in ${this.sortOrder ? this.sortOrder : 'asc'}`;
         orderRaw = true;
@@ -75,7 +70,7 @@ export default class Schedule extends KyselyModel {
     }
     const where = { grazing_schedule_id: this.id };
     let entries = await GrazingScheduleEntry.findWithLivestockType(db, where, order, orderRaw);
-    if (this.sortBy === 'pld_au_ms' || this.sortBy === 'crown_au_ms') {
+    if (this.sortBy === 'pld_aums' || this.sortBy === 'crown_aums') {
       entries = entries.map((row: any) => {
         const days = calcDateDiff(row.date_out, row.date_in, false);
         const pldPercent = row.pasture_pld_percent;
@@ -85,18 +80,21 @@ export default class Schedule extends KyselyModel {
         row.pldAUMs = round(calcPldAUMs(totalAUMs, pldPercent), 0);
         const crownAUMWithDecimal = calcCrownAUMs(totalAUMs, row.pldAUMs);
         row.crownAUMs = crownAUMWithDecimal > 0 && crownAUMWithDecimal < 1 ? 1 : round(crownAUMWithDecimal, 0);
-        row.dateIn = row.dateIn ? new Date(row.dateIn).toISOString().split('T')[0] : null;
-        row.dateOut = row.dateOut ? new Date(row.dateOut).toISOString().split('T')[0] : null;
         return row;
       });
-      if (this.sortBy === 'pld_au_ms') {
+      if (this.sortBy === 'pld_aums') {
         if (this.sortOrder === 'asc') entries.sort((a: any, b: any) => a.pldAUMs - b.pldAUMs);
         else entries.sort((a: any, b: any) => b.pldAUMs - a.pldAUMs);
       } else {
         if (this.sortOrder === 'asc') entries.sort((a: any, b: any) => a.crownAUMs - b.crownAUMs);
         else entries.sort((a: any, b: any) => b.crownAUMs - a.crownAUMs);
       }
     }
-    this.scheduleEntries = entries.map((entry: any) => new GrazingScheduleEntry(entry, db));
+    this.scheduleEntries = entries.map((entry: any) => {
+      const formatted = { ...entry };
+      formatted.date_in = formatted.date_in ? new Date(formatted.date_in).toISOString().split('T')[0] : null;
+      formatted.date_out = formatted.date_out ? new Date(formatted.date_out).toISOString().split('T')[0] : null;
+      return new GrazingScheduleEntry(formatted, db);
+    });
   }
 }

src/libs/utils.ts

@@ -24,11 +24,7 @@
 import { errorWithCode } from './bcgov-shim.js';
 
 const camelCase = (str) => str.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
-export const snakeCase = (str) =>
-  str
-    .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
-    .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
-    .toLowerCase();
+export const snakeCase = (str) => str.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase();
 
 /**
  * Check if a string consits of [0-9].

src/router/controllers_v1/PlanController.ts

@@ -76,8 +76,8 @@ export default class PlanController {
           let sanitizedSortBy = schedule.sortBy && objPathToCamelCase(schedule.sortBy);
           sanitizedSortBy = sanitizedSortBy && sanitizedSortBy.replace('pastureName', 'pasture.name');
           sanitizedSortBy = sanitizedSortBy && sanitizedSortBy.replace('refLivestockName', 'livestockType.name');
-          sanitizedSortBy = sanitizedSortBy && sanitizedSortBy.replace('pldAuMs', 'pldAUMs');
-          sanitizedSortBy = sanitizedSortBy && sanitizedSortBy.replace('crownAuMs', 'crownAUMs');
+          sanitizedSortBy = sanitizedSortBy && sanitizedSortBy.replace('pldAums', 'pldAUMs');
+          sanitizedSortBy = sanitizedSortBy && sanitizedSortBy.replace('crownAums', 'crownAUMs');
           return {
             ...schedule,
             sortBy: sanitizedSortBy,

src/router/controllers_v1/PlanScheduleController.ts

@@ -62,7 +62,12 @@ export default class PlanScheduleController {
         schedule = await Schedule.create(trx, {
           ...rest,
           plan_id: planId,
-          sort_by: sortBy && objPathToSnakeCase(sortBy),
+          sort_by:
+            sortBy &&
+            objPathToSnakeCase(sortBy.replace('AUMs', 'Aums').replace('livestockType', 'ref_livestock')).replace(
+              '.',
+              '_',
+            ),
         });
 
         const entryCreates = scheduleEntries.map((entry) => {
@@ -145,7 +150,12 @@ export default class PlanScheduleController {
           {
             ...rest,
             plan_id: planId,
-            sort_by: sortBy && objPathToSnakeCase(sortBy),
+            sort_by:
+              sortBy &&
+              objPathToSnakeCase(sortBy.replace('AUMs', 'Aums').replace('livestockType', 'ref_livestock')).replace(
+                '.',
+                '_',
+              ),
           },
         );
 
@@ -314,7 +324,10 @@ export default class PlanScheduleController {
         await PlanRouteHelper.canUserAccessThisAgreement(trx, Agreement, user, agreementId);
 
         if (sortBy) {
-          sortBy = objPathToSnakeCase(sortBy.replace('livestockType', 'ref_livestock')).replace('.', '_');
+          sortBy = objPathToSnakeCase(sortBy.replace('AUMs', 'Aums').replace('livestockType', 'ref_livestock')).replace(
+            '.',
+            '_',
+          );
         }
 
         const result = await trx