Merge pull request #170 from OpenLMIS-Angola/OAM-291-cache-ward-valid…

…-sources OAM-291: added caching vs for wards
OpenLMIS-Angola · Aug 13, 2024 · c80df64 · c80df64
2 parents fb74269 + 06bca54
commit c80df64
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/stock-adjustment-creation/adjustment-creation.controller.spec.js b/src/stock-adjustment-creation/adjustment-creation.controller.spec.js
@@ -420,14 +420,11 @@ describe('StockAdjustmentCreationController', function() {
         });
 
         it('should redirect with proper state params after success', function() {
-            console.log('test start');
             spyOn(stockAdjustmentCreationService, 'submitAdjustments');
             stockAdjustmentCreationService.submitAdjustments.andReturn(q.resolve());
             vm.submit();
             rootScope.$apply();
 
-            console.log('test end - before expect');
-
             expect(alertService.error).not.toHaveBeenCalled();
         });
 

diff --git a/src/stock-valid-sources/source-cache.run.js b/src/stock-valid-sources/source-cache.run.js
@@ -21,9 +21,11 @@
         .module('stock-valid-sources')
         .run(routes);
 
-    routes.$inject = ['loginService', 'sourceDestinationService', 'facilityFactory', '$q'];
+    routes.$inject = ['loginService', 'sourceDestinationService', 'facilityFactory', '$q', 'wardService',
+        'WARDS_CONSTANTS'];
 
-    function routes(loginService, sourceDestinationService, facilityFactory, $q) {
+    function routes(loginService, sourceDestinationService, facilityFactory, $q, wardService,
+                    WARDS_CONSTANTS) {
 
         loginService.registerPostLoginAction(function() {
             sourceDestinationService.clearSourcesCache();
@@ -42,12 +44,32 @@
                         homeFacility.id ? homeFacility.id : homeFacility
                     );
 
-                    return sources;
+                    return getHomeFacilityWards(homeFacility)
+                        .then(function(response) {
+                            var wards = response.content;
+                            if (wards.length) {
+                                var wardsPromise = sourceDestinationService
+                                    .getSourceAssignments(supportedProgramsIds, wards[0].id);
+                                return $q.all([sources, wardsPromise]);
+                            }
+                            return sources;
+                        })
+                        .catch(function() {
+                            return sources;
+                        });
                 })
                 .catch(function() {
                     return $q.resolve();
                 });
         });
+
+        function getHomeFacilityWards(homeFacility) {
+            return wardService.getWardsByFacility({
+                zoneId: homeFacility.geographicZone.id,
+                sort: 'code,asc',
+                type: WARDS_CONSTANTS.WARD_TYPE_CODE
+            });
+        }
     }
 
 })();