Fixes #281

Author: frank06

lib/src/adapter/remote_adapter.dart

@@ -8,7 +8,7 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
   ///
   /// For specific paths to this type [T], see [urlForFindAll], [urlForFindOne], etc
   @protected
-  String get baseUrl => 'https://override-base-url-in-adapter/';
+  String get baseUrl => 'https://override-base-url-in-adapter';
 
   /// Returns whether calling [findAll] should trigger a remote call.
   ///

lib/src/utils/extensions.dart

@@ -104,7 +104,11 @@ extension MapUtilsX<K, V> on Map<K, V> {
 
 extension UriUtilsX on Uri {
   Uri operator /(String path) {
-    return replace(path: path_helper.posix.normalize('/${this.path}/$path'));
+    final argUri = Uri.parse(path);
+    return replace(
+          path: path_helper.posix.normalize('/${this.path}/${argUri.path}'),
+        ) &
+        argUri.queryParameters;
   }
 
   Uri operator &(Map<String, dynamic> params) => params.isNotEmpty

test/_support/person.dart

@@ -106,12 +106,17 @@ mixin PersonLoginAdapter on Adapter<Person> {
   Future<String?> url(Map<String, dynamic> params,
       {bool useDefaultParams = false}) async {
     return await sendRequest(
-      baseUrl.asUri / 'url' & params,
+      baseUrl.asUri / urlForFindOne('url', params) & params,
       onSuccess: (data, _) =>
           (data.body as Map<String, dynamic>?)?['url'].toString(),
       omitDefaultParams: !useDefaultParams,
     );
   }
+
+  @override
+  String urlForFindOne(id, Map<String, dynamic> params) {
+    return 'endpoint?url=$id';
+  }
 }
 
 mixin GenericDoesNothingAdapter<T extends DataModel<T>> on Adapter<T> {

test/repository/remote_adapter_test.dart

@@ -96,10 +96,12 @@ void main() async {
     container.read(responseProvider.notifier).state = TestResponse(
       (req) async => '{"url" : "${req.url.toString()}"}',
     );
+
+    // also tests overridden `urlForFindOne` in Person
     expect(await adapter.url({'a': 1}),
-        'https://override-base-url-in-adapter/url?a=1');
+        'https://override-base-url-in-adapter/endpoint?url=url&a=1');
     expect(await adapter.url({'b': 2}, useDefaultParams: true),
-        'https://override-base-url-in-adapter/url?b=2&default=true');
+        'https://override-base-url-in-adapter/endpoint?url=url&b=2&default=true');
   });
 
   test('can override type', () {