feat(speakers): add unique activities count endpoints for speakers and submitters #543
+625
−18
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,3 +40,4 @@ public/apc.php | |
| .nvmrc | ||
| .codegraph | ||
| docs/ | ||
| docker-compose.override.yml | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -495,4 +495,111 @@ public function send($summit_id) | |
| return $this->ok(); | ||
| }); | ||
| } | ||
|
|
||
| #[OA\Get( | ||
| path: "/api/v1/summits/{id}/submitters/all/events/count", | ||
| summary: "Get unique activities count for submitters", | ||
| operationId: "getSubmittersActivitiesCount", | ||
| tags: ["Summit Submitters"], | ||
| security: [['summit_submitters_oauth2' => [ | ||
| SummitScopes::ReadSummitData, | ||
| SummitScopes::ReadAllSummitData, | ||
| ]]], | ||
| parameters: [ | ||
| new OA\Parameter( | ||
| name: "id", | ||
| in: "path", | ||
| required: true, | ||
| description: "Summit ID", | ||
| schema: new OA\Schema(type: "integer") | ||
| ), | ||
| new OA\Parameter( | ||
| name: "filter", | ||
| in: "query", | ||
| required: false, | ||
| description: "Filter query (supports multiple operators). Filterable fields: id, not_id, first_name, last_name, email, full_name, member_id, member_user_external_id, has_accepted_presentations, has_alternate_presentations, has_rejected_presentations, presentations_track_id, presentations_selection_plan_id, presentations_type_id, presentations_title, presentations_abstract, presentations_submitter_full_name, presentations_submitter_email, is_speaker, has_media_upload_with_type, has_not_media_upload_with_type.", | ||
| schema: new OA\Schema(type: "string", example: "has_accepted_presentations==true") | ||
| ), | ||
| ], | ||
| responses: [ | ||
| new OA\Response( | ||
| response: Response::HTTP_OK, | ||
| description: "Unique activities count", | ||
| content: new OA\JsonContent( | ||
| properties: [new OA\Property(property: "count", type: "integer")] | ||
| ) | ||
| ), | ||
| new OA\Response(response: Response::HTTP_BAD_REQUEST, description: "Bad Request"), | ||
| new OA\Response(response: Response::HTTP_UNAUTHORIZED, description: "Unauthorized"), | ||
| new OA\Response(response: Response::HTTP_FORBIDDEN, description: "Forbidden"), | ||
| new OA\Response(response: Response::HTTP_NOT_FOUND, description: "Summit not found"), | ||
| new OA\Response(response: Response::HTTP_INTERNAL_SERVER_ERROR, description: "Server Error"), | ||
| ] | ||
| )] | ||
| public function getSubmittersActivitiesCount($summit_id) | ||
| { | ||
| return $this->processRequest(function () use ($summit_id) { | ||
|
|
||
| $summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->getResourceServerContext())->find(intval($summit_id)); | ||
|
Collaborator
There was a problem hiding this comment. |
||
| if (is_null($summit)) return $this->error404(); | ||
|
|
||
| $filter = null; | ||
|
|
||
| if (Request::has('filter')) { | ||
| $filter = FilterParser::parse(Request::input('filter'), [ | ||
| 'id' => ['=='], | ||
| 'not_id' => ['=='], | ||
| 'first_name' => ['=@', '@@', '=='], | ||
| 'last_name' => ['=@', '@@', '=='], | ||
| 'email' => ['=@', '@@', '=='], | ||
| 'full_name' => ['=@', '@@', '=='], | ||
| 'member_id' => ['=='], | ||
| 'member_user_external_id' => ['=='], | ||
| 'has_accepted_presentations' => ['=='], | ||
| 'has_alternate_presentations' => ['=='], | ||
| 'has_rejected_presentations' => ['=='], | ||
| 'presentations_track_id' => ['=='], | ||
| 'presentations_selection_plan_id' => ['=='], | ||
| 'presentations_type_id' => ['=='], | ||
| 'presentations_title' => ['=@', '@@', '=='], | ||
| 'presentations_abstract' => ['=@', '@@', '=='], | ||
| 'presentations_submitter_full_name' => ['=@', '@@', '=='], | ||
| 'presentations_submitter_email' => ['=@', '@@', '=='], | ||
| 'is_speaker' => ['=='], | ||
| 'has_media_upload_with_type' => ['=='], | ||
| 'has_not_media_upload_with_type' => ['=='], | ||
| ]); | ||
| } | ||
|
|
||
| if (!is_null($filter)) { | ||
| $filter->validate([ | ||
| 'id' => 'sometimes|integer', | ||
| 'not_id' => 'sometimes|integer', | ||
| 'first_name' => 'sometimes|string', | ||
| 'last_name' => 'sometimes|string', | ||
| 'email' => 'sometimes|string', | ||
| 'full_name' => 'sometimes|string', | ||
| 'member_id' => 'sometimes|integer', | ||
| 'member_user_external_id' => 'sometimes|integer', | ||
| 'has_accepted_presentations' => 'sometimes|string|in:true,false', | ||
|
Collaborator
There was a problem hiding this comment. @mulldug The getSpeakersActivitiesCount validation rules for has_accepted_presentations, has_alternate_presentations, and has_rejected_presentations use sometimes|required|string|in:true,false, |
||
| 'has_alternate_presentations' => 'sometimes|string|in:true,false', | ||
| 'has_rejected_presentations' => 'sometimes|string|in:true,false', | ||
| 'presentations_track_id' => 'sometimes|integer', | ||
| 'presentations_selection_plan_id' => 'sometimes|integer', | ||
| 'presentations_type_id' => 'sometimes|integer', | ||
| 'presentations_title' => 'sometimes|string', | ||
| 'presentations_abstract' => 'sometimes|string', | ||
| 'presentations_submitter_full_name' => 'sometimes|string', | ||
| 'presentations_submitter_email' => 'sometimes|string', | ||
| 'is_speaker' => 'sometimes|string|in:true,false', | ||
| 'has_media_upload_with_type' => 'sometimes|integer', | ||
| 'has_not_media_upload_with_type' => 'sometimes|integer', | ||
| ]); | ||
| } | ||
|
|
||
| $count = $this->repository->getUniqueActivitiesCountBySummit($summit, $filter); | ||
|
|
||
| return $this->ok(['count' => $count]); | ||
| }); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,7 +58,7 @@ protected function getBaseEntity() | |
| */ | ||
| protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null): QueryBuilder | ||
| { | ||
| if(!is_null($filter) && ($filter->hasFilter("summit_id") || $filter->hasFilter("schedule_event_id"))){ | ||
| $query | ||
| ->leftJoin("e.schedule","sch") | ||
| ->leftJoin("sch.event", "evt") | ||
|
|
@@ -638,6 +638,48 @@ function ($query) { | |
| }); | ||
| } | ||
|
|
||
| /** | ||
| * @param Summit $summit | ||
| * @param Filter|null $filter | ||
| * @return int | ||
| * @throws \Doctrine\DBAL\Exception | ||
| */ | ||
| public function getUniqueActivitiesCountBySummit(Summit $summit, Filter $filter = null): int | ||
| { | ||
| // Collect distinct member IDs matching the summit + filter using the | ||
| // same base query / filter mappings as getSubmittersBySummit. | ||
| $qb = $this->getEntityManager()->createQueryBuilder() | ||
| ->distinct(true) | ||
| ->select("e.id") | ||
| ->from($this->getBaseEntity(), "e") | ||
| ->where(" | ||
| EXISTS ( | ||
| SELECT __p.id FROM models\summit\Presentation __p | ||
| WHERE __p.created_by = e AND __p.summit = :summit | ||
| )") | ||
| ->setParameter("summit", $summit); | ||
|
|
||
| $qb = $this->applyExtraJoins($qb, $filter); | ||
|
|
||
| if (!is_null($filter)) { | ||
| $filter->apply2Query($qb, $this->getFilterMappings($filter)); | ||
| } | ||
|
|
||
| // Count distinct presentations using the member query as a subquery — no PHP ID materialization. | ||
| $countQb = $this->getEntityManager()->createQueryBuilder() | ||
| ->select("COUNT(DISTINCT p.id)") | ||
| ->from('models\summit\Presentation', 'p') | ||
| ->where('p.summit = :summit_outer') | ||
| ->andWhere("p.created_by IN ({$qb->getDQL()})"); | ||
|
Collaborator
There was a problem hiding this comment. @mulldug First, the filter mappings for this repository contain hardcoded Second, Consider using |
||
|
|
||
| $countQb->setParameter('summit_outer', $summit); | ||
| foreach ($qb->getParameters() as $param) { | ||
| $countQb->setParameter($param->getName(), $param->getValue(), $param->getType()); | ||
| } | ||
|
|
||
| return intval($countQb->getQuery()->getSingleScalarResult()); | ||
| } | ||
|
|
||
| /** | ||
| * @param PagingInfo $paging_info | ||
| * @param Filter|null $filter | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -697,6 +697,39 @@ function ($query) { | |
| } | ||
|
|
||
|
|
||
| /** | ||
| * @param Summit $summit | ||
| * @param Filter|null $filter | ||
| * @return int | ||
| * @throws \Doctrine\DBAL\Exception | ||
| */ | ||
| public function getUniqueActivitiesCountBySummit(Summit $summit, Filter $filter = null): int | ||
| { | ||
| // Single query: cross-join Presentation × PresentationSpeaker, then filter to | ||
| // rows where the speaker is either an assigned speaker OR the moderator. | ||
| // COUNT(DISTINCT p.id) deduplicates in SQL — no PHP-side array_unique needed. | ||
| // All aliases (e, m, rr) are top-level, so getFilterMappings() applies unchanged. | ||
| $countQb = $this->getEntityManager()->createQueryBuilder() | ||
| ->select('COUNT(DISTINCT p.id)') | ||
| ->from('models\summit\Presentation', 'p') | ||
| ->from('models\summit\PresentationSpeaker', 'e') | ||
|
Collaborator
There was a problem hiding this comment. @mulldug The member repository avoids this with a two-stage subquery: first collect matching member IDs, then count presentations for those IDs. The same pattern works here — collect matching speaker IDs in a subquery scoped to this summit's assignments, then feed that as an |
||
| ->leftJoin('e.registration_request', 'rr') | ||
| ->leftJoin('e.member', 'm') | ||
| ->where('p.summit = :summit') | ||
| ->andWhere( | ||
| 'EXISTS (SELECT 1 FROM App\Models\Foundation\Summit\Speakers\PresentationSpeakerAssignment __cnt' | ||
| . ' WHERE __cnt.presentation = p AND __cnt.speaker = e)' | ||
| . ' OR p.moderator = e' | ||
| ) | ||
| ->setParameter('summit', $summit); | ||
|
|
||
| if (!is_null($filter)) { | ||
| $filter->apply2Query($countQb, $this->getFilterMappings($filter)); | ||
| } | ||
|
|
||
| return intval($countQb->getQuery()->getSingleScalarResult()); | ||
| } | ||
|
|
||
| /** | ||
| * @param Summit $summit | ||
| * @param PagingInfo $paging_info | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mulldug please cast $summit_id to int