Fixing duplicate records for hostiles on submission.

Author: rcreasey

lib/actions/postStatusAction.js

@@ -1,4 +1,4 @@
-module.exports = function (hostileService, eventService, memberService, standingsService, neow, headerParser, errorResponse, successResponse, _) {
+module.exports = function (hostileService, eventService, memberService, standingsService, neow, headerParser, errorResponse, successResponse, async, _) {
 
   var pub = {};
 
@@ -66,13 +66,36 @@ module.exports = function (hostileService, eventService, memberService, standing
               });
 
             } else if (scanData.text === 'hostile') {
-              hostileService.addAndGet(headerParser.parse(req), scanData, req.session.armadaKey, function (error, status) {
-                if (error) return errorResponse.respond(res, 'status', 'Unable to add status.');
+              var hostiles = [];
+
+              async.each(scanData.pilots, function(pilot, callback) {
+                async.waterfall([
+                    function(callback){
+                      hostileService.getById(pilot.id, function(error, result) {
+                        if (error) return errorResponse.respond(res, 'status', 'Unable to find hostile by id ' + pilot.id);
+                        if (result !== null) {
+                          pilot.key = result.key;
+                          if (result.shipType !== null) pilot.shipType = result.shipType;
+                          if (result.shipTypeId !== null) pilot.shipTypeId = result.shipTypeId;
+                        }
+                        callback(null, pilot);
+                      });
+                    },
+                    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.');
+                  hostiles.push(hostile);
+                  callback();
+                });
 
+              }, function(error) {
                 memberService.getByKey(req.session.memberKey, function (error, member) {
                   if (error) return errorResponse.respond(res, 'member', 'Error fetching member');
-
-                  eventService.addAndGet('reportHostile', status, req.session.armadaKey, function (error, event) {
+                  eventService.addAndGet('reportHostile', hostiles, req.session.armadaKey, function(error, event) {
                     successResponse.respond(res);
                   });
                 });

lib/services/hostileService.js

@@ -1,4 +1,4 @@
-module.exports = function (keyGenerator, storageManager, settings, Q) {
+module.exports = function (keyGenerator, storageManager, settings) {
 
   var pub = {};
 
@@ -41,29 +41,7 @@ module.exports = function (keyGenerator, storageManager, settings, Q) {
   };
 
   pub.addAndGet = function(headerData, scanData, armadaKey, callback) {
-    var hostiles = [];
-
-    for (i in scanData.pilots) {
-
-      storageManager.getById('hostile', scanData.pilots[i].id, function(error, result) {
-        if (error) return callback(error);
-        var hostile = createHostile(headerData, scanData.pilots[i], armadaKey);
-
-        if (result !== null) hostile.key = result.key;
-        debugger;
-
-        return hostile;
-      }).then(function(hostile) {
-        debugger;
-        storageManager.updateItem('hostile', hostile.key, hostile, function (error) {
-          if (error) return callback(error);
-        });
-
-        hostiles.push(hostile);
-      });
-    }
-
-    callback(null, hostiles);
+    hostileService.updateAndGet(headerData, scanData, armadaKey, callback);
   };
 
   pub.updateAndGet = function(headerData, scanData, armadaKey, callback) {
@@ -73,7 +51,7 @@ module.exports = function (keyGenerator, storageManager, settings, Q) {
       if (error) return callback(error);
     });
 
-    callback(null, hostile);
+    callback(hostile);
   };
 
   pub.getById = function (id, callback) {

lib/storage/cacheLayer.js

@@ -66,6 +66,8 @@ module.exports = function (logger, _) {
 	};
 
 	pub.upsertItem = function (type, item) {
+		if (item === null) return;
+
 		// logger.log('Updating ' + type + ' ' + item.key + ' in cache...', 2);
 		for (var i in store[type]) {
 			if (store[type][i].key === item.key) {