From d5c1b3b3934b349d09e10c7d653e10df21b9df93 Mon Sep 17 00:00:00 2001
From: ocket8888 <ocket8888@gmail.com>
Date: Tue, 28 May 2019 13:13:36 -0600
Subject: [PATCH 1/2] Removed restangular from ./StatusService.js

---
 .../app/src/common/api/StatusService.js       | 68 +++++++++++--------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/traffic_portal/app/src/common/api/StatusService.js b/traffic_portal/app/src/common/api/StatusService.js
index f67e851bf8..3871cbab6a 100644
--- a/traffic_portal/app/src/common/api/StatusService.js
+++ b/traffic_portal/app/src/common/api/StatusService.js
@@ -17,54 +17,68 @@
  * under the License.
  */
 
-var StatusService = function(Restangular, locationUtils, messageModel) {
+var StatusService = function($http, ENV, locationUtils, messageModel) {
 
     this.getStatuses = function(queryParams) {
-        return Restangular.all('statuses').getList(queryParams);
+        return $http.get(ENV.api['root'] + 'statuses', {params: queryParams}).then(
+            function (result) {
+                return result.data.response;
+            },
+            function (err) {
+                console.error(err);
+            }
+        )
     };
 
     this.getStatus = function(id) {
-        return Restangular.one("statuses", id).get();
+        return $http.get(ENV.api['root'] + 'statuses', {params: {id: id}}).then(
+            function (result) {
+                return result.data.response[0];
+            },
+            function (err) {
+                console.error(err);
+            }
+        )
     };
 
     this.createStatus = function(status) {
-        return Restangular.service('statuses').post(status)
-            .then(
-                function() {
-                    messageModel.setMessages([ { level: 'success', text: 'Status created' } ], true);
-                    locationUtils.navigateToPath('/statuses');
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
-                }
-            );
+        return $http.post(ENV.api['root'] + 'statuses', status).then(
+            function(result) {
+                messageModel.setMessages([ { level: 'success', text: 'Status created' } ], true);
+                locationUtils.navigateToPath('/statuses');
+                return result;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+            }
+        );
     };
 
     this.updateStatus = function(status) {
-        return status.put()
-            .then(
-            function() {
+        return $http.put(ENV.api['root'] + 'statuses/' + status.id, status).then(
+            function(result) {
                 messageModel.setMessages([ { level: 'success', text: 'Status updated' } ], false);
+                return result;
             },
-            function(fault) {
-                messageModel.setMessages(fault.data.alerts, false);
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
             }
         );
     };
 
     this.deleteStatus = function(id) {
-        return Restangular.one("statuses", id).remove()
-            .then(
-                function() {
-                    messageModel.setMessages([ { level: 'success', text: 'Status deleted' } ], true);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, true);
-                }
+        return $http.get(ENZ.api['root'] + "statuses/" + id).then(
+            function(result) {
+                messageModel.setMessages([ { level: 'success', text: 'Status deleted' } ], true);
+                return result;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, true);
+            }
         );
     };
 
 };
 
-StatusService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
+StatusService.$inject = ['$http', 'ENV', 'locationUtils', 'messageModel'];
 module.exports = StatusService;

From d602d089e2fc3e4a5a2b518d3f3035fd968beb81 Mon Sep 17 00:00:00 2001
From: ocket8888 <ocket8888@gmail.com>
Date: Wed, 29 May 2019 08:19:47 -0600
Subject: [PATCH 2/2] fixed typo, missing 'throw's

---
 traffic_portal/app/src/common/api/StatusService.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/traffic_portal/app/src/common/api/StatusService.js b/traffic_portal/app/src/common/api/StatusService.js
index 3871cbab6a..33753b3f84 100644
--- a/traffic_portal/app/src/common/api/StatusService.js
+++ b/traffic_portal/app/src/common/api/StatusService.js
@@ -25,7 +25,7 @@ var StatusService = function($http, ENV, locationUtils, messageModel) {
                 return result.data.response;
             },
             function (err) {
-                console.error(err);
+                throw err;
             }
         )
     };
@@ -36,7 +36,7 @@ var StatusService = function($http, ENV, locationUtils, messageModel) {
                 return result.data.response[0];
             },
             function (err) {
-                console.error(err);
+                throw err;
             }
         )
     };
@@ -50,6 +50,7 @@ var StatusService = function($http, ENV, locationUtils, messageModel) {
             },
             function(err) {
                 messageModel.setMessages(err.data.alerts, false);
+                throw err;
             }
         );
     };
@@ -62,18 +63,20 @@ var StatusService = function($http, ENV, locationUtils, messageModel) {
             },
             function(err) {
                 messageModel.setMessages(err.data.alerts, false);
+                throw err;
             }
         );
     };
 
     this.deleteStatus = function(id) {
-        return $http.get(ENZ.api['root'] + "statuses/" + id).then(
+        return $http.delete(ENV.api['root'] + "statuses/" + id).then(
             function(result) {
                 messageModel.setMessages([ { level: 'success', text: 'Status deleted' } ], true);
                 return result;
             },
             function(err) {
                 messageModel.setMessages(err.data.alerts, true);
+                throw err;
             }
         );
     };