X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/9d4b25a60ff36b21f841ad7bf785186f270c91ef..58883dd276b37950932fff7bc166b95404f7b4ca:/Command/Calendar2Command.php?ds=sidebyside

diff --git a/Command/Calendar2Command.php b/Command/Calendar2Command.php
index 86be070..0ce4da8 100644
--- a/Command/Calendar2Command.php
+++ b/Command/Calendar2Command.php
@@ -26,96 +26,62 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 use Twig\Extra\Markdown\DefaultMarkdown;
 
-use Rapsys\AirBundle\Entity\Session;
+use Rapsys\AirBundle\Command;
 use Rapsys\AirBundle\Entity\GoogleCalendar;
 use Rapsys\AirBundle\Entity\GoogleToken;
+use Rapsys\AirBundle\Entity\Session;
 
 use Rapsys\PackBundle\Util\SluggerUtil;
 
+/**
+ * {@inheritdoc}
+ *
+ * Synchronize sessions in users' calendar
+ */
 class Calendar2Command extends Command {
 	/**
-	 * Set default name
-	 */
-    protected static $defaultName = 'rapsysair:calendar2';
-
-	/**
-	 * Set default description
-	 */
-    protected static $defaultDescription = 'Synchronize sessions in users\' calendar';
-
-	/**
-	 * Set google client scopes
-	 */
-	private array $scopes = [
-		Calendar::CALENDAR_EVENTS,
-		Calendar::CALENDAR,
-		Oauth2::USERINFO_EMAIL
-	];
-
-	/**
-	 * Set google client instance
-	 */
-	private Client $client;
-
-	/**
-	 * Set markdown instance
+	 * Set description
+	 *
+	 * Shown with bin/console list
 	 */
-	private DefaultMarkdown $markdown;
+	protected string $description = 'Synchronize sessions in users\' calendar';
 
 	/**
-	 * Set date period instance
+	 * Set help
+	 *
+	 * Shown with bin/console --help rapsysair:calendar2
 	 */
-	private \DatePeriod $period;
+	protected string $help = 'This command synchronize sessions in users\' google calendar';
 
 	/**
 	 * {@inheritdoc}
-	 *
-	 * @param string $project The google project
-	 * @param string $client The google client
-	 * @param string $secret The google secret
 	 */
-	public function __construct(ManagerRegistry $doctrine, RouterInterface $router, SluggerUtil $slugger, TranslatorInterface $translator, string $locale, string $project, string $client, string $secret) {
+	public function __construct(protected ManagerRegistry $doctrine, protected string $locale, protected RouterInterface $router, protected SluggerUtil $slugger, protected TranslatorInterface $translator, protected Client $google, protected DefaultMarkdown $markdown) {
 		//Call parent constructor
-		parent::__construct($doctrine, $router, $slugger, $translator, $locale);
-
-		//Set google client
-		$this->client = new Client(
-			[
-				'application_name' => $project,
-				'client_id' => $client,
-				'client_secret' => $secret,
-				'redirect_uri' => $this->router->generate('rapsys_air_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
-				'scopes' => $this->scopes,
-				'access_type' => 'offline',
-				#'login_hint' => $user->getMail(),
-				//XXX: see https://stackoverflow.com/questions/10827920/not-receiving-google-oauth-refresh-token
-				#'approval_prompt' => 'force'
-				'prompt' => 'consent'
-			]
-		);
+		parent::__construct($this->doctrine, $this->locale, $this->router, $this->slugger, $this->translator);
 
-		//Set Markdown instance
-		$this->markdown = new DefaultMarkdown;
+		//Replace google client redirect uri
+		$this->google->setRedirectUri($this->router->generate($this->google->getRedirectUri(), [], UrlGeneratorInterface::ABSOLUTE_URL));
 	}
 
 	/**
 	 * Process the attribution
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		//Set period
+		$period = new \DatePeriod(
+			//Start from last week
+			new \DateTime('-1 week'),
+			//Iterate on each day
+			new \DateInterval('P1D'),
+			//End with next 2 week
+			new \DateTime('+2 week')
+		);
+
 		//Iterate on google tokens
 		foreach($tokens = $this->doctrine->getRepository(GoogleToken::class)->findAllIndexed() as $tid => $token) {
 			//Iterate on google calendars
 			foreach($calendars = $token['calendars'] as $cid => $calendar) {
-				//Set period
-				$this->period = new \DatePeriod(
-					//Start from last week
-					new \DateTime('-1 week'),
-					//Iterate on each day
-					new \DateInterval('P1D'),
-					//End with next 2 week
-					new \DateTime('+2 week')
-				);
-
 				#$calendar['synchronized']
 				var_dump($token);
 
@@ -124,7 +90,7 @@ class Calendar2Command extends Command {
 				//TODO: load all calendar events here ?
 
 				//Iterate on sessions to update
-				foreach($sessions = $this->doctrine->getRepository(Session::class)->findAllByUserIdSynchronized($token['uid'], $calendar['synchronized'])) {
+				foreach($sessions = $this->doctrine->getRepository(Session::class)->findAllByUserIdSynchronized($token['uid'], $calendar['synchronized']) as $session) {
 					//TODO: insert/update/delete events here ?
 				}
 
@@ -136,56 +102,7 @@ class Calendar2Command extends Command {
 
 		//TODO: XXX: or fetch directly the events updated since synchronized + matching rubscriptions and/or dances
 
-		#var_dump($tokens);
 		exit;
-		
-		//Set sql request
-		$sql =<<<SQL
-SELECT
-	b.*,
-	GROUP_CONCAT(us.user_id) AS users
-FROM (
-	SELECT
-		a.*,
-		GROUP_CONCAT(ud.dance_id) AS dances
-	FROM (
-		SELECT
-			t.id AS tid,
-			t.mail AS gmail,
-			t.user_id,
-			t.access,
-			t.refresh,
-			t.expired,
-			GROUP_CONCAT(c.id) AS cids,
-			GROUP_CONCAT(c.mail) AS cmails,
-			GROUP_CONCAT(c.summary) AS csummaries,
-			GROUP_CONCAT(c.synchronized) AS csynchronizeds
-		FROM google_tokens AS t
-		JOIN google_calendars AS c ON (c.google_token_id = t.id)
-		GROUP BY t.id
-		ORDER BY NULL
-		LIMIT 100000
-	) AS a
-	LEFT JOIN users_dances AS ud ON (ud.user_id = a.user_id)
-	GROUP BY a.tid
-	ORDER BY NULL
-	LIMIT 100000
-) AS b
-LEFT JOIN users_subscriptions AS us ON (us.subscriber_id = b.user_id)
-GROUP BY b.tid
-ORDER BY NULL
-SQL;
-		#$sessions = $this->doctrine->getRepository(Session::class)->findAllByDanceUserModified($filter['dance'], $filter['user'], $calendar['synchronized']);
-		//Iterate on google tokens
-		foreach($tokens as $token) {
-			//TODO: clear google client cache
-			//TODO: set google token
-			//Iterate on google calendars
-			foreach($calendars as $calendar) {
-				//Fetch sessions to sync
-				$sessions = $this->doctrine->getRepository(Session::class)->findAllByDanceUserModified($filter['dance'], $filter['user'], $calendar['synchronized']);
-			}
-		}
 
 		//Return success
 		return self::SUCCESS;