|
@@ -9,9 +9,11 @@
|
|
namespace App\Http\Controllers\V1;
|
|
namespace App\Http\Controllers\V1;
|
|
|
|
|
|
use App\Repositories\Circle\CircleArticleRepository;
|
|
use App\Repositories\Circle\CircleArticleRepository;
|
|
|
|
+use App\Repositories\Circle\CircleMemberRepository;
|
|
use App\Repositories\Circle\CircleRepository;
|
|
use App\Repositories\Circle\CircleRepository;
|
|
use App\Traits\UserTrait;
|
|
use App\Traits\UserTrait;
|
|
use App\Transformers\Circle\ArticleListTransformer;
|
|
use App\Transformers\Circle\ArticleListTransformer;
|
|
|
|
+use App\Transformers\Circle\CircleMemberTransformer;
|
|
use App\Transformers\Circle\DetailTransformer;
|
|
use App\Transformers\Circle\DetailTransformer;
|
|
use App\Transformers\Circle\QuestionTransformer;
|
|
use App\Transformers\Circle\QuestionTransformer;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Http\Request;
|
|
@@ -29,10 +31,12 @@ class CircleController extends Controller
|
|
use UserTrait;
|
|
use UserTrait;
|
|
|
|
|
|
public function __construct(CircleRepository $circleRepository,
|
|
public function __construct(CircleRepository $circleRepository,
|
|
- CircleArticleRepository $circleArticleRepository)
|
|
|
|
|
|
+ CircleArticleRepository $circleArticleRepository,
|
|
|
|
+ CircleMemberRepository $circleMemberRepository)
|
|
{
|
|
{
|
|
$this->circleRepository = $circleRepository;
|
|
$this->circleRepository = $circleRepository;
|
|
$this->circleArticleRepository = $circleArticleRepository;
|
|
$this->circleArticleRepository = $circleArticleRepository;
|
|
|
|
+ $this->circleMemberRepository = $circleMemberRepository;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -149,7 +153,7 @@ class CircleController extends Controller
|
|
if ($userInfo) {
|
|
if ($userInfo) {
|
|
$uid = $userInfo['uid'];
|
|
$uid = $userInfo['uid'];
|
|
$inviteCode = $userInfo['invite_code'];
|
|
$inviteCode = $userInfo['invite_code'];
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
$uid = 0;
|
|
$uid = 0;
|
|
$inviteCode = '';
|
|
$inviteCode = '';
|
|
}
|
|
}
|
|
@@ -167,4 +171,21 @@ class CircleController extends Controller
|
|
|
|
|
|
return jsonSuccess($data);
|
|
return jsonSuccess($data);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public function memberList(Request $request)
|
|
|
|
+ {
|
|
|
|
+ $validator = Validator::make($request->all(), [
|
|
|
|
+ 'id' => 'required|exists:interest_circles'
|
|
|
|
+ ]);
|
|
|
|
+ if ($validator->fails()) {
|
|
|
|
+ return $this->jsonError($validator->errors()->first());
|
|
|
|
+ }
|
|
|
|
+ $list = $this->circleMemberRepository->lists($request->all());
|
|
|
|
+ $fractal = new Manager();
|
|
|
|
+ $resource = new Collection($list, new CircleMemberTransformer());
|
|
|
|
+ $resource->setPaginator(new IlluminatePaginatorAdapter($list));
|
|
|
|
+ $data = $fractal->createData($resource)->toArray();
|
|
|
|
+
|
|
|
|
+ return jsonSuccess($data);
|
|
|
|
+ }
|
|
}
|
|
}
|