refactor: manual journal.

server/src/models/Expense.js

@@ -71,7 +71,6 @@ export default class Expense extends TenantModel {
    */
   static get relationMappings() {
     const Account = require('models/Account');
-    const User = require('models/TenantUser');
     const ExpenseCategory = require('models/ExpenseCategory');
     
     return {
@@ -91,14 +90,6 @@ export default class Expense extends TenantModel {
           to: 'expense_transaction_categories.expenseId',
         },
       },
-      user: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: this.relationBindKnex(User.default),
-        join: {
-          from: 'expenses_transactions.userId',
-          to: 'users.id',
-        },
-      },
     };
   }
 }

server/src/models/ManualJournal.js

@@ -1,5 +1,6 @@
 import { Model } from 'objection';
 import TenantModel from 'models/TenantModel';
+import { AccountTransaction } from 'models';
 
 export default class ManualJournal extends TenantModel {
   /**
@@ -21,8 +22,20 @@ export default class ManualJournal extends TenantModel {
    */
   static get relationMappings() {
     const Media = require('models/Media');
+    const AccountTransaction = require('models/AccountTransaction');
 
     return {
+      entries: {
+        relation: Model.HasManyRelation,
+        modelClass: this.relationBindKnex(AccountTransaction.default),
+        join: {
+          from: 'manual_journals.id',
+          to: 'accounts_transactions.referenceId',
+        },
+        filter: (query) => {
+          query.where('referenceType', 'Journal');
+        },
+      },
       media: {
         relation: Model.ManyToManyRelation,
         modelClass: this.relationBindKnex(Media.default),

server/src/models/Model.js

@@ -6,6 +6,15 @@ import DateSession from 'models/DateSession';
 
 export default class ModelBase extends mixin(Model, [DateSession]) {
 
+
+  static query(...args) {
+    return super.query(...args).onBuildKnex(knexQueryBuilder => {
+      knexQueryBuilder.on('query', queryData => {
+        console.log(queryData);
+      });
+    });
+  }
+
   get timestamps() {
     return [];
   }