From 6f4894351db4ded3413808f3660feb65e65655ca Mon Sep 17 00:00:00 2001 From: Leena Date: Mon, 7 Mar 2016 08:47:28 +0530 Subject: [PATCH] Ignore deleted devices while showing the App usage report --- app/models/app_usage.rb | 1 + spec/models/app_usage_spec.rb | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/app/models/app_usage.rb b/app/models/app_usage.rb index 74ff983..868aad9 100644 --- a/app/models/app_usage.rb +++ b/app/models/app_usage.rb @@ -4,6 +4,7 @@ class AppUsage < ActiveRecord::Base scope :app_usages_per_device_app_day, lambda { AppUsage.select(:package_name,:device_id,:used_on). + where("device_id IS NOT NULL"). order("used_on desc"). order("device_id"). order("package_name"). diff --git a/spec/models/app_usage_spec.rb b/spec/models/app_usage_spec.rb index b46693f..ee40b75 100644 --- a/spec/models/app_usage_spec.rb +++ b/spec/models/app_usage_spec.rb @@ -7,4 +7,13 @@ RSpec.describe AppUsage, type: :model do it { should validate_presence_of :usage_duration_in_seconds } it { should validate_presence_of :used_on } it { should belong_to :device } + + context "App Usage report" do + let!(:app_usage) { create(:app_usage,device_id: nil) } + it "Ignore Deleted devices" do + app_usage = AppUsage.app_usages_per_device_app_day + expect(app_usage).to be_empty + end + + end end