@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface WatercourseRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getWatercourseList(); |
|
| 7 | + public function getWatercourseList(); |
|
| 8 | 8 | } |
@@ -7,38 +7,38 @@ |
||
| 7 | 7 | class MysqlWaterfallRepository implements WaterfallRepositoryInterface |
| 8 | 8 | { |
| 9 | 9 | |
| 10 | - /** @var Aura\Sql\ConnectionLocator */ |
|
| 11 | - protected $connections; |
|
| 12 | - |
|
| 13 | - /** |
|
| 14 | - * @param Aura\Sql\ConnectionLocator $connections |
|
| 15 | - */ |
|
| 16 | - public function __construct(ConnectionLocator $connections) |
|
| 17 | - { |
|
| 18 | - $this->connections = $connections; |
|
| 19 | - } |
|
| 20 | - |
|
| 21 | - public function getWaterfalls($limit = null, $offset = 0) |
|
| 22 | - { |
|
| 23 | - $query = " |
|
| 10 | + /** @var Aura\Sql\ConnectionLocator */ |
|
| 11 | + protected $connections; |
|
| 12 | + |
|
| 13 | + /** |
|
| 14 | + * @param Aura\Sql\ConnectionLocator $connections |
|
| 15 | + */ |
|
| 16 | + public function __construct(ConnectionLocator $connections) |
|
| 17 | + { |
|
| 18 | + $this->connections = $connections; |
|
| 19 | + } |
|
| 20 | + |
|
| 21 | + public function getWaterfalls($limit = null, $offset = 0) |
|
| 22 | + { |
|
| 23 | + $query = " |
|
| 24 | 24 | SELECT `waterfall`.`id`, `waterfall`.`name`, `waterfall`.`alias`, |
| 25 | 25 | `watercourse`.`name` AS `watercourse`, `watercourse`.`alias` AS `watercourse_alias` |
| 26 | 26 | FROM `jpemeric_waterfall`.`waterfall` |
| 27 | 27 | INNER JOIN `jpemeric_waterfall`.`watercourse` ON `waterfall`.`watercourse` = `watercourse`.`id` |
| 28 | 28 | WHERE `is_public` = :public |
| 29 | 29 | ORDER BY `name`, `watercourse`"; |
| 30 | - if ($limit != null) { |
|
| 31 | - $query .= " |
|
| 30 | + if ($limit != null) { |
|
| 31 | + $query .= " |
|
| 32 | 32 | LIMIT {$offset}, {$limit}"; |
| 33 | - } |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - $bindings = [ |
|
| 36 | - 'public' => 1, |
|
| 37 | - ]; |
|
| 35 | + $bindings = [ |
|
| 36 | + 'public' => 1, |
|
| 37 | + ]; |
|
| 38 | 38 | |
| 39 | - return $this |
|
| 40 | - ->connections |
|
| 41 | - ->getRead() |
|
| 42 | - ->fetchAll($query, $bindings); |
|
| 43 | - } |
|
| 39 | + return $this |
|
| 40 | + ->connections |
|
| 41 | + ->getRead() |
|
| 42 | + ->fetchAll($query, $bindings); |
|
| 43 | + } |
|
| 44 | 44 | } |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface WaterfallRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getWaterfalls($limit = null, $offset= 0); |
|
| 7 | + public function getWaterfalls($limit = null, $offset= 0); |
|
| 8 | 8 | } |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface ChangelogRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getChanges($limit = null, $offset = 0); |
|
| 7 | + public function getChanges($limit = null, $offset = 0); |
|
| 8 | 8 | } |
@@ -28,9 +28,9 @@ |
||
| 28 | 28 | |
| 29 | 29 | private function get_changelog() |
| 30 | 30 | { |
| 31 | - global $container; |
|
| 32 | - $changelogRepository = new MysqlChangelogRepository($container['db_connection_locator']); |
|
| 33 | - $changelog_result = $changelogRepository->getChanges(40); |
|
| 31 | + global $container; |
|
| 32 | + $changelogRepository = new MysqlChangelogRepository($container['db_connection_locator']); |
|
| 33 | + $changelog_result = $changelogRepository->getChanges(40); |
|
| 34 | 34 | |
| 35 | 35 | foreach($changelog_result as $change) |
| 36 | 36 | { |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface GithubRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getEvents($limit = null, $offset = 0); |
|
| 8 | - public function getEventByEventId($eventId); |
|
| 7 | + public function getEvents($limit = null, $offset = 0); |
|
| 8 | + public function getEventByEventId($eventId); |
|
| 9 | 9 | } |
@@ -9,9 +9,9 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | $client = new Client(); |
| 11 | 11 | $client->authenticate( |
| 12 | - $config->github->client_id, |
|
| 13 | - $config->github->client_secret, |
|
| 14 | - Client::AUTH_URL_CLIENT_ID |
|
| 12 | + $config->github->client_id, |
|
| 13 | + $config->github->client_secret, |
|
| 14 | + Client::AUTH_URL_CLIENT_ID |
|
| 15 | 15 | ); |
| 16 | 16 | |
| 17 | 17 | /********************************************* |
@@ -24,33 +24,33 @@ discard block |
||
| 24 | 24 | $mostRecentChangeDateTime = new DateTime($mostRecentChangeDateTime); |
| 25 | 25 | |
| 26 | 26 | $parameters = [ |
| 27 | - 'sha' => 'master', |
|
| 28 | - 'since' => $mostRecentChangeDateTime->format('c'), |
|
| 27 | + 'sha' => 'master', |
|
| 28 | + 'since' => $mostRecentChangeDateTime->format('c'), |
|
| 29 | 29 | ]; |
| 30 | 30 | $commits = $client->api('repo')->commits()->all('jacobemerick', 'web', $parameters); |
| 31 | 31 | |
| 32 | 32 | foreach ($commits as $commit) { |
| 33 | - $uniqueChangeCheck = $changelogRepository->getChangeByHash($commit['sha']); |
|
| 34 | - if ($uniqueChangeCheck !== false) { |
|
| 35 | - continue; |
|
| 36 | - } |
|
| 37 | - $changelogRepository->insertChange( |
|
| 38 | - $commit['sha'], |
|
| 39 | - $commit['commit']['message'], |
|
| 40 | - (new DateTime($commit['commit']['author']['date']))->setTimezone($container['default_timezone']), |
|
| 41 | - $commit['commit']['author']['name'], |
|
| 42 | - $commit['html_url'] |
|
| 43 | - ); |
|
| 33 | + $uniqueChangeCheck = $changelogRepository->getChangeByHash($commit['sha']); |
|
| 34 | + if ($uniqueChangeCheck !== false) { |
|
| 35 | + continue; |
|
| 36 | + } |
|
| 37 | + $changelogRepository->insertChange( |
|
| 38 | + $commit['sha'], |
|
| 39 | + $commit['commit']['message'], |
|
| 40 | + (new DateTime($commit['commit']['author']['date']))->setTimezone($container['default_timezone']), |
|
| 41 | + $commit['commit']['author']['name'], |
|
| 42 | + $commit['html_url'] |
|
| 43 | + ); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /********************************************* |
| 47 | 47 | * get activity for jacobemerick |
| 48 | 48 | *********************************************/ |
| 49 | 49 | $supportedEventTypes = [ |
| 50 | - 'CreateEvent', |
|
| 51 | - 'ForkEvent', |
|
| 52 | - 'PullRequestEvent', |
|
| 53 | - 'PushEvent', |
|
| 50 | + 'CreateEvent', |
|
| 51 | + 'ForkEvent', |
|
| 52 | + 'PullRequestEvent', |
|
| 53 | + 'PushEvent', |
|
| 54 | 54 | ]; |
| 55 | 55 | |
| 56 | 56 | $githubRepository = new GithubRepository($container['db_connection_locator']); |
@@ -61,23 +61,23 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | $events = $client->api('user')->publicEvents('jacobemerick'); |
| 63 | 63 | foreach ($events as $event) { |
| 64 | - $eventDateTime = new DateTime($event['created_at']); |
|
| 65 | - if ($eventDateTime <= $mostRecentEventDateTime) { |
|
| 66 | - break; |
|
| 67 | - } |
|
| 64 | + $eventDateTime = new DateTime($event['created_at']); |
|
| 65 | + if ($eventDateTime <= $mostRecentEventDateTime) { |
|
| 66 | + break; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - if (!in_array($event['type'], $supportedEventTypes)) { |
|
| 70 | - continue; |
|
| 71 | - } |
|
| 72 | - $uniqueEventCheck = $githubRepository->getEventByEventId($event['id']); |
|
| 73 | - if ($uniqueEventCheck !== false) { |
|
| 74 | - continue; |
|
| 75 | - } |
|
| 69 | + if (!in_array($event['type'], $supportedEventTypes)) { |
|
| 70 | + continue; |
|
| 71 | + } |
|
| 72 | + $uniqueEventCheck = $githubRepository->getEventByEventId($event['id']); |
|
| 73 | + if ($uniqueEventCheck !== false) { |
|
| 74 | + continue; |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - $githubRepository->insertEvent( |
|
| 78 | - $event['id'], |
|
| 79 | - $event['type'], |
|
| 80 | - $eventDateTime->setTimezone($container['default_timezone']), |
|
| 81 | - $event |
|
| 82 | - ); |
|
| 77 | + $githubRepository->insertEvent( |
|
| 78 | + $event['id'], |
|
| 79 | + $event['type'], |
|
| 80 | + $eventDateTime->setTimezone($container['default_timezone']), |
|
| 81 | + $event |
|
| 82 | + ); |
|
| 83 | 83 | } |
@@ -16,23 +16,23 @@ |
||
| 16 | 16 | $playlist = $client->getPlaylistItemsByPlaylistId($config->youtube->favorites_playlist, 10); |
| 17 | 17 | |
| 18 | 18 | foreach ($playlist as $playlistItem) { |
| 19 | - $datetime = new DateTime($playlistItem->snippet->publishedAt); |
|
| 20 | - if ($datetime <= $mostRecentVideoDateTime) { |
|
| 21 | - break; |
|
| 22 | - } |
|
| 23 | - |
|
| 24 | - $videoId = $playlistItem->contentDetails->videoId; |
|
| 25 | - $uniqueVideoCheck = $youTubeRepository->getYouTubeByVideoId($videoId); |
|
| 26 | - if ($uniqueVideoCheck !== false) { |
|
| 27 | - continue; |
|
| 28 | - } |
|
| 29 | - |
|
| 30 | - $datetime->setTimezone($container['default_timezone']); |
|
| 31 | - $metadata = json_decode(json_encode($playlistItem), true); |
|
| 32 | - |
|
| 33 | - $youTubeRepository->insertVideo( |
|
| 34 | - $videoId, |
|
| 35 | - $datetime, |
|
| 36 | - $metadata |
|
| 37 | - ); |
|
| 19 | + $datetime = new DateTime($playlistItem->snippet->publishedAt); |
|
| 20 | + if ($datetime <= $mostRecentVideoDateTime) { |
|
| 21 | + break; |
|
| 22 | + } |
|
| 23 | + |
|
| 24 | + $videoId = $playlistItem->contentDetails->videoId; |
|
| 25 | + $uniqueVideoCheck = $youTubeRepository->getYouTubeByVideoId($videoId); |
|
| 26 | + if ($uniqueVideoCheck !== false) { |
|
| 27 | + continue; |
|
| 28 | + } |
|
| 29 | + |
|
| 30 | + $datetime->setTimezone($container['default_timezone']); |
|
| 31 | + $metadata = json_decode(json_encode($playlistItem), true); |
|
| 32 | + |
|
| 33 | + $youTubeRepository->insertVideo( |
|
| 34 | + $videoId, |
|
| 35 | + $datetime, |
|
| 36 | + $metadata |
|
| 37 | + ); |
|
| 38 | 38 | } |
@@ -8,100 +8,100 @@ |
||
| 8 | 8 | class MysqlChangelogRepository implements ChangelogRepositoryInterface |
| 9 | 9 | { |
| 10 | 10 | |
| 11 | - /** @var ConnectionLocator */ |
|
| 12 | - protected $connections; |
|
| 11 | + /** @var ConnectionLocator */ |
|
| 12 | + protected $connections; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @param ConnectonLocator $connections |
|
| 16 | - */ |
|
| 17 | - public function __construct(ConnectionLocator $connections) |
|
| 18 | - { |
|
| 19 | - $this->connections = $connections; |
|
| 20 | - } |
|
| 14 | + /** |
|
| 15 | + * @param ConnectonLocator $connections |
|
| 16 | + */ |
|
| 17 | + public function __construct(ConnectionLocator $connections) |
|
| 18 | + { |
|
| 19 | + $this->connections = $connections; |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * @param integer $limit |
|
| 24 | - * @param integer $offset |
|
| 25 | - * |
|
| 26 | - * @return array|false |
|
| 27 | - */ |
|
| 28 | - public function getChanges($limit = null, $offset = 0) |
|
| 29 | - { |
|
| 30 | - $query = " |
|
| 22 | + /** |
|
| 23 | + * @param integer $limit |
|
| 24 | + * @param integer $offset |
|
| 25 | + * |
|
| 26 | + * @return array|false |
|
| 27 | + */ |
|
| 28 | + public function getChanges($limit = null, $offset = 0) |
|
| 29 | + { |
|
| 30 | + $query = " |
|
| 31 | 31 | SELECT `message`, `message_short`, `datetime`, `commit_link` |
| 32 | 32 | FROM `jpemeric_stream`.`changelog` |
| 33 | 33 | ORDER BY `datetime` DESC"; |
| 34 | - if (!is_null($limit)) { |
|
| 35 | - $query .= " |
|
| 34 | + if (!is_null($limit)) { |
|
| 35 | + $query .= " |
|
| 36 | 36 | LIMIT {$offset}, {$limit}"; |
| 37 | - } |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - return $this |
|
| 40 | - ->connections |
|
| 41 | - ->getRead() |
|
| 42 | - ->fetchAll($query); |
|
| 43 | - } |
|
| 39 | + return $this |
|
| 40 | + ->connections |
|
| 41 | + ->getRead() |
|
| 42 | + ->fetchAll($query); |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @param string $hash |
|
| 47 | - * |
|
| 48 | - * @return array|false |
|
| 49 | - */ |
|
| 50 | - public function getChangeByHash($hash) |
|
| 51 | - { |
|
| 52 | - $query = " |
|
| 45 | + /** |
|
| 46 | + * @param string $hash |
|
| 47 | + * |
|
| 48 | + * @return array|false |
|
| 49 | + */ |
|
| 50 | + public function getChangeByHash($hash) |
|
| 51 | + { |
|
| 52 | + $query = " |
|
| 53 | 53 | SELECT * |
| 54 | 54 | FROM `jpemeric_stream`.`changelog` |
| 55 | 55 | WHERE `hash` = :hash |
| 56 | 56 | LIMIT 1"; |
| 57 | 57 | |
| 58 | - $bindings = [ |
|
| 59 | - 'hash' => $hash, |
|
| 60 | - ]; |
|
| 58 | + $bindings = [ |
|
| 59 | + 'hash' => $hash, |
|
| 60 | + ]; |
|
| 61 | 61 | |
| 62 | - return $this |
|
| 63 | - ->connections |
|
| 64 | - ->getRead() |
|
| 65 | - ->fetchOne($query, $bindings); |
|
| 66 | - } |
|
| 62 | + return $this |
|
| 63 | + ->connections |
|
| 64 | + ->getRead() |
|
| 65 | + ->fetchOne($query, $bindings); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * @param string $hash |
|
| 70 | - * @param string $message |
|
| 71 | - * @param DateTime $datetime |
|
| 72 | - * @param string $author |
|
| 73 | - * @param string $commit_link |
|
| 74 | - * |
|
| 75 | - * @return |
|
| 76 | - */ |
|
| 77 | - public function insertChange($hash, $message, DateTime $datetime, $author, $commit_link) |
|
| 78 | - { |
|
| 79 | - $message_short = $message; |
|
| 80 | - $message_short = strtok($message_short, "\n"); |
|
| 81 | - if (strlen($message_short) > 72) { |
|
| 82 | - $message_short = wordwrap($message_short, 65); |
|
| 83 | - $message_short = strtok($message_short, "\n"); |
|
| 84 | - $message_short .= '...'; |
|
| 85 | - } |
|
| 68 | + /** |
|
| 69 | + * @param string $hash |
|
| 70 | + * @param string $message |
|
| 71 | + * @param DateTime $datetime |
|
| 72 | + * @param string $author |
|
| 73 | + * @param string $commit_link |
|
| 74 | + * |
|
| 75 | + * @return |
|
| 76 | + */ |
|
| 77 | + public function insertChange($hash, $message, DateTime $datetime, $author, $commit_link) |
|
| 78 | + { |
|
| 79 | + $message_short = $message; |
|
| 80 | + $message_short = strtok($message_short, "\n"); |
|
| 81 | + if (strlen($message_short) > 72) { |
|
| 82 | + $message_short = wordwrap($message_short, 65); |
|
| 83 | + $message_short = strtok($message_short, "\n"); |
|
| 84 | + $message_short .= '...'; |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | - $query = " |
|
| 87 | + $query = " |
|
| 88 | 88 | INSERT INTO `jpemeric_stream`.`changelog` |
| 89 | 89 | (`hash`, `message`, `message_short`, `datetime`, `author`, `commit_link`) |
| 90 | 90 | VALUES |
| 91 | 91 | (:hash, :message, :message_short, :datetime, :author, :commit_link)"; |
| 92 | 92 | |
| 93 | - $bindings = [ |
|
| 94 | - 'hash' => $hash, |
|
| 95 | - 'message' => $message, |
|
| 96 | - 'message_short' => $message_short, |
|
| 97 | - 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
| 98 | - 'author' => $author, |
|
| 99 | - 'commit_link' => $commit_link |
|
| 100 | - ]; |
|
| 93 | + $bindings = [ |
|
| 94 | + 'hash' => $hash, |
|
| 95 | + 'message' => $message, |
|
| 96 | + 'message_short' => $message_short, |
|
| 97 | + 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
| 98 | + 'author' => $author, |
|
| 99 | + 'commit_link' => $commit_link |
|
| 100 | + ]; |
|
| 101 | 101 | |
| 102 | - return $this |
|
| 103 | - ->connections |
|
| 104 | - ->getWrite() |
|
| 105 | - ->perform($query, $bindings); |
|
| 106 | - } |
|
| 102 | + return $this |
|
| 103 | + ->connections |
|
| 104 | + ->getWrite() |
|
| 105 | + ->perform($query, $bindings); |
|
| 106 | + } |
|
| 107 | 107 | } |