260311 最新消息修改前後篇的顯示條件

app/Http/Controllers/Api/NewsController.php

@@ -128,8 +128,8 @@ class NewsController extends Controller
     public function detail(Request $request, $locale = 'tw', $id){
 
         $isPreview = $request->input("preview","");
-        $now = now();
-
+        $now = Carbon::now(); 
+        
         if($isPreview){
             $news = News::where('id', $id)
                 ->first();
@@ -156,34 +156,53 @@ class NewsController extends Controller
         }
 // dd($news);
         //取得前一篇
-        $previous = News::where(function ($query) use ($news) {
+        $previous = News::where(function ($query) use ($news, $now) {
             $query->where('order', $news->order)
             ->where('post_date', $news->post_date)
-            ->where('id', '>', $news->id);
+            ->where('id', '>', $news->id)
+            ->where("visible", 1)
+            ->where(fn($q) => $q->whereNull('start_date')->orWhere('start_date', '<=', $now))
+            ->where(fn($q) => $q->whereNull('end_date')->orWhere('end_date', '>=', $now));
         })
-        ->orWhere(function ($query) use ($news) {
+        ->orWhere(function ($query) use ($news, $now) {
             $query->where('order', $news->order)
-            ->where('post_date', '>', $news->post_date);
+            ->where('post_date', '>', $news->post_date)
+            ->where("visible", 1)
+            ->where(fn($q) => $q->whereNull('start_date')->orWhere('start_date', '<=', $now))
+            ->where(fn($q) => $q->whereNull('end_date')->orWhere('end_date', '>=', $now));
         })
-        ->orWhere(function ($query) use ($news) {
-            $query->where('order', '>', $news->order);
+        ->orWhere(function ($query) use ($news, $now) {
+            $query->where('order', '>', $news->order)
+            ->where("visible", 1)
+            ->where(fn($q) => $q->whereNull('start_date')->orWhere('start_date', '<=', $now))
+            ->where(fn($q) => $q->whereNull('end_date')->orWhere('end_date', '>=', $now));
         })
         ->orderBy('order', 'asc')
         ->orderBy('post_date', 'asc')
         ->orderBy('id', 'asc')
         ->first();
+
         //取得下一篇
-        $next = News::where(function ($query) use ($news) {
+        $next = News::where(function ($query) use ($news, $now) {
             $query->where('order', $news->order)
             ->where('post_date', $news->post_date)
-            ->where('id', '<', $news->id);
+            ->where('id', '<', $news->id)
+            ->where("visible", 1)
+            ->where(fn($q) => $q->whereNull('start_date')->orWhere('start_date', '<=', $now))
+            ->where(fn($q) => $q->whereNull('end_date')->orWhere('end_date', '>=', $now));
         })
-        ->orWhere(function ($query) use ($news) {
+        ->orWhere(function ($query) use ($news, $now) {
             $query->where('order', $news->order)
-            ->where('post_date', '<', $news->post_date);
+            ->where('post_date', '<', $news->post_date)
+            ->where("visible", 1)
+            ->where(fn($q) => $q->whereNull('start_date')->orWhere('start_date', '<=', $now))
+            ->where(fn($q) => $q->whereNull('end_date')->orWhere('end_date', '>=', $now));
         })
-        ->orWhere(function ($query) use ($news) {
-            $query->where('order', '<', $news->order);
+        ->orWhere(function ($query) use ($news, $now) {
+            $query->where('order', '<', $news->order)
+            ->where("visible", 1)
+            ->where(fn($q) => $q->whereNull('start_date')->orWhere('start_date', '<=', $now))
+            ->where(fn($q) => $q->whereNull('end_date')->orWhere('end_date', '>=', $now));
         })
         ->orderBy('order', 'desc')
         ->orderBy('post_date', 'desc')