From e3883be7106e667322d51e35aa124ee7298125cb Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 7 May 2022 16:08:36 +0300 Subject: Autocommit at 07.05.2022 @ 16:08 --- src/Generic/List/List.hpp | 60 +++++++++++++++++++++++-------------------- src/Services/EventService.cpp | 11 ++++++-- src/Services/StatusCode.h | 1 + 3 files changed, 42 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/Generic/List/List.hpp b/src/Generic/List/List.hpp index 2569380..7bbc835 100644 --- a/src/Generic/List/List.hpp +++ b/src/Generic/List/List.hpp @@ -27,9 +27,6 @@ public: List& operator+=(const List other); - std::istream& read(std::istream& istr); - std::ostream& write(std::ostream& ostr) const; - unsigned get_length() const; unsigned get_count() const; @@ -42,6 +39,11 @@ public: List& operator=(List&& other); }; +template +std::istream& operator>>(std::istream& istr, List& obj); +template +std::ostream& operator<<(std::ostream& ostr, const List& obj); + /* Private */ template @@ -141,31 +143,6 @@ List& List::operator+=(const List other) { return *this; } -template -std::istream& List::read(std::istream& istr) { - istr.read((char*)&length, sizeof(length)); - istr.read((char*)&count, sizeof(count)); - - delete[] elements; - elements = new T[length]; - - for (int i = 0; i < count; i++) - elements[i].read(istr); // disgusting - - return istr; -} - -template -std::ostream& List::write(std::ostream& ostr) const { - ostr.write((const char*)&length, sizeof(length)); - ostr.write((const char*)&count, sizeof(count)); - - for (int i = 0; i < count; i++) - elements[i].write(ostr); // disgusting - - return ostr; -} - template unsigned List::get_length() const { return length; @@ -222,4 +199,31 @@ List& List::operator=(List&& other) { return *this; } +/* Other */ + +template +std::istream& operator>>(std::istream& istr, List& obj) { + istr.read((char*)&length, sizeof(length)); + istr.read((char*)&count, sizeof(count)); + + delete[] elements; + elements = new T[length]; + + for (int i = 0; i < count; i++) + elements[i].read(istr); // disgusting + + return istr; +} + +template +std::ostream& operator<<(std::ostream& ostr, const List& obj) { + ostr.write((const char*)&length, sizeof(length)); + ostr.write((const char*)&count, sizeof(count)); + + for (int i = 0; i < count; i++) + elements[i].write(ostr); // disgusting + + return ostr; +} + #endif diff --git a/src/Services/EventService.cpp b/src/Services/EventService.cpp index 26c9bb6..926aadf 100644 --- a/src/Services/EventService.cpp +++ b/src/Services/EventService.cpp @@ -173,7 +173,7 @@ bool cond_event_date(const Event& e, const Date& date) { } StatusCode EventService::reportReservations(const char* name, const Date& date) { - List result; + List result; bool (*cond_name)(const Event&, const char*) = cond_event_name; bool (*cond_date)(const Event&, const Date&) = cond_event_date; @@ -182,8 +182,15 @@ StatusCode EventService::reportReservations(const char* name, const Date& date) for (unsigned i = 0; i < events.get_count(); i++) { if (cond_name(events[i], name) && cond_date(events[i], date)) - result += events[i].get_reservations(); + result.add(events[i]); } + std::ofstream outFile("report.txt"); + if (!outFile.is_open()) + return E_FileCouldNotBeOpened; + outFile << result; + outFile.close(); + + return Success; } diff --git a/src/Services/StatusCode.h b/src/Services/StatusCode.h index a1eaa17..79c9a7e 100644 --- a/src/Services/StatusCode.h +++ b/src/Services/StatusCode.h @@ -10,6 +10,7 @@ enum StatusCode { E_Generic, E_DoesntExist, + E_FileCouldNotBeOpened, E_HallDoesntExist, -- cgit v1.3.1-26-gb76a