Merge lp:~dobey/unity-scope-click/departments into lp:unity-scope-click/devel

[dobey]

Add support for departments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/33/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'scope/click/CMakeLists.txt'
--- scope/click/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ scope/click/CMakeLists.txt	2014-05-14 20:14:25 +0000
@@ -9,6 +9,8 @@
 )
 
 add_library(${SCOPE_LIB_UNVERSIONED} SHARED
+  departments.cpp
+  department-lookup.cpp
   configuration.cpp
   download-manager.cpp
   index.cpp

=== added file 'scope/click/department-lookup.cpp'
--- scope/click/department-lookup.cpp	1970-01-01 00:00:00 +0000
+++ scope/click/department-lookup.cpp	2014-05-14 20:14:25 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include "department-lookup.h"
+
+namespace click
+{
+
+DepartmentLookup::DepartmentLookup()
+{
+}
+
+void DepartmentLookup::rebuild(const Department::SPtr& dept)
+{
+    departments[dept->id()] = dept;
+    for (auto const& subdep: dept->sub_departments())
+    {
+        parent_lut[subdep->id()] = dept;
+        rebuild(subdep);
+    }
+}
+
+void DepartmentLookup::rebuild(const std::list<Department::SPtr>& root_departments)
+{
+    parent_lut.clear();
+    departments.clear();
+    for (auto const& dep: root_departments)
+    {
+        rebuild(dep);
+    }
+}
+
+Department::SPtr DepartmentLookup::get_parent(const std::string& department_id) const
+{
+    auto it = parent_lut.find(department_id);
+    if (it != parent_lut.end())
+    {
+        return it->second;
+    }
+    return Department::SPtr(nullptr);
+}
+
+Department::SPtr DepartmentLookup::get_department_info(const std::string& department_id) const
+{
+    auto it = departments.find(department_id);
+    if (it != departments.end())
+    {
+        return it->second;
+    }
+    return nullptr;
+}
+
+int DepartmentLookup::size() const
+{
+    return parent_lut.size();
+}
+
+}

=== added file 'scope/click/department-lookup.h'
--- scope/click/department-lookup.h	1970-01-01 00:00:00 +0000
+++ scope/click/department-lookup.h	2014-05-14 20:14:25 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef CLICK_DEPARTMENT_LOOKUP_H
+#define CLICK_DEPARTMENT_LOOKUP_H
+
+#include "departments.h"
+#include <string>
+#include <memory>
+#include <map>
+
+namespace click
+{
+
+class DepartmentLookup
+{
+    public:
+        DepartmentLookup();
+        void rebuild(const std::list<Department::SPtr>& root_departments);
+        Department::SPtr get_parent(const std::string& department_id) const;
+        Department::SPtr get_department_info(const std::string& department_id) const;
+        int size() const;
+
+    private:
+        void rebuild(const Department::SPtr& dept);
+        std::map<std::string, Department::SPtr> parent_lut;
+        std::map<std::string, Department::SPtr> departments;
+};
+
+}
+
+#endif

=== added file 'scope/click/departments.cpp'
--- scope/click/departments.cpp	1970-01-01 00:00:00 +0000
+++ scope/click/departments.cpp	2014-05-14 20:14:25 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include "departments.h"
+#include <iostream>
+
+namespace click
+{
+
+Department::Department(const std::string& id, const std::string& name)
+    : id_(id),
+      name_(name),
+      has_children_flag_(false)
+{
+}
+
+Department::Department(const std::string& id, const std::string &name, bool has_children)
+    : id_(id),
+      name_(name),
+      has_children_flag_(has_children)
+{
+}
+
+std::string Department::id() const
+{
+    return id_;
+}
+
+std::string Department::name() const
+{
+    return name_;
+}
+
+bool Department::has_children_flag() const
+{
+    return has_children_flag_;
+}
+
+void Department::set_subdepartments(const std::list<Department::SPtr>& deps)
+{
+    sub_departments_ = deps;
+}
+
+std::list<Department::SPtr> Department::sub_departments() const
+{
+    return sub_departments_;
+}
+
+std::list<Department::SPtr> Department::from_json_node(const Json::Value& node)
+{
+    std::list<Department::SPtr> deps;
+
+    for (uint i = 0; i < node.size(); i++)
+    {
+        auto const item = node[i];
+        if (item.isObject() && item.isMember(Department::JsonKeys::name))
+        {
+            auto name = item[Department::JsonKeys::name].asString();
+            const bool has_children = item.isMember(Department::JsonKeys::has_children) ? item[Department::JsonKeys::has_children].asBool() : false;
+            auto dep = std::make_shared<Department>(name, name, has_children); //FIXME: id
+            if (item.isObject() && item.isMember(Department::JsonKeys::embedded))
+            {
+                auto const emb = item[Department::JsonKeys::embedded];
+                if (emb.isObject() && emb.isMember(Department::JsonKeys::department))
+                {
+                    auto const ditem = emb[Department::JsonKeys::department];
+                    auto const subdeps = from_json_node(ditem);
+                    dep->set_subdepartments(subdeps);
+                }
+            }
+            deps.push_back(dep);
+        }
+    }
+
+    return deps;
+}
+
+std::list<Department::SPtr> Department::from_json_root_node(const Json::Value& root)
+{
+    if (root.isObject() && root.isMember(Department::JsonKeys::embedded))
+    {
+        auto const emb = root[Department::JsonKeys::embedded];
+        if (emb.isObject() && emb.isMember(Department::JsonKeys::department))
+        {
+            auto const ditem = emb[Department::JsonKeys::department];
+            return from_json_node(ditem);
+        }
+    }
+
+    return std::list<Department::SPtr>();
+}
+
+std::list<Department::SPtr> Department::from_json(const std::string& json)
+{
+    Json::Reader reader;
+    Json::Value root;
+
+    try
+    {
+        if (!reader.parse(json, root)) {
+            throw std::runtime_error(reader.getFormattedErrorMessages());
+        }
+
+        if (root.isObject() && root.isMember(Department::JsonKeys::embedded))
+        {
+            auto const emb = root[Department::JsonKeys::embedded];
+            if (emb.isObject() && emb.isMember(Department::JsonKeys::department))
+            {
+                auto const ditem = emb[Department::JsonKeys::department];
+                return from_json_node(ditem);
+            }
+        }
+    }
+    catch (const std::exception& e)
+    {
+        std::cerr << "Error parsing departments: " << e.what() << std::endl;
+    }
+    catch (...)
+    {
+        std::cerr << "Unknown error when parsing departments" << std::endl;
+    }
+
+    return std::list<Department::SPtr>();
+}
+
+}

=== added file 'scope/click/departments.h'
--- scope/click/departments.h	1970-01-01 00:00:00 +0000
+++ scope/click/departments.h	2014-05-14 20:14:25 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef CLICK_DEPARTMENTS_H
+#define CLICK_DEPARTMENTS_H
+
+#include <string>
+#include <list>
+#include <memory>
+#include <json/json.h>
+
+namespace click
+{
+
+class Department
+{
+    public:
+        typedef std::shared_ptr<Department> SPtr;
+        typedef std::shared_ptr<Department const> SCPtr;
+
+        struct JsonKeys
+        {
+            JsonKeys() = delete;
+            constexpr static const char* name {"name"};
+            constexpr static const char* embedded {"_embedded"};
+            constexpr static const char* department {"clickindex:department"};
+            constexpr static const char* has_children {"has_children"};
+        };
+
+        Department(const std::string &id, const std::string &name);
+        Department(const std::string &id, const std::string &name, bool has_children);
+        std::string id() const;
+        std::string name() const;
+        bool has_children_flag() const;
+        void set_subdepartments(const std::list<Department::SPtr>& deps);
+        std::list<Department::SPtr> sub_departments() const;
+        static std::list<Department::SPtr> from_json(const std::string& json);
+        static std::list<Department::SPtr> from_json_root_node(const Json::Value& val);
+
+    private:
+        static std::list<Department::SPtr> from_json_node(const Json::Value& val);
+        std::string id_;
+        std::string name_;
+        bool has_children_flag_;
+        std::list<Department::SPtr> sub_departments_;
+};
+
+typedef std::list<Department::SPtr> DepartmentList;
+
+}
+
+#endif

=== modified file 'scope/click/index.cpp'
--- scope/click/index.cpp	2014-05-14 20:14:25 +0000
+++ scope/click/index.cpp	2014-05-14 20:14:25 +0000
@@ -87,11 +87,15 @@
 
 }
 
-std::string Index::build_index_query(const std::string& query)
+std::string Index::build_index_query(const std::string& query, const std::string& department)
 {
     std::stringstream result;
 
     result << query;
+    if (!department.empty()) {
+        result << ",department:" << department;
+    }
+
     return result.str();
 }
 
@@ -109,10 +113,10 @@
     };
 }
 
-click::web::Cancellable Index::search (const std::string& query, std::function<void(click::PackageList)> callback)
+click::web::Cancellable Index::search (const std::string& query, const std::string& department, std::function<void(click::PackageList, click::DepartmentList)> callback)
 {
     click::web::CallParams params;
-    const std::string built_query(build_index_query(query));
+    const std::string built_query(build_index_query(query, department));
     params.add(click::QUERY_ARGNAME, built_query.c_str());
     QSharedPointer<click::web::Response> response(client->call(
         get_base_url() + click::SEARCH_PATH, "GET", false, build_headers(), "", params));
@@ -122,22 +126,52 @@
         Json::Value root;
 
         click::PackageList pl;
+        click::DepartmentList depts;
         if (reader.parse(reply.toUtf8().constData(), root)) {
             pl = click::package_list_from_json_node(root);
             qDebug() << "found packages:" << pl.size();
+            depts = click::Department::from_json_root_node(root);
         }
-        callback(pl);
+        callback(pl, depts);
     });
     QObject::connect(response.data(), &click::web::Response::error, [=](QString /*description*/) {
         qDebug() << "No packages found due to network error";
         click::PackageList pl;
+        click::DepartmentList depts; //TODO
         qDebug() << "calling callback";
-        callback(pl);
+        callback(pl, depts);
         qDebug() << "                ...Done!";
     });
     return click::web::Cancellable(response);
 }
 
+click::web::Cancellable Index::bootstrap(std::function<void(const click::DepartmentList&, Error)> callback)
+{
+    click::web::CallParams params;
+    QSharedPointer<click::web::Response> response(client->call(
+        get_base_url() + click::BOOTSTRAP_PATH, "GET", false, build_headers(), "", params));
+
+    QObject::connect(response.data(), &click::web::Response::finished, [=](QString reply) {
+            qDebug() << "bootstrap request finished";
+            Json::Reader reader;
+            Json::Value root;
+
+            click::DepartmentList depts;
+            if (reader.parse(reply.toUtf8().constData(), root)) {
+                depts = Department::from_json_root_node(root);
+                // TODO: highlights
+            }
+            callback(depts, click::Index::Error::NoError);
+        });
+    QObject::connect(response.data(), &click::web::Response::error, [=](QString /*description*/) {
+            qWarning() << "bootstrap call failed due to network error";
+            const click::DepartmentList depts;
+            qDebug() << "bootstrap: calling callback";
+            callback(depts, click::Index::Error::NetworkError);
+        });
+    return click::web::Cancellable(response);
+}
+
 click::web::Cancellable Index::get_details (const std::string& package_name, std::function<void(PackageDetails, click::Index::Error)> callback)
 {
     QSharedPointer<click::web::Response> response = client->call

=== modified file 'scope/click/index.h'
--- scope/click/index.h	2014-05-14 20:14:25 +0000
+++ scope/click/index.h	2014-05-14 20:14:25 +0000
@@ -37,6 +37,7 @@
 #include "configuration.h"
 #include "package.h"
 #include "webclient.h"
+#include "departments.h"
 
 
 namespace click {
@@ -46,6 +47,7 @@
 const std::string SEARCH_BASE_URL_ENVVAR = "U1_SEARCH_BASE_URL";
 const std::string SEARCH_BASE_URL = "https://search.apps.ubuntu.com/";
 const std::string SEARCH_PATH = "api/v1/search";
+const std::string BOOTSTRAP_PATH = "api/v1/departments";
 const std::string SUPPORTED_FRAMEWORKS = "framework:ubuntu-sdk-13.10";
 const std::string QUERY_ARGNAME = "q";
 const std::string ARCHITECTURE = "architecture:";
@@ -63,15 +65,16 @@
 protected:
     QSharedPointer<web::Client> client;
     QSharedPointer<Configuration> configuration;
-    virtual std::string build_index_query(const std::string& query);
+    virtual std::string build_index_query(const std::string& query, const std::string& department);
     virtual std::map<std::string, std::string> build_headers();
 
 public:
     enum class Error {NoError, CredentialsError, NetworkError};
     Index(const QSharedPointer<click::web::Client>& client,
           const QSharedPointer<Configuration> configuration=QSharedPointer<Configuration>(new Configuration()));
-    virtual click::web::Cancellable search (const std::string& query, std::function<void(PackageList)> callback);
+    virtual click::web::Cancellable search (const std::string& query, const std::string& department, std::function<void(PackageList, DepartmentList)> callback);
     virtual click::web::Cancellable get_details(const std::string& package_name, std::function<void(PackageDetails, Error)> callback);
+    virtual click::web::Cancellable bootstrap(std::function<void(const DepartmentList&, Error)> callback);
     virtual ~Index();
 
     static std::string get_base_url ();

=== modified file 'scope/click/query.cpp'
--- scope/click/query.cpp	2014-05-14 20:14:25 +0000
+++ scope/click/query.cpp	2014-05-14 20:14:25 +0000
@@ -37,6 +37,7 @@
 #include <unity/scopes/Annotation.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/Department.h>
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/SearchReply.h>
 #include <unity/scopes/SearchMetadata.h>
@@ -117,20 +118,22 @@
 
 struct click::Query::Private
 {
-    Private(const unity::scopes::CannedQuery& query, click::Index& index, const scopes::SearchMetadata& metadata)
+    Private(const unity::scopes::CannedQuery& query, click::Index& index, click::DepartmentLookup& depts, const scopes::SearchMetadata& metadata)
         : query(query),
           index(index),
+          department_lookup(depts),
           meta(metadata)
     {
     }
     unity::scopes::CannedQuery query;
     click::Index& index;
+    click::DepartmentLookup& department_lookup;
     scopes::SearchMetadata meta;
     click::web::Cancellable search_operation;
 };
 
-click::Query::Query(unity::scopes::CannedQuery const& query, click::Index& index, scopes::SearchMetadata const& metadata)
-    : impl(new Private(query, index, metadata))
+click::Query::Query(unity::scopes::CannedQuery const& query, click::Index& index, click::DepartmentLookup& depts, scopes::SearchMetadata const& metadata)
+    : impl(new Private(query, index, depts, metadata))
 {
 }
 
@@ -183,6 +186,57 @@
     });
 }
 
+unity::scopes::DepartmentList click::Query::populate_departments(const click::DepartmentList& depts, const std::string& current_dep_id)
+{
+    unity::scopes::DepartmentList departments;
+
+    // create a list of subdepartments of current department
+    foreach (auto d, depts)
+    {
+        unity::scopes::Department department(d->id(), impl->query, d->name());
+        if (d->has_children_flag())
+        {
+            department.set_has_subdepartments();
+        }
+        departments.push_back(department);
+    }
+
+    if (current_dep_id != "")
+    {
+        auto curr_dpt = impl->department_lookup.get_department_info(current_dep_id);
+        if (curr_dpt != nullptr)
+        {
+            unity::scopes::Department cur(current_dep_id, impl->query, curr_dpt->name());
+            if (departments.size() > 0) // this may be a leaf department
+            {
+                cur.set_subdepartments(departments);
+            }
+
+            auto parent_info = impl->department_lookup.get_parent(current_dep_id);
+            if (parent_info != nullptr)
+            {
+                unity::scopes::Department parent_dept(parent_info->id(), impl->query, parent_info->name());
+                parent_dept.set_subdepartments({cur});
+                return {parent_dept};
+            }
+            else
+            {
+                unity::scopes::Department root_dept("", impl->query, _("All departments"));
+                root_dept.set_subdepartments({cur});
+                return {root_dept};
+            }
+        }
+        else
+        {
+            qWarning() << "Unknown department:" << QString::fromStdString(current_dep_id);
+        }
+    }
+
+    unity::scopes::Department root_dept("", impl->query, _("All departments"));
+    root_dept.set_subdepartments(departments);
+    return unity::scopes::DepartmentList({root_dept});
+}
+
 void click::Query::add_available_apps(scopes::SearchReplyProxy const& searchReply,
                                       const std::set<std::string>& locallyInstalledApps,
                                       const std::string& categoryTemplate)
@@ -195,11 +249,20 @@
         return;
     }
 
+    assert(searchReply);
+
     run_under_qt([=]()
     {
-            auto search_cb = [this, searchReply, category, locallyInstalledApps](PackageList packages) {
+            auto search_cb = [this, searchReply, category, locallyInstalledApps](PackageList packages, DepartmentList depts) {
                 qDebug("search callback");
 
+                // handle departments data
+                auto click_depts = populate_departments(depts, impl->query.department_id());
+                if (click_depts.size() > 0)
+                {
+                    searchReply->register_departments(click_depts, impl->query.department_id());
+                }
+
                 // handle packages data
                 foreach (auto p, packages) {
                     qDebug() << "pushing result" << QString::fromStdString(p.name);
@@ -226,8 +289,29 @@
                 this->finished(searchReply);
         };
 
+        if (impl->department_lookup.size() == 0)
+        {
+            qDebug() << "performing bootstrap request";
+            impl->search_operation = impl->index.bootstrap([this, search_cb, searchReply](const DepartmentList& deps, click::Index::Error error) {
+                if (error == click::Index::Error::NoError)
+                {
+                    qDebug() << "bootstrap request completed";
+                    impl->department_lookup.rebuild(deps);
+                    qDebug() << "Total number of departments:" << impl->department_lookup.size();
+                }
+                else
+                {
+                    qWarning() << "bootstrap request failed";
+                }
+                qDebug() << "starting search of" << QString::fromStdString(impl->query.query_string());
+                impl->search_operation = impl->index.search(impl->query.query_string(), impl->query.department_id(), search_cb);
+            });
+        }
+        else
+        {
             qDebug() << "starting search of" << QString::fromStdString(impl->query.query_string());
-            impl->search_operation = impl->index.search(impl->query.query_string(), search_cb);
+            impl->search_operation = impl->index.search(impl->query.query_string(), impl->query.department_id(), search_cb);
+        }
     });
 }
 

=== modified file 'scope/click/query.h'
--- scope/click/query.h	2014-05-14 20:14:25 +0000
+++ scope/click/query.h	2014-05-14 20:14:25 +0000
@@ -32,18 +32,21 @@
 
 
 #include <unity/scopes/SearchQueryBase.h>
+#include <unity/scopes/Department.h>
 
 namespace scopes = unity::scopes;
 
 #include <QSharedPointer>
 #include <set>
 
+#include "department-lookup.h"
 
 namespace click
 {
 
 class Application;
 class Index;
+class DepartmentLookup;
 
 class Query : public scopes::SearchQueryBase
 {
@@ -70,7 +73,7 @@
         constexpr static const char* VERSION{"version"};
     };
 
-    Query(unity::scopes::CannedQuery const& query, click::Index& index, scopes::SearchMetadata const& metadata);
+    Query(unity::scopes::CannedQuery const& query, click::Index& index, click::DepartmentLookup& dept_lookup, scopes::SearchMetadata const& metadata);
     virtual ~Query();
 
     virtual void cancelled() override;
@@ -78,6 +81,7 @@
     virtual void run(scopes::SearchReplyProxy const& reply) override;
 
 protected:
+    virtual unity::scopes::DepartmentList populate_departments(const click::DepartmentList& depts, const std::string& current_department_id);
     virtual void add_available_apps(const scopes::SearchReplyProxy &searchReply, const std::set<std::string> &locallyInstalledApps, const std::string &category);
     virtual bool push_result(const scopes::SearchReplyProxy &searchReply, scopes::CategorisedResult const& res);
     virtual void finished(const scopes::SearchReplyProxy &searchReply);

=== modified file 'scope/click/scope.cpp'
--- scope/click/scope.cpp	2014-05-14 20:14:25 +0000
+++ scope/click/scope.cpp	2014-05-14 20:14:25 +0000
@@ -33,6 +33,7 @@
 #include "preview.h"
 #include "network_access_manager.h"
 #include "interface.h"
+#include "department-lookup.h"
 #include "scope_activation.h"
 
 #include <QSharedPointer>
@@ -55,6 +56,7 @@
     nam.reset(new click::network::AccessManager());
     client.reset(new click::web::Client(nam));
     index.reset(new click::Index(client));
+    depts.reset(new click::DepartmentLookup());
 }
 
 click::Scope::~Scope()
@@ -88,7 +90,7 @@
 
 scopes::SearchQueryBase::UPtr click::Scope::search(unity::scopes::CannedQuery const& q, scopes::SearchMetadata const& metadata)
 {
-    return scopes::SearchQueryBase::UPtr(new click::Query(q, *index, metadata));
+    return scopes::SearchQueryBase::UPtr(new click::Query(q, *index, *depts, metadata));
 }
 
 

=== modified file 'scope/click/scope.h'
--- scope/click/scope.h	2014-04-29 03:17:38 +0000
+++ scope/click/scope.h	2014-05-14 20:14:25 +0000
@@ -30,6 +30,7 @@
 #ifndef CLICK_SCOPE_H
 #define CLICK_SCOPE_H
 
+#include <memory>
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/ActivationQueryBase.h>
@@ -42,6 +43,9 @@
 
 namespace click
 {
+
+class DepartmentLookup;
+
 class Scope : public scopes::ScopeBase
 {
 public:
@@ -63,6 +67,7 @@
     QSharedPointer<click::network::AccessManager> nam;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::Index> index;
+    std::shared_ptr<click::DepartmentLookup> depts;
 
     std::string installApplication(unity::scopes::Result const& result);
 };

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ scope/tests/CMakeLists.txt	2014-05-14 20:14:25 +0000
@@ -35,6 +35,7 @@
   test_reviews.cpp
   test_smartconnect.cpp
   test_webclient.cpp
+  test_departments.cpp
 
   ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp
 )
@@ -68,4 +69,4 @@
 
 add_subdirectory(integration)
 add_subdirectory(download_manager_tool)
-add_subdirectory(click_interface_tool)
\ No newline at end of file
+add_subdirectory(click_interface_tool)

=== modified file 'scope/tests/fake_json.h'
--- scope/tests/fake_json.h	2014-05-14 20:14:25 +0000
+++ scope/tests/fake_json.h	2014-05-14 20:14:25 +0000
@@ -142,6 +142,102 @@
     }
 )foo";
 
+const std::string FAKE_JSON_DEPARTMENTS_ONLY = R"(
+  {
+    "_links": {
+        "self": {
+            "href": "https://search.apps.ubuntu.com/api/v1/departments"
+        },
+        "curies": [
+            {
+                "name": "clickindex",
+                "href": "https://search.apps.ubuntu.com/docs/v1/relations.html{#rel}",
+                "templated": true
+            }
+        ]
+    },
+    "_embedded": {
+        "clickindex:department": [
+            {
+                "name": "Games",
+                "_links": {
+                    "self": {
+                        "href": "https://search.apps.ubuntu.com/api/v1/departments/Games"
+                    }
+                },
+                "_embedded": {
+                    "clickindex:department": [
+                        {
+                            "name": "Board Games",
+                            "_links": {
+                                "self": {
+                                    "href": "https://search.apps.ubuntu.com/api/v1/departments/Games/Board+Games"
+                                }
+                            }
+                        }
+                    ]
+                }
+            },
+            {
+                "name": "Graphics",
+                "_links": {
+                    "self": {
+                        "href": "https://search.apps.ubuntu.com/api/v1/departments/Graphics"
+                    }
+                },
+                "_embedded": {
+                    "clickindex:department": [
+                        {
+                            "name": "Drawing",
+                            "_links": {
+                                "self": {
+                                    "href": "https://search.apps.ubuntu.com/api/v1/departments/Graphics/Drawing"
+                                }
+                            }
+                        }
+                    ]
+                }
+            },
+            {
+                "name": "Internet",
+                "_links": {
+                    "self": {
+                        "href": "https://search.apps.ubuntu.com/api/v1/departments/Internet"
+                    }
+                },
+                "_embedded": {
+                    "clickindex:department": [
+                        {
+                            "name": "Chat",
+                            "_links": {
+                                "self": {
+                                    "href": "https://search.apps.ubuntu.com/api/v1/departments/Internet/Chat"
+                                }
+                            }
+                        },
+                        {
+                            "name": "Mail",
+                            "_links": {
+                                "self": {
+                                    "href": "https://search.apps.ubuntu.com/api/v1/departments/Internet/Mail"
+                                }
+                            }
+                        },
+                        {
+                            "name": "Web Browsers",
+                            "_links": {
+                                "self": {
+                                    "href": "https://search.apps.ubuntu.com/api/v1/departments/Internet/Web+Browsers"
+                                }
+                            }
+                        }
+                    ]
+                }
+            }
+        ]
+    }
+})";
+
 const std::string FAKE_JSON_MANIFEST_REMOVABLE = R"foo(
     {
         "_removable": 1,

=== modified file 'scope/tests/integration/webclient_integration.cpp'
--- scope/tests/integration/webclient_integration.cpp	2014-04-29 03:17:38 +0000
+++ scope/tests/integration/webclient_integration.cpp	2014-05-14 20:14:25 +0000
@@ -30,6 +30,7 @@
 #include <click/network_access_manager.h>
 #include <click/webclient.h>
 #include <click/index.h>
+#include <click/departments.h>
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -102,7 +103,8 @@
                 new click::web::Client(namPtr));
     click::Index index(clientPtr);
     click::PackageList packages;
-    index.search("qr,architecture:armhf", [&, this](click::PackageList found_packages){
+    index.search("qr,architecture:armhf", "", [&, this](click::PackageList found_packages, click::DepartmentList){
+        //TODO departments
         packages = found_packages;
         Quit();
     });

=== modified file 'scope/tests/mock_webclient.h'
--- scope/tests/mock_webclient.h	2014-04-29 03:17:38 +0000
+++ scope/tests/mock_webclient.h	2014-05-14 20:14:25 +0000
@@ -86,7 +86,7 @@
         const click::web::CallParams& params));
     QSharedPointer<click::web::Response> call(
         const std::string& iri,
-        const click::web::CallParams& params=click::web::CallParams()) {
+        const click::web::CallParams& params=click::web::CallParams()) override {
         return callImpl(iri, "GET", false,
                         std::map<std::string, std::string>(), "", params);
     }
@@ -96,7 +96,7 @@
         bool sign = false,
         const std::map<std::string, std::string>& headers = std::map<std::string, std::string>(),
         const std::string& data = "",
-        const click::web::CallParams& params=click::web::CallParams()) {
+        const click::web::CallParams& params=click::web::CallParams()) override {
         return callImpl(iri, method, sign, headers, data, params);
     }
 };

=== removed file 'scope/tests/test_data.cpp'
=== added file 'scope/tests/test_departments.cpp'
--- scope/tests/test_departments.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/test_departments.cpp	2014-05-14 20:14:25 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <gtest/gtest.h>
+#include "fake_json.h"
+#include "click/departments.h"
+#include "click/department-lookup.h"
+
+class DepartmentsTest : public ::testing::Test
+{
+    protected:
+        void SetUp() override
+        {
+        }
+};
+
+TEST_F(DepartmentsTest, testParsing)
+{
+    const std::string jsonstr(FAKE_JSON_DEPARTMENTS_ONLY);
+    auto depts = click::Department::from_json(jsonstr);
+    EXPECT_EQ(3u, depts.size());
+    auto it = depts.cbegin();
+    {
+        auto dep = *it;
+        EXPECT_EQ("Games", dep->id());
+        EXPECT_EQ("Games", dep->name());
+        EXPECT_FALSE(dep->has_children_flag());
+        auto subdepts = dep->sub_departments();
+        EXPECT_EQ(1u, subdepts.size());
+        auto sit = subdepts.cbegin();
+        EXPECT_EQ("Board Games", (*sit)->name());
+    }
+    {
+        ++it;
+        auto dep = *it;
+        EXPECT_EQ("Graphics", dep->id());
+        EXPECT_EQ("Graphics", dep->name());
+        EXPECT_FALSE(dep->has_children_flag());
+        auto subdepts = dep->sub_departments();
+        EXPECT_EQ(1u, subdepts.size());
+        auto sit = subdepts.cbegin();
+        EXPECT_EQ("Drawing", (*sit)->name());
+    }
+    {
+        ++it;
+        auto dep = *it;
+        EXPECT_EQ("Internet", dep->id());
+        EXPECT_EQ("Internet", dep->name());
+        EXPECT_FALSE(dep->has_children_flag());
+        auto subdepts = dep->sub_departments();
+        EXPECT_EQ(3u, subdepts.size());
+        auto sit = subdepts.cbegin();
+        auto subdep = *sit;
+        EXPECT_EQ("Chat", subdep->name());
+        subdep = *(++sit);
+        EXPECT_EQ("Mail", subdep->name());
+        subdep = *(++sit);
+        EXPECT_EQ("Web Browsers", subdep->name());
+    }
+}
+
+TEST_F(DepartmentsTest, testLookup)
+{
+    auto dep_games = std::make_shared<click::Department>("games", "Games");
+    auto dep_rpg = std::make_shared<click::Department>("rpg", "RPG");
+    auto dep_strategy = std::make_shared<click::Department>("strategy", "Strategy");
+    const std::list<click::Department::SPtr> departments {dep_rpg, dep_strategy};
+    dep_games->set_subdepartments(departments);
+
+    const std::list<click::Department::SPtr> root {dep_games};
+    click::DepartmentLookup lut;
+    lut.rebuild(root);
+
+    EXPECT_EQ(2u, lut.size());
+    EXPECT_EQ("games", lut.get_parent("strategy")->id());
+    EXPECT_EQ("games", lut.get_parent("rpg")->id());
+    EXPECT_EQ(nullptr, lut.get_parent("games"));
+
+    lut.rebuild(root);
+    EXPECT_EQ(2u, lut.size());
+}
+

=== modified file 'scope/tests/test_index.cpp'
--- scope/tests/test_index.cpp	2014-05-14 20:14:25 +0000
+++ scope/tests/test_index.cpp	2014-05-14 20:14:25 +0000
@@ -51,8 +51,8 @@
         click::Index(client, configuration)
     {
     }
-    MOCK_METHOD1(build_index_query, std::string(const std::string&));
     MOCK_METHOD0(build_headers, std::map<std::string, std::string>());
+    MOCK_METHOD2(build_index_query, std::string(const std::string&, const std::string&));
 };
 
 class MockConfiguration : public click::Configuration {
@@ -99,7 +99,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::PackageList) {});
+    indexPtr->search("", "", [](click::PackageList, click::DepartmentList) {});
 }
 
 TEST_F(IndexTest, testSearchSendsBuiltQueryAsParam)
@@ -115,11 +115,11 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    EXPECT_CALL(*indexPtr, build_index_query(FAKE_QUERY))
+    EXPECT_CALL(*indexPtr, build_index_query(FAKE_QUERY, ""))
             .Times(1)
             .WillOnce(Return(FAKE_BUILT_QUERY));
 
-    indexPtr->search(FAKE_QUERY, [](click::PackageList) {});
+    indexPtr->search(FAKE_QUERY, "", [](click::PackageList, click::DepartmentList) {});
 }
 
 TEST_F(IndexTest, testSearchSendsRightPath)
@@ -132,7 +132,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::PackageList) {});
+    indexPtr->search("", "", [](click::PackageList, click::DepartmentList) {});
 }
 
 TEST_F(IndexTest, testSearchCallbackIsCalled)
@@ -149,7 +149,7 @@
             .WillOnce(Return(response));
     EXPECT_CALL(*this, search_callback(_)).Times(1);
 
-    indexPtr->search("", [this](click::PackageList packages){
+    indexPtr->search("", "", [this](click::PackageList packages, click::DepartmentList){
         search_callback(packages);
     });
     response->replyFinished();
@@ -170,7 +170,7 @@
     click::PackageList empty_package_list;
     EXPECT_CALL(*this, search_callback(empty_package_list)).Times(1);
 
-    indexPtr->search("", [this](click::PackageList packages){
+    indexPtr->search("", "", [this](click::PackageList packages, click::DepartmentList){
         search_callback(packages);
     });
     response->replyFinished();
@@ -199,7 +199,7 @@
     };
     EXPECT_CALL(*this, search_callback(single_package_list)).Times(1);
 
-    indexPtr->search("", [this](click::PackageList packages){
+    indexPtr->search("", "", [this](click::PackageList packages, click::DepartmentList){
         search_callback(packages);
     });
     response->replyFinished();
@@ -214,7 +214,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    auto search_operation = indexPtr->search("", [](click::PackageList) {});
+    auto search_operation = indexPtr->search("", "", [](click::PackageList, click::DepartmentList) {});
     EXPECT_CALL(reply.instance, abort()).Times(1);
     search_operation.cancel();
 }
@@ -233,7 +233,7 @@
             .Times(1)
             .WillOnce(Return(response));
     EXPECT_CALL(reply.instance, errorString()).Times(1).WillOnce(Return("fake error"));
-    indexPtr->search("", [this](click::PackageList packages){
+    indexPtr->search("", "", [this](click::PackageList packages, click::DepartmentList){
         search_callback(packages);
     });
 

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-05-14 20:14:25 +0000
+++ scope/tests/test_query.cpp	2014-05-14 20:14:25 +0000
@@ -45,6 +45,7 @@
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/SearchReply.h>
+#include <unity/scopes/testing/MockSearchReply.h>
 
 using namespace ::testing;
 
@@ -56,30 +57,43 @@
 
 class MockIndex : public click::Index {
     click::PackageList packages;
+    click::DepartmentList departments;
+    click::DepartmentList bootstrap_departments;
 public:
-    MockIndex(click::PackageList packages = click::PackageList())
+    MockIndex(click::PackageList packages = click::PackageList(),
+            click::DepartmentList departments = click::DepartmentList(),
+            click::DepartmentList boot_departments = click::DepartmentList())
         : Index(QSharedPointer<click::web::Client>()),
-          packages(packages)
-    {
-
-    }
-
-    click::web::Cancellable search(const std::string &query, std::function<void (click::PackageList)> callback) override
-    {
-        do_search(query, callback);
-        callback(packages);
-        return click::web::Cancellable();
-    }
-
-    MOCK_METHOD2(do_search,
-                 void(const std::string&,
-                      std::function<void(click::PackageList)>));
+          packages(packages),
+          departments(departments),
+          bootstrap_departments(boot_departments)
+    {
+
+    }
+
+    click::web::Cancellable search(const std::string &query, const std::string& department, std::function<void (click::PackageList, click::DepartmentList)> callback) override
+    {
+        do_search(query, department, callback);
+        callback(packages, departments);
+        return click::web::Cancellable();
+    }
+
+    click::web::Cancellable bootstrap(std::function<void(const click::DepartmentList&, Error)> callback) override
+    {
+        callback(bootstrap_departments, click::Index::Error::NoError);
+        return click::web::Cancellable();
+    }
+
+    MOCK_METHOD3(do_search,
+                 void(const std::string&, const std::string&,
+                      std::function<void(click::PackageList, click::DepartmentList)>));
 };
 
 class MockQueryBase : public click::Query {
 public:
     MockQueryBase(const unity::scopes::CannedQuery& query, click::Index& index,
-                  scopes::SearchMetadata const& metadata) : click::Query(query, index, metadata)
+                  click::DepartmentLookup& depts,
+                  scopes::SearchMetadata const& metadata) : click::Query(query, index, depts, metadata)
     {
 
     }
@@ -93,7 +107,8 @@
 class MockQuery : public MockQueryBase {
 public:
     MockQuery(const unity::scopes::CannedQuery& query, click::Index& index,
-              scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, metadata)
+              click::DepartmentLookup& depts,
+              scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, depts, metadata)
     {
 
     }
@@ -115,7 +130,8 @@
 class MockQueryRun : public MockQueryBase {
 public:
     MockQueryRun(const unity::scopes::CannedQuery& query, click::Index& index,
-                 scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, metadata)
+                 click::DepartmentLookup& depts,
+                 scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, depts, metadata)
     {
 
     }
@@ -143,12 +159,16 @@
 TEST(QueryTest, testAddAvailableAppsCallsClickIndex)
 {
     MockIndex mock_index;
+    click::DepartmentLookup dept_lookup;
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
-    MockQuery q(query, mock_index, metadata);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)).Times(1);
-    scopes::SearchReplyProxy reply;
+    MockQuery q(query, mock_index, dept_lookup, metadata);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _)).Times(1);
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(mock_reply, register_departments(_, _)).Times(1);
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -162,17 +182,21 @@
         {"name", "title", 0.0, "", ""}
     };
     MockIndex mock_index(packages);
+    click::DepartmentLookup dept_lookup;
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
-    MockQuery q(query, mock_index, metadata);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    MockQuery q(query, mock_index, dept_lookup, metadata);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
     EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat));
 
-    scopes::SearchReplyProxy reply;
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(mock_reply, register_departments(_, _)).Times(1);
+
     auto expected_title = packages.front().title;
     EXPECT_CALL(q, push_result(_, Property(&scopes::CategorisedResult::title, expected_title)));
     q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
@@ -184,17 +208,20 @@
         {"name", "title", 0.0, "", ""}
     };
     MockIndex mock_index(packages);
+    click::DepartmentLookup dept_lookup;
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
-    MockQuery q(query, mock_index, metadata);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    MockQuery q(query, mock_index, dept_lookup, metadata);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
     EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat));
 
-    scopes::SearchReplyProxy reply;
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(mock_reply, register_departments(_, _)).Times(1);
     EXPECT_CALL(q, finished(_));
     q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
 }
@@ -205,11 +232,12 @@
         {"name", "title", 0.0, "", ""}
     };
     MockIndex mock_index(packages);
+    click::DepartmentLookup dept_lookup;
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
-    MockQuery q(query, mock_index, metadata);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)).Times(0);
+    MockQuery q(query, mock_index, dept_lookup, metadata);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _)).Times(0);
 
     EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(nullptr));
 
@@ -224,10 +252,11 @@
         {"name", "title", 0.0, "", ""}
     };
     MockIndex mock_index(packages);
+    click::DepartmentLookup dept_lookup;
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
-    MockQueryRun q(query, mock_index, metadata);
+    MockQueryRun q(query, mock_index, dept_lookup, metadata);
     auto reply = scopes::SearchReplyProxy();
     EXPECT_CALL(q, push_local_results(_, _, _));
     EXPECT_CALL(q, add_available_apps(reply, no_installed_packages, _));
@@ -244,19 +273,23 @@
         {"org.example.app2", "app title2", 0.0, "", ""}
     };
     MockIndex mock_index(packages);
+    click::DepartmentLookup dept_lookup;
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> one_installed_package {
         "org.example.app2"
     };
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
-    MockQuery q(query, mock_index, metadata);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    MockQuery q(query, mock_index, dept_lookup, metadata);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
     EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat));
 
-    scopes::SearchReplyProxy reply;
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(mock_reply, register_departments(_, _)).Times(1);
+
     auto expected_name = packages.front().name;
     EXPECT_CALL(q, push_result(_, HasPackageName(expected_name)));
     q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE);