Skip to content

Commit

Permalink
update territory #2486
Browse files Browse the repository at this point in the history
  • Loading branch information
sfinx13 committed Apr 22, 2024
1 parent f285a2f commit d30e3d6
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 38 deletions.
7 changes: 7 additions & 0 deletions src/DataFixtures/Files/Partner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -455,3 +455,10 @@ partners:
- 'FSL'
- 'VISITES'
- 'RSD'
-
nom: "Mairie de Saint-Denis"
email: "[email protected]"
is_archive: 0
insee: "[\"93066\"]"
territory: "Seine-Saint-Denis"
type: "COMMUNE_SCHS"
39 changes: 39 additions & 0 deletions src/DataFixtures/Files/Signalement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1786,3 +1786,42 @@ signalements:
qualifications:
- "RSD"
- "NON_DECENCE"
-
uuid: "00000000-0000-0093-2024-000000000005"
details: "Un signalement auto-assigné."
is_proprio_averti: 1
is_logement_social: 1
bailleur: "Seine-Saint-Denis Style"
nb_adultes: "2"
nb_enfants_m6: "0"
nb_enfants_p6: "2"
is_allocataire: ""
nature_logement: "maison"
superficie: 100
phone_number: 0621127286
adresse_occupant: "17 Avenue Didier Morville"
cp_occupant: "93002"
ville_occupant: "Saint-Denis"
statut: 7
reference: "2024-05"
geoloc: "{\"lng\":\"43.301787\", \"lat\":\"5.364626\"}"
created_at: "2024-01-01 16:06:33"
score: 0
insee_occupant: "93066"
is_rsa: 0
nb_occupants_logement: 4
territory: "Seine-Saint-Denis"
mode_contact_proprio: "[\"\",\"t\\u00e9l\\u00e9phone\"]"
situations:
- "le confort du logement"
criteres:
- "De l’air s’infiltre dans mon logement."
- "Mes factures de chauffage sont anormalement élevées."
- "Mon logement est mal isolé."
criticites:
- "Infiltration ou fuite d'air dans plus de deux des éléments suivants : toit, charpente, façades, murs extérieurs. Sensation de courant d'air régulière ou très fréquente."
- "Ma facture est trop élevée et le chauffage est limité dans le logement."
- "Le DPE indique une étiquette énergie F ou G ou n’a pas été fait. J’ai tout le temps la sensation d'avoir froid en hiver et/ou très chaud en été."
qualifications:
- "RSD"
- "NON_DECENCE"
67 changes: 33 additions & 34 deletions src/DataFixtures/Files/Territory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ territories:
name: "Ain"
is_active: 1
bbox: "{\"n\":\"46.519953\",\"e\":\"6.170198\",\"s\":\"45.611093\",\"w\":\"4.728067\"}"
is_auto_affectation_enabled: 1
-
zip: "02"
name: "Aisne"
Expand Down Expand Up @@ -43,7 +42,7 @@ territories:
-
zip: "09"
name: "Ariège"
is_active: 0
is_active: 1
bbox: "{\"n\":\"43.316222\",\"e\":\"2.175847\",\"s\":\"42.571489\",\"w\":\"0.825994\"}"
-
zip: "10"
Expand All @@ -58,7 +57,7 @@ territories:
-
zip: "12"
name: "Aveyron"
is_active: 0
is_active: 1
bbox: "{\"n\":\"44.941441\",\"e\":\"3.451754\",\"s\":\"43.690619\",\"w\":\"1.839313\"}"
-
zip: "13"
Expand All @@ -83,12 +82,12 @@ territories:
-
zip: "17"
name: "Charente-Maritime"
is_active: 0
is_active: 1
bbox: "{\"n\":\"46.371485\",\"e\":\"0.005972\",\"s\":\"45.08875\",\"w\":\"-1.562669\"}"
-
zip: "18"
name: "Cher"
is_active: 0
is_active: 1
bbox: "{\"n\":\"47.629116\",\"e\":\"3.079745\",\"s\":\"46.420477\",\"w\":\"1.773677\"}"
-
zip: "19"
Expand Down Expand Up @@ -118,7 +117,7 @@ territories:
-
zip: "23"
name: "Creuse"
is_active: 0
is_active: 1
bbox: "{\"n\":\"46.45537\",\"e\":\"2.611293\",\"s\":\"45.663551\",\"w\":\"1.372604\"}"
-
zip: "24"
Expand Down Expand Up @@ -156,7 +155,7 @@ territories:
-
zip: "30"
name: "Gard"
is_active: 0
is_active: 1
bbox: "{\"n\":\"44.459664\",\"e\":\"4.845564\",\"s\":\"43.460159\",\"w\":\"3.261869\"}"
-
zip: "31"
Expand All @@ -171,17 +170,17 @@ territories:
-
zip: "33"
name: "Gironde"
is_active: 0
is_active: 1
bbox: "{\"n\":\"45.573636\",\"e\":\"0.315137\",\"s\":\"44.193902\",\"w\":\"-1.261424\"}"
-
zip: "34"
name: "Hérault"
is_active: 0
is_active: 1
bbox: "{\"n\":\"43.97276\",\"e\":\"4.19454\",\"s\":\"43.21021\",\"w\":\"2.539549\"}"
-
zip: "35"
name: "Ille-et-Vilaine"
is_active: 0
is_active: 1
bbox: "{\"n\":\"48.721737\",\"e\":\"-1.015621\",\"s\":\"47.631614\",\"w\":\"-2.289611\"}"
-
zip: "36"
Expand All @@ -191,7 +190,7 @@ territories:
-
zip: "37"
name: "Indre-et-Loire"
is_active: 0
is_active: 1
bbox: "{\"n\":\"47.709868\",\"e\":\"1.366049\",\"s\":\"46.736714\",\"w\":\"0.052737\"}"
-
zip: "38"
Expand All @@ -206,12 +205,12 @@ territories:
-
zip: "40"
name: "Landes"
is_active: 0
is_active: 1
bbox: "{\"n\":\"44.532381\",\"e\":\"0.136691\",\"s\":\"43.48743\",\"w\":\"-1.523575\"}"
-
zip: "41"
name: "Loir-et-Cher"
is_active: 0
is_active: 1
bbox: "{\"n\":\"48.133235\",\"e\":\"2.247891\",\"s\":\"47.186391\",\"w\":\"0.580487\"}"
-
zip: "42"
Expand All @@ -221,7 +220,7 @@ territories:
-
zip: "43"
name: "Haute-Loire"
is_active: 0
is_active: 1
bbox: "{\"n\":\"45.427609\",\"e\":\"4.490819\",\"s\":\"44.743961\",\"w\":\"3.082197\"}"
-
zip: "44"
Expand All @@ -231,12 +230,12 @@ territories:
-
zip: "45"
name: "Loiret"
is_active: 0
is_active: 1
bbox: "{\"n\":\"48.344954\",\"e\":\"3.12841\",\"s\":\"47.483027\",\"w\":\"1.51145\"}"
-
zip: "46"
name: "Lot"
is_active: 0
is_active: 1
bbox: "{\"n\":\"45.046684\",\"e\":\"2.210891\",\"s\":\"44.203348\",\"w\":\"0.981522\"}"
-
zip: "47"
Expand All @@ -246,7 +245,7 @@ territories:
-
zip: "48"
name: "Lozère"
is_active: 0
is_active: 1
bbox: "{\"n\":\"44.975761\",\"s\":\"44.109591\",\"e\":\"3.998366\",\"w\":\"2.981197\"}"
-
zip: "49"
Expand All @@ -256,17 +255,17 @@ territories:
-
zip: "50"
name: "Manche"
is_active: 0
is_active: 1
bbox: "{\"n\":\"49.729982\",\"s\":\"48.455797\",\"e\":\"-0.734817\",\"w\":\"-1.954995\"}"
-
zip: "51"
name: "Marne"
is_active: 0
is_active: 1
bbox: "{\"n\":\"49.407828\",\"s\":\"48.515251\",\"e\":\"5.039668\",\"w\":\"3.395865\"}"
-
zip: "52"
name: "Haute-Marne"
is_active: 0
is_active: 1
bbox: "{\"n\":\"48.689322\",\"s\":\"47.576566\",\"e\":\"5.891043\",\"w\":\"4.626603\"}"
-
zip: "53"
Expand All @@ -276,12 +275,12 @@ territories:
-
zip: "54"
name: "Meurthe-et-Moselle"
is_active: 0
is_active: 1
bbox: "{\"n\":\"49.563268\",\"s\":\"48.348987\",\"e\":\"7.123213\",\"w\":\"5.426108\"}"
-
zip: "55"
name: "Meuse"
is_active: 0
is_active: 1
bbox: "{\"n\":\"49.616864\",\"s\":\"48.408992\",\"e\":\"5.854206\",\"w\":\"4.888377\"}"
-
zip: "56"
Expand All @@ -296,7 +295,7 @@ territories:
-
zip: "58"
name: "Nièvre"
is_active: 0
is_active: 1
bbox: "{\"n\":\"47.588288\",\"s\":\"46.651024\",\"e\":\"4.23191\",\"w\":\"2.844891\"}"
-
zip: "59"
Expand All @@ -306,7 +305,7 @@ territories:
-
zip: "60"
name: "Oise"
is_active: 0
is_active: 1
bbox: "{\"n\":\"49.763922\",\"s\":\"49.060525\",\"e\":\"3.166125\",\"w\":\"1.688866\"}"
-
zip: "61"
Expand Down Expand Up @@ -341,7 +340,7 @@ territories:
-
zip: "67"
name: "Bas-Rhin"
is_active: 0
is_active: 1
bbox: "{\"n\":\"49.077858\",\"s\":\"48.120387\",\"e\":\"8.233549\",\"w\":\"6.940614\"}"
-
zip: "68"
Expand Down Expand Up @@ -457,7 +456,7 @@ territories:
-
zip: "70"
name: "Haute-Saône"
is_active: 0
is_active: 1
bbox: "{\"n\":\"48.024154\",\"s\":\"47.252553\",\"e\":\"6.824947\",\"w\":\"5.366937\"}"
-
zip: "71"
Expand All @@ -467,12 +466,12 @@ territories:
-
zip: "72"
name: "Sarthe"
is_active: 0
is_active: 1
bbox: "{\"n\":\"48.48502\",\"s\":\"47.568401\",\"e\":\"0.916639\",\"w\":\"-0.448063\"}"
-
zip: "73"
name: "Savoie"
is_active: 0
is_active: 1
bbox: "{\"n\":\"45.938537\",\"s\":\"45.051689\",\"e\":\"7.185566\",\"w\":\"5.621902\"}"
-
zip: "74"
Expand All @@ -487,7 +486,7 @@ territories:
-
zip: "76"
name: "Seine-Maritime"
is_active: 0
is_active: 1
bbox: "{\"n\":\"50.072097\",\"s\":\"49.250643\",\"e\":\"1.790589\",\"w\":\"0.065572\"}"
-
zip: "77"
Expand All @@ -497,7 +496,7 @@ territories:
-
zip: "78"
name: "Yvelines"
is_active: 0
is_active: 1
bbox: "{\"n\":\"49.085448\",\"s\":\"48.438557\",\"e\":\"2.229127\",\"w\":\"1.44617\"}"
-
zip: "79"
Expand Down Expand Up @@ -527,22 +526,22 @@ territories:
-
zip: "84"
name: "Vaucluse"
is_active: 0
is_active: 1
bbox: "{\"n\":\"44.431566\",\"s\":\"43.658718\",\"e\":\"5.757335\",\"w\":\"4.649082\"}"
-
zip: "85"
name: "Vendée"
is_active: 0
is_active: 1
bbox: "{\"n\":\"47.085008\",\"s\":\"46.266539\",\"e\":\"-0.538134\",\"w\":\"-2.400631\"}"
-
zip: "86"
name: "Vienne"
is_active: 0
is_active: 1
bbox: "{\"n\":\"47.17599\",\"s\":\"46.048269\",\"e\":\"1.21323\",\"w\":\"-0.105026\"}"
-
zip: "87"
name: "Haute-Vienne"
is_active: 0
is_active: 1
bbox: "{\"n\":\"46.401586\",\"s\":\"45.43663\",\"e\":\"1.911079\",\"w\":\"0.62925\"}"
-
zip: "88"
Expand Down
8 changes: 8 additions & 0 deletions src/DataFixtures/Files/User.yml
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,14 @@ users:
is_generique: 0
is_mailing_active: 1
territory: "Pas-de-Calais"
-
email: [email protected]
roles: "[\"ROLE_USER_PARTNER\"]"
partner: "Mairie de Saint-Denis"
statut: 1
is_generique: 0
is_mailing_active: 1
territory: "Seine-Saint-Denis"
-
email: [email protected]
roles: "[\"ROLE_USAGER\"]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public function testStatistiquesHomepage(string $route, string $email): void
public function provideRoutesStatistiquesDatas(): \Generator
{
yield 'Super Admin' => ['back_statistiques_filter', [], self::USER_SUPER_ADMIN, [
['result' => 39, 'label' => 'count_signalement'],
['result' => 64.1, 'label' => 'average_criticite'],
['result' => 40, 'label' => 'count_signalement'],
['result' => 62.5, 'label' => 'average_criticite'],
]];
yield 'Responsable Territoire' => ['back_statistiques_filter', [], self::USER_ADMIN_TERRITOIRE, [
['result' => 25, 'label' => 'count_signalement'],
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Service/AutoAssignerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ protected function setUp(): void

public function testAutoAssignmentSuccess(): void
{
$this->testHelper('2023-1', 1);
$this->testHelper('2024-05', 1);
}

public function testAutoAssignmentFailed(): void
{
$this->testHelper('2023-2', 0);
$this->testHelper('2023-1', 0);
}

private function testHelper($reference, $expectedCount)
Expand Down

0 comments on commit d30e3d6

Please sign in to comment.