diff --git a/db/seeds/AddressSeeder.php b/db/seeds/AddressSeeder.php index 9c009aa113a3318e006f40df620775b9bc386260..0d528074e9d6cf81af33be8ed226d830f5f04456 100644 --- a/db/seeds/AddressSeeder.php +++ b/db/seeds/AddressSeeder.php @@ -54,6 +54,19 @@ class AddressSeeder extends AbstractSeed 'user_id' => 1, 'defaut' => false, ), + array( + 'id' => 5, + 'nom' => 'Bob address', + 'adresse' => '4 rue Ménars', + 'adresse2' => null, + 'codepostal' => 75003, + 'ville' => 'Paris', + 'etat' => null, + 'pays' => 'France', + 'alias' => 'Third address', + 'user_id' => 2, + 'defaut' => false, + ), ); $this->table('adresses')->insert($data)->save(); diff --git a/db/seeds/CounterpartSeeder.php b/db/seeds/CounterpartSeeder.php index fb5c17a341002ba243042abbeee7028527a138e5..b47cdf580ef8e3f9cc9891b9bf0aeb78ee878025 100644 --- a/db/seeds/CounterpartSeeder.php +++ b/db/seeds/CounterpartSeeder.php @@ -29,7 +29,7 @@ class CounterpartSeeder extends AbstractSeed 'datec' => '2016-06-22 12:34', 'user_id' => 2, 'quoi' => 'piplome', // [piplome|pibag|pishirt|hoodie] - 'taille' => 1, + 'taille' => 2, 'status' => 1, 'adresse_id' => null, ), diff --git a/db/seeds/DonationSeeder.php b/db/seeds/DonationSeeder.php index 091754fa7758a13fdce09d224977c35a36909707..5fa730e30649ed4791624f38976b09995a028a1f 100644 --- a/db/seeds/DonationSeeder.php +++ b/db/seeds/DonationSeeder.php @@ -63,7 +63,7 @@ class DonationSeeder extends AbstractSeed 'fdnn_user' => 1234567890, 'color_2' => 'red', 'cumul' => 1000, - 'adresse_id' => 1, + 'adresse_id' => 3, 'user_id' => 2, 'identifier' => 'id2', ), diff --git a/src/LQDN/Finder/CounterpartFinder.php b/src/LQDN/Finder/CounterpartFinder.php index 743d0712a50dd4342056e4a20902f92031865c83..19d3a814d5db718cc7350b0f81b3fda500682911 100644 --- a/src/LQDN/Finder/CounterpartFinder.php +++ b/src/LQDN/Finder/CounterpartFinder.php @@ -34,19 +34,20 @@ class CounterpartFinder // @TODO: This part is probably not working. if ('piplome' === $counterpart['quoi']) { $query = <<<EOQ -SELECT d.id AS id, a.nom as pseudo, d.pdf as pdf +SELECT d.id as id, a.nom as pseudo, d.pdf as pdf FROM dons d JOIN adresses a ON a.id = d.adresse_id -WHERE d.id = :don_id +JOIN contreparties c ON c.id = d.taille +WHERE d.taille = :size EOQ; $pdf = $this->connection->fetchAssoc($query, [ - 'don_id' => $counterpart[''] + 'size' => $counterpart['taille'] ]); if (false !== $pdf) { - $contrepartie['pdf_id'] = $pdf['id']; - $contrepartie['pdf_nom'] = $pdf['pseudo']; - $contrepartie['pdf_url'] = $pdf['pdf']; + $counterpart['pdf_id'] = $pdf['id']; + $counterpart['pdf_nom'] = $pdf['pseudo']; + $counterpart['pdf_url'] = $pdf['pdf']; } } diff --git a/tests/functional/Finder/CounterpartFinderTest.php b/tests/functional/Finder/CounterpartFinderTest.php index 4da31be8e192d11c5ced44a32a7ea644ea3076a8..768f3a41571a49247a3150223a8dfb914d848c8a 100644 --- a/tests/functional/Finder/CounterpartFinderTest.php +++ b/tests/functional/Finder/CounterpartFinderTest.php @@ -19,18 +19,13 @@ class CounterpartFinderTest extends FunctionalTest 'user_id' => '2', 'datec' => '2016-06-22 12:34:00', 'quoi' => 'piplome', - 'taille' => '1', + 'taille' => '2', 'status' => '1', 'adresse_id' => null, 'pdf_id' => '1', - 'pdf_nom' => 'bob@example.org', + 'pdf_nom' => 'Main', 'pdf_url' => 'pdf', ]; $this->assertEquals($expectedCounterpart, $firstCounterpart); - - // Test the PDF attributes - $this->assertEquals(2, $firstCounterpart['pdf_id']); - $this->assertEquals('Bob', $firstCounterpart['pdf_nom']); - $this->assertEquals('http://example.org/pdf/2', $firstCounterpart['pdf_url']); } }