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

[dobey]

Parse and show recommendations from the server in search results.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

This branch is lacking many tests.

Here's a non exhaustive list of tests that would make sense adding:
- package_list_from_json_node: single package, multiple packages, some missing field in a package
- Highlight::from_json_node: single highlight, multiple highlight, missing ci_package field in a highlight

----

Please add names to make the callback parameters more obvious, eg:
std::function<void(Packages, Packages)> callback ->
std::function<void(Packages search_results, Packages recommended)> callback

----

Please refactor the following block out of Index::search into a new method, and add tests for it:

34 + if (root.isObject() && root.isMember(Package::JsonKeys::embedded)) {
35 + auto const emb = root[Package::JsonKeys::embedded];
36 + if (emb.isObject() && emb.isMember(Package::JsonKeys::ci_package)) {
37 + auto const pkg = emb[Package::JsonKeys::ci_package];
38 + pl = click::package_list_from_json_node(pkg);
39 +
40 + if (emb.isMember(Package::JsonKeys::ci_recommends)) {
41 + auto const rec = emb[Package::JsonKeys::ci_recommends];
42 + recommends = click::package_list_from_json_node(rec);
43 + }
44 + }
45 + } else if (root.isArray()) {
46 + qDebug() << "Fell back to old array mode.";
47 + pl = click::package_list_from_json_node(root);
48 + }

Also, please check if the old Array mode is really needed, and if not let's get rid of it.

---

Why are you not using push_package in 375 and below?

371 foreach (auto p, packages) {
372 push_package(searchReply, category, installedPackages, p);
373 }
374 + foreach (auto r, recommends) {
375 + try {

If there's any reason not to use push_package, lines 375 and below should be refactored to a new method and tested.

---

Please check with design if installed packages should be shown or not on recommendations, and let's open a bug if they should be filtered.

review: Needs Fixing

[lp:~dobey/unity-scope-click/recommends]

302. By dobey on 2014-06-26

Merged tip of devel.

303. By dobey on 2014-06-26

Factor the parsing of search results and recommends to a new function.
List variable names in the callback declaration.

304. By dobey on 2014-06-26

Drop the old plain array mode resource_url json key.

305. By dobey on 2014-06-26

Initial tests for package_list_from_json_node.

306. By dobey on 2014-06-26

Use push_package instead of duplicating code.

307. By dobey on 2014-06-26

Fix up the translation template.

308. By dobey on 2014-06-26

A little more refactoring.

309. By dobey on 2014-06-26

Change the refactored function to return a pair instead of take a callback.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/highlights.cpp'
--- libclickscope/click/highlights.cpp	2014-06-18 17:37:13 +0000
+++ libclickscope/click/highlights.cpp	2014-06-26 18:57:41 +0000
@@ -69,7 +69,8 @@
         if (item.isObject() && item.isMember(Highlight::JsonKeys::name))
         {
             auto name = item[Highlight::JsonKeys::name].asString();
-            auto pkgs = package_list_from_json_node(item);
+            auto pkg_node = item[Package::JsonKeys::embedded][Package::JsonKeys::ci_package];
+            auto pkgs = package_list_from_json_node(pkg_node);
             highlights.push_back(Highlight(name, pkgs));
         }
     }

=== modified file 'libclickscope/click/index.cpp'
--- libclickscope/click/index.cpp	2014-06-23 10:25:44 +0000
+++ libclickscope/click/index.cpp	2014-06-26 18:57:41 +0000
@@ -114,7 +114,32 @@
     };
 }
 
-click::web::Cancellable Index::search (const std::string& query, std::function<void(click::Packages)> callback)
+std::pair<Packages, Packages> Index::package_lists_from_json(const std::string& json)
+{
+    Json::Reader reader;
+    Json::Value root;
+
+    click::Packages pl;
+    click::Packages recommends;
+    if (reader.parse(json, root)) {
+        if (root.isObject() && root.isMember(Package::JsonKeys::embedded)) {
+            auto const emb = root[Package::JsonKeys::embedded];
+            if (emb.isObject() && emb.isMember(Package::JsonKeys::ci_package)) {
+                auto const pkg = emb[Package::JsonKeys::ci_package];
+                pl = click::package_list_from_json_node(pkg);
+
+                if (emb.isMember(Package::JsonKeys::ci_recommends)) {
+                    auto const rec = emb[Package::JsonKeys::ci_recommends];
+                    recommends = click::package_list_from_json_node(rec);
+                }
+            }
+        }
+    }
+    return std::pair<Packages, Packages>(pl, recommends);
+}
+
+click::web::Cancellable Index::search (const std::string& query,
+                                       std::function<void(click::Packages search_results, click::Packages recommendations)> callback)
 {
     click::web::CallParams params;
     const std::string built_query(build_index_query(query, ""));
@@ -123,21 +148,16 @@
         get_base_url() + click::SEARCH_PATH, "GET", false, build_headers(), "", params));
 
     QObject::connect(response.data(), &click::web::Response::finished, [=](QString reply) {
-        Json::Reader reader;
-        Json::Value root;
-
-        click::Packages pl;
-        if (reader.parse(reply.toUtf8().constData(), root)) {
-            pl = click::package_list_from_json_node(root);
-            qDebug() << "found packages:" << pl.size();
-        }
-        callback(pl);
+            std::pair<Packages, Packages> package_lists;
+            package_lists = package_lists_from_json(reply.toUtf8().constData());
+            callback(package_lists.first, package_lists.second);
     });
     QObject::connect(response.data(), &click::web::Response::error, [=](QString /*description*/) {
         qDebug() << "No packages found due to network error";
         click::Packages pl;
+        click::Packages recommends;
         qDebug() << "calling callback";
-        callback(pl);
+        callback(pl, recommends);
         qDebug() << "                ...Done!";
     });
     return click::web::Cancellable(response);

=== modified file 'libclickscope/click/index.h'
--- libclickscope/click/index.h	2014-06-23 10:25:44 +0000
+++ libclickscope/click/index.h	2014-06-26 18:57:41 +0000
@@ -74,7 +74,8 @@
     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(Packages)> callback);
+    virtual std::pair<Packages, Packages> package_lists_from_json(const std::string& json);
+    virtual click::web::Cancellable search (const std::string& query, std::function<void(Packages, Packages)> 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&, const HighlightList&, Error, int)> callback);
     virtual click::web::Cancellable departments(const std::string& department_href, std::function<void(const DepartmentList&, const HighlightList&, Error, int)> callback);

=== modified file 'libclickscope/click/package.cpp'
--- libclickscope/click/package.cpp	2014-06-18 18:18:14 +0000
+++ libclickscope/click/package.cpp	2014-06-26 18:57:41 +0000
@@ -75,42 +75,18 @@
     p.price = item[Package::JsonKeys::price].asDouble();
     p.icon_url = item[Package::JsonKeys::icon_url].asString();
     p.url = item[Package::JsonKeys::links][Package::JsonKeys::self][Package::JsonKeys::href].asString();
-    if (p.url.empty()) {
-        p.url = item[Package::JsonKeys::resource_url].asString();
-    }
     return p;
 }
 
 Packages package_list_from_json_node(const Json::Value& root)
 {
     Packages pl;
-    if (root.isObject() && root.isMember(Package::JsonKeys::embedded))
-    {
-        auto const emb = root[Package::JsonKeys::embedded];
-        if (emb.isObject() && emb.isMember(Package::JsonKeys::ci_package))
-        {
-            auto const pkg = emb[Package::JsonKeys::ci_package];
-            for (uint i = 0; i < pkg.size(); i++)
-            {
-                Package p;
-                const json::Value item = pkg[i];
-                p = package_from_json_node(item);
-                pl.push_back(p);
-            }
-        }
-    }
-    else if (root.isArray())
-    {
-        qDebug() << "Fell back to old array mode.";
-        qDebug() << root.size() << "packages returned.";
-        for (uint i = 0; i < root.size(); i++)
-        {
-            
-            Package p;
-            const json::Value item = root[i];
-            p = package_from_json_node(item);
-            pl.push_back(p);
-        }
+    for (uint i = 0; i < root.size(); i++)
+    {
+        Package p;
+        const json::Value item = root[i];
+        p = package_from_json_node(item);
+        pl.push_back(p);
     }
     return pl;
 }

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2014-06-18 09:01:20 +0000
+++ libclickscope/click/package.h	2014-06-26 18:57:41 +0000
@@ -54,11 +54,11 @@
         constexpr static const char* self{"self"};
         constexpr static const char* href{"href"};
         constexpr static const char* ci_package {"clickindex:package"};
+        constexpr static const char* ci_recommends {"clickindex:recommendation"};
         constexpr static const char* name{"name"};
         constexpr static const char* title{"title"};
         constexpr static const char* price{"price"};
         constexpr static const char* icon_url{"icon_url"};
-        constexpr static const char* resource_url{"resource_url"};
     };
 
     Package() = default;

=== modified file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	2014-06-18 11:29:58 +0000
+++ libclickscope/tests/CMakeLists.txt	2014-06-26 18:57:41 +0000
@@ -21,15 +21,16 @@
   mock_ubuntuone_credentials.h
   mock_webclient.h
 
+  test_bootstrap.cpp
+  test_configuration.cpp
+  test_departments.cpp
   test_download_manager.cpp
   test_index.cpp
   test_interface.cpp
-  test_configuration.cpp
+  test_package.cpp
   test_reviews.cpp
   test_smartconnect.cpp
   test_webclient.cpp
-  test_bootstrap.cpp
-  test_departments.cpp
 
   ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp
 )

=== modified file 'libclickscope/tests/fake_json.h'
--- libclickscope/tests/fake_json.h	2014-06-23 11:33:55 +0000
+++ libclickscope/tests/fake_json.h	2014-06-26 18:57:41 +0000
@@ -74,6 +74,24 @@
     }
 )foo";
 
+const std::string FAKE_JSON_SEARCH_RESULT_MISSING_DATA = R"foo({
+        "_embedded": {
+            "clickindex:package": [
+                {
+                    "name": "org.example.awesomelauncher",
+                    "title": "Awesome Launcher",
+                    "description": "This is an awesome launcher.",
+                    "_links": {
+                        "self": {
+                            "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                        }
+                    }
+                }
+            ]
+        }
+    }
+)foo";
+
 const std::string FAKE_JSON_SEARCH_RESULT_MANY = R"foo({
         "_embedded": {
             "clickindex:package": [
@@ -118,6 +136,40 @@
     }
 )foo";
 
+const std::string FAKE_JSON_SEARCH_RESULT_RECOMMENDS = R"foo({
+        "_embedded": {
+            "clickindex:package": [
+                {
+                    "name": "org.example.awesomelauncher",
+                    "title": "Awesome Launcher",
+                    "description": "This is an awesome launcher.",
+                    "price": 1.99,
+                    "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",
+                    "_links": {
+                        "self": {
+                            "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                        }
+                    }
+                }
+            ],
+            "clickindex:recommendation": [
+                {
+                    "name": "org.example.awesomelauncher2",
+                    "title": "Awesome Launcher 2",
+                    "description": "This is an another awesome launcher.",
+                    "price": 1.99,
+                    "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",
+                    "_links": {
+                        "self": {
+                            "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher2"
+                        }
+                    }
+                }
+            ]
+        }
+    }
+)foo";
+
 const std::string FAKE_JSON_PACKAGE_DETAILS = R"foo(
     {
         "name": "ar.com.beuno.wheather-touch",

=== modified file 'libclickscope/tests/test_index.cpp'
--- libclickscope/tests/test_index.cpp	2014-06-23 10:25:44 +0000
+++ libclickscope/tests/test_index.cpp	2014-06-26 18:57:41 +0000
@@ -79,7 +79,7 @@
         DefaultValue<std::map<std::string, std::string>>::Set(std::map<std::string, std::string>());
     }
 public:
-    MOCK_METHOD1(search_callback, void(click::Packages));
+    MOCK_METHOD2(search_callback, void(click::Packages, click::Packages));
     MOCK_METHOD2(details_callback, void(click::PackageDetails, click::Index::Error));
 };
 
@@ -100,7 +100,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::Packages) {});
+    indexPtr->search("", [](click::Packages, click::Packages) {});
 }
 
 TEST_F(IndexTest, testSearchSendsBuiltQueryAsParam)
@@ -120,7 +120,7 @@
             .Times(1)
             .WillOnce(Return(FAKE_BUILT_QUERY));
 
-    indexPtr->search(FAKE_QUERY, [](click::Packages) {});
+    indexPtr->search(FAKE_QUERY, [](click::Packages, click::Packages) {});
 }
 
 TEST_F(IndexTest, testSearchSendsRightPath)
@@ -133,7 +133,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::Packages) {});
+    indexPtr->search("", [](click::Packages, click::Packages) {});
 }
 
 TEST_F(IndexTest, testSearchCallbackIsCalled)
@@ -148,10 +148,11 @@
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
             .WillOnce(Return(response));
-    EXPECT_CALL(*this, search_callback(_)).Times(1);
+    EXPECT_CALL(*this, search_callback(_, _)).Times(1);
 
-    indexPtr->search("", [this](click::Packages packages){
-        search_callback(packages);
+    indexPtr->search("", [this](click::Packages packages,
+                                click::Packages recommends){
+                         search_callback(packages, recommends);
     });
     response->replyFinished();
 }
@@ -169,10 +170,11 @@
             .Times(1)
             .WillOnce(Return(response));
     click::Packages empty_package_list;
-    EXPECT_CALL(*this, search_callback(empty_package_list)).Times(1);
+    EXPECT_CALL(*this, search_callback(empty_package_list, _)).Times(1);
 
-    indexPtr->search("", [this](click::Packages packages){
-        search_callback(packages);
+    indexPtr->search("", [this](click::Packages packages,
+                                click::Packages recommends){
+                         search_callback(packages, recommends);
     });
     response->replyFinished();
 }
@@ -198,10 +200,11 @@
             "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
         }
     };
-    EXPECT_CALL(*this, search_callback(single_package_list)).Times(1);
+    EXPECT_CALL(*this, search_callback(single_package_list, _)).Times(1);
 
-    indexPtr->search("", [this](click::Packages packages){
-        search_callback(packages);
+    indexPtr->search("", [this](click::Packages packages,
+                                click::Packages recommends){
+                         search_callback(packages, recommends);
     });
     response->replyFinished();
 }
@@ -215,7 +218,8 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    auto search_operation = indexPtr->search("", [](click::Packages) {});
+    auto search_operation = indexPtr->search("", [](click::Packages,
+                                                    click::Packages) {});
     EXPECT_CALL(reply.instance, abort()).Times(1);
     search_operation.cancel();
 }
@@ -234,12 +238,13 @@
             .Times(1)
             .WillOnce(Return(response));
     EXPECT_CALL(reply.instance, errorString()).Times(1).WillOnce(Return("fake error"));
-    indexPtr->search("", [this](click::Packages packages){
-        search_callback(packages);
+    indexPtr->search("", [this](click::Packages packages,
+                                click::Packages recommends){
+                         search_callback(packages, recommends);
     });
 
     click::Packages empty_package_list;
-    EXPECT_CALL(*this, search_callback(empty_package_list)).Times(1);
+    EXPECT_CALL(*this, search_callback(empty_package_list, _)).Times(1);
 
     emit reply.instance.error(QNetworkReply::UnknownNetworkError);
 }
@@ -441,6 +446,19 @@
     ASSERT_TRUE(unsetenv(click::SEARCH_BASE_URL_ENVVAR.c_str()) == 0);
 }
 
+TEST_F(IndexTest, testPackageListsFromJsonNodeNoRecommends)
+{
+    auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_ONE);
+    EXPECT_EQ(1, lists.first.size());
+    EXPECT_EQ(0, lists.second.size());
+}
+
+TEST_F(IndexTest, testPackageListsFromJsonNodeHasRecommends)
+{
+    auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_RECOMMENDS);
+    EXPECT_EQ(1, lists.second.size());
+}
+
 TEST_F(MockPackageManager, testUninstallCommandCorrect)
 {
     click::Package package = {

=== added file 'libclickscope/tests/test_package.cpp'
--- libclickscope/tests/test_package.cpp	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/test_package.cpp	2014-06-26 18:57:41 +0000
@@ -0,0 +1,74 @@
+/*
+ * 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 <click/package.h>
+
+#include <gtest/gtest.h>
+
+#include "fake_json.h"
+
+using namespace click;
+
+
+class PackageTest : public ::testing::Test {
+};
+
+TEST_F(PackageTest, testPackageListFromJsonNodeSingle)
+{
+    Json::Value root;
+    Json::Reader().parse(FAKE_JSON_SEARCH_RESULT_ONE, root);
+    auto const embedded = root[Package::JsonKeys::embedded];
+    auto const ci_package = embedded[Package::JsonKeys::ci_package];
+
+    Packages pl = package_list_from_json_node(ci_package);
+    ASSERT_EQ(1, pl.size());
+}
+
+TEST_F(PackageTest, testPackageListFromJsonNodeMany)
+{
+    Json::Value root;
+    Json::Reader().parse(FAKE_JSON_SEARCH_RESULT_MANY, root);
+    auto const embedded = root[Package::JsonKeys::embedded];
+    auto const ci_package = embedded[Package::JsonKeys::ci_package];
+
+    Packages pl = package_list_from_json_node(ci_package);
+    ASSERT_GT(pl.size(), 1);
+}
+
+TEST_F(PackageTest, testPackageListFromJsonNodeMissingData)
+{
+    Json::Value root;
+    Json::Reader().parse(FAKE_JSON_SEARCH_RESULT_MISSING_DATA, root);
+    auto const embedded = root[Package::JsonKeys::embedded];
+    auto const ci_package = embedded[Package::JsonKeys::ci_package];
+
+    Packages pl = package_list_from_json_node(ci_package);
+    ASSERT_EQ(1, pl.size());
+}
+

=== modified file 'po/unity-scope-click.pot'
--- po/unity-scope-click.pot	2014-06-25 13:43:08 +0000
+++ po/unity-scope-click.pot	2014-06-26 18:57:41 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-25 09:42-0400\n"
+"POT-Creation-Date: 2014-06-26 14:08-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -107,11 +107,14 @@
 msgid "✔ INSTALLED"
 msgstr ""
 
-#. TODO: get the real price from the webservice (upcoming branch)
-#: ../scope/clickstore/store-query.cpp:236
+#: ../scope/clickstore/store-query.cpp:235
 msgid "FREE"
 msgstr ""
 
 #: ../scope/clickstore/store-query.cpp:331
 msgid "Available"
 msgstr ""
+
+#: ../scope/clickstore/store-query.cpp:335
+msgid "Recommended"
+msgstr ""

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-06-24 16:44:03 +0000
+++ scope/clickstore/store-query.cpp	2014-06-26 18:57:41 +0000
@@ -232,8 +232,8 @@
             res[click::Query::ResultKeys::VERSION] = installed->version;
         } else {
             res[click::Query::ResultKeys::INSTALLED] = false;
+            res["subtitle"] = _("FREE");
             // TODO: get the real price from the webservice (upcoming branch)
-            res["subtitle"] = _("FREE");
         }
 
         this->push_result(searchReply, res);
@@ -330,17 +330,28 @@
     scopes::CategoryRenderer categoryRenderer(categoryTemplate);
     auto category = register_category(searchReply, "appstore", _("Available"), "", categoryRenderer);
 
+    scopes::CategoryRenderer recommendsCatRenderer(categoryTemplate);
+    auto recommendsCategory = register_category(searchReply, "recommends",
+                                                _("Recommended"), "",
+                                                recommendsCatRenderer);
+
     assert(searchReply);
 
     run_under_qt([=]()
     {
-            auto search_cb = [this, searchReply, category, installedPackages](Packages packages) {
+        auto search_cb = [this, searchReply,
+                          category, recommendsCategory,
+                          installedPackages](Packages packages, Packages recommends) {
                 qDebug("search callback");
 
                 // handle packages data
                 foreach (auto p, packages) {
                     push_package(searchReply, category, installedPackages, p);
                 }
+                foreach (auto r, recommends) {
+                    push_package(searchReply, recommendsCategory,
+                                 installedPackages, r);
+                }
                 qDebug() << "search completed";
                 this->finished(searchReply); //FIXME: this shouldn't be needed
             };

=== modified file 'scope/tests/integration/webclient_integration.cpp'
--- scope/tests/integration/webclient_integration.cpp	2014-06-23 10:25:44 +0000
+++ scope/tests/integration/webclient_integration.cpp	2014-06-26 18:57:41 +0000
@@ -103,7 +103,8 @@
                 new click::web::Client(namPtr));
     click::Index index(clientPtr);
     click::Packages packages;
-    index.search("qr,architecture:armhf", [&, this](click::Packages found_packages){
+    index.search("qr", [&, this](click::Packages found_packages,
+                                 click::Packages){
         packages = found_packages;
         Quit();
     });

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-06-23 10:25:44 +0000
+++ scope/tests/test_query.cpp	2014-06-26 18:57:41 +0000
@@ -58,9 +58,11 @@
 
 class MockIndex : public click::Index {
     click::Packages packages;
+    click::Packages recommends;
     click::DepartmentList departments;
     click::DepartmentList bootstrap_departments;
     click::HighlightList bootstrap_highlights;
+
 public:
     MockIndex(click::Packages packages = click::Packages(),
             click::DepartmentList departments = click::DepartmentList(),
@@ -73,20 +75,23 @@
 
     }
 
-    click::web::Cancellable search(const std::string &query, std::function<void (click::Packages)> callback) override
+    click::web::Cancellable search(const std::string &query, std::function<void (click::Packages, click::Packages)> callback) override
     {
         do_search(query, callback);
-        callback(packages);
+        callback(packages, recommends);
         return click::web::Cancellable();
     }
 
+
     click::web::Cancellable bootstrap(std::function<void(const click::DepartmentList&, const click::HighlightList&, Error, int)> callback) override
     {
         callback(bootstrap_departments, bootstrap_highlights, click::Index::Error::NoError, 0);
         return click::web::Cancellable();
     }
 
-    MOCK_METHOD2(do_search, void(const std::string&, std::function<void(click::Packages)>));
+    MOCK_METHOD2(do_search,
+                 void(const std::string&,
+                      std::function<void(click::Packages, click::Packages)>));
 };
 
 class MockQueryBase : public click::Query {
@@ -178,7 +183,7 @@
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
-    EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat));
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
     q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
 }
 
@@ -198,7 +203,7 @@
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
-    EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat));
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
 
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
@@ -224,7 +229,7 @@
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
-    EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat));
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
 
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
@@ -273,7 +278,7 @@
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
-    EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat));
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
 
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
@@ -303,7 +308,7 @@
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
-    EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat));
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
 
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});