diff --git a/config/config.example.toml b/config/config.example.toml index 7631fc6..2f830f3 100644 --- a/config/config.example.toml +++ b/config/config.example.toml @@ -19,12 +19,6 @@ username="" password="" -[seating] - # SeatID -> Category - A01 = "NORMAL" - A02 = "NORMAL" - C01 = "LUXUS" - [tickets] [tickets."NORMAL"] total_tickets=30 diff --git a/src/ez_lan_manager/__init__.py b/src/ez_lan_manager/__init__.py index 76fd5b7..8cf15b7 100644 --- a/src/ez_lan_manager/__init__.py +++ b/src/ez_lan_manager/__init__.py @@ -25,7 +25,7 @@ def init_services() -> tuple[AccountingService, CateringService, ConfigurationSe news_service = NewsService(db_service) mailing_service = MailingService(configuration_service) ticketing_service = TicketingService(configuration_service.get_ticket_info(), db_service, accounting_service) - seating_service = SeatingService(configuration_service.get_seating_configuration(), configuration_service.get_lan_info(), db_service, ticketing_service) + seating_service = SeatingService(configuration_service.get_lan_info(), db_service, ticketing_service) catering_service = CateringService(db_service, accounting_service, user_service) local_data_service = LocalDataService() diff --git a/src/ez_lan_manager/services/ConfigurationService.py b/src/ez_lan_manager/services/ConfigurationService.py index 2700131..a46513c 100644 --- a/src/ez_lan_manager/services/ConfigurationService.py +++ b/src/ez_lan_manager/services/ConfigurationService.py @@ -71,15 +71,6 @@ class ConfigurationService: logger.fatal("Error loading LAN Info, exiting...") sys.exit(1) - def get_seating_configuration(self) -> SeatingConfiguration: - try: - return SeatingConfiguration( - seats=self._config["seating"] - ) - except KeyError: - logger.fatal("Error loading seating configuration, exiting...") - sys.exit(1) - def get_ticket_info(self) -> tuple[TicketInfo, ...]: try: return tuple([TicketInfo( diff --git a/src/ez_lan_manager/services/SeatingService.py b/src/ez_lan_manager/services/SeatingService.py index d323c36..2a4f90e 100644 --- a/src/ez_lan_manager/services/SeatingService.py +++ b/src/ez_lan_manager/services/SeatingService.py @@ -22,8 +22,7 @@ class SeatAlreadyTakenError(Exception): pass class SeatingService: - def __init__(self, seating_configuration: SeatingConfiguration, lan_info: LanInfo, db_service: DatabaseService, ticketing_service: TicketingService) -> None: - self._seating_configuration = seating_configuration + def __init__(self, lan_info: LanInfo, db_service: DatabaseService, ticketing_service: TicketingService) -> None: self._lan_info = lan_info self._db_service = db_service self._ticketing_service = ticketing_service