review uuid usage #67

src/server/firebase/Location.js

@@ -86,19 +86,17 @@ export async function getLatestLocation(params, isAdmin) {
 }
 
 
-export async function createLocation(location, deviceInfo, org, batch) {
+export async function createLocation(location, device, org, batch) {
   const now = new Date();
-  const { uuid: deviceId } = deviceInfo;
-
-  const currentDevice = await findOrCreate(org, { ...deviceInfo });
+  const { uuid: deviceId } = device;
 
   console.info(
     'v3:location:create'.green,
     'org:name'.green,
     org,
     'org'.green,
     'device:id'.green,
-    currentDevice.device_id,
+    device.device_id,
   );
 
   const orgRef = firestore
@@ -156,13 +154,13 @@ export async function createLocations(
   await batch.commit();
 }
 
-export async function create(params) {
+export async function create(params, org) {
   if (Array.isArray(params)) {
     return Promise.reduce(
       params,
       async (p, pp) => {
         try {
-          await create(pp);
+          await create(pp, org);
         } catch (e) {
           console.error('v3:create', e);
           throw e;
@@ -173,10 +171,11 @@ export async function create(params) {
   }
 
   const {
-    company_token: token = 'UNKNOWN',
+    company_token: token = org || 'UNKNOWN',
     location: list = [],
-    device = { model: 'UNKNOWN', uuid: 'UNKNOWN' },
+    device: deviceInfo = { model: 'UNKNOWN', uuid: 'UNKNOWN' },
   } = params;
+  const device = await findOrCreate(token, { ...deviceInfo });
   const locations = Array.isArray(list)
     ? list
     : (

src/server/models/Location.js

@@ -75,9 +75,8 @@ export async function getLatestLocation(params, isAdmin) {
   return result;
 }
 
-export async function createLocation(location, deviceInfo, org) {
+export async function createLocation(location, device, org) {
   const now = new Date();
-  const device = await findOrCreate(org, { ...deviceInfo });
 
   CompanyModel.update(
     { updated_at: now },
@@ -95,7 +94,7 @@ export async function createLocation(location, deviceInfo, org) {
     'org:id'.green,
     device.company_id,
     'device:id'.green,
-    device.uuid,
+    device.device_id,
   );
   const row = {
     latitude: location.coords.latitude,
@@ -154,8 +153,13 @@ export async function create(
   const {
     company_token: token = org || 'UNKNOWN',
     location: list = [],
-    device = { model: 'UNKNOWN', uuid: 'UNKNOWN' },
+    device: deviceInfo = { model: 'UNKNOWN', uuid: 'UNKNOWN' },
   } = params;
+  const device = await findOrCreate(
+    org,
+    { device_id: deviceInfo.uuid },
+  );
+  console.log('deviceInfo', deviceInfo, device);
   const locations = Array.isArray(list)
     ? list
     : (

src/server/routes/firebase-api.js

@@ -315,7 +315,7 @@ router.post('/locations', checkAuth(verify), async (req, res) => {
   }
 
   try {
-    await create(data);
+    await create(data, org);
     return res.send({ success: true });
   } catch (err) {
     if (err instanceof AccessDeniedError) {

src/server/routes/site-api.js

@@ -168,7 +168,7 @@ router.post('/locations', getAuth(verify), async (req, res) => {
   }
 
   try {
-    await create(data);
+    await create(data, org);
     return res.send({ success: true });
   } catch (err) {
     if (err instanceof AccessDeniedError) {
@@ -225,7 +225,6 @@ router.delete('/locations', checkAuth(verify), async (req, res) => {
     );
 
     res.send({ success: true });
-    res.status(500).send({ error: 'Something failed!' });
   } catch (err) {
     console.info('v1', 'delete /locations', JSON.stringify(req.query), err);
     res.status(500).send({ error: 'Something failed!' });

tests/data.js

@@ -10,6 +10,30 @@ export const regData = {
 };
 
 export const location = {
+  is_moving: false,
+  uuid: '8a21f59c-c7d8-43ed-ac6d-8b23cea7c7d7',
+  timestamp: '2019-11-17T19:14:25.776Z',
+  odometer: 4616.5,
+  coords: {
+    latitude: 45.519264,
+    longitude: -73.616931,
+    accuracy: 15.2,
+    speed: -1,
+    heading: -1,
+    altitude: 41.8,
+  },
+  activity: {
+    type: 'still',
+    confidence: 100,
+  },
+  battery: {
+    is_charging: true,
+    level: 0.92,
+  },
+  extras: { setCurrentPosition: true },
+};
+
+export const location2 = {
   is_moving: false,
   uuid: '03f4aa4c-ed00-4390-9e82-49f0c5799940',
   timestamp: '2020-03-12T19:26:12.020Z',

tests/firebase.test.js

@@ -191,6 +191,16 @@ describe('firebase api', () => {
       expect(res).to.be.json;
     });
 
+    test('POST /locations/test', async () => {
+      const res = await chai
+        .request(server)
+        .post('/api/firebase/locations/test')
+        .set('Authorization', `Bearer ${token}`)
+        .send({ location });
+      expect(res).have.status(200);
+      expect(res).to.be.json;
+    });
+
     test('DELETE /locations', async () => {
       const res = await chai
         .request(server)

tests/site-api.test.js

@@ -5,6 +5,7 @@ import chaiHttp from 'chai-http';
 
 import {
   location,
+  location2,
   regData,
   server,
 } from './data';
@@ -82,7 +83,7 @@ describe('site api', () => {
         .set('Authorization', `Bearer ${token}`)
         .send({
           location,
-          device: { model: 'test', uuid: 'test' },
+          device: { model: 'test', uuid: 'uuid' },
           company_token: 'test',
         });
       expect(res).have.status(200);
@@ -96,7 +97,7 @@ describe('site api', () => {
         .set('Authorization', `Bearer ${token}`)
         .send([{
           location,
-          device: { model: 'test', uuid: 'test' },
+          device: { model: 'test', uuid: 'uuid' },
           company_token: 'test',
         }]);
       expect(res).have.status(200);
@@ -121,14 +122,34 @@ describe('site api', () => {
         .post('/api/site/locations/test')
         .set('Authorization', `Bearer ${token}`)
         .send({
-          location,
-          device: { model: 'test', uuid: 'test' },
+          location: [location, location2],
+          device: { model: 'test', uuid: 'uuid' },
           company_token: 'test',
         });
       expect(res).have.status(200);
       expect(res).to.be.json;
     });
 
+    test('POST /locations/test without device & company_token', async () => {
+      const res = await chai
+        .request(server)
+        .post('/api/site/locations/test')
+        .set('Authorization', `Bearer ${token}`)
+        .send({ location });
+      expect(res).have.status(200);
+      expect(res).to.be.json;
+    });
+
+    test('POST /locations/test [] without device & company_token', async () => {
+      const res = await chai
+        .request(server)
+        .post('/api/site/locations/test')
+        .set('Authorization', `Bearer ${token}`)
+        .send([{ location }]);
+      expect(res).have.status(200);
+      expect(res).to.be.json;
+    });
+
     test('DELETE /locations', async () => {
       const res = await chai.request(server)
         .delete(