|
1 | | -<<<<<<< HEAD |
2 | | -======= |
3 | 1 | <?php |
4 | 2 |
|
5 | 3 | /** |
|
21 | 19 | use Illuminate\Http\JsonResponse; |
22 | 20 | use Illuminate\Http\Response; |
23 | 21 | use Illuminate\Support\Facades\Route; |
| 22 | +use Illuminate\Support\Facades\DB; |
24 | 23 | use PKP\core\PKPBaseController; |
25 | 24 | use PKP\core\PKPRequest; |
| 25 | +use PKP\API\v1\editTaskTemplates\formRequests\AddTaskTemplate; |
| 26 | +use PKP\API\v1\editTaskTemplates\resources\TaskTemplateResource; |
26 | 27 | use Illuminate\Http\Request; |
27 | 28 | use PKP\security\authorization\CanAccessSettingsPolicy; |
28 | 29 | use PKP\security\authorization\ContextAccessPolicy; |
@@ -57,39 +58,85 @@ public function getGroupRoutes(): void |
57 | 58 | Role::ROLE_ID_SITE_ADMIN, |
58 | 59 | ]), |
59 | 60 | ])->group(function () { |
| 61 | + Route::post('', $this->add(...)); |
60 | 62 | Route::get('', $this->getMany(...)); |
61 | 63 | }); |
62 | 64 | } |
63 | 65 |
|
| 66 | + /** |
| 67 | + * POST /api/v1/editTaskTemplates |
| 68 | + */ |
| 69 | + public function add(AddTaskTemplate $illuminateRequest): JsonResponse |
| 70 | + { |
| 71 | + $context = $this->getRequest()->getContext(); |
| 72 | + $validated = $illuminateRequest->validated(); |
| 73 | + |
| 74 | + $template = DB::transaction(function () use ($validated, $context) { |
| 75 | + $tpl = Template::create([ |
| 76 | + 'stage_id' => $validated['stageId'], |
| 77 | + 'title' => $validated['title'], |
| 78 | + 'context_id' => $context->getId(), |
| 79 | + 'include' => $validated['include'] ?? false, |
| 80 | + 'email_template_key' => $validated['emailTemplateKey'] ?? null, |
| 81 | + ]); |
| 82 | + |
| 83 | + $tpl->userGroups()->sync($validated['userGroupIds']); |
| 84 | + |
| 85 | + return $tpl; |
| 86 | + }); |
| 87 | + |
| 88 | + // return via Resource |
| 89 | + return response()->json( |
| 90 | + (new TaskTemplateResource($template->refresh()->load('userGroups'))) |
| 91 | + ->toArray($illuminateRequest), |
| 92 | + Response::HTTP_OK |
| 93 | + ); |
| 94 | + } |
| 95 | + |
64 | 96 | /** |
65 | 97 | * GET /api/v1/editTaskTemplates |
66 | 98 | */ |
67 | 99 | public function getMany(Request $request): JsonResponse |
68 | 100 | { |
69 | 101 | $context = $this->getRequest()->getContext(); |
70 | 102 |
|
71 | | - $q = Template::query() |
72 | | - ->byContextId((int) $context->getId()) |
| 103 | + // Start with our standard collector/scopes |
| 104 | + $collector = Template::byContextId((int) $context->getId()) |
73 | 105 | ->with('userGroups'); |
74 | 106 |
|
75 | | - if ($request->filled('stageId')) { |
76 | | - $q->where('stage_id', (int) $request->query('stageId')); |
77 | | - } |
| 107 | + // Apply supported filters from query params via model scopes |
| 108 | + foreach ($request->query() as $param => $val) { |
| 109 | + switch ($param) { |
| 110 | + case 'stageId': |
| 111 | + if ($val !== null && $val !== '') { |
| 112 | + $collector = $collector->withStageId((int) $val); |
| 113 | + } |
| 114 | + break; |
| 115 | + |
| 116 | + case 'include': |
| 117 | + // Accept "true"/"false", 1/0, etc. |
| 118 | + $bool = filter_var($val, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); |
| 119 | + if ($bool !== null) { |
| 120 | + $collector = $collector->withInclude($bool); |
| 121 | + } |
| 122 | + break; |
| 123 | + |
| 124 | + case 'emailTemplateKey': |
| 125 | + $key = trim((string) $val); |
| 126 | + if ($key !== '') { |
| 127 | + $collector = $collector->withEmailTemplateKey($key); |
| 128 | + } |
| 129 | + break; |
78 | 130 |
|
79 | | - if ($request->has('include')) { |
80 | | - $include = filter_var($request->query('include'), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); |
81 | | - if ($include !== null) { |
82 | | - $q->where('include', $include); |
| 131 | + // ignore unknown params |
83 | 132 | } |
84 | 133 | } |
85 | 134 |
|
86 | | - if ($request->filled('emailTemplateKey')) { |
87 | | - $q->where('email_template_key', trim((string) $request->query('emailTemplateKey'))); |
88 | | - } |
89 | | - $collection = $q->orderByPkDesc()->get(); |
| 135 | + $collection = $collector->orderByPkDesc()->get(); |
| 136 | + |
90 | 137 | return EditTaskTemplateResource::collection($collection) |
91 | 138 | ->response() |
92 | 139 | ->setStatusCode(Response::HTTP_OK); |
93 | | - } |
| 140 | + } |
| 141 | + |
94 | 142 | } |
95 | | ->>>>>>> 3036c1a2c0... pkp/pkp-lib#11833 Rename to getMany, drop validation, use scope, return collection |
|
0 commit comments