fix: Fixed a bug that Timestamp was not converted.

mathrunet · Jan 20, 2024 · abe0ff8 · abe0ff8
1 parent 30c3db3
commit abe0ff8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/packages/katana_model_firestore/lib/converter/firestore_model_timestamp_converter.dart b/packages/katana_model_firestore/lib/converter/firestore_model_timestamp_converter.dart
@@ -83,14 +83,9 @@ class FirestoreModelTimestampConverter
         };
       }
     } else if (value is Timestamp) {
-      final targetKey = "#$key";
-      final targetMap = original.getAsMap(targetKey);
-      final type = targetMap.get(_kTypeKey, "");
-      if (type == this.type) {
-        return {
-          key: ModelTimestamp(value.toDate()).toJson(),
-        };
-      }
+      return {
+        key: ModelTimestamp(value.toDate()).toJson(),
+      };
     }
     return null;
   }

diff --git a/packages/katana_model_firestore/lib/src/firestore_model_field_value_converter.dart b/packages/katana_model_firestore/lib/src/firestore_model_field_value_converter.dart
@@ -19,8 +19,9 @@ abstract class FirestoreModelFieldValueConverter {
   static const Set<FirestoreModelFieldValueConverter> defaultConverters = {
     FirestoreModelCommandBaseConverter(),
     FirestoreModelCounterConverter(),
-    FirestoreModelTimestampConverter(),
     FirestoreModelDateConverter(),
+    // Timestampを必ず変換するためTimestamp変換系はこれを一番最後にすること
+    FirestoreModelTimestampConverter(),
     FirestoreModelLocaleConverter(),
     FirestoreModelLocalizedValueConverter(),
     FirestoreModelUriConverter(),

diff --git a/packages/katana_model_firestore/pubspec.lock b/packages/katana_model_firestore/pubspec.lock
@@ -292,7 +292,7 @@ packages:
       path: "../katana_model"
       relative: true
     source: path
-    version: "2.18.2"
+    version: "2.18.5"
   lints:
     dependency: transitive
     description: