fix: use openapi_patching from v1

open-api/bin/generate-open-api.sh

@@ -22,18 +22,19 @@ function dart {
   rm ../mobile/openapi/analysis_options.yaml
 }
 
-function dartDio {
+function dart2 {
   rm -rf ../mobile-v2/openapi
-  cd ./templates/mobile-v2/serialization/native
+  cd ./templates/mobile/serialization/native
   wget -O native_class.mustache https://raw.githubusercontent.com/OpenAPITools/openapi-generator/$OPENAPI_GENERATOR_VERSION/modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache
   patch --no-backup-if-mismatch -u native_class.mustache < native_class.mustache.patch
   cd ../../../../
 
-  npx --yes @openapitools/openapi-generator-cli generate -g dart -i ./immich-openapi-specs.json -o ../mobile-v2/openapi -t ./templates/mobile-v2
+  npx --yes @openapitools/openapi-generator-cli generate -g dart -i ./immich-openapi-specs.json -o ../mobile-v2/openapi -t ./templates/mobile
 
   # Post generate patches
-  patch --no-backup-if-mismatch -u ../mobile-v2/openapi/lib/api_client.dart <./patch/api_client.dart.patch
-  patch --no-backup-if-mismatch -u ../mobile-v2/openapi/lib/api.dart <./patch/api-v2.dart.patch
+  patch --no-backup-if-mismatch -u ../mobile-v2/openapi/lib/api_client.dart < ./patch/api_client.dart.patch
+  patch --no-backup-if-mismatch -u ../mobile-v2/openapi/lib/api.dart < ./patch/api.dart.patch
+  patch --no-backup-if-mismatch -u ../mobile-v2/openapi/pubspec.yaml < ./patch/pubspec_immich_mobile.yaml.patch
   # Don't include analysis_options.yaml for the generated openapi files
   # so that language servers can properly exclude the mobile/openapi directory
   rm ../mobile-v2/openapi/analysis_options.yaml
@@ -49,8 +50,8 @@ npm run sync:open-api --prefix=../server
 
 if [[ $1 == 'dart' ]]; then
   dart
-elif [[ $1 == 'dart-dio' ]]; then
-  dartDio
+elif [[ $1 == 'dart-2' ]]; then
+  dart2
 elif [[ $1 == 'typescript' ]]; then
   typescript
 else

open-api/templates/mobile-v2/serialization/native/native_class.mustache.patch

@@ -1,56 +0,0 @@
---- native_class.mustache	2023-08-31 23:09:59.584269162 +0200
-+++ native_class1.mustache	2023-08-31 22:59:53.633083270 +0200
-@@ -91,14 +91,14 @@
-     {{/isDateTime}}
-     {{#isNullable}}
-     } else {
--      json[r'{{{baseName}}}'] = null;
-+    //  json[r'{{{baseName}}}'] = null;
-     }
-     {{/isNullable}}
-     {{^isNullable}}
-       {{^required}}
-         {{^defaultValue}}
-     } else {
--      json[r'{{{baseName}}}'] = null;
-+    //  json[r'{{{baseName}}}'] = null;
-     }
-         {{/defaultValue}}
-       {{/required}}
-@@ -114,17 +114,6 @@
-     if (value is Map) {
-       final json = value.cast<String, dynamic>();
- 
--      // Ensure that the map contains the required keys.
--      // Note 1: the values aren't checked for validity beyond being non-null.
--      // Note 2: this code is stripped in release mode!
--      assert(() {
--        requiredKeys.forEach((key) {
--          assert(json.containsKey(key), 'Required key "{{{classname}}}[$key]" is missing from JSON.');
--          assert(json[key] != null, 'Required key "{{{classname}}}[$key]" has a null value in JSON.');
--        });
--        return true;
--      }());
--
-       return {{{classname}}}(
-   {{#vars}}
-     {{#isDateTime}}
-@@ -215,6 +204,10 @@
-             ? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
-             : {{{datatypeWithEnum}}}.parse(json[r'{{{baseName}}}'].toString()),
-               {{/isNumber}}
-+              {{#isDouble}}
-+        {{{name}}}: (mapValueOfType<num>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}).toDouble(),
-+              {{/isDouble}}
-+              {{^isDouble}}
-               {{^isNumber}}
-                 {{^isEnum}}
-         {{{name}}}: mapValueOfType<{{{datatypeWithEnum}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-@@ -223,6 +216,7 @@
-         {{{name}}}: {{{enumName}}}.fromJson(json[r'{{{baseName}}}']){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-                 {{/isEnum}}
-               {{/isNumber}}
-+              {{/isDouble}}
-             {{/isMap}}
-           {{/isArray}}
-         {{/complexType}}