Merge pull request #12 from JMLamodiere/bad_tests

Fix hexagonal mistakes, but tests are still too much coupled with implem

Author: JMLamodiere

.travis.yml

@@ -24,6 +24,7 @@ branches:
   only:
     - main
     - bad_implementation
+    - bad_tests
 
 before_install:
   - make preinstall

README.md

@@ -2,11 +2,21 @@
 
 [![Build Status](https://travis-ci.com/JMLamodiere/tdd-demo-forumphp2020.svg?branch=main)](https://travis-ci.com/JMLamodiere/tdd-demo-forumphp2020)
 
-Live coding examples used during Forum PHP 2020 talk (in :fr: French) : [Trop de mock tue le test : ce que l'archi hexagonale a changé](https://event.afup.org/forum-php-2020/programme-forum-php-2020/#3414)
+Live coding examples used during Forum PHP 2020 talk (:fr: french) : [Trop de mock tue le test : ce que l'archi hexagonale a changé](https://event.afup.org/forum-php-2020/programme-forum-php-2020/#3414)
+(video not yet published).
 
-:warning: **WARNING:** The [bad_implementation](https://github.com/JMLamodiere/tdd-demo-forumphp2020/tree/bad_implementation)
-branch contains example of bad practices ! See [main](https://github.com/JMLamodiere/tdd-demo-forumphp2020) branch
-for correct implementation.
+For a bit of theory, see [De CRUD à DDD, comment Meetic a sauvé son legacy](https://afup.org/talks/3037-de-crud-a-ddd-comment-meetic-a-sauve-son-legacy) (:fr: french)
+
+## Steps by step refactoring
+
+1. [bad_implementation](https://github.com/JMLamodiere/tdd-demo-forumphp2020/tree/bad_implementation) branch
+contains :
+    - Architecture mistakes according to [Hexagonal architecture](https://alistair.cockburn.us/hexagonal-architecture/) (aka Port & Adapters)
+    - Tests too much coupled with implementation details, and an incorrect usage of mocks
+1. [bad_tests](https://github.com/JMLamodiere/tdd-demo-forumphp2020/tree/bad_tests) branch
+[(see Pull Request)](https://github.com/JMLamodiere/tdd-demo-forumphp2020/pull/12) only fixes (some) hexagonal mistakes.
+Many obscure changes are required in the tests, proving they do not help much during refactoring
+1. (todo...)
 
 ## API documentation
 

src/Application/Command/RegisterRunningSessionHandler.php

@@ -4,34 +4,30 @@
 
 namespace App\Application\Command;
 
-use App\Domain\RestWeatherProviderInterface;
 use App\Domain\RunningSession;
 use App\Domain\RunningSessionRepository;
-use Webmozart\Assert\Assert;
+use App\Domain\WeatherProvider;
 
 class RegisterRunningSessionHandler
 {
-    private RestWeatherProviderInterface $weatherProvider;
+    private WeatherProvider $weatherProvider;
     private RunningSessionRepository $repository;
 
-    public function __construct(RestWeatherProviderInterface $weatherProvider, RunningSessionRepository $repository)
+    public function __construct(WeatherProvider $weatherProvider, RunningSessionRepository $repository)
     {
         $this->weatherProvider = $weatherProvider;
         $this->repository = $repository;
     }
 
     public function handle(RegisterRunningSession $command): RunningSession
     {
-        $currentCondition = $this->weatherProvider->callGetCurrentCondition();
-        $observations = $currentCondition->getObservations();
-        Assert::notEmpty($observations, 'observations should not be empty');
-        $observation = reset($observations);
+        $currentTemperature = $this->weatherProvider->getCurrentCelciusTemperature();
 
         $session = new RunningSession(
             $command->getId(),
             $command->getDistance(),
             $command->getShoes(),
-            $observation->getMetricTemperature()
+            $currentTemperature
         );
 
         $this->repository->add($session);

src/Domain/CannotGetCurrentTemperature.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Domain;
+
+use RuntimeException;
+
+class CannotGetCurrentTemperature extends RuntimeException
+{
+}

src/Domain/RestWeatherProviderInterface.php

@@ -6,5 +6,5 @@
 
 interface RunningSessionRepository
 {
-    public function add(RunningSession $session): int;
+    public function add(RunningSession $session): void;
 }

src/Domain/RunningSessionRepository.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Domain;
+
+interface WeatherProvider
+{
+    /**
+     * @throws CannotGetCurrentTemperature
+     */
+    public function getCurrentCelciusTemperature(): float;
+}

src/Domain/WeatherProvider.php

@@ -19,7 +19,7 @@ public function __construct(Connection $dbal)
         $this->dbal = $dbal;
     }
 
-    public function add(RunningSession $session): int
+    public function add(RunningSession $session): void
     {
         $queryBuilder = $this->dbal->createQueryBuilder();
 
@@ -31,6 +31,6 @@ public function add(RunningSession $session): int
             ->setValue('TEMPERATURE_CELCIUS', ':celcius')->setParameter(':celcius', $session->getMetricTemperature())
         ;
 
-        return $queryBuilder->execute();
+        $queryBuilder->execute();
     }
 }

src/Infrastructure/Database/PostgresRunningSessionRepository.php

@@ -9,22 +9,24 @@
 
 class CurrentConditionDeserializer
 {
-    public function deserialize(ResponseInterface $response): CurrentCondition
+    public function deserialize(ResponseInterface $response): float
     {
         $content = $response->getBody()->getContents();
         $data = json_decode($content, true, 512, JSON_THROW_ON_ERROR);
 
         Assert::isArray($data, 'Data root should be array');
+        Assert::notEmpty($data, 'Data root should not be empty');
+        $firstObservation = reset($data);
 
-        return new CurrentCondition(array_map([$this, 'denormalizeObservation'], $data));
+        return $this->denormalizeObservation($firstObservation);
     }
 
-    private function denormalizeObservation(array $data): Observation
+    private function denormalizeObservation(array $data): float
     {
         Assert::keyExists($data, 'Temperature', 'missing Temperature key');
         Assert::keyExists($data['Temperature'], 'Metric', 'missing Temperature.Metric key');
         Assert::keyExists($data['Temperature']['Metric'], 'Value', 'missing Temperature.Metric.Value key');
 
-        return new Observation($data['Temperature']['Metric']['Value']);
+        return $data['Temperature']['Metric']['Value'];
     }
 }