Merge pull request #33 from jobapis/removing-premium

Removing premium tier for v.1 release
jobapis · Dec 31, 2016 · 54c8891 · 54c8891
2 parents 5b4da18 + 5da6c8c
commit 54c8891
Show file tree

Hide file tree

Showing 41 changed files with 92 additions and 640 deletions.
diff --git a/.env.example b/.env.example
@@ -5,6 +5,7 @@ APP_DEBUG=true
 APP_URL=http://localhost/
 ADMIN_EMAIL=
 ADMIN_NAME=
+MAX_SEARCHES=
 TIMEZONE=
 
 ## Database config

diff --git a/app/Console/Commands/EmailJobs.php b/app/Console/Commands/EmailJobs.php
@@ -2,11 +2,8 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use JobApis\JobsToMail\Jobs\CollectJobsForUser;
-use JobApis\JobsToMail\Jobs\SearchAndNotifyUser;
+use JobApis\JobsToMail\Jobs\Collections\SearchAndNotifyUser;
 use JobApis\JobsToMail\Repositories\Contracts\SearchRepositoryInterface;
-use JobApis\JobsToMail\Repositories\SearchRepository;
-use JobApis\JobsToMail\Repositories\UserRepository;
 
 class EmailJobs extends Command
 {

diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
diff --git a/app/Http/Controllers/CollectionsController.php b/app/Http/Controllers/CollectionsController.php
@@ -17,8 +17,6 @@ public function download(Request $request, $id)
     {
         $path = $this->dispatchNow(new GenerateCsv($id));
 
-        // sleep(2);
-
         return response()->download($path, null, ['Content-Type: text/csv']);
     }
 }
diff --git a/app/Http/Controllers/SearchesController.php b/app/Http/Controllers/SearchesController.php
@@ -5,8 +5,8 @@
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Support\Facades\URL;
-use JobApis\JobsToMail\Jobs\DeleteSearch;
-use JobApis\JobsToMail\Jobs\GetUserSearches;
+use JobApis\JobsToMail\Jobs\Searches\Delete;
+use JobApis\JobsToMail\Jobs\Searches\GetUserSearches;
 
 class SearchesController extends BaseController
 {
@@ -38,7 +38,7 @@ public function index(Request $request, $userId = null)
      */
     public function unsubscribe(Request $request, $searchId)
     {
-        $message = $this->dispatchNow(new DeleteSearch($searchId));
+        $message = $this->dispatchNow(new Delete($searchId));
 
         $request->session()->flash($message->type, $message->message);
 

diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -5,10 +5,8 @@
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use JobApis\JobsToMail\Http\Requests\CreateUser;
-use JobApis\JobsToMail\Http\Requests\PremiumUser;
-use JobApis\JobsToMail\Jobs\CreateUserAndSearch;
-use JobApis\JobsToMail\Jobs\DeleteUser;
-use JobApis\JobsToMail\Jobs\Users\PremiumUserSignup;
+use JobApis\JobsToMail\Jobs\Users\CreateUserAndSearch;
+use JobApis\JobsToMail\Jobs\Users\Delete;
 
 class UsersController extends BaseController
 {
@@ -33,32 +31,10 @@ public function create(CreateUser $request)
      */
     public function delete(Request $request, $userId)
     {
-        $message = $this->dispatchNow(new DeleteUser($userId));
+        $message = $this->dispatchNow(new Delete($userId));
 
         $request->session()->flash($message->type, $message->message);
 
         return redirect('/');
     }
-
-    /**
-     * Show premium signup form
-     */
-    public function premium()
-    {
-        return view('users.premium');
-    }
-
-    /**
-     * Post premium signup form
-     */
-    public function postPremium(PremiumUser $request)
-    {
-        $data = $request->only(array_keys($request->rules()));
-
-        $message = $this->dispatchNow(new PremiumUserSignup($data));
-
-        $request->session()->flash($message->type, $message->message);
-
-        return redirect('/premium');
-    }
 }
diff --git a/app/Http/Requests/CreateUser.php b/app/Http/Requests/CreateUser.php
@@ -24,8 +24,6 @@ public function messages()
         return [
             'regex' =>'The location should be formatted 
                 "City, ST". Currently only works for US locations.',
-            'premium' =>'Only premium users can use this feature. 
-                Contact upgrade@jobstomail.com to get access.',
         ];
     }
 
@@ -40,7 +38,7 @@ public function rules()
             'email' => 'required|email',
             'keyword' => 'required',
             'location' => 'required|regex:/([^,]+), \s*(\w{2})/',
-            'no_recruiters' => 'required|premium',
+            'no_recruiters' => 'required',
         ];
     }
 }
diff --git a/app/Http/Requests/PremiumUser.php b/app/Http/Requests/PremiumUser.php
diff --git a/app/Jobs/SearchAndNotifyUser.php → app/Jobs/Collections/SearchAndNotifyUser.php b/app/Jobs/SearchAndNotifyUser.php → app/Jobs/Collections/SearchAndNotifyUser.php
@@ -1,4 +1,4 @@
-<?php namespace JobApis\JobsToMail\Jobs;
+<?php namespace JobApis\JobsToMail\Jobs\Collections;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Jobs/DeleteSearch.php → app/Jobs/Searches/Delete.php b/app/Jobs/DeleteSearch.php → app/Jobs/Searches/Delete.php
@@ -1,9 +1,9 @@
-<?php namespace JobApis\JobsToMail\Jobs;
+<?php namespace JobApis\JobsToMail\Jobs\Searches;
 
 use JobApis\JobsToMail\Http\Messages\FlashMessage;
 use JobApis\JobsToMail\Repositories\Contracts\SearchRepositoryInterface;
 
-class DeleteSearch
+class Delete
 {
     /**
      * @var string $searchId

diff --git a/app/Jobs/GetUserSearches.php → app/Jobs/Searches/GetUserSearches.php b/app/Jobs/GetUserSearches.php → app/Jobs/Searches/GetUserSearches.php
@@ -1,4 +1,4 @@
-<?php namespace JobApis\JobsToMail\Jobs;
+<?php namespace JobApis\JobsToMail\Jobs\Searches;
 
 use JobApis\JobsToMail\Repositories\Contracts\SearchRepositoryInterface;
 

diff --git a/app/Jobs/CreateUserAndSearch.php → app/Jobs/Users/CreateUserAndSearch.php b/app/Jobs/CreateUserAndSearch.php → app/Jobs/Users/CreateUserAndSearch.php
@@ -1,4 +1,4 @@
-<?php namespace JobApis\JobsToMail\Jobs;
+<?php namespace JobApis\JobsToMail\Jobs\Users;
 
 use Illuminate\Support\Facades\Log;
 use JobApis\JobsToMail\Http\Messages\FlashMessage;
@@ -36,15 +36,15 @@ public function handle(
             $user = $users->firstOrCreate($this->data);
 
             // Make sure the user isn't over their maximum
-            $maxSearches = config('app.user_tier_permissions.'.$user->tier.'.max_search_count');
+            $maxSearches = config('app.max_searches');
+            $adminEmail = env('ADMIN_EMAIL');
 
             if ($user->existed === true && $user->searches()->count() >= $maxSearches) {
                 return new FlashMessage(
                     'alert-danger',
-                    "You have reached your maximum number of job searches. As a 
-                        {$user->tier} user you can create {$maxSearches} searches. 
-                        Unsubscribe from a search or contact upgrade@jobstomail.com 
-                        to upgrade your account."
+                    "You have reached your maximum number of {$maxSearches} 
+                        job searches. Unsubscribe from a search or contact 
+                        {$adminEmail} to upgrade your account."
                 );
             }
 

diff --git a/app/Jobs/DeleteUser.php → app/Jobs/Users/Delete.php b/app/Jobs/DeleteUser.php → app/Jobs/Users/Delete.php
@@ -1,9 +1,9 @@
-<?php namespace JobApis\JobsToMail\Jobs;
+<?php namespace JobApis\JobsToMail\Jobs\Users;
 
 use JobApis\JobsToMail\Http\Messages\FlashMessage;
 use JobApis\JobsToMail\Repositories\Contracts\UserRepositoryInterface;
 
-class DeleteUser
+class Delete
 {
     /**
      * @var string $userId

diff --git a/app/Jobs/Users/PremiumUserSignup.php b/app/Jobs/Users/PremiumUserSignup.php
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -37,16 +37,6 @@ protected static function boot()
         });
     }
 
-    /**
-     * Checks whether the user is premium
-     *
-     * @return boolean
-     */
-    public function isPremium()
-    {
-        return $this->tier == config('app.user_tiers.premium');
-    }
-
     /**
      * Defines the relationship to Search model
      *

diff --git a/app/Notifications/JobsCollected.php b/app/Notifications/JobsCollected.php
@@ -90,12 +90,10 @@ public function toMail($notifiable)
         }
 
         // Add a link to download the collection
-        if ($notifiable->isPremium()) {
-            $message->action(
-                'Download CSV',
-                url('/collections/' . $this->id . '/download')
-            );
-        }
+        $message->action(
+            'Download CSV',
+            url('/collections/' . $this->id . '/download')
+        );
 
         return $message;
     }

diff --git a/app/Notifications/PremiumUserSignup.php b/app/Notifications/PremiumUserSignup.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -14,13 +14,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        // Only premium users can set this value to true
-        Validator::extend('premium', function ($attribute, $value, $parameters, $validator) {
-            if ($value == 1) {
-                return config('app.user_tiers.premium') === session()->get('user.tier');
-            }
-            return true;
-        });
+        //
     }
 
     /**