Merge lp:~stolowski/unity-scope-click/default-department-key into lp:unity-scope-click/devel

[Paweł Stołowski]

Handle X-Ubuntu-Default-Department-ID key of .desktop files to support departments for preinstalled apps.

Handle X-Ubuntu-Default-Department-ID key of .desktop files to support departments for preinstalled apps.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/225/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/199
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/199

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/225/rebuild

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/application.h'
--- libclickscope/click/application.h	2014-05-27 15:02:04 +0000
+++ libclickscope/click/application.h	2014-07-21 13:01:36 +0000
@@ -42,10 +42,12 @@
                 std::string icon_url,
                 std::string url,
                 std::string description,
-                std::string main_screenshot
+                std::string main_screenshot,
+                std::string default_department
                 ) : Package {name, title, price, icon_url, url},
                     description(description),
-                    main_screenshot(main_screenshot)
+                    main_screenshot(main_screenshot),
+                    default_department(default_department)
     {
 
     }
@@ -55,6 +57,7 @@
     std::string description;
     std::vector<std::string> keywords;
     std::string main_screenshot;
+    std::string default_department;
     time_t installed_time;
 };
 

=== modified file 'libclickscope/click/departments-db.cpp'
--- libclickscope/click/departments-db.cpp	2014-07-17 10:49:54 +0000
+++ libclickscope/click/departments-db.cpp	2014-07-21 13:01:36 +0000
@@ -62,6 +62,7 @@
     insert_dept_id_query_.reset(new QSqlQuery(db_));
     insert_dept_name_query_.reset(new QSqlQuery(db_));
     select_pkgs_by_dept_.reset(new QSqlQuery(db_));
+    select_pkg_by_pkgid_.reset(new QSqlQuery(db_));
     select_pkgs_by_dept_recursive_.reset(new QSqlQuery(db_));
     select_parent_dept_.reset(new QSqlQuery(db_));
     select_children_depts_.reset(new QSqlQuery(db_));
@@ -75,6 +76,7 @@
     insert_dept_name_query_->prepare("INSERT OR REPLACE INTO deptnames (deptid, locale, name) VALUES (:deptid, :locale, :name)");
     select_pkgs_by_dept_->prepare("SELECT pkgid FROM pkgmap WHERE deptid=:deptid");
     select_pkgs_by_dept_recursive_->prepare("WITH RECURSIVE recdepts(deptid) AS (SELECT deptid FROM depts_v WHERE deptid=:deptid UNION SELECT depts_v.deptid FROM recdepts,depts_v WHERE recdepts.deptid=depts_v.parentid) SELECT pkgid FROM pkgmap NATURAL JOIN recdepts");
+    select_pkg_by_pkgid_->prepare("SELECT pkgid FROM pkgmap WHERE pkgid=:pkgid");
     select_children_depts_->prepare("SELECT deptid,(SELECT COUNT(1) from DEPTS_V AS inner WHERE inner.parentid=outer.deptid) FROM DEPTS_V AS outer WHERE parentid=:parentid");
     select_parent_dept_->prepare("SELECT parentid FROM depts_v WHERE deptid=:deptid");
     select_dept_name_->prepare("SELECT name FROM deptnames WHERE deptid=:deptid AND locale=:locale");
@@ -224,6 +226,23 @@
     return pkgs;
 }
 
+bool DepartmentsDb::has_package(const std::string& package_id)
+{
+    select_pkg_by_pkgid_->bindValue(":pkgid", QVariant(QString::fromStdString(package_id)));
+    if (!select_pkg_by_pkgid_->exec())
+    {
+        report_db_error(select_parent_dept_->lastError(), "Failed to query for package " + package_id);
+    }
+    if (!select_pkg_by_pkgid_->next())
+    {
+        select_pkg_by_pkgid_->finish();
+        return false;
+    }
+    select_pkg_by_pkgid_->finish();
+    return true;
+
+}
+
 void DepartmentsDb::store_package_mapping(const std::string& package_id, const std::string& department_id)
 {
     if (package_id.empty())

=== modified file 'libclickscope/click/departments-db.h'
--- libclickscope/click/departments-db.h	2014-07-17 06:28:31 +0000
+++ libclickscope/click/departments-db.h	2014-07-21 13:01:36 +0000
@@ -66,6 +66,7 @@
 
     virtual std::string get_department_name(const std::string& department_id, const std::list<std::string>& locales);
     virtual std::unordered_set<std::string> get_packages_for_department(const std::string& department_id, bool recursive = true);
+    virtual bool has_package(const std::string& package_id);
     virtual std::string get_parent_department_id(const std::string& department_id);
     virtual std::list<DepartmentInfo> get_children_departments(const std::string& department_id);
 
@@ -95,6 +96,7 @@
     std::unique_ptr<QSqlQuery> insert_dept_id_query_;
     std::unique_ptr<QSqlQuery> insert_dept_name_query_;
     std::unique_ptr<QSqlQuery> select_pkgs_by_dept_;
+    std::unique_ptr<QSqlQuery> select_pkg_by_pkgid_;
     std::unique_ptr<QSqlQuery> select_pkgs_by_dept_recursive_;
     std::unique_ptr<QSqlQuery> select_parent_dept_;
     std::unique_ptr<QSqlQuery> select_children_depts_;

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-07-17 18:37:23 +0000
+++ libclickscope/click/interface.cpp	2014-07-21 13:01:36 +0000
@@ -52,6 +52,7 @@
 
 #include "interface.h"
 #include <click/key_file_locator.h>
+#include <click/departments-db.h>
 
 #include <click/click-i18n.h>
 
@@ -85,6 +86,7 @@
 static const std::string DESKTOP_FILE_KEY_APP_ID("X-Ubuntu-Application-ID");
 static const std::string DESKTOP_FILE_KEY_DOMAIN("X-Ubuntu-Gettext-Domain");
 static const std::string DESKTOP_FILE_UBUNTU_TOUCH("X-Ubuntu-Touch");
+static const std::string DESKTOP_FILE_UBUNTU_DEFAULT_DEPARTMENT("X-Ubuntu-Default-Department-ID");
 static const std::string DESKTOP_FILE_COMMENT("Comment");
 static const std::string DESKTOP_FILE_SCREENSHOT("X-Screenshot");
 static const std::string DESKTOP_FILE_NODISPLAY("NoDisplay");
@@ -169,6 +171,10 @@
                                                 DESKTOP_FILE_KEY_KEYWORDS);
     }
 
+    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_UBUNTU_DEFAULT_DEPARTMENT)) {
+        app.default_department = keyFile.get_string(DESKTOP_FILE_GROUP, DESKTOP_FILE_UBUNTU_DEFAULT_DEPARTMENT);
+    }
+
     if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_APP_ID)) {
         QString app_id = QString::fromStdString(keyFile.get_string(
                 DESKTOP_FILE_GROUP,
@@ -229,14 +235,33 @@
  * Find all of the installed apps matching @search_query in a timeout.
  */
 std::vector<click::Application> Interface::find_installed_apps(const std::string& search_query,
-            const std::unordered_set<std::string>& packages_in_department,
-            bool department_filter)
+        const std::string& current_department,
+        const std::shared_ptr<click::DepartmentsDb>& depts_db)
 {
+    //
+    // only apply department filtering if not in root of all departments.
+    bool apply_department_filter = (search_query.empty() && !current_department.empty());
+
+    // get the set of packages that belong to current deparment;
+    std::unordered_set<std::string> packages_in_department;
+    if (depts_db && apply_department_filter)
+    {
+        try
+        {
+            packages_in_department = depts_db->get_packages_for_department(current_department);
+        }
+        catch (const std::exception& e)
+        {
+            qWarning() << "Failed to get packages of department" << QString::fromStdString(current_department);
+            apply_department_filter = false; // disable so that we are not loosing any apps if something goes wrong
+        }
+    }
+
     std::vector<Application> result;
 
     bool include_desktop_results = show_desktop_apps();
 
-    auto enumerator = [&result, this, search_query, packages_in_department, department_filter, include_desktop_results]
+    auto enumerator = [&result, this, search_query, current_department, packages_in_department, apply_department_filter, include_desktop_results, depts_db]
             (const unity::util::IniParser& keyFile, const std::string& filename)
     {
         if (keyFile.has_group(DESKTOP_FILE_GROUP) == false) {
@@ -253,17 +278,34 @@
             auto app = load_app_from_desktop(keyFile, filename);
 
             // check if apps is present in current department
-            if (department_filter)
+            if (apply_department_filter)
             {
-                if (!app.name.empty()) // app from click package
-                {
-                    if (packages_in_department.find(app.name) == packages_in_department.end())
-                        return;
-                }
-                else // non-click app, match on desktop file name
-                {
-                    if (packages_in_department.find(filename) == packages_in_department.end())
-                        return;
+                // app from click package has non-empty name; for non-click apps use desktop filename
+                const std::string key = app.name.empty() ? filename : app.name;
+                if (packages_in_department.find(key) == packages_in_department.end())
+                {
+                    if (app.default_department.empty())
+                    {
+                        // default department not present in the keyfile, skip this app
+                        return;
+                    }
+                    else
+                    {
+                        // default department not empty: check if this app is in a different
+                        // department in the db (i.e. got moved from the default department);
+                        if (depts_db->has_package(key))
+                        {
+                            // app is now in a different department
+                            return;
+                        }
+
+                        if (app.default_department != current_department)
+                        {
+                            return;
+                        }
+
+                        // else - this package is in current department
+                    }
                 }
             }
 

=== modified file 'libclickscope/click/interface.h'
--- libclickscope/click/interface.h	2014-07-15 14:36:21 +0000
+++ libclickscope/click/interface.h	2014-07-21 13:01:36 +0000
@@ -44,6 +44,7 @@
 {
 
 class KeyFileLocator;
+class DepartmentsDb;
 
 // Hash map of desktop files that are not yet click packages
 const std::unordered_set<std::string>& nonClickDesktopFiles();
@@ -92,8 +93,8 @@
                                               const std::string& filename);
     static std::vector<Application> sort_apps(const std::vector<Application>& apps);
     virtual std::vector<Application> find_installed_apps(const std::string& search_query,
-            const std::unordered_set<std::string>& packages_in_department = std::unordered_set<std::string>(),
-            bool department_filter = false);
+            const std::string& current_department = "",
+            const std::shared_ptr<click::DepartmentsDb>& depts_db = nullptr);
 
     static bool is_non_click_app(const QString& filename);
 

=== modified file 'libclickscope/tests/applications/system/address-book-app.desktop'
--- libclickscope/tests/applications/system/address-book-app.desktop	2014-02-13 20:48:58 +0000
+++ libclickscope/tests/applications/system/address-book-app.desktop	2014-07-21 13:01:36 +0000
@@ -11,4 +11,5 @@
 X-Ubuntu-StageHint=SideStage
 X-Ubuntu-Gettext-Domain=address-book-app
 X-Ubuntu-Single-Instance=true
+X-Ubuntu-Default-Department-ID=accessories
 # this one has no screenshot nor comment, to test how it breaks

=== modified file 'libclickscope/tests/test_departments-db.cpp'
--- libclickscope/tests/test_departments-db.cpp	2014-07-17 10:49:54 +0000
+++ libclickscope/tests/test_departments-db.cpp	2014-07-21 13:01:36 +0000
@@ -54,6 +54,7 @@
         EXPECT_FALSE(insert_dept_name_query_->isActive());
         EXPECT_FALSE(select_pkgs_by_dept_->isActive());
         EXPECT_FALSE(select_pkgs_by_dept_recursive_->isActive());
+        EXPECT_FALSE(select_pkg_by_pkgid_->isActive());
         EXPECT_FALSE(select_parent_dept_->isActive());
         EXPECT_FALSE(select_children_depts_->isActive());
         EXPECT_FALSE(select_dept_name_->isActive());
@@ -177,6 +178,10 @@
 TEST_F(DepartmentsDbTest, testPackageLookup)
 {
     {
+        EXPECT_TRUE(db->has_package("game1"));
+        EXPECT_FALSE(db->has_package("foooo"));
+    }
+    {
         auto pkgs = db->get_packages_for_department("rpg", false);
         EXPECT_EQ(1u, pkgs.size());
         EXPECT_TRUE(pkgs.find("game1") != pkgs.end());

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2014-07-15 21:30:03 +0000
+++ libclickscope/tests/test_interface.cpp	2014-07-21 13:01:36 +0000
@@ -42,6 +42,7 @@
 
 #include <click/interface.h>
 #include <click/key_file_locator.h>
+#include <click/departments-db.h>
 
 using namespace click;
 using namespace ::testing;
@@ -53,25 +54,31 @@
 // Maintaining this list here will become tedious over time.
 static const std::vector<click::Application> non_desktop_applications =
 {
-    {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", ""},
-    {"", "Weather", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.weather/./weather64.png", "application:///com.ubuntu.weather_weather_1.0.168.desktop", "", ""},
-    {"com.ubuntu.developer.webapps.webapp-twitter", "Twitter", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-twitter/./twitter.png", "application:///com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5.desktop", "", ""},
-    {"com.ubuntu.music", "Music", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.music/images/music.png", "application:///com.ubuntu.music_music_1.1.329.desktop", "", ""},
-    {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", ""},
-    {"com.ubuntu.dropping-letters", "Dropping Letters", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.dropping-letters/dropping-letters.png", "application:///com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43.desktop", "", ""},
-    {"com.ubuntu.developer.webapps.webapp-gmail", "Gmail", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-gmail/./gmail.png", "application:///com.ubuntu.developer.webapps.webapp-gmail_webapp-gmail_1.0.8.desktop", "", ""},
-    {"com.ubuntu.terminal", "Terminal", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.terminal/./terminal64.png", "application:///com.ubuntu.terminal_terminal_0.5.29.desktop", "", ""},
-    {"com.ubuntu.calendar", "Calendar", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calendar/./calendar64.png", "application:///com.ubuntu.calendar_calendar_0.4.182.desktop", "", ""},
-    {"com.ubuntu.notes", "Notes", 0.0, "image://theme/notepad", "application:///com.ubuntu.notes_notes_1.4.242.desktop", "", ""},
-    {"com.ubuntu.developer.webapps.webapp-amazon", "Amazon", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-amazon/./amazon.png", "application:///com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.6.desktop", "", ""},
-    {"com.ubuntu.shorts", "Shorts", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.shorts/./rssreader64.png", "application:///com.ubuntu.shorts_shorts_0.2.162.desktop", "", ""},
-    {"com.ubuntu.filemanager", "File Manager", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.filemanager/./filemanager64.png", "application:///com.ubuntu.filemanager_filemanager_0.1.1.97.desktop", "", ""},
-    {"com.ubuntu.calculator", "Calculator", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/./calculator64.png", "application:///com.ubuntu.calculator_calculator_0.1.3.206.desktop", "", ""},
-    {"com.ubuntu.sudoku", "Sudoku", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.sudoku/SudokuGameIcon.png", "application:///com.ubuntu.sudoku_sudoku_1.0.142.desktop", "", ""},
-    {"com.ubuntu.developer.webapps.webapp-ebay", "eBay", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ebay/./ebay.png", "application:///com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8.desktop", "", ""},
-    {"com.ubuntu.developer.webapps.webapp-facebook", "Facebook", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-facebook/./facebook.png", "application:///com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook_1.0.5.desktop", "", ""},
-    {"", "Messaging", 0.0, "image://theme/messages-app", "application:///messaging-app.desktop", "Messaging application", "/usr/share/messaging-app/assets/messaging-app-screenshot.png"},
-    {"", "Contacts", 0.0, "image://theme/contacts-app", "application:///address-book-app.desktop", "", ""}
+    {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0,
+        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", "", ""},
+    {"", "Weather", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.weather/./weather64.png", "application:///com.ubuntu.weather_weather_1.0.168.desktop", "", "", ""},
+    {"com.ubuntu.developer.webapps.webapp-twitter", "Twitter", 0.0,
+        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-twitter/./twitter.png", "application:///com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5.desktop", "", "", ""},
+    {"com.ubuntu.music", "Music", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.music/images/music.png", "application:///com.ubuntu.music_music_1.1.329.desktop", "", "", ""},
+    {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", "", ""},
+    {"com.ubuntu.dropping-letters", "Dropping Letters", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.dropping-letters/dropping-letters.png", "application:///com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43.desktop", "", "", ""},
+    {"com.ubuntu.developer.webapps.webapp-gmail", "Gmail", 0.0,
+        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-gmail/./gmail.png", "application:///com.ubuntu.developer.webapps.webapp-gmail_webapp-gmail_1.0.8.desktop", "", "", ""},
+    {"com.ubuntu.terminal", "Terminal", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.terminal/./terminal64.png", "application:///com.ubuntu.terminal_terminal_0.5.29.desktop", "", "", ""},
+    {"com.ubuntu.calendar", "Calendar", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calendar/./calendar64.png", "application:///com.ubuntu.calendar_calendar_0.4.182.desktop", "", "", ""},
+    {"com.ubuntu.notes", "Notes", 0.0, "image://theme/notepad", "application:///com.ubuntu.notes_notes_1.4.242.desktop", "", "", ""},
+    {"com.ubuntu.developer.webapps.webapp-amazon", "Amazon", 0.0,
+        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-amazon/./amazon.png", "application:///com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.6.desktop", "", "", ""},
+    {"com.ubuntu.shorts", "Shorts", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.shorts/./rssreader64.png", "application:///com.ubuntu.shorts_shorts_0.2.162.desktop", "", "", ""},
+    {"com.ubuntu.filemanager", "File Manager", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.filemanager/./filemanager64.png", "application:///com.ubuntu.filemanager_filemanager_0.1.1.97.desktop", "", "", ""},
+    {"com.ubuntu.calculator", "Calculator", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/./calculator64.png", "application:///com.ubuntu.calculator_calculator_0.1.3.206.desktop", "", "", ""},
+    {"com.ubuntu.sudoku", "Sudoku", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.sudoku/SudokuGameIcon.png", "application:///com.ubuntu.sudoku_sudoku_1.0.142.desktop", "", "", ""},
+    {"com.ubuntu.developer.webapps.webapp-ebay", "eBay", 0.0,
+        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ebay/./ebay.png", "application:///com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8.desktop", "", "", ""},
+    {"com.ubuntu.developer.webapps.webapp-facebook", "Facebook", 0.0,
+        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-facebook/./facebook.png", "application:///com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook_1.0.5.desktop", "", "", ""},
+    {"", "Messaging", 0.0, "image://theme/messages-app", "application:///messaging-app.desktop", "Messaging application", "/usr/share/messaging-app/assets/messaging-app-screenshot.png", ""},
+    {"", "Contacts", 0.0, "image://theme/contacts-app", "application:///address-book-app.desktop", "", "", ""}
 };
 
 static click::Application desktop_application
@@ -82,6 +89,7 @@
     "image://theme/sample-desktop-app",
     "application:///non-click-app-without-exception.desktop",
     "multiline description goes here",
+    "",
     ""
 };
 
@@ -182,6 +190,50 @@
     EXPECT_TRUE(results.empty());
 }
 
+//
+// test that application with a default department id key in the desktop
+// file is returned when department matches
+TEST(ClickInterface, testFindAppsWithAppWithDefaultDepartmentId)
+{
+    QSharedPointer<click::KeyFileLocator> keyFileLocator(
+                new click::KeyFileLocator(
+                    testing::systemApplicationsDirectoryForTesting(),
+                    testing::userApplicationsDirectoryForTesting()));
+
+    click::Interface iface(keyFileLocator);
+
+    auto depts_db = std::make_shared<click::DepartmentsDb>(":memory:");
+    auto results = iface.find_installed_apps("", "accessories", depts_db);
+
+    EXPECT_EQ(1u, results.size());
+    EXPECT_EQ("Contacts", results.begin()->title);
+}
+
+TEST(ClickInterface, testFindAppsWithAppWithDefaultDepartmentIdOverriden)
+{
+    QSharedPointer<click::KeyFileLocator> keyFileLocator(
+                new click::KeyFileLocator(
+                    testing::systemApplicationsDirectoryForTesting(),
+                    testing::userApplicationsDirectoryForTesting()));
+
+    click::Interface iface(keyFileLocator);
+
+    auto depts_db = std::make_shared<click::DepartmentsDb>(":memory:");
+
+    depts_db->store_department_name("utilities", "", "Utilities");
+    depts_db->store_department_name("accessories", "", "Accessories");
+
+    auto results = iface.find_installed_apps("", "utilies", depts_db);
+    EXPECT_EQ(0, results.size());
+
+    // address book applicaton moved to utilities
+    depts_db->store_package_mapping("address-book-app.desktop", "utilities");
+    results = iface.find_installed_apps("", "utilities", depts_db);
+
+    EXPECT_EQ(1u, results.size());
+    EXPECT_EQ("Contacts", results.begin()->title);
+}
+
 TEST(ClickInterface, testFindAppsInDirSorted)
 {
     QSharedPointer<click::KeyFileLocator> keyFileLocator(
@@ -194,8 +246,9 @@
     auto results = iface.find_installed_apps("ock");
 
     const std::vector<click::Application> expected_results = {
-        {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", ""},
-        {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", ""},
+        {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", "", ""},
+        {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0,
+            "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", "", ""},
     };
     EXPECT_EQ(expected_results, results);
 }
@@ -203,19 +256,19 @@
 TEST(ClickInterface, testSortApps)
 {
     std::vector<click::Application> apps = {
-        {"", "Sudoku", 0.0, "", "", "", ""},
-        {"", "eBay", 0.0, "", "", "", ""},
-        {"", "Facebook", 0.0, "", "", "", ""},
-        {"", "Messaging", 0.0, "", "", "", ""},
-        {"", "Contacts", 0.0, "", "", "", ""},
+        {"", "Sudoku", 0.0, "", "", "", "", ""},
+        {"", "eBay", 0.0, "", "", "", "", ""},
+        {"", "Facebook", 0.0, "", "", "", "", ""},
+        {"", "Messaging", 0.0, "", "", "", "", ""},
+        {"", "Contacts", 0.0, "", "", "", "", ""},
     };
 
     std::vector<click::Application> expected = {
-        {"", "Contacts", 0.0, "", "", "", ""},
-        {"", "eBay", 0.0, "", "", "", ""},
-        {"", "Facebook", 0.0, "", "", "", ""},
-        {"", "Messaging", 0.0, "", "", "", ""},
-        {"", "Sudoku", 0.0, "", "", "", ""},
+        {"", "Contacts", 0.0, "", "", "", "", ""},
+        {"", "eBay", 0.0, "", "", "", "", ""},
+        {"", "Facebook", 0.0, "", "", "", "", ""},
+        {"", "Messaging", 0.0, "", "", "", "", ""},
+        {"", "Sudoku", 0.0, "", "", "", "", ""},
     };
 
     ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US.UTF-8", 1), 0);
@@ -226,13 +279,13 @@
 TEST(ClickInterface, testSortAppsWithDuplicates)
 {
     std::vector<click::Application> apps = {
-        {"com.sudoku.sudoku", "Sudoku", 0.0, "", "", "", ""},
-        {"com.canonical.sudoku", "Sudoku", 0.0, "", "", "", ""},
+        {"com.sudoku.sudoku", "Sudoku", 0.0, "", "", "", "", ""},
+        {"com.canonical.sudoku", "Sudoku", 0.0, "", "", "", "", ""},
     };
 
     std::vector<click::Application> expected = {
-        {"com.canonical.sudoku", "Sudoku", 0.0, "", "", "", ""},
-        {"com.sudoku.sudoku", "Sudoku", 0.0, "", "", "", ""},
+        {"com.canonical.sudoku", "Sudoku", 0.0, "", "", "", "", ""},
+        {"com.sudoku.sudoku", "Sudoku", 0.0, "", "", "", "", ""},
     };
 
     ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US.UTF-8", 1), 0);
@@ -243,17 +296,17 @@
 TEST(ClickInterface, testSortAppsWithAccents)
 {
     std::vector<click::Application> apps = {
-        {"", "Robots", 0.0, "", "", "", ""},
-        {"", "Æon", 0.0, "", "", "", ""},
-        {"", "Contacts", 0.0, "", "", "", ""},
-        {"", "Über", 0.0, "", "", "", ""},
+        {"", "Robots", 0.0, "", "", "", "", ""},
+        {"", "Æon", 0.0, "", "", "", "", ""},
+        {"", "Contacts", 0.0, "", "", "", "", ""},
+        {"", "Über", 0.0, "", "", "", "", ""},
     };
 
     std::vector<click::Application> expected = {
-        {"", "Æon", 0.0, "", "", "", ""},
-        {"", "Contacts", 0.0, "", "", "", ""},
-        {"", "Robots", 0.0, "", "", "", ""},
-        {"", "Über", 0.0, "", "", "", ""},
+        {"", "Æon", 0.0, "", "", "", "", ""},
+        {"", "Contacts", 0.0, "", "", "", "", ""},
+        {"", "Robots", 0.0, "", "", "", "", ""},
+        {"", "Über", 0.0, "", "", "", "", ""},
     };
 
     ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US.UTF-8", 1), 0);
@@ -264,17 +317,17 @@
 TEST(ClickInterface, testSortAppsMixedCharsets)
 {
     std::vector<click::Application> apps = {
-        {"", "Robots", 0.0, "", "", "", ""},
-        {"", "汉字", 0.0, "", "", "", ""},
-        {"", "漢字", 0.0, "", "", "", ""},
-        {"", "Über", 0.0, "", "", "", ""},
+        {"", "Robots", 0.0, "", "", "", "", ""},
+        {"", "汉字", 0.0, "", "", "", "", ""},
+        {"", "漢字", 0.0, "", "", "", "", ""},
+        {"", "Über", 0.0, "", "", "", "", ""},
     };
 
     std::vector<click::Application> expected = {
-        {"", "汉字", 0.0, "", "", "", ""},
-        {"", "漢字", 0.0, "", "", "", ""},
-        {"", "Robots", 0.0, "", "", "", ""},
-        {"", "Über", 0.0, "", "", "", ""},
+        {"", "汉字", 0.0, "", "", "", "", ""},
+        {"", "漢字", 0.0, "", "", "", "", ""},
+        {"", "Robots", 0.0, "", "", "", "", ""},
+        {"", "Über", 0.0, "", "", "", "", ""},
     };
 
     ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "zh_CN.UTF-8", 1), 0);

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-07-17 20:05:57 +0000
+++ scope/clickapps/apps-query.cpp	2014-07-21 13:01:36 +0000
@@ -336,28 +336,9 @@
     auto const current_dept = query().department_id();
     auto const querystr = query().query_string();
 
-    //
-    // get the set of packages that belong to current deparment;
-    // only apply department filtering if not in root of all departments.
-    bool apply_department_filter = (querystr.empty() && !current_dept.empty());
-    std::unordered_set<std::string> pkgs_in_department;
-    if (impl->depts_db && apply_department_filter)
-    {
-        try
-        {
-            pkgs_in_department = impl->depts_db->get_packages_for_department(current_dept);
-        }
-        catch (const std::exception& e)
-        {
-            qWarning() << "Failed to get packages of department" << QString::fromStdString(current_dept);
-            apply_department_filter = false; // disable so that we are not loosing any apps if something goes wrong
-        }
-    }
-
     const bool show_top_apps = querystr.empty() && current_dept.empty();
     ResultPusher pusher(searchReply, show_top_apps ? impl->configuration.get_core_apps() : std::vector<std::string>());
-    auto const localResults = clickInterfaceInstance().find_installed_apps(
-                querystr, pkgs_in_department, apply_department_filter);
+    auto const localResults = clickInterfaceInstance().find_installed_apps(querystr, current_dept, impl->depts_db);
 
     if (querystr.empty()) {
         if (impl->depts_db)

=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-07-17 20:05:57 +0000
+++ scope/tests/test_apps_query.cpp	2014-07-21 13:01:36 +0000
@@ -61,7 +61,7 @@
 {
 public:
     MockClickInterface() = default;
-    MOCK_METHOD3(find_installed_apps, std::vector<click::Application>(const std::string&, const std::unordered_set<std::string>&, bool));
+    MOCK_METHOD3(find_installed_apps, std::vector<click::Application>(const std::string&, const std::string&, const std::shared_ptr<click::DepartmentsDb>&));
 };
 
 class MockAppsQuery : public click::apps::Query
@@ -89,10 +89,10 @@
 {
     std::string categoryTemplate("{}");
     std::vector<click::Application> apps {
-        {"app1", "App1", 0.0f, "icon", "url", "", "sshot"},
-        {"app2", "App2", 0.0f, "icon", "url", "", "sshot"},
-        {"app3", "App3", 0.0f, "icon", "url", "", "sshot"},
-        {"", "App4", 0.0f, "icon", "application:///app4.desktop", "", "sshot"} // a non-click app
+        {"app1", "App1", 0.0f, "icon", "url", "", "sshot", ""},
+        {"app2", "App2", 0.0f, "icon", "url", "", "sshot", ""},
+        {"app3", "App3", 0.0f, "icon", "url", "", "sshot", ""},
+        {"", "App4", 0.0f, "icon", "application:///app4.desktop", "", "sshot", ""} // a non-click app
     };
 
     click::apps::ResultPusher pusher(reply, {"app2_fooappname", "app4"});
@@ -171,7 +171,7 @@
 
 class DepartmentsTest : public ::testing::Test {
 protected:
-    const std::vector<click::Application> installed_apps = {{"app1", "App1", 0.0f, "icon", "url", "descr", "scrshot"}};
+    const std::vector<click::Application> installed_apps = {{"app1", "App1", 0.0f, "icon", "url", "descr", "scrshot", ""}};
     const scopes::SearchMetadata metadata{"en_EN", "phone"};
     const scopes::CategoryRenderer renderer{"{}"};
     const std::list<std::string> expected_locales {"en_EN", "en_US", ""};