Update acceptance test (MetadataValidator).

_metadata/src/AdapterCli/ForSynchronizingMetadata/MetadataUpdateCommand.php

@@ -27,13 +27,13 @@ public function execute(CommandBus $commandBus): void
         $moduleId = 'foo';
 
         // with error
-        $repoUrl = 'https://github.com/zerai/foo';
+        //$repoUrl = 'https://github.com/zerai/foo';
 
         // without metadata
         //$repoUrl = 'https://github.com/zerai/oe-module-demo-farm-add-ons';
 
         // with metadata
-        //$repoUrl = 'https://github.com/MedicalMundi/oe-module-todo-list';
+        $repoUrl = 'https://github.com/MedicalMundi/oe-module-todo-list';
 
         $command = new UpdateModuleMetadata($moduleId, $repoUrl);
 

_metadata/src/AdapterForReadingExternalMetadataSource/StatelessWorkflowProcess.php

@@ -20,6 +20,7 @@
 use Ecotone\Modelling\Attribute\CommandHandler;
 use Github\Api\Repo;
 use Github\Client as GithubClient;
+use Metadata\Core\MetadataValidationEngine\MetadataValidator;
 use Metadata\Core\ValueObject\Repository;
 use Nyholm\Psr7\Request;
 use Psr\Http\Client\ClientInterface;
@@ -137,30 +138,35 @@ public function getComposerJson(
 
     #[InternalHandler(
         inputChannelName: 'module.extractMetadata',
-        outputChannelName: 'image.upload'
+        outputChannelName: 'module.validateMetadata',
+        changingHeaders: true,
     )]
     public function extractMetadata(
         UpdateModuleMetadata $command,
         #[Header('composer_json_content')]
         string $composerJsonContent,
-    ): UpdateModuleMetadata {
+    ): ?array {
         $ar = (array) json_decode($composerJsonContent, true);
 
         if ($this->hasMetadata($ar)) {
-            print_r($ar['extra']['openemr-module']['metadata']['oe-modules.com']);
+            return [
+                'metadata' => $ar['extra']['openemr-module']['metadata']['oe-modules.com'],
+            ];
         }
 
-        print_r($nodata = 'No metadata found');
-
-        return $command;
+        return null;
     }
 
-    #[InternalHandler(inputChannelName: 'image.resize', outputChannelName: 'image.upload')]
-    public function resizeImage(UpdateModuleMetadata $command): UpdateModuleMetadata
+    #[InternalHandler(inputChannelName: 'module.validateMetadata')]
+    public function validateMetadata(#[Header('metadata')] array $metadata, MetadataValidator $metadataValidator): ?UpdateModuleMetadata
     {
-        //echo 'xxxx';
+        if ($metadataValidator->validate($metadata)) {
+            echo 'metadata pass';
+        } else {
+            echo 'metadata not pass';
+        }
 
-        return $command;
+        return null;
     }
 
     #[InternalHandler(inputChannelName: 'image.upload')]

_metadata/src/Core/MetadataUpdater.php

@@ -15,9 +15,9 @@
 
 namespace Metadata\Core;
 
-use Metadata\Core\MetadataValidationEngine\FixedTrueMetadataValidationEngineValidation;
 use Metadata\Core\MetadataValidationEngine\ForMetadataSchemaValidation;
 use Metadata\Core\MetadataValidationEngine\MetadataValidationException;
+use Metadata\Core\MetadataValidationEngine\MetadataValidator;
 use Metadata\Core\Port\Driven\ForReadingExternalMetadataSource\ForReadingExternalMetadataSource;
 use Metadata\Core\Port\Driven\ForReadingExternalMetadataSource\MetadataReaderException;
 use Metadata\Core\Port\Driven\ForStoringMetadata;
@@ -32,7 +32,7 @@ public function __construct(
         /** TODO: Implement a real validator engine */
         private ?ForMetadataSchemaValidation $validatorEngine = null,
     ) {
-        $this->validatorEngine = $validatorEngine ?? new FixedTrueMetadataValidationEngineValidation();
+        $this->validatorEngine = $validatorEngine ?? new MetadataValidator();
     }
 
     public function getMetadataForModule(string $moduleId): ?ModuleMetadata

_metadata/tests/Acceptance/Bdd/Features/driver_for_synchronizing_metadata/synchronizeModuleMetadata.feature

@@ -19,12 +19,12 @@ Feature: Synchronize module metadata
 
     Given there is the following metadata at metadata original source "https://www.github.com/foo/bar"
       | enableSync | category | tag |
-      | true  | FINANCE | finance, payment |
+      | true  | billing | todo |
 
     When I ask for update the metadata for module with code "4868cd6a-b854-461e-91a4-fb30ad1ce2cd"
 
     Then I should obtain the following updated metadata:
       | enableSync | category | tag | moduleCode |
-      | true  | FINANCE | finance, payment | 4868cd6a-b854-461e-91a4-fb30ad1ce2cd |
+      | true  | billing | todo | 4868cd6a-b854-461e-91a4-fb30ad1ce2cd |
 
 

_metadata/tests/Unit/MetadataUpdaterTest.php

@@ -19,8 +19,8 @@
 use Metadata\AdapterForStoringMetadataFake\FakeForStoringMetadata;
 use Metadata\Core\MetadataModule;
 use Metadata\Core\MetadataUpdater;
-use Metadata\Core\MetadataValidationEngine\FixedTrueMetadataValidationEngineValidation;
 use Metadata\Core\MetadataValidationEngine\MetadataValidationException;
+use Metadata\Core\MetadataValidationEngine\MetadataValidator;
 use Metadata\Core\ModuleConfigurator;
 use Metadata\Core\Port\Driven\ForReadingExternalMetadataSource\ExternalMetadataDto;
 use Metadata\Core\Port\Driven\ModuleMetadata;
@@ -36,7 +36,7 @@
 #[UsesClass(MetadataModule::class)]
 #[UsesClass(FakeForStoringMetadata::class)]
 #[UsesClass(StubAdapterForReadingExternalMetadataSource::class)]
-#[UsesClass(FixedTrueMetadataValidationEngineValidation::class)]
+#[UsesClass(MetadataValidator::class)]
 #[UsesClass(ModuleConfigurator::class)]
 #[UsesClass(ModuleMetadata::class)]
 #[UsesClass(ExternalMetadataDto::class)]
@@ -77,23 +77,22 @@ public function should_update_metadata_for_a_given_module()
             $tags = ['irrelevant1-1', 'irrelevant-2']
         );
         $app->moduleConfigurator()->createMetadata($moduleMetadata);
-        $app->moduleConfigurator()->setExternalMetadataDto($repoUrl, new ExternalMetadataDto(false, 'performance', ['cache', 'redis']));
+        $app->moduleConfigurator()->setExternalMetadataDto($repoUrl, new ExternalMetadataDto(false, 'billing', ['sms', 'organizer']));
 
         $app->metadataUpdater()->synchronizeMetadataFor($moduleIdAsString);
 
         $updatedModuleMetadata = $app->metadataUpdater()->getMetadataForModule($moduleIdAsString);
         self::assertEquals(false, $updatedModuleMetadata->isSynchronizable());
-        self::assertEquals('performance', $updatedModuleMetadata->category());
-        self::assertEquals(['cache', 'redis'], $updatedModuleMetadata->tags());
+        self::assertEquals('billing', $updatedModuleMetadata->category());
+        self::assertEquals(['sms', 'organizer'], $updatedModuleMetadata->tags());
     }
 
     #[Test]
     public function should_throw_metadata_validation_error()
     {
-        self::markTestIncomplete('Implement a real Metadata Validator');
         self::expectException(MetadataValidationException::class);
         self::expectExceptionMessage(
-            'Metadata validation error'
+            'Category not allowed: performance'
         );
 
         $app = new MetadataModule(