Merge lp:~stolowski/unity-scope-click/no-empty-departments into lp:unity-scope-click/devel

[Paweł Stołowski]

Exclude empty departments from the departments tree in Apps.

Exclude empty departments from the departments tree in Apps.

When building and filtering the list of installed apps in find_installed_apps, set a real_department attribute of every app. That attribute is later used when populating departments to create a helper lookup of all non-empty subdepartments of current department.

Note: due to a bug in shell plugin https://bugs.launchpad.net/unity-scopes-shell/+bug/1354362 department doesn't disappear when scopes stops returning it (so, after removing last application from a department, an emmpty department stays until reboot).

[lp:~stolowski/unity-scope-click/no-empty-departments]

398. By Paweł Stołowski on 2014-08-08

Minor test updates.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~stolowski/unity-scope-click/no-empty-departments]

399. By Paweł Stołowski on 2014-08-08

Make methods virtual.

400. By Paweł Stołowski on 2014-08-08

Enhance the test to use an app that is deeper in the departments hierarchy.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~stolowski/unity-scope-click/no-empty-departments]

401. By Paweł Stołowski on 2014-08-12

Merged devel.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:401
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/239
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/238/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/238

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

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:401
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/270/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/244
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/244/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/244/console

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

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

Minor comment. Not sure I understand the SQL but as a backup reviewer it should be fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/application.h'
--- libclickscope/click/application.h	2014-07-18 10:35:52 +0000
+++ libclickscope/click/application.h	2014-08-12 10:55:35 +0000
@@ -43,11 +43,13 @@
                 std::string url,
                 std::string description,
                 std::string main_screenshot,
-                std::string default_department
+                std::string default_department,
+                std::string real_department = ""
                 ) : Package {name, title, price, icon_url, url},
                     description(description),
                     main_screenshot(main_screenshot),
-                    default_department(default_department)
+                    default_department(default_department),
+                    real_department(real_department)
     {
 
     }
@@ -58,6 +60,7 @@
     std::vector<std::string> keywords;
     std::string main_screenshot;
     std::string default_department;
+    std::string real_department;
     time_t installed_time;
 };
 
 
=== modified file 'libclickscope/click/departments-db.cpp'
--- libclickscope/click/departments-db.cpp	2014-08-05 14:16:26 +0000
+++ libclickscope/click/departments-db.cpp	2014-08-12 10:55:35 +0000
@@ -81,11 +81,14 @@
     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_dept_for_pkg_.reset(new QSqlQuery(db_));
     select_pkg_by_pkgid_.reset(new QSqlQuery(db_));
     select_pkgs_by_dept_recursive_.reset(new QSqlQuery(db_));
+    select_pkgs_count_in_dept_recursive_.reset(new QSqlQuery(db_));
     select_parent_dept_.reset(new QSqlQuery(db_));
     select_children_depts_.reset(new QSqlQuery(db_));
     select_dept_name_.reset(new QSqlQuery(db_));
+    select_is_descendant_of_dept_.reset(new QSqlQuery(db_));
 
     delete_pkgmap_query_->prepare("DELETE FROM pkgmap WHERE pkgid=:pkgid");
     delete_depts_query_->prepare("DELETE FROM depts");
@@ -94,11 +97,14 @@
     insert_dept_id_query_->prepare("INSERT OR REPLACE INTO depts (deptid, parentid) VALUES (:deptid, :parentid)");
     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 WHERE deptid=:deptid UNION SELECT depts.deptid FROM recdepts,depts WHERE recdepts.deptid=depts.parentid) SELECT pkgid FROM pkgmap NATURAL JOIN recdepts");
+    select_pkgs_by_dept_recursive_->prepare("WITH RECURSIVE recdepts(deptid) AS (SELECT deptid FROM depts WHERE deptid=:deptid OR parentid=:deptid UNION SELECT depts.deptid FROM recdepts,depts WHERE recdepts.deptid=depts.parentid) SELECT pkgid FROM pkgmap NATURAL JOIN recdepts");
+    select_dept_for_pkg_->prepare("SELECT deptid from pkgmap WHERE pkgid=:pkgid");
+    select_pkgs_count_in_dept_recursive_->prepare("WITH RECURSIVE recdepts(deptid) AS (SELECT deptid FROM depts WHERE deptid=:deptid OR parentid=:deptid UNION SELECT depts.deptid FROM recdepts,depts WHERE recdepts.deptid=depts.parentid) SELECT COUNT(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 AS inner WHERE inner.parentid=outer.deptid) FROM depts AS outer WHERE parentid=:parentid");
     select_parent_dept_->prepare("SELECT parentid FROM depts WHERE deptid=:deptid");
     select_dept_name_->prepare("SELECT name FROM deptnames WHERE deptid=:deptid AND locale=:locale");
+    select_is_descendant_of_dept_->prepare("WITH RECURSIVE recdepts(deptid) AS (SELECT deptid FROM depts WHERE parentid=:parentid UNION SELECT depts.deptid FROM recdepts,depts WHERE recdepts.deptid=depts.parentid) SELECT COUNT(1) FROM recdepts WHERE deptid=:deptid");
 }
 
 DepartmentsDb::~DepartmentsDb()
@@ -205,7 +211,6 @@
 
 std::list<DepartmentsDb::DepartmentInfo> DepartmentsDb::get_children_departments(const std::string& department_id)
 {
-    // FIXME: this should only return departments that have results, and set 'has_children' flag on the same basis.
     select_children_depts_->bindValue(":parentid", QVariant(QString::fromStdString(department_id)));
     if (!select_children_depts_->exec())
     {
@@ -215,14 +220,47 @@
     std::list<DepartmentInfo> depts;
     while (select_children_depts_->next())
     {
-        const DepartmentInfo inf(select_children_depts_->value(0).toString().toStdString(), select_children_depts_->value(1).toBool());
-        depts.push_back(inf);
+        auto const child_id = select_children_depts_->value(0).toString().toStdString();
+        // only return child department if it's not empty
+        if (!is_empty(child_id))
+        {
+            const DepartmentInfo inf(child_id, select_children_depts_->value(1).toBool());
+            depts.push_back(inf);
+        }
     }
 
     select_children_depts_->finish();
+
     return depts;
 }
 
+bool DepartmentsDb::is_descendant_of_department(const std::string& department_id, const std::string& parent_department_id)
+{
+    select_is_descendant_of_dept_->bindValue(":deptid", QVariant(QString::fromStdString(department_id)));
+    select_is_descendant_of_dept_->bindValue(":parentid", QVariant(QString::fromStdString(parent_department_id)));
+
+    if (!select_is_descendant_of_dept_->exec() || !select_is_descendant_of_dept_->next())
+    {
+        report_db_error(select_is_descendant_of_dept_->lastError(), "Failed to query for package count of department " + department_id);
+    }
+    auto cnt = select_is_descendant_of_dept_->value(0).toInt();
+    select_is_descendant_of_dept_->finish();
+
+    return cnt > 0;
+}
+
+bool DepartmentsDb::is_empty(const std::string& department_id)
+{
+    select_pkgs_count_in_dept_recursive_->bindValue(":deptid", QVariant(QString::fromStdString(department_id)));
+    if (!select_pkgs_count_in_dept_recursive_->exec() || !select_pkgs_count_in_dept_recursive_->next())
+    {
+        report_db_error(select_pkgs_count_in_dept_recursive_->lastError(), "Failed to query for package count of department " + department_id);
+    }
+    auto cnt = select_pkgs_count_in_dept_recursive_->value(0).toInt();
+    select_pkgs_count_in_dept_recursive_->finish();
+    return cnt == 0;
+}
+
 std::unordered_set<std::string> DepartmentsDb::get_packages_for_department(const std::string& department_id, bool recursive)
 {
     std::unordered_set<std::string> pkgs;
@@ -240,6 +278,24 @@
     return pkgs;
 }
 
+std::string DepartmentsDb::get_department_for_package(const std::string& package_id)
+{
+    select_dept_for_pkg_->bindValue(":pkgid", QVariant(QString::fromStdString(package_id)));
+    if (!select_dept_for_pkg_->exec())
+    {
+        report_db_error(select_dept_for_pkg_->lastError(), "Failed to query for department of package " + package_id);
+    }
+    if (!select_dept_for_pkg_->next())
+    {
+        select_dept_for_pkg_->finish();
+        throw std::logic_error("Unknown package '" + package_id + "'");
+    }
+    auto const res = select_dept_for_pkg_->value(0).toString().toStdString();
+    select_dept_for_pkg_->finish();
+    return res;
+
+}
+
 bool DepartmentsDb::has_package(const std::string& package_id)
 {
     select_pkg_by_pkgid_->bindValue(":pkgid", QVariant(QString::fromStdString(package_id)));
 
=== modified file 'libclickscope/click/departments-db.h'
--- libclickscope/click/departments-db.h	2014-07-22 20:07:28 +0000
+++ libclickscope/click/departments-db.h	2014-08-12 10:55:35 +0000
@@ -66,9 +66,12 @@
 
     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 std::string get_department_for_package(const std::string& package_id);
+    virtual bool is_empty(const std::string& department_id);
     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);
+    virtual bool is_descendant_of_department(const std::string& department_id, const std::string& parent_department_id);
 
     virtual void store_package_mapping(const std::string& package_id, const std::string& department_id);
     virtual void store_department_mapping(const std::string& department_id, const std::string& parent_department_id);
@@ -79,7 +82,7 @@
     virtual int package_count() const;
     virtual int department_name_count() const;
 
-    void store_departments(const click::DepartmentList& depts, const std::string& locale);
+    virtual void store_departments(const click::DepartmentList& depts, const std::string& locale);
 
     static std::unique_ptr<DepartmentsDb> open(bool create = true);
 
@@ -96,11 +99,14 @@
     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_dept_for_pkg_;
     std::unique_ptr<QSqlQuery> select_pkg_by_pkgid_;
     std::unique_ptr<QSqlQuery> select_pkgs_by_dept_recursive_;
+    std::unique_ptr<QSqlQuery> select_pkgs_count_in_dept_recursive_;
     std::unique_ptr<QSqlQuery> select_parent_dept_;
     std::unique_ptr<QSqlQuery> select_children_depts_;
     std::unique_ptr<QSqlQuery> select_dept_name_;
+    std::unique_ptr<QSqlQuery> select_is_descendant_of_dept_;
 };
 
 }
 
=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-07-23 16:22:19 +0000
+++ libclickscope/click/interface.cpp	2014-08-12 10:55:35 +0000
@@ -277,12 +277,13 @@
             || Interface::is_non_click_app(QString::fromStdString(filename))) {
             auto app = load_app_from_desktop(keyFile, filename);
 
+            // app from click package has non-empty name; for non-click apps use desktop filename
+            const std::string department_key = app.name.empty() ? filename : app.name;
+
             // check if apps is present in current department
             if (apply_department_filter)
             {
-                // 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 (packages_in_department.find(department_key) == packages_in_department.end())
                 {
                     if (app.default_department.empty())
                     {
@@ -293,7 +294,7 @@
                     {
                         // 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))
+                        if (depts_db->has_package(department_key))
                         {
                             // app is now in a different department
                             return;
@@ -303,12 +304,38 @@
                         {
                             return;
                         }
-
                         // else - this package is in current department
                     }
                 }
             }
 
+            //
+            // the packages_in_department set contains packages from
+            // all its subdepartments; we need to find actual department now
+            // to update app.real_department.
+            if (depts_db)
+            {
+                if (depts_db->has_package(department_key))
+                {
+                    try
+                    {
+                        app.real_department = depts_db->get_department_for_package(department_key);
+                    }
+                    catch (const std::exception &e)
+                    {
+                        qWarning() << "Failed to get department of package:" << QString::fromStdString(department_key);
+                    }
+                }
+                else
+                {
+                    app.real_department = app.default_department;
+                    if (app.real_department.empty())
+                    {
+                        qWarning() << "No default department set in the .desktop file and no entry in the database for" << QString::fromStdString(department_key);
+                    }
+                }
+            }
+
             if (search_query.empty()) {
                 result.push_back(app);
             } else {
 
=== modified file 'libclickscope/tests/test_departments-db.cpp'
--- libclickscope/tests/test_departments-db.cpp	2014-08-05 14:16:26 +0000
+++ libclickscope/tests/test_departments-db.cpp	2014-08-12 10:55:35 +0000
@@ -53,10 +53,13 @@
         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_dept_for_pkg_->isActive());
+        EXPECT_FALSE(select_pkgs_count_in_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());
+        EXPECT_FALSE(select_is_descendant_of_dept_->isActive());
     }
 };
 
@@ -112,6 +115,35 @@
     }
 }
 
+TEST_F(DepartmentsDbTest, testDepartmentForPackageLookup)
+{
+    EXPECT_EQ("rpg", db->get_department_for_package("game1"));
+    EXPECT_EQ("fps", db->get_department_for_package("game2"));
+    EXPECT_EQ("office", db->get_department_for_package("app2"));
+    EXPECT_EQ("tools", db->get_department_for_package("app1"));
+    EXPECT_THROW(db->get_department_for_package("foobar"), std::logic_error);
+}
+
+TEST_F(DepartmentsDbTest, testIsDepartmentEmpty)
+{
+    EXPECT_TRUE(db->is_empty("card"));
+    EXPECT_FALSE(db->is_empty(""));
+    EXPECT_FALSE(db->is_empty("games"));
+    EXPECT_FALSE(db->is_empty("office"));
+    EXPECT_FALSE(db->is_empty("tools"));
+}
+
+TEST_F(DepartmentsDbTest, testIsDescendantOfDepartment)
+{
+    EXPECT_TRUE(db->is_descendant_of_department("rpg", "games"));
+    EXPECT_TRUE(db->is_descendant_of_department("office", "tools"));
+    EXPECT_TRUE(db->is_descendant_of_department("office", ""));
+    EXPECT_TRUE(db->is_descendant_of_department("rpg", ""));
+    EXPECT_TRUE(db->is_descendant_of_department("games", ""));
+    EXPECT_FALSE(db->is_descendant_of_department("games", "office"));
+    EXPECT_FALSE(db->is_descendant_of_department("", "games"));
+}
+
 TEST_F(DepartmentsDbTest, testDepartmentNameUpdates)
 {
     {
@@ -156,10 +188,10 @@
     }
     {
         auto depts = db->get_children_departments("games");
-        EXPECT_EQ(3u, depts.size());
+        EXPECT_EQ(2u, depts.size());
         EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("rpg", false)) != depts.end());
         EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("fps", false)) != depts.end());
-        EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("card", false)) != depts.end());
+        EXPECT_FALSE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("card", false)) != depts.end());
     }
 }
 
 
=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-08-06 17:30:55 +0000
+++ scope/clickapps/apps-query.cpp	2014-08-12 10:55:35 +0000
@@ -291,11 +291,22 @@
     searchReply->push(res);
 }
 
-void click::apps::Query::push_local_departments(scopes::SearchReplyProxy const& replyProxy)
+void click::apps::Query::push_local_departments(scopes::SearchReplyProxy const& replyProxy, const std::vector<Application>& apps)
 {
     auto const current_dep_id = query().department_id();
     const std::list<std::string> locales = { search_metadata().locale(), "en_US" };
 
+    //
+    // create helper lookup of all departments of currently installed apps.
+    // note that apps that are passed here are supposed to be already filterd by current department
+    // that means we only have subdepartments of current department (or subdepartment(s) of subdepartment(s)
+    // and so on of current department, as the hierarchy may be of arbitrary depth.
+    std::unordered_set<std::string> all_subdepartments;
+    for (auto const app: apps)
+    {
+        all_subdepartments.insert(app.real_department);
+    }
+
     unity::scopes::Department::SPtr root;
 
     try
@@ -309,17 +320,48 @@
         // attach subdepartments to it
         for (auto const& subdep: impl->depts_db->get_children_departments(current_dep_id))
         {
-            // if single supdepartment fails, then ignore it and continue with others
-            try
-            {
-                name = impl->depts_db->get_department_name(subdep.id, locales);
-                unity::scopes::Department::SPtr dep = unity::scopes::Department::create(subdep.id, query(), name);
-                dep->set_has_subdepartments(subdep.has_children);
-                current->add_subdepartment(dep);
-            }
-            catch (const std::exception &e)
-            {
-                qWarning() << "Failed to create subdeparment:" << QString::fromStdString(e.what());
+            //
+            // check if this subdepartment either directly matches a subdepartment of installed app,
+            // or is any of the departments of installed apps is a descendant of current subdepartment.
+            // the latter means we have app somewhere in the subtree of the current subdepartment, so it
+            // needs to be shown.
+            bool show_subdepartment = false;
+            auto it = all_subdepartments.find(subdep.id);
+            if (it != all_subdepartments.end())
+            {
+                // subdepartment id matches directly one of the ids from all_subdepartments
+                show_subdepartment = true;
+                all_subdepartments.erase(it);
+            }
+            else
+            {
+                // no direct match - we need to check descendants of this subdepartment
+                // by querying the db
+                for (auto it = all_subdepartments.begin(); it != all_subdepartments.end(); it++)
+                {
+                    if (impl->depts_db->is_descendant_of_department(*it, subdep.id))
+                    {
+                        show_subdepartment = true;
+                        all_subdepartments.erase(it);
+                        break;
+                    }
+                }
+            }
+
+            if (show_subdepartment)
+            {
+                // if single supdepartment fails, then ignore it and continue with others
+                try
+                {
+                    name = impl->depts_db->get_department_name(subdep.id, locales);
+                    unity::scopes::Department::SPtr dep = unity::scopes::Department::create(subdep.id, query(), name);
+                    dep->set_has_subdepartments(subdep.has_children);
+                    current->add_subdepartment(dep);
+                }
+                catch (const std::exception &e)
+                {
+                    qWarning() << "Failed to create subdeparment:" << QString::fromStdString(e.what());
+                }
             }
         }
 
@@ -357,7 +399,7 @@
     if (querystr.empty()) {
         if (impl->depts_db)
         {
-            push_local_departments(searchReply);
+            push_local_departments(searchReply, localResults);
         }
     }
 
 
=== modified file 'scope/clickapps/apps-query.h'
--- scope/clickapps/apps-query.h	2014-07-22 13:17:28 +0000
+++ scope/clickapps/apps-query.h	2014-08-12 10:55:35 +0000
@@ -74,7 +74,7 @@
 
     virtual void add_fake_store_app(scopes::SearchReplyProxy const &replyProxy);
 
-    virtual void push_local_departments(scopes::SearchReplyProxy const& replyProxy);
+    virtual void push_local_departments(scopes::SearchReplyProxy const& replyProxy, const std::vector<Application>& apps);
 
 protected:
     virtual click::Interface& clickInterfaceInstance();
 
=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-08-05 14:16:26 +0000
+++ scope/tests/test_apps_query.cpp	2014-08-12 10:55:35 +0000
@@ -192,7 +192,10 @@
 
 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", "", "games-rpg"},
+        {"app2", "App2", 0.0f, "icon", "url", "descr", "scrshot", "", "video"}
+    };
     const scopes::SearchMetadata metadata{"en_EN", "phone"};
     const scopes::CategoryRenderer renderer{"{}"};
     const std::list<std::string> expected_locales {"en_EN", "en_US"};
@@ -214,6 +217,7 @@
         scopes::testing::MockSearchReply mock_reply;
         scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
 
+        // no apps in 'books' department, thus excluded
         std::list<std::string> expected_departments({{"", "games", "video"}});
 
         EXPECT_CALL(*clickif, find_installed_apps(_, _, _)).WillOnce(Return(installed_apps));
@@ -222,14 +226,25 @@
         EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
 
-        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
+        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
+
+        ON_CALL(*depts_db, is_descendant_of_department(_, _)).WillByDefault(Return(false));
+        ON_CALL(*depts_db, is_descendant_of_department("games", "")).WillByDefault(Return(true));
+        ON_CALL(*depts_db, is_descendant_of_department("games-rpg", "games")).WillByDefault(Return(true));
+        ON_CALL(*depts_db, is_descendant_of_department("books", "")).WillByDefault(Return(true));
+        ON_CALL(*depts_db, is_descendant_of_department("video", "")).WillByDefault(Return(true));
 
         EXPECT_CALL(*depts_db, get_department_name("games", expected_locales)).WillOnce(Return("Games"));
         EXPECT_CALL(*depts_db, get_department_name("video", expected_locales)).WillOnce(Return("Video"));
+        EXPECT_CALL(*depts_db, is_empty("games")).WillRepeatedly(Return(false));
+        EXPECT_CALL(*depts_db, is_empty("video")).WillRepeatedly(Return(false));
+        EXPECT_CALL(*depts_db, is_empty("books")).WillRepeatedly(Return(false));
+        EXPECT_CALL(*depts_db, is_descendant_of_department(_, _)).Times(AnyNumber());
         EXPECT_CALL(*depts_db, get_children_departments("")).WillOnce(Return(
                     std::list<click::DepartmentsDb::DepartmentInfo>({
-                        {"games", false},
-                        {"video", true}
+                        {"games", true},
+                        {"video", true},
+                        {"books", true}
                     }))
                 );
 
@@ -259,7 +274,7 @@
         EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
 
-        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
+        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
 
         EXPECT_CALL(*depts_db, get_parent_department_id("games")).WillOnce(Return(""));
         EXPECT_CALL(*depts_db, get_department_name("games", expected_locales)).WillOnce(Return("Games"));
@@ -290,7 +305,7 @@
         EXPECT_CALL(mock_reply, register_category("local", StrEq(""), _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
 
-        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
+        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
 
         q.run(reply);
     }
 
=== modified file 'scope/tests/test_helpers.h'
--- scope/tests/test_helpers.h	2014-07-18 15:01:41 +0000
+++ scope/tests/test_helpers.h	2014-08-12 10:55:35 +0000
@@ -65,6 +65,8 @@
     MOCK_METHOD2(get_packages_for_department, std::unordered_set<std::string>(const std::string&, bool));
     MOCK_METHOD1(get_parent_department_id, std::string(const std::string&));
     MOCK_METHOD1(get_children_departments, std::list<click::DepartmentsDb::DepartmentInfo>(const std::string&));
+    MOCK_METHOD1(is_empty, bool(const std::string&));
+    MOCK_METHOD2(is_descendant_of_department, bool(const std::string&, const std::string&));
 
     MOCK_METHOD2(store_package_mapping, void(const std::string&, const std::string&));
     MOCK_METHOD2(store_department_mapping, void(const std::string&, const std::string&));