inventory

maestro-server · Aug 14, 2017 · 449a237 · 449a237
1 parent af45e95
commit 449a237
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/app/core/applications/persistenceApplication.js b/app/core/applications/persistenceApplication.js
@@ -73,6 +73,8 @@ const PersistenceApp = (Entity, PersistenceServices = DPersistenceServices) => {
 
         create (req, res, next) {
 
+            _.defaults(req.body, Entity.defaults || {});
+
             const bodyWithOwner = Object.assign(
                 {},
                 req.body,

diff --git a/app/inventory/applications/persistenceApplications.js b/app/inventory/applications/persistenceApplications.js
@@ -21,8 +21,6 @@ const persistenceApplications = (Entity, PersistenceServices = DPersistenceServi
             {dest: 'system.name', source: 'lsystem'}
           ]);
 
-          console.log(query);
-
           Object.assign(req, {query});
           PersistenceApplication(Entity, PersistenceServices)
             .find(req, res, next);

diff --git a/app/inventory/entities/Application.js b/app/inventory/entities/Application.js
@@ -5,7 +5,7 @@ const _ = require('lodash');
 const Applications = require('../repositories/dao/applications');
 
 const app = () => {
-    const resFilled = ['_id', 'updated_at', 'created_at', 'name', 'environment', 'system.name', 'system._id', 'servers', 'role', 'spec', 'language', 'cluster', 'deploy', 'tags', 'description'];
+    const resFilled = ['_id', 'updated_at', 'created_at', 'name', 'family', 'environment', 'system.name', 'system._id', 'servers', 'role', 'spec', 'language', 'cluster', 'deploy', 'tags', 'description'];
 
     const singleFilled = [...resFilled, 'roles', 'owner'];
 
@@ -20,6 +20,8 @@ const app = () => {
 
       dao: Applications,
 
+      defaults: {family: 'Application'},
+
       filled,
       singleFilled,
       resFilled

diff --git a/app/inventory/validators/applications.js b/app/inventory/validators/applications.js
@@ -38,7 +38,7 @@ const schema = Joi.object().keys({
       refs: Joi.string()
     }),
     spec: Joi.object({
-      role: Joi.string().valid('Application', 'Worker', 'LoadBalance', 'Jobs', 'Service Discovery', 'Monitoring', 'Testing', 'Standard').required(),
+      role: Joi.string().valid('Application', 'Worker', 'Jobs', 'Service Discovery', 'Monitoring', 'Testing', 'Standard').required(),
       endpoint: Joi.string().uri().max(250),
       path: Joi.string().max(150),
       command: Joi.string().max(150),
@@ -51,6 +51,7 @@ const schema = Joi.object().keys({
     deploy: Joi.array().items(deploy),
     roles: Joi.array().items(roles).unique('_id'),
     environment: Joi.string().valid('Production', 'Staging', 'Development', 'UTA', 'Training', 'SandBox').required(),
+    family: Joi.string().valid('Application', 'LoadBalance', 'Broker', 'DataBase', 'Serveless', 'Api Gateway', 'SearchEngine', 'Cache').default("Application"),
     tags: Joi.array().items(tags),
     active: Joi.boolean()
 });

diff --git a/migrations/0020-system_options.js b/migrations/0020-system_options.js
@@ -0,0 +1,21 @@
+'use strict';
+
+
+exports.up = function (db, next) {
+    let pets = db.collection('adminer');
+    pets.insert({
+        "value": {
+            check: ['Public URL', 'Private URL', 'Admin', 'WebSocket', 'TCP/IP', 'Unix Sock', 'HealthCheck'],
+            apps: ['Application', 'LoadBalance', 'Broker', 'DataBase', 'Serveless', 'Api Gateway', 'SearchEngine', 'Cache']
+        },
+        "key": "system_options",
+        "active": true,
+        "updated_at": new Date()
+    }, next);
+};
+
+exports.down = function (db, next) {
+    let pets = db.collection('adminer');
+
+    pets.findAndModify({key: 'system_options'}, [], {}, {remove: true}, next);
+};