1181 - Allow sort on plan extension column

bcgov · Jan 22, 2025 · f38e162 · f38e162
1 parent 881819d
commit f38e162
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/libs/db2/model/agreement.js b/src/libs/db2/model/agreement.js
@@ -118,10 +118,12 @@ export default class Agreement extends Model {
       })
       .leftJoin('ref_agreement_type', {
         'agreement.agreement_type_id': 'ref_agreement_type.id',
-      })
-      .orderByRaw(
-        `${filterSettings.orderBy} ${filterSettings.order === 'asc' ? 'asc nulls last' : 'desc nulls first'}`,
-      );
+      });
+
+    q.orderByRaw(
+      `${filterSettings.orderBy} ${filterSettings.order === 'asc' ? 'asc nulls last' : 'desc nulls first'} 
+    ${filterSettings.orderBy === 'extension_status' ? ', CASE WHEN extension_received_votes = extension_required_votes THEN 1 ELSE 0 END desc, extension_required_votes desc' : ''}`,
+    );
     if (Object.keys(where).length === 1 && where[Object.keys(where)[0]]?.constructor === Array) {
       const k = Object.keys(where)[0];
       const v = where[k];