move devices endpoint from app unit to api unit

lib/units/api/config/default.yaml

@@ -26,6 +26,7 @@ swagger:
     swagger_controllers:
       - onError: json_error_handler
       - cors
+      - swagger_params_parser
       - swagger_security
       - _swagger_validate
       - express_compatibility

lib/units/api/controllers/device.js

@@ -0,0 +1,61 @@
+var Promise = require('bluebird')
+
+var dbapi = require('../../../db/api')
+var logger = require('../../../util/logger')
+var datautil = require('../../../util/datautil')
+
+var log = logger.createLogger('api:contoller:device')
+
+module.exports = {
+  getDevices: getDevices
+, getDeviceBySerial: getDeviceBySerial
+};
+
+function getDevices(req, res) {
+  dbapi.loadDevices()
+    .then(function(cursor) {
+      return Promise.promisify(cursor.toArray, cursor)()
+        .then(function(list) {
+          list.forEach(function(device) {
+            datautil.normalize(device, req.user)
+          })
+
+          res.json({
+            success: true
+          , devices: list
+          })
+        })
+    })
+    .catch(function(err) {
+      log.error('Failed to load device list: ', err.stack)
+      res.json(500, {
+        success: false
+      })
+    })
+}
+
+function getDeviceBySerial(req, res) {
+  var serial = req.swagger.params.serial.value
+
+  dbapi.loadDevice(serial)
+    .then(function(device) {
+      if (device) {
+        datautil.normalize(device, req.user)
+        res.json({
+          success: true
+        , device: device
+        })
+      }
+      else {
+        res.json(404, {
+          success: false
+        })
+      }
+    })
+    .catch(function(err) {
+      log.error('Failed to load device "%s": ', req.params.serial, err.stack)
+      res.json(500, {
+        success: false
+      })
+    })
+}

lib/units/api/swagger/api_v1.yaml

@@ -9,7 +9,7 @@ info:
   contact:
     url: http://openstf.io/
     email: [email protected]
-basePath: /api/v1/
+basePath: /api/v1
 schemes:
   - http
   - https
@@ -33,6 +33,42 @@ paths:
           description: Unexpected Error
           schema:
             $ref: "#/definitions/ErrorResponse"
+  /devices:
+    x-swagger-router-controller: device
+    get:
+      summary: Device List
+      description: List of all the STF devices including Disconnected and Offline
+      operationId: getDevices
+      responses:
+        "200":
+          description: List of Devices
+          schema:
+            $ref: "#/definitions/DeviceListResponse"
+        default:
+          description: Unexpected Error
+          schema:
+            $ref: "#/definitions/ErrorResponse"
+  /devices/{serial}:
+    x-swagger-router-controller: device
+    get:
+      summary: Device Information
+      description: Device Information
+      operationId: getDeviceBySerial
+      parameters:
+        - name: serial
+          in: path
+          description: Device Serial
+          required: true
+          type: string
+      responses:
+        "200":
+          description: Device Information
+          schema:
+            $ref: "#/definitions/DeviceResponse"
+        default:
+          description: Unexpected Error
+          schema:
+            $ref: "#/definitions/ErrorResponse"
 
 definitions:
   UserResponse:
@@ -41,6 +77,20 @@ definitions:
     properties:
       user:
         type: object
+  DeviceListResponse:
+    required:
+      - devices
+    properties:
+      devices:
+        type: array
+        items:
+          type: object
+  DeviceResponse:
+    required:
+      - device
+    properties:
+      device:
+        type: object
   ErrorResponse:
     required:
       - message

lib/units/app/index.js

@@ -146,53 +146,6 @@ module.exports = function(options) {
       })
   })
 
-  app.get('/app/api/v1/devices', function(req, res) {
-    dbapi.loadDevices()
-      .then(function(cursor) {
-        return Promise.promisify(cursor.toArray, cursor)()
-          .then(function(list) {
-            list.forEach(function(device) {
-              datautil.normalize(device, req.user)
-            })
-
-            res.json({
-              success: true
-            , devices: list
-            })
-          })
-      })
-      .catch(function(err) {
-        log.error('Failed to load device list: ', err.stack)
-        res.json(500, {
-          success: false
-        })
-      })
-  })
-
-  app.get('/app/api/v1/devices/:serial', function(req, res) {
-    dbapi.loadDevice(req.params.serial)
-      .then(function(device) {
-        if (device) {
-          datautil.normalize(device, req.user)
-          res.json({
-            success: true
-          , device: device
-          })
-        }
-        else {
-          res.json(404, {
-            success: false
-          })
-        }
-      })
-      .catch(function(err) {
-        log.error('Failed to load device "%s": ', req.params.serial, err.stack)
-        res.json(500, {
-          success: false
-        })
-      })
-  })
-
   app.get('/app/api/v1/accessTokens', function(req, res) {
     dbapi.loadAccessTokens(req.user.email)
       .then(function(cursor) {

res/app/components/stf/device/device-service.js

@@ -165,7 +165,7 @@ module.exports = function DeviceServiceFactory($http, socket, EnhanceDeviceServi
     , digest: false
     })
 
-    oboe('/app/api/v1/devices')
+    oboe('/api/v1/devices')
       .node('devices[*]', function(device) {
         tracker.add(device)
       })
@@ -190,7 +190,7 @@ module.exports = function DeviceServiceFactory($http, socket, EnhanceDeviceServi
   }
 
   deviceService.load = function(serial) {
-    return $http.get('/app/api/v1/devices/' + serial)
+    return $http.get('/api/v1/devices/' + serial)
       .then(function(response) {
         return response.data.device
       })