불필요한 json 제거 및 문의 첨부이미지 바로보기

app/Http/Controllers/Admin/UserController.php

@@ -62,7 +62,6 @@ class UserController extends Controller
                 ->withCount('reports', 'modified')
                 ->where('uid', $uid)
                 ->first();
-            //logger(json_decode(json_encode($data->user), true));
         }
 
         if (!$data) {

app/Http/Controllers/Front/BoardController.php

@@ -6,12 +6,12 @@ use App\Http\Controllers\Controller;
 use App\Libs\TraitSetting;
 use App\Libs\TraitBoard;
 
-use App\Models\Setting;
 use App\Services\SmsService;
 use App\Services\CrossFileService;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Cookie;
 
 class BoardController extends Controller
 {
@@ -73,6 +73,19 @@ class BoardController extends Controller
     {
         $data = $this->showPost($request, $code, $uid);
 
+        // 조회수 추가
+        $cookie = unserialize($request->cookie('readIds'));
+        if (empty($cookie)) {
+            $cookie = [];
+        }
+
+        if (!in_array($uid, $cookie)) {
+            $cookie[] = $uid;
+
+            $data->increment('view_count');
+            Cookie::queue('readIds', serialize($cookie));
+        }
+
         $this->page['code'] .= '.' . $code;
         $this->page['subTitle'] = $data->board->name;
 

app/Http/Controllers/Front/IndexController.php

@@ -31,8 +31,6 @@ class IndexController extends Controller
     public function index(Request $request)
     {
         $data = $this->getPostList($request, 'gallery', 2);
-        logger(json_decode(json_encode($data), true));
-        logger($data['data']->total());
 
         $pages['total'] = $data['data']->total();
         $pages['items'] = $data['data']->perPage() * $data['data']->currentPage();
@@ -52,7 +50,6 @@ class IndexController extends Controller
     public function galleryList(Request $request)
     {
         $result = $this->getPostList($request, 'gallery', 12);
-//        logger(json_decode(json_encode($result), true));
 
         $lists = [];
         $pages = [];
@@ -81,7 +78,6 @@ class IndexController extends Controller
         $uid = $request->get('uid', '');
 
         $data = $this->showPost($request, 'gallery', $uid);
-        logger(['uid' => $uid]);
 
         return $this->sendJson('데이터 추출 완료', 'success', $data);
     }

app/Libs/TraitBoard.php

@@ -127,8 +127,6 @@ trait TraitBoard
             ->where('uid', $uid)
             ->first();
 
-        logger(json_decode(json_encode($data), true));
-
         return $data;
     }
 
@@ -147,7 +145,6 @@ trait TraitBoard
 
         $board = $this->getBoardInfo($code);
         $data = $this->getPostInfo($uid);
-        logger(json_decode(json_encode($data), true));
 
         if ($data) {
             $prev = BoardArticle::query()

app/Libs/TraitPartner.php

@@ -93,7 +93,6 @@ trait TraitPartner
             $data->category = 1;
             $data->status = 1;
         }
-//        logger($data);
 
         return $data;
     }

app/Libs/TraitUser.php

@@ -0,0 +1,561 @@
+<?php
+
+namespace App\Libs;
+
+use App\Models\User;
+use App\Services\CrossFileService;
+
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
+
+trait TraitUser
+{
+    /**
+     * 회원 목록
+     *
+     * @param Request $request
+     * @param int $perPage
+     * @return array
+     */
+    protected function getUserList(Request $request, int $perPage = 15)
+    {
+        $list = User::query()
+            ->with(['user', 'asset', 'assets', 'comments'])
+            ->withCount(['assets', 'comments'])
+            ->where('board_id', $board->id)
+            ->where(function ($query) use ($request) {
+                if ($request->filled('word')) {
+                    if ($request->filled('field') && $request->field != 'all') {
+                        $query->where($request->field, 'like', '%' . $request->word . '%');
+                    } else {
+                        $query->orWhere('name', 'like', '%'. $request->word .'%')
+                            ->orWhere('email', 'like', '%'. $request->word .'%')
+                            ->orWhere('phone', 'like', '%'. $request->word .'%')
+                            ->orWhere('subject', 'like', '%'. $request->word .'%')
+                            ->orWhere('content', 'like', '%'. $request->word .'%');
+                    }
+                }
+            })
+            ->orderByDesc('notice')
+            ->latest()
+            ->paginate($perPage);
+
+        $list = $this->getListNumber($list);
+
+        $search = $request->all();
+        $list->appends($search);
+
+        $searchs = [
+            'all' => '통합검색',
+            'subject' => '제목',
+            'content' => '내용'
+        ];
+
+        if ($code == 'inquiry') {
+            $searchs = [
+                'all' => '통합검색',
+                'name' => '이름',
+                'email' => '이메일',
+                'phone' => '연락처',
+                'content' => '내용'
+            ];
+        }
+
+        $data = [
+            'mode'    => 'list',
+            'code'    => $code,
+            'board'   => $board,
+            'data'    => $list,
+            'search'  => $search,
+            'searchs' => $searchs
+        ];
+
+        return $data;
+    }
+
+    /**
+     * 최근게시물
+     *
+     * @param Request $request
+     * @param string $code
+     * @param int $perPage
+     * @return array
+     */
+    protected function getLatest(string $code = '', int $count = 5)
+    {
+        $board = $this->getBoardInfo($code);
+
+        $data = BoardArticle::query()->where('board_id', $board->id)->latest()->limit($count)->get();
+
+        return $data;
+    }
+
+    /**
+     * 게시글 정보
+     *
+     * @param string $uid
+     * @return mixed
+     */
+    protected function getPostInfo(string $uid = '')
+    {
+        $data = BoardArticle::query()
+            ->with(['board', 'user', 'asset', 'assets', 'comments'])
+            ->withCount(['assets', 'comments'])
+            ->where('uid', $uid)
+            ->first();
+
+        return $data;
+    }
+
+    /**
+     * 게시글 보기 화면
+     *
+     * @param Request $request
+     * @param string $code
+     * @param string $uid
+     * @return mixed
+     */
+    protected function showPost(Request $request, string $code = '', string $uid = '')
+    {
+        $next  = null;
+        $prev  = null;
+
+        $board = $this->getBoardInfo($code);
+        $data = $this->getPostInfo($uid);
+
+        if ($data) {
+            $prev = BoardArticle::query()
+                ->where('id', '>', $data->id)
+                ->where('board_id', $data->board->id)
+                ->first();
+
+            $next = BoardArticle::query()
+                ->where('id', '<', $data->id)
+                ->where('board_id', $data->board->id)
+                ->orderBy('created_at', "desc")
+                ->first();
+        } else {
+            $data = new BoardArticle;
+        }
+
+        $data->mode = 'view';
+        $data->code = $code;
+        $data->board = $board;
+        $data->board_id = $board->id;
+        $data->next = $next;
+        $data->prev = $prev;
+        $data->search = $request->all();
+
+        $images = [];
+        $files = [];
+        if ($data->assets) {
+            foreach ($data->assets as $asset) {
+                if ($asset->asset->width && $asset->asset->height) {
+                    $images[] = $asset->asset;
+                } else {
+                    $files[] = $asset->asset;
+                }
+            }
+        }
+        $data->images = $images;
+        $data->files = $files;
+
+        return $data;
+    }
+
+    /**
+     * 게시글 등록/수정
+     *
+     * @param Request $request
+     * @param string $code
+     * @param string $uid
+     * @return array
+     */
+    protected function createPost(Request $request, string $code = '', string $uid = '')
+    {
+        $board = $this->getBoardInfo($code);
+
+        if ($uid) {
+            $data = $this->getPostInfo($uid);
+            $data->mode = 'modify';
+        } else {
+            $data = new BoardArticle;
+            $data->mode = 'add';
+            $data->board_id = $board->id;
+            $data->uid = '';
+        }
+
+        $data->code = $code;
+        $data->board = $board;
+        $data->search = $request->all();
+
+        return $data;
+    }
+
+    /**
+     * 게시글 저장
+     *
+     * @param Request $request
+     * @param CrossFileService $fileService
+     * @return mixed
+     */
+    protected function storePost(Request $request, CrossFileService $fileService)
+    {
+        return DB::transaction(function() use ($request, $fileService) {
+            $rules = [
+                'mode' => 'required|string',
+                'code' => 'required|string|max:20',
+                'board_id' => 'required|integer',
+                'subject' => 'required|string|max:255'
+            ];
+
+            $boardCode = $request->code;
+            if ($boardCode == 'inquiry') {
+                $rules['name'] = 'required|string';
+                $rules['email'] = 'required|string';
+            }
+
+            $validator = $this->validation($request, $rules);
+            if ($validator !== true) {
+                return $this->sendResult($validator);
+            }
+
+            $board = $this->getBoardInfo($boardCode);
+            if (!$board) {
+                return $this->sendResult('존재하지 않는 게시판입니다.');
+            }
+
+            $mode = $request->get('mode', 'add');
+            $uid  = (string)$request->get('uid', '');
+            $data = $this->getPostInfo($uid);
+
+            $postData = $request->only([
+                'board_id', 'category', 'notice',
+                'name', 'email', 'phone', 'zone',
+                'subject', 'content', 'related_link'
+            ]);
+            $postData = array_map('setDefault', $postData);
+
+            if (!isset($postData['subject'])) {
+                $postData['subject'] = '';
+            }
+
+            if (!isset($postData['notice'])) {
+                $postData['notice'] = 0;
+            }
+
+            if (!isset($postData['name'])) {
+                if (auth()->check()) {
+                    $postData['name'] = auth()->user()->name;
+                } else {
+                    $postData['name'] = '';
+                }
+            }
+            if (!isset($postData['email'])) {
+                if (auth()->check()) {
+                    $postData['email'] = auth()->user()->email;
+                } else {
+                    $postData['email'] = '';
+                }
+            }
+            if (!isset($postData['phone'])) {
+                if (auth()->check()) {
+                    $postData['email'] = auth()->user()->phone;
+                } else {
+                    $postData['phone'] = '';
+                }
+            }
+
+            // 목록이미지 삭제
+            if ($request->get('delImage', 0)) {
+                // 기존파일 삭제
+                if ($data && $data->image) {
+                    $fileService->deleteFile($data->image);
+                }
+                $postData['image'] = '';
+            }
+
+            // 갤러리형 목록이미지
+            if ($request->hasFile('image')) {
+                // 기존파일 삭제
+                if ($data && $data->image) {
+                    $fileService->deleteFile($data->image);
+                }
+                $asset = $fileService->saveFile(auth()->user(), $request, 'image');
+                if ($asset) {
+                    $postData['image'] = $asset->uid;
+                }
+            }
+
+            // 수정
+            if ($mode == 'modify') {
+                if (!$data) {
+                    return $this->sendResult('게시글이 존재하지 않습니다.');
+                }
+
+                // 기존파일 삭제
+                $delFiles = $request->get('delFiles');
+                if (!empty($delFiles) && $data->assets) {
+                    foreach ($data->assets as $asset) {
+                        if (in_array($asset->uid, $delFiles)) {
+                            $fileService->deleteFile($asset->uid);
+                            $asset->delete();
+                        }
+                    }
+                }
+
+                $appends = [
+                    'updated_id' => auth()->user()->id,
+                    'updated_at' => (string)Carbon::now()
+                ];
+                $postData = array_merge($postData, $appends);
+
+                $data->fill($postData);
+                $data->save();
+            } else {
+                $appends = [
+                    'uid' => Str::uuid()->toString(),
+                    'created_at' => (string)Carbon::now()
+                ];
+
+                if (auth()->check()) {
+                    $appends['created_id'] = auth()->user()->id;
+                }
+
+                $postData = array_merge($postData, $appends);
+
+                $data = BoardArticle::query()->create($postData);
+                if (!$data) {
+                    return $this->sendResult('게시물 등록에 실패했습니다.');
+                }
+            }
+
+            // 첨부사진
+            if ($request->file('files')) {
+                $assets = $fileService->saveFile(auth()->user(), $request, 'files');
+                if (is_array($assets)) {
+                    foreach ($assets as $asset) {
+                        if ($asset) {
+                            $assetFields = array(
+                                'article_id' => $data->id,
+                                'uid' => $asset->uid
+                            );
+                            BoardAsset::query()->create($assetFields);
+                        }
+                    }
+                }
+            }
+
+
+            if ($mode == 'add') {
+                $message = '게시물이 등록되었습니다.';
+            } else {
+                $message = '게시물 정보가 수정되었습니다.';
+            }
+
+            return $this->sendResult($message, 'success');
+        });
+    }
+
+    /**
+     * 에디터 이미지 첨부파일 저장하기
+     *
+     * @param Request $request
+     * @param CrossFileService $fileService
+     * @return array
+     */
+    protected function editorImageUpload(Request $request, CrossFileService $fileService)
+    {
+        $message = '';
+        $statusCode = '';
+        $data = [];
+
+        $validatorRules = [
+            'image' => 'bail|required|file|image',
+        ];
+
+        $validatorMessages = [
+            'image' => '이미지 파일만 업로드 가능합니다',
+        ];
+
+        $validator = Validator::make($request->all(), $validatorRules, $validatorMessages);
+
+        if ($validator->fails()) {
+            $message = $validator->errors()->first('image');
+            $statusCode = 'error';
+        } else {
+            try {
+                $asset = $fileService->saveFile(auth()->user(), $request, 'image');
+                if ($asset) {
+                    $data = [
+                        'name' => $asset->name,
+                        'origin' => $asset->orgin_name,
+                        'size' => $asset->size,
+                        'width' => $asset->width,
+                        'height' => $asset->height,
+                        'url' => '/image/' . $asset->uid
+                    ];
+                    $statusCode = 'success';
+                }
+            } catch (\Exception $exception) {
+                $message = '업로드 중 에러가 발생했습니다.';
+                $statusCode = 'error';
+            }
+        }
+
+        return $this->sendResult($message, $statusCode, ['data' => $data]);
+    }
+
+    /**
+     * 첨부 파일 삭제하기
+     *
+     * @param Request $request
+     * @param CrossFileService $fileService
+     * @return array
+     */
+    public function assetDelete(Request $request, CrossFileService $fileService)
+    {
+        $data = BoardAsset::query()->where('uid', $request->uid)->first();
+        $statusCode = 'error';
+
+        if ($data) {
+            $fileService->deleteFile($data->uid);
+            $data->delete();
+            $message = '파일이 삭제되었습니다.';
+            $statusCode = 'success';
+        } else {
+            $message = '파일을 삭제하지 못했습니다.';
+        }
+
+        return $this->sendResult($message, $statusCode);
+    }
+
+    /**
+     * 댓글 저장하기
+     *
+     * @param Request $request
+     * @return array
+     */
+    protected function storeComment(Request $request)
+    {
+        return DB::transaction(function () use ($request) {
+            $rules = [
+                'artist_id' => 'required|string',
+                'content' => 'required|string'
+            ];
+
+            $validator = $this->validation($request, $rules);
+            if ($validator !== true) {
+                return $this->sendResult($validator);
+            }
+
+            $article_id = $request->get('article_id', 0);
+            $uid  = $request->get('uid', '');
+
+            $article = $this->getPostInfo($article_id);
+            if (!$article_id || !$article) {
+                return $this->sendResult('게시글이 존재하지 않습니다.');
+            }
+
+            $data = BoardComment::query()->where('uid', $uid)->first();
+
+            $postData = $request->only([
+                'content'
+            ]);
+            $postData = array_map('setDefault', $postData);
+
+            // 수정
+            if ($uid) {
+                if (!$data) {
+                    return $this->sendResult('댓글이 존재하지 않습니다.');
+                }
+
+                $appends = [
+                    'updated_id' => auth()->user()->id,
+                    'updated_at' => (string)Carbon::now()
+                ];
+                $postData = array_merge($postData, $appends);
+
+                $data->fill($postData);
+                $data->save();
+
+                return $this->sendResult('댓글이 등록되었습니다.', 'success');
+            } else {
+                $uid = Str::uuid()->toString();
+                $appends = [
+                    'article_id' => $article->id,
+                    'uid' => $uid,
+                    'parent_id' => $uid,
+                    'name' => auth()->user()->name,
+                    'created_id' => auth()->user()->id,
+                    'created_at' => (string)Carbon::now()
+                ];
+                $postData = array_merge($postData, $appends);
+
+                $data = BoardComment::query()->create($postData);
+                if (!$data) {
+                    return $this->sendResult('댓글 등록에 실패했습니다.');
+                }
+
+                return $this->sendResult('댓글이 수정되었습니다.', 'success');
+            }
+        });
+    }
+
+    /**
+     * 댓글 삭제하기
+     *
+     * @param Request $request
+     * @return array
+     */
+    protected function deleteComment(Request $request)
+    {
+        return DB::transaction(function () use ($request) {
+            $uid  = $request->get('uid', '');
+            $data = BoardComment::query()->where('uid', $uid)->first();
+            if (!$uid || !$data) {
+                return $this->sendResult('댓글이 존재하지 않습니다.');
+            }
+
+            $data->delete();
+
+            return $this->sendResult('댓글이 삭제되었습니다.', 'success');
+        });
+    }
+
+    /**
+     * 게시글 삭제
+     *
+     * @param Request $request
+     * @param CrossFileService $fileService
+     * @return array
+     */
+    public function deletePost(Request $request, CrossFileService $fileService)
+    {
+        $uid  = $request->get('uid', '');
+        $data = $this->getPostInfo($uid);
+        if (!$uid || !$data) {
+            return $this->sendResult('해당 게시글이 존재하지 않습니다.');
+        }
+
+        // 댓글 삭제
+        if ($data->comments_count) {
+            $data->comments->delete();
+        }
+
+        // 첨부파일 삭제
+        if ($data->assets) {
+            foreach ($data->assets as $asset) {
+                $fileService->deleteFile($asset->uid);
+                $asset->delete();
+            }
+        }
+
+        $data->delete();
+
+        return $this->sendResult('게시글이 삭제되었습니다.', 'success');
+    }
+}

app/Models/User.php

@@ -30,6 +30,26 @@ class User extends Authenticatable
 
     protected $table = 'user';
 
+    public function getAttribute($key)
+    {
+        if (in_array($key, $this->encryptable)) {
+            $value = $this->getEncryptAttribute($key);
+        } else {
+            $value = parent::getAttribute($key);
+        }
+
+        return $value;
+    }
+
+    public function setAttribute($key, $value)
+    {
+        if (in_array($key, $this->encryptable)) {
+            $this->setEncryptAttribute($key, $value);
+        } else {
+            parent::setAttribute($key, $value);
+        }
+    }
+
     /**
      * The attributes that are mass assignable.
      *
@@ -84,26 +104,6 @@ class User extends Authenticatable
         'phone' => EncryptFixed::class
     ];
 
-    public function getAttribute($key)
-    {
-        if (in_array($key, $this->encryptable)) {
-            $value = $this->getEncryptAttribute($key);
-        } else {
-            $value = parent::getAttribute($key);
-        }
-
-        return $value;
-    }
-
-    public function setAttribute($key, $value)
-    {
-        if (in_array($key, $this->encryptable)) {
-            $this->setEncryptAttribute($key, $value);
-        } else {
-            parent::setAttribute($key, $value);
-        }
-    }
-
     /**
      * Get the entity's last logout at.
      */

config/admin.php

@@ -2,4 +2,5 @@
 return [
     'prefix' => env('APP_ADMIN_PREFIX', 'admin'),
     'domain' => env('APP_ADMIN_DOMAIN', 'admin.localhost'),
+    'super' => env('APP_ADMIN_SUPER', ''),
 ];

resources/views/admin/board/inquiry/view.blade.php

@@ -43,7 +43,11 @@
                     <label for="input-file" class="form-label mb-2">첨부파일</label>
                     @foreach ($data->assets as $i => $asset)
                     <div class="form-control file-item-box mb-2">
+                        @if($asset->asset->width && $asset->asset->height)
+                        <a href="{{ route('image', [$asset->uid], false) }}" data-fancybox="gallery">{{ $asset->asset->orgin_name }} ({{ human_filesize($asset->asset->size) }})</a>
+                        @else
                         <a href="{{ route('download', [$asset->uid], false) }}">{{ $asset->asset->orgin_name }} ({{ human_filesize($asset->asset->size) }})</a>
+                        @endif
                     </div>
                     @endforeach
                 </div>