invitations: do not count banned contacts

Exclude banned contacts from total number of pending invitations.

Change-Id: I62a58de8b499719e5c9dd31f1df84c57ed2c023b
Reviewed-by: Sebastien Blin <sebastien.blin@savoirfairelinux.com>

src/contactmodel.cpp

@@ -181,6 +181,7 @@ ContactModel::pendingRequestCount() const
     int pendingRequestCount = 0;
     auto i = std::for_each(pimpl_->contacts.begin(), pimpl_->contacts.end(),
         [&pendingRequestCount] (const auto& c) {
+            if (!c.second.isBanned)
                 pendingRequestCount += static_cast<int>(c.second.profileInfo.type == profile::Type::PENDING);
         });
     return pendingRequestCount;

test/contactmodeltester.cpp

@@ -237,6 +237,17 @@ ContactModelTester::testCountPendingRequests()
     CPPUNIT_ASSERT_EQUAL(accInfo_.contactModel->pendingRequestCount(), 1);
 }
 
+void
+ContactModelTester::testCountPendingRequestsWithBlockedContact()
+{
+    CPPUNIT_ASSERT(accInfo_.contactModel->hasPendingRequests());
+    CPPUNIT_ASSERT_EQUAL(accInfo_.contactModel->pendingRequestCount(), 1);
+    CPPUNIT_ASSERT_NO_THROW(accInfo_.contactModel->getContact("pending0"));
+    accInfo_.contactModel->removeContact("pending0", true);
+    CPPUNIT_ASSERT(!accInfo_.contactModel->hasPendingRequests());
+    CPPUNIT_ASSERT_EQUAL(accInfo_.contactModel->pendingRequestCount(), 0);
+}
+
 void
 ContactModelTester::tearDown()
 {

test/contactmodeltester.h

@@ -112,6 +112,10 @@ public:
      * Count contact requests
      */
     void testCountPendingRequests();
+    /**
+     * Count contact requests when banned contacts exists
+     */
+    void testCountPendingRequestsWithBlockedContact();
     /**
      * Method automatically called after each test by CppUnit
      */