Fleet Scans done.

Author: rcreasey

app/js/Data.js

@@ -32,7 +32,7 @@ var Data = {
 		alertCount: 0,
 		data_client: null,
 		dimmed: false,
-		lastPollTs : Date.now(),
+		lastPollTs : moment().unix(),
 		memberSortOrder: {
 			property: 'name',
 			order: 'asc'

app/js/Main.js

@@ -269,7 +269,7 @@ function log(message) {
 		});
 
 	} else if (Data.config.log === 'console') {
-		console.log('[' + Date.now() + '] - ' + message)
+		console.log('[' + moment().unix() + '] - ' + message)
 	}
 }
 

app/js/Server.js

@@ -51,7 +51,7 @@ var Server = {
 
 	status: function (callback) {
 		Server.ajaxGet('/status', callback);
-		Data.state.lastPollTs = Date.now();
+		Data.state.lastPollTs = moment().unix();
 	},
 
 	joinFleet: function (fleetKey, callback) {

app/js/client/Main.js

@@ -61,6 +61,6 @@ function log(message) {
     });
 
   } else if (Data.config.log === 'console') {
-    console.log('[' + Date.now() + '] - ' + message)
+    console.log('[' + moment().unix() + '] - ' + message)
   }
 };

lib/controllers/fleet.js

@@ -290,15 +290,82 @@ exports.update_status = function(req, res, next){
         console.log(error)
         return response.error(res, 'report', 'Error reporting status: ' + error);
       })
-      .done(function() {
-
-
-      });
+      .done();
   }
 };
 
-exports.add_scan = function(req, res, next){
-  response.success(res, []);
+exports.add_scan = function(req, res, next) {
+
+  Member.findOneQ({key: req.session.memberKey})
+    .then(function(reporter) {
+      var scan = Scan.prepare(reporter.fleetKey, reporter, req.body.scanData);
+
+      if (!scan.shipTypes.length) return response.error(res, 'report', 'Invalid scan data.');
+      if (!scan.shipClasses.length) return response.error(res, 'report', 'Invalid scan data.');
+
+      var event = Event.prepare('scanPosted', reporter.fleetKey, scan);
+      scan.saveQ();
+      event.saveQ();
+      
+      return response.success(res);
+    })
+    .catch(function(error) {
+      console.log(error)
+      return response.error(res, 'report', 'Error reporting scan: ' + error);
+    })
+    .done();
+
+  // var checkScanDataIntegrity = function (scan) {
+  //   var shipQty = 0;
+  //
+  //   for (var index in scan) {
+  //     if (!typeof(scan) === 'object'
+  //       || (!scan[index].shipType && !scan[index].shipClass)
+  //       || !scan[index].count
+  //       || !scan[index].details
+  //       || !typeof scan[index].details === 'object') {
+  //
+  //       return false;
+  //     }
+  //
+  //     for (var detailIndex in scan[index].details) {
+  //       if (!scan[index].details[detailIndex].distance
+  //         || !scan[index].details[detailIndex].shipName) {
+  //
+  //         return false;
+  //       }
+  //       shipQty++;
+  //     }
+  //   }
+  //
+  //   return !(shipQty > settings.scanMaxShips || shipQty < settings.scanMinShips);
+  // };
+  //
+  // pub.run = function (req, res) {
+  //   logger.processing(req);
+  //
+  //   var scanData = req.body.scanData;
+  //   if ( !scanData
+  //     || !checkScanDataIntegrity(scanData.types)
+  //     || !checkScanDataIntegrity(scanData.classes) ) {
+  //     return errorResponse.respond(req, res, 'scan', 'Invalid scan data.');
+  //   }
+  //
+  //   scanService.addAndGet(headerParser.parse(req), scanData, req.session.fleetKey, function (error, scan) {
+  //     if (error) return errorResponse.respond(req, res, 'scan', 'Unable to add scan');
+  //
+  //     memberService.getByKey(req.session.memberKey, function (error, member) {
+  //       if (error) return errorResponse.respond(req, res, 'member', 'Error fetching member');
+  //
+  //       eventService.addAndGet('scanPosted', scan, req.session.fleetKey, function (error, event) {
+  //         successResponse.respond(res);
+  //       });
+  //     });
+  //   });
+  // };
+  //
+  // return pub;
+
 };
 
 exports.add_report = function(req, res, next){

lib/middleware/checks.js

@@ -26,7 +26,7 @@ exports.request_size = function (req, res, next) {
 };
 
 exports.for_existing_fleet = function(req) {
-  return !!(req.fleet || req.session.fleet || req.session.fleetKey || req.session.memberKey);
+  return !!(req.session.fleetKey || req.session.memberKey);
 };
 
 exports.static_rewrite = function (req, res, next) {

lib/models/scan.js

@@ -13,8 +13,20 @@ var ScanSchema  = new Schema({
   systemId: Number,
   systemName: String,
 
-  shipTypes: Schema.Types.Mixed,
-  shipClasses: Schema.Types.Mixed
+  shipTypes: [ Schema.Types.Mixed ],
+  shipClasses: [ Schema.Types.Mixed ]
 });
 
+ScanSchema.statics.prepare = function prepare(fleetKey, reporter, scan) {
+  return new this({
+    fleetKey: fleetKey,
+    reporterId: reporter.characterId,
+    reporterName: reporter.characterName,
+    systemId: reporter.systemId,
+    systemName: reporter.systemName,
+    shipTypes: scan.types || [],
+    shipClasses: scan.classes || []
+  });
+};
+
 module.exports = mongoose.model('Scan', ScanSchema);

test/fixtures/scan-data.json

@@ -0,0 +1,44 @@
+{
+  "scanData": {
+    "classes": [
+      { "shipClass": "frigate",
+        "count": "1",
+        "details": [
+          { "distance": "7 729 m",
+            "shipClass": "Magnate",
+            "shipName": "Gerius Semah Magnate"
+          }
+        ]
+      },
+      { "shipClass": "freighter",
+        "count": "1",
+        "details": [
+          { "distance": "11 km",
+            "shipClass": "Fenrir",
+            "shipName": "KOPbITO"
+          }
+        ]
+      }
+    ],
+    "types": [
+      { "shipType": "Magnate",
+        "count": "1",
+        "details": [
+          { "distance": "7 729 m",
+            "shipClass": "Magnate",
+            "shipName": "Gerius Semah Magnate"
+          }
+        ]
+      },
+      { "shipType": "Fenrir",
+        "count": "1",
+        "details": [
+          { "distance": "11 km",
+            "shipClass": "Fenrir",
+            "shipName": "KOPbITO"
+          }
+        ]
+      }
+    ]
+  }
+}