From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 12 Jul 2017 10:44:05 +0000 (+0100)
Subject: Rename association to reported_user, for clarity
X-Git-Tag: live~2949^2~114
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/99df5f6179b63bac322ddcc6581350082f4b8846

Rename association to reported_user, for clarity
---

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 763c85ef1..d1267fa4d 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -59,7 +59,7 @@ class IssuesController < ApplicationController
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments
-    @related_issues = @issue.user.issues.where(:issue_type => @user_role)
+    @related_issues = @issue.reported_user.issues.where(:issue_type => @user_role)
 
     @updated_by_admin = User.find(@issue.updated_by) if @issue.updated_by
   end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 963a27a6e..b6a531824 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,6 +1,6 @@
 class Issue < ActiveRecord::Base
   belongs_to :reportable, :polymorphic => true
-  belongs_to :user, :class_name => "User", :foreign_key => :reported_user_id
+  belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id
   belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by
 
   has_many :reports, :dependent => :destroy
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 7a7da4578..0eb2108b9 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -35,7 +35,7 @@ Search for a particular issue(s):  <br/>
         <td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
         <td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
         <td><%= reports_url(issue) %></td>
-        <td><%= link_to issue.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %></td>
+        <td><%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %></td>
         <td><%= instance_url(issue.reportable) %></td>
       </tr>
     <% end %>
diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 4a7b19119..602c6eb53 100644
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -162,7 +162,7 @@ class IssuesControllerTest < ActionController::TestCase
 
   def test_change_status_by_normal_user
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
     # Login as normal user
     session[:user] = create(:user).id
@@ -177,7 +177,7 @@ class IssuesControllerTest < ActionController::TestCase
 
   def test_change_status_by_admin
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
     # Login as administrator
     session[:user] = create(:administrator_user).id
@@ -201,7 +201,7 @@ class IssuesControllerTest < ActionController::TestCase
   def test_search_issues
     good_user = create(:user)
     bad_user = create(:user)
-    create(:issue, :reportable => bad_user, :reported_user_id => bad_user.id, :issue_type => "administrator")
+    create(:issue, :reportable => bad_user, :reported_user => bad_user, :issue_type => "administrator")
     # Login as administrator
     session[:user] = create(:administrator_user).id
 
diff --git a/test/factories/issues.rb b/test/factories/issues.rb
index 6078e5fd0..b6dec4478 100644
--- a/test/factories/issues.rb
+++ b/test/factories/issues.rb
@@ -2,8 +2,6 @@ FactoryGirl.define do
   factory :issue do
     # Default to reporting users
     association :reportable, :factory => :user
-
-    # reported_user_id
-    association :user, :factory => :user
+    association :reported_user, :factory => :user
   end
 end