summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Brandl <abrandl@gitlab.com>2018-03-05 16:50:05 +0100
committerAndreas Brandl <abrandl@gitlab.com>2018-03-06 12:53:15 +0100
commit9ebbcb8f8b401d2a49cfec6b9cb55bf9703d8180 (patch)
tree0b87b1cc157b4b431b0480ac183ac9992251b372
parent11a559f7c9ce21b040c3a9c0544169f4885b9fa6 (diff)
downloadgitlab-ce-9ebbcb8f8b401d2a49cfec6b9cb55bf9703d8180.tar.gz
Operate on ids to avoid unnecessary loading.
-rw-r--r--app/models/user_interacted_project.rb6
-rw-r--r--spec/models/user_interacted_project_spec.rb4
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/user_interacted_project.rb b/app/models/user_interacted_project.rb
index 5e7f6d5eeda..5d661018a9d 100644
--- a/app/models/user_interacted_project.rb
+++ b/app/models/user_interacted_project.rb
@@ -2,8 +2,8 @@ class UserInteractedProject < ActiveRecord::Base
belongs_to :user
belongs_to :project
- validates :project, presence: true
- validates :user, presence: true
+ validates :project_id, presence: true
+ validates :user_id, presence: true
CACHE_EXPIRY_TIME = 1.day
@@ -15,7 +15,7 @@ class UserInteractedProject < ActiveRecord::Base
# For events without a project, we simply don't care.
# An example of this is the creation of a snippet (which
# is not related to any project).
- return unless event.project
+ return unless event.project_id
# This is a precaution because the cache lookup
# will work just fine without an author.
diff --git a/spec/models/user_interacted_project_spec.rb b/spec/models/user_interacted_project_spec.rb
index 1428fc2d433..cb4bb3372d4 100644
--- a/spec/models/user_interacted_project_spec.rb
+++ b/spec/models/user_interacted_project_spec.rb
@@ -55,6 +55,6 @@ describe UserInteractedProject do
end
end
- it { is_expected.to validate_presence_of(:project) }
- it { is_expected.to validate_presence_of(:user) }
+ it { is_expected.to validate_presence_of(:project_id) }
+ it { is_expected.to validate_presence_of(:user_id) }
end