Merge pull request #425 from systopia/get-rid-of-some-legacy-code

Get rid of some legacy code

Author: dontub

Civi/Api4/RemoteFundingApplicationProcessActivity.php

@@ -3,10 +3,10 @@
 
 namespace Civi\Api4;
 
-use Civi\Funding\Api4\AbstractRemoteFundingEntityLegacy;
+use Civi\Funding\Api4\AbstractRemoteFundingEntity;
 use Civi\Funding\Api4\Action\Remote\ApplicationProcessActivity\GetAction;
 
-final class RemoteFundingApplicationProcessActivity extends AbstractRemoteFundingEntityLegacy {
+final class RemoteFundingApplicationProcessActivity extends AbstractRemoteFundingEntity {
 
   public static function get(): GetAction {
     return new GetAction();

Civi/Api4/RemoteFundingCaseInfo.php

@@ -19,16 +19,16 @@
 
 namespace Civi\Api4;
 
-use Civi\Funding\Api4\AbstractRemoteFundingEntityLegacy;
-use Civi\Funding\Api4\Action\Remote\RemoteFundingGetActionLegacy;
+use Civi\Funding\Api4\AbstractRemoteFundingEntity;
+use Civi\Funding\Api4\Action\Remote\RemoteFundingGetAction;
 
 /**
  * @deprecated Use RemoteFundingApplicationProcess instead.
  */
-final class RemoteFundingCaseInfo extends AbstractRemoteFundingEntityLegacy {
+final class RemoteFundingCaseInfo extends AbstractRemoteFundingEntity {
 
-  public static function get(): RemoteFundingGetActionLegacy {
-    return new RemoteFundingGetActionLegacy(static::getEntityName());
+  public static function get(): RemoteFundingGetAction {
+    return new RemoteFundingGetAction(static::getEntityName(), __FUNCTION__);
   }
 
 }

Civi/Funding/Api4/AbstractRemoteFundingEntityLegacy.php

@@ -4,20 +4,15 @@
 namespace Civi\Funding\Api4\Action\Remote\ApplicationProcessActivity;
 
 use Civi\Api4\RemoteFundingApplicationProcessActivity;
-use Civi\Funding\Api4\Action\Remote\RemoteFundingGetActionLegacy;
+use Civi\Funding\Api4\Action\Remote\RemoteFundingGetAction;
 use Civi\Funding\Api4\Action\Traits\ApplicationProcessIdParameterTrait;
-use Civi\Funding\Event\Remote\ApplicationProcessActivity\GetEvent;
 
-final class GetAction extends RemoteFundingGetActionLegacy {
+final class GetAction extends RemoteFundingGetAction {
 
   use ApplicationProcessIdParameterTrait;
 
   public function __construct() {
     parent::__construct(RemoteFundingApplicationProcessActivity::getEntityName(), 'get');
   }
 
-  protected function getEventClass(): string {
-    return GetEvent::class;
-  }
-
 }

Civi/Funding/Api4/Action/Remote/ApplicationProcessActivity/GetAction.php

@@ -36,14 +36,7 @@ public function __construct(Api4Interface $api4) {
    * @throws \CRM_Core_Exception
    */
   public function get(RemoteFundingGetAction $action): Result {
-    $params = [
-      'language' => $action->getLanguage(),
-      'select' => $action->getSelect(),
-      'where' => $action->getWhere(),
-      'orderBy' => $action->getOrderBy(),
-      'limit' => $action->getLimit(),
-      'offset' => $action->getOffset(),
-    ];
+    $params = $this->getParams($action);
 
     $join = $this->getJoin($action);
     if ($join !== []) {
@@ -66,4 +59,18 @@ protected function getJoin(RemoteFundingGetAction $action): array {
     return [];
   }
 
+  /**
+   * @phpstan-return array<string, mixed>
+   */
+  protected function getParams(RemoteFundingGetAction $action): array {
+    return [
+      'language' => $action->getLanguage(),
+      'select' => $action->getSelect(),
+      'where' => $action->getWhere(),
+      'orderBy' => $action->getOrderBy(),
+      'limit' => $action->getLimit(),
+      'offset' => $action->getOffset(),
+    ];
+  }
+
 }

Civi/Funding/Api4/Action/Remote/RemoteFundingGetActionLegacy.php

@@ -0,0 +1,55 @@
+<?php
+/*
+ * Copyright (C) 2025 SYSTOPIA GmbH
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation in version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types = 1);
+
+namespace Civi\Funding\ApplicationProcess\Api4\ActionHandler\ApplicationProcessActivity;
+
+use Civi\Api4\FundingApplicationProcessActivity;
+use Civi\Api4\Generic\Result;
+use Civi\Funding\ActivityTypeIds;
+use Civi\Funding\ActivityTypeNames;
+use Civi\Funding\Api4\Action\Remote\RemoteFundingGetAction;
+use Civi\Funding\Api4\ActionHandler\AbstractRemoteFundingGetActionHandler;
+
+final class RemoteGetActionHandler extends AbstractRemoteFundingGetActionHandler {
+
+  public const ENTITY_NAME = 'RemoteFundingApplicationProcessActivity';
+
+  protected function getEntityName(): string {
+    return FundingApplicationProcessActivity::getEntityName();
+  }
+
+  public function get(RemoteFundingGetAction $action): Result {
+    $action->addClause('OR',
+      ['activity_type_id', '=', ActivityTypeIds::FUNDING_APPLICATION_CREATE],
+      ['activity_type_id', '=', ActivityTypeIds::FUNDING_APPLICATION_STATUS_CHANGE],
+      ['activity_type_id', '=', ActivityTypeIds::FUNDING_APPLICATION_COMMENT_EXTERNAL],
+      ['activity_type_id:name', '=', ActivityTypeNames::FUNDING_CLEARING_CREATE],
+      ['activity_type_id:name', '=', ActivityTypeNames::FUNDING_CLEARING_STATUS_CHANGE],
+    );
+
+    return parent::get($action);
+  }
+
+  protected function getParams(RemoteFundingGetAction $action): array {
+    /** @var \Civi\Funding\Api4\Action\Remote\ApplicationProcessActivity\GetAction $action */
+    return ['applicationProcessId' => $action->getApplicationProcessId()]
+      + parent::getParams($action);
+  }
+
+}

Civi/Funding/Api4/ActionHandler/AbstractRemoteFundingGetActionHandler.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2022 SYSTOPIA GmbH
+ * Copyright (C) 2025 SYSTOPIA GmbH
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as published by
@@ -17,17 +17,17 @@
 
 declare(strict_types = 1);
 
-namespace Civi\Funding\EventSubscriber\Remote;
+namespace Civi\Funding\ApplicationProcess\Api4\ActionHandler\ApplicationProcessActivity;
 
-use Civi\Funding\Event\Remote\FundingGetFieldsEvent;
-use Civi\RemoteTools\EventSubscriber\AbstractRemoteGetFieldsSubscriber;
+use Civi\Api4\FundingApplicationProcessActivity;
+use Civi\Funding\Api4\ActionHandler\AbstractRemoteFundingGetFieldsActionHandler;
 
-final class ApplicationProcessActivityGetFieldsSubscriber extends AbstractRemoteGetFieldsSubscriber {
+final class RemoteGetFieldsActionHandler extends AbstractRemoteFundingGetFieldsActionHandler {
 
-  protected const BASIC_ENTITY_NAME = 'FundingApplicationProcessActivity';
+  public const ENTITY_NAME = 'RemoteFundingApplicationProcessActivity';
 
-  protected const ENTITY_NAME = 'RemoteFundingApplicationProcessActivity';
-
-  protected const EVENT_CLASS = FundingGetFieldsEvent::class;
+  protected function getEntityName(): string {
+    return FundingApplicationProcessActivity::getEntityName();
+  }
 
 }

Civi/Funding/ApplicationProcess/Api4/ActionHandler/ApplicationProcessActivity/RemoteGetActionHandler.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2022 SYSTOPIA GmbH
+ * Copyright (C) 2025 SYSTOPIA GmbH
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as published by
@@ -17,15 +17,18 @@
 
 declare(strict_types = 1);
 
-namespace Civi\RemoteTools\Database;
+namespace Civi\Funding\ApplicationProcess\Api4\ActionHandler\FundingCaseInfo;
 
-/**
- * @codeCoverageIgnore
- */
-class TransactionFactory {
+use Civi\Api4\FundingCaseInfo;
+use Civi\Funding\Api4\ActionHandler\AbstractRemoteFundingGetActionHandler;
+
+final class RemoteGetActionHandler extends AbstractRemoteFundingGetActionHandler {
+
+  public const ENTITY_NAME = 'RemoteFundingCaseInfo';
 
-  public function createTransaction(): \CRM_Core_Transaction {
-    return \CRM_Core_Transaction::create();
+  protected function getEntityName(): string {
+    // @phpstan-ignore staticMethod.deprecatedClass
+    return FundingCaseInfo::getEntityName();
   }
 
 }

Civi/Funding/EventSubscriber/Remote/ApplicationProcessActivityGetFieldsSubscriber.php Civi/Funding/ApplicationProcess/Api4/ActionHandler/ApplicationProcessActivity/RemoteGetFieldsActionHandler.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2022 SYSTOPIA GmbH
+ * Copyright (C) 2025 SYSTOPIA GmbH
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as published by
@@ -17,17 +17,18 @@
 
 declare(strict_types = 1);
 
-namespace Civi\Funding\EventSubscriber\Remote;
+namespace Civi\Funding\ApplicationProcess\Api4\ActionHandler\FundingCaseInfo;
 
-use Civi\Funding\Event\Remote\FundingGetEvent;
-use Civi\RemoteTools\EventSubscriber\AbstractRemoteGetSubscriber;
+use Civi\Api4\FundingCaseInfo;
+use Civi\Funding\Api4\ActionHandler\AbstractRemoteFundingGetFieldsActionHandler;
 
-class FundingCaseInfoGetSubscriber extends AbstractRemoteGetSubscriber {
+final class RemoteGetFieldsActionHandler extends AbstractRemoteFundingGetFieldsActionHandler {
 
-  protected const BASIC_ENTITY_NAME = 'FundingCaseInfo';
+  public const ENTITY_NAME = 'RemoteFundingCaseInfo';
 
-  protected const ENTITY_NAME = 'RemoteFundingCaseInfo';
-
-  protected const EVENT_CLASS = FundingGetEvent::class;
+  protected function getEntityName(): string {
+    // @phpstan-ignore staticMethod.deprecatedClass
+    return FundingCaseInfo::getEntityName();
+  }
 
 }