fix(cloud_firestore_odm): add support for searching Enums

.github/workflows/all_plugins.yaml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
@@ -111,7 +111,7 @@ jobs:
       - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
@@ -128,7 +128,7 @@ jobs:
       - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:

.github/workflows/e2e_tests.yaml

@@ -64,7 +64,7 @@ jobs:
           restore-keys: firebase-emulators-v2
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
@@ -134,7 +134,7 @@ jobs:
           restore-keys: firebase-emulators-v1
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
@@ -212,7 +212,7 @@ jobs:
           restore-keys: firebase-emulators-v1
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
@@ -263,7 +263,7 @@ jobs:
           java-version: '11'
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:

.github/workflows/firebase_firestore_odm.yaml

@@ -31,7 +31,7 @@ jobs:
           fetch-depth: 0
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
@@ -64,7 +64,7 @@ jobs:
           java-version: '11'
       - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          channel: 'stable'
+          channel: 'master'
           cache: true
       - uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:

packages/cloud_firestore_odm/cloud_firestore_odm/example/build.yaml

@@ -15,6 +15,7 @@ targets:
             - lib/**
         options:
           create_field_map: true
+          create_per_field_to_json: true
       source_gen|combining_builder:
         options:
           ignore_for_file:

packages/cloud_firestore_odm/cloud_firestore_odm/example/integration_test/collection_reference_test.dart

@@ -106,6 +106,112 @@ void main() {
           skip: true,
         );
 
+        test(
+          'supports get with enum',
+          () async {
+            final collection = await initializeTest(MovieCollectionReference());
+
+            await collection.doc('123').set(
+                  createMovie(
+                    title: 'title',
+                    certification: CertificationType.pg,
+                  ),
+                );
+
+            await collection.doc('123').get();
+
+            expect(
+              await collection
+                  .whereCertification(isEqualTo: CertificationType.pg)
+                  .get(),
+              isA<MovieQuerySnapshot>().having((e) => e.docs, 'doc', [
+                isA<MovieQueryDocumentSnapshot>().having(
+                  (e) => e.data.certification,
+                  'data.certification',
+                  CertificationType.pg,
+                )
+              ]),
+            );
+          },
+        );
+
+        test(
+          'supports get using list of enum',
+          () async {
+            final collection = await initializeTest(MovieCollectionReference());
+
+            await collection.doc('123').set(
+                  createMovie(
+                    title: 'title',
+                    language: [LanguageType.english, LanguageType.korean],
+                    cast: [
+                      {CastType.coStar: 'William Shatner'},
+                      {CastType.cameo: 'Harlan Ellison'}
+                    ],
+                  ),
+                );
+            await collection.doc('123').get();
+
+            expect(
+              await collection
+                  .whereLanguage(
+                    arrayContains: LanguageType.english,
+                    // arrayContainsAny: [LanguageType.English],
+                    // isEqualTo: [LanguageType.English, LanguageType.Korean]
+                  )
+                  .get(),
+              isA<MovieQuerySnapshot>().having((e) => e.docs, 'doc', [
+                isA<MovieQueryDocumentSnapshot>().having(
+                  (e) => e.data.language,
+                  'data.language',
+                  [LanguageType.english, LanguageType.korean],
+                )
+              ]),
+            );
+          },
+        );
+
+        test(
+          'supports get using enum (list of) map',
+          () async {
+            final collection = await initializeTest(MovieCollectionReference());
+
+            await collection.doc('123').set(
+                  createMovie(
+                    title: 'title',
+                    language: [LanguageType.english, LanguageType.korean],
+                    cast: [
+                      {
+                        CastType.coStar: 'William Shatner',
+                      },
+                      {CastType.cameo: 'Harlan Ellison'}
+                    ],
+                    majorCast: {
+                      CastType.coStar: 'William Shatner',
+                      CastType.cameo: 'Harlan Ellison'
+                    },
+                  ),
+                );
+            await collection.doc('123').get();
+
+            expect(
+              await collection.whereCast(
+                // whereMajorCast
+                arrayContains: {
+                  CastType.coStar: 'William Shatner',
+                },
+              ).get(),
+              isA<MovieQuerySnapshot>().having((e) => e.docs, 'doc', [
+                isA<MovieQueryDocumentSnapshot>()
+                    .having((e) => e.data.cast, 'data.cast', [
+                  {CastType.coStar: 'William Shatner'},
+                  {CastType.cameo: 'Harlan Ellison'},
+                ])
+              ]),
+            );
+          },
+        );
+
         test('returns a future that fails if decoding throws', () async {
           final collection = await initializeTest(MovieCollectionReference());
 
@@ -767,6 +873,15 @@ void main() {
             title: 'title',
             year: 1999,
             id: '_',
+            language: [LanguageType.english],
+            certification: CertificationType.pg,
+            cast: [
+              {CastType.cameo: 'Wil Wheaton', CastType.recurring: 'Jim Parsons'}
+            ],
+            majorCast: {
+              CastType.cameo: 'Wil Wheaton',
+              CastType.recurring: 'Jim Parsons'
+            },
           ),
         );
         final snapshot = StreamQueue(doc.snapshots());
@@ -791,6 +906,18 @@ void main() {
             title: 'title2',
             year: 14242,
             id: '_',
+            language: [LanguageType.english],
+            certification: CertificationType.R,
+            cast: [
+              {
+                CastType.star: 'Michael Jackson',
+                CastType.guestStar: 'Vincent Price'
+              }
+            ],
+            majorCast: {
+              CastType.star: 'Michael Jackson',
+              CastType.guestStar: 'Vincent Price'
+            },
           ),
         );
 
@@ -825,6 +952,18 @@ void main() {
             title: 'title',
             year: 1999,
             id: '_',
+            language: [LanguageType.english],
+            certification: CertificationType.pg13,
+            cast: [
+              {
+                CastType.coStar: 'William Shatner',
+                CastType.cameo: 'Harlan Ellison'
+              }
+            ],
+            majorCast: {
+              CastType.coStar: 'William Shatner',
+              CastType.cameo: 'Harlan Ellison'
+            },
           ),
         );
 
@@ -848,6 +987,18 @@ void main() {
             title: 'title2',
             year: 14242,
             id: '_',
+            language: [LanguageType.spanish],
+            certification: CertificationType.tvma,
+            cast: [
+              {
+                CastType.coStar: 'Sandra Bullock',
+                CastType.cameo: 'George Clooney'
+              }
+            ],
+            majorCast: {
+              CastType.coStar: 'Sandra Bullock',
+              CastType.cameo: 'George Clooney'
+            },
           ),
         );
 

packages/cloud_firestore_odm/cloud_firestore_odm/example/integration_test/common.dart

@@ -31,6 +31,15 @@ Movie createMovie({
   String title = '',
   int year = 1990,
   String id = '',
+  List<LanguageType> language = const [],
+  CertificationType certification = CertificationType.none,
+  List<Map<CastType, String>> cast = const [
+    {CastType.cameo: 'Wil Wheaton', CastType.recurring: 'Jim Parsons'}
+  ],
+  Map<CastType, String> majorCast = const {
+    CastType.cameo: 'Wil Wheaton',
+    CastType.recurring: 'Jim Parsons'
+  },
 }) {
   return Movie(
     genre: genre,
@@ -41,6 +50,10 @@ Movie createMovie({
     title: title,
     year: year,
     id: id,
+    language: language,
+    certification: certification,
+    cast: cast,
+    majorCast: majorCast,
   );
 }