Autocommit at 06.05.2022 @ 11:41

3 files changed, 7 insertions, 2 deletions

diff --git a/src/Venue/Venue.cpp b/src/Venue/Venue.cpp
index 3185d7b..01c6a95 100644
--- a/src/Venue/Venue.cpp
+++ b/src/Venue/Venue.cpp
@@ -12,7 +12,7 @@ Venue::Venue(const Hall* halls, unsigned hallCount, const EventSystem& es) {
 }
 
 bool Venue::hallExists(unsigned hallIndex) const {
-	return hallIndex < halls.get_count();
+	return halls.contain(Hall(hallIndex, 0, 0));
 }
 
 bool Venue::hallExists(const Hall& hall) const {
@@ -23,6 +23,10 @@ const List<Hall>& Venue::get_halls() const {
 	return this->halls;
 }
 
+const Hall& Venue::getHall(unsigned hallIndex) const {
+	return this->halls[this->halls.findIndex(Hall(hallIndex, 0, 0))];
+}
+
 EventSystem& Venue::get_es() {
 	return this->es;
 }
diff --git a/src/Venue/Venue.h b/src/Venue/Venue.h
index 2f39bbc..8c0f53e 100644
--- a/src/Venue/Venue.h
+++ b/src/Venue/Venue.h
@@ -18,6 +18,7 @@ public:
 	bool hallExists(const Hall& hall) const;
 
 	const List<Hall>& get_halls() const;
+	const Hall& getHall(unsigned hallIndex) const;
 	EventSystem& get_es();
 };
 
diff --git a/src/VenueConsoleUI.cpp b/src/VenueConsoleUI.cpp
index af02425..94615c3 100644
--- a/src/VenueConsoleUI.cpp
+++ b/src/VenueConsoleUI.cpp
@@ -130,7 +130,7 @@ void command_createEvent() {
 	Date date;
 	inputBox("Enter event date: ", &date);
 	
-	handleStatusCode(v->get_es().createEvent(&v->get_halls()[hallIndex], name, date), eventManagementMenu);
+	handleStatusCode(v->get_es().createEvent(&v->getHall(hallIndex), name, date), eventManagementMenu);
 }
 
 void command_cancelEvent() {