From 9371d77762ca88a98da266e149635adbfdd7b3b5 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 16 Mar 2018 13:12:33 +0100 Subject: [PATCH] Improve connections between repository models [SCI-1697] --- app/models/my_module_repository_row.rb | 6 ++++-- app/models/repository_cell.rb | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/models/my_module_repository_row.rb b/app/models/my_module_repository_row.rb index b03d754ae..f17cc8743 100644 --- a/app/models/my_module_repository_row.rb +++ b/app/models/my_module_repository_row.rb @@ -3,8 +3,10 @@ class MyModuleRepositoryRow < ApplicationRecord foreign_key: 'assigned_by_id', class_name: 'User', optional: true - belongs_to :repository_row, optional: true - belongs_to :my_module, optional: true + belongs_to :repository_row, + optional: true, + inverse_of: :my_module_repository_rows + belongs_to :my_module, optional: true, inverse_of: :my_module_repository_rows validates :repository_row, :my_module, presence: true validates :repository_row, uniqueness: { scope: :my_module } diff --git a/app/models/repository_cell.rb b/app/models/repository_cell.rb index 19474bc56..650dcba78 100644 --- a/app/models/repository_cell.rb +++ b/app/models/repository_cell.rb @@ -1,7 +1,9 @@ class RepositoryCell < ActiveRecord::Base belongs_to :repository_row belongs_to :repository_column - belongs_to :value, polymorphic: true, dependent: :destroy + belongs_to :value, polymorphic: true, + inverse_of: :repository_cell, + dependent: :destroy belongs_to :repository_text_value, (lambda do where(repository_cells: { value_type: 'RepositoryTextValue' })