#8 - Fix the issue that the returned response of the fetch function is not processed again

Author: guylabs

dist/angular-spring-data-rest.js

@@ -103,13 +103,15 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
                     promisesArray.push($injector.get("$http").get(url)
                         .then(function (responseData) {
 
-                            // wrap the response again with the adapter if the recursive flag is set
+                            // wrap the response again with the adapter and return the promise
                             if (recursive) {
-                                promisesArray.push(processData(responseData.data, fetchLinkNames, true).then(function (processedData) {
+                                return processData(responseData.data, fetchLinkNames, true).then(function (processedData) {
                                     data[key] = processedData;
-                                }));
+                                });
                             } else {
-                                data[key] = responseData.data;
+                                return processData(responseData.data).then(function (processedData) {
+                                    data[key] = processedData;
+                                });
                             }
                         }, function (error) {
                             if (error.status != 404) {

dist/angular-spring-data-rest.min.js

@@ -79,9 +79,11 @@
                     if (void 0 == e.fetchFunction) {
                         var h = [];
                         return h.push(a.get("$http").get(b).then(function (a) {
-                            g ? h.push(i(a.data, f, !0).then(function (a) {
+                            return g ? i(a.data, f, !0).then(function (a) {
                                 d[c] = a
-                            })) : d[c] = a.data
+                            }) : i(a.data).then(function (a) {
+                                d[c] = a
+                            })
                         }, function (b) {
                             return 404 != b.status ? a.get("$q").reject(b) : void 0
                         })), a.get("$q").all(h)

src/angular-spring-data-rest-provider.js

@@ -91,13 +91,15 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
                     promisesArray.push($injector.get("$http").get(url)
                         .then(function (responseData) {
 
-                            // wrap the response again with the adapter if the recursive flag is set
+                            // wrap the response again with the adapter and return the promise
                             if (recursive) {
-                                promisesArray.push(processData(responseData.data, fetchLinkNames, true).then(function (processedData) {
+                                return processData(responseData.data, fetchLinkNames, true).then(function (processedData) {
                                     data[key] = processedData;
-                                }));
+                                });
                             } else {
-                                data[key] = responseData.data;
+                                return processData(responseData.data).then(function (processedData) {
+                                    data[key] = processedData;
+                                });
                             }
                         }, function (error) {
                             if (error.status != 404) {

test/angular-spring-data-rest-provider.fetch.spec.js

@@ -207,7 +207,7 @@ describe("the fetch function", function () {
             respond(300, "error");
         this.httpBackend.expectGET(testCategoryHref);
 
-        SpringDataRestAdapter.process(this.rawResponse, fetchLinkName).then(function (responseData) {
+        SpringDataRestAdapter.process(this.rawResponse, fetchLinkName).then(function () {
             throw new Error("Should not be called when the promise is rejected")
         }, function (error) {
             expect(error.status).toBe(300);
@@ -243,5 +243,38 @@ describe("the fetch function", function () {
         this.httpBackend.verifyNoOutstandingExpectation();
     });
 
+
+    it("must process the fetched responses as all the other responses", function () {
+
+        var embeddedNewKey = this.config.embeddedNewKey;
+        var fetchLinkName = 'parentCategory';
+
+        // the correct link href url
+        var firstParentCategoryHref = 'http://localhost:8080/categories/f974f5ef-a951-43b4-9027-4d2163216e54/parentCategory';
+        var secondParentCategoryHref = 'http://localhost:8080/categories/b5ba38d5-98d3-4579-8709-a28549406697/parentCategory';
+
+        // check if the underlying fetch function is called with the correct href url
+        var firstExpectedResult = mockData();
+        var secondExpectedResult = mockData();
+
+        this.httpBackend.whenGET(firstParentCategoryHref).
+            respond(200, firstExpectedResult);
+        this.httpBackend.expectGET(firstParentCategoryHref);
+
+        this.httpBackend.whenGET(secondParentCategoryHref).
+            respond(200, secondExpectedResult);
+        this.httpBackend.expectGET(secondParentCategoryHref);
+
+        SpringDataRestAdapter.process(this.rawResponse, fetchLinkName).then(function (processedData) {
+            // expect the fetched objects
+            expect(processedData[embeddedNewKey][0][fetchLinkName][embeddedNewKey][0]['name']).toEqual('Test category 1');
+            expect(processedData[embeddedNewKey][1][fetchLinkName][embeddedNewKey][1]['name']).toEqual('Test category 2');
+        });
+
+        this.httpBackend.flush();
+        this.httpBackend.verifyNoOutstandingRequest();
+        this.httpBackend.verifyNoOutstandingExpectation();
+    });
+
 });