[VID-12] Delivery of remaining features for v1.1

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / services / aaiService.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
index 8132e3a..ee99547 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
@@ -82,8 +82,8 @@ var AaiService = function($http, $log, PropertyService, UtilityService, COMPONEN
                                        angular.forEach(subscriber[FIELD.ID.SERVICE_SUBSCRIPTIONS][FIELD.ID.SERVICE_SUBSCRIPTION], function(serviceSubscription, key) {\r
                                                var serviceInstanceId = [];\r
                                                var serviceType = "";\r
-                                               if (serviceSubscription[FIELD.ID.SERVICE_TYPE] != null) {\r
-                                                       serviceType = serviceSubscription[FIELD.ID.SERVICE_TYPE];\r
+                                               if (serviceSubscription[FIELD.ID.SERVICETYPE] != null) {\r
+                                                       serviceType = serviceSubscription[FIELD.ID.SERVICETYPE];\r
                                                } else {\r
                                                        serviceType = FIELD.PROMPT.NO_SERVICE_SUB;\r
                                                }\r
@@ -115,7 +115,8 @@ var AaiService = function($http, $log, PropertyService, UtilityService, COMPONEN
                                                                serviceType             : serviceType,\r
                                                                serviceInstanceId       : subVal.serviceInstanceId,\r
                                                                aaiModelInvariantId             : subVal.aaiModelInvariantId,\r
-                                                               aaiModelVersionId : subVal.aaiModelVersionId,\r
+                                                               aaiModelVersionId\r
+                                                               : subVal.aaiModelVersionId,\r
                                                                serviceInstanceName     : subVal.serviceInstanceName\r
                                                        });\r
                                                });\r
@@ -198,7 +199,7 @@ var AaiService = function($http, $log, PropertyService, UtilityService, COMPONEN
                                                var serviceSubscriptions = response.data[FIELD.ID.SERVICE_SUBSCRIPTIONS][FIELD.ID.SERVICE_SUBSCRIPTION];\r
                                                \r
                                                for (var i = 0; i < serviceSubscriptions.length; i++) {\r
-                                                       serviceTypes.push(serviceSubscriptions[i][FIELD.ID.SERVICE_TYPE]);\r
+                                                       serviceTypes.push(serviceSubscriptions[i][FIELD.ID.SERVICETYPE]);\r
                                                }\r
                                                successCallbackFunction(serviceTypes);\r
                                        } else {\r
@@ -331,7 +332,25 @@ var AaiService = function($http, $log, PropertyService, UtilityService, COMPONEN
                        }\r
                    })["catch"]\r
                    (UtilityService.runHttpErrorHandler);\r
-}\r
+},\r
+getServiceModelsByServiceType : function(namedQueryId,globalCustomerId,serviceType,successCallbackFunction) {\r
+               $log\r
+               .debug("AaiService:getServiceModelsByServiceType");\r
+               var url =   COMPONENT.AAI_GET_SERVICES_BY_TYPE+COMPONENT.FORWARD_SLASH+namedQueryId+COMPONENT.FORWARD_SLASH+globalCustomerId+COMPONENT.FORWARD_SLASH +serviceType+COMPONENT.ASSIGN + Math.random();\r
+               \r
+               $http.get(url,\r
+                               {\r
+                       timeout : PropertyService\r
+                       .getServerResponseTimeoutMsec()\r
+                               }).then(function(response) {\r
+                                       if (response.data) {\r
+                                               successCallbackFunction(response);\r
+                                       } else {\r
+                                               successCallbackFunction([]);\r
+                                       }\r
+                               })["catch"]\r
+               (UtilityService.runHttpErrorHandler);\r
+       }\r
     }\r
 }\r
 \r