From 8df5a45c299271c81db402fac5f71ae69e6b9251 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Thu, 8 Oct 2020 00:00:49 +0200 Subject: [PATCH] fix: relations media links with models. --- .../migrations/20200503032011_create_media_links_table.js | 2 +- server/src/models/Expense.js | 3 +++ server/src/models/ManualJournal.js | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/src/database/migrations/20200503032011_create_media_links_table.js b/server/src/database/migrations/20200503032011_create_media_links_table.js index 675337f94..31d26be4b 100644 --- a/server/src/database/migrations/20200503032011_create_media_links_table.js +++ b/server/src/database/migrations/20200503032011_create_media_links_table.js @@ -3,7 +3,7 @@ exports.up = function(knex) { return knex.schema.createTable('media_links', table => { table.increments(); table.string('model_name').index(); - table.integer('media_id').unsigned().index(); + table.integer('media_id').unsigned().references('id').inTable('media'); table.integer('model_id').unsigned().index(); }) }; diff --git a/server/src/models/Expense.js b/server/src/models/Expense.js index d49577982..eb1ae2c01 100644 --- a/server/src/models/Expense.js +++ b/server/src/models/Expense.js @@ -103,6 +103,9 @@ export default class Expense extends TenantModel { }, to: 'media.id', }, + filter(query) { + query.where('model_name', 'Expense'); + } }, }; } diff --git a/server/src/models/ManualJournal.js b/server/src/models/ManualJournal.js index b22fe610a..d3f0bf408 100644 --- a/server/src/models/ManualJournal.js +++ b/server/src/models/ManualJournal.js @@ -46,6 +46,9 @@ export default class ManualJournal extends TenantModel { to: 'media_links.media_id', }, to: 'media.id', + }, + filter(query) { + query.where('model_name', 'ManualJournal'); } } };