Merge branch 'master' into feature-createIssue-ajax

Author: Renato Marinho

.env.example

@@ -27,3 +27,7 @@ PROXY_METHOD=
 PROXY_SERVER=
 PROXY_USER=
 PROXY_PASS=
+
+SLACK_CHANNEL=channel-name
+SLACK_BOT_NAME=bot-name
+SLACK_WEBHOOK=endpoint

README.md

@@ -156,7 +156,8 @@ DB_PASSWORD=XXXXX
 **Remember**: Create the database for GitScrum before run artisan command.
 
 ```
-php artisan migrate --seed
+php artisan migrate
+php artisan db:seed --class=SettingSeeder
 ```
 
 #### Github

app/Contracts/SlackInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace GitScrum\Contracts;
+
+interface SlackInterface
+{
+    public function send($content, $type = 0);
+}

app/Http/Controllers/Web/AuthController.php

@@ -13,6 +13,7 @@
 use Socialite;
 use Auth;
 use SocialiteProviders\Manager\Exception\InvalidArgumentException;
+use Session;
 
 class AuthController extends Controller
 {

app/Http/Controllers/Web/IssueController.php

@@ -9,6 +9,7 @@
 namespace GitScrum\Http\Controllers\Web;
 
 use Illuminate\Http\Request;
+use GitScrum\Contracts\SlackInterface as Slack;
 use GitScrum\Http\Requests\IssueRequest;
 use GitScrum\Models\Sprint;
 use GitScrum\Models\Issue;
@@ -22,58 +23,41 @@ class IssueController extends Controller
 {
     public function index($slug)
     {
-        if ($slug) {
-            $sprint = Sprint::slug($slug)
-                ->with('issues.user')
-                ->with('issues.users')
-                ->with('issues.commits')
-                ->with('issues.statuses')
-                ->with('issues.status')
-                ->with('issues.comments')
-                ->with('issues.attachments')
-                ->with('issues.type')
-                ->with('issues.productBacklog')
-                ->with('issues.sprint')
-                ->with('issues.configEffort')
-                ->first();
-            
-            //when viewing from sprint planning, issues need to be passed in an array indexed by their status, so they can be put in the appropriate kanban columns
-            $is = $sprint->issues;
-            $issues = array();
-            foreach($is as $i) {
-                $issues[$i->config_status_id] = array();
-            }
-            foreach($is as $i) {
-                $issues[$i->config_status_id][] = $i;
-            }
-        } else {
-            $sprint = null;
-            $issues = Auth::user()->issues()
-                ->with('user')
-                ->with('users')
-                ->with('commits')
-                ->with('statuses')
-                ->with('status')
-                ->with('comments')
-                ->with('attachments')
-                ->with('type')
-                ->with('productBacklog')
-                ->with('sprint')
-                ->with('configEffort')
-                ->get()
-                ->sortBy('position')->groupBy('config_status_id');
-        }
-
-        $configStatus = ConfigStatus::type('issues')->get();
+        [$sprint,$issues] = $this->sprintWithIssues($slug);
 
         if (!is_null($sprint) && !count($sprint)) {
             return redirect()->route('sprints.index');
         }
 
         return view('issues.index')
             ->with('sprint', $sprint)
-            ->with('issues', $issues)
-            ->with('configStatus', $configStatus);
+            ->with('issues', $issues->sortBy('position')->groupBy('config_issue_effort_id'))
+            ->with('configStatus', ConfigStatus::type('issues')->get());
+    }
+
+    private function sprintWithIssues($slug)
+    {
+        if ($slug)
+        {
+            $sprint = $this->eagerLoad(Sprint::slug($slug),'issues.')->first();
+
+            return [$sprint , $sprint->issues];
+        }
+
+        return [ null , $this->eagerLoad(Auth::user()->issues())->get()];
+    }
+
+    private function eagerLoad($query , $relation = '')
+    {
+        $eagerLoaders = collect(['user','users','commits','statuses',
+                                 'comments','attachments','type',
+                                 'productBacklog','sprint','configEffort']);
+
+        $eagerLoaders->each(function($loader) use (&$query,$relation){
+            $query = $query->with($relation . $loader);
+        });
+
+        return $query;
     }
 
     public function create($scope, $slug, $parent_id = null)
@@ -137,7 +121,7 @@ public function update(IssueRequest $request, $slug)
             ->with('success', trans('gitscrum.congratulations-the-issue-has-been-edited-with-successfully'));
     }
 
-    public function statusUpdate(Request $request, $slug = null, $status = 0)
+    public function statusUpdate(Request $request, Slack $slack, $slug = null, $status = 0)
     {
         $request->status_id = $request->status_id ?? $status;
 
@@ -158,6 +142,17 @@ public function statusUpdate(Request $request, $slug = null, $status = 0)
 
         resolve('IssueService')->setRequest($request)->updateStatus();
 
+        $issue = Issue::slug($slug)->firstOrFail();
+
+        $content = [
+            'title' => "{$issue->title}",
+            'url' => url("issues/status-update/{$slug}"),
+            'updated_by' => Auth::user()->slack_username,
+            'status' => $status,
+        ];
+
+        $slack->send($content, 2);
+
         return back()->with('success', trans('gitscrum.updated-successfully'));
     }
 

app/Http/Controllers/Web/SlackUserController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace GitScrum\Http\Controllers\Web;
+
+use Auth;
+use Illuminate\Http\Request;
+
+class SlackUserController extends Controller
+{
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     */
+    public function update(Request $request)
+    {
+    	$user = Auth::user();
+    	$user->slack_username = $request->slack_username;
+    	$user->save();
+
+    	return back()->with('success', trans('gitscrum.updated-successfully'));
+    }
+}

app/Http/Controllers/Web/SprintController.php

@@ -103,6 +103,11 @@ public function show($slug)
             return redirect()->route('sprints.index');
         }
 
+        if ($sprint->user_id !== Auth()->user()->id && $sprint->is_private) {
+            return redirect()->route('sprints.index')
+                ->with('error', trans('gitscrum.private-sprint'));
+        }
+
         $configStatus = ConfigStatus::type('sprints')->get();
 
         return view('sprints.show')

app/Http/Controllers/Web/UserIssueController.php

@@ -8,9 +8,11 @@
 
 namespace GitScrum\Http\Controllers\Web;
 
-use Illuminate\Http\Request;
+use Auth;
+use GitScrum\Contracts\SlackInterface as Slack;
 use GitScrum\Models\Issue;
 use GitScrum\Models\User;
+use Illuminate\Http\Request;
 
 class UserIssueController extends Controller
 {
@@ -93,7 +95,7 @@ public function edit($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $slug)
+    public function update(Request $request, $slug, Slack $slack)
     {
         $members = $request->input('members');
 
@@ -103,6 +105,21 @@ public function update(Request $request, $slug)
         $issue->users()->sync($members);
 
         if (!$request->ajax()) {
+            $users = User::whereIn('id', $members)->select('slack_username')->get();
+            $slackUsers = [];
+
+            foreach ($users as $user) {
+                $slackUsers[] = $user->slack_username;
+            }
+
+            $content = [
+                'title' => $issue->title,
+                'assigned_to' => $slackUsers,
+                'url' => route('issues.show', $issue->slug),
+                'assigned_by' => Auth::user()->slack_username,
+            ];
+            $slack->send($content, 1);
+
             return redirect()->back()->with('success', trans('gitscrum.updated-successfully'));
         }
     }

app/Http/Requests/IssueRequest.php

@@ -32,6 +32,7 @@ public function rules()
     {
         return [
             'title' => 'required|min:2|max:255',
+            'sprint_id' => 'required|integer',
         ];
     }
     /**
@@ -45,6 +46,7 @@ public function messages()
             'title.required' => trans('gitscrum.issue-cannot-be-blank'),
             'title.min' => trans('gitscrum.issue-must-be-at-least-2-characters'),
             'title.max' => trans('gitscrum.issue-must-be-between-2-and-255-characters'),
+            'sprint_id.required' => trans('gitscrum.sprint-cannot-be-blank'),
         ];
     }
 

app/Providers/SlackServiceProvider.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace GitScrum\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class SlackServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap the application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+    }
+
+    /**
+     * Register the application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->bind('GitScrum\Contracts\SlackInterface', 'GitScrum\Services\SlackService');
+    }
+}