From 84de25812b0f026e453ecee453fa340c5a9d3edb Mon Sep 17 00:00:00 2001
From: ritualsfinal <solverjt@gmail.com>
Date: Fri, 31 May 2019 13:11:41 -0600
Subject: [PATCH 01/17] [feature] basic alert logic when signing up for
 concurrent shift

---
 laravel/app/Http/Controllers/SlotController.php | 15 ++++++++++++++-
 laravel/resources/views/app.blade.php           |  6 ++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index 73359ba7..24fe3a50 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -100,11 +100,24 @@ public function take(SlotRequest $request, Slot $slot)
         // Has somebody else already taken this slot?
         if(is_null($slot->user))
         {
+            $concurrentSlot = Slot::where('user_id', Auth::user()->id)
+                        ->where('start_date', $slot->start_date)
+                        ->where('start_time', '<', $slot->end_time)
+                        ->where('end_time', '>', $slot->start_time)
+                        ->first();
+
             $slot->user_id = Auth::user()->id;
             $slot->save();
 
             event(new SlotChanged($slot, ['status' => 'taken', 'name' => Auth::user()->name]));
-            $request->session()->flash('success', 'You signed up for a volunteer shift.');
+            if($concurrentSlot)
+            {
+                $request->session()->flash('warning', 'You are currently also signed up elsewhere INSERT HERE');
+            }
+            else
+            {
+                $request->session()->flash('success', 'You signed up for a volunteer shift.');
+            }
 
             // If a password was used
             if($slot->schedule->password)
diff --git a/laravel/resources/views/app.blade.php b/laravel/resources/views/app.blade.php
index 7ec33ce7..121d5991 100644
--- a/laravel/resources/views/app.blade.php
+++ b/laravel/resources/views/app.blade.php
@@ -33,6 +33,12 @@
                 </div>
             @endif
 
+            @if(Session::has('warning'))
+                <div class="general-alert alert alert-warning" role="alert">
+                    <b>Warning!</b> {{ Session::get('warning') }}
+                </div>
+            @endif
+
             @if(Session::has('error'))
                 <div class="general-alert alert alert-danger" role="alert">
                     <b>Error!</b> {{ Session::get('error') }}

From 9ac1f4e01b87979ede3ddf0293376565f52ea155 Mon Sep 17 00:00:00 2001
From: ritualsfinal <solverjt@gmail.com>
Date: Fri, 31 May 2019 17:51:48 -0600
Subject: [PATCH 02/17] [feature] warnings present when admin assinging
 overlapping shifts

---
 .../app/Http/Controllers/SlotController.php   | 75 ++++++++++++-------
 laravel/resources/views/app.blade.php         |  2 +-
 .../resources/views/pages/slot/view.blade.php |  1 +
 3 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index 24fe3a50..c20f6602 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -101,36 +101,41 @@ public function take(SlotRequest $request, Slot $slot)
         if(is_null($slot->user))
         {
             $concurrentSlot = Slot::where('user_id', Auth::user()->id)
-                        ->where('start_date', $slot->start_date)
-                        ->where('start_time', '<', $slot->end_time)
-                        ->where('end_time', '>', $slot->start_time)
-                        ->first();
+                                    ->where('start_date', $slot->start_date)
+                                    ->where('start_time', '<', $slot->end_time)
+                                    ->where('end_time', '>', $slot->start_time)
+                                    ->first();
 
-            $slot->user_id = Auth::user()->id;
-            $slot->save();
-
-            event(new SlotChanged($slot, ['status' => 'taken', 'name' => Auth::user()->name]));
-            if($concurrentSlot)
+            if( $concurrentSlot && $request->input('warned') === '' )
             {
-                $request->session()->flash('warning', 'You are currently also signed up elsewhere INSERT HERE');
+                $warning_message = 'You\'re currently signed up for another ';
+                $warning_message .= '<a href="'.env('SITE_URL').'/slot/'.$concurrentSlot->id.'/view">overlapping shift</a>';
+                $warning_message .= '. Are you sure you want to sign up?';
+                $request->session()->flash('warning', $warning_message);
+                $request->session()->flash('concurrentSlotWarning', true);
+                return back();
             }
             else
             {
-                $request->session()->flash('success', 'You signed up for a volunteer shift.');
-            }
+                $slot->user_id = Auth::user()->id;
+                $slot->save();
 
-            // If a password was used
-            if($slot->schedule->password)
-            {
-                // Assign the user to any roles this shift requires
-                $roles = [];
+                event(new SlotChanged($slot, ['status' => 'taken', 'name' => Auth::user()->name]));
+                $request->session()->flash('success', 'You signed up for a volunteer shift.');
 
-                foreach($slot->schedule->getRoles() as $role)
+                // If a password was used
+                if($slot->schedule->password)
                 {
-                    $roles[] = $role->role->name;
-                }
+                    // Assign the user to any roles this shift requires
+                    $roles = [];
+
+                    foreach($slot->schedule->getRoles() as $role)
+                    {
+                        $roles[] = $role->role->name;
+                    }
 
-                UserRole::assign(Auth::user(), $roles);
+                    UserRole::assign(Auth::user(), $roles);
+                }
             }
         }
         else
@@ -205,14 +210,32 @@ public function adminAssign(Request $request, Slot $slot)
     {
         $user = User::findorFail($request->get('user'));
 
+        $username = Helpers::displayName($user, false);
+
         if(is_null($slot->user))
         {
-            $username = Helpers::displayName($user, false);
+            $concurrentSlot = Slot::where('user_id', $user->id)
+                                    ->where('start_date', $slot->start_date)
+                                    ->where('start_time', '<', $slot->end_time)
+                                    ->where('end_time', '>', $slot->start_time)
+                                    ->first();
 
-            $slot->user_id=$user->data->user_id;
-            $slot->save();
-            event(new SlotChanged($slot, ['status' => 'taken']));
-            $request->session()->flash('success', 'You added '.$username.' to this shift');
+            if( $concurrentSlot && $request->input('warned') === '' )
+            {
+                $warning_message = $username.' is currently signed up for another ';
+                $warning_message .= '<a href="'.env('SITE_URL').'/slot/'.$concurrentSlot->id.'/view">overlapping shift</a>';
+                $warning_message .= '. Are you sure you want to sign them up?';
+                $request->session()->flash('warning', $warning_message);
+                $request->session()->flash('concurrentSlotWarning', true);
+                return back();
+            }
+            else
+            {
+                $slot->user_id=$user->data->user_id;
+                $slot->save();
+                event(new SlotChanged($slot, ['status' => 'taken']));
+                $request->session()->flash('success', 'You added '.$username.' to this shift');
+            }
         }
         return redirect('/event/'.$slot->event->id);
     }
diff --git a/laravel/resources/views/app.blade.php b/laravel/resources/views/app.blade.php
index 121d5991..393ce8bf 100644
--- a/laravel/resources/views/app.blade.php
+++ b/laravel/resources/views/app.blade.php
@@ -35,7 +35,7 @@
 
             @if(Session::has('warning'))
                 <div class="general-alert alert alert-warning" role="alert">
-                    <b>Warning!</b> {{ Session::get('warning') }}
+                    <b>Warning!</b> {!! Session::get('warning') !!}
                 </div>
             @endif
 
diff --git a/laravel/resources/views/pages/slot/view.blade.php b/laravel/resources/views/pages/slot/view.blade.php
index d6cd1bb9..a84e4526 100644
--- a/laravel/resources/views/pages/slot/view.blade.php
+++ b/laravel/resources/views/pages/slot/view.blade.php
@@ -163,6 +163,7 @@
                 Please arrive at least 15 minutes ahead of time to be briefed by the previous shift team and answer any questions you have.
             </p>
 
+            <input type="hidden" name="warned" value="{{ Session::get('concurrentSlotWarning') }}">
             <button type="submit" class="btn btn-success">Take Shift</button>
         @endif
 

From dcdf4168b418ad9d0d26e3b4f53205c82bf85ade Mon Sep 17 00:00:00 2001
From: ritualsfinal <solverjt@gmail.com>
Date: Sun, 2 Jun 2019 15:21:20 -0600
Subject: [PATCH 03/17] [refactor] split formatting of warning page into
 partial

~ moved indirect access to controller
~ some more consistent nameing changes
---
 .../app/Http/Controllers/SlotController.php   | 42 +++++++++++--------
 laravel/resources/views/app.blade.php         |  6 ++-
 .../resources/views/pages/slot/view.blade.php |  2 +-
 .../warning/concurrent-slot.blade.php         | 11 +++++
 4 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 laravel/resources/views/partials/warning/concurrent-slot.blade.php

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index c20f6602..b2169961 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -100,19 +100,21 @@ public function take(SlotRequest $request, Slot $slot)
         // Has somebody else already taken this slot?
         if(is_null($slot->user))
         {
-            $concurrentSlot = Slot::where('user_id', Auth::user()->id)
+            $concurrent_slot = Slot::where('user_id', Auth::user()->id)
                                     ->where('start_date', $slot->start_date)
                                     ->where('start_time', '<', $slot->end_time)
                                     ->where('end_time', '>', $slot->start_time)
                                     ->first();
 
-            if( $concurrentSlot && $request->input('warned') === '' )
+            if( $concurrent_slot && intval($request->input('warned-user-id')) !== Auth::user()->id )
             {
-                $warning_message = 'You\'re currently signed up for another ';
-                $warning_message .= '<a href="'.env('SITE_URL').'/slot/'.$concurrentSlot->id.'/view">overlapping shift</a>';
-                $warning_message .= '. Are you sure you want to sign up?';
-                $request->session()->flash('warning', $warning_message);
-                $request->session()->flash('concurrentSlotWarning', true);
+                $layout = 'concurrent-slot';
+                $user_id = Auth::user()->id;
+                $concurrent_slot_id = $concurrent_slot->id;
+
+                $warning_data = compact('layout', 'user_id', 'concurrent_slot_id');
+
+                $request->session()->flash('warning', $warning_data);
                 return back();
             }
             else
@@ -192,12 +194,12 @@ public function adminRelease(Request $request, Slot $slot)
     {
         if(!is_null($slot->user))
         {
-            $username = Helpers::displayName($slot->user, false);
+            $user_name = Helpers::displayName($slot->user, false);
 
             $slot->user_id = null;
             $slot->save();
             event(new SlotChanged($slot, ['status' => 'released']));
-            $request->session()->flash('success', $username.' is removed!!');
+            $request->session()->flash('success', $user_name.' is removed!!');
         }
         else
         {
@@ -210,23 +212,27 @@ public function adminAssign(Request $request, Slot $slot)
     {
         $user = User::findorFail($request->get('user'));
 
-        $username = Helpers::displayName($user, false);
+        $user_name = Helpers::displayName($user, false);
 
         if(is_null($slot->user))
         {
-            $concurrentSlot = Slot::where('user_id', $user->id)
+            $concurrent_slot = Slot::where('user_id', $user->id)
                                     ->where('start_date', $slot->start_date)
                                     ->where('start_time', '<', $slot->end_time)
                                     ->where('end_time', '>', $slot->start_time)
                                     ->first();
 
-            if( $concurrentSlot && $request->input('warned') === '' )
+            if( $concurrent_slot && intval($request->input('warned-user-id')) !== $user->id )
             {
-                $warning_message = $username.' is currently signed up for another ';
-                $warning_message .= '<a href="'.env('SITE_URL').'/slot/'.$concurrentSlot->id.'/view">overlapping shift</a>';
-                $warning_message .= '. Are you sure you want to sign them up?';
-                $request->session()->flash('warning', $warning_message);
-                $request->session()->flash('concurrentSlotWarning', true);
+                $layout = 'concurrent-slot';
+                $user_id = $user->id;
+                $user_name = $user_name;
+                $concurrent_slot_id = $concurrent_slot->id;
+                $admin = true;
+
+                $warning_data = compact('layout', 'user_id', 'user_name', 'concurrent_slot_id', 'admin');
+
+                $request->session()->flash('warning', $warning_data);
                 return back();
             }
             else
@@ -234,7 +240,7 @@ public function adminAssign(Request $request, Slot $slot)
                 $slot->user_id=$user->data->user_id;
                 $slot->save();
                 event(new SlotChanged($slot, ['status' => 'taken']));
-                $request->session()->flash('success', 'You added '.$username.' to this shift');
+                $request->session()->flash('success', 'You added '.$user_name.' to this shift');
             }
         }
         return redirect('/event/'.$slot->event->id);
diff --git a/laravel/resources/views/app.blade.php b/laravel/resources/views/app.blade.php
index 393ce8bf..ef9615d6 100644
--- a/laravel/resources/views/app.blade.php
+++ b/laravel/resources/views/app.blade.php
@@ -35,7 +35,11 @@
 
             @if(Session::has('warning'))
                 <div class="general-alert alert alert-warning" role="alert">
-                    <b>Warning!</b> {!! Session::get('warning') !!}
+                    @if(isset(Session::get('warning')['layout']))
+                        <b>Warning!</b> @include('partials.warning.'.Session::get('warning')['layout'], Session::get('warning'))
+                    @else
+                        <b>Warning!</b> {{ Session::get('warning') }}
+                    @endif
                 </div>
             @endif
 
diff --git a/laravel/resources/views/pages/slot/view.blade.php b/laravel/resources/views/pages/slot/view.blade.php
index a84e4526..8778e441 100644
--- a/laravel/resources/views/pages/slot/view.blade.php
+++ b/laravel/resources/views/pages/slot/view.blade.php
@@ -163,7 +163,7 @@
                 Please arrive at least 15 minutes ahead of time to be briefed by the previous shift team and answer any questions you have.
             </p>
 
-            <input type="hidden" name="warned" value="{{ Session::get('concurrentSlotWarning') }}">
+            <input type="hidden" name="warned-user-id" value="{{ Session::get('warning')['user_id'] }}">
             <button type="submit" class="btn btn-success">Take Shift</button>
         @endif
 
diff --git a/laravel/resources/views/partials/warning/concurrent-slot.blade.php b/laravel/resources/views/partials/warning/concurrent-slot.blade.php
new file mode 100644
index 00000000..86ecd39d
--- /dev/null
+++ b/laravel/resources/views/partials/warning/concurrent-slot.blade.php
@@ -0,0 +1,11 @@
+<span>
+@if(isset($admin) && $admin === true)
+    {{ $user_name }} is currently signed up for another
+    <a href=" {{ env('SITE_URL') }} /slot/{{ $concurrent_slot_id }}/view">overlapping shift</a>.
+    Are you sure you want to sign them up for this shift?
+@else
+    You are currently signed up for another
+    <a href=" {{ env('SITE_URL') }} /slot/{{ $concurrent_slot_id }}/view">overlapping shift</a>.
+    Are you sure you want to sign up for this shift?
+@endif
+</span>

From 6407c59ed46530846e3f3804093483a7ad1c15d0 Mon Sep 17 00:00:00 2001
From: ritualsfinal <solverjt@gmail.com>
Date: Mon, 3 Jun 2019 04:18:22 -0600
Subject: [PATCH 04/17] [refactor] took warning logic out of assignments

+ [docs] also included for how the warning code works
---
 .../app/Http/Controllers/SlotController.php   | 117 ++++++++++--------
 .../resources/views/pages/slot/view.blade.php |   2 +-
 2 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index b2169961..3319976c 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -100,44 +100,32 @@ public function take(SlotRequest $request, Slot $slot)
         // Has somebody else already taken this slot?
         if(is_null($slot->user))
         {
-            $concurrent_slot = Slot::where('user_id', Auth::user()->id)
-                                    ->where('start_date', $slot->start_date)
-                                    ->where('start_time', '<', $slot->end_time)
-                                    ->where('end_time', '>', $slot->start_time)
-                                    ->first();
-
-            if( $concurrent_slot && intval($request->input('warned-user-id')) !== Auth::user()->id )
+            $concurrent_slot_warning = $this->warnIfConcurrentSlotForUserExists($request, $slot, Auth::user());
+            if($concurrent_slot_warning)
             {
-                $layout = 'concurrent-slot';
-                $user_id = Auth::user()->id;
-                $concurrent_slot_id = $concurrent_slot->id;
+                return $concurrent_slot_warning;
+            }
 
-                $warning_data = compact('layout', 'user_id', 'concurrent_slot_id');
 
-                $request->session()->flash('warning', $warning_data);
-                return back();
-            }
-            else
-            {
-                $slot->user_id = Auth::user()->id;
-                $slot->save();
 
-                event(new SlotChanged($slot, ['status' => 'taken', 'name' => Auth::user()->name]));
-                $request->session()->flash('success', 'You signed up for a volunteer shift.');
+            $slot->user_id = Auth::user()->id;
+            $slot->save();
 
-                // If a password was used
-                if($slot->schedule->password)
-                {
-                    // Assign the user to any roles this shift requires
-                    $roles = [];
+            event(new SlotChanged($slot, ['status' => 'taken', 'name' => Auth::user()->name]));
+            $request->session()->flash('success', 'You signed up for a volunteer shift.');
 
-                    foreach($slot->schedule->getRoles() as $role)
-                    {
-                        $roles[] = $role->role->name;
-                    }
+            // If a password was used
+            if($slot->schedule->password)
+            {
+                // Assign the user to any roles this shift requires
+                $roles = [];
 
-                    UserRole::assign(Auth::user(), $roles);
+                foreach($slot->schedule->getRoles() as $role)
+                {
+                    $roles[] = $role->role->name;
                 }
+
+                UserRole::assign(Auth::user(), $roles);
             }
         }
         else
@@ -216,33 +204,58 @@ public function adminAssign(Request $request, Slot $slot)
 
         if(is_null($slot->user))
         {
-            $concurrent_slot = Slot::where('user_id', $user->id)
-                                    ->where('start_date', $slot->start_date)
-                                    ->where('start_time', '<', $slot->end_time)
-                                    ->where('end_time', '>', $slot->start_time)
-                                    ->first();
-
-            if( $concurrent_slot && intval($request->input('warned-user-id')) !== $user->id )
+            $concurrent_slot_warning = $this->warnIfConcurrentSlotForUserExists($request, $slot, $user, true);
+            if($concurrent_slot_warning)
             {
-                $layout = 'concurrent-slot';
-                $user_id = $user->id;
-                $user_name = $user_name;
-                $concurrent_slot_id = $concurrent_slot->id;
-                $admin = true;
+                return $concurrent_slot_warning;
+            }
 
-                $warning_data = compact('layout', 'user_id', 'user_name', 'concurrent_slot_id', 'admin');
+            $slot->user_id=$user->data->user_id;
+            $slot->save();
+            event(new SlotChanged($slot, ['status' => 'taken']));
+            $request->session()->flash('success', 'You added '.$user_name.' to this shift');
+        }
+        return redirect('/event/'.$slot->event->id);
+    }
 
-                $request->session()->flash('warning', $warning_data);
-                return back();
-            }
-            else
+    /**
+     * Give a warning, if one hasn't already been delivered, to the client if a
+     * the user is trying to sign up or an admin is attempting to sign a user
+     * up for a slot one that overlaps with another slot the user is assigned
+     * to.
+     *
+     * @param  Request $request the client request
+     * @param  Slot    $slot    a currently unoccupied slot
+     * @param  User    $user    the user that will fill the slot
+     * @param  boolean $admin   whether or not this an admin request
+     * @return Response         a warning response or null
+     */
+    private function warnIfConcurrentSlotForUserExists(Request $request, Slot $slot, User $user, $admin=false)
+    {
+        //search for all user occupied slots that are concurrent with the given one
+        $concurrent_slot = Slot::where('user_id', $user->id)
+                                ->where('start_date', $slot->start_date)
+                                ->where('start_time', '<', $slot->end_time)
+                                ->where('end_time', '>', $slot->start_time)
+                                ->first();
+
+        //check if an overlapping slot for the user exists
+        if($concurrent_slot)
+        {
+            //check if the client has already been warned that the user has a concurrent slot
+            if(intval($request->input('concurrent-slot-warning-user-id')) !== $user->id)
             {
-                $slot->user_id=$user->data->user_id;
-                $slot->save();
-                event(new SlotChanged($slot, ['status' => 'taken']));
-                $request->session()->flash('success', 'You added '.$user_name.' to this shift');
+                $request->session()->flash('warning', [
+                    'layout' => 'concurrent-slot',
+                    'user' => $user,
+                    'slot' => $slot,
+                    'admin' => $admin,
+                    'user_id' => $user->id,
+                    'user_name' => Helpers::displayName($user, false),
+                    'concurrent_slot_id' => $concurrent_slot->id
+                ]);
+                return back();
             }
         }
-        return redirect('/event/'.$slot->event->id);
     }
 }
diff --git a/laravel/resources/views/pages/slot/view.blade.php b/laravel/resources/views/pages/slot/view.blade.php
index 8778e441..05927c36 100644
--- a/laravel/resources/views/pages/slot/view.blade.php
+++ b/laravel/resources/views/pages/slot/view.blade.php
@@ -163,7 +163,7 @@
                 Please arrive at least 15 minutes ahead of time to be briefed by the previous shift team and answer any questions you have.
             </p>
 
-            <input type="hidden" name="warned-user-id" value="{{ Session::get('warning')['user_id'] }}">
+            <input type="hidden" name="concurrent-slot-warning-user-id" value="{{ Session::get('warning')['user_id'] }}">
             <button type="submit" class="btn btn-success">Take Shift</button>
         @endif
 

From ee6f963889ad2b42056ad184d128672e29764efe Mon Sep 17 00:00:00 2001
From: ritualsfinal <solverjt@gmail.com>
Date: Mon, 3 Jun 2019 04:29:17 -0600
Subject: [PATCH 05/17] [scrap] removed experimental feature warning admins of
 overlapping slots

This may come in handy later, but is entirely besides the main point and
beyond the scope of the issue.
---
 laravel/app/Http/Controllers/SlotController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index 3319976c..3f9860d8 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -204,11 +204,11 @@ public function adminAssign(Request $request, Slot $slot)
 
         if(is_null($slot->user))
         {
-            $concurrent_slot_warning = $this->warnIfConcurrentSlotForUserExists($request, $slot, $user, true);
-            if($concurrent_slot_warning)
-            {
-                return $concurrent_slot_warning;
-            }
+            // $concurrent_slot_warning = $this->warnIfConcurrentSlotForUserExists($request, $slot, $user, true);
+            // if($concurrent_slot_warning)
+            // {
+            //     return $concurrent_slot_warning;
+            // }
 
             $slot->user_id=$user->data->user_id;
             $slot->save();

From 14211ece7b904ac125bf38ec32b74b996ce090ba Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Mon, 10 Jun 2019 19:21:04 -0600
Subject: [PATCH 06/17] [build] introduced working test environment

---
 laravel/package.json                     |  3 ++-
 laravel/tests/ExampleTest.php            | 19 -------------------
 laravel/tests/Feature/SlotAssignTest.php | 20 ++++++++++++++++++++
 laravel/tests/TestCase.php               |  9 +++++++--
 4 files changed, 29 insertions(+), 22 deletions(-)
 delete mode 100644 laravel/tests/ExampleTest.php
 create mode 100644 laravel/tests/Feature/SlotAssignTest.php

diff --git a/laravel/package.json b/laravel/package.json
index 2017e0ee..a00e453a 100644
--- a/laravel/package.json
+++ b/laravel/package.json
@@ -2,7 +2,8 @@
   "private": true,
   "scripts": {
     "build": "./node_modules/.bin/webpack",
-    "dev": "./node_modules/.bin/webpack --config webpack.dev.config.js --watch"
+    "dev": "./node_modules/.bin/webpack --config webpack.dev.config.js --watch",
+    "test": "./vendor/bin/phpunit tests"
   },
   "devDependencies": {
     "babel-core": "^6.22.1",
diff --git a/laravel/tests/ExampleTest.php b/laravel/tests/ExampleTest.php
deleted file mode 100644
index 7e81d37a..00000000
--- a/laravel/tests/ExampleTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-
-class ExampleTest extends TestCase
-{
-    /**
-     * A basic functional test example.
-     *
-     * @return void
-     */
-    public function testBasicExample()
-    {
-        $this->visit('/')
-             ->see('Laravel 5');
-    }
-}
diff --git a/laravel/tests/Feature/SlotAssignTest.php b/laravel/tests/Feature/SlotAssignTest.php
new file mode 100644
index 00000000..719376c1
--- /dev/null
+++ b/laravel/tests/Feature/SlotAssignTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Tests\Feature;
+
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class SlotAssignTest extends TestCase
+{
+    /**
+     * A basic test example.
+     * @test
+     * @return void
+     */
+    public function testExample()
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/laravel/tests/TestCase.php b/laravel/tests/TestCase.php
index 8578b17e..5aeaa520 100644
--- a/laravel/tests/TestCase.php
+++ b/laravel/tests/TestCase.php
@@ -1,6 +1,11 @@
 <?php
 
-class TestCase extends Illuminate\Foundation\Testing\TestCase
+namespace Tests;
+
+use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Illuminate\Contracts\Console\Kernel;
+
+class TestCase extends BaseTestCase
 {
     /**
      * The base URL to use while testing the application.
@@ -18,7 +23,7 @@ public function createApplication()
     {
         $app = require __DIR__.'/../bootstrap/app.php';
 
-        $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
+        $app->make(Kernel::class)->bootstrap();
 
         return $app;
     }

From 1bf2ceb1d0f5fdc53a9fd3c5b1a83f5dd120d942 Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Thu, 13 Jun 2019 15:22:56 -0600
Subject: [PATCH 07/17] [build] more test testing

+ slot factory for quick build
~ more robust factories
~ a way to shut off env
+ more scripts for testing
~ better slot tests
---
 laravel/config/app.php                        | 15 ++++-
 .../database/factories/DepartmentFactory.php  |  4 +-
 laravel/database/factories/EventFactory.php   |  2 +-
 .../database/factories/ScheduleFactory.php    | 12 ++--
 laravel/database/factories/ShiftFactory.php   |  6 +-
 laravel/database/factories/SlotFactory.php    | 15 +++++
 laravel/package.json                          |  3 +-
 laravel/tests/Feature/SlotAssignTest.php      | 56 +++++++++++++++++--
 8 files changed, 97 insertions(+), 16 deletions(-)
 create mode 100644 laravel/database/factories/SlotFactory.php

diff --git a/laravel/config/app.php b/laravel/config/app.php
index 3ad588a5..5bf823a7 100644
--- a/laravel/config/app.php
+++ b/laravel/config/app.php
@@ -2,6 +2,19 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Application Environment
+    |--------------------------------------------------------------------------
+    |
+    | This value determines the "environment" your application is currently
+    | running in. This may determine how you prefer to configure various
+    | services the application utilizes. Set this in your ".env" file.
+    |
+    */
+
+    'env' => env('APP_ENV', 'production'),
+
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode
@@ -134,7 +147,7 @@
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
-        
+
         /*
          * Application Service Providers...
          */
diff --git a/laravel/database/factories/DepartmentFactory.php b/laravel/database/factories/DepartmentFactory.php
index 671d9dd0..24bd1f8a 100644
--- a/laravel/database/factories/DepartmentFactory.php
+++ b/laravel/database/factories/DepartmentFactory.php
@@ -1,13 +1,13 @@
 <?php
 
-use Carbon\Carbon;
 use App\Models\Department;
+use App\Models\Event;
 
 $factory->define(Department::class, function (Faker\Generator $faker)
 {
     return
     [
-        'event_id' => 1,
+        'event_id' => Event::all()->map->id->random(),
         'name' => $faker->company,
         'description' => $faker->bs
     ];
diff --git a/laravel/database/factories/EventFactory.php b/laravel/database/factories/EventFactory.php
index b6e8067b..947dac23 100644
--- a/laravel/database/factories/EventFactory.php
+++ b/laravel/database/factories/EventFactory.php
@@ -5,7 +5,7 @@
 
 $factory->define(Event::class, function (Faker\Generator $faker, $data)
 {
-    $start_date = (isset($data['start_date']) ? $data['start_date'] : Carbon::now());
+    $start_date = Carbon::now();
     return
     [
         'name' => $faker->sentence(2),
diff --git a/laravel/database/factories/ScheduleFactory.php b/laravel/database/factories/ScheduleFactory.php
index 77800b52..657dee88 100644
--- a/laravel/database/factories/ScheduleFactory.php
+++ b/laravel/database/factories/ScheduleFactory.php
@@ -2,16 +2,18 @@
 
 use Carbon\Carbon;
 use App\Models\Schedule;
+use App\Models\Department;
+use App\Models\Shift;
+
 
 $factory->define(Schedule::class, function (Faker\Generator $faker, $data)
 {
-    $dates = json_decode($data['dates'], true);
     return
     [
-        'department_id' => 1,
-        'shift_id' => 1,
-        'start_date' => $dates[0],
-        'end_date' => end($dates),
+        'department_id' => Department::all()->map->id->random(),
+        'shift_id' => Shift::all()->map->id->random(),
+        'start_date' => $faker->dateTime->format('Y-m-d'),
+        'end_date' => $faker->dateTime->modify('+30 day')->format('Y-m-d'),
         'start_time' => Carbon::createFromFormat('H', $faker->numberBetween(0,10))->toTimeString(),
         'end_time' => Carbon::createFromFormat('H', $faker->numberBetween(14,23))->toTimeString(),
         'duration' => Carbon::createFromFormat('H', $faker->numberBetween(2,4))->toTimeString(),
diff --git a/laravel/database/factories/ShiftFactory.php b/laravel/database/factories/ShiftFactory.php
index 9a887d2d..86ec404a 100644
--- a/laravel/database/factories/ShiftFactory.php
+++ b/laravel/database/factories/ShiftFactory.php
@@ -2,13 +2,15 @@
 
 use Carbon\Carbon;
 use App\Models\Shift;
+use App\Models\Event;
+use App\Models\Department;
 
 $factory->define(Shift::class, function (Faker\Generator $faker)
 {
     return
     [
-        'event_id' => 1,
-        'department_id' => 1,
+        'event_id' => Event::all()->map->id->random(),
+        'department_id' => Department::all()->map->id->random(),
         'name' => $faker->jobTitle,
         'description' => $faker->bs
     ];
diff --git a/laravel/database/factories/SlotFactory.php b/laravel/database/factories/SlotFactory.php
new file mode 100644
index 00000000..f62ca1fa
--- /dev/null
+++ b/laravel/database/factories/SlotFactory.php
@@ -0,0 +1,15 @@
+<?php
+
+use Faker\Generator as Faker;
+use App\Models\Slot;
+use App\Models\Schedule;
+
+$factory->define(Slot::class, function (Faker $faker) {
+    return [
+        'schedule_id' => Schedule::all()->map->id->random(),
+        'start_date' => $faker->dateTimeThisYear->format('Y-m-d'),
+        'start_time'=> $faker->time('H:i'),
+        'end_time' => $faker->time('H:i'),
+        'row' => 3
+    ];
+});
diff --git a/laravel/package.json b/laravel/package.json
index a00e453a..8b8696cd 100644
--- a/laravel/package.json
+++ b/laravel/package.json
@@ -3,7 +3,8 @@
   "scripts": {
     "build": "./node_modules/.bin/webpack",
     "dev": "./node_modules/.bin/webpack --config webpack.dev.config.js --watch",
-    "test": "./vendor/bin/phpunit tests"
+    "test": "./vendor/bin/phpunit --debug tests",
+    "watch:test": "watch --color npm run --silent test"
   },
   "devDependencies": {
     "babel-core": "^6.22.1",
diff --git a/laravel/tests/Feature/SlotAssignTest.php b/laravel/tests/Feature/SlotAssignTest.php
index 719376c1..64069a8f 100644
--- a/laravel/tests/Feature/SlotAssignTest.php
+++ b/laravel/tests/Feature/SlotAssignTest.php
@@ -2,19 +2,67 @@
 
 namespace Tests\Feature;
 
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\WithFaker;
+use App\Models\Department;
+use App\Models\Event;
+use App\Models\Schedule;
+use App\Models\Shift;
+use App\Models\Slot;
+use App\Models\User;
+use App\Models\UserData;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class SlotAssignTest extends TestCase
 {
+    use RefreshDatabase;
+
     /**
+     * [setUpBeforeClass description]
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->user = factory(User::class)->create();
+        factory(UserData::class)->create([
+            'user_id' => $this->user->id
+        ]);
+        $this->event = factory(Event::class)->create();
+        $this->department = factory(Department::class)->create();
+        $this->shift = factory(Shift::class)->create();
+        $this->schedule = factory(Schedule::class)->create();
+        $this->slot = factory(Slot::class)->create();
+    }
+
+    /**
+     * @test
      * A basic test example.
+     *
+     * @return void
+     */
+    public function user_can_see_a_slot()
+    {
+        $response = $this->actingAs($this->user)
+            ->get('/slot/' . $this->slot->id . '/view');
+
+        $response->assertStatus(200);
+    }
+
+    /**
      * @test
+     * A basic test example.
+     *
      * @return void
      */
-    public function testExample()
+    public function user_can_take_a_slot()
     {
-        $this->assertTrue(true);
+        $response = $this->actingAs($this->user)
+            ->post('/slot/' . $this->slot->id . '/take');
+
+        var_dump($response->getContent());
+
+        $response->assertRedirect('/');
+
+        $response->assertJson(['warning' => $this->slot->id]);
     }
 }

From 35183a78288d68c37e37073003d10ddd48e2a57e Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Fri, 14 Jun 2019 07:45:03 -0600
Subject: [PATCH 08/17] Revert "[build] more test testing"

This reverts commit 1bf2ceb1d0f5fdc53a9fd3c5b1a83f5dd120d942.
---
 laravel/config/app.php                        | 15 +----
 .../database/factories/DepartmentFactory.php  |  4 +-
 laravel/database/factories/EventFactory.php   |  2 +-
 .../database/factories/ScheduleFactory.php    | 12 ++--
 laravel/database/factories/ShiftFactory.php   |  6 +-
 laravel/database/factories/SlotFactory.php    | 15 -----
 laravel/package.json                          |  3 +-
 laravel/tests/Feature/SlotAssignTest.php      | 56 ++-----------------
 8 files changed, 16 insertions(+), 97 deletions(-)
 delete mode 100644 laravel/database/factories/SlotFactory.php

diff --git a/laravel/config/app.php b/laravel/config/app.php
index 5bf823a7..3ad588a5 100644
--- a/laravel/config/app.php
+++ b/laravel/config/app.php
@@ -2,19 +2,6 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Application Environment
-    |--------------------------------------------------------------------------
-    |
-    | This value determines the "environment" your application is currently
-    | running in. This may determine how you prefer to configure various
-    | services the application utilizes. Set this in your ".env" file.
-    |
-    */
-
-    'env' => env('APP_ENV', 'production'),
-
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode
@@ -147,7 +134,7 @@
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
-
+        
         /*
          * Application Service Providers...
          */
diff --git a/laravel/database/factories/DepartmentFactory.php b/laravel/database/factories/DepartmentFactory.php
index 24bd1f8a..671d9dd0 100644
--- a/laravel/database/factories/DepartmentFactory.php
+++ b/laravel/database/factories/DepartmentFactory.php
@@ -1,13 +1,13 @@
 <?php
 
+use Carbon\Carbon;
 use App\Models\Department;
-use App\Models\Event;
 
 $factory->define(Department::class, function (Faker\Generator $faker)
 {
     return
     [
-        'event_id' => Event::all()->map->id->random(),
+        'event_id' => 1,
         'name' => $faker->company,
         'description' => $faker->bs
     ];
diff --git a/laravel/database/factories/EventFactory.php b/laravel/database/factories/EventFactory.php
index 947dac23..b6e8067b 100644
--- a/laravel/database/factories/EventFactory.php
+++ b/laravel/database/factories/EventFactory.php
@@ -5,7 +5,7 @@
 
 $factory->define(Event::class, function (Faker\Generator $faker, $data)
 {
-    $start_date = Carbon::now();
+    $start_date = (isset($data['start_date']) ? $data['start_date'] : Carbon::now());
     return
     [
         'name' => $faker->sentence(2),
diff --git a/laravel/database/factories/ScheduleFactory.php b/laravel/database/factories/ScheduleFactory.php
index 657dee88..77800b52 100644
--- a/laravel/database/factories/ScheduleFactory.php
+++ b/laravel/database/factories/ScheduleFactory.php
@@ -2,18 +2,16 @@
 
 use Carbon\Carbon;
 use App\Models\Schedule;
-use App\Models\Department;
-use App\Models\Shift;
-
 
 $factory->define(Schedule::class, function (Faker\Generator $faker, $data)
 {
+    $dates = json_decode($data['dates'], true);
     return
     [
-        'department_id' => Department::all()->map->id->random(),
-        'shift_id' => Shift::all()->map->id->random(),
-        'start_date' => $faker->dateTime->format('Y-m-d'),
-        'end_date' => $faker->dateTime->modify('+30 day')->format('Y-m-d'),
+        'department_id' => 1,
+        'shift_id' => 1,
+        'start_date' => $dates[0],
+        'end_date' => end($dates),
         'start_time' => Carbon::createFromFormat('H', $faker->numberBetween(0,10))->toTimeString(),
         'end_time' => Carbon::createFromFormat('H', $faker->numberBetween(14,23))->toTimeString(),
         'duration' => Carbon::createFromFormat('H', $faker->numberBetween(2,4))->toTimeString(),
diff --git a/laravel/database/factories/ShiftFactory.php b/laravel/database/factories/ShiftFactory.php
index 86ec404a..9a887d2d 100644
--- a/laravel/database/factories/ShiftFactory.php
+++ b/laravel/database/factories/ShiftFactory.php
@@ -2,15 +2,13 @@
 
 use Carbon\Carbon;
 use App\Models\Shift;
-use App\Models\Event;
-use App\Models\Department;
 
 $factory->define(Shift::class, function (Faker\Generator $faker)
 {
     return
     [
-        'event_id' => Event::all()->map->id->random(),
-        'department_id' => Department::all()->map->id->random(),
+        'event_id' => 1,
+        'department_id' => 1,
         'name' => $faker->jobTitle,
         'description' => $faker->bs
     ];
diff --git a/laravel/database/factories/SlotFactory.php b/laravel/database/factories/SlotFactory.php
deleted file mode 100644
index f62ca1fa..00000000
--- a/laravel/database/factories/SlotFactory.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-use Faker\Generator as Faker;
-use App\Models\Slot;
-use App\Models\Schedule;
-
-$factory->define(Slot::class, function (Faker $faker) {
-    return [
-        'schedule_id' => Schedule::all()->map->id->random(),
-        'start_date' => $faker->dateTimeThisYear->format('Y-m-d'),
-        'start_time'=> $faker->time('H:i'),
-        'end_time' => $faker->time('H:i'),
-        'row' => 3
-    ];
-});
diff --git a/laravel/package.json b/laravel/package.json
index 8b8696cd..a00e453a 100644
--- a/laravel/package.json
+++ b/laravel/package.json
@@ -3,8 +3,7 @@
   "scripts": {
     "build": "./node_modules/.bin/webpack",
     "dev": "./node_modules/.bin/webpack --config webpack.dev.config.js --watch",
-    "test": "./vendor/bin/phpunit --debug tests",
-    "watch:test": "watch --color npm run --silent test"
+    "test": "./vendor/bin/phpunit tests"
   },
   "devDependencies": {
     "babel-core": "^6.22.1",
diff --git a/laravel/tests/Feature/SlotAssignTest.php b/laravel/tests/Feature/SlotAssignTest.php
index 64069a8f..719376c1 100644
--- a/laravel/tests/Feature/SlotAssignTest.php
+++ b/laravel/tests/Feature/SlotAssignTest.php
@@ -2,67 +2,19 @@
 
 namespace Tests\Feature;
 
-use App\Models\Department;
-use App\Models\Event;
-use App\Models\Schedule;
-use App\Models\Shift;
-use App\Models\Slot;
-use App\Models\User;
-use App\Models\UserData;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class SlotAssignTest extends TestCase
 {
-    use RefreshDatabase;
-
     /**
-     * [setUpBeforeClass description]
-     */
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->user = factory(User::class)->create();
-        factory(UserData::class)->create([
-            'user_id' => $this->user->id
-        ]);
-        $this->event = factory(Event::class)->create();
-        $this->department = factory(Department::class)->create();
-        $this->shift = factory(Shift::class)->create();
-        $this->schedule = factory(Schedule::class)->create();
-        $this->slot = factory(Slot::class)->create();
-    }
-
-    /**
-     * @test
      * A basic test example.
-     *
-     * @return void
-     */
-    public function user_can_see_a_slot()
-    {
-        $response = $this->actingAs($this->user)
-            ->get('/slot/' . $this->slot->id . '/view');
-
-        $response->assertStatus(200);
-    }
-
-    /**
      * @test
-     * A basic test example.
-     *
      * @return void
      */
-    public function user_can_take_a_slot()
+    public function testExample()
     {
-        $response = $this->actingAs($this->user)
-            ->post('/slot/' . $this->slot->id . '/take');
-
-        var_dump($response->getContent());
-
-        $response->assertRedirect('/');
-
-        $response->assertJson(['warning' => $this->slot->id]);
+        $this->assertTrue(true);
     }
 }

From 094749e674da8a60d154d6f7c0cbd9e5fc1757a6 Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Fri, 14 Jun 2019 07:45:15 -0600
Subject: [PATCH 09/17] Revert "[build] introduced working test environment"

This reverts commit 14211ece7b904ac125bf38ec32b74b996ce090ba.
---
 laravel/package.json                     |  3 +--
 laravel/tests/ExampleTest.php            | 19 +++++++++++++++++++
 laravel/tests/Feature/SlotAssignTest.php | 20 --------------------
 laravel/tests/TestCase.php               |  9 ++-------
 4 files changed, 22 insertions(+), 29 deletions(-)
 create mode 100644 laravel/tests/ExampleTest.php
 delete mode 100644 laravel/tests/Feature/SlotAssignTest.php

diff --git a/laravel/package.json b/laravel/package.json
index a00e453a..2017e0ee 100644
--- a/laravel/package.json
+++ b/laravel/package.json
@@ -2,8 +2,7 @@
   "private": true,
   "scripts": {
     "build": "./node_modules/.bin/webpack",
-    "dev": "./node_modules/.bin/webpack --config webpack.dev.config.js --watch",
-    "test": "./vendor/bin/phpunit tests"
+    "dev": "./node_modules/.bin/webpack --config webpack.dev.config.js --watch"
   },
   "devDependencies": {
     "babel-core": "^6.22.1",
diff --git a/laravel/tests/ExampleTest.php b/laravel/tests/ExampleTest.php
new file mode 100644
index 00000000..7e81d37a
--- /dev/null
+++ b/laravel/tests/ExampleTest.php
@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class ExampleTest extends TestCase
+{
+    /**
+     * A basic functional test example.
+     *
+     * @return void
+     */
+    public function testBasicExample()
+    {
+        $this->visit('/')
+             ->see('Laravel 5');
+    }
+}
diff --git a/laravel/tests/Feature/SlotAssignTest.php b/laravel/tests/Feature/SlotAssignTest.php
deleted file mode 100644
index 719376c1..00000000
--- a/laravel/tests/Feature/SlotAssignTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Tests\Feature;
-
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-
-class SlotAssignTest extends TestCase
-{
-    /**
-     * A basic test example.
-     * @test
-     * @return void
-     */
-    public function testExample()
-    {
-        $this->assertTrue(true);
-    }
-}
diff --git a/laravel/tests/TestCase.php b/laravel/tests/TestCase.php
index 5aeaa520..8578b17e 100644
--- a/laravel/tests/TestCase.php
+++ b/laravel/tests/TestCase.php
@@ -1,11 +1,6 @@
 <?php
 
-namespace Tests;
-
-use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
-use Illuminate\Contracts\Console\Kernel;
-
-class TestCase extends BaseTestCase
+class TestCase extends Illuminate\Foundation\Testing\TestCase
 {
     /**
      * The base URL to use while testing the application.
@@ -23,7 +18,7 @@ public function createApplication()
     {
         $app = require __DIR__.'/../bootstrap/app.php';
 
-        $app->make(Kernel::class)->bootstrap();
+        $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
 
         return $app;
     }

From d433e39b2fce37b09207989f2556905a23784e09 Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Tue, 25 Jun 2019 13:45:12 -0600
Subject: [PATCH 10/17] [enhance] warning on viewing concurrent slot

---
 laravel/app/Http/Controllers/SlotController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index 0ac6e415..97b59e4d 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -66,6 +66,8 @@ public function view(Request $request, Slot $slot)
             return redirect('/profile/data/edit');
         }
 
+        $this->warnIfConcurrentSlotForUserExists($request, $slot, Auth::user());
+
         return view('pages/slot/view', compact('slot'));
     }
 
@@ -103,7 +105,7 @@ public function take(SlotRequest $request, Slot $slot)
             $concurrent_slot_warning = $this->warnIfConcurrentSlotForUserExists($request, $slot, Auth::user());
             if($concurrent_slot_warning)
             {
-                return $concurrent_slot_warning;
+                return back();
             }
 
 
@@ -207,7 +209,7 @@ public function adminAssign(Request $request, Slot $slot)
             // $concurrent_slot_warning = $this->warnIfConcurrentSlotForUserExists($request, $slot, $user, true);
             // if($concurrent_slot_warning)
             // {
-            //     return $concurrent_slot_warning;
+            //     return back();
             // }
 
             $slot->user_id=$user->data->user_id;
@@ -254,8 +256,9 @@ private function warnIfConcurrentSlotForUserExists(Request $request, Slot $slot,
                     'user_name' => Helpers::displayName($user, false),
                     'concurrent_slot_id' => $concurrent_slot->id
                 ]);
-                return back();
+                return true;
             }
+            return false;
         }
     }
 }

From ceb3e0cc781467869ac1d91aab2105620dd465fb Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Mon, 15 Jul 2019 21:06:09 -0600
Subject: [PATCH 11/17] [test] writing shift protection tests

---
 .../app/Http/Controllers/SlotController.php   |  9 ++++--
 laravel/tests/Feature/SlotControllerTest.php  | 32 +++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 laravel/tests/Feature/SlotControllerTest.php

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index 97b59e4d..e9bf375a 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -54,6 +54,11 @@ private function userAllowed(Slot $slot)
             }
         }
 
+        if($slotRoles->isEmpty())
+        {
+            $allowed = true;
+        }
+
         return $allowed;
     }
 
@@ -108,8 +113,6 @@ public function take(SlotRequest $request, Slot $slot)
                 return back();
             }
 
-
-
             $slot->user_id = Auth::user()->id;
             $slot->save();
 
@@ -184,7 +187,7 @@ public function adminRelease(Request $request, Slot $slot)
     {
         if(!is_null($slot->user))
         {
-            $username = Helpers::displayName($slot->user);
+            $user_name = Helpers::displayName($slot->user);
 
             $slot->user_id = null;
             $slot->save();
diff --git a/laravel/tests/Feature/SlotControllerTest.php b/laravel/tests/Feature/SlotControllerTest.php
new file mode 100644
index 00000000..9318d1ea
--- /dev/null
+++ b/laravel/tests/Feature/SlotControllerTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Slot;
+use App\Models\UserData;
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class SlotControllerTest extends TestCase
+{
+    /**
+     * @test
+     *
+     * @return void
+     */
+    public function shift_warned_on_view()
+    {
+        $slots = factory(Slot::class, 2)->create();
+        $user = factory(UserData::class)->create()->user;
+
+        $this->actingAs($user);
+
+        // When
+        $response = $this->post("/slot/{$slots[0]->id}/take");
+        $response = $this->get("/slot/{$slots[1]->id}/view");
+
+        // Then
+        $response->assertSee("You are currently signed up for another");
+    }
+}

From 87344aefc249c2d610c8e7a9a8988ecb93c96958 Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Tue, 16 Jul 2019 00:17:24 -0600
Subject: [PATCH 12/17] [wip] using reports controller to poll if slot is
 concurrent now

---
 .../app/Http/Controllers/ReportController.php | 25 +++++++++
 .../app/Http/Controllers/SlotController.php   |  2 +-
 .../database/factories/ScheduleFactory.php    | 38 +++++++++----
 laravel/database/factories/SlotFactory.php    | 26 +++++++--
 laravel/tests/Feature/SlotControllerTest.php  | 56 +++++++++++++++++--
 5 files changed, 122 insertions(+), 25 deletions(-)

diff --git a/laravel/app/Http/Controllers/ReportController.php b/laravel/app/Http/Controllers/ReportController.php
index 76976878..d4e04a8a 100644
--- a/laravel/app/Http/Controllers/ReportController.php
+++ b/laravel/app/Http/Controllers/ReportController.php
@@ -61,6 +61,31 @@ public function searchUsers(Request $request)
         return json_encode($users);
     }
 
+    public function concurrentSlots(Request $request)
+    {
+        $user = User::find($request->get('user_id'));
+        $slot = Slot::find($request->get('slot_id'));
+
+        //search for all user occupied slots that are concurrent with the given one
+        $concurrent_slot = Slot::where('user_id', $user_id)
+                                ->where('start_date', $slot->start_date)
+                                ->where('start_time', '<', $slot->end_time)
+                                ->where('end_time', '>', $slot->start_time)
+                                ->first();
+
+        $concurrent_slots = [
+            'slot_ids' => false,
+        ];
+        //check if an overlapping slot for the user exists
+        if($concurrent_slot)
+        {
+            $concurrent_slots = [
+                'slot_ids' => true,
+            ];
+        }
+        return json_encode($concurrent_slots);
+    }
+
     public function getDepartments(Request $request)
     {
         $id = $request->get('event');
diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index e9bf375a..3d689851 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -261,7 +261,7 @@ private function warnIfConcurrentSlotForUserExists(Request $request, Slot $slot,
                 ]);
                 return true;
             }
-            return false;
         }
+        return false;
     }
 }
diff --git a/laravel/database/factories/ScheduleFactory.php b/laravel/database/factories/ScheduleFactory.php
index e77002f9..10bfe2ed 100644
--- a/laravel/database/factories/ScheduleFactory.php
+++ b/laravel/database/factories/ScheduleFactory.php
@@ -22,23 +22,37 @@
     $duration_min = 2; //hours
     $duration_max = 8; //hours
 
+    $days_min = 2;
+    $days_max = 4;
+
     $volunteer_min = 1;
     $volunteer_max = 3;
 
-    $start_datetime = Carbon::tomorrow();
-    $end_datetime = $start_datetime->copy()->addDays($faker->numberBetween(2,4));
-
-    $duration = Carbon::createFromTime($faker->numberBetween($duration_min, $duration_max));
-    $start_time = Carbon::createFromTime($faker->numberBetween(0, 23));
-    $end_time = $start_time->addHours($duration->hour);
-
     return
     [
-        'start_date' => $start_datetime->format('Y-m-d'),
-        'end_date' => $end_datetime->format('Y-m-d'),
-        'start_time' => $start_time->format('H:M:S'),
-        'end_time' => $end_time->format('H:M:S'),
-        'duration' => $duration->format('H:M:S'),
+        'start_date' => Carbon::tomorrow()->addDays(1)->format('Y-m-d'),
+        'end_date' => function($schedule) use ($faker, $days_min, $days_max)
+        {
+            $duration = $faker->numberBetween($days_min,$days_max);
+            $start_date = Carbon::createFromFormat('Y-m-d', $schedule['start_date']);
+            $end_date = $start_date->addDays($duration);
+            return $end_date->format('Y-m-d');
+        },
+        'start_time' => Carbon::createFromTime($faker->numberBetween(0, 23))->format('H:i:s'),
+        'end_time' => function($schedule) use ($faker, $duration_min, $duration_max)
+        {
+            $duration = $faker->numberBetween($duration_min, $duration_max);
+            $start_time = Carbon::createFromFormat('H:i:s', $schedule['start_time']);
+            $end_time = $start_time->addHours($duration);
+            return $end_time->format('H:i:s');
+        },
+        'duration' => function($schedule)
+        {
+            $start_time = Carbon::createFromFormat('H:i:s', $schedule['start_time']);
+            $end_time = Carbon::createFromFormat('H:i:s', $schedule['end_time']);
+            $duration = $end_time->diff($start_time);
+            return $duration->format('H:i:s');
+        },
         'volunteers' => $faker->numberBetween($volunteer_min, $volunteer_max),
         'department_id' => function ($schedule)
         {
diff --git a/laravel/database/factories/SlotFactory.php b/laravel/database/factories/SlotFactory.php
index 5b2be74e..233edfbd 100644
--- a/laravel/database/factories/SlotFactory.php
+++ b/laravel/database/factories/SlotFactory.php
@@ -3,6 +3,7 @@
 use App\Models\Schedule;
 use App\Models\Slot;
 use Faker\Generator as Faker;
+use Carbon\Carbon;
 
 $factory->define(Slot::class, function (Faker $faker, array $data)
 {
@@ -10,16 +11,29 @@
     {
         Log::warning("Using Factory[Slot] without setting schedule_id");
     }
-    
+
+    $duration_min = 2; //hours
+    $duration_max = 8; //hours
+
     return
     [
-        'start_date' => $faker->dateTimeThisYear->format('Y-m-d'),
-        'start_time' => $faker->time('H:i'),
-        'end_time' => $faker->time('H:i'),
+        'start_date' => Carbon::tomorrow()->addDays(1)->format('Y-m-d'),
+        'start_time' => Carbon::createFromTime($faker->numberBetween(0, 23))->format('H:i:s'),
+        'end_time' => function($schedule) use ($faker, $duration_min, $duration_max)
+        {
+            $duration = $faker->numberBetween($duration_min, $duration_max);
+            $start_time = Carbon::createFromFormat('H:i:s', $schedule['start_time']);
+            $end_time = $start_time->addHours($duration);
+            return $end_time->format('H:i:s');
+        },
         'row' => 1,
-        'schedule_id' => function ()
+        'schedule_id' => function ($schedule)
         {
-            return factory(Schedule::class)->create()->id;
+            return factory(Schedule::class)->create([
+                'start_date' => $schedule['start_date'],
+                'start_time' => $schedule['start_time'],
+                'end_time' => $schedule['end_time'],
+            ])->id;
         },
     ];
 });
diff --git a/laravel/tests/Feature/SlotControllerTest.php b/laravel/tests/Feature/SlotControllerTest.php
index 9318d1ea..e62afe36 100644
--- a/laravel/tests/Feature/SlotControllerTest.php
+++ b/laravel/tests/Feature/SlotControllerTest.php
@@ -4,29 +4,73 @@
 
 use App\Models\Slot;
 use App\Models\UserData;
+use App\Models\User;
 use Tests\TestCase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class SlotControllerTest extends TestCase
 {
+    use RefreshDatabase;
+    
     /**
      * @test
      *
      * @return void
      */
-    public function shift_warned_on_view()
+    public function same_time_shift_warned_on_view()
     {
-        $slots = factory(Slot::class, 2)->create();
+        // Given 
+        $take_slot = factory(Slot::class)->create();
+        $view_slot = factory(Slot::class)->create([
+            'start_date' => $take_slot->start_date,
+            'start_time' => $take_slot->start_time,
+            'end_time' => $take_slot->end_time,
+        ]);
         $user = factory(UserData::class)->create()->user;
-
+        
+        $take_slot->user_id = $user->id;
+        $take_slot->save();
+        
         $this->actingAs($user);
 
         // When
-        $response = $this->post("/slot/{$slots[0]->id}/take");
-        $response = $this->get("/slot/{$slots[1]->id}/view");
+        $response = $this->get("/slot/{$view_slot->id}/view");
+        
+        // Then
+        $response->assertSee("You are currently signed up for another")
+                ->assertSee("overlapping shift");
+    }
+    
+    /**
+     * @test
+     *
+     * @return void
+     */
+    public function same_time_shift_warned_on_admin_assign()
+    {
+        // Given 
+        $take_slot = factory(Slot::class)->create();
+        $view_slot = factory(Slot::class)->create([
+            'start_date' => $take_slot->start_date,
+            'start_time' => $take_slot->start_time,
+            'end_time' => $take_slot->end_time,
+        ]);
+        $user = factory(UserData::class)->create()->user;
+        $admin = factory(UserData::class)->create([
+            'user_id' => factory(User::class)->states('admin')->create()->id,
+        ])->user;
+        
+        $take_slot->user_id = $user->id;
+        $take_slot->save();
+        
+        $this->actingAs($admin);
 
+        // When
+        $response = $this->post("/slot/{$view_slot->id}/adminAssign");
+        
         // Then
-        $response->assertSee("You are currently signed up for another");
+        $response->assertSee("You are currently signed up for another")
+                ->assertSee("overlapping shift");
     }
 }

From 0cbcad2d55402267a9d609f011608dd07016501b Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Sat, 3 Aug 2019 16:44:25 -0600
Subject: [PATCH 13/17] [wip] revert to previous solution

---
 .../app/Http/Controllers/ReportController.php | 27 +--------------
 laravel/app/Models/Event.php                  |  4 ++-
 laravel/tests/Feature/SlotControllerTest.php  | 33 ++++++++++---------
 laravel/tests/Unit/ExampleTest.php            |  2 +-
 laravel/tests/Unit/FactoryTest.php            |  2 +-
 5 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/laravel/app/Http/Controllers/ReportController.php b/laravel/app/Http/Controllers/ReportController.php
index d4e04a8a..39e7f0ac 100644
--- a/laravel/app/Http/Controllers/ReportController.php
+++ b/laravel/app/Http/Controllers/ReportController.php
@@ -60,32 +60,7 @@ public function searchUsers(Request $request)
 
         return json_encode($users);
     }
-
-    public function concurrentSlots(Request $request)
-    {
-        $user = User::find($request->get('user_id'));
-        $slot = Slot::find($request->get('slot_id'));
-
-        //search for all user occupied slots that are concurrent with the given one
-        $concurrent_slot = Slot::where('user_id', $user_id)
-                                ->where('start_date', $slot->start_date)
-                                ->where('start_time', '<', $slot->end_time)
-                                ->where('end_time', '>', $slot->start_time)
-                                ->first();
-
-        $concurrent_slots = [
-            'slot_ids' => false,
-        ];
-        //check if an overlapping slot for the user exists
-        if($concurrent_slot)
-        {
-            $concurrent_slots = [
-                'slot_ids' => true,
-            ];
-        }
-        return json_encode($concurrent_slots);
-    }
-
+    
     public function getDepartments(Request $request)
     {
         $id = $request->get('event');
diff --git a/laravel/app/Models/Event.php b/laravel/app/Models/Event.php
index 9f7eab2d..4eea9870 100644
--- a/laravel/app/Models/Event.php
+++ b/laravel/app/Models/Event.php
@@ -110,16 +110,18 @@ public function days($hideEmpty = false)
             if($hideEmpty)
             {
                 // get an array of all the dates fields for this event
+                dd(Schedule::whereIn('shift_id', $this->shifts->pluck('id'))->get());
                 $shift_dates = Schedule::whereIn('shift_id', $this->shifts->pluck('id'))->pluck('dates');
                 $merged_dates = [];
                 //iterate through scheduled dates and merge them into one list
+                dd($shift_dates);
                 foreach ($shift_dates as $i) {
                     $merged_dates = array_merge($merged_dates, json_decode($i));
                 }
                 // remove duplicate dates
                 $shift_dates = array_unique( $merged_dates );
             }
-            
+
             // $date keeps track of the current date as we loop towards the end
             $date = $start_date;
 
diff --git a/laravel/tests/Feature/SlotControllerTest.php b/laravel/tests/Feature/SlotControllerTest.php
index e62afe36..fef6176a 100644
--- a/laravel/tests/Feature/SlotControllerTest.php
+++ b/laravel/tests/Feature/SlotControllerTest.php
@@ -11,8 +11,8 @@
 
 class SlotControllerTest extends TestCase
 {
-    use RefreshDatabase;
-    
+    // use RefreshDatabase;
+
     /**
      * @test
      *
@@ -20,7 +20,7 @@ class SlotControllerTest extends TestCase
      */
     public function same_time_shift_warned_on_view()
     {
-        // Given 
+        // Given
         $take_slot = factory(Slot::class)->create();
         $view_slot = factory(Slot::class)->create([
             'start_date' => $take_slot->start_date,
@@ -28,20 +28,20 @@ public function same_time_shift_warned_on_view()
             'end_time' => $take_slot->end_time,
         ]);
         $user = factory(UserData::class)->create()->user;
-        
+
         $take_slot->user_id = $user->id;
         $take_slot->save();
-        
+
         $this->actingAs($user);
 
         // When
         $response = $this->get("/slot/{$view_slot->id}/view");
-        
+
         // Then
         $response->assertSee("You are currently signed up for another")
                 ->assertSee("overlapping shift");
     }
-    
+
     /**
      * @test
      *
@@ -49,7 +49,7 @@ public function same_time_shift_warned_on_view()
      */
     public function same_time_shift_warned_on_admin_assign()
     {
-        // Given 
+        // Given
         $take_slot = factory(Slot::class)->create();
         $view_slot = factory(Slot::class)->create([
             'start_date' => $take_slot->start_date,
@@ -60,17 +60,18 @@ public function same_time_shift_warned_on_admin_assign()
         $admin = factory(UserData::class)->create([
             'user_id' => factory(User::class)->states('admin')->create()->id,
         ])->user;
-        
-        $take_slot->user_id = $user->id;
-        $take_slot->save();
-        
+
         $this->actingAs($admin);
 
         // When
-        $response = $this->post("/slot/{$view_slot->id}/adminAssign");
-        
+        $take_slot->user_id = $user->id;
+        $take_slot->save();
+
+        $response = $this->followingRedirects()->post("/slot/{$view_slot->id}/adminAssign", [
+            'user' => $user->id,
+        ]);
+
         // Then
-        $response->assertSee("You are currently signed up for another")
-                ->assertSee("overlapping shift");
+        $response->assertSee("Are you sure you want to sign them up for this shift?");
     }
 }
diff --git a/laravel/tests/Unit/ExampleTest.php b/laravel/tests/Unit/ExampleTest.php
index ceaa20ef..04879be6 100644
--- a/laravel/tests/Unit/ExampleTest.php
+++ b/laravel/tests/Unit/ExampleTest.php
@@ -10,7 +10,7 @@
 class ExampleTest extends TestCase
 {
     //Use this to clear the database at the beginning of the test class
-    use RefreshDatabase;
+    // use RefreshDatabase;
 
     /**
      * Make sure to use either "test" in the method name
diff --git a/laravel/tests/Unit/FactoryTest.php b/laravel/tests/Unit/FactoryTest.php
index de700ba5..0da66768 100644
--- a/laravel/tests/Unit/FactoryTest.php
+++ b/laravel/tests/Unit/FactoryTest.php
@@ -18,7 +18,7 @@
 
 class FactoryTest extends TestCase
 {
-    use RefreshDatabase;
+    // use RefreshDatabase;
 
     /**
      * @test

From a11bee4c058cda291e7532e99b2120ae98d1a121 Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Sat, 3 Aug 2019 18:59:35 -0600
Subject: [PATCH 14/17] [feature] admin is now warned on assigning user with
 concurrent slot

~ changed ScheduleFactory to work with recent changes
---
 laravel/app/Http/Controllers/SlotController.php | 10 +++++-----
 laravel/app/Models/Event.php                    |  2 --
 laravel/database/factories/ScheduleFactory.php  |  4 ++++
 laravel/tests/Feature/SlotControllerTest.php    |  2 +-
 laravel/tests/Unit/ExampleTest.php              |  2 +-
 laravel/tests/Unit/FactoryTest.php              |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index 49d816a2..fd3e26a7 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -202,11 +202,11 @@ public function adminAssign(Request $request, Slot $slot)
 
         if(is_null($slot->user))
         {
-            // $concurrent_slot_warning = $this->warnIfConcurrentSlotForUserExists($request, $slot, $user, true);
-            // if($concurrent_slot_warning)
-            // {
-            //     return back();
-            // }
+            $concurrent_slot_warning = $this->warnIfConcurrentSlotForUserExists($request, $slot, $user, true);
+            if($concurrent_slot_warning)
+            {
+                return back();
+            }
 
             $slot->user_id=$user->id;
             $slot->save();
diff --git a/laravel/app/Models/Event.php b/laravel/app/Models/Event.php
index 4eea9870..55a1a001 100644
--- a/laravel/app/Models/Event.php
+++ b/laravel/app/Models/Event.php
@@ -110,11 +110,9 @@ public function days($hideEmpty = false)
             if($hideEmpty)
             {
                 // get an array of all the dates fields for this event
-                dd(Schedule::whereIn('shift_id', $this->shifts->pluck('id'))->get());
                 $shift_dates = Schedule::whereIn('shift_id', $this->shifts->pluck('id'))->pluck('dates');
                 $merged_dates = [];
                 //iterate through scheduled dates and merge them into one list
-                dd($shift_dates);
                 foreach ($shift_dates as $i) {
                     $merged_dates = array_merge($merged_dates, json_decode($i));
                 }
diff --git a/laravel/database/factories/ScheduleFactory.php b/laravel/database/factories/ScheduleFactory.php
index 10bfe2ed..c0e9f141 100644
--- a/laravel/database/factories/ScheduleFactory.php
+++ b/laravel/database/factories/ScheduleFactory.php
@@ -54,6 +54,10 @@
             return $duration->format('H:i:s');
         },
         'volunteers' => $faker->numberBetween($volunteer_min, $volunteer_max),
+        'dates' => function($schedule)
+        {
+            return json_encode([$schedule['start_date'], $schedule['end_date']]);    
+        },
         'department_id' => function ($schedule)
         {
             $event_id = function () use ($schedule)
diff --git a/laravel/tests/Feature/SlotControllerTest.php b/laravel/tests/Feature/SlotControllerTest.php
index 32a53355..ff149632 100644
--- a/laravel/tests/Feature/SlotControllerTest.php
+++ b/laravel/tests/Feature/SlotControllerTest.php
@@ -11,7 +11,7 @@
 
 class SlotControllerTest extends TestCase
 {
-    // use RefreshDatabase;
+    use RefreshDatabase;
 
     /**
      * @test
diff --git a/laravel/tests/Unit/ExampleTest.php b/laravel/tests/Unit/ExampleTest.php
index 04879be6..ceaa20ef 100644
--- a/laravel/tests/Unit/ExampleTest.php
+++ b/laravel/tests/Unit/ExampleTest.php
@@ -10,7 +10,7 @@
 class ExampleTest extends TestCase
 {
     //Use this to clear the database at the beginning of the test class
-    // use RefreshDatabase;
+    use RefreshDatabase;
 
     /**
      * Make sure to use either "test" in the method name
diff --git a/laravel/tests/Unit/FactoryTest.php b/laravel/tests/Unit/FactoryTest.php
index 0da66768..de700ba5 100644
--- a/laravel/tests/Unit/FactoryTest.php
+++ b/laravel/tests/Unit/FactoryTest.php
@@ -18,7 +18,7 @@
 
 class FactoryTest extends TestCase
 {
-    // use RefreshDatabase;
+    use RefreshDatabase;
 
     /**
      * @test

From 3bf7c2144787e7c2c27a4ce6008dceaacdb337b6 Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Sat, 3 Aug 2019 19:25:59 -0600
Subject: [PATCH 15/17] [cleanup] taking warning out of view load

---
 laravel/app/Http/Controllers/SlotController.php | 4 +---
 laravel/tests/Unit/ExampleTest.php              | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index fd3e26a7..934a37be 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -71,9 +71,7 @@ public function view(Request $request, Slot $slot)
             $request->session()->flash('error', "You must enter your name before you can sign up for shifts.");
             return redirect('/profile/data/edit');
         }
-
-        $this->warnIfConcurrentSlotForUserExists($request, $slot, Auth::user());
-
+        
         return view('pages/slot/view', compact('slot'));
     }
 
diff --git a/laravel/tests/Unit/ExampleTest.php b/laravel/tests/Unit/ExampleTest.php
index ceaa20ef..4b4c86ed 100644
--- a/laravel/tests/Unit/ExampleTest.php
+++ b/laravel/tests/Unit/ExampleTest.php
@@ -10,7 +10,7 @@
 class ExampleTest extends TestCase
 {
     //Use this to clear the database at the beginning of the test class
-    use RefreshDatabase;
+    // use RefreshDatabase;
 
     /**
      * Make sure to use either "test" in the method name
@@ -40,16 +40,16 @@ class ExampleTest extends TestCase
     public function testExample()
     {
         //Given
-        $user_id = 1; //first autoincrement id
+        $user_name = 'Foo';
 
         //When
         $user = factory(User::class)->create([
-            'id' => $user_id,
+            'name' => $user_name,
         ]);
 
         //Then
         $this->assertDatabaseHas('users', [
-            'id' => $user_id,
+            'name' => $user_name,
         ]);
     }
 }

From 52dbd4d8bdf89295e59e318aee54cb4f6baf7336 Mon Sep 17 00:00:00 2001
From: James Thornton <solverjt@gmail.com>
Date: Sat, 3 Aug 2019 19:37:30 -0600
Subject: [PATCH 16/17] [cleanup] corrected endpoint test

---
 laravel/tests/Feature/SlotControllerTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/laravel/tests/Feature/SlotControllerTest.php b/laravel/tests/Feature/SlotControllerTest.php
index ff149632..81e5e50d 100644
--- a/laravel/tests/Feature/SlotControllerTest.php
+++ b/laravel/tests/Feature/SlotControllerTest.php
@@ -18,7 +18,7 @@ class SlotControllerTest extends TestCase
      *
      * @return void
      */
-    public function same_time_shift_warned_on_view()
+    public function same_time_shift_warned_on_take()
     {
         // Given
         $take_slot = factory(Slot::class)->create();
@@ -35,7 +35,7 @@ public function same_time_shift_warned_on_view()
         $this->actingAs($user);
 
         // When
-        $response = $this->get("/slot/{$view_slot->id}/view");
+        $response = $this->followingRedirects()->post("/slot/{$view_slot->id}/take");
 
         // Then
         $response->assertSee("You are currently signed up for another")

From 36f4f63d0e142df5713e57b2c23d6425ea2829dd Mon Sep 17 00:00:00 2001
From: demogorgonzola <solverjt@gmail.com>
Date: Mon, 26 Aug 2019 11:30:36 -0600
Subject: [PATCH 17/17] [fix] warning partial html fix and factory change

~ ScheduleFactory now has "volunteer" role by default
---
 .../app/Http/Controllers/SlotController.php   |  5 -----
 .../database/factories/ScheduleFactory.php    | 20 +++++++++++++++++++
 laravel/database/factories/UserFactory.php    | 19 ++++++++++++++----
 .../warning/concurrent-slot.blade.php         |  2 +-
 laravel/tests/Feature/SlotControllerTest.php  |  3 ++-
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/laravel/app/Http/Controllers/SlotController.php b/laravel/app/Http/Controllers/SlotController.php
index 934a37be..3b17e841 100644
--- a/laravel/app/Http/Controllers/SlotController.php
+++ b/laravel/app/Http/Controllers/SlotController.php
@@ -55,11 +55,6 @@ private function userAllowed(Slot $slot)
             }
         }
 
-        if($slotRoles->isEmpty())
-        {
-            $allowed = true;
-        }
-
         return $allowed;
     }
 
diff --git a/laravel/database/factories/ScheduleFactory.php b/laravel/database/factories/ScheduleFactory.php
index c0e9f141..cb2016be 100644
--- a/laravel/database/factories/ScheduleFactory.php
+++ b/laravel/database/factories/ScheduleFactory.php
@@ -2,6 +2,8 @@
 
 use App\Models\Department;
 use App\Models\Event;
+use App\Models\EventRole;
+use App\Models\Role;
 use App\Models\Schedule;
 use App\Models\Shift;
 use Carbon\Carbon;
@@ -81,3 +83,21 @@
         },
     ];
 });
+
+$factory->afterCreating(Schedule::class, function(Schedule $schedule, Faker $faker) 
+{
+        //find the admin role
+        $volunteer_role = Role::where('name', 'volunteer')->first();
+        //if there is no admin role, create it
+        if (!$volunteer_role)
+        {
+            $volunteer_role = factory(Role::class)->create([
+                'name' => 'volunteer',
+            ]);
+        }
+    
+        $schedule->roles()->save(factory(EventRole::class)->make([
+            'role_id' => $volunteer_role->id,
+            'foreign_id' => $schedule->id,
+        ]));
+});
\ No newline at end of file
diff --git a/laravel/database/factories/UserFactory.php b/laravel/database/factories/UserFactory.php
index 1902cd69..6082a74c 100644
--- a/laravel/database/factories/UserFactory.php
+++ b/laravel/database/factories/UserFactory.php
@@ -15,11 +15,22 @@
     ];
 });
 
-$factory->state(User::class, 'admin', function (Faker $faker)
+$factory->afterCreating(User::class, function (User $user, Faker $faker)
 {
-    return
-    [
-    ];
+    //find the volunteer role
+    $volunteer_role = Role::where('name', 'volunteer')->first();
+    //if there is no volunteer role, create it
+    if (!$volunteer_role)
+    {
+        $volunteer_role = factory(Role::class)->create([
+            'name' => 'volunteer',
+        ]);
+    }
+
+    $user->roles()->save(factory(UserRole::class)->make([
+        'role_id' => $volunteer_role->id,
+        'user_id' => $user->id,
+    ]));
 });
 
 $factory->afterCreatingState(User::class, 'admin', function (User $user, Faker $faker)
diff --git a/laravel/resources/views/partials/warning/concurrent-slot.blade.php b/laravel/resources/views/partials/warning/concurrent-slot.blade.php
index 86ecd39d..ab5e3137 100644
--- a/laravel/resources/views/partials/warning/concurrent-slot.blade.php
+++ b/laravel/resources/views/partials/warning/concurrent-slot.blade.php
@@ -5,7 +5,7 @@
     Are you sure you want to sign them up for this shift?
 @else
     You are currently signed up for another
-    <a href=" {{ env('SITE_URL') }} /slot/{{ $concurrent_slot_id }}/view">overlapping shift</a>.
+    <a href="{{ env('SITE_URL') }}/slot/{{ $concurrent_slot_id }}/view">overlapping shift</a>.
     Are you sure you want to sign up for this shift?
 @endif
 </span>
diff --git a/laravel/tests/Feature/SlotControllerTest.php b/laravel/tests/Feature/SlotControllerTest.php
index 81e5e50d..012e7751 100644
--- a/laravel/tests/Feature/SlotControllerTest.php
+++ b/laravel/tests/Feature/SlotControllerTest.php
@@ -27,7 +27,8 @@ public function same_time_shift_warned_on_take()
             'start_time' => $take_slot->start_time,
             'end_time' => $take_slot->end_time,
         ]);
-        $user = factory(UserData::class)->create()->user;
+        $user = factory(User::class)->create();
+        $user->data()->save(factory(UserData::class)->make());
 
         $take_slot->user_id = $user->id;
         $take_slot->save();