From dc13118c73b1fe6b54892c5e0584a97707e12b2d Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 7 May 2022 09:07:00 +0300 Subject: Autocommit at 07.05.2022 @ 09:07 --- src/Models/Reservation.cpp | 9 +-- src/Models/Reservation.h | 1 - src/Services/EventService.cpp | 127 ++++++++++++++++++++++++++++++++++++++++++ src/Services/EventService.h | 46 +++++++++++++++ src/Services/EventSystem.cpp | 127 ------------------------------------------ src/Services/EventSystem.h | 46 --------------- src/main.cpp | 5 +- 7 files changed, 177 insertions(+), 184 deletions(-) create mode 100644 src/Services/EventService.cpp create mode 100644 src/Services/EventService.h delete mode 100644 src/Services/EventSystem.cpp delete mode 100644 src/Services/EventSystem.h (limited to 'src') diff --git a/src/Models/Reservation.cpp b/src/Models/Reservation.cpp index 26278b2..50febd3 100644 --- a/src/Models/Reservation.cpp +++ b/src/Models/Reservation.cpp @@ -1,6 +1,5 @@ #include "Reservation.h" #include -#include Reservation::Reservation() : Reservation(Ticket(), "", "") {} @@ -8,12 +7,8 @@ Reservation::Reservation(const Ticket& ticket) : Reservation(ticket, "", "") {} Reservation::Reservation(const Ticket& ticket, const char* password, const char* note) { this->ticket = ticket; - strcpy(this->password, password); - strcpy(this->note, note); -} - -bool Reservation::validPassword(const char* password) const { - return !strcmp(this->password, password); + strncpy(this->password, password, PASSWORD_LEN); + strncpy(this->note, note, NOTE_LEN); } const Ticket& Reservation::get_ticket() const { diff --git a/src/Models/Reservation.h b/src/Models/Reservation.h index 1a415b5..936b6b5 100644 --- a/src/Models/Reservation.h +++ b/src/Models/Reservation.h @@ -18,7 +18,6 @@ public: Reservation(const Ticket& ticket); Reservation(const Ticket& ticket, const char* password, const char* note); - bool validPassword(const char* password) const; const Ticket& get_ticket() const; void read(std::istream& istr); diff --git a/src/Services/EventService.cpp b/src/Services/EventService.cpp new file mode 100644 index 0000000..95bd1c4 --- /dev/null +++ b/src/Services/EventService.cpp @@ -0,0 +1,127 @@ +#include "EventSystem.h" +#include "StatusCodes.h" + +/* Private */ + +void EventSystem::updateSoonestUpcoming() { + +} + +unsigned EventSystem::indexOfEvent(const Date& date) { + // TODO: make binary search + for (unsigned i = indSoonestUpcoming; i < events.get_count(); i++) { + if (events[i].get_date().compare(date) == 0) + return i; + } + return events.get_count(); +} + +unsigned EventSystem::indexOfEvent(const char* name, const Date& date) { + unsigned ind = indexOfEvent(date); + if (ind < events.get_count() && events[ind].get_name().compare(name) == 0) + return ind; + return events.get_count(); +} + +/* Public */ + +EventSystem::EventSystem() { + events = OrderedList(); + indSoonestUpcoming = 0; +} + +EventSystem::EventSystem(const Event* events, unsigned eventCount) { + this->events = OrderedList(events, eventCount); + indSoonestUpcoming = 0; + updateSoonestUpcoming(); +} + +StatusCode EventSystem::createEvent(const Hall* hall, String name, Date date) { + if (indexOfEvent(date) < events.get_count()) + return E_EventWillOverlap; + + events.insert(Event(hall, name, date)); + return Success; +} + +StatusCode EventSystem::cancelEvent(const char* name, const Date& date) { + unsigned ind = indexOfEvent(name, date); + if (ind == events.get_count()) + return E_EventDoesNotExist; + + events.removeAt(ind); + return Success; +} + +StatusCode EventSystem::reserveTicket(const char* name, const Date& date, const char* password, const char* note, unsigned seatRow, unsigned seatColumn) { + return reserveTicket(name, date, password, note, Ticket(seatRow, seatColumn)); +} + +StatusCode EventSystem::reserveTicket(const char* name, const Date& date, const char* password, const char* note, const Ticket& ticket) { + unsigned ind = indexOfEvent(name, date); + if (ind == events.get_count()) + return E_EventDoesNotExist; + + return events[ind].reserveTicket(ticket, password, note); +} + +StatusCode EventSystem::cancelTicketReservation(const char* name, const Date& date, unsigned seatRow, unsigned seatColumn) { + return cancelTicketReservation(name, date, Ticket(seatRow, seatColumn)); +} + +StatusCode EventSystem::cancelTicketReservation(const char* name, const Date& date, const Ticket& ticket) { + unsigned ind = indexOfEvent(name, date); + if (ind == events.get_count()) + return E_EventDoesNotExist; + + return events[ind].cancelReservation(ticket); +} + +StatusCode EventSystem::buyTicket(const char* name, const Date& date, unsigned row, unsigned seat) { + return buyTicket(name, date, Ticket(row, seat)); +} + +StatusCode EventSystem::buyTicket(const char* name, const Date& date, const Ticket& ticket) { + unsigned ind = indexOfEvent(name, date); + if (ind == events.get_count()) + return E_EventDoesNotExist; + + return events[ind].buyTicket(ticket); +} + +StatusCode EventSystem::buyTicket(const char* name, const Date& date, unsigned row, unsigned seat, const char* password) { + return buyTicket(name, date, Ticket(row, seat), password); +} + +StatusCode EventSystem::buyTicket(const char* name, const Date& date, const Ticket& ticket, const char* password) { + unsigned ind = indexOfEvent(name, date); + if (ind == events.get_count()) + return E_EventDoesNotExist; + + return events[ind].buyTicketFromReservation(Reservation(ticket), password); +} + + +const Hall* EventSystem::queryEventHall(const char* name, const Date& date) { + unsigned ind = indexOfEvent(name, date); + if (ind == events.get_count()) + return nullptr; + + return &events[ind].get_hall(); +} + +OrderedList EventSystem::queryTickets(const char* name, const Date& date) { + unsigned ind = indexOfEvent(name, date); + if (ind == events.get_count()) + return OrderedList(); + + return events[ind].get_tickets(); +} + +OrderedList EventSystem::queryReservations(const char* name, const Date& date) { + unsigned ind = indexOfEvent(name, date); + if (ind == events.get_count()) + return OrderedList(); + + return events[ind].get_reservations(); +} diff --git a/src/Services/EventService.h b/src/Services/EventService.h new file mode 100644 index 0000000..4eeac61 --- /dev/null +++ b/src/Services/EventService.h @@ -0,0 +1,46 @@ +#ifndef HEADER_EVENTSYSTEM +#define HEADER_EVENTSYSTEM + +#include "../List/OrderedList.hpp" +#include "../Date/Date.h" + +#include "Event.h" +#include "StatusCodes.h" + +class EventSystem { + OrderedList events; + unsigned indSoonestUpcoming; + + void updateSoonestUpcoming(); + unsigned indexOfEvent(const Date& date); + unsigned indexOfEvent(const char* name, const Date& date); + +public: + EventSystem(); + EventSystem(const Event* events, unsigned eventCount); + + StatusCode createEvent(const Hall* hall, String name, Date date); + StatusCode cancelEvent(const char* name, const Date& date); + + StatusCode reserveTicket(const char* name, const Date& date, const char* password, const char* note, unsigned seatRow, unsigned seatColumn); + StatusCode reserveTicket(const char* name, const Date& date, const char* password, const char* note, const Ticket& ticket); + + StatusCode cancelTicketReservation(const char* name, const Date& date, unsigned seatRow, unsigned seatColumn); + StatusCode cancelTicketReservation(const char* name, const Date& date, const Ticket& ticket); + + StatusCode buyTicket(const char* name, const Date& date, unsigned row, unsigned seat); + StatusCode buyTicket(const char* name, const Date& date, const Ticket& ticket); + StatusCode buyTicket(const char* name, const Date& date, unsigned row, unsigned seat, const char* password); + StatusCode buyTicket(const char* name, const Date& date, const Ticket& ticket, const char* password); + + const Hall* queryEventHall(const char* name, const Date& date); + OrderedList queryTickets(const char* name, const Date& date); + OrderedList queryReservations(const char* name, const Date& date); + + void queryMostVisited(); + void queryInsufficientlyVisited(); + void reportBoughtTickets(Date start, Date end, unsigned hall); + void reportReservations(unsigned eventIndex); +}; + +#endif diff --git a/src/Services/EventSystem.cpp b/src/Services/EventSystem.cpp deleted file mode 100644 index 95bd1c4..0000000 --- a/src/Services/EventSystem.cpp +++ /dev/null @@ -1,127 +0,0 @@ -#include "EventSystem.h" -#include "StatusCodes.h" - -/* Private */ - -void EventSystem::updateSoonestUpcoming() { - -} - -unsigned EventSystem::indexOfEvent(const Date& date) { - // TODO: make binary search - for (unsigned i = indSoonestUpcoming; i < events.get_count(); i++) { - if (events[i].get_date().compare(date) == 0) - return i; - } - return events.get_count(); -} - -unsigned EventSystem::indexOfEvent(const char* name, const Date& date) { - unsigned ind = indexOfEvent(date); - if (ind < events.get_count() && events[ind].get_name().compare(name) == 0) - return ind; - return events.get_count(); -} - -/* Public */ - -EventSystem::EventSystem() { - events = OrderedList(); - indSoonestUpcoming = 0; -} - -EventSystem::EventSystem(const Event* events, unsigned eventCount) { - this->events = OrderedList(events, eventCount); - indSoonestUpcoming = 0; - updateSoonestUpcoming(); -} - -StatusCode EventSystem::createEvent(const Hall* hall, String name, Date date) { - if (indexOfEvent(date) < events.get_count()) - return E_EventWillOverlap; - - events.insert(Event(hall, name, date)); - return Success; -} - -StatusCode EventSystem::cancelEvent(const char* name, const Date& date) { - unsigned ind = indexOfEvent(name, date); - if (ind == events.get_count()) - return E_EventDoesNotExist; - - events.removeAt(ind); - return Success; -} - -StatusCode EventSystem::reserveTicket(const char* name, const Date& date, const char* password, const char* note, unsigned seatRow, unsigned seatColumn) { - return reserveTicket(name, date, password, note, Ticket(seatRow, seatColumn)); -} - -StatusCode EventSystem::reserveTicket(const char* name, const Date& date, const char* password, const char* note, const Ticket& ticket) { - unsigned ind = indexOfEvent(name, date); - if (ind == events.get_count()) - return E_EventDoesNotExist; - - return events[ind].reserveTicket(ticket, password, note); -} - -StatusCode EventSystem::cancelTicketReservation(const char* name, const Date& date, unsigned seatRow, unsigned seatColumn) { - return cancelTicketReservation(name, date, Ticket(seatRow, seatColumn)); -} - -StatusCode EventSystem::cancelTicketReservation(const char* name, const Date& date, const Ticket& ticket) { - unsigned ind = indexOfEvent(name, date); - if (ind == events.get_count()) - return E_EventDoesNotExist; - - return events[ind].cancelReservation(ticket); -} - -StatusCode EventSystem::buyTicket(const char* name, const Date& date, unsigned row, unsigned seat) { - return buyTicket(name, date, Ticket(row, seat)); -} - -StatusCode EventSystem::buyTicket(const char* name, const Date& date, const Ticket& ticket) { - unsigned ind = indexOfEvent(name, date); - if (ind == events.get_count()) - return E_EventDoesNotExist; - - return events[ind].buyTicket(ticket); -} - -StatusCode EventSystem::buyTicket(const char* name, const Date& date, unsigned row, unsigned seat, const char* password) { - return buyTicket(name, date, Ticket(row, seat), password); -} - -StatusCode EventSystem::buyTicket(const char* name, const Date& date, const Ticket& ticket, const char* password) { - unsigned ind = indexOfEvent(name, date); - if (ind == events.get_count()) - return E_EventDoesNotExist; - - return events[ind].buyTicketFromReservation(Reservation(ticket), password); -} - - -const Hall* EventSystem::queryEventHall(const char* name, const Date& date) { - unsigned ind = indexOfEvent(name, date); - if (ind == events.get_count()) - return nullptr; - - return &events[ind].get_hall(); -} - -OrderedList EventSystem::queryTickets(const char* name, const Date& date) { - unsigned ind = indexOfEvent(name, date); - if (ind == events.get_count()) - return OrderedList(); - - return events[ind].get_tickets(); -} - -OrderedList EventSystem::queryReservations(const char* name, const Date& date) { - unsigned ind = indexOfEvent(name, date); - if (ind == events.get_count()) - return OrderedList(); - - return events[ind].get_reservations(); -} diff --git a/src/Services/EventSystem.h b/src/Services/EventSystem.h deleted file mode 100644 index 4eeac61..0000000 --- a/src/Services/EventSystem.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef HEADER_EVENTSYSTEM -#define HEADER_EVENTSYSTEM - -#include "../List/OrderedList.hpp" -#include "../Date/Date.h" - -#include "Event.h" -#include "StatusCodes.h" - -class EventSystem { - OrderedList events; - unsigned indSoonestUpcoming; - - void updateSoonestUpcoming(); - unsigned indexOfEvent(const Date& date); - unsigned indexOfEvent(const char* name, const Date& date); - -public: - EventSystem(); - EventSystem(const Event* events, unsigned eventCount); - - StatusCode createEvent(const Hall* hall, String name, Date date); - StatusCode cancelEvent(const char* name, const Date& date); - - StatusCode reserveTicket(const char* name, const Date& date, const char* password, const char* note, unsigned seatRow, unsigned seatColumn); - StatusCode reserveTicket(const char* name, const Date& date, const char* password, const char* note, const Ticket& ticket); - - StatusCode cancelTicketReservation(const char* name, const Date& date, unsigned seatRow, unsigned seatColumn); - StatusCode cancelTicketReservation(const char* name, const Date& date, const Ticket& ticket); - - StatusCode buyTicket(const char* name, const Date& date, unsigned row, unsigned seat); - StatusCode buyTicket(const char* name, const Date& date, const Ticket& ticket); - StatusCode buyTicket(const char* name, const Date& date, unsigned row, unsigned seat, const char* password); - StatusCode buyTicket(const char* name, const Date& date, const Ticket& ticket, const char* password); - - const Hall* queryEventHall(const char* name, const Date& date); - OrderedList queryTickets(const char* name, const Date& date); - OrderedList queryReservations(const char* name, const Date& date); - - void queryMostVisited(); - void queryInsufficientlyVisited(); - void reportBoughtTickets(Date start, Date end, unsigned hall); - void reportReservations(unsigned eventIndex); -}; - -#endif diff --git a/src/main.cpp b/src/main.cpp index 8575d3b..ca47c56 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,5 @@ -#include "VenueConsoleUI.h" -#include "Venue/Venue.h" -#include "Venue/Hall.h" +#include "UserInterface/VenueConsoleUI.h" +#include "Models/Hall.h" int main() { Hall myVenueHalls[] = { Hall(1, 20, 30), Hall(2, 15, 15), Hall(3, 10, 20) }; -- cgit v1.3.1-26-gb76a