From 9ed3313f0fd5d9997e58262ec69444fbb4ad08f5 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Wed, 27 Feb 2019 07:30:43 +0100
Subject: [PATCH] Create project activity refactored

---
 app/controllers/projects_controller.rb       | 18 +++++++-----------
 spec/controllers/projects_controller_spec.rb |  6 ++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 6a4c39f86..eac0a39af 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -103,17 +103,13 @@ class ProjectsController < ApplicationController
       )
       up.save
 
-      # Create "project created" activity
-      Activity.create(
-        type_of: :create_project,
-        owner: current_user,
-        project: @project,
-        message: t(
-          "activities.create_project",
-          user: current_user.full_name,
-          project: @project.name
-        )
-      )
+      Activities::CreateActivityService
+        .call(activity_type: :create_project,
+              owner: current_user,
+              subject: @project,
+              team: @project.team,
+              project: @project,
+              message_items: { project: @project.id })
 
       message = t('projects.create.success_flash', name: @project.name)
       respond_to do |format|
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 1aa7f6690..251c0b133 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -117,6 +117,12 @@ describe ProjectsController, type: :controller do
         expect(response).to have_http_status(:unprocessable_entity)
         expect(response.content_type).to eq 'application/json'
       end
+
+      it 'never calls create activity service' do
+        expect(Activities::CreateActivityService).not_to receive(:call)
+
+        post :create, params: params, format: :json
+      end
     end
   end