BIG-20: fix filtering manual journals by status column.

server/src/models/ManualJournal.Settings.ts

@@ -43,6 +43,7 @@ export default {
         { key: 'draft', label: 'Draft' },
         { key: 'published', label: 'published' }
       ],
+      filterCustomQuery: StatusFieldFilterQuery,
       sortCustomQuery: StatusFieldSortQuery,
     },
     'created_at': {
@@ -53,6 +54,16 @@ export default {
   },
 };
 
+/**
+ * Status field sorting custom query.
+ */
 function StatusFieldSortQuery(query, role) {
   return query.modify('sortByStatus', role.order);
 }
+
+/**
+ * Status field filter custom query.
+ */
+ function StatusFieldFilterQuery(query, role) {
+  query.modify('filterByStatus', role.value);
+}

server/src/models/ManualJournal.js

@@ -52,9 +52,41 @@ export default class ManualJournal extends mixin(TenantModel, [
    */
   static get modifiers() {
     return {
+      /**
+       * Sort by status query.
+       */
       sortByStatus(query, order) {
         query.orderByRaw(`PUBLISHED_AT IS NULL ${order}`);
       },
+
+      /**
+       * Filter by draft status.
+       */
+      filterByDraft(query) {
+        query.whereNull('publishedAt');
+      },
+
+      /**
+       * Filter by published status.
+       */
+      filterByPublished(query) {
+        query.whereNotNull('publishedAt');
+      },
+
+      /**
+       * Filter by the given status.
+       */
+      filterByStatus(query, filterType) {
+        switch (filterType) {
+          case 'draft':
+            query.modify('filterByDraft');
+            break;
+          case 'published':
+          default:
+            query.modify('filterByPublished');
+            break;
+        }
+      },
     };
   }