OXDEV-8489: Cleanup rebase conflicts

CHANGELOG.md

@@ -3,11 +3,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## [1.2.0] - Unreleased
-
-### Added
-- Prevention of deactivation of certain modules mentioned in modules_blocklist.yaml.
-- Mutations to  activate and deactive a module.
 
 ## [1.2.0] - Unreleased
 
@@ -16,16 +11,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Module list and filtering option on basis of module name and status
 - Activation of given theme by themeId
 - Mutations to activate and deactive a module.
+- Prevention of deactivation of certain modules mentioned in modules_blocklist.yaml.
 
 ## [1.1.0] - 2024-07-05
 This is stable release for v1.1.0. No changes have been made since v1.1.0-rc.1.
 
 ## [1.1.0-rc.1] - 2024-05-30
-[.gitignore](.gitignore)
 ### Added
 - PHP 8.2 support
 - Module activation dependency on GraphQL Base module
--  Activate a given  theme by themeId.
 
 ### Changed
 - PHPUnit upgraded to version 10.x

src/Module/Service/ModuleActivationService.php

@@ -18,7 +18,8 @@ class ModuleActivationService implements ModuleActivationServiceInterface
 {
     public function __construct(
         private readonly ContextInterface $context,
-        private readonly ModuleActivationBridgeInterface $moduleActivationBridge
+        private readonly ModuleActivationBridgeInterface $moduleActivationBridge,
+        private readonly ModuleBlocklistServiceInterface $moduleBlocklistService
     ) {
     }
 
@@ -43,6 +44,12 @@ public function activateModule(string $moduleId): bool
      */
     public function deactivateModule(string $moduleId): bool
     {
+        if ($this->moduleBlocklistService->isModuleBlocked($moduleId)) {
+            throw new ModuleDeactivationException(
+                sprintf(ModuleDeactivationException::BLOCKED_MODULE_MESSAGE, $moduleId)
+            );
+        }
+
         $shopId = $this->context->getCurrentShopId();
 
         try {

tests/Unit/Module/Service/ModuleActivationsServiceTest.php

@@ -14,6 +14,7 @@
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Exception\ModuleActivationException;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Exception\ModuleDeactivationException;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleActivationService;
+use OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleBlocklistServiceInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\UnitTestCase;
 
 /**
@@ -34,6 +35,12 @@ public function testModuleActivationAndDeactivation(
             ->method($method)
             ->with($moduleId, $shopId);
 
+        $moduleBlocklistServiceMock = $this->createMock(ModuleBlocklistServiceInterface::class);
+        $moduleBlocklistServiceMock
+            ->method('isModuleBlocked')
+            ->with($moduleId)
+            ->willReturn(false);
+
         $sut = $this->getSut(
             context: $this->getContextMock($shopId),
             moduleActivationBridge: $moduleActivationBridgeMock
@@ -94,13 +101,16 @@ public static function exceptionDataProvider(): \Generator
 
     public function getSut(
         ContextInterface $context = null,
-        ModuleActivationBridgeInterface $moduleActivationBridge = null
+        ModuleActivationBridgeInterface $moduleActivationBridge = null,
+        ModuleBlocklistServiceInterface $moduleBlocklistService = null
     ): ModuleActivationService {
         return new ModuleActivationService(
             context: $context
                 ??  $this->createStub(ContextInterface::class),
             moduleActivationBridge: $moduleActivationBridge
-                ??  $this->createStub(ModuleActivationBridgeInterface::class)
+                ??  $this->createStub(ModuleActivationBridgeInterface::class),
+            moduleBlocklistService: $moduleBlocklistService
+                ??  $this->createStub(ModuleBlocklistServiceInterface::class)
         );
     }
 }