Fixing detail submission for hostiles. Cleaning up.

Author: rcreasey

app/index.html

@@ -212,7 +212,6 @@ <h3>{{hostiles}} hostile{{#if hostiles}}s{{/if}} in {{name}}</h3>
     <script type="text/x-handlebars-template" id="hostileTemplate">
       <table class="hostile" id="hostile-{{id}}">
         <tr>
-          <td class="key">{{{key}}}</td>
           <td class="ship-icon">{{{shipIcon}}}</td>
           <td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{id}});">{{name}}</a></td>
           <td class="alliance">

app/styles/main.css

@@ -477,9 +477,9 @@ rect.status-hostile { stroke: #d9534f; fill: #74312f; }
 .event.reportShared {	background-color:#332; border-bottom: 0.2rem solid #110; border-top: 0.16rem solid #553; }
 .event.error { background-color:#411; border-bottom: 0.2rem solid #200; border-top: 0.16rem solid #633; }
 .event.reportHostile { background-color:#411; border-bottom: 0.2rem solid #200; border-top: 0.16rem solid #633; }
+.event.updateHostile { background-color:#885000; border-bottom: 0.2rem solid #291E0E; border-top: 0.16rem solid #BD8942; }
 .event.reportClear { background-color:#366436; border-bottom: 0.2rem solid #222; border-top: 0.16rem solid #5cb85c; }
 
-
   /*/
  / /  PANEL
  */

lib/actions/postDetailsAction.js

@@ -1,4 +1,4 @@
-module.exports = function (hostileService, eventService, memberService, headerParser, errorResponse, successResponse) {
+module.exports = function (hostileService, eventService, headerParser, errorResponse, successResponse, async) {
 
   var pub = {};
 
@@ -16,30 +16,35 @@ module.exports = function (hostileService, eventService, memberService, headerPa
   };
 
   pub.run = function (req, res) {
-    var detailData = req.body.scanData;
+    var pilot = req.body.scanData;
 
-    if (!checkDetailsDataIntegrity(detailData)) {
+    if (!checkDetailsDataIntegrity(pilot)) {
       return errorResponse.respond(res, 'status', 'Invalid detail data.');
     }
 
-    hostileService.getById(detailData.id, function(error, hostile) {
-      if (error) return errorResponse.respond(res, 'status', 'Error fetching hostile');
-
-      var headerData = headerParser.parse(req);
-      hostile.shipType = detailData.shipType;
-      headerData.systemId = hostile.systemId;
-      headerData.systemName = hostile.systemName;
-
-      hostileService.updateAndGet(headerData, hostile, req.session.armadaKey, function (error, status) {
-        if (error) return errorResponse.respond(res, 'status', 'Unable to add status');
-
-        memberService.getByKey(req.session.memberKey, function (error, member) {
-          if (error) return errorResponse.respond(res, 'member', 'Error fetching member');
-
-          eventService.addAndGet('updateHostile', status, req.session.armadaKey, function (error, event) {
-            successResponse.respond(res);
+    async.waterfall([
+        function(callback){
+          hostileService.getById(pilot.id, function(error, hostile) {
+            if (error) return errorResponse.respond(res, 'status', 'Unable to find hostile by id ' + pilot.id);
+            if (hostile !== null) {
+
+              var headerData = headerParser.parse(req);
+              hostile.shipType = pilot.shipType;
+              headerData.systemId = pilot.systemId;
+              headerData.systemName = pilot.systemName;
+            }
+            callback(null, hostile);
+          });
+        },
+        function(pilot, callback){
+          hostileService.updateAndGet(headerParser.parse(req), pilot, req.session.armadaKey, function(hostile) {
+            callback(null, hostile);
           });
-        });
+        }
+    ], function (error, hostile) {
+      if (error) return errorResponse.respond(res, 'status', 'Unable to parse status.');
+      eventService.addAndGet('updateHostile', hostile, req.session.armadaKey, function(error, event) {
+        successResponse.respond(res);
       });
     });
   };

lib/actions/postStatusAction.js

@@ -93,11 +93,9 @@ module.exports = function (hostileService, eventService, memberService, standing
                 });
 
               }, function(error) {
-                memberService.getByKey(req.session.memberKey, function (error, member) {
-                  if (error) return errorResponse.respond(res, 'member', 'Error fetching member');
-                  eventService.addAndGet('reportHostile', hostiles, req.session.armadaKey, function(error, event) {
-                    successResponse.respond(res);
-                  });
+                if (error) return errorResponse.respond(res, 'member', 'Error fetching member');
+                eventService.addAndGet('reportHostile', hostiles, req.session.armadaKey, function(error, event) {
+                  successResponse.respond(res);
                 });
               });
             }