From f81c3ed940ff699632c01efe77e53e8abe941f63 Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Fri, 1 May 2020 14:53:16 +0200 Subject: [PATCH] database: Tolerate null as page value --- database/lib/src/database.dart | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/database/lib/src/database.dart b/database/lib/src/database.dart index d3bfe7a..cfc9099 100644 --- a/database/lib/src/database.dart +++ b/database/lib/src/database.dart @@ -36,10 +36,8 @@ class Database extends _$Database { /// This will return a list of [pageSize] persons. You can get another page /// using the [page] parameter. If a non empty [search] string is provided, /// the persons will get filtered based on that string. - Future> getPersons([int page = 0, String search]) async { - assert(page != null); - - final offset = page * pageSize; + Future> getPersons([int page, String search]) async { + final offset = page != null ? page * pageSize : 0; List result; if (search == null || search.isEmpty) { @@ -66,10 +64,8 @@ class Database extends _$Database { /// This will return a list of [pageSize] instruments. You can get another /// page using the [page] parameter. If a non empty [search] string is /// provided, the instruments will get filtered based on that string. - Future> getInstruments([int page = 0, String search]) async { - assert(page != null); - - final offset = page * pageSize; + Future> getInstruments([int page, String search]) async { + final offset = page != null ? page * pageSize : 0; List result; if (search == null || search.isEmpty) { @@ -129,10 +125,8 @@ class Database extends _$Database { /// using the [page] parameter. If a non empty [search] string is provided, /// the works will be filtered using that string. Future> getWorks(int personId, - [int page = 0, String search]) async { - assert(page != null); - - final offset = page * pageSize; + [int page, String search]) async { + final offset = page != null ? page * pageSize : 0; List works; if (search == null || search.isEmpty) { @@ -205,10 +199,8 @@ class Database extends _$Database { /// This will return a list of [pageSize] ensembles. You can get another page /// using the [page] parameter. If a non empty [search] string is provided, /// the ensembles will get filtered based on that string. - Future> getEnsembles([int page = 0, String search]) async { - assert(page != null); - - final offset = page * pageSize; + Future> getEnsembles([int page, String search]) async { + final offset = page != null ? page * pageSize : 0; List result; if (search == null || search.isEmpty) { @@ -308,10 +300,8 @@ class Database extends _$Database { /// /// This will return a list of [pageSize] recordings. You can get the other /// pages using the [page] parameter. - Future> getRecordings(int workId, [int page = 0]) async { - assert(page != null); - - final offset = page * pageSize; + Future> getRecordings(int workId, [int page]) async { + final offset = page != null ? page * pageSize : 0; final recordings = await recordingsByWork(workId, pageSize, offset).get(); final List result = [];