fixed too many requests - fixes #51

intro-tour-admin/src/app/components/tour/event/event.component.html

@@ -34,7 +34,7 @@ <h3>Set range:</h3>
 				<div class="card" *ngFor="let event of events">
 					<div class="content">
 						<div class="header">
-							{{event.location.name}} ({{event.event_id}})
+							{{event.location.name}}
 						</div>
 						<div class="meta">
 							{{event.location.description}}
@@ -48,7 +48,7 @@ <h3>Set range:</h3>
 					<div class="extra content">
 						<div class="ui two buttons">
 							<div class="ui basic blue button disabled"><i class="fas fa-pen"></i></div>
-							<div class="ui basic red button" (click)="deleteLocation(event.location.id, event.event_id)"><i class="fas fa-trash-alt"></i></div>
+							<div class="ui basic red button" (click)="deleteLocation(event.location.id, event.id)"><i class="fas fa-trash-alt"></i></div>
 						</div>
 					</div>
 				</div>

intro-tour-admin/src/app/components/tour/event/event.component.ts

@@ -73,14 +73,10 @@ export class EventComponent implements OnInit {
 		this.adminService.getAdminById(1)
 			.subscribe((admin) => {
 				this.admin = admin[0];
-				this.eventService.getEventsById(this.admin.tour.id)
+				this.eventService.getEventsByTourId(this.admin.tour.id)
 					.subscribe((events) => {
-						events.forEach(event => {
-							this.locationService.getLocation(event.event.trigger.data.location_id)
-								.subscribe((location) => {
-									event.location = location[0];
-									this.events.push(event);
-								});
+						events.forEach(element => {
+							this.events.push(element[0]);
 						});
 					});
 			});

intro-tour-admin/src/app/services/event.service.ts

@@ -17,6 +17,10 @@ export class EventService {
     return this.http.get(this.apiUrl + 'events/' + id);
   }
 
+  public getEventsByTourId(id: number): Observable<any>{
+    return this.http.get(this.apiUrl + 'events-by-tour/' + id);
+  }
+
   public createEvent(data): Observable<any>{
     return this.http.post(this.apiUrl + 'events', data);
   }

intro_tour/app/Event.php

@@ -13,8 +13,14 @@ class Event extends Model
     protected $fillable = [
         'trigger', 'action'
     ];
+
     public function question()
     {
         return $this->hasOne('App\Question', 'id', 'action->data->question_id');
     }
+
+    public function location()
+    {
+        return $this->hasOne('App\Location', 'id', 'trigger["data"]["location_id"]');
+    }
 }

intro_tour/app/Http/Controllers/EventController.php

@@ -5,6 +5,9 @@
 use Illuminate\Http\Request;
 use App\Event;
 use App\EventTour;
+use App\Tour;
+use App\Location;
+use App\Question;
 use Response;
 use DB;
 
@@ -111,4 +114,24 @@ public function deleteEventTour($id)
 
         return response()->json(null, 204);
     }
+
+    public function getEventsByTourId($id)
+    {
+        $eventTours = EventTour::where('tour_id', $id)->get();
+        $events = [];
+
+        foreach ($eventTours as $eventTour)
+        {
+            $event = Event::where('id', $eventTour->event_id)->get();
+            $location = Location::where('id', $event[0]->trigger['data']['location_id'])->get();
+            $question = Question::where('id', $event[0]->action['data']['question_id'])->with('answers')->get();
+
+            $event[0]->location = $location[0];
+            $event[0]->question = $question[0];
+
+            array_push($events, $event);
+        }
+
+        return response()->json($events, 200);
+    }
 }

intro_tour/routes/api.php

@@ -73,6 +73,7 @@
 /* Events */
 Route::get('events', 'EventController@index');
 Route::get('events/{id}', 'EventController@show');
+Route::get('events-by-tour/{id}', 'EventController@getEventsByTourId');
 Route::post('events', 'EventController@store');
 Route::post('event-tour', 'EventController@storeEventTour');
 Route::delete('event-tour/{id}', 'EventController@deleteEventTour');