Repository navigation
Split conferences and CFPs #2058
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.
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
Open
mattstauffer
wants to merge
2
commits into
php:master
Choose a base branch
from
mattstauffer:mes/conferences-split
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+445
−24
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace phpweb\News; | ||
|
|
||
| /** | ||
| * The category terms a news entry can carry. | ||
| */ | ||
| enum Category: string | ||
| { | ||
| case Frontpage = 'frontpage'; | ||
| case Releases = 'releases'; | ||
| case Conferences = 'conferences'; | ||
| case Cfp = 'cfp'; | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace phpweb\News; | ||
|
|
||
| use function usort; | ||
|
|
||
| /** | ||
| * Groups and orders conference/CFP news entries for the /conferences page and its CFP view. | ||
| * | ||
| * Conferences and calls for papers are separate, unlinked news entries, each with a single | ||
| * finalTeaserDate that means different things: for a conference it's the event's start date, | ||
| * for a CFP it's the submission deadline. They live on different pages: | ||
| * | ||
| * - The conferences view shows conferences only, split by start date into upcoming (soonest | ||
| * first) and past (most recent first). A conference with no finalTeaserDate falls into past. | ||
| * - The CFP view shows CFPs only, split by deadline into open (deadline today or later, soonest | ||
| * first) and closed (deadline passed, or no deadline, most recently closed first). | ||
| * | ||
| * finalTeaserDate nuance: for a conference it's start date, for a CFP it's end date | ||
| */ | ||
| final class ConferenceSchedule | ||
| { | ||
| /** @var list<array> Conferences starting today or later, soonest first. */ | ||
| public private(set) array $upcomingConferences = []; | ||
|
|
||
| /** @var list<array> Conferences already started (or undated), most recent first. */ | ||
| public private(set) array $pastConferences = []; | ||
|
|
||
| /** @var list<array> CFPs whose submission deadline has not passed, soonest deadline first. */ | ||
| public private(set) array $openCallsForPapers = []; | ||
|
|
||
| /** @var list<array> CFPs whose deadline has passed (or is unknown), most recently closed first. */ | ||
| public private(set) array $closedCallsForPapers = []; | ||
|
|
||
| /** | ||
| * @param list<array> $entries conference/CFP entries, e.g. from NewsHandler::getConferences() | ||
| * @param string $today today's date as 'Y-m-d' | ||
| */ | ||
| public function __construct(array $entries, string $today) | ||
| { | ||
| foreach ($entries as $entry) { | ||
| $this->assignConferenceOrCfp($entry, $today); | ||
| } | ||
|
|
||
| $this->upcomingConferences = self::sortedByDate($this->upcomingConferences, ascending: true); | ||
| $this->openCallsForPapers = self::sortedByDate($this->openCallsForPapers, ascending: true); | ||
| $this->pastConferences = self::sortedByDate($this->pastConferences, ascending: false); | ||
| $this->closedCallsForPapers = self::sortedByDate($this->closedCallsForPapers, ascending: false); | ||
| } | ||
|
|
||
| /** | ||
| * The entry's primary term. A few posts announce a conference and open its CFP at once, | ||
| * carrying both terms; anything that is a conference is treated as a conference (and so | ||
| * placed by its date), leaving Cfp for CFP-only posts. | ||
| * | ||
| * @param array<array-key, mixed> $entry | ||
| */ | ||
| public static function termFor(array $entry): ?Category | ||
| { | ||
| $found = null; | ||
| foreach ($entry['category'] as $category) { | ||
| $term = Category::tryFrom($category['term']); | ||
|
|
||
| if ($term === Category::Conferences) { | ||
| return $term; | ||
| } | ||
|
|
||
| if ($term === Category::Cfp) { | ||
| $found = $term; | ||
| } | ||
| } | ||
|
|
||
| return $found; | ||
| } | ||
|
|
||
| /** | ||
| * @param array<array-key, mixed> $conferenceOrCfp | ||
| */ | ||
| private function assignConferenceOrCfp(array $conferenceOrCfp, string $today): void | ||
| { | ||
| $isFuture = isset($conferenceOrCfp['finalTeaserDate']) && $conferenceOrCfp['finalTeaserDate'] >= $today; | ||
| $isCfp = self::termFor($conferenceOrCfp) === Category::Cfp; | ||
|
|
||
| match (true) { | ||
| $isCfp && $isFuture => $this->openCallsForPapers[] = $conferenceOrCfp, | ||
| $isCfp => $this->closedCallsForPapers[] = $conferenceOrCfp, | ||
| $isFuture => $this->upcomingConferences[] = $conferenceOrCfp, | ||
| default => $this->pastConferences[] = $conferenceOrCfp, | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Sort entries by finalTeaserDate ('Y-m-d'), keeping undated entries last. | ||
| * | ||
| * @param list<array> $entries | ||
| * | ||
| * @return list<array> | ||
| */ | ||
| private static function sortedByDate(array $entries, bool $ascending): array | ||
| { | ||
| usort($entries, static function (array $a, array $b) use ($ascending): int { | ||
| $aDate = $a['finalTeaserDate'] ?? ''; | ||
| $bDate = $b['finalTeaserDate'] ?? ''; | ||
|
|
||
| // Push undated entries to the end whichever way the dated ones are ordered. | ||
| if ($aDate === '' || $bDate === '') { | ||
| return ($aDate === '' ? 1 : 0) <=> ($bDate === '' ? 1 : 0); | ||
| } | ||
|
|
||
| return $ascending ? $aDate <=> $bDate : $bDate <=> $aDate; | ||
| }); | ||
|
|
||
| return $entries; | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.