fix(ResultsMapSerializer): Add meta back to serializer output

coldbox-modules · Jan 4, 2019 · d9594d0 · d9594d0
1 parent b631189
commit d9594d0
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 3 deletions.
diff --git a/models/serializers/ResultsMapSerializer.cfc b/models/serializers/ResultsMapSerializer.cfc
@@ -90,8 +90,9 @@ component singleton {
     *
     * @response The metadata nested under a "meta" key.
     */
-    function meta( resource, scope ) {
-        return { "#variables.metaKey#" = resource.getMeta() };
+    function meta( resource, scope, data ) {
+        structAppend( data, { "#variables.metaKey#" = resource.getMeta() }, true );
+        return data;
     }
 
 }
diff --git a/tests/specs/integration/FractalBuilderTest.cfc b/tests/specs/integration/FractalBuilderTest.cfc
@@ -314,6 +314,57 @@ component extends="testbox.system.BaseSpec" {
                                 }
                             } );
                         } );
+
+                        it( "returns pagination data in a meta field for the results map serializer", function() {
+                            var books = [
+                                new tests.resources.Book( {
+                                    id = 1,
+                                    title = "To Kill a Mockingbird",
+                                    year = "1960"
+                                } ),
+                                new tests.resources.Book( {
+                                    id = 2,
+                                    title = "A Tale of Two Cities",
+                                    year = "1859"
+                                } )
+                            ];
+
+                            var result = fractal.builder()
+                                .collection( books )
+                                .withSerializer( new cffractal.models.serializers.ResultsMapSerializer() )
+                                .withTransformer( new tests.resources.BookTransformer().setManager( fractal ) )
+                                .withPagination( {
+                                    "maxrows": 50,
+                                    "page": 2,
+                                    "pages": 3,
+                                    "totalRecords": 112
+                                } )
+                                .convert();
+
+                            expect( result ).toBe( {
+                                "results": [ 1, 2 ],
+                                "resultsMap": {
+                                    "1": {
+                                        "id": 1,
+                                        "title": "To Kill a Mockingbird",
+                                        "year": 1960
+                                    },
+                                    "2": {
+                                        "id": 2,
+                                        "title": "A Tale of Two Cities",
+                                        "year": 1859
+                                    }
+                                },
+                                "meta": {
+                                    "pagination": {
+                                        "maxrows": 50,
+                                        "page": 2,
+                                        "pages": 3,
+                                        "totalRecords": 112
+                                    }
+                                }
+                            } );
+                        } );
                     } );
 
                     describe( "postTransformationCallbacks", function() {

diff --git a/tests/specs/unit/serializers/ResultsMapSerializerTest.cfc b/tests/specs/unit/serializers/ResultsMapSerializerTest.cfc
@@ -34,7 +34,7 @@ component extends="testbox.system.BaseSpec" {
                 var mockItem = getMockBox().createMock( "cffractal.models.resources.Item" );
                 mockItem.$( "getMeta", pagingData, false );
                 var serializer = new cffractal.models.serializers.ResultsMapSerializer();
-                expect( serializer.meta( mockItem, mockScope ) )
+                expect( serializer.meta( mockItem, mockScope, {} ) )
                     .toBe( { "meta" = pagingData } );
             } );
         } );