@@ -7,20 +7,20 @@ discard block |
||
| 7 | 7 | class MysqlCountyRepository implements CountyRepositoryInterface |
| 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 getCountyList() |
|
| 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 getCountyList() |
|
| 22 | + { |
|
| 23 | + $query = " |
|
| 24 | 24 | SELECT `county`.`name`, `county`.`alias`, COUNT(1) AS `count` |
| 25 | 25 | FROM `jpemeric_waterfall`.`county` |
| 26 | 26 | INNER JOIN `jpemeric_waterfall`.`waterfall` ON `waterfall`.`county` = `county`.`id` AND |
@@ -28,13 +28,13 @@ discard block |
||
| 28 | 28 | GROUP BY `alias` |
| 29 | 29 | ORDER BY `name`"; |
| 30 | 30 | |
| 31 | - $bindings = [ |
|
| 32 | - 'public' => 1, |
|
| 33 | - ]; |
|
| 31 | + $bindings = [ |
|
| 32 | + 'public' => 1, |
|
| 33 | + ]; |
|
| 34 | 34 | |
| 35 | - return $this |
|
| 36 | - ->connections |
|
| 37 | - ->getRead() |
|
| 38 | - ->fetchAll($query, $bindings); |
|
| 39 | - } |
|
| 35 | + return $this |
|
| 36 | + ->connections |
|
| 37 | + ->getRead() |
|
| 38 | + ->fetchAll($query, $bindings); |
|
| 39 | + } |
|
| 40 | 40 | } |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | protected $connections; |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | - * @param Aura\Sql\ConnectionLocator $connections |
|
| 14 | + * @param ConnectionLocator $connections |
|
| 15 | 15 | */ |
| 16 | 16 | public function __construct(ConnectionLocator $connections) |
| 17 | 17 | { |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface LogRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getActiveLogs($limit = null, $offset= 0); |
|
| 7 | + public function getActiveLogs($limit = null, $offset= 0); |
|
| 8 | 8 | } |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface LogRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getActiveLogs($limit = null, $offset= 0); |
|
| 7 | + public function getActiveLogs($limit = null, $offset = 0); |
|
| 8 | 8 | } |
@@ -7,36 +7,36 @@ |
||
| 7 | 7 | class MysqlLogRepository implements LogRepositoryInterface |
| 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 getActiveLogs($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 getActiveLogs($limit = null, $offset = 0) |
|
| 22 | + { |
|
| 23 | + $query = " |
|
| 24 | 24 | SELECT `id`, `title`, `alias`, `date`, `publish_date`, `introduction` |
| 25 | 25 | FROM `jpemeric_waterfall`.`log` |
| 26 | 26 | WHERE `is_public` = :public |
| 27 | 27 | ORDER BY `date` DESC"; |
| 28 | - if ($limit != null) { |
|
| 29 | - $query .= " |
|
| 28 | + if ($limit != null) { |
|
| 29 | + $query .= " |
|
| 30 | 30 | LIMIT {$offset}, {$limit}"; |
| 31 | - } |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - $bindings = [ |
|
| 34 | - 'public' => 1, |
|
| 35 | - ]; |
|
| 33 | + $bindings = [ |
|
| 34 | + 'public' => 1, |
|
| 35 | + ]; |
|
| 36 | 36 | |
| 37 | - return $this |
|
| 38 | - ->connections |
|
| 39 | - ->getRead() |
|
| 40 | - ->fetchAll($query, $bindings); |
|
| 41 | - } |
|
| 37 | + return $this |
|
| 38 | + ->connections |
|
| 39 | + ->getRead() |
|
| 40 | + ->fetchAll($query, $bindings); |
|
| 41 | + } |
|
| 42 | 42 | } |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | protected $connections; |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | - * @param Aura\Sql\ConnectionLocator $connections |
|
| 14 | + * @param ConnectionLocator $connections |
|
| 15 | 15 | */ |
| 16 | 16 | public function __construct(ConnectionLocator $connections) |
| 17 | 17 | { |
@@ -7,20 +7,20 @@ discard block |
||
| 7 | 7 | class MysqlPeriodRepository implements PeriodRepositoryInterface |
| 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 getPeriodList() |
|
| 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 getPeriodList() |
|
| 22 | + { |
|
| 23 | + $query = " |
|
| 24 | 24 | SELECT `period`.`name`, `period`.`alias`, COUNT(1) AS `count` |
| 25 | 25 | FROM `jpemeric_waterfall`.`period` |
| 26 | 26 | INNER JOIN `jpemeric_waterfall`.`log` ON `log`.`period` = `log`.`id` AND |
@@ -28,13 +28,13 @@ discard block |
||
| 28 | 28 | GROUP BY `alias` |
| 29 | 29 | ORDER BY `name`"; |
| 30 | 30 | |
| 31 | - $bindings = [ |
|
| 32 | - 'public' => 1, |
|
| 33 | - ]; |
|
| 31 | + $bindings = [ |
|
| 32 | + 'public' => 1, |
|
| 33 | + ]; |
|
| 34 | 34 | |
| 35 | - return $this |
|
| 36 | - ->connections |
|
| 37 | - ->getRead() |
|
| 38 | - ->fetchAll($query, $bindings); |
|
| 39 | - } |
|
| 35 | + return $this |
|
| 36 | + ->connections |
|
| 37 | + ->getRead() |
|
| 38 | + ->fetchAll($query, $bindings); |
|
| 39 | + } |
|
| 40 | 40 | } |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | protected $connections; |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | - * @param Aura\Sql\ConnectionLocator $connections |
|
| 14 | + * @param ConnectionLocator $connections |
|
| 15 | 15 | */ |
| 16 | 16 | public function __construct(ConnectionLocator $connections) |
| 17 | 17 | { |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface PeriodRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getPeriodList(); |
|
| 7 | + public function getPeriodList(); |
|
| 8 | 8 | } |
@@ -7,21 +7,21 @@ discard block |
||
| 7 | 7 | class MysqlWatercourseRepository implements WatercourseRepositoryInterface |
| 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 | - // todo wot are you even serious |
|
| 22 | - public function getWatercourseList() |
|
| 23 | - { |
|
| 24 | - $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 | + // todo wot are you even serious |
|
| 22 | + public function getWatercourseList() |
|
| 23 | + { |
|
| 24 | + $query = " |
|
| 25 | 25 | SELECT `sum_table`.`name`, `sum_table`.`alias`, SUM(`count`) AS `count` |
| 26 | 26 | FROM (( |
| 27 | 27 | SELECT `watercourse`.`name`, `watercourse`.`alias`, `parent_count`.`count` |
@@ -46,15 +46,15 @@ discard block |
||
| 46 | 46 | GROUP BY `alias` |
| 47 | 47 | ORDER BY `name`"; |
| 48 | 48 | |
| 49 | - $bindings = [ |
|
| 50 | - 'public' => 1, |
|
| 51 | - 'no_parent' => 0, |
|
| 52 | - 'has_page' => 1, |
|
| 53 | - ]; |
|
| 54 | - |
|
| 55 | - return $this |
|
| 56 | - ->connections |
|
| 57 | - ->getRead() |
|
| 58 | - ->fetchAll($query, $bindings); |
|
| 59 | - } |
|
| 49 | + $bindings = [ |
|
| 50 | + 'public' => 1, |
|
| 51 | + 'no_parent' => 0, |
|
| 52 | + 'has_page' => 1, |
|
| 53 | + ]; |
|
| 54 | + |
|
| 55 | + return $this |
|
| 56 | + ->connections |
|
| 57 | + ->getRead() |
|
| 58 | + ->fetchAll($query, $bindings); |
|
| 59 | + } |
|
| 60 | 60 | } |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | protected $connections; |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | - * @param Aura\Sql\ConnectionLocator $connections |
|
| 14 | + * @param ConnectionLocator $connections |
|
| 15 | 15 | */ |
| 16 | 16 | public function __construct(ConnectionLocator $connections) |
| 17 | 17 | { |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface WatercourseRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getWatercourseList(); |
|
| 7 | + public function getWatercourseList(); |
|
| 8 | 8 | } |
@@ -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 WaterfallRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getWaterfalls($limit = null, $offset= 0); |
|
| 7 | + public function getWaterfalls($limit = null, $offset = 0); |
|
| 8 | 8 | } |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | require_once __DIR__ . '/../index.php'; |
| 4 | 4 | |
| 5 | 5 | use Github\Client; |
| 6 | - |
|
| 7 | 6 | use Jacobemerick\Web\Domain\Stream\Changelog\MysqlChangelogRepository as ChangelogRepository; |
| 8 | 7 | |
| 9 | 8 | $client = new Client(); |
@@ -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 | } |