Autocommit at 02.05.2022 @ 22:00

5 files changed, 8 insertions, 5 deletions

diff --git a/src/OrderedList/OrderedList.cpp b/List/OrderedList.cpp
index f3a7450..f3a7450 100644
--- a/src/OrderedList/OrderedList.cpp
+++ b/List/OrderedList.cpp
diff --git a/src/OrderedList/OrderedList.h b/List/OrderedList.h
index ef723ff..22f05df 100644
--- a/src/OrderedList/OrderedList.h
+++ b/List/OrderedList.h
@@ -1,7 +1,7 @@
 #ifndef HEADER_ORDEREDLIST
 #define HEADER_ORDEREDLIST
 
-#include "../List/List.h"
+#include "List.h"
 
 template <class T>
 class OrderedList : public List<T> {
diff --git a/src/EventSystem/Event.cpp b/src/EventSystem/Event.cpp
index f0a3f75..a6d0e95 100644
--- a/src/EventSystem/Event.cpp
+++ b/src/EventSystem/Event.cpp
@@ -36,9 +36,12 @@ StatusCode Event::buyTicket(const Ticket& ticket) {
 }
 
 StatusCode Event::buyTicketFromReservation(const Reservation& reservation, const char* password) {
-	if (!reservations.contain(reservation)) return E_ReservationDoesNotExist;
+	unsigned resInd = reservations.findIndex(reservation);
+	if (resInd == reservations.get_count()) return E_ReservationDoesNotExist;
 
 	if (!reservation.checkPassword(password)) return E_WrongReservationPassword;
 
-	reservations.removeAt
+	reservations.removeAt(resInd);
+	tickets.insert(reservation.get_ticket());
+	return Success;
 }
diff --git a/src/EventSystem/Event.h b/src/EventSystem/Event.h
index fa1169a..ad3ae89 100644
--- a/src/EventSystem/Event.h
+++ b/src/EventSystem/Event.h
@@ -1,7 +1,7 @@
 #ifndef HEADER_EVENTSYSTEM_EVENT
 #define HEADER_EVENTSYSTEM_EVENT
 
-#include "../OrderedList/OrderedList.h"
+#include "../List/OrderedList.h"
 #include "../DateTime/DateTime.h"
 #include "../String/String.h"
 #include "../Venue/Hall.h"
diff --git a/src/EventSystem/EventSystem.h b/src/EventSystem/EventSystem.h
index a38ab2b..9492b09 100644
--- a/src/EventSystem/EventSystem.h
+++ b/src/EventSystem/EventSystem.h
@@ -1,7 +1,7 @@
 #ifndef HEADER_EVENTSYSTEM
 #define HEADER_EVENTSYSTEM
 
-#include "../List/List.h"
+#include "../List/OrderedList.h"
 #include "../DateTime/DateTime.h"
 
 #include "Event.h"