From 21fdc1edaecf228c1fdc540375bbdad0fd69164a Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 10 Aug 2016 22:45:30 +0800 Subject: Cleanup the use of duration and optimize some queries --- app/models/concerns/statuseable.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'app/models/concerns') diff --git a/app/models/concerns/statuseable.rb b/app/models/concerns/statuseable.rb index 44c6b30f278..37efc44b79b 100644 --- a/app/models/concerns/statuseable.rb +++ b/app/models/concerns/statuseable.rb @@ -31,11 +31,6 @@ module Statuseable all.pluck(self.status_sql).first end - def duration - duration_array = all.map(&:duration).compact - duration_array.reduce(:+) - end - def started_at all.minimum(:started_at) end @@ -78,4 +73,14 @@ module Statuseable def complete? canceled? || success? || failed? end + + private + + def calculate_duration + if started_at && finished_at + finished_at - started_at + elsif started_at + Time.now - started_at + end + end end -- cgit v1.2.1 From ce641335167230d288fbb2ec277548acbaff9dd7 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Mon, 15 Aug 2016 21:32:36 +0800 Subject: Introduce Gitlab::Utils.now so that it's easier to stub --- app/models/concerns/statuseable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/concerns') diff --git a/app/models/concerns/statuseable.rb b/app/models/concerns/statuseable.rb index 750f937b724..9f73c5c9467 100644 --- a/app/models/concerns/statuseable.rb +++ b/app/models/concerns/statuseable.rb @@ -87,7 +87,7 @@ module Statuseable if started_at && finished_at finished_at - started_at elsif started_at - Time.now - started_at + Gitlab::Utils.now - started_at end end end -- cgit v1.2.1 From f3e8b8881463bd30aa50085a45f5db96d400d3e7 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 19 Aug 2016 16:57:25 +0800 Subject: Use travel_to instead of dependency injection, feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5734#note_14056642 --- app/models/concerns/statuseable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/concerns') diff --git a/app/models/concerns/statuseable.rb b/app/models/concerns/statuseable.rb index 9f73c5c9467..750f937b724 100644 --- a/app/models/concerns/statuseable.rb +++ b/app/models/concerns/statuseable.rb @@ -87,7 +87,7 @@ module Statuseable if started_at && finished_at finished_at - started_at elsif started_at - Gitlab::Utils.now - started_at + Time.now - started_at end end end -- cgit v1.2.1