various changesHEADmain

1 files changed, 24 insertions, 9 deletions

diff --git a/src/http/Controller/Village.php b/src/http/Controller/Village.php
index 2d6aa39..22713b1 100644
--- a/src/http/Controller/Village.php
+++ b/src/http/Controller/Village.php
@@ -57,26 +57,32 @@ class Village
     )->fetchAll();
 
     foreach ($eventsBuilding as $row) {
-      $events['UpgradeBuilding'][$row['type']][] = DB::convertToModel(UpgradeBuilding::class, $row);
+      $model = DB::convertToModel(UpgradeBuilding::class, $row);
+      $model->populateEvent();
+
+      $events['UpgradeBuilding'][$row['type']][] = $model;
     }
 
     $eventsUnits = DB::query(
       <<<SQL
       select * from events_train_units as event
       left join events on event.event_id = events.id
-      where village_id=:id
+      where events.village_id=:id
       SQL, ['id' => $village->id]
     )->fetchAll();
 
     foreach ($eventsUnits as $row) {
-      $events['TrainUnits'][] = DB::convertToModel(TrainUnits::class, $row);
+      $model = DB::convertToModel(TrainUnits::class, $row);
+      $model->populateEvent();
+
+      $events['TrainUnits'][] = $model;
     }
 
     $eventsUnitsSendOwn = DB::query(
       <<<SQL
       select * from events_send_units as event
       left join events on event.event_id = events.id
-      where village_id=:id
+      where events.village_id=:id
       SQL, ['id' => $village->id]
     )->fetchAll();
 
@@ -89,14 +95,17 @@ class Village
     )->fetchAll();
 
     foreach ([...$eventsUnitsSendOwn, ...$eventsUnitsSendOther] as $row) {
-      $events['SendUnits'][] = DB::convertToModel(SendUnits::class, $row);;
+      $model = DB::convertToModel(SendUnits::class, $row);
+      $model->populateEvent();
+
+      $events['SendUnits'][] = DB::convertToModel(SendUnits::class, $row);
     }
 
     $eventsResourcesSendOwn = DB::query(
       <<<SQL
       select * from events_send_resources as event
       left join events on event.event_id = events.id
-      where village_id=:id
+      where events.village_id=:id
       SQL, ['id' => $village->id]
     )->fetchAll();
 
@@ -109,14 +118,17 @@ class Village
     )->fetchAll();
 
     foreach ([...$eventsResourcesSendOwn, ...$eventsResourcesSendOther] as $row) {
-      $events['SendResources'][] = DB::convertToModel(SendResources::class, $row);;
+      $model = DB::convertToModel(SendResources::class, $row);
+      $model->populateEvent();
+
+      $events['SendResources'][] = DB::convertToModel(SendResources::class, $row);
     }
 
     $eventsResourcesCarriersSendOwn = DB::query(
       <<<SQL
       select * from events_send_resources_carriers as event
       left join events on event.event_id = events.id
-      where village_id=:id
+      where events.village_id=:id
       SQL, ['id' => $village->id]
     )->fetchAll();
 
@@ -129,7 +141,10 @@ class Village
     )->fetchAll();
 
     foreach ([...$eventsResourcesCarriersSendOwn, ...$eventsResourcesCarriersSendOther] as $row) {
-      $events['SendResourcesCarriers'][] = DB::convertToModel(SendResourcesCarriers::class, $row);;
+      $model = DB::convertToModel(SendResourcesCarriers::class, $row);
+      $model->populateEvent();
+      
+      $events['SendResourcesCarriers'][] = $model;
     }
 
     $buildings = [];