Autocommit at 07.05.2022 @ 19:49

2 files changed, 12 insertions, 9 deletions

diff --git a/src/Models/Event.cpp b/src/Models/Event.cpp
index b2b1e01..c1f7343 100644
--- a/src/Models/Event.cpp
+++ b/src/Models/Event.cpp
@@ -52,16 +52,17 @@ int Event::compare(const Event& other) {
 }
 
 std::istream& operator>>(std::istream& istr, Event& event) {
-	return istr >> event.hall >> event.name >> event.date >> event.tickets >> event.reservations;
+	return istr >> event.get_hall() >> event.get_name() >> event.get_date() >> event.get_tickets() >> event.get_reservations();
 }
+
 std::ostream& operator<<(std::ostream& ostr, const Event& event) {
-	ostr << "Hall: " << event.hall << " Name: " << event.name << " Date: " << event.date << std::endl;
+	ostr << "Hall: " << event.get_hall() << " Name: " << event.get_name() << " Date: " << event.get_date() << std::endl;
 
 	ostr << "Bought tickets: ";
-	for (unsigned i = 0; i < event.tickets.get_count(); i++)
-		ostr << event.tickets[i] << " ";
+	for (unsigned i = 0; i < event.get_tickets().get_count(); i++)
+		ostr << event.get_tickets()[i] << " ";
 	ostr << std::endl << "Reserved tickets: ";
-	for (unsigned i = 0; i < event.reservations.get_count(); i++)
-		ostr << event.reservations[i] << " ";
+	for (unsigned i = 0; i < event.get_reservations().get_count(); i++)
+		ostr << event.get_reservations()[i] << " ";
 	return ostr << std::endl;
 }
diff --git a/src/Models/Event.h b/src/Models/Event.h
index 280f24c..4257c1f 100644
--- a/src/Models/Event.h
+++ b/src/Models/Event.h
@@ -25,15 +25,17 @@ public:
 	const String& get_name() const;
 	const Date& get_date() const;
 	OrderedList<Ticket>& get_tickets();
+	const OrderedList<Ticket>& get_tickets() const;
 	OrderedList<Reservation>& get_reservations();
+	const OrderedList<Reservation>& get_reservations() const;
 
 	void write(std::ostream& ostr);
 	void read(std::istream& istr);
 
 	int compare(const Event& other);
-
-	friend std::istream& operator>>(std::istream& istr, Event& event);
-	friend std::ostream& operator<<(std::ostream& ostr, const Event& event);
 };
 
+std::istream& operator>>(std::istream& istr, Event& event);
+std::ostream& operator<<(std::ostream& ostr, const Event& event);
+
 #endif