From f06162e45f496de0aaee9bbadf11018a969a5ff5 Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Mon, 28 Sep 2015 14:10:14 +0300
Subject: [PATCH] #713: done

---
 devops-service/db/mongo/models/report.rb | 9 ++++++---
 devops-service/db/mongo/models/server.rb | 2 +-
 devops-service/workers/deploy_worker.rb  | 7 ++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/devops-service/db/mongo/models/report.rb b/devops-service/db/mongo/models/report.rb
index 4d9a253..c7ca2c4 100644
--- a/devops-service/db/mongo/models/report.rb
+++ b/devops-service/db/mongo/models/report.rb
@@ -9,9 +9,10 @@ module Devops
       BOOTSTRAP_TYPE = 3
       PROJECT_TEST_TYPE = 4
       STACK_TYPE = 5
-      DELETE_SERVER_TYPE = 6
+      DEPLOY_STACK_TYPE = 6
+      DELETE_SERVER_TYPE = 7
 
-      attr_accessor :id, :file, :created_at, :updated_at, :created_by, :project, :deploy_env, :type, :chef_node_name, :host, :status
+      attr_accessor :id, :file, :created_at, :updated_at, :created_by, :project, :deploy_env, :type, :chef_node_name, :host, :status, :stack
 
       def initialize r
         self.id = r["_id"]
@@ -23,6 +24,7 @@ module Devops
         self.created_at = r["created_at"]
         self.chef_node_name = r["chef_node_name"]
         self.host = r["host"]
+        self.stack = r["stack"]
         self.created_at = r["created_at"].localtime unless r["created_at"].nil?
         self.updated_at = r["updated_at"].localtime unless r["updated_at"].nil?
         self.status = r["status"]
@@ -39,7 +41,8 @@ module Devops
           "type" => self.type,
           "chef_node_name" => self.chef_node_name,
           "host" => self.host,
-          "status" => self.status
+          "status" => self.status,
+          "stack" => self.stack
         }
       end
 
diff --git a/devops-service/db/mongo/models/server.rb b/devops-service/db/mongo/models/server.rb
index 187b99a..f6296fe 100644
--- a/devops-service/db/mongo/models/server.rb
+++ b/devops-service/db/mongo/models/server.rb
@@ -29,7 +29,7 @@ module Devops
       set_validators  ::Validators::DeployEnv::RunList
 
       def self.fields
-        ["chef_node_name", "project", "deploy_env", "provider", "remote_user", "private_ip", "public_ip", "created_at", "created_by", "key", "reserved_by", "run_list"]
+        ["chef_node_name", "project", "deploy_env", "provider", "remote_user", "private_ip", "public_ip", "created_at", "created_by", "key", "reserved_by", "run_list", "stack"]
       end
 
       def initialize s={}
diff --git a/devops-service/workers/deploy_worker.rb b/devops-service/workers/deploy_worker.rb
index 2120222..e47d384 100644
--- a/devops-service/workers/deploy_worker.rb
+++ b/devops-service/workers/deploy_worker.rb
@@ -31,11 +31,16 @@ class DeployWorker < Worker
       "created_by" => owner,
       "project" => server.project,
       "deploy_env" => server.deploy_env,
-      "type" => Devops::Model::Report::DEPLOY_TYPE,
       "status" => STATUS::RUNNING,
       "chef_node_name" => server.chef_node_name,
       "host" => server.public_ip || server.private_ip
     }
+    if server.stack.nil?
+      report_data["type"] = Devops::Model::Report::DEPLOY_TYPE
+    else
+      report_data["type"] = Devops::Model::Report::DEPLOY_STACK_TYPE
+      report_data["stack"] = server.stack
+    end
     report = Devops::Model::Report.new(report_data)
     mongo.save_report(report)
     report