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.

Sign up for GitHub

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

Ajout de la réservation et du calendrier, ultra moche, ultra simple #104

Merged
merged 11 commits into from
Feb 28, 2019
Merged

Ajout de la réservation et du calendrier, ultra moche, ultra simple #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e99b646
Harmonisation de la récupération des données utilisateurs avec le reste
NastuzziSamy Feb 27, 2019
91be54c
Ajout de la migration des réservations
NastuzziSamy Feb 27, 2019
ccf170a
Ajout de la page de réservation
NastuzziSamy Feb 27, 2019
debae97
Ajout de données pour les events et amélioration du calcul des routes
NastuzziSamy Feb 27, 2019
0cb7fc3
Création de la page de réservation et affichage des salles réservées
NastuzziSamy Feb 27, 2019
d6187d9
Correction du lint
NastuzziSamy Feb 27, 2019
4601927
Affichage du chargement lors du téléchargement des événements
NastuzziSamy Feb 27, 2019
4080f1f
Ajout de la route pour les réservations
NastuzziSamy Feb 27, 2019
4a691d5
Ajout de la création de créaneaux
NastuzziSamy Feb 28, 2019
cf79f14
Correction des tailles en db de certains champs
NastuzziSamy Feb 28, 2019
d61d452
Fix linter
NastuzziSamy Feb 28, 2019
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
2 changes: 1 addition & 1 deletion .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"no-console": 0,
"no-case-declarations": 1,
"no-fallthrough": 0,
"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
"no-plusplus": 0,
"no-unused-vars": [1,
{ "vars": "local",
"argsIgnorePattern": "^_",
Expand Down
224 changes: 182 additions & 42 deletions app/Console/Commands/OldToNew.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
};
use App\Models\{
Asso, AssoType, Article, Contact, ContactType, Client, Tag, Role, Semester, User, Visibility, AuthCas, Event, Service,
Access, Room, Location
Access, Room, Location, Booking, BookingType
};

class OldToNew extends Command
Expand All @@ -44,6 +44,7 @@ class OldToNew extends Command
protected $roles = [];
protected $events = [];
protected $access = [];
protected $rooms = [];
protected $resultedRoles = [];

/**
Expand Down Expand Up @@ -78,11 +79,11 @@ class OldToNew extends Command
public function handle()
{
if (!$this->confirm('Ceci va supprimer toutes les données actuelles en faveur de l\'ancien Portail.\
Cela prend en moyenne 10 à 15 min. Confirmer ?')) {
Cela prend en moyenne entre 30 min et 2h. Confirmer ?')) {
return;
}

$bar = $this->output->createProgressBar(10);
$bar = $this->output->createProgressBar(11);
$errors = [];

$this->info('Migration et nettoyage de la base de données');
Expand All @@ -94,59 +95,57 @@ public function handle()

$this->info('Préparation des données à récupérer');

$this->users = $this->getDB()->select('SELECT * FROM sf_guard_user');
$this->assos = $this->getDB()->select('SELECT * FROM asso');
$this->users = $this->getDB()->select('SELECT * FROM sf_guard_user');
$this->semesters = $this->getDB()->select('SELECT * FROM semestre');
$this->roles = $this->getDB()->select('SELECT * FROM role');
$this->events = $this->getDB()->select('SELECT * FROM event');
$this->access = $this->getDB()->select('SELECT * FROM charte_locaux_type');
$this->rooms = $this->getDB()->select('SELECT * FROM salle');

$bar->advance();
$this->info(PHP_EOL);

try {
$errors['Associations'] = $this->addAssos();
$next = function() use ($bar) {
$this->info(PHP_EOL);
$bar->advance();
$this->info(PHP_EOL);
};

try {
$errors['Associations'] = $this->addAssos();
$next();

$errors['Articles'] = $this->addArticles();
$this->info(PHP_EOL);
$bar->advance();
$this->info(PHP_EOL);
$next();

$errors['Utilisateurs'] = $this->addUsers();
$this->info(PHP_EOL);
$bar->advance();
$this->info(PHP_EOL);
$next();

$errors['Membres'] = $this->addMembers();
$this->info(PHP_EOL);
$bar->advance();
$this->info(PHP_EOL);
$next();

$errors['Evénements'] = $this->addEvents();
$this->info(PHP_EOL);
$bar->advance();
$this->info(PHP_EOL);
$next();

$errors['Services'] = $this->addServices();
$this->info(PHP_EOL);
$bar->advance();
$this->info(PHP_EOL);
$next();

$errors['Accès'] = $this->addAssosAccess();
$next();

$errors['Salles'] = $this->addRooms();
$this->info(PHP_EOL);
$bar->advance();
$this->info(PHP_EOL);
$next();

$errors['Réservations'] = $this->addBookings();
$next();
} catch (\Exception $e) {
throw $e;
} finally {
DB::delete('DELETE FROM jobs;');
DB::delete('DELETE FROM failed_jobs;');
DB::delete('DELETE FROM jobs; DELETE FROM failed_jobs;');

$this->info(PHP_EOL);
$this->info(PHP_EOL);
$this->info(PHP_EOL.PHP_EOL);
$this->info('Rapport:');
foreach ($errors as $name => $subErrors) {
$this->info(PHP_EOL);
Expand Down Expand Up @@ -295,6 +294,20 @@ protected function getAccess(int $access_id)
return Access::where('utc_access', $oldAccess->correspondance)->first();
}

/**
* Récupère la salle.
*
* @param integer $room_id
* @return mixed|null
*/
protected function getRoom(int $room_id)
{
$oldRoom = $this->getModelFrom($this->rooms, $room_id);
$names = explode(' ', $oldRoom->name);

return Room::where('location_id', Location::where('name', 'LIKE', '%'.end($names).'%')->first()->id)->first();
}

/**
* Crée les associations depuis l'ancien Portail.
*
Expand All @@ -306,7 +319,6 @@ protected function addAssos()

$assoTypes = $this->getDB()->select('SELECT * FROM type_asso');
$poles = $this->getDB()->select('SELECT * FROM pole');
$this->assos = $this->getDB()->select('SELECT * FROM asso');

$this->info('Création des '.count($this->assos).' associations');

Expand Down Expand Up @@ -582,25 +594,29 @@ protected function addMembers()
try {
$asso = $this->getAsso($member->asso_id);
if (!$asso) {
$this->output->error('Association non existante n°'.$member->asso_id);
$errors[] = 'Association non existante n°'.$member->asso_id;
$bar->advance();
continue;
}

$role = $this->getRole($member->role_id);
if (!$role) {
$this->output->error('Rôle non existant n°'.$member->role_id);
$errors[] = 'Rôle non existant n°'.$member->role_id;
$bar->advance();
continue;
}

$user = $this->getUser($member->user_id);
if (!$user) {
$this->output->error('Utilisateur non existant n°'.$member->user_id);
$errors[] = 'Utilisateur non existant n°'.$member->user_id;
$bar->advance();
continue;
}

$semester = $this->getSemester($member->semestre_id);
if (!$semester) {
$this->output->error('Semestre non existant n°'.$member->semestre_id);
$errors[] = 'Semestre non existant n°'.$member->semestre_id;
$bar->advance();
continue;
}

Expand Down Expand Up @@ -814,25 +830,29 @@ protected function addAssosAccess()
try {
$asso = $this->getAsso($access->asso_id);
if (!$asso) {
$this->output->error('Association non existante n°'.$access->asso_id);
$errors[] = 'Association non existante n°'.$access->asso_id;
$bar->advance();
continue;
}

$type = $this->getAccess($access->type_id);
if (!$type) {
$this->output->error('Accès non existant n°'.$access->type_id);
$errors[] = 'Accès non existant n°'.$access->type_id;
$bar->advance();
continue;
}

$user = $this->getUser($access->user_id);
if (!$user) {
$this->output->error('Utilisateur non existant n°'.$access->user_id);
$errors[] = 'Utilisateur non existant n°'.$access->user_id;
$bar->advance();
continue;
}

$semester = $this->getSemester($access->semestre_id);
if (!$semester) {
$this->output->error('Semestre non existant n°'.$access->semestre_id);
$errors[] = 'Semestre non existant n°'.$access->semestre_id;
$bar->advance();
continue;
}

Expand Down Expand Up @@ -898,25 +918,26 @@ protected function addRooms()
{
$this->info('Préparation des salles');

$rooms = $this->getDB()->select('SELECT * FROM salle');
$poles = $this->getDB()->select('SELECT * FROM pole');

$this->info('Création des '.count($rooms).' salles');
$this->info('Création des '.count($this->rooms).' salles');

$bar = $this->output->createProgressBar(count($rooms));
$bar = $this->output->createProgressBar(count($this->rooms));
$errors = [];

foreach ($rooms as $room) {
foreach ($this->rooms as $room) {
try {
$pole = $this->getModelFrom($poles, $room->id_pole);
if (!$pole) {
$this->output->error('Pôle non existant n°'.$room->id_pole);
$errors[] = 'Pôle non existant n°'.$room->id_pole;
$bar->advance();
continue;
}

$asso = $this->getAsso($pole->asso_id);
if (!$asso) {
$this->output->error('Association non existante n°'.$pole->asso_id);
$errors[] = 'Association non existante n°'.$pole->asso_id;
$bar->advance();
continue;
}

Expand Down Expand Up @@ -967,4 +988,123 @@ protected function addRooms()

return $errors;
}

/**
* Crée les réservation depuis l'ancien Portail.
*
* @return array
*/
protected function addBookings()
{
$this->info('Préparation des réservations');

$bookings = $this->getDB()->select('SELECT * FROM reservation');

$this->info('Création des '.count($bookings).' réservations');

$bar = $this->output->createProgressBar(count($bookings));
$errors = [];

foreach ($bookings as $booking) {
try {
try {
$asso = $this->getAsso($booking->id_asso);
if (!$asso) {
$errors[] = 'Association non existante n°'.$booking->asso_id;
$bar->advance();
continue;
}
} catch (\Error $e) {
$errors[] = 'Association non donnée, réservation sautée n°'.$booking->id;
$bar->advance();
continue;
} catch (\Exception $e) {
$errors[] = 'Association non existante';
$bar->advance();
continue;
}

try {
if ($booking->id_user_valid) {
$validated_by = $this->getUser($booking->id_user_valid);
if (!$validated_by) {
$errors[] = 'Utilisateur non existant n°'.$booking->id_user_valid;
$bar->advance();
continue;
}
}

$user = $this->getUser($booking->id_user_reserve);
if (!$user) {
$errors[] = 'Utilisateur non existant n°'.$booking->id_user_reserve;
$bar->advance();
continue;
}
} catch (\Exception $e) {
$errors[] = 'Utilisateur non existant';
$bar->advance();
continue;
}

$room = $this->getRoom($booking->id_salle);
if (!$room) {
$errors[] = 'Salle non existante n°'.$booking->id_salle;
$bar->advance();
continue;
}

// Ici si aucun type n'est trouvé, on considère que c'est un blocage de créneau.
$type = BookingType::where('name', $booking->activite)->first();
$name = ($booking->commentaire ? $booking->commentaire : ($type ? $type->name : 'Blocage'));

if ($booking->estvalide && !isset($validated_by)) {
$validated_by = $user;
}

try {
$event = Event::create([
'name' => $name,
'begin_at' => $booking->date.' '.$booking->heuredebut,
'end_at' => $booking->date.' '.$booking->heurefin,
'full_day' => ($booking->allDay ?? false),
'location_id' => $room->location->id,
'created_by_id' => $user->id,
'created_by_type' => User::class,
'owned_by_id' => $asso->id,
'owned_by_type' => Asso::class,
'visibility_id' => $room->calendar->visibility_id,
]);
} catch (\Exception $e) {
$errors[] = 'Evénement déjà créé pour la réservation n°'.$booking->id;
$bar->advance();
continue;
}

$room->calendar->events()->attach($event);
$model = $room->bookings()->create([
'type_id' => ($type->id ?? null),
'event_id' => $event->id,
'description' => $booking->commentaire,
'created_by_id' => $user->id,
'created_by_type' => User::class,
'owned_by_id' => $asso->id,
'owned_by_type' => Asso::class,
'validated_by_id' => ($validated_by->id ?? null),
'validated_by_type' => User::class,
]);

$bar->advance();
} catch (\Exception $e) {
$this->output->error('Impossible de créer la réservation n°'.$booking->id);

throw $e;
} catch (\Error $e) {
$this->output->error('Impossible de créer la réservation n°'.$booking->id);

throw $e;
}
}

return $errors;
}
}
Loading