X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/9d4b25a60ff36b21f841ad7bf785186f270c91ef..278a472cf91b7936dca2ea7629a931be4ff74740:/Command/Calendar2Command.php

diff --git a/Command/Calendar2Command.php b/Command/Calendar2Command.php
index 86be070..257d2e3 100644
--- a/Command/Calendar2Command.php
+++ b/Command/Calendar2Command.php
@@ -26,65 +26,61 @@ 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
+	 * Set description
+	 *
+	 * Shown with bin/console list
 	 */
-	private array $scopes = [
-		Calendar::CALENDAR_EVENTS,
-		Calendar::CALENDAR,
-		Oauth2::USERINFO_EMAIL
-	];
+	protected string $description = 'Synchronize sessions in users\' calendar';
 
 	/**
-	 * Set google client instance
+	 * Set help
+	 *
+	 * Shown with bin/console --help rapsysair:calendar2
 	 */
-	private Client $client;
+	protected string $help = 'This command synchronize sessions in users\' google calendar';
 
 	/**
 	 * Set markdown instance
 	 */
-	private DefaultMarkdown $markdown;
+	#private DefaultMarkdown $markdown;
 
 	/**
 	 * Set date period instance
 	 */
-	private \DatePeriod $period;
+	#private \DatePeriod $period;
 
 	/**
 	 * {@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);
+		parent::__construct($this->doctrine, $this->locale, $this->router, $this->slugger, $this->translator);
 
+		//Replace google client redirect uri
+		$this->google->setRedirectUri($this->router->generate($this->google->getRedirectUri(), [], UrlGeneratorInterface::ABSOLUTE_URL));
+
+		/*
 		//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),
+				'application_name' => $_ENV['RAPSYSAIR_GOOGLE_PROJECT'],
+				'client_id' => $_ENV['GOOGLE_CLIENT_ID'],
+				'client_secret' => $_ENV['GOOGLE_CLIENT_SECRET'],
+				'redirect_uri' => $this->router->generate('rapsysair_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
 				'scopes' => $this->scopes,
 				'access_type' => 'offline',
 				#'login_hint' => $user->getMail(),
@@ -95,27 +91,41 @@ class Calendar2Command extends Command {
 		);
 
 		//Set Markdown instance
-		$this->markdown = new DefaultMarkdown;
+		$this->markdown = new DefaultMarkdown;*/
 	}
 
+	/**
+	 * Configure attribute command
+	 */
+	/*protected function configure() {
+		//Configure the class
+		$this
+			//Set name
+			->setName('rapsysair:calendar2')
+			//Set description shown with bin/console list
+			->setDescription('Synchronize sessions in users\' calendar')
+			//Set description shown with bin/console --help airlibre:attribute
+			->setHelp('This command synchronize sessions in users\' google calendar');
+	}*/
+
 	/**
 	 * 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 +134,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 ?
 				}