fixing async

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · May 24, 2021 · 9962537 · 9962537
1 parent 99a3d1e
commit 9962537
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Command/MembersAdd.php b/lib/Command/MembersAdd.php
@@ -40,37 +40,29 @@
 use daita\MySmallPhpTools\Model\Request;
 use Exception;
 use OC\Core\Command\Base;
-use OCA\Circles\Db\CircleRequest;
 use OCA\Circles\Exceptions\FederatedItemException;
 use OCA\Circles\Exceptions\GSStatusException;
 use OCA\Circles\Model\Member;
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Service\MemberService;
-use OCP\IL10N;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
 /**
- * Class MembersCreate
+ * Class MembersAdd
  *
  * @package OCA\Circles\Command
  */
 class MembersAdd extends Base {
 
 
-	/** @var IL10N */
-	private $l10n;
-
 	/** @var FederatedUserService */
 	private $federatedUserService;
 
-	/** @var CircleRequest */
-	private $circleRequest;
-
 	/** @var MemberService */
 	private $memberService;
 
@@ -79,23 +71,20 @@ class MembersAdd extends Base {
 
 
 	/**
-	 * MembersCreate constructor.
+	 * MembersAdd constructor.
 	 *
-	 * @param IL10N $l10n
-	 * @param CircleRequest $circleRequest
 	 * @param FederatedUserService $federatedUserService
 	 * @param MemberService $memberService
 	 * @param ConfigService $configService
 	 */
 	public function __construct(
-		IL10N $l10n, CircleRequest $circleRequest, FederatedUserService $federatedUserService,
-		MemberService $memberService, ConfigService $configService
+		FederatedUserService $federatedUserService,
+		MemberService $memberService,
+		ConfigService $configService
 	) {
 		parent::__construct();
 
-		$this->l10n = $l10n;
 		$this->federatedUserService = $federatedUserService;
-		$this->circleRequest = $circleRequest;
 
 		$this->memberService = $memberService;
 		$this->configService = $configService;

diff --git a/lib/Controller/EventWrapperController.php b/lib/Controller/EventWrapperController.php
@@ -30,10 +30,11 @@
 namespace OCA\Circles\Controller;
 
 
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Async;
 use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Controller;
-use daita\MySmallPhpTools\Traits\TAsync;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use Exception;
+use OCA\Circles\AppInfo\Application;
 use OCA\Circles\Db\EventWrapperRequest;
 use OCA\Circles\Model\Federated\EventWrapper;
 use OCA\Circles\Model\Federated\FederatedEvent;
@@ -56,7 +57,7 @@ class EventWrapperController extends Controller {
 
 
 	use TStringTools;
-	use TAsync;
+	use TNC22Async;
 	use TNC22Controller;
 
 
@@ -102,6 +103,9 @@ public function __construct(
 		$this->remoteUpstreamService = $remoteUpstreamService;
 		$this->remoteDownstreamService = $remoteDownstreamService;
 		$this->configService = $configService;
+
+		$this->setup('app', Application::APP_ID);
+		$this->setupInt(self::$SETUP_TIME_LIMIT, 900);
 	}
 
 
@@ -120,7 +124,7 @@ public function __construct(
 	 */
 	public function asyncBroadcast(string $token): DataResponse {
 		$wrappers = $this->remoteUpstreamService->getEventsByToken($token);
-		if (empty($wrappers)) {
+		if (empty($wrappers) && $token !== 'test-dummy-token') {
 			return new DataResponse(null, Http::STATUS_OK);
 		}
 
@@ -133,6 +137,11 @@ public function asyncBroadcast(string $token): DataResponse {
 
 		$this->federatedEventService->manageResults($token);
 
+		// circles:check can check async is fine
+		if ($token === 'test-dummy-token') {
+			sleep(5);
+		}
+
 		// exit() or useless log will be generated
 		exit();
 	}

diff --git a/lib/FederatedItems/SingleMemberAdd.php b/lib/FederatedItems/SingleMemberAdd.php
@@ -135,6 +135,7 @@ class SingleMemberAdd implements
 	 * @param IUserManager $userManager
 	 * @param MemberRequest $memberRequest
 	 * @param FederatedUserService $federatedUserService
+	 * @param RemoteStreamService $remoteStreamService
 	 * @param CircleService $circleService
 	 * @param MembershipService $membershipService
 	 * @param EventService $eventService