Skip to content

Feature/gat 4841 #932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft

Feature/gat 4841 #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a347940
index all teams
calmacx Oct 10, 2024
75b8b31
hot fix for sql tables
calmacx Oct 21, 2024
9e98114
revert file
calmacx Oct 21, 2024
bfda9d4
update enquiry thread
calmacx Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion app/Http/Controllers/Api/V1/EnquiryThreadController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ public function index(Request $request): JsonResponse
* description="EnquiryThread id",
* ),
* ),
* @OA\Parameter(
* name="include_messages",
* in="query",
* description="Include messages in the response",
* required=false,
* example="true",
* @OA\Schema(
* type="boolean",
* description="Whether to include related messages",
* ),
* ),
* @OA\Response(
* response=200,
* description="Success",
Expand Down Expand Up @@ -130,8 +141,14 @@ public function show(Request $request, int $id): JsonResponse
try {
$input = $request->all();
$jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : [];
$includeMessages = $request->boolean('include_messages', false);

$enquiryThread = EnquiryThread::where('id', $id)->get();
$enquiryThread = EnquiryThread::when(
$includeMessages,
function ($query) {
$query->with("messages");
}
)->where('id', $id)->get();

Auditor::log([
'user_id' => (int)$jwtUser['id'],
Expand Down
4 changes: 2 additions & 2 deletions app/Models/Traits/ModelHelpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function countDursForDatasetVersion(int $datasetVersionId): null|int
WHERE
dataset_version_id = :dataset_version_id
AND
deleted_at = null
deleted_at is NULL
',
[
'dataset_version_id' => $datasetVersionId,
Expand All @@ -40,7 +40,7 @@ public function countPublicationsForDatasetVersion(int $datasetVersionId): null|
WHERE
dataset_version_id = :dataset_version_id
AND
deleted_at = null
deleted_at IS NULL
',
[
'dataset_version_id' => $datasetVersionId,
Expand Down