permissionsdao: no silent fallback to user-permissions if we find none for user

database/database.h

@@ -10,6 +10,7 @@
 #include "sessiondao.h"
 #include "userdao.h"
 #include "categorydao.h"
+#include "permissionsdao.h"
 class Database
 {
 private:
@@ -26,6 +27,7 @@ private:
 	virtual std::unique_ptr<SessionDao> createSessionDao() const = 0;
 	virtual std::unique_ptr<UserDao> createUserDao() const = 0;
 	virtual std::unique_ptr<CategoryDao> createCategoryDao() const = 0;
+	virtual std::unique_ptr<PermissionsDao> createPermissionsDao() const = 0;
 	virtual ~Database() { }
 };
 

database/permissionsdao.h

@@ -6,7 +6,7 @@ class PermissionsDao
 {
 public:
 	PermissionsDao();
-	virtual Permissions find(std::string pagename, std::string username) = 0;
+	virtual std::optional<Permissions> find(std::string pagename, std::string username) = 0;
 };
 
 #endif // PERMISSIONSDAO_H

database/permissionsdaosqlite.cpp

@@ -25,8 +25,19 @@ PermissionsDaoSqlite::PermissionsDaoSqlite()
 
 }
 
-Permissions PermissionsDaoSqlite::find(std::string pagename, std::string username)
+std::optional<Permissions> PermissionsDaoSqlite::find(std::string pagename, std::string username)
 {
-	/* auto query = *db << "SELECT COALESCE( (SELECT permissions FROM permissions WHERE page = ? AND userid = ?), (SELECT permissions FROM user WHERE ID = ?))";
+	auto query = *db << "SELECT permissions FROM permissions WHERE page = (SELECT id FROM page WHERE name = ?) AND userid = (SELECT id FROM user WHERE username = ?)";
-	exec*/
+	query << pagename << username;
+	int permissions = 0;
+	try
+	{
+		permissions = execInt(query);
+	}
+	catch(const sqlite::errors::no_rows &e)
+	{
+		return { };
+	}
+
+	return Permissions { permissions };
 }

database/permissionsdaosqlite.h

@@ -8,7 +8,7 @@ class PermissionsDaoSqlite : public PermissionsDao, protected SqliteDao
 public:
 	PermissionsDaoSqlite();
 
-	Permissions find(std::string pagename, std::string username) override;
+	std::optional<Permissions> find(std::string pagename, std::string username) override;
 	using SqliteDao::SqliteDao;
 };
 

database/sqlite.cpp

@@ -26,6 +26,7 @@ SOFTWARE.
 #include "userdaosqlite.h"
 #include "categorydaosqlite.h"
 #include "exceptions.h"
+#include "permissionsdaosqlite.h"
 
 Sqlite::Sqlite(std::string path) : Database(path)
 {
@@ -62,6 +63,13 @@ std::unique_ptr<CategoryDao> Sqlite::createCategoryDao() const
 {
 	return create<CategoryDaoSqlite>();
 }
+
+
+std::unique_ptr<PermissionsDao> Sqlite::createPermissionsDao() const
+{
+	return create<PermissionsDaoSqlite>();
+}
+
 void Sqlite::beginTransaction()
 {
 	if(!inTransaction)

database/sqlite.h

@@ -22,6 +22,7 @@ public:
 	std::unique_ptr<UserDao> createUserDao() const;
 	std::unique_ptr<SessionDao> createSessionDao() const;
 	std::unique_ptr<CategoryDao> createCategoryDao() const;
+	std::unique_ptr<PermissionsDao> createPermissionsDao() const;
 	void beginTransaction();
 	void commitTransaction();
 	void rollbackTransaction();