added "contains" to all stores

Author: Skycoder42

src/datasync/datastore.cpp

@@ -58,6 +58,11 @@ QVariantList DataStore::loadAll(int metaTypeId) const
 	return resList;
 }
 
+bool DataStore::contains(int metaTypeId, const QString &key) const
+{
+	return d->store->contains({d->typeName(metaTypeId), key});
+}
+
 QVariant DataStore::load(int metaTypeId, const QString &key) const
 {
 	auto data = d->store->load({d->typeName(metaTypeId), key});

src/datasync/datastore.h

@@ -47,6 +47,10 @@ class Q_DATASYNC_EXPORT DataStore : public QObject
 	QStringList keys(int metaTypeId) const;
 	//! @copybrief DataStore::loadAll() const
 	QVariantList loadAll(int metaTypeId) const;
+	bool contains(int metaTypeId, const QString &key) const;
+	inline bool contains(int metaTypeId, const QVariant &key) const {
+		return contains(metaTypeId, key.toString());
+	}
 	//! @copybrief DataStore::load(const QString &) const
 	QVariant load(int metaTypeId, const QString &key) const;
 	//! @copybrief DataStore::load(int, const QString &) const
@@ -89,6 +93,10 @@ class Q_DATASYNC_EXPORT DataStore : public QObject
 	QList<T> loadAll() const;
 	//! Loads the dataset with the given key for the given type
 	template<typename T>
+	bool contains(const QString &key) const;
+	template<typename T, typename K>
+	bool contains(const K &key) const;
+	template<typename T>
 	T load(const QString &key) const;
 	//! @copybrief DataStore::load(const QString &) const
 	template<typename T, typename K>
@@ -254,6 +262,20 @@ QList<T> DataStore::loadAll() const
 	return rList;
 }
 
+template<typename T>
+bool DataStore::contains(const QString &key) const
+{
+	QTDATASYNC_STORE_ASSERT(T);
+	return contains(qMetaTypeId<T>(), key);
+}
+
+template<typename T, typename K>
+bool DataStore::contains(const K &key) const
+{
+	QTDATASYNC_STORE_ASSERT(T);
+	return contains(qMetaTypeId<T>(), QVariant::fromValue(key));
+}
+
 template<typename T>
 T DataStore::load(const QString &key) const
 {

src/datasync/datatypestore.h

@@ -51,6 +51,7 @@ class DataTypeStore : public DataTypeStoreBase
 	QList<TKey> keys() const;
 	//! @copybrief DataStore::loadAll() const
 	QList<TType> loadAll() const;
+	bool contains(const TKey &key) const;
 	//! @copybrief DataStore::load(const K &) const
 	TType load(const TKey &key) const;
 	//! @copybrief DataStore::save(const T &)
@@ -237,6 +238,12 @@ QList<TType> DataTypeStore<TType, TKey>::loadAll() const
 	return _store->loadAll<TType>();
 }
 
+template<typename TType, typename TKey>
+bool DataTypeStore<TType, TKey>::contains(const TKey &key) const
+{
+	return _store->contains<TType>(key);
+}
+
 template <typename TType, typename TKey>
 TType DataTypeStore<TType, TKey>::load(const TKey &key) const
 {

src/datasync/localstore.cpp

@@ -168,6 +168,16 @@ QList<QJsonObject> LocalStore::loadAll(const QByteArray &typeName) const
 	}
 }
 
+bool LocalStore::contains(const ObjectKey &key) const
+{
+	QSqlQuery existsQuery(_database);
+	existsQuery.prepare(QStringLiteral("SELECT 1 FROM DataIndex WHERE Type = ? AND Id = ?"));
+	existsQuery.addBindValue(key.typeName);
+	existsQuery.addBindValue(key.id);
+	exec(existsQuery, key);
+	return existsQuery.first();
+}
+
 QJsonObject LocalStore::load(const ObjectKey &key) const
 {
 	//check if cached

src/datasync/localstore_p.h

@@ -64,6 +64,7 @@ class Q_DATASYNC_EXPORT LocalStore : public QObject
 	QStringList keys(const QByteArray &typeName) const;
 	QList<QJsonObject> loadAll(const QByteArray &typeName) const;
 
+	bool contains(const ObjectKey &key) const;
 	QJsonObject load(const ObjectKey &key) const;
 	void save(const ObjectKey &key, const QJsonObject &data);
 	bool remove(const ObjectKey &key);

tests/auto/datasync/TestDataStore/tst_datastore.cpp

@@ -18,6 +18,7 @@ private Q_SLOTS:
 	void testSave();
 	void testSaveInvalid();
 	void testAll();
+	void testContains();
 	void testFind();
 	void testRemove_data();
 	void testRemove();
@@ -117,6 +118,16 @@ void TestDataStore::testAll()
 	}
 }
 
+void TestDataStore::testContains()
+{
+	try {
+		QVERIFY(store->contains<TestData>(TestLib::generateDataKey(430)));
+		QVERIFY(!store->contains<TestData>(TestLib::generateDataKey(440)));
+	} catch(QException &e) {
+		QFAIL(e.what());
+	}
+}
+
 void TestDataStore::testFind()
 {
 	const QList<TestData> objects {

tests/auto/datasync/TestDataTypeStore/tst_datatypestore.cpp

@@ -64,6 +64,7 @@ void TestDataTypeStore::testSimple()
 			store.save(data);
 			QCOMPARE(dataStore->load<TestData>(i), data);
 			QCOMPARE(store.load(i), data);
+			QVERIFY(store.contains(i));
 
 			QCOMPARE(changeSpy.size(), 1);
 			auto sig = changeSpy.takeFirst();

tests/auto/datasync/TestLocalStore/tst_localstore.cpp

@@ -20,6 +20,7 @@ private Q_SLOTS:
 	void testSave_data();
 	void testSave();
 	void testAll();
+	void testContains();
 	void testFind_data();
 	void testFind();
 	void testRemove_data();
@@ -126,6 +127,16 @@ void TestLocalStore::testAll()
 	}
 }
 
+void TestLocalStore::testContains()
+{
+	try {
+		QVERIFY(store->contains(TestLib::generateKey(430)));
+		QVERIFY(!store->contains(TestLib::generateKey(440)));
+	} catch(QException &e) {
+		QFAIL(e.what());
+	}
+}
+
 void TestLocalStore::testFind_data()
 {
 	QTest::addColumn<QString>("query");