refactor(lib): collapse three single-class namespaces into Service/ (ADR-099 §3)

lib/Controller/RecognitionController.php

@@ -44,7 +44,7 @@
 namespace OCA\Shillinq\Controller;
 
 use OCA\Shillinq\AppInfo\Application;
-use OCA\Shillinq\Recognition\RevenueRecognitionService;
+use OCA\Shillinq\Service\RevenueRecognitionService;
 use OCA\Shillinq\Service\AdministrationContextService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;

lib/Listener/OrderFulfilmentTransitionListener.php

@@ -46,7 +46,7 @@
 namespace OCA\Shillinq\Listener;
 
 use OCA\OpenRegister\Event\ObjectTransitionedEvent;
-use OCA\Shillinq\Integration\TenderNedStatusSync;
+use OCA\Shillinq\Service\TenderNedStatusSync;
 use OCA\Shillinq\Service\BudgetImpactEmitter;
 use OCA\Shillinq\Service\ListenerSchemaResolver;
 use OCP\EventDispatcher\Event;

lib/Consolidation/ConsolidationGuard.php → lib/Service/ConsolidationGuard.php

@@ -11,7 +11,7 @@
  * lib/Settings/shillinq_register.json.
  *
  * @category Lifecycle
- * @package  OCA\Shillinq\Consolidation
+ * @package  OCA\Shillinq\Service
  *
  * @author    Conduction Development Team <info@conduction.nl>
  * @copyright 2026 Conduction B.V.
@@ -27,7 +27,7 @@
 
 declare(strict_types=1);
 
-namespace OCA\Shillinq\Consolidation;
+namespace OCA\Shillinq\Service;
 
 use OCA\Shillinq\AppInfo\Application;
 use OCP\IAppConfig;

lib/Recognition/RevenueRecognitionService.php → lib/Service/RevenueRecognitionService.php

@@ -24,7 +24,7 @@
  * boundary.
  *
  * @category Service
- * @package  OCA\Shillinq\Recognition
+ * @package  OCA\Shillinq\Service
  *
  * @author    Conduction Development Team <info@conduction.nl>
  * @copyright 2026 Conduction B.V.
@@ -40,7 +40,7 @@
 
 declare(strict_types=1);
 
-namespace OCA\Shillinq\Recognition;
+namespace OCA\Shillinq\Service;
 
 use OCA\Shillinq\AppInfo\Application;
 use OCP\IAppConfig;

lib/Integration/TenderNedStatusSync.php → lib/Service/TenderNedStatusSync.php

@@ -30,8 +30,8 @@
  * KvK before the call is allowed (vendors cannot sync; only the
  * aanbestedende dienst can — see design D6).
  *
- * @category Integration
- * @package  OCA\Shillinq\Integration
+ * @category Service
+ * @package  OCA\Shillinq\Service
  *
  * @author    Conduction Development Team <info@conduction.nl>
  * @copyright 2026 Conduction B.V.
@@ -47,7 +47,7 @@
 
 declare(strict_types=1);
 
-namespace OCA\Shillinq\Integration;
+namespace OCA\Shillinq\Service;
 
 use OCA\Shillinq\AppInfo\Application;
 use OCP\IAppConfig;

lib/Settings/shillinq_register.json

@@ -1994,14 +1994,14 @@
               "to": "final",
               "label": "Finalise balance sheet",
               "description": "Operator or scheduled workflow closes fiscal period. Triggers balance-sheet aggregation (REQ-FS-004).",
-              "requires": "OCA\\Shillinq\\Consolidation\\ConsolidationGuard::requireFiscalPeriodClosed"
+              "requires": "OCA\\Shillinq\\Service\\ConsolidationGuard::requireFiscalPeriodClosed"
             },
             "publish": {
               "from": "final",
               "to": "published",
               "label": "Publish balance sheet",
               "description": "Operator (role: controller) releases to stakeholders via OR publication extension or ConsolidationGuard fallback per ADR-031.",
-              "requires": "OCA\\Shillinq\\Consolidation\\ConsolidationGuard::requirePublicationApproval"
+              "requires": "OCA\\Shillinq\\Service\\ConsolidationGuard::requirePublicationApproval"
             },
             "archive": {
               "from": "published",
@@ -2212,14 +2212,14 @@
               "to": "final",
               "label": "Finalise trial balance",
               "description": "Operator or scheduled workflow closes fiscal period. Also triggered by BalanceSheet finalise hook.",
-              "requires": "OCA\\Shillinq\\Consolidation\\ConsolidationGuard::requireFiscalPeriodClosed"
+              "requires": "OCA\\Shillinq\\Service\\ConsolidationGuard::requireFiscalPeriodClosed"
             },
             "publish": {
               "from": "final",
               "to": "published",
               "label": "Publish trial balance",
               "description": "Operator (role: controller) releases to stakeholders via OR publication extension or ConsolidationGuard fallback per ADR-031.",
-              "requires": "OCA\\Shillinq\\Consolidation\\ConsolidationGuard::requirePublicationApproval"
+              "requires": "OCA\\Shillinq\\Service\\ConsolidationGuard::requirePublicationApproval"
             },
             "archive": {
               "from": "published",
@@ -2583,14 +2583,14 @@
               "to": "final",
               "label": "Finalise consolidated report",
               "description": "Applies consolidation workflow and inter-company eliminations per ConsolidationGroup.eliminationRules. Consumed via OR consolidation extension (ADR-022) or ConsolidationGuard fallback per ADR-031 exception.",
-              "requires": "OCA\\Shillinq\\Consolidation\\ConsolidationGuard::requireAllMembersFinalised"
+              "requires": "OCA\\Shillinq\\Service\\ConsolidationGuard::requireAllMembersFinalised"
             },
             "publish": {
               "from": "final",
               "to": "published",
               "label": "Publish consolidated report",
               "description": "Operator (role: controller) releases to stakeholders via OR publication extension or ConsolidationGuard fallback per ADR-031.",
-              "requires": "OCA\\Shillinq\\Consolidation\\ConsolidationGuard::requirePublicationApproval"
+              "requires": "OCA\\Shillinq\\Service\\ConsolidationGuard::requirePublicationApproval"
             },
             "archive": {
               "from": "published",

tests/Unit/Consolidation/ConsolidationGuardTest.php

@@ -22,7 +22,7 @@
 
 namespace OCA\Shillinq\Tests\Unit\Consolidation;
 
-use OCA\Shillinq\Consolidation\ConsolidationGuard;
+use OCA\Shillinq\Service\ConsolidationGuard;
 use OCA\Shillinq\Tests\Unit\Service\Support\DuckObjectServiceAdapter;
 use OCP\IAppConfig;
 use PHPUnit\Framework\MockObject\MockObject;

tests/Unit/Controller/RecognitionControllerTest.php

@@ -23,7 +23,7 @@
 namespace OCA\Shillinq\Tests\Unit\Controller;
 
 use OCA\Shillinq\Controller\RecognitionController;
-use OCA\Shillinq\Recognition\RevenueRecognitionService;
+use OCA\Shillinq\Service\RevenueRecognitionService;
 use OCA\Shillinq\Service\AdministrationContextService;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;

tests/Unit/Integration/TenderNedStatusSyncTest.php

@@ -35,7 +35,7 @@
 
 namespace OCA\Shillinq\Tests\Unit\Integration;
 
-use OCA\Shillinq\Integration\TenderNedStatusSync;
+use OCA\Shillinq\Service\TenderNedStatusSync;
 use OCP\IAppConfig;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;

tests/Unit/Listener/OrderFulfilmentTransitionListenerTest.php

@@ -34,7 +34,7 @@
 
 use OCA\OpenRegister\Db\ObjectEntity;
 use OCA\OpenRegister\Event\ObjectTransitionedEvent;
-use OCA\Shillinq\Integration\TenderNedStatusSync;
+use OCA\Shillinq\Service\TenderNedStatusSync;
 use OCA\Shillinq\Listener\OrderFulfilmentTransitionListener;
 use OCA\Shillinq\Service\BudgetImpactEmitter;
 use OCA\Shillinq\Service\ListenerSchemaResolver;
@@ -108,7 +108,19 @@ private function spyingSync(): TenderNedStatusSync {
 			 */
 			public array $syncCalls = [];
 
+			/**
+			 * When true, syncCompletion() throws — so a test can show the
+			 * listener's fail-soft catch keeps the transition alive.
+			 *
+			 * @var bool
+			 */
+			public bool $throwOnSync = false;
+
 			public function syncCompletion(array $oplevering): bool {
+				if ($this->throwOnSync === true) {
+					throw new \RuntimeException('TenderNed is unreachable');
+				}
+
 				$this->syncCalls[] = $oplevering;
 				return true;
 			}//end syncCompletion()
@@ -344,6 +356,75 @@ public function testUnapprovedEindopleveringDoesNotTriggerSync(): void {
 	 *
 	 * @return void
 	 */
+	/**
+	 * An event of another type is ignored. The dispatcher hands `Event`, so
+	 * the instanceof guard is the only thing between this listener and a
+	 * getTo() that does not exist on that class.
+	 *
+	 * @return void
+	 */
+	public function testAnEventOfAnotherTypeIsIgnored(): void {
+		$dispatcher = $this->recordingDispatcher();
+		$sync = $this->spyingSync();
+		$listener = new OrderFulfilmentTransitionListener(
+			new BudgetImpactEmitter($dispatcher, new NullLogger()),
+			$sync,
+			$this->resolver('OrderFulfilment'),
+			new NullLogger()
+		);
+
+		$listener->handle(new \OCP\EventDispatcher\GenericEvent());
+
+		$this->assertCount(0, $dispatcher->events);
+		$this->assertCount(0, $sync->syncCalls);
+
+	}//end testAnEventOfAnotherTypeIsIgnored()
+
+	/**
+	 * THE FAIL-SOFT CONTRACT. This listener runs inside another object's
+	 * transition, so a throw here would roll that transition back. A sync
+	 * that blows up must be logged and swallowed, not propagated — and the
+	 * milestone event that already fired must still stand.
+	 *
+	 * @return void
+	 */
+	public function testAThrowingSyncIsSwallowedAndTheMilestoneStillEmitted(): void {
+		$dispatcher = $this->recordingDispatcher();
+		$sync = $this->spyingSync();
+		$sync->throwOnSync = true;
+
+		$listener = new OrderFulfilmentTransitionListener(
+			new BudgetImpactEmitter($dispatcher, new NullLogger()),
+			$sync,
+			$this->resolver('OrderFulfilment'),
+			new NullLogger()
+		);
+
+		$listener->handle(
+			new ObjectTransitionedEvent(
+				$this->entity('1201', [
+					'commitmentId' => 'TN-2026-0001',
+					'milestoneId' => 'M-EIND',
+					'deliveryType' => 'eindoplevering',
+					'approved' => true,
+				]),
+				'afronden',
+				'in-progress',
+				'completed',
+				'admin',
+				'shillinq',
+				'OrderFulfilment'
+			)
+		);
+
+		$this->assertCount(
+			1,
+			$dispatcher->events,
+			'the milestone event fires before the sync, so it must survive the sync failing'
+		);
+
+	}//end testAThrowingSyncIsSwallowedAndTheMilestoneStillEmitted()
+
 	public function testNonCompletedTransitionIsIgnored(): void {
 		$dispatcher = $this->recordingDispatcher();
 		$emitter = new BudgetImpactEmitter($dispatcher, new NullLogger());

tests/Unit/Recognition/RevenueRecognitionServiceTest.php

@@ -22,7 +22,7 @@
 
 namespace OCA\Shillinq\Tests\Unit\Recognition;
 
-use OCA\Shillinq\Recognition\RevenueRecognitionService;
+use OCA\Shillinq\Service\RevenueRecognitionService;
 use OCP\IAppConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;