Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Back - Signalement] Il manque très souvent la ville du propriétaire #2419

Merged
merged 2 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions migrations/Version20240405080750.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

final class Version20240405080750 extends AbstractMigration
{
public function getDescription(): string
{
return '';
numew marked this conversation as resolved.
Show resolved Hide resolved
}

public function up(Schema $schema): void
{
$this->addSql('UPDATE signalement s
INNER JOIN signalement_draft d ON s.created_from_id = d.id
SET s.ville_proprio = d.payload->"$.coordonnees_bailleur_adresse_detail_commune"
WHERE s.code_postal_proprio IS NOT NULL AND s.ville_proprio IS NULL');
}

public function down(Schema $schema): void
{
}
}
10 changes: 5 additions & 5 deletions src/Dto/Request/Signalement/SignalementDraftRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class SignalementDraftRequest
private ?string $coordonneesBailleurAdresse = null;
private ?string $coordonneesBailleurAdresseDetailNumero = null;
private ?string $coordonneesBailleurAdresseDetailCodePostal = null;
private ?string $coordonneesBailleurAdresseCommune = null;
private ?string $coordonneesBailleurAdresseDetailCommune = null;
private ?string $zoneConcerneeZone = null;
private ?string $typeLogementNature = null;
private ?string $typeLogementNatureAutrePrecision = null;
Expand Down Expand Up @@ -693,14 +693,14 @@ public function setCoordonneesBailleurAdresseDetailCodePostal(
return $this;
}

public function getCoordonneesBailleurAdresseCommune(): ?string
public function getCoordonneesBailleurAdresseDetailCommune(): ?string
{
return $this->coordonneesBailleurAdresseCommune;
return $this->coordonneesBailleurAdresseDetailCommune;
}

public function setCoordonneesBailleurAdresseCommune(?string $coordonneesBailleurAdresseCommune): self
public function setCoordonneesBailleurAdresseDetailCommune(?string $coordonneesBailleurAdresseDetailCommune): self
{
$this->coordonneesBailleurAdresseCommune = $coordonneesBailleurAdresseCommune;
$this->coordonneesBailleurAdresseDetailCommune = $coordonneesBailleurAdresseDetailCommune;

return $this;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Service/Signalement/SignalementBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ private function setProprietaireData(): void
} else {
$this->signalement
->setAdresseProprio($this->signalementDraftRequest->getCoordonneesBailleurAdresseDetailNumero())
->setVilleProprio($this->signalementDraftRequest->getCoordonneesBailleurAdresseCommune())
->setVilleProprio($this->signalementDraftRequest->getCoordonneesBailleurAdresseDetailCommune())
->setCodePostalProprio($this->signalementDraftRequest->getCoordonneesBailleurAdresseDetailCodePostal())
->setMailProprio($this->signalementDraftRequest->getCoordonneesBailleurEmail())
->setNomProprio($bailleurNom = $this->signalementDraftRequest->getCoordonneesBailleurNom())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@ public function testBuildSignalement(): void
$this->assertArrayHasKey('lat', $signalement->getGeoloc());
$this->assertArrayHasKey('lng', $signalement->getGeoloc());

$this->assertEquals('13 Habitat', $signalement->getNomProprio());
$this->assertEquals('Sandrine', $signalement->getPrenomProprio());
$this->assertEquals('sandrine@histologe.fr', $signalement->getMailProprio());
$this->assertEquals('10 rue du 14 juillet', $signalement->getAdresseProprio());
$this->assertEquals('64000', $signalement->getCodePostalProprio());
$this->assertEquals('Pau', $signalement->getVilleProprio());

$this->assertTrue($signalement->getIsLogementSocial());
$this->assertTrue($signalement->getIsBailEnCours());
$this->assertTrue($signalement->getIsProprioAverti());
Expand Down
Loading