findAll functions in the itemmapper

3 files changed, 25 insertions, 0 deletions

diff --git a/doc/.mapper spec.md.kate-swp b/doc/.mapper spec.md.kate-swp
new file mode 100644
index 000000000..4dbdf8137
--- /dev/null
+++ b/doc/.mapper spec.md.kate-swp
diff --git a/doc/mapper spec.md b/doc/mapper spec.md
index f9b28fe94..725a0d6b2 100644
--- a/doc/mapper spec.md
+++ b/doc/mapper spec.md
@@ -1,5 +1,6 @@
 itemmapper
 
+<<<<<<< Updated upstream
 find(int $feedId, $userId)
 
 
@@ -35,11 +36,20 @@ request: get all items of a feed of a user (unread and read)
 
 
 all requests: can be specified using an (offset (id), limit) or (updatedSince (timestamp))
+=======
+findAllFromUser($userId)
+find(int $feedId, $userId)
+
+findAll($status, $feedId, $userId, );
+>>>>>>> Stashed changes
 
 foldermapper
 
 find($feedId, $userId)
+<<<<<<< Updated upstream
 findAllFromUser($userId)
+=======
+>>>>>>> Stashed changes
 
 feedmapper
 
diff --git a/doc/mapper spec.md~ b/doc/mapper spec.md~
new file mode 100644
index 000000000..a5e877734
--- /dev/null
+++ b/doc/mapper spec.md~
@@ -0,0 +1,15 @@
+
+findAllFromUser($userId)
+find(int $feedId, $userId)
+findAllFromFeedWithStatus($status, $feedId, $userId);
+
+foldermapper
+
+find($feedId, $userId)
+
+feedmapper
+
+find($feedId, $userId)
+findAll()
+findAllFromUser($userId)
+