fix : 회원목록, 회원상세정보, 내정보 보기 기능 수정 (with Swagger)

app/Services/MemberService.php

@@ -6,6 +6,7 @@
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
+use Illuminate\Auth\AuthenticationException;
 
 class MemberService
 {
@@ -32,7 +33,7 @@ public static function getMembers($request)
     /**
      * 단일 회원 조회
      */
-    public static function getMember(int $userNo, bool $debug = false)
+    public static function getMember(int $userNo)
     {
         $query = User::whereHas('userTenants', function($q) {
             $q->active();
@@ -44,18 +45,22 @@ public static function getMember(int $userNo, bool $debug = false)
     /**
      * 내정보 확인
      */
-    public static function getMyInfo($request, bool $debug = false)
+    public static function getMyInfo()
     {
 
         $apiUser = app('api_user');
 
-        $user = User::find($apiUser);
+        $user = User::with([
+            'userTenant.tenant' => function($q) {
+                $q->select('id', 'company_name', 'code', 'email', 'phone', 'address', 'business_num', 'corp_reg_no', 'ceo_name', 'homepage', 'fax', 'logo', 'admin_memo', 'options',); // 원하는 컬럼만
+            }
+        ])->find($apiUser);
         $data=[
-            'member' => $member,
-            'company' => $company
+            'user' => $user->userTenant->user,
+            'tenant' => $user->userTenant->tenant,
         ];
 
-        return ApiResponse::response('result', $data, $debug);
+        return ApiResponse::response('result', $data);
     }
 
     /**