commande pour créer des stats de toutes les villes insee
# Conflicts: # src/Command/ProcessLabourageQueueCommand.php # src/Controller/PublicController.php
This commit is contained in:
Tykayn
tykayn
parent
dfeaf123f4
commit
8cfea30fdf
6 changed files with 475 additions and 44 deletions
|
|
@ -771,6 +771,7 @@ final class AdminController extends AbstractController
|
|||
if (!$stats) {
|
||||
$stats = new Stats();
|
||||
$stats->setZone($insee_code);
|
||||
$stats->setKind('request'); // Set the kind to 'request' as it's created from an admin request
|
||||
// $this->addFlash('error', '3 Aucune stats trouvée pour ce code INSEE.');
|
||||
// return $this->redirectToRoute('app_public_index');
|
||||
}
|
||||
|
|
@ -1337,7 +1338,8 @@ final class AdminController extends AbstractController
|
|||
$stats->setZone($zone)
|
||||
->setName($name)
|
||||
->setDateCreated(new \DateTime())
|
||||
->setDateModified(new \DateTime());
|
||||
->setDateModified(new \DateTime())
|
||||
->setKind('request'); // Set the kind to 'request' as it's created from an admin import
|
||||
|
||||
// Remplir les champs optionnels
|
||||
if (isset($statData['population'])) {
|
||||
|
|
|
|||
|
|
@ -122,6 +122,138 @@ class PublicController extends AbstractController
|
|||
return $this->redirectToRoute('app_public_index');
|
||||
}
|
||||
|
||||
#[Route('/api/demande/create', name: 'app_public_create_demande', methods: ['POST'])]
|
||||
public function createDemande(Request $request): JsonResponse
|
||||
{
|
||||
$data = json_decode($request->getContent(), true);
|
||||
|
||||
if (!isset($data['businessName']) || empty($data['businessName'])) {
|
||||
return new JsonResponse(['success' => false, 'message' => 'Le nom du commerce est requis'], 400);
|
||||
}
|
||||
|
||||
// Create a new Demande
|
||||
$demande = new Demande();
|
||||
$demande->setQuery($data['businessName']);
|
||||
$demande->setStatus('new');
|
||||
$demande->setCreatedAt(new \DateTime());
|
||||
|
||||
// Save the INSEE code if provided
|
||||
if (isset($data['insee']) && !empty($data['insee'])) {
|
||||
$demande->setInsee((int)$data['insee']);
|
||||
}
|
||||
|
||||
// Save the OSM object type if provided
|
||||
if (isset($data['osmObjectType']) && !empty($data['osmObjectType'])) {
|
||||
$demande->setOsmObjectType($data['osmObjectType']);
|
||||
}
|
||||
|
||||
// Save the OSM ID if provided
|
||||
if (isset($data['osmId']) && !empty($data['osmId'])) {
|
||||
$demande->setOsmId($data['osmId']);
|
||||
}
|
||||
|
||||
// Check if a Place exists with the same OSM ID and type
|
||||
$place = null;
|
||||
if ($demande->getOsmId() && $demande->getOsmObjectType()) {
|
||||
$existingPlace = $this->entityManager->getRepository(Place::class)->findOneBy([
|
||||
'osm_kind' => $demande->getOsmObjectType(),
|
||||
'osmId' => $demande->getOsmId()
|
||||
]);
|
||||
|
||||
if ($existingPlace) {
|
||||
// Link the Place UUID to the Demande
|
||||
$demande->setPlaceUuid($existingPlace->getUuidForUrl());
|
||||
$demande->setPlace($existingPlace);
|
||||
$place = $existingPlace;
|
||||
} else {
|
||||
// Create a new Place if one doesn't exist
|
||||
$place = new Place();
|
||||
$place->setOsmId((string)$demande->getOsmId());
|
||||
$place->setOsmKind($demande->getOsmObjectType());
|
||||
|
||||
// Get OSM data from Overpass API
|
||||
$commerce_overpass = $this->motocultrice->get_osm_object_data($demande->getOsmObjectType(), $demande->getOsmId());
|
||||
|
||||
if ($commerce_overpass) {
|
||||
// Update the Place with OSM data
|
||||
$place->update_place_from_overpass_data($commerce_overpass);
|
||||
|
||||
// Link the Place to the Demande
|
||||
$demande->setPlaceUuid($place->getUuidForUrl());
|
||||
$demande->setPlace($place);
|
||||
|
||||
// Persist the Place
|
||||
$this->entityManager->persist($place);
|
||||
}
|
||||
}
|
||||
|
||||
// Link the Place to a Stat object using the INSEE code
|
||||
if ($place && $demande->getInsee()) {
|
||||
$stats = $place->getStats();
|
||||
if (!$stats) {
|
||||
$stats_exist = $this->entityManager->getRepository(Stats::class)->findOneBy(['zone' => $demande->getInsee()]);
|
||||
if ($stats_exist) {
|
||||
$stats = $stats_exist;
|
||||
} else {
|
||||
$stats = new Stats();
|
||||
$zipcode = (string)$demande->getInsee();
|
||||
$stats->setZone($zipcode);
|
||||
$stats->setKind('user'); // Set the kind to 'user' as it's created from a user request
|
||||
$place->setZipCode($zipcode);
|
||||
$this->entityManager->persist($stats);
|
||||
}
|
||||
|
||||
|
||||
$stats->addPlace($place);
|
||||
$place->setStats($stats);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!$place->getUuidForUrl()) {
|
||||
$place->setUuidForUrl(uniqid());
|
||||
}
|
||||
if (!$place->getZipCode()) {
|
||||
$place->setZipCode("00000");
|
||||
}
|
||||
|
||||
$this->entityManager->persist($demande);
|
||||
$this->entityManager->flush();
|
||||
|
||||
return new JsonResponse([
|
||||
'success' => true,
|
||||
'message' => 'Demande créée avec succès',
|
||||
'id' => $demande->getId()
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/api/demande/{id}/email', name: 'app_public_update_demande_email', methods: ['POST'])]
|
||||
public function updateDemandeEmail(int $id, Request $request): JsonResponse
|
||||
{
|
||||
$data = json_decode($request->getContent(), true);
|
||||
|
||||
if (!isset($data['email']) || empty($data['email'])) {
|
||||
return new JsonResponse(['success' => false, 'message' => 'L\'email est requis'], 400);
|
||||
}
|
||||
|
||||
$demande = $this->entityManager->getRepository(Demande::class)->find($id);
|
||||
|
||||
if (!$demande) {
|
||||
return new JsonResponse(['success' => false, 'message' => 'Demande non trouvée'], 404);
|
||||
}
|
||||
|
||||
$demande->setEmail($data['email']);
|
||||
$demande->setStatus('email_provided');
|
||||
|
||||
$this->entityManager->persist($demande);
|
||||
$this->entityManager->flush();
|
||||
|
||||
return new JsonResponse([
|
||||
'success' => true,
|
||||
'message' => 'Email ajouté avec succès'
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/', name: 'app_public_index')]
|
||||
public function index(): Response
|
||||
{
|
||||
|
|
@ -129,11 +261,11 @@ class PublicController extends AbstractController
|
|||
|
||||
// Préparer les données pour la carte
|
||||
$citiesForMap = [];
|
||||
|
||||
|
||||
foreach ($stats as $stat) {
|
||||
if ($stat->getZone() && $stat->getZone() !== 'undefined' && preg_match('/^\d+$/', $stat->getZone()) && $stat->getZone() !== '00000') {
|
||||
$cityName = $stat->getName() ?: $stat->getZone();
|
||||
|
||||
|
||||
// Utiliser les coordonnées stockées si disponibles
|
||||
if ($stat->getLat() && $stat->getLon()) {
|
||||
$citiesForMap[] = [
|
||||
|
|
@ -167,33 +299,33 @@ class PublicController extends AbstractController
|
|||
{
|
||||
// Cache simple pour éviter trop d'appels API
|
||||
$cacheKey = 'city_coords_' . $inseeCode;
|
||||
|
||||
|
||||
// Vérifier le cache (ici on utilise une approche simple)
|
||||
// En production, vous pourriez utiliser le cache Symfony
|
||||
|
||||
|
||||
$query = urlencode($cityName . ', France');
|
||||
$url = "https://nominatim.openstreetmap.org/search?q={$query}&format=json&limit=1&countrycodes=fr";
|
||||
|
||||
|
||||
try {
|
||||
// Ajouter un délai pour respecter les limites de l'API Nominatim
|
||||
usleep(100000); // 0.1 seconde entre les appels
|
||||
|
||||
|
||||
$context = stream_context_create([
|
||||
'http' => [
|
||||
'timeout' => 5, // Timeout de 5 secondes
|
||||
'user_agent' => 'OSM-Commerces/1.0'
|
||||
]
|
||||
]);
|
||||
|
||||
|
||||
$response = file_get_contents($url, false, $context);
|
||||
|
||||
|
||||
if ($response === false) {
|
||||
error_log("DEBUG: Échec de récupération des coordonnées pour $cityName ($inseeCode)");
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
$data = json_decode($response, true);
|
||||
|
||||
|
||||
if (!empty($data) && isset($data[0]['lat']) && isset($data[0]['lon'])) {
|
||||
error_log("DEBUG: Coordonnées trouvées pour $cityName ($inseeCode): " . $data[0]['lat'] . ", " . $data[0]['lon']);
|
||||
return [
|
||||
|
|
@ -206,7 +338,7 @@ class PublicController extends AbstractController
|
|||
} catch (\Exception $e) {
|
||||
error_log("DEBUG: Exception lors de la récupération des coordonnées pour $cityName ($inseeCode): " . $e->getMessage());
|
||||
}
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -269,7 +401,7 @@ class PublicController extends AbstractController
|
|||
{
|
||||
|
||||
$this->actionLogger->log('dashboard', []);
|
||||
|
||||
|
||||
$stats_repo = $this->entityManager->getRepository(Stats::class)->findAll();
|
||||
|
||||
$stats_for_chart = [];
|
||||
|
|
@ -298,6 +430,75 @@ class PublicController extends AbstractController
|
|||
]);
|
||||
}
|
||||
|
||||
#[Route('/api/dashboard/regression', name: 'api_dashboard_regression', methods: ['POST'])]
|
||||
public function saveRegressionData(Request $request): JsonResponse
|
||||
{
|
||||
$this->actionLogger->log('save_regression_data', []);
|
||||
|
||||
// Récupérer les données de la requête
|
||||
$data = json_decode($request->getContent(), true);
|
||||
|
||||
if (!isset($data['angle']) || !isset($data['slope']) || !isset($data['intercept'])) {
|
||||
return new JsonResponse([
|
||||
'success' => false,
|
||||
'message' => 'Données de régression incomplètes'
|
||||
], Response::HTTP_BAD_REQUEST);
|
||||
}
|
||||
|
||||
// Récupérer les stats globales (zone 00000)
|
||||
$statsGlobal = $this->entityManager->getRepository(Stats::class)->findOneBy(['zone' => '00000']);
|
||||
|
||||
if (!$statsGlobal) {
|
||||
// Créer les stats globales si elles n'existent pas
|
||||
$statsGlobal = new Stats();
|
||||
$statsGlobal->setZone('00000');
|
||||
$statsGlobal->setName('toutes les villes');
|
||||
$statsGlobal->setKind('request'); // Set the kind to 'request' as it's a system-generated stat
|
||||
$this->entityManager->persist($statsGlobal);
|
||||
$this->entityManager->flush();
|
||||
}
|
||||
|
||||
// Créer un nouveau followup pour la régression linéaire
|
||||
$followup = new CityFollowUp();
|
||||
$followup->setName('regression_angle');
|
||||
$followup->setMeasure($data['angle']);
|
||||
$followup->setDate(new \DateTime());
|
||||
$followup->setStats($statsGlobal);
|
||||
|
||||
$this->entityManager->persist($followup);
|
||||
|
||||
// Créer un followup pour la pente
|
||||
$followupSlope = new CityFollowUp();
|
||||
$followupSlope->setName('regression_slope');
|
||||
$followupSlope->setMeasure($data['slope']);
|
||||
$followupSlope->setDate(new \DateTime());
|
||||
$followupSlope->setStats($statsGlobal);
|
||||
|
||||
$this->entityManager->persist($followupSlope);
|
||||
|
||||
// Créer un followup pour l'ordonnée à l'origine
|
||||
$followupIntercept = new CityFollowUp();
|
||||
$followupIntercept->setName('regression_intercept');
|
||||
$followupIntercept->setMeasure($data['intercept']);
|
||||
$followupIntercept->setDate(new \DateTime());
|
||||
$followupIntercept->setStats($statsGlobal);
|
||||
|
||||
$this->entityManager->persist($followupIntercept);
|
||||
|
||||
$this->entityManager->flush();
|
||||
|
||||
return new JsonResponse([
|
||||
'success' => true,
|
||||
'message' => 'Données de régression enregistrées avec succès',
|
||||
'followup' => [
|
||||
'id' => $followup->getId(),
|
||||
'name' => $followup->getName(),
|
||||
'measure' => $followup->getMeasure(),
|
||||
'date' => $followup->getDate()->format('Y-m-d H:i:s')
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/modify/{osm_object_id}/{version}/{changesetID}', name: 'app_public_submit')]
|
||||
public function submit($osm_object_id, $version, $changesetID): Response
|
||||
{
|
||||
|
|
@ -471,6 +672,7 @@ class PublicController extends AbstractController
|
|||
} else {
|
||||
$stats = new Stats();
|
||||
$stats->setZone($place->getZipCode());
|
||||
$stats->setKind('user'); // Set the kind to 'user' as it's created from a user interaction
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -658,7 +860,7 @@ class PublicController extends AbstractController
|
|||
public function publicFollowupGraph(string $insee_code, string $theme): Response
|
||||
{
|
||||
$stats = $this->entityManager->getRepository(Stats::class)->findOneBy(['zone' => $insee_code]);
|
||||
if (!$stats) {
|
||||
if (!$stats) {
|
||||
$this->addFlash('error', '13 Aucune stats trouvée pour ce code INSEE.');
|
||||
return $this->redirectToRoute('app_public_index');
|
||||
}
|
||||
|
|
@ -673,7 +875,7 @@ class PublicController extends AbstractController
|
|||
$followups = $stats->getCityFollowUps();
|
||||
$countData = [];
|
||||
$completionData = [];
|
||||
|
||||
|
||||
foreach ($followups as $fu) {
|
||||
if ($fu->getName() === $theme . '_count') {
|
||||
$countData[] = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue