FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delete feeds and folders by ids and by account id (closes #100)

This commit is contained in:
Shinokuni 2021-07-16 17:51:23 +02:00
parent d51c7ed90a
commit ef195b4231
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/src/main/java/com/readrops/db/dao/FeedDao.java
View File

@ -29,9 +29,6 @@ public abstract class FeedDao implements BaseDao<Feed> {
@Query("Select * from Feed Where id = :feedId") @Query("Select * from Feed Where id = :feedId")
public abstract Feed getFeedById(int feedId); public abstract Feed getFeedById(int feedId);
@Query("Select id From Feed Where url = :url and account_id = :accountId")
public abstract int getFeedIdByUrl(String url, int accountId);
@Query("Select case When :feedUrl In (Select url from Feed Where account_id = :accountId) Then 1 else 0 end") @Query("Select case When :feedUrl In (Select url from Feed Where account_id = :accountId) Then 1 else 0 end")
public abstract boolean feedExists(String feedUrl, int accountId); public abstract boolean feedExists(String feedUrl, int accountId);
@ -81,8 +78,8 @@ public abstract class FeedDao implements BaseDao<Feed> {
@Query("Select remoteId From Feed Where account_id = :accountId") @Query("Select remoteId From Feed Where account_id = :accountId")
public abstract List<String> getFeedRemoteIdsOfAccount(int accountId); public abstract List<String> getFeedRemoteIdsOfAccount(int accountId);
@Query("Delete from Feed Where remoteId in (:ids)") @Query("Delete from Feed Where remoteId in (:ids) And account_id = :accountId")
abstract void deleteByIds(List<String> ids); abstract void deleteByIds(List<String> ids, int accountId);
@Query("Select id From Folder Where remoteId = :remoteId And account_id = :accountId") @Query("Select id From Folder Where remoteId = :remoteId And account_id = :accountId")
abstract int getRemoteFolderLocalId(String remoteId, int accountId); abstract int getRemoteFolderLocalId(String remoteId, int accountId);
@ -126,8 +123,9 @@ public abstract class FeedDao implements BaseDao<Feed> {
} }
} }
if (!accountFeedIds.isEmpty()) if (!accountFeedIds.isEmpty()) {
deleteByIds(accountFeedIds); deleteByIds(accountFeedIds, account.getId());
}
return insert(feedsToInsert); return insert(feedsToInsert);
} }

11
db/src/main/java/com/readrops/db/dao/FolderDao.java
View File

@ -36,8 +36,8 @@ public abstract class FolderDao implements BaseDao<Folder> {
@Query("Select remoteId From Folder Where account_id = :accountId") @Query("Select remoteId From Folder Where account_id = :accountId")
public abstract List<String> getFolderRemoteIdsOfAccount(int accountId); public abstract List<String> getFolderRemoteIdsOfAccount(int accountId);
@Query("Delete From Folder Where remoteId in (:ids)") @Query("Delete From Folder Where remoteId in (:ids) And account_id = :accountId")
abstract void deleteByIds(List<String> ids); abstract void deleteByIds(List<String> ids, int accountId);
@Query("Select * From Folder Where name = :name And account_id = :accountId") @Query("Select * From Folder Where name = :name And account_id = :accountId")
public abstract Folder getFolderByName(String name, int accountId); public abstract Folder getFolderByName(String name, int accountId);
@ -47,7 +47,7 @@ public abstract class FolderDao implements BaseDao<Folder> {
* *
* @param folders folders to insert or update * @param folders folders to insert or update
* @param account owner of the feeds * @param account owner of the feeds
* @return the list of the inserted feeds ids * @return the list of the inserted folders ids
*/ */
@Transaction @Transaction
public List<Long> foldersUpsert(List<Folder> folders, Account account) { public List<Long> foldersUpsert(List<Folder> folders, Account account) {
@ -64,8 +64,9 @@ public abstract class FolderDao implements BaseDao<Folder> {
} }
} }
if (!accountFolderIds.isEmpty()) if (!accountFolderIds.isEmpty()) {
deleteByIds(accountFolderIds); deleteByIds(accountFolderIds, account.getId());
}
return insert(foldersToInsert); return insert(foldersToInsert);
} }