Merge pull request #25 from zigzagdev/feature/20_newsBatch

batchJobs

Author: zigzagdev

app/Console/Commands/ReadNews.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Api\News;
+use Illuminate\Console\Command;
+
+class ReadNews extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'command:name';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     *
+     */
+    public function handle()
+    {
+        $from = date('Y-m-01');
+        $to = date('Y-m-t');
+        echo News::whereBetween('created_at', [$from, $to])->get()->count();
+    }
+}

app/Console/Kernel.php

@@ -2,8 +2,10 @@
 
 namespace App\Console;
 
+use App\Console\Commands\ReadNews;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use App\Console\Commands\InformationSend;
 
 class Kernel extends ConsoleKernel
 {
@@ -13,9 +15,14 @@ class Kernel extends ConsoleKernel
      * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
      * @return void
      */
+
+    protected $commands = [
+        ReadNews::class
+    ];
+
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')->hourly();
+         $schedule->command('command:name')->monthly()->at('10:00');
     }
 
     /**

app/Http/Controllers/Api/AdminColumnChangeController.php

@@ -10,18 +10,15 @@
 use App\Http\Resources\Api\ErrorResource;
 use App\Http\Resources\Api\SuccessResource;
 use App\Models\Api\Admin;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Testing\Fluent\Concerns\Has;
 use PharIo\Manifest\Email;
 use Symfony\Component\HttpFoundation\Response;
 
 class AdminColumnChangeController extends Controller
 {
     public function adminEmailChange(EmailRequest $request)
     {
-        // emailChangeFunction
         try {
             DB::beginTransaction();
             $adminId = $request->admin_id;

app/Http/Controllers/Api/ArticleController.php

@@ -15,11 +15,9 @@
 use App\Models\Api\Article;
 use App\Models\Api\Comment;
 use App\Models\Api\MountainRating;
-use App\Models\Api\News;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Mail;
 use Symfony\Component\HttpFoundation\Response;
-use App\Consts\Api\Prefecture;
 use Illuminate\Http\Request;
 use Carbon\Carbon;
 use App\Mail\Api\ArticleCreateMail;
@@ -31,6 +29,7 @@ class ArticleController extends Controller
     public function articleWrite(ArticleRequest $request)
     {
         try {
+            DB::beginTransaction();
             $adminId = $request->adminId;
 
             // Whether admin is existed or not .
@@ -59,7 +58,7 @@ public function articleWrite(ArticleRequest $request)
                     'mountain_name' => $request->input('mountainName'),
                     'prefecture' => $request->input('prefecture'),
                 ]);
-
+            DB::commit();
             Mail::to($admin->address)->send(new ArticleCreateMail($admin, $newArticle));
             return new RegisterArticleResource($request);
         } catch (\Exception $e) {
@@ -127,12 +126,12 @@ public function articleDelete(Request $request)
                 return new ErrorResource($request, Response::HTTP_BAD_REQUEST);
             }
             $address = $findArticle->address;
-            DB::commit();
             Article::where([
                 'adminId' => $adminId,
                 'id' => $findArticle->id
             ])->delete();
 
+            DB::commit();
             Mail::to($address)->send(new ArticleDeleteNotificationMail());
             return new SuccessResource($request);
         } catch (\Exception $e) {

app/Http/Controllers/Api/CommentController.php

@@ -67,8 +67,8 @@ public function changeComment(CommentRequest $request) {
                     'article_id' => $articleId,
                 ]);
 
-            DB::commit();
             $mailUserInform = Article::compilingComments($articleId);
+            DB::commit();
             Mail::to($mailUserInform->address)->send(new CommentNoticeChange($mailUserInform));
             return new CommentUpdateResource($request);
         } catch (\Exception $e) {
@@ -93,7 +93,6 @@ public function deleteComment(Request $request)
             }
             Comment::find($commentId)->delete();
             DB::commit();
-
             return new CommentDeleteResource($request);
         } catch (\Exception $e) {
             DB::rollBack();

app/Http/Controllers/Api/DisplayController.php

@@ -78,7 +78,6 @@ public function ratingDisplay(Request $request)
             }
             return new RatingDisplayCollection($avg);
         } catch (\Exception $e) {
-            DB::rollBack();
             $request->merge(['statusMessage' => sprintf(CommonConst::FETCH_FAILED, '検索内容')]);
             return new ErrorResource($request, Response::HTTP_BAD_REQUEST);
         }

app/Http/Controllers/Api/LoginController.php

@@ -35,8 +35,8 @@ public function login(LoginRequest $request)
 
             //トークン生成
             $token = TokenMakeService::createToken($loginUser->id);
-            DB::commit();
             $request->merge(['adminToken' => $token, 'adminId' => $loginUser->id]);
+            DB::commit();
             return new AdminLoginResource($request);
         } catch (\Exception $e) {
             DB::rollBack();

app/Http/Controllers/Api/LogoutController.php

@@ -17,6 +17,7 @@ class LogoutController extends Controller
     public function logout(Request $request)
     {
         try {
+            DB::beginTransaction();
             $expirationValid =  AdminToken::where('admin_id', $request->adminId)->orderBy('created_at', 'desc')->first();
             if ($expirationValid->expired_at <= Carbon::now()) {
                 $request->merge(['statusMessage' => sprintf(CommonConst::FAILED, 'ログアウト')]);
@@ -26,6 +27,7 @@ public function logout(Request $request)
             ->where('expired_at', '>', Carbon::now())->update([
                 'expired_at' => Carbon::now()
             ]);
+            DB::commit();
             return new SuccessResource($request);
         } catch (\Exception $e) {
             DB::rollBack();

app/Http/Controllers/Api/NewsMakingController.php

@@ -71,7 +71,6 @@ public function newsReWrite(Request $request)
                     'expiration' => Carbon::now()->addMonths(3),
                 ]);
             DB::commit();
-
             Mail::to($findNews->address)->send(new NewsUpdateMail($findNews));
             return new NewsResource($request);
         } catch (\Exception $e) {