Refactor getIdMap (38bb26e3) · Commits · e / os / Notes

app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public class NotesDaoTest {
		}

		@Test
		public void deleteNotebyId() throws InterruptedException {
		public void deleteNoteById() throws InterruptedException {
		db.getNoteDao().addNote(new Note(1, 1L, Calendar.getInstance(), "T", "C", "", false, "1", LOCAL_DELETED, account.getId(), "", 0));
		db.getNoteDao().deleteByNoteId(1, LOCAL_DELETED);
		assertNull(db.getNoteDao().getNoteById(1));

app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		package it.niedermann.owncloud.notes.persistence;

		import android.content.Context;

		import androidx.annotation.NonNull;
		import androidx.arch.core.executor.testing.InstantTaskExecutorRule;
		import androidx.room.Room;
		import androidx.test.core.app.ApplicationProvider;
		import androidx.test.ext.junit.runners.AndroidJUnit4;

		import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException;

		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		import java.util.Calendar;
		import java.util.List;
		import java.util.Map;

		import it.niedermann.owncloud.notes.persistence.entity.Account;
		import it.niedermann.owncloud.notes.persistence.entity.Note;
		import it.niedermann.owncloud.notes.shared.model.Capabilities;

		import static it.niedermann.owncloud.notes.shared.model.DBStatus.LOCAL_DELETED;
		import static it.niedermann.owncloud.notes.shared.model.DBStatus.LOCAL_EDITED;
		import static it.niedermann.owncloud.notes.shared.model.DBStatus.VOID;
		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertNull;

		@RunWith(AndroidJUnit4.class)
		public class NotesDatabaseTest {

		@Rule
		public InstantTaskExecutorRule instantTaskExecutorRule = new InstantTaskExecutorRule();

		@NonNull
		private Context context;
		private NotesDatabase db = null;
		private Account account = null;
		private Account secondAccount = null;

		@Before
		public void setupDB() throws NextcloudHttpRequestFailedException {
		context = ApplicationProvider.getApplicationContext();
		db = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), NotesDatabase.class).build();

		db.addAccount("https://äöüß.example.com", "彼得", "彼得@äöüß.example.com", new Capabilities("{\"ocs\":{\"meta\":{\"status\":\"ok\",\"statuscode\":200,\"message\":\"OK\"},\"data\":{\"version\":{\"major\":18,\"minor\":0,\"micro\":4,\"string\":\"18.0.4\",\"edition\":\"\",\"extendedSupport\":false},\"capabilities\":{\"core\":{\"pollinterval\":60,\"webdav-root\":\"remote.php\\/webdav\"},\"bruteforce\":{\"delay\":0},\"files\":{\"bigfilechunking\":true,\"blacklisted_files\":[\".htaccess\"],\"directEditing\":{\"url\":\"https:\\/\\/efss.qloud.my\\/ocs\\/v2.php\\/apps\\/files\\/api\\/v1\\/directEditing\",\"etag\":\"ed2b141af2a39b0e42666952ba60988d\"},\"versioning\":true,\"undelete\":true},\"activity\":{\"apiv2\":[\"filters\",\"filters-api\",\"previews\",\"rich-strings\"]},\"ocm\":{\"enabled\":true,\"apiVersion\":\"1.0-proposal1\",\"endPoint\":\"https:\\/\\/efss.qloud.my\\/index.php\\/ocm\",\"resourceTypes\":[{\"name\":\"file\",\"shareTypes\":[\"user\",\"group\"],\"protocols\":{\"webdav\":\"\\/public.php\\/webdav\\/\"}}]},\"deck\":{\"version\":\"0.8.2\"},\"richdocuments\":{\"mimetypes\":[\"application\\/vnd.oasis.opendocument.text\",\"application\\/vnd.oasis.opendocument.spreadsheet\",\"application\\/vnd.oasis.opendocument.graphics\",\"application\\/vnd.oasis.opendocument.presentation\",\"application\\/vnd.lotus-wordpro\",\"application\\/vnd.visio\",\"application\\/vnd.wordperfect\",\"application\\/msonenote\",\"application\\/msword\",\"application\\/rtf\",\"text\\/rtf\",\"application\\/vnd.openxmlformats-officedocument.wordprocessingml.document\",\"application\\/vnd.openxmlformats-officedocument.wordprocessingml.template\",\"application\\/vnd.ms-word.document.macroEnabled.12\",\"application\\/vnd.ms-word.template.macroEnabled.12\",\"application\\/vnd.ms-excel\",\"application\\/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"application\\/vnd.openxmlformats-officedocument.spreadsheetml.template\",\"application\\/vnd.ms-excel.sheet.macroEnabled.12\",\"application\\/vnd.ms-excel.template.macroEnabled.12\",\"application\\/vnd.ms-excel.addin.macroEnabled.12\",\"application\\/vnd.ms-excel.sheet.binary.macroEnabled.12\",\"application\\/vnd.ms-powerpoint\",\"application\\/vnd.openxmlformats-officedocument.presentationml.presentation\",\"application\\/vnd.openxmlformats-officedocument.presentationml.template\",\"application\\/vnd.openxmlformats-officedocument.presentationml.slideshow\",\"application\\/vnd.ms-powerpoint.addin.macroEnabled.12\",\"application\\/vnd.ms-powerpoint.presentation.macroEnabled.12\",\"application\\/vnd.ms-powerpoint.template.macroEnabled.12\",\"application\\/vnd.ms-powerpoint.slideshow.macroEnabled.12\",\"text\\/csv\"],\"mimetypesNoDefaultOpen\":[\"image\\/svg+xml\",\"application\\/pdf\",\"text\\/plain\",\"text\\/spreadsheet\"],\"collabora\":[],\"direct_editing\":false,\"templates\":false,\"productName\":\"\\u5728\\u7ebf\\u534f\\u4f5c\"},\"dav\":{\"chunking\":\"1.0\"},\"files_sharing\":{\"api_enabled\":true,\"public\":{\"enabled\":true,\"password\":{\"enforced\":true,\"askForOptionalPassword\":false},\"expire_date\":{\"enabled\":true,\"days\":\"7\",\"enforced\":false},\"multiple_links\":true,\"expire_date_internal\":{\"enabled\":false},\"send_mail\":false,\"upload\":true,\"upload_files_drop\":true},\"resharing\":true,\"user\":{\"send_mail\":false,\"expire_date\":{\"enabled\":true}},\"group_sharing\":true,\"group\":{\"enabled\":true,\"expire_date\":{\"enabled\":true}},\"default_permissions\":31,\"federation\":{\"outgoing\":false,\"incoming\":false,\"expire_date\":{\"enabled\":true}},\"sharee\":{\"query_lookup_default\":false},\"sharebymail\":{\"enabled\":true,\"upload_files_drop\":{\"enabled\":true},\"password\":{\"enabled\":true},\"expire_date\":{\"enabled\":true}}},\"external\":{\"v1\":[\"sites\",\"device\",\"groups\",\"redirect\"]},\"notifications\":{\"ocs-endpoints\":[\"list\",\"get\",\"delete\",\"delete-all\",\"icons\",\"rich-strings\",\"action-web\"],\"push\":[\"devices\",\"object-data\",\"delete\"],\"admin-notifications\":[\"ocs\",\"cli\"]},\"password_policy\":{\"minLength\":8,\"enforceNonCommonPassword\":true,\"enforceNumericCharacters\":false,\"enforceSpecialCharacters\":false,\"enforceUpperLowerCase\":false,\"api\":{\"generate\":\"https:\\/\\/efss.qloud.my\\/ocs\\/v2.php\\/apps\\/password_policy\\/api\\/v1\\/generate\",\"validate\":\"https:\\/\\/efss.qloud.my\\/ocs\\/v2.php\\/apps\\/password_policy\\/api\\/v1\\/validate\"}},\"theming\":{\"name\":\"QloudData\",\"url\":\"https:\\/\\/www.qloud.my\\/qloud-data\\/\",\"slogan\":\"Powered by NextCloud\",\"color\":\"#1E4164\",\"color-text\":\"#ffffff\",\"color-element\":\"#1E4164\",\"logo\":\"https:\\/\\/efss.qloud.my\\/index.php\\/apps\\/theming\\/image\\/logo?useSvg=1&v=47\",\"background\":\"https:\\/\\/efss.qloud.my\\/core\\/img\\/background.png?v=47\",\"background-plain\":false,\"background-default\":true,\"logoheader\":\"https:\\/\\/efss.qloud.my\\/index.php\\/apps\\/theming\\/image\\/logo?useSvg=1&v=47\",\"favicon\":\"https:\\/\\/efss.qloud.my\\/index.php\\/apps\\/theming\\/image\\/logo?useSvg=1&v=47\"},\"registration\":{\"enabled\":true,\"apiRoot\":\"\\/ocs\\/v2.php\\/apps\\/registration\\/api\\/v1\\/\",\"apiLevel\":\"v1\"}}}}}", null));
		account = db.getAccountDao().getAccountByName("彼得@äöüß.example.com");

		db.addAccount("https://example.org", "test", "test@example.org", new Capabilities("", null));
		secondAccount = db.getAccountDao().getAccountByName("test@example.org");

		List.of(
		new Note(1, 1001L, Calendar.getInstance(), "美好的一天", "C", "Movies", false, null, VOID, account.getId(), "", 0),
		new Note(2, null, Calendar.getInstance(), "T", "C", "Movies", false, null, LOCAL_EDITED, account.getId(), "", 0),
		new Note(3, 1003L, Calendar.getInstance(), "美好的一天", "C", "Movies", false, null, LOCAL_EDITED, account.getId(), "", 0),
		new Note(4, null, Calendar.getInstance(), "T", "C", "Music", false, null, VOID, account.getId(), "", 0),
		new Note(5, 1005L, Calendar.getInstance(), "美好的一天", "C", " 兄弟，这真是美好的一天。", false, null, LOCAL_EDITED, account.getId(), "", 0),
		new Note(6, 1006L, Calendar.getInstance(), "美好的一天", "C", " 兄弟，这真是美好的一天。", false, null, LOCAL_DELETED, account.getId(), "", 0),
		new Note(7, null, Calendar.getInstance(), "T", "C", "Music", true, null, LOCAL_EDITED, secondAccount.getId(), "", 0),
		new Note(8, 1008L, Calendar.getInstance(), "美好的一天", "C", "ToDo", true, null, LOCAL_EDITED, secondAccount.getId(), "", 0),
		new Note(9, 1009L, Calendar.getInstance(), "美好的一天", "C", "ToDo", true, null, LOCAL_DELETED, secondAccount.getId(), "", 0)
		).forEach(note -> db.getNoteDao().addNote(note));
		}

		@Test
		public void testGetIdMap() {
		final Map<Long, Long> idMapOfFirstAccount = db.getIdMap(account.getId());
		assertEquals(3, idMapOfFirstAccount.size());
		assertEquals(Long.valueOf(1L), idMapOfFirstAccount.get(1001L));
		assertEquals(Long.valueOf(3L), idMapOfFirstAccount.get(1003L));

		final Map<Long, Long> idMapOfSecondAccount = db.getIdMap(secondAccount.getId());
		assertEquals(1, idMapOfSecondAccount.size());
		assertEquals(Long.valueOf(8L), idMapOfSecondAccount.get(1008L));
		}

		}
		No newline at end of file

app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesNotesDatabaseTest.java

deleted100644 → 0

+0 −666

File deleted.

Preview size limit exceeded, changes collapsed.

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import org.json.JSONException;
		import java.util.ArrayList;
		import java.util.Calendar;
		import java.util.Collections;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;

		@@ -79,6 +78,7 @@ import static it.niedermann.owncloud.notes.edit.EditNoteActivity.ACTION_SHORTCUT
		import static it.niedermann.owncloud.notes.shared.util.NoteUtil.generateNoteExcerpt;
		import static it.niedermann.owncloud.notes.widget.notelist.NoteListWidget.updateNoteListWidgets;
		import static it.niedermann.owncloud.notes.widget.singlenote.SingleNoteWidget.updateSingleNoteWidgets;
		import static java.util.stream.Collectors.toMap;

		@Database(
		entities = {
		@@ -215,15 +215,19 @@ public abstract class NotesDatabase extends RoomDatabase {
		});
		}

		/**
		* @return a {@link Map} of remote IDs as keys and local IDs as values of all {@link Note}s of
		* the given {@param accountId} which are note {@link DBStatus#LOCAL_DELETED}
		*/
		@NonNull
		@WorkerThread
		public Map<Long, Long> getIdMap(long accountId) {
		validateAccountId(accountId);
		Map<Long, Long> result = new HashMap<>();
		for (Note pair : getNoteDao().getRemoteIdAndId(accountId)) {
		result.put(pair.getRemoteId(), pair.getId());
		}
		return result;
		return getNoteDao()
		.getRemoteIdAndId(accountId)
		.stream()
		.filter(note -> note.getRemoteId() != null)
		.collect(toMap(Note::getRemoteId, Note::getId));
		}

		@AnyThread

app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/AccountDao.java

+9 −17

Original line number	Diff line number	Diff line
		@@ -20,10 +20,14 @@ public interface AccountDao {
		@Delete
		int deleteAccount(Account localAccount);

		String getAccountById = "SELECT * FROM Account WHERE ID = :accountId";
		String getAccountByName = "SELECT * FROM Account WHERE ACCOUNTNAME = :accountName";
		String getAccounts = "SELECT * FROM Account";
		String countAccounts = "SELECT COUNT(*) FROM Account";
		String getAccountById = "SELECT * FROM Account WHERE ID = :accountId";

		@Query(getAccounts)
		LiveData<List<Account>> getAccounts$();

		@Query(getAccounts)
		List<Account> getAccounts();

		@Query(getAccountById)
		LiveData<Account> getAccountById$(long accountId);
		@@ -31,24 +35,12 @@ public interface AccountDao {
		@Query(getAccountById)
		Account getAccountById(long accountId);

		@Query(getAccountByName)
		LiveData<Account> getAccountByName$(String accountName);

		@Query(getAccountByName)
		@Query("SELECT * FROM Account WHERE ACCOUNTNAME = :accountName")
		Account getAccountByName(String accountName);

		@Query(getAccounts)
		LiveData<List<Account>> getAccounts$();

		@Query(getAccounts)
		List<Account> getAccounts();

		@Query(countAccounts)
		@Query("SELECT COUNT(*) FROM Account")
		LiveData<Integer> countAccounts$();

		@Query(countAccounts)
		Integer countAccounts();

		@Query("UPDATE Account SET COLOR = :color, TEXTCOLOR = :textColor WHERE id = :id")
		void updateBrand(long id, @ColorInt Integer color, @ColorInt Integer textColor);