From 9e45915834de0ac752b08c84495a2c4010253972 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 14 Feb 2021 13:29:44 +0100 Subject: [PATCH 1/8] Update Add persistence into ticket --- .../app/datamapper/ProjectionDataMapper.java | 18 +++---- .../app/datamapper/SeatDataMapper.java | 4 +- .../app/datamapper/TicketDataMapper.java | 15 ++---- .../ttbmp/cinehub/app/dto/ProjectionDto.java | 49 +++++++++++++++---- .../com/ttbmp/cinehub/app/dto/SeatDto.java | 12 ++++- .../com/ttbmp/cinehub/app/dto/TicketDto.java | 40 ++++++++++++--- .../projection/MockProjectionRepository.java | 9 +++- .../projection/ProjectionRepository.java | 3 +- .../repository/seat/MockSeatRepository.java | 48 ++++++++++++++---- .../app/repository/seat/SeatProxy.java | 4 +- .../app/repository/seat/SeatRepository.java | 2 + .../ticket/MockTicketRepository.java | 23 +++++---- .../app/repository/ticket/TicketProxy.java | 24 ++++++++- .../repository/ticket/TicketRepository.java | 4 +- .../buyticket/BuyTicketController.java | 41 +++++++--------- .../usecase/buyticket/BuyTicketHandler.java | 6 +-- .../usecase/buyticket/BuyTicketPresenter.java | 2 +- .../usecase/buyticket/BuyTicketUseCase.java | 4 +- ...Request.java => GetProjectionRequest.java} | 4 +- .../usecase/buyticket/request/PayRequest.java | 40 ++++++++++++++- .../com/ttbmp/cinehub/domain/Payment.java | 4 +- .../com/ttbmp/cinehub/domain/Projection.java | 4 ++ .../java/com/ttbmp/cinehub/domain/Seat.java | 12 ++++- .../domain/ticket/component/Ticket.java | 37 +++++++++----- .../ticket/component/TicketAbstract.java | 30 ------------ .../ticket/decorator/TicketDecorator.java | 13 ++--- .../decorator/TicketFoldingArmchair.java | 6 +-- .../decorator/TicketHeatedArmchair.java | 6 +-- .../ticket/decorator/TicketSkipLine.java | 6 +-- .../buyticket/BuyTicketPresenterFx.java | 10 ++-- .../desktop/buyticket/BuyTicketViewModel.java | 2 +- .../ChooseCinemaViewController.java | 4 +- .../ChooseProjectionItemViewController.java | 20 -------- .../chooseseat/SeatsMatrixViewController.java | 36 ++++++++++---- .../payment/PaymentViewController.java | 10 ++-- .../buy_ticket/projection_list_item.fxml | 30 ------------ 36 files changed, 351 insertions(+), 231 deletions(-) rename app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/{GetTimeOfProjectionRequest.java => GetProjectionRequest.java} (89%) delete mode 100644 domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/TicketAbstract.java diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java index a27afdbf..c9b6ad82 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java @@ -2,11 +2,8 @@ import com.ttbmp.cinehub.app.dto.ProjectionDto; import com.ttbmp.cinehub.app.utilities.DataMapperHelper; -import com.ttbmp.cinehub.domain.CreditCard; import com.ttbmp.cinehub.domain.Projection; -import com.ttbmp.cinehub.domain.employee.Projectionist; -import java.util.ArrayList; import java.util.List; /** @@ -23,22 +20,23 @@ public static ProjectionDto mapToDto(Projection projection) { CinemaDataMapper.mapToDto(projection.getCinema()), HallDataMapper.mapToDto(projection.getHall()), projection.getStartTime(), - projection.getDate() - ); + projection.getDate(), + TicketDataMapper.mapToDtoList(projection.getTicketList()), + projection.getId(), + projection.getProjectionist() + ); } public static Projection mapToEntity(ProjectionDto projectionDto) { return new Projection( - 0, + projectionDto.getId(), projectionDto.getDate(), projectionDto.getStartTime(), MovieDataMapper.mapToEntity(projectionDto.getMovieDto()), HallDataMapper.mapToEntity(projectionDto.getHallDto()), CinemaDataMapper.mapToEntity(projectionDto.getCinemaDto()), - new Projectionist( - "", "", "", "", new CreditCard(0, "", 0, ""), - CinemaDataMapper.mapToEntity(projectionDto.getCinemaDto())), - new ArrayList<>() + projectionDto.getProjectionist(), + TicketDataMapper.mapToEntityList(projectionDto.getListTicket()) ); } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java index 7bc3212f..d6431a78 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java @@ -14,11 +14,11 @@ private SeatDataMapper() { } public static SeatDto mapToDto(Seat seat) { - return new SeatDto(seat.getId(), seat.getPrice(), true); + return new SeatDto(seat.getId(), seat.getPrice(), true, seat.getPosition()); } public static Seat mapToEntity(SeatDto seatDto) { - return new Seat(seatDto.getId(), seatDto.getPrice(), seatDto.getState()); + return new Seat(seatDto.getId(), seatDto.getPrice(), seatDto.getState(),seatDto.getPosition()); } public static List mapToDtoList(List seatList) { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java index ce609db8..aac4a8b0 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java @@ -4,7 +4,6 @@ import com.ttbmp.cinehub.app.dto.TicketDto; import com.ttbmp.cinehub.app.utilities.DataMapperHelper; import com.ttbmp.cinehub.domain.ticket.component.Ticket; -import com.ttbmp.cinehub.domain.ticket.component.TicketAbstract; import java.util.List; @@ -16,24 +15,20 @@ public class TicketDataMapper { private TicketDataMapper() { } - public static TicketDto mapToDto(TicketAbstract ticketAbstract) { - TicketDto ticketDto = new TicketDto(ticketAbstract.getPrice()); - ticketDto.setPosition(ticketAbstract.getPosition()); - return ticketDto; + public static TicketDto mapToDto(Ticket ticket) { + return new TicketDto(ticket.getId(),ticket.getPrice(),ticket.getOwner(),SeatDataMapper.mapToDto(ticket.getSeat())); } public static Ticket mapToEntity(TicketDto ticketDto) { - Ticket ticket = new Ticket(ticketDto.getPrice()); - ticket.setPosition(ticketDto.getPosition()); - return ticket; + return new Ticket(ticketDto.getId(),ticketDto.getPrice(),ticketDto.getOwner(),SeatDataMapper.mapToEntity(ticketDto.getSeatDto())); } public static List mapToDtoList(List ticketList) { return DataMapperHelper.mapList(ticketList, TicketDataMapper::mapToDto); } - public static List mapToEntityList(List ticketDtos) { - return DataMapperHelper.mapList(ticketDtos, TicketDataMapper::mapToEntity); + public static List mapToEntityList(List ticketDto) { + return DataMapperHelper.mapList(ticketDto, TicketDataMapper::mapToEntity); } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java index d1d6afcb..cdb90324 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java @@ -1,5 +1,7 @@ package com.ttbmp.cinehub.app.dto; +import com.ttbmp.cinehub.domain.employee.Projectionist; + import java.util.List; /** @@ -7,27 +9,56 @@ */ public class ProjectionDto { + private int id; + private String date; private final String startTime; + private MovieDto movieDto; private final HallDto hallDto; private CinemaDto cinemaDto; - private MovieDto movieDto; - private List ticketBasicList; - private String date; - - public ProjectionDto(MovieDto movie, CinemaDto cinema, HallDto hall, String startTime, String date) { + private Projectionist projectionist; + private List listTicket; + + public ProjectionDto(MovieDto movie, + CinemaDto cinema, + HallDto hall, + String startTime, + String date, + List listTicket, + int id, + Projectionist projectionist + ) { + this.id = id; + this.projectionist = projectionist; this.movieDto = movie; this.cinemaDto = cinema; this.hallDto = hall; this.startTime = startTime; this.date = date; + this.listTicket = listTicket; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Projectionist getProjectionist() { + return projectionist; + } + + public void setProjectionist(Projectionist projectionist) { + this.projectionist = projectionist; } - public List getTicketBasicList() { - return ticketBasicList; + public List getListTicket() { + return listTicket; } - public void setTicketBasicList(List ticketBasicList) { - this.ticketBasicList = ticketBasicList; + public void setListTicket(List listTicket) { + this.listTicket = listTicket; } public String getStartTime() { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java index 9c32ebbd..65b6c0b3 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java @@ -8,11 +8,21 @@ public class SeatDto { private int id; private Long price; private Boolean state; + private String position; - public SeatDto(int id, Long price, Boolean state) { + public SeatDto(int id, Long price, Boolean state,String position) { this.id = id; this.price = price; this.state = state; + this.position = position; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; } public int getId() { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java index 7ad3b985..5a2afaca 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java @@ -1,17 +1,47 @@ package com.ttbmp.cinehub.app.dto; +import com.ttbmp.cinehub.domain.User; + /** * @author Palmieri Ivan */ public class TicketDto { private long price; - private String position; + private int id; + private User owner; + private SeatDto seatDto; - public TicketDto(long price) { + public TicketDto(int id,long price,User owner,SeatDto seatDto) { + this.id =id; + this.owner=owner; this.price = price; + this.seatDto = seatDto; + } + + public SeatDto getSeatDto() { + return seatDto; + } + + public void setSeatDto(SeatDto seatDto) { + this.seatDto = seatDto; + } + + public int getId() { + return id; } + public void setId(int id) { + this.id = id; + } + + public User getOwner() { + return owner; + } + + public void setOwner(User owner) { + this.owner = owner; + } public Long getPrice() { return price; @@ -25,12 +55,6 @@ public void setPrice(Long price) { this.price = price; } - public String getPosition() { - return position; - } - public void setPosition(String position) { - this.position = position; - } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/MockProjectionRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/MockProjectionRepository.java index 5be62236..425c0e22 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/MockProjectionRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/MockProjectionRepository.java @@ -11,10 +11,13 @@ import com.ttbmp.cinehub.app.repository.movie.MovieRepository; import com.ttbmp.cinehub.app.repository.shift.MockShiftRepository; import com.ttbmp.cinehub.app.repository.shift.projectionist.MockProjectionistShiftRepository; +import com.ttbmp.cinehub.app.repository.ticket.MockTicketRepository; import com.ttbmp.cinehub.app.repository.ticket.TicketRepository; +import com.ttbmp.cinehub.domain.Cinema; import com.ttbmp.cinehub.domain.Movie; import com.ttbmp.cinehub.domain.Projection; import com.ttbmp.cinehub.domain.shift.ProjectionistShift; +import com.ttbmp.cinehub.domain.ticket.component.Ticket; import java.time.LocalDate; import java.time.LocalTime; @@ -57,6 +60,7 @@ public class MockProjectionRepository implements ProjectionRepository { .map(MockShiftRepository.ShiftData::getEmployeeId) .collect(Collectors.toList()) .get(0); + PROJECTION_DATA_LIST.add(new ProjectionData( projectionIdCounter++, date.toString(), @@ -83,7 +87,7 @@ public static List getProjectionDataList() { } @Override - public List getProjectionList(CinemaDto cinema, MovieDto movie, String date) { + public List getProjectionList(Cinema cinema, Movie movie, String date) { return PROJECTION_DATA_LIST.stream() .filter(d -> d.cinemaId == cinema.getId() && d.movieId == movie.getId() && d.date.equals(date)) .map(d -> new ProjectionProxy( @@ -99,6 +103,7 @@ public List getProjectionList(CinemaDto cinema, MovieDto movie, Stri .collect(Collectors.toList()); } + @Override public List getProjectionList(String localDate) { return PROJECTION_DATA_LIST.stream() @@ -165,6 +170,7 @@ public static class ProjectionData { private int cinemaId; private String projectionistId; + public ProjectionData(int id, String date, String startTime, int movieId, int hallId, int cinemaId, String projectionistId) { this.id = id; this.date = date; @@ -173,6 +179,7 @@ public ProjectionData(int id, String date, String startTime, int movieId, int ha this.hallId = hallId; this.cinemaId = cinemaId; this.projectionistId = projectionistId; + } public int getId() { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java index 59f08593..7c357f2e 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java @@ -2,6 +2,7 @@ import com.ttbmp.cinehub.app.dto.CinemaDto; import com.ttbmp.cinehub.app.dto.MovieDto; +import com.ttbmp.cinehub.domain.Cinema; import com.ttbmp.cinehub.domain.Movie; import com.ttbmp.cinehub.domain.Projection; import com.ttbmp.cinehub.domain.shift.ProjectionistShift; @@ -13,7 +14,7 @@ */ public interface ProjectionRepository { - List getProjectionList(CinemaDto mapToDto, MovieDto mapToDto1, String date); + List getProjectionList(Cinema cinema, Movie movie, String date); List getProjectionList(String localDate); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/MockSeatRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/MockSeatRepository.java index ef988633..a8e3d856 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/MockSeatRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/MockSeatRepository.java @@ -1,8 +1,10 @@ package com.ttbmp.cinehub.app.repository.seat; import com.ttbmp.cinehub.app.repository.hall.MockHallRepository; +import com.ttbmp.cinehub.app.repository.ticket.MockTicketRepository; import com.ttbmp.cinehub.domain.Hall; import com.ttbmp.cinehub.domain.Seat; +import com.ttbmp.cinehub.domain.ticket.component.Ticket; import java.util.ArrayList; import java.util.List; @@ -13,7 +15,7 @@ */ public class MockSeatRepository implements SeatRepository { - private static final List SEAT_ENTITY_LIST = new ArrayList<>(); + private static final List SEAT_DATA_LIST = new ArrayList<>(); private static int seatIdCounter = 0; static { @@ -21,36 +23,62 @@ public class MockSeatRepository implements SeatRepository { .map(MockHallRepository.HallData::getId) .collect(Collectors.toList()); for (int hallId : hallIdList) { - for (int i = 0; i < 50 + 10 * (seatIdCounter % 3); i++, seatIdCounter++) { - SEAT_ENTITY_LIST.add(new SeatEntity(seatIdCounter, 5L + seatIdCounter % 3, seatIdCounter % 2 == 0, hallId)); + for (char c : new char[]{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'L'}) { + for (int i = 0; i < 7; i++) { + SEAT_DATA_LIST.add(new SeatData(seatIdCounter++, 5L + seatIdCounter % 3, seatIdCounter % 2 == 0, hallId, c + String.valueOf(i))); + } } } } - public static List getSeatEntityList() { - return SEAT_ENTITY_LIST; + public static List getSeatDataList() { + return SEAT_DATA_LIST; } @Override public List getSeatList(Hall hall) { - return SEAT_ENTITY_LIST.stream() - .filter(e -> e.hallId == hall.getId()) - .map(e -> new SeatProxy(e.id, e.price, e.state)) + return SEAT_DATA_LIST.stream() + .filter(d -> d.hallId == hall.getId()) + .map(d -> new SeatProxy(d.id, d.price, d.state, d.position)) .collect(Collectors.toList()); } - public static class SeatEntity { + @Override + public Seat getSeat(Ticket ticket) { + int ticketSeatId = MockTicketRepository.getTicketDataList().stream() + .filter(d -> d.getId() == ticket.getId()) + .map(MockTicketRepository.TicketData::getSeatId) + .collect(Collectors.toList()) + .get(0); + return SEAT_DATA_LIST.stream() + .filter(d -> d.id == ticketSeatId) + .map(d -> new SeatProxy(d.id, d.price, d.state, d.position)) + .collect(Collectors.toList()) + .get(0); + } + + public static class SeatData { private int id; private long price; private boolean state; private int hallId; + private String position; - public SeatEntity(int id, long price, boolean state, int hallId) { + public SeatData(int id, long price, boolean state, int hallId, String position) { this.id = id; this.price = price; this.state = state; this.hallId = hallId; + this.position = position; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; } public int getId() { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatProxy.java index 616c1b67..e187a7bd 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatProxy.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatProxy.java @@ -7,8 +7,8 @@ */ public class SeatProxy extends Seat { - public SeatProxy(int id, Long price, Boolean state) { - super(id, price, state); + public SeatProxy(int id, Long price, Boolean state,String position) { + super(id, price, state,position); } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatRepository.java index 3fef12b8..49baa2c5 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatRepository.java @@ -2,6 +2,7 @@ import com.ttbmp.cinehub.domain.Hall; import com.ttbmp.cinehub.domain.Seat; +import com.ttbmp.cinehub.domain.ticket.component.Ticket; import java.util.List; @@ -12,4 +13,5 @@ public interface SeatRepository { List getSeatList(Hall hall); + Seat getSeat(Ticket ticket); } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java index d8c95e74..089725ec 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java @@ -1,6 +1,7 @@ package com.ttbmp.cinehub.app.repository.ticket; import com.ttbmp.cinehub.app.di.ServiceLocator; +import com.ttbmp.cinehub.app.repository.seat.SeatRepository; import com.ttbmp.cinehub.app.repository.user.MockUserRepository; import com.ttbmp.cinehub.app.repository.user.UserRepository; import com.ttbmp.cinehub.domain.Projection; @@ -11,12 +12,12 @@ import java.util.stream.Collectors; /** - * @author Fabio Buracchi + * @author Fabio Buracchi and Palmieri Ivan */ public class MockTicketRepository implements TicketRepository { private static final List TICKET_DATA_LIST = new ArrayList<>(); - + private static int counterTicketId =0; static { List userIdList = MockUserRepository.getUserDataList().stream() .map(MockUserRepository.UserData::getId) @@ -35,17 +36,18 @@ public static List getTicketDataList() { } @Override - public void saveTicket(Ticket ticket) { - // TODO get seat and projection information + public void saveTicket(Ticket ticket, int projectionId) { TICKET_DATA_LIST.add(new TicketData( - ticket.getId(), + counterTicketId++, ticket.getPrice(), ticket.getOwner().getId(), - 0, - 0 + projectionId, + ticket.getSeat().getId() + )); } + @Override public List getTicketList(Projection projection) { return TICKET_DATA_LIST.stream() @@ -53,7 +55,8 @@ public List getTicketList(Projection projection) { .map(d -> new TicketProxy( d.id, d.price, - serviceLocator.getService(UserRepository.class) + serviceLocator.getService(UserRepository.class), + serviceLocator.getService(SeatRepository.class) )) .collect(Collectors.toList()); } @@ -71,9 +74,10 @@ public TicketData(int id, long price, String userId, int projectionId, int seatI this.price = price; this.userId = userId; this.projectionId = projectionId; - this.seatId = seatId; + this.seatId =seatId; } + public int getId() { return id; } @@ -113,7 +117,6 @@ public int getSeatId() { public void setSeatId(int seatId) { this.seatId = seatId; } - } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketProxy.java index 97d7aeb4..ee857356 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketProxy.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketProxy.java @@ -1,6 +1,8 @@ package com.ttbmp.cinehub.app.repository.ticket; +import com.ttbmp.cinehub.app.repository.seat.SeatRepository; import com.ttbmp.cinehub.app.repository.user.UserRepository; +import com.ttbmp.cinehub.domain.Seat; import com.ttbmp.cinehub.domain.User; import com.ttbmp.cinehub.domain.ticket.component.Ticket; @@ -12,12 +14,17 @@ public class TicketProxy extends Ticket { private final UserRepository userRepository; private boolean isUserLoaded = false; + private final SeatRepository seatRepository; + private boolean isSeatLoaded=false; - public TicketProxy(int id, long price, UserRepository userRepository) { - super(id, price, null); + public TicketProxy(int id, long price, UserRepository userRepository, SeatRepository seatRepository) { + super(id, price, null,null); + this.seatRepository = seatRepository; this.userRepository = userRepository; } + + @Override public User getOwner() { if (!isUserLoaded) { @@ -32,4 +39,17 @@ public void setOwner(User owner) { super.setOwner(owner); } + @Override + public Seat getSeat() { + if(!isSeatLoaded){ + setSeat(seatRepository.getSeat(this)); + } + return super.getSeat(); + } + + @Override + public void setSeat(Seat seat) { + isSeatLoaded=true; + super.setSeat(seat); + } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java index f13a43bd..8178bc9f 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java @@ -6,11 +6,11 @@ import java.util.List; /** - * @author Fabio Buracchi + * @author Fabio Buracchi and Palmieri Ivan */ public interface TicketRepository { - void saveTicket(Ticket ticket); + void saveTicket(Ticket ticket, int projectionId); List getTicketList(Projection projection); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java index 3699f004..88caa620 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java @@ -19,7 +19,6 @@ import com.ttbmp.cinehub.app.usecase.buyticket.response.*; import com.ttbmp.cinehub.domain.*; import com.ttbmp.cinehub.domain.ticket.component.Ticket; -import com.ttbmp.cinehub.domain.ticket.component.TicketAbstract; import com.ttbmp.cinehub.domain.ticket.decorator.TicketFoldingArmchair; import com.ttbmp.cinehub.domain.ticket.decorator.TicketHeatedArmchair; import com.ttbmp.cinehub.domain.ticket.decorator.TicketSkipLine; @@ -56,7 +55,7 @@ public BuyTicketController(ServiceLocator serviceLocator, BuyTicketPresenter buy } @Override - public boolean pay(PayRequest request) { + public void pay(PayRequest request) { try { Request.validate(request); User user = userRepository.getUser(authenticationService.signIn("", "").getUserId()); @@ -68,12 +67,11 @@ public boolean pay(PayRequest request) { ticket.getPrice() )); ticket.setOwner(user); - ticketRepository.saveTicket(ticket); + ticketRepository.saveTicket(ticket,request.getProjection().getId()); emailService.sendMail(new EmailServiceRequest( user.getEmail(), "Payment receipt" )); - return true; } catch (Request.NullRequestException e) { buyTicketPresenter.presentPayNullRequest(); } catch (Request.InvalidRequestException e) { @@ -81,9 +79,8 @@ public boolean pay(PayRequest request) { } catch (PaymentServiceException e) { buyTicketPresenter.presentErrorByStripe(e); } catch (AuthenticationException e) { - e.printStackTrace(); + buyTicketPresenter.presentAutenticationError(); } - return false; } @Override @@ -123,46 +120,44 @@ public void createTicket(GetTicketBySeatsRequest request) { Request.validate(request); List seats = SeatDataMapper.mapToEntityList(request.getSeatDtoList()); Integer pos = request.getPos(); - String position = request.getPosition(); - Seat selectedSeats = seats.get(pos); - + Seat seat = seats.get(pos); + User user = userRepository.getUser(authenticationService.signIn("", "").getUserId()); /*DECORATOR PATTERN GOF*/ - TicketAbstract ticketAbstract = new Ticket(selectedSeats.getPrice()); - ticketAbstract.increasePrice(); + Ticket ticket = new Ticket(0,seat.getPrice(),user,seat); if (Boolean.TRUE.equals(request.getHeatedArmchairOption())) { - ticketAbstract = new TicketSkipLine(ticketAbstract); - ticketAbstract.setPrice(ticketAbstract.increasePrice()); + ticket = new TicketSkipLine(ticket); + ticket.setPrice(ticket.increasePrice()); } if (Boolean.TRUE.equals(request.getFoldingArmchairOption())) { - ticketAbstract = new TicketFoldingArmchair(ticketAbstract); - ticketAbstract.setPrice(ticketAbstract.increasePrice()); + ticket = new TicketFoldingArmchair(ticket); + ticket.setPrice(ticket.increasePrice()); } if (Boolean.TRUE.equals(request.getSkipLineRadioOption())) { - ticketAbstract = new TicketHeatedArmchair(ticketAbstract); - ticketAbstract.setPrice(ticketAbstract.increasePrice()); + ticket = new TicketHeatedArmchair(ticket); + ticket.setPrice(ticket.increasePrice()); } /*-----------------------------------------*/ - - ticketAbstract.setPosition(position); - buyTicketPresenter.setSelectedTicket(new GetTicketBySeatsResponse(TicketDataMapper.mapToDto(ticketAbstract))); + buyTicketPresenter.setSelectedTicket(new GetTicketBySeatsResponse(TicketDataMapper.mapToDto(ticket))); } catch (Request.NullRequestException e) { buyTicketPresenter.presentGetTicketBySeatsNullRequest(); } catch (Request.InvalidRequestException e) { buyTicketPresenter.presentInvalidGetTicketBySeats(request); + } catch (AuthenticationException e) { + buyTicketPresenter.presentAutenticationError(); } } /*To find the times of the screenings given a film, a cinema and a date*/ @Override - public void getProjectionList(GetTimeOfProjectionRequest request) { + public void getProjectionList(GetProjectionRequest request) { try { Request.validate(request); Cinema cinema = CinemaDataMapper.mapToEntity(request.getCinemaDto()); Movie movie = MovieDataMapper.mapToEntity(request.getMovieDto()); String date = request.getLocalDate(); List projectionList = projectionRepository.getProjectionList( - CinemaDataMapper.mapToDto(cinema), - MovieDataMapper.mapToDto(movie), + cinema, + movie, date); buyTicketPresenter.presentProjectionList( new ProjectionListResponse(ProjectionDataMapper.mapToDtoList(projectionList)));//Lista delle possiobili proiezioni da scegliere diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketHandler.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketHandler.java index f6e8b906..09dc128f 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketHandler.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketHandler.java @@ -15,8 +15,8 @@ public BuyTicketHandler(BuyTicketPresenter presenter) { } @Override - public boolean pay(PayRequest request) { - return controller.pay(request); + public void pay(PayRequest request) { + controller.pay(request); } @Override @@ -35,7 +35,7 @@ public void getListCinema(GetListCinemaRequest request) { } @Override - public void getProjectionList(GetTimeOfProjectionRequest request) { + public void getProjectionList(GetProjectionRequest request) { controller.getProjectionList(request); } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketPresenter.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketPresenter.java index d0ca0e22..98f57e0f 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketPresenter.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketPresenter.java @@ -32,7 +32,7 @@ public interface BuyTicketPresenter { void presentGetTimeOfProjectionNullRequest(); - void presentInvalidGetTimeOfProjection(GetTimeOfProjectionRequest request); + void presentInvalidGetTimeOfProjection(GetProjectionRequest request); void presentGetNumberOfSeatsNullRequest(); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketUseCase.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketUseCase.java index 28773721..361656e7 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketUseCase.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketUseCase.java @@ -8,7 +8,7 @@ */ public interface BuyTicketUseCase extends UseCase { - boolean pay(PayRequest request); + void pay(PayRequest request); void getListMovie(GetListMovieRequest request); @@ -16,7 +16,7 @@ public interface BuyTicketUseCase extends UseCase { void getListCinema(GetListCinemaRequest request); - void getProjectionList(GetTimeOfProjectionRequest request); + void getProjectionList(GetProjectionRequest request); void getListOfSeat(GetNumberOfSeatsRequest request); } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetTimeOfProjectionRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetProjectionRequest.java similarity index 89% rename from app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetTimeOfProjectionRequest.java rename to app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetProjectionRequest.java index 71662e36..909c266c 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetTimeOfProjectionRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetProjectionRequest.java @@ -9,7 +9,7 @@ /** * @author Palmieri Ivan */ -public class GetTimeOfProjectionRequest extends Request { +public class GetProjectionRequest extends Request { public static final Request.Error MISSING_MOVIE_ERROR = new Request.Error("Movie can't be null"); public static final Request.Error MISSING_DATE_ERROR = new Request.Error("Date can't be null"); @@ -19,7 +19,7 @@ public class GetTimeOfProjectionRequest extends Request { private CinemaDto cinemaDto; private String localDate; - public GetTimeOfProjectionRequest(MovieDto movieDto, CinemaDto cinemaDto, LocalDate localDate) { + public GetProjectionRequest(MovieDto movieDto, CinemaDto cinemaDto, LocalDate localDate) { this.movieDto = movieDto; this.cinemaDto = cinemaDto; this.localDate = localDate.toString(); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java index cbcc622b..9ba3035b 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java @@ -1,9 +1,12 @@ package com.ttbmp.cinehub.app.usecase.buyticket.request; +import com.ttbmp.cinehub.app.dto.CinemaDto; +import com.ttbmp.cinehub.app.dto.MovieDto; import com.ttbmp.cinehub.app.dto.ProjectionDto; import com.ttbmp.cinehub.app.dto.TicketDto; import com.ttbmp.cinehub.app.usecase.Request; + /** * @author Palmieri Ivan */ @@ -15,13 +18,48 @@ public class PayRequest extends Request { private final Integer index; private ProjectionDto projection; private TicketDto ticket; + private CinemaDto cinemaDto; + private MovieDto movieDto; + private String selectedDate; + + - public PayRequest(TicketDto ticket, ProjectionDto projection, Integer index) { + public PayRequest(TicketDto ticket,ProjectionDto projection,Integer index,CinemaDto cinemaDto,MovieDto movieDto, String selectedDate) { this.index = index; this.projection = projection; this.ticket = ticket; + this.cinemaDto = cinemaDto; + this.movieDto = movieDto; + this.selectedDate = selectedDate; + + } + + public MovieDto getMovieDto() { + return movieDto; + } + + public void setMovieDto(MovieDto movieDto) { + this.movieDto = movieDto; + } + + public String getSelectedDate() { + return selectedDate; + } + + public void setSelectedDate(String selectedDate) { + this.selectedDate = selectedDate; + } + + public CinemaDto getCinemaDto() { + return cinemaDto; } + public void setCinemaDto(CinemaDto cinemaDto) { + this.cinemaDto = cinemaDto; + } + + + public ProjectionDto getProjection() { return projection; } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Payment.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Payment.java index 57640692..8e0ec0cc 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Payment.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Payment.java @@ -5,14 +5,12 @@ */ public class Payment { - private final String status; private String id; private long price; - public Payment(String id, long l, String status) { + public Payment(String id, long l) { this.id = id; this.price = l; - this.status = status; } public String getId() { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Projection.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Projection.java index 82e30140..1e3e7b7c 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Projection.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Projection.java @@ -94,4 +94,8 @@ public void setTicketList(List ticketList) { this.ticketList = ticketList; } + public void addTicket(Ticket ticket){ + this.ticketList.add(ticket); + } + } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Seat.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Seat.java index f34507d8..0dd49486 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Seat.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Seat.java @@ -8,11 +8,21 @@ public class Seat { private int id; private long price; private boolean state; + private String position; - public Seat(int id, long price, boolean state) { + public Seat(int id, long price, boolean state,String position) { this.id = id; this.price = price; this.state = state; + this.position = position; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; } public int getId() { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/Ticket.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/Ticket.java index 759669f0..69000e70 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/Ticket.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/Ticket.java @@ -1,24 +1,34 @@ package com.ttbmp.cinehub.domain.ticket.component; +import com.ttbmp.cinehub.domain.Seat; import com.ttbmp.cinehub.domain.User; /** * @author Palmieri Ivan */ -public class Ticket extends TicketAbstract { +public class Ticket { + - private final long price; private int id; + private long price; + private Seat seat; private User owner; - public Ticket(long price) { - this.price = price; - } - public Ticket(int id, long price, User owner) { + public Ticket(int id, long price, User owner,Seat seat) { this.id = id; this.price = price; this.owner = owner; + this.seat = seat; + } + + + public Seat getSeat() { + return seat; + } + + public void setSeat(Seat seat) { + this.seat = seat; } public int getId() { @@ -29,6 +39,15 @@ public void setId(int id) { this.id = id; } + public long getPrice() { + return price; + } + + public void setPrice(long price) { + this.price = price; + } + + public User getOwner() { return owner; } @@ -37,14 +56,10 @@ public void setOwner(User owner) { this.owner = owner; } - @Override public long increasePrice() { return this.price; } - @Override - public long getPrice() { - return this.price; - } + } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/TicketAbstract.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/TicketAbstract.java deleted file mode 100644 index 22d70f62..00000000 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/TicketAbstract.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ttbmp.cinehub.domain.ticket.component; - -/** - * @author Palmieri Ivan - */ -public abstract class TicketAbstract { - - private long price; - private String position; - - - public abstract long increasePrice(); - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public long getPrice() { - return price; - } - - public void setPrice(long price) { - this.price = price; - } - -} diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketDecorator.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketDecorator.java index 8492745c..bcfe15a5 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketDecorator.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketDecorator.java @@ -1,20 +1,21 @@ package com.ttbmp.cinehub.domain.ticket.decorator; -import com.ttbmp.cinehub.domain.ticket.component.TicketAbstract; +import com.ttbmp.cinehub.domain.ticket.component.Ticket; /** * @author Palmieri Ivan */ -public abstract class TicketDecorator extends TicketAbstract { +public abstract class TicketDecorator extends Ticket { - TicketAbstract ticketAbstract; + Ticket ticket; - TicketDecorator(TicketAbstract ticketAbstract) { - this.ticketAbstract = ticketAbstract; + TicketDecorator(Ticket ticket) { + super(ticket.getId(),ticket.getPrice(), ticket.getOwner(), ticket.getSeat()); + this.ticket = ticket; } @Override public long increasePrice() { - return ticketAbstract.increasePrice(); + return ticket.increasePrice(); } } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketFoldingArmchair.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketFoldingArmchair.java index 94dc48b0..aee74be1 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketFoldingArmchair.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketFoldingArmchair.java @@ -1,14 +1,14 @@ package com.ttbmp.cinehub.domain.ticket.decorator; -import com.ttbmp.cinehub.domain.ticket.component.TicketAbstract; +import com.ttbmp.cinehub.domain.ticket.component.Ticket; /** * @author Palmieri Ivan */ public class TicketFoldingArmchair extends TicketDecorator { - public TicketFoldingArmchair(TicketAbstract ticketAbstract) { - super(ticketAbstract); + public TicketFoldingArmchair(Ticket ticket) { + super(ticket); } @Override diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketHeatedArmchair.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketHeatedArmchair.java index 9d485939..7e3d6bdf 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketHeatedArmchair.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketHeatedArmchair.java @@ -1,14 +1,14 @@ package com.ttbmp.cinehub.domain.ticket.decorator; -import com.ttbmp.cinehub.domain.ticket.component.TicketAbstract; +import com.ttbmp.cinehub.domain.ticket.component.Ticket; /** * @author Palmieri Ivan */ public class TicketHeatedArmchair extends TicketDecorator { - public TicketHeatedArmchair(TicketAbstract ticketAbstract) { - super(ticketAbstract); + public TicketHeatedArmchair(Ticket ticket) { + super(ticket); } @Override diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketSkipLine.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketSkipLine.java index 77ba6900..21a70de9 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketSkipLine.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketSkipLine.java @@ -1,6 +1,6 @@ package com.ttbmp.cinehub.domain.ticket.decorator; -import com.ttbmp.cinehub.domain.ticket.component.TicketAbstract; +import com.ttbmp.cinehub.domain.ticket.component.Ticket; /** * @author Palmieri Ivan @@ -8,8 +8,8 @@ public class TicketSkipLine extends TicketDecorator { - public TicketSkipLine(TicketAbstract ticketAbstract) { - super(ticketAbstract); + public TicketSkipLine(Ticket ticket) { + super(ticket); } @Override diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketPresenterFx.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketPresenterFx.java index b059e185..a07c436a 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketPresenterFx.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketPresenterFx.java @@ -98,12 +98,12 @@ public void presentGetTimeOfProjectionNullRequest() { } @Override - public void presentInvalidGetTimeOfProjection(GetTimeOfProjectionRequest request) { - if (request.getErrorList().contains(GetTimeOfProjectionRequest.MISSING_MOVIE_ERROR)) { - viewModel.cinemaErrorProperty().setValue(GetTimeOfProjectionRequest.MISSING_MOVIE_ERROR.getMessage()); + public void presentInvalidGetTimeOfProjection(GetProjectionRequest request) { + if (request.getErrorList().contains(GetProjectionRequest.MISSING_MOVIE_ERROR)) { + viewModel.cinemaErrorProperty().setValue(GetProjectionRequest.MISSING_MOVIE_ERROR.getMessage()); } - if (request.getErrorList().contains(GetTimeOfProjectionRequest.MISSING_DATE_ERROR)) { - viewModel.cinemaErrorProperty().setValue(GetTimeOfProjectionRequest.MISSING_DATE_ERROR.getMessage()); + if (request.getErrorList().contains(GetProjectionRequest.MISSING_DATE_ERROR)) { + viewModel.cinemaErrorProperty().setValue(GetProjectionRequest.MISSING_DATE_ERROR.getMessage()); } } diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketViewModel.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketViewModel.java index 88ba0339..0261e038 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketViewModel.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketViewModel.java @@ -76,7 +76,7 @@ public BuyTicketViewModel() { selectedCinemaCity.bind(ObjectBindings.map(selectedCinema, CinemaDto::getCity)); selectedCinemaName.bind(ObjectBindings.map(selectedCinema, CinemaDto::getName)); selectedTicketPrice.bind(ObjectBindings.map(selectedTicket, TicketDto::getPrice)); - selectedTicketPosition.bind(ObjectBindings.map(selectedTicket, TicketDto::getPosition)); + selectedTicketPosition.bind(ObjectBindings.map(selectedTicket,ticket-> ticket.getSeatDto().getPosition())); StringProperty selectedMovieRating = new SimpleStringProperty(); selectedMovieRating.bind(ObjectBindings.map(selectedMovie, MovieDto::getVote)); StringProperty selectedMovieOverview = new SimpleStringProperty(); diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaViewController.java index b139fd71..737efb91 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaViewController.java @@ -4,7 +4,7 @@ import com.ttbmp.cinehub.app.dto.CinemaDto; import com.ttbmp.cinehub.app.dto.ProjectionDto; import com.ttbmp.cinehub.app.usecase.buyticket.BuyTicketUseCase; -import com.ttbmp.cinehub.app.usecase.buyticket.request.GetTimeOfProjectionRequest; +import com.ttbmp.cinehub.app.usecase.buyticket.request.GetProjectionRequest; import com.ttbmp.cinehub.ui.desktop.appbar.AppBarViewController; import com.ttbmp.cinehub.ui.desktop.buyticket.BuyTicketViewModel; import com.ttbmp.cinehub.ui.desktop.buyticket.choosemovie.ChooseMovieView; @@ -88,7 +88,7 @@ private void onTimeSelected() { private void onCinemaItemClick() { if (viewModel.selectedCinemaProperty().getValue() != null) { viewModel.getTimeOfProjectionList().clear(); - activity.getUseCase(BuyTicketUseCase.class).getProjectionList(new GetTimeOfProjectionRequest( + activity.getUseCase(BuyTicketUseCase.class).getProjectionList(new GetProjectionRequest( viewModel.selectedMovieProperty().getValue(), viewModel.selectedCinemaProperty().getValue(), viewModel.selectedDateProperty().getValue() diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemViewController.java index e2e6219f..5cf09ab6 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemViewController.java @@ -16,14 +16,7 @@ public class ChooseProjectionItemViewController extends ViewController { private ProjectionDto projectionDto; - @FXML - private Label projectionCapacityLabel; - - @FXML - private Label freeSeatLabel; - @FXML - private Label buysSeatLabel; @FXML private Label projectionTimeLabel; @@ -34,20 +27,7 @@ public class ChooseProjectionItemViewController extends ViewController { @Override protected void onLoad() { Objects.requireNonNull(projectionDto); - int freeSeat = 0; - int buysSeat = 0; - int totalSeat = projectionDto.getHallDto().getSeatList().size(); - for (int i = 0; i < projectionDto.getHallDto().getSeatList().size(); i++) { - if (Boolean.TRUE.equals(projectionDto.getHallDto().getSeatList().get(i).getState())) { - freeSeat++; - } else { - buysSeat++; - } - } hallNameLabel.setText(String.valueOf(projectionDto.getHallDto().getId())); - freeSeatLabel.setText(String.valueOf(freeSeat)); - buysSeatLabel.setText(String.valueOf(buysSeat)); - projectionCapacityLabel.setText(String.valueOf(totalSeat)); projectionTimeLabel.setText(projectionDto.getStartTime()); } diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixViewController.java index f566c4da..040c26e5 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixViewController.java @@ -43,38 +43,54 @@ private void createMatrix(BuyTicketViewModel viewModel, List seatDtoLis int rest = size % rows; int count = 0; int buy = 0; - char[] a = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'Z'}; for (int i = 0; i < rows; i++) { for (int j = 0; j < columns; j++) { RadioButton radioButton = new RadioButton(); radioButton.setPadding(new Insets(5, 5, 5, 5)); - radioButton.setText("" + a[j] + i + "\n" + seatDtoList.get(count).getPrice() + "\u20ac"); + radioButton.setText(seatDtoList.get(count).getPosition()+ "\n" + seatDtoList.get(count).getPrice() + "\u20ac"); radioButton.setToggleGroup(toggleGroup); ImageView imageView = new ImageView(new Image(String.valueOf(this.getClass().getResource("/drawables/office-chair.png")))); imageView.setFitWidth(25); imageView.setFitHeight(25); radioButton.setGraphic(imageView); - if (seatDtoList.get(count).getState().equals(Boolean.FALSE)) { - radioButton.setDisable(true); + + if(!viewModel.selectedProjectionProperty().getValue().getListTicket().isEmpty()) { + int finalCount = count; + viewModel.selectedProjectionProperty().getValue().getListTicket().forEach(x -> { + String val = seatDtoList.get(finalCount).getPosition(); + if (x.getSeatDto().getPosition().equals(val) ) { + radioButton.setDisable(true); + } + }); + } + if (radioButton.isDisabled()) { buy++; } - gridSeats.add(radioButton, i, j); count++; } } - addOtherButton(seatDtoList, columns, rest, count, buy, a); + addOtherButton(seatDtoList, columns, rest, count, buy,viewModel); updateValue(viewModel, size, buy); } - private void addOtherButton(List seatDtoList, int columns, int rest, int count, int buy, char[] a) { + private void addOtherButton(List seatDtoList, int columns, int rest, int count, int buy, BuyTicketViewModel viewModel) { for (int k = 0; k < rest; k++) { RadioButton radioButton = new RadioButton(); - radioButton.setText("" + a[columns + 1] + k + "\n" + seatDtoList.get(count).getPrice() + "\u20ac"); + radioButton.setText(seatDtoList.get(count).getPosition() + "\n" + seatDtoList.get(count).getPrice() + "\u20ac"); radioButton.setToggleGroup(toggleGroup); radioButton.setPadding(new Insets(5, 5, 5, 5)); - if (seatDtoList.get(count).getState().equals(Boolean.FALSE)) { - radioButton.setDisable(true); + if(!viewModel.selectedProjectionProperty().getValue().getListTicket().isEmpty()) { + + int finalCount = count; + viewModel.selectedProjectionProperty().getValue().getListTicket().forEach(x -> { + String val = seatDtoList.get(finalCount).getPosition(); + if (x.getSeatDto().getPosition().equals(val) ) { + radioButton.setDisable(true); + } + }); + } + if (radioButton.isDisabled()) { buy++; } ImageView imageView = new ImageView(new Image(String.valueOf(this.getClass().getResource("/drawables/office-chair.png")))); diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentViewController.java index ceaa3aa0..00c31413 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentViewController.java @@ -95,16 +95,20 @@ private void bind() { private void startPayment(ActionEvent actionEvent) { - if (activity.getUseCase(BuyTicketUseCase.class).pay(new PayRequest( + activity.getUseCase(BuyTicketUseCase.class).pay(new PayRequest( viewModel.selectedTicketProperty().getValue(), viewModel.selectedProjectionProperty().getValue(), - viewModel.seatSelectedPosition().getValue()))) { + viewModel.seatSelectedPosition().getValue(), + viewModel.selectedCinemaProperty().getValue(), + viewModel.selectedMovieProperty().getValue(), + String.valueOf(viewModel.selectedDateProperty().getValue()) + )) ; try { navController.navigate(new NavDestination(new ConfirmEmailView())); } catch (IOException e) { e.printStackTrace(); } - } + } diff --git a/ui/desktop/src/main/resources/layout/buy_ticket/projection_list_item.fxml b/ui/desktop/src/main/resources/layout/buy_ticket/projection_list_item.fxml index c10ff639..d3dc84c9 100644 --- a/ui/desktop/src/main/resources/layout/buy_ticket/projection_list_item.fxml +++ b/ui/desktop/src/main/resources/layout/buy_ticket/projection_list_item.fxml @@ -25,36 +25,6 @@ - - - - - - From e58df3a21a772f227ee5316d27d198cba6852f99 Mon Sep 17 00:00:00 2001 From: sonMassimo1 <56676941+sonMassimo1@users.noreply.github.com> Date: Sun, 14 Feb 2021 15:41:07 +0100 Subject: [PATCH 2/8] Fix #44 --- .../app/repository/hall/HallRepository.java | 2 + .../repository/hall/MockHallRepository.java | 9 ++ .../repository/shift/MockShiftRepository.java | 2 +- .../app/repository/shift/ShiftRepository.java | 2 +- .../repository/shift/ShiftSaveException.java | 2 +- .../ManageEmployeesShiftController.java | 68 ++++++------ .../ManageEmployeesShiftHandler.java | 5 - .../ManageEmployeesShiftPresenter.java | 6 +- .../ManageEmployeesShiftUseCase.java | 2 - .../request/ShiftModifyRequest.java | 102 ++++++++++++++---- .../request/ShiftRepeatRequest.java | 79 ++++++++++---- .../domain/shift/ModifyShiftException.java | 10 ++ .../domain/shift/ProjectionistShift.java | 19 ++++ .../com/ttbmp/cinehub/domain/shift/Shift.java | 7 ++ .../cinehub/domain/shift/ShiftFactory.java | 28 ----- .../cinehub/domain/shift/UsherShift.java | 21 ++++ .../shift/factory/CreateShiftException.java | 10 ++ .../domain/shift/factory/ShiftFactory.java | 50 +++++++++ .../ManageEmployeesShiftFxPresenter.java | 58 ++++++---- .../ManageEmployeesShiftViewModel.java | 14 +-- .../assign/AssignShiftViewController.java | 68 ++++-------- .../modify/ModifyShiftViewController.java | 12 +-- 22 files changed, 377 insertions(+), 199 deletions(-) create mode 100644 domain/src/main/java/com/ttbmp/cinehub/domain/shift/ModifyShiftException.java delete mode 100644 domain/src/main/java/com/ttbmp/cinehub/domain/shift/ShiftFactory.java create mode 100644 domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/CreateShiftException.java create mode 100644 domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/ShiftFactory.java diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/HallRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/HallRepository.java index 52b1f0c6..8ae04cd9 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/HallRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/HallRepository.java @@ -18,4 +18,6 @@ public interface HallRepository { Hall getHall(ProjectionistShift projectionistShift); + Hall getHall(int hallId); + } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/MockHallRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/MockHallRepository.java index 3e4a1fbd..35dde7b7 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/MockHallRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/MockHallRepository.java @@ -79,6 +79,15 @@ public Hall getHall(ProjectionistShift projectionistShift) { .get(0); } + @Override + public Hall getHall(int hallId) { + return HALL_DATA_LIST.stream() + .filter(d-> d.id == hallId) + .map(d-> new HallProxy(d.id, serviceLocator.getService(SeatRepository.class))) + .collect(Collectors.toList()) + .get(0); + } + public static class HallData { private int id; diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/MockShiftRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/MockShiftRepository.java index b16efddb..f0e991a0 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/MockShiftRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/MockShiftRepository.java @@ -147,7 +147,7 @@ public void deletedShift(Shift shift) throws ShiftSaveException { } @Override - public synchronized void saveShift(Shift shift) throws ShiftSaveException { + public synchronized void saveShift(Shift shift){ SHIFT_DATA_LIST.add(new ShiftData( shiftIdCounter, shift.getDate(), diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/ShiftRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/ShiftRepository.java index b5f6d662..9f4e5ab4 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/ShiftRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/ShiftRepository.java @@ -17,7 +17,7 @@ public interface ShiftRepository { List getShiftList(Employee employee); - void saveShift(Shift shift) throws ShiftSaveException; + void saveShift(Shift shift); void deletedShift(Shift shift) throws ShiftSaveException; diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/ShiftSaveException.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/ShiftSaveException.java index 03455cf5..49739712 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/ShiftSaveException.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/ShiftSaveException.java @@ -6,7 +6,7 @@ public class ShiftSaveException extends Exception { public static final String ALREADY_EXIST_ERROR = "Shift Already Exist"; - public static final String NOT_EXIST_ERROR = "Shift Already Exist"; + public static final String NOT_EXIST_ERROR = "Shift Not Exist"; public ShiftSaveException(String message) { super(message); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java index 20305c8e..26ad388f 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java @@ -7,6 +7,7 @@ import com.ttbmp.cinehub.app.di.ServiceLocator; import com.ttbmp.cinehub.app.dto.ShiftDto; import com.ttbmp.cinehub.app.repository.cinema.CinemaRepository; +import com.ttbmp.cinehub.app.repository.employee.EmployeeRepository; import com.ttbmp.cinehub.app.repository.hall.HallRepository; import com.ttbmp.cinehub.app.repository.shift.ShiftRepository; import com.ttbmp.cinehub.app.repository.shift.ShiftSaveException; @@ -15,9 +16,12 @@ import com.ttbmp.cinehub.app.usecase.Request; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.*; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.response.*; +import com.ttbmp.cinehub.domain.Hall; import com.ttbmp.cinehub.domain.employee.Employee; +import com.ttbmp.cinehub.domain.shift.ModifyShiftException; import com.ttbmp.cinehub.domain.shift.Shift; -import com.ttbmp.cinehub.domain.shift.ShiftFactory; +import com.ttbmp.cinehub.domain.shift.factory.CreateShiftException; +import com.ttbmp.cinehub.domain.shift.factory.ShiftFactory; import java.time.LocalDate; import java.util.ArrayList; @@ -36,6 +40,7 @@ public class ManageEmployeesShiftController implements ManageEmployeesShiftUseCa private final CinemaRepository cinemaRepository; private final HallRepository hallRepository; private final EmailService emailService; + private final EmployeeRepository employeeRepository; public ManageEmployeesShiftController(ServiceLocator serviceLocator, ManageEmployeesShiftPresenter manageEmployeesShiftPresenter) { this.manageEmployeesShiftPresenter = manageEmployeesShiftPresenter; @@ -43,6 +48,7 @@ public ManageEmployeesShiftController(ServiceLocator serviceLocator, ManageEmplo this.cinemaRepository = serviceLocator.getService(CinemaRepository.class); this.hallRepository = serviceLocator.getService(HallRepository.class); this.emailService = serviceLocator.getService(EmailService.class); + this.employeeRepository = serviceLocator.getService(EmployeeRepository.class); } @Override @@ -84,41 +90,30 @@ public void getShiftList(GetShiftListRequest request) { } } - @Override - public void saveShift(ShiftRequest request) { - try { - Request.validate(request); - shiftRepository.saveShift(ShiftDataMapper.mapToEntity(request.getShift())); - manageEmployeesShiftPresenter.presentSaveShift(); - emailService.sendMail(new EmailServiceRequest( - EmployeeDataMapper.matToEntity(request.getShift().getEmployee()).getEmail(), - "Shift Assign" - )); - } catch (Request.NullRequestException e) { - manageEmployeesShiftPresenter.presentSaveShiftNullRequest(); - } catch (Request.InvalidRequestException e) { - manageEmployeesShiftPresenter.presentInvalidSaveShiftListRequest(request); - } catch (ShiftSaveException e) { - manageEmployeesShiftPresenter.presentSaveShiftError(e); - } - } - @Override public void modifyShift(ShiftModifyRequest request) { try { Request.validate(request); - shiftRepository.modifyShift(shiftRepository.getShift(request.getNewShift().getId())); - manageEmployeesShiftPresenter.presentSaveShift(); - manageEmployeesShiftPresenter.presentDeleteShift(); + Shift shift= shiftRepository.getShift(request.getShiftId()); + Employee employee = employeeRepository.getEmployee(request.getEmployeeDto().getId()); + /* Hall hall= hallRepository.getHall(request.getHall().getId());*/ + shift.modifyShift(shift,request.getDate(),request.getStart(),request.getEnd(),HallDataMapper.mapToEntity(request.getHall())); + shiftRepository.modifyShift(shift); emailService.sendMail(new EmailServiceRequest( - EmployeeDataMapper.matToEntity(request.getNewShift().getEmployee()).getEmail(), + employee.getEmail(), "Shift Modify" )); + manageEmployeesShiftPresenter.presentCreateShift(new CreateShiftResponse(ShiftDataMapper.mapToDto(shift))); + manageEmployeesShiftPresenter.presentDeleteShift(); + manageEmployeesShiftPresenter.presentSaveShift(); + } catch (Request.NullRequestException e) { manageEmployeesShiftPresenter.presentModifyShiftNullRequest(); } catch (Request.InvalidRequestException e) { manageEmployeesShiftPresenter.presentInvalidModifyShiftListRequest(request); } catch (ShiftSaveException e) { + manageEmployeesShiftPresenter.presentCreateShiftError(e); + } catch (ModifyShiftException e) { manageEmployeesShiftPresenter.presentModifyShiftError(e); } @@ -149,6 +144,7 @@ public void saveRepeatedShift(ShiftRepeatRequest request) { Request.validate(request); List shiftDtoList = new ArrayList<>(); UnaryOperator increaseDateFunction; + Employee employee = employeeRepository.getEmployee(request.getEmployeeDto().getId()); switch (request.getOption()) { case "EVERY_DAY": increaseDateFunction = date -> date.plusDays(1); @@ -165,17 +161,17 @@ public void saveRepeatedShift(ShiftRepeatRequest request) { for (LocalDate date = request.getStart(); date.isBefore(request.getEnd().plusDays(1)); date = increaseDateFunction.apply(date)) { ShiftFactory shiftFactory = new ShiftFactory(); Shift shift = shiftFactory.createConcreteShift( - EmployeeDataMapper.matToEntity(request.getShift().getEmployee()), + employee, date.toString(), - request.getShift().getStart().toString(), - request.getShift().getEnd().toString(), + request.getStartShift().toString(), + request.getEndShift().toString(), HallDataMapper.mapToEntity(request.getHall()) ); shiftRepository.saveShift(shift); shiftDtoList.add(ShiftDataMapper.mapToDto(shift)); } emailService.sendMail(new EmailServiceRequest( - EmployeeDataMapper.matToEntity(request.getShift().getEmployee()).getEmail(), + employee.getEmail(), "Shift Modify" )); manageEmployeesShiftPresenter.presentRepeatShift(new ShiftRepeatResponse(shiftDtoList)); @@ -183,8 +179,8 @@ public void saveRepeatedShift(ShiftRepeatRequest request) { manageEmployeesShiftPresenter.presentRepeatedShiftNullRequest(); } catch (Request.InvalidRequestException e) { manageEmployeesShiftPresenter.presentInvalidRepeatedShiftListRequest(request); - } catch (ShiftSaveException e) { - manageEmployeesShiftPresenter.presentSaveShiftError(e); + } catch (CreateShiftException e) { + manageEmployeesShiftPresenter.presentCreateShiftError(e); } } @@ -192,7 +188,7 @@ public void saveRepeatedShift(ShiftRepeatRequest request) { public void createShift(CreateShiftRequest request) { try { Request.validate(request); - Employee employee = EmployeeDataMapper.matToEntity(request.getEmployee()); + Employee employee = employeeRepository.getEmployee(request.getEmployee().getId()); String date = request.getDate().toString(); String start = request.getStart().toString(); String end = request.getEnd().toString(); @@ -200,10 +196,20 @@ public void createShift(CreateShiftRequest request) { Shift shift = shiftFactory.createConcreteShift(employee, date, start, end, HallDataMapper.mapToEntity(request.getHall())); manageEmployeesShiftPresenter.presentCreateShift(new CreateShiftResponse(ShiftDataMapper.mapToDto(shift))); + + shiftRepository.saveShift(shift); + manageEmployeesShiftPresenter.presentSaveShift(); + emailService.sendMail(new EmailServiceRequest( + employee.getEmail(), + "Shift Assign" + )); + } catch (Request.NullRequestException e) { manageEmployeesShiftPresenter.presentCreateShiftNullRequest(); } catch (Request.InvalidRequestException e) { manageEmployeesShiftPresenter.presentInvalidCreateShiftListRequest(request); + } catch (CreateShiftException e) { + manageEmployeesShiftPresenter.presentCreateShiftError(e); } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftHandler.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftHandler.java index 9359b0d4..878d55c1 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftHandler.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftHandler.java @@ -44,11 +44,6 @@ public void createShift(CreateShiftRequest request) { controller.createShift(request); } - @Override - public void saveShift(ShiftRequest request) { - controller.saveShift(request); - } - @Override public void modifyShift(ShiftModifyRequest request) { controller.modifyShift(request); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftPresenter.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftPresenter.java index 252fe77e..727af8f5 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftPresenter.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftPresenter.java @@ -23,11 +23,7 @@ public interface ManageEmployeesShiftPresenter { void presentCreateShift(CreateShiftResponse response); - void presentInvalidSaveShiftListRequest(ShiftRequest request); - - void presentSaveShiftNullRequest(); - - void presentSaveShiftError(Throwable error); + void presentCreateShiftError(Throwable error); void presentInvalidDeleteShiftListRequest(ShiftRequest request); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftUseCase.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftUseCase.java index 31bb3ee3..1b36c18f 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftUseCase.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftUseCase.java @@ -21,8 +21,6 @@ public interface ManageEmployeesShiftUseCase extends UseCase { void createShift(CreateShiftRequest request); - void saveShift(ShiftRequest request); - void modifyShift(ShiftModifyRequest request); } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftModifyRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftModifyRequest.java index cd9a3498..fb84fb8c 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftModifyRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftModifyRequest.java @@ -1,43 +1,105 @@ package com.ttbmp.cinehub.app.usecase.manageemployeesshift.request; -import com.ttbmp.cinehub.app.dto.ShiftDto; +import com.ttbmp.cinehub.app.dto.EmployeeDto; +import com.ttbmp.cinehub.app.dto.HallDto; +import com.ttbmp.cinehub.app.dto.ProjectionistDto; import com.ttbmp.cinehub.app.usecase.Request; +import java.time.LocalDate; +import java.time.LocalTime; + public class ShiftModifyRequest extends Request { - public static final Request.Error MISSING_OLD_SHIFT = new Request.Error("Old Shift non valido"); - public static final Request.Error MISSING_NEW_SHIFT = new Request.Error("New Shift non valido"); + public static final Request.Error MISSING_SHIFT = new Request.Error("Shift non valido"); + public static final Request.Error MISSING_DATE = new Request.Error("Data non valido"); + public static final Request.Error MISSING_START = new Request.Error("Inizio non valido"); + public static final Request.Error MISSING_END = new Request.Error("Fine non valida"); + public static final Request.Error MISSING_HALL = new Request.Error("Hall non valida"); + public static final Request.Error MISSING_EMPLOYEE = new Request.Error("Dipendente non valido"); + + private EmployeeDto employeeDto; + private int shiftId; + private LocalDate date; + private LocalTime start; + private LocalTime end; + private HallDto hall; + + public ShiftModifyRequest(EmployeeDto employeeDto, int shiftId, LocalDate date, LocalTime start, LocalTime end, HallDto hall) { + this.employeeDto = employeeDto; + this.shiftId = shiftId; + this.date = date; + this.start = start; + this.end = end; + this.hall = hall; + } + + public EmployeeDto getEmployeeDto() { + return employeeDto; + } + + public void setEmployeeDto(EmployeeDto employeeDto) { + this.employeeDto = employeeDto; + } + + public int getShiftId() { + return shiftId; + } + + public void setShiftId(int shiftId) { + this.shiftId = shiftId; + } + + public LocalDate getDate() { + return date; + } - private ShiftDto oldShift; - private ShiftDto newShift; + public void setDate(LocalDate date) { + this.date = date; + } + + public LocalTime getStart() { + return start; + } - public ShiftModifyRequest(ShiftDto oldShift, ShiftDto newShift) { - this.oldShift = oldShift; - this.newShift = newShift; + public void setStart(LocalTime start) { + this.start = start; } - public ShiftDto getOldShift() { - return oldShift; + public LocalTime getEnd() { + return end; } - public void setOldShift(ShiftDto oldShift) { - this.oldShift = oldShift; + public void setEnd(LocalTime end) { + this.end = end; } - public ShiftDto getNewShift() { - return newShift; + public HallDto getHall() { + return hall; } - public void setNewShift(ShiftDto newShift) { - this.newShift = newShift; + public void setHall(HallDto hall) { + this.hall = hall; } @Override protected void onValidate() { - if (newShift == null) { - addError(MISSING_NEW_SHIFT); + if (shiftId == -1) { + addError(MISSING_SHIFT); } - if (oldShift == null) { - addError(MISSING_OLD_SHIFT); + if (date == null) { + addError(MISSING_DATE); } + if (start == null) { + addError(MISSING_START); + } + if (end == null) { + addError(MISSING_END); + } + if (hall == null && employeeDto instanceof ProjectionistDto) { + addError(MISSING_HALL); + } + if(employeeDto == null){ + addError(MISSING_EMPLOYEE); + } + } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftRepeatRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftRepeatRequest.java index 442331f1..0da18fb2 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftRepeatRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftRepeatRequest.java @@ -1,37 +1,39 @@ package com.ttbmp.cinehub.app.usecase.manageemployeesshift.request; +import com.ttbmp.cinehub.app.dto.EmployeeDto; import com.ttbmp.cinehub.app.dto.HallDto; -import com.ttbmp.cinehub.app.dto.ShiftDto; +import com.ttbmp.cinehub.app.dto.ProjectionistDto; import com.ttbmp.cinehub.app.usecase.Request; import java.time.LocalDate; +import java.time.LocalTime; public class ShiftRepeatRequest extends Request { - public static final Request.Error MISSING_SHIFT = new Request.Error("turni non validi"); - public static final Request.Error MISSING_START = new Request.Error("inizio non valido"); - public static final Request.Error MISSING_END = new Request.Error("fine non valida"); - public static final Request.Error MISSING_OPTION = new Request.Error("opzione non valida"); + public static final Request.Error MISSING_EMPLOYEE = new Request.Error("Dipendente non valido"); + public static final Request.Error MISSING_START = new Request.Error("Data inizio non valido"); + public static final Request.Error MISSING_END = new Request.Error("Data fine non valida"); + public static final Request.Error MISSING_OPTION = new Request.Error("Opzione non valida"); + public static final Request.Error MISSING_START_SHIFT = new Request.Error("Ora inizio non valido"); + public static final Request.Error MISSING_END_SHIFT = new Request.Error("Ora fine non valida"); + public static final Request.Error MISSING_HALL = new Request.Error("Sala non valida"); + private LocalDate start; private LocalDate end; private String option; - private ShiftDto shift; + private EmployeeDto employeeDto; + private LocalTime startShift; + private LocalTime endShift; private HallDto hall; - public ShiftRepeatRequest(LocalDate start, LocalDate end, String option, ShiftDto shift, HallDto hall) { + public ShiftRepeatRequest(LocalDate start, LocalDate end, String option, EmployeeDto employeeDto, LocalTime startShift, LocalTime endShift, HallDto hall) { this.start = start; this.end = end; this.option = option; - this.shift = shift; - this.hall = hall; - } - - public HallDto getHall() { - return hall; - } - - public void setHall(HallDto hall) { + this.employeeDto = employeeDto; + this.startShift = startShift; + this.endShift = endShift; this.hall = hall; } @@ -59,18 +61,42 @@ public void setOption(String option) { this.option = option; } - public ShiftDto getShift() { - return shift; + public EmployeeDto getEmployeeDto() { + return employeeDto; + } + + public void setEmployeeDto(EmployeeDto employeeDto) { + this.employeeDto = employeeDto; + } + + public LocalTime getStartShift() { + return startShift; + } + + public void setStartShift(LocalTime startShift) { + this.startShift = startShift; + } + + public LocalTime getEndShift() { + return endShift; + } + + public void setEndShift(LocalTime endShift) { + this.endShift = endShift; + } + + public HallDto getHall() { + return hall; } - public void setShift(ShiftDto shift) { - this.shift = shift; + public void setHall(HallDto hall) { + this.hall = hall; } @Override public void onValidate() { - if (shift == null) { - addError(MISSING_SHIFT); + if (employeeDto == null) { + addError(MISSING_EMPLOYEE); } if (option == null) { addError(MISSING_OPTION); @@ -81,5 +107,14 @@ public void onValidate() { if (end == null) { addError(MISSING_END); } + if(startShift == null){ + addError(MISSING_START_SHIFT); + }if(endShift == null){ + addError(MISSING_END_SHIFT); + } + if(hall == null && employeeDto instanceof ProjectionistDto){ + addError(MISSING_HALL); + } } + } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ModifyShiftException.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ModifyShiftException.java new file mode 100644 index 00000000..3c36c2e5 --- /dev/null +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ModifyShiftException.java @@ -0,0 +1,10 @@ +package com.ttbmp.cinehub.domain.shift; + +public class ModifyShiftException extends Exception { + public static final String ALREADY_EXIST_ERROR = "Shift Already Exist"; + public static final String NOT_EXIST_ERROR = "Shift Not Exist"; + + public ModifyShiftException(String message) { + super(message); + } +} diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ProjectionistShift.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ProjectionistShift.java index ba44b4cd..7341c43b 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ProjectionistShift.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ProjectionistShift.java @@ -4,6 +4,8 @@ import com.ttbmp.cinehub.domain.Projection; import com.ttbmp.cinehub.domain.employee.Employee; +import java.time.LocalDate; +import java.time.LocalTime; import java.util.List; /** @@ -36,6 +38,23 @@ public void setProjectionList(List projectionList) { this.projectionList = projectionList; } + @Override + public void modifyShift(Shift shift, LocalDate date, LocalTime start, LocalTime end, Hall hall) throws ModifyShiftException { + List shiftList = shift.getEmployee().getShiftListBetween(date.minusDays(1), date.plusDays(1)); + for (Shift elem : shiftList) { + if (elem.getId() != shift.getId() + && LocalDate.parse(elem.getDate()).equals(date) + && (start.isBefore(LocalTime.parse(elem.getEnd())) + && (end.isAfter(LocalTime.parse(elem.getStart()))))) { + throw new ModifyShiftException(ModifyShiftException.ALREADY_EXIST_ERROR); + } + } + shift.setDate(date.toString()); + shift.setStart(start.toString()); + shift.setEnd(end.toString()); + ((ProjectionistShift) shift).setHall(hall); + } + @Override public boolean equals(Object obj) { return super.equals(obj); diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/Shift.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/Shift.java index 81086a62..b5a75610 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/Shift.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/Shift.java @@ -1,7 +1,12 @@ package com.ttbmp.cinehub.domain.shift; +import com.ttbmp.cinehub.domain.Hall; import com.ttbmp.cinehub.domain.employee.Employee; +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.List; + /** * @author Fabio Buracchi, Massimo Mazzetti */ @@ -21,6 +26,8 @@ protected Shift(int id, Employee employee, String date, String start, String end this.end = end; } + public abstract void modifyShift(Shift shift, LocalDate date, LocalTime start, LocalTime end, Hall hall) throws ModifyShiftException; + public int getId() { return id; } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ShiftFactory.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ShiftFactory.java deleted file mode 100644 index 8bd5932a..00000000 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/ShiftFactory.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.ttbmp.cinehub.domain.shift; - - -import com.ttbmp.cinehub.domain.Hall; -import com.ttbmp.cinehub.domain.employee.Employee; -import com.ttbmp.cinehub.domain.employee.Projectionist; -import com.ttbmp.cinehub.domain.employee.Usher; - -public class ShiftFactory { - - public Shift createConcreteShift(Employee employee, String date, String start, String end, Hall hall) { - if (employee.getClass().equals(Projectionist.class)) { - return createShiftProjectionist(employee, date, start, end, hall); - } else if (employee.getClass().equals(Usher.class)) { - return createShiftUsher(employee, date, start, end); - } - throw new IllegalStateException("Unexpected value: " + employee.getClass()); - } - - private Shift createShiftProjectionist(Employee employee, String date, String start, String end, Hall hall) { - return new ProjectionistShift(0, employee, date, start, end, hall, null); - } - - private Shift createShiftUsher(Employee employee, String date, String start, String end) { - return new UsherShift(0, employee, date, start, end); - } - -} diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/UsherShift.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/UsherShift.java index fa5dac62..cfc00f3d 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/UsherShift.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/UsherShift.java @@ -1,8 +1,13 @@ package com.ttbmp.cinehub.domain.shift; +import com.ttbmp.cinehub.domain.Hall; import com.ttbmp.cinehub.domain.employee.Employee; +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.List; + /** * @author Massimo Mazzetti */ @@ -12,4 +17,20 @@ public UsherShift(int id, Employee employee, String date, String start, String e super(id, employee, date, start, end); } + @Override + public void modifyShift(Shift shift, LocalDate date, LocalTime start, LocalTime end, Hall hall) throws ModifyShiftException { + List shiftList = shift.getEmployee().getShiftListBetween(date.minusDays(1), date.plusDays(1)); + for (Shift elem : shiftList) { + if (elem.getId() !=shift.getId() + && LocalDate.parse(elem.getDate()).equals(date) + && (start.isBefore(LocalTime.parse(elem.getEnd())) + && (end.isAfter(LocalTime.parse(elem.getStart()))))) { + throw new ModifyShiftException(ModifyShiftException.ALREADY_EXIST_ERROR); + } + } + shift.setDate(date.toString()); + shift.setStart(start.toString()); + shift.setEnd(end.toString()); + } + } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/CreateShiftException.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/CreateShiftException.java new file mode 100644 index 00000000..2d785cca --- /dev/null +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/CreateShiftException.java @@ -0,0 +1,10 @@ +package com.ttbmp.cinehub.domain.shift.factory; + +public class CreateShiftException extends Exception{ + public static final String ALREADY_EXIST_ERROR = "Shift Already Exist"; + public static final String NOT_EXIST_ERROR = "Shift Not Exist"; + + public CreateShiftException(String message) { + super(message); + } +} diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/ShiftFactory.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/ShiftFactory.java new file mode 100644 index 00000000..75bfdebd --- /dev/null +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/ShiftFactory.java @@ -0,0 +1,50 @@ +package com.ttbmp.cinehub.domain.shift.factory; + + +import com.ttbmp.cinehub.domain.Hall; +import com.ttbmp.cinehub.domain.employee.Employee; +import com.ttbmp.cinehub.domain.employee.Projectionist; +import com.ttbmp.cinehub.domain.employee.Usher; +import com.ttbmp.cinehub.domain.shift.ProjectionistShift; +import com.ttbmp.cinehub.domain.shift.Shift; +import com.ttbmp.cinehub.domain.shift.UsherShift; + +import java.time.LocalTime; +import java.util.List; + +public class ShiftFactory { + + public Shift createConcreteShift(Employee employee, String date, String start, String end, Hall hall) throws CreateShiftException { + if (employee instanceof Projectionist) { + return createShiftProjectionist(employee, date, start, end, hall); + } else if(employee instanceof Usher) { + return createShiftUsher(employee, date, start, end); + } + throw new IllegalStateException("Unexpected value: " + employee.getClass()); + } + + private Shift createShiftProjectionist(Employee employee, String date, String start, String end, Hall hall) throws CreateShiftException { + List shiftList = employee.getShiftList(); + for(Shift shift : shiftList){ + if(shift.getDate().equals(date) + && LocalTime.parse(start).isBefore(LocalTime.parse(shift.getEnd())) + && LocalTime.parse(end).isAfter(LocalTime.parse(shift.getStart()))){ + throw new CreateShiftException(CreateShiftException.ALREADY_EXIST_ERROR); + } + } + return new ProjectionistShift(0, employee, date, start, end, hall, null); + } + + private Shift createShiftUsher(Employee employee, String date, String start, String end) throws CreateShiftException { + List shiftList = employee.getShiftList(); + for(Shift shift : shiftList){ + if(shift.getDate().equals(date) + && LocalTime.parse(start).isBefore(LocalTime.parse(shift.getEnd())) + && LocalTime.parse(end).isAfter(LocalTime.parse(shift.getStart()))){ + throw new CreateShiftException(CreateShiftException.ALREADY_EXIST_ERROR); + } + } + return new UsherShift(0, employee, date, start, end); + } + +} diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftFxPresenter.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftFxPresenter.java index 4e0705d0..c154e74c 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftFxPresenter.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftFxPresenter.java @@ -110,24 +110,13 @@ public void presentRepeatShift(ShiftRepeatResponse response) { @Override public void presentCreateShift(CreateShiftResponse response) { + viewModel.setErrorAssignVisibility(false); viewModel.setShiftCreated(response.getShiftDto()); } @Override - public void presentInvalidSaveShiftListRequest(ShiftRequest request) { - if (request.getErrorList().contains(ShiftRequest.MISSING_SHIFT)) { - viewModel.errorProperty().setValue(ShiftRequest.MISSING_SHIFT.getMessage()); - } - } - - @Override - public void presentSaveShiftNullRequest() { - viewModel.errorProperty().setValue("Error with operation save shift"); - } - - @Override - public void presentSaveShiftError(Throwable error) { - viewModel.errorProperty().setValue("IMPOSSIBLE ASSIGN SHIFT"); + public void presentCreateShiftError(Throwable error) { + viewModel.errorProperty().setValue(error.getMessage()); viewModel.setErrorAssignVisibility(true); } @@ -151,12 +140,25 @@ public void presentDeleteShiftError(Throwable error) { @Override public void presentInvalidModifyShiftListRequest(ShiftModifyRequest request) { - if (request.getErrorList().contains(ShiftModifyRequest.MISSING_NEW_SHIFT)) { - viewModel.errorProperty().setValue(ShiftModifyRequest.MISSING_NEW_SHIFT.getMessage()); + if (request.getErrorList().contains(ShiftModifyRequest.MISSING_EMPLOYEE)) { + viewModel.errorProperty().setValue(ShiftModifyRequest.MISSING_EMPLOYEE.getMessage()); + } + if (request.getErrorList().contains(ShiftModifyRequest.MISSING_SHIFT)) { + viewModel.errorProperty().setValue(ShiftModifyRequest.MISSING_SHIFT.getMessage()); + } + if (request.getErrorList().contains(ShiftModifyRequest.MISSING_DATE)) { + viewModel.errorProperty().setValue(ShiftModifyRequest.MISSING_DATE.getMessage()); + } + if (request.getErrorList().contains(ShiftModifyRequest.MISSING_HALL)) { + viewModel.errorProperty().setValue(ShiftModifyRequest.MISSING_HALL.getMessage()); } - if (request.getErrorList().contains(ShiftModifyRequest.MISSING_OLD_SHIFT)) { - viewModel.errorProperty().setValue(ShiftModifyRequest.MISSING_OLD_SHIFT.getMessage()); + if (request.getErrorList().contains(ShiftModifyRequest.MISSING_START)) { + viewModel.errorProperty().setValue(ShiftModifyRequest.MISSING_START.getMessage()); } + if (request.getErrorList().contains(ShiftModifyRequest.MISSING_END)) { + viewModel.errorProperty().setValue(ShiftModifyRequest.MISSING_END.getMessage()); + } + } @Override @@ -196,18 +198,28 @@ public void presentCreateShiftNullRequest() { @Override public void presentInvalidRepeatedShiftListRequest(ShiftRepeatRequest request) { - if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_SHIFT)) { - viewModel.errorProperty().setValue(ShiftRepeatRequest.MISSING_SHIFT.getMessage()); + String error = ""; + if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_EMPLOYEE)) { + viewModel.errorProperty().setValue(error +ShiftRepeatRequest.MISSING_EMPLOYEE.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_START)) { - viewModel.errorProperty().setValue(ShiftRepeatRequest.MISSING_START.getMessage()); + viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_START.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_END)) { - viewModel.errorProperty().setValue(ShiftRepeatRequest.MISSING_END.getMessage()); + viewModel.errorProperty().setValue(error+ShiftRepeatRequest.MISSING_END.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_OPTION)) { - viewModel.errorProperty().setValue(ShiftRepeatRequest.MISSING_OPTION.getMessage()); + viewModel.errorProperty().setValue(error+ShiftRepeatRequest.MISSING_OPTION.getMessage()); + } + if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_START_SHIFT)) { + viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_START_SHIFT.getMessage()); + } + if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_END_SHIFT)) { + viewModel.errorProperty().setValue(error+ShiftRepeatRequest.MISSING_END_SHIFT.getMessage()); } + if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_HALL)) { + viewModel.errorProperty().setValue(error+ShiftRepeatRequest.MISSING_HALL.getMessage()); + }viewModel.errorAssignVisibilityProperty().setValue(true); } @Override diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftViewModel.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftViewModel.java index fbb418f3..7e57d306 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftViewModel.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftViewModel.java @@ -40,7 +40,7 @@ public class ManageEmployeesShiftViewModel implements ViewModel { private final ObjectProperty selectedDayWeek = new SimpleObjectProperty<>(); private final ObjectProperty selectedWeek = new SimpleObjectProperty<>(); private final ObservableList employeeShiftWeekList = FXCollections.observableArrayList(); - private final ObjectProperty selectedOptions = new SimpleObjectProperty<>(); + private final ObjectProperty selectedOption = new SimpleObjectProperty<>(ShiftRepeatingOption.EVERY_DAY); private final ObservableList options = FXCollections.observableArrayList(); private final ObjectProperty shiftCreated = new SimpleObjectProperty<>(); @@ -251,16 +251,16 @@ public ObservableList getEmployeeShiftWeekList() { return employeeShiftWeekList; } - public ShiftRepeatingOption getSelectedOptions() { - return selectedOptions.get(); + public ShiftRepeatingOption getSelectedOption() { + return selectedOption.get(); } - public void setSelectedOptions(ShiftRepeatingOption selectedOptions) { - this.selectedOptions.set(selectedOptions); + public void setSelectedOption(ShiftRepeatingOption selectedOption) { + this.selectedOption.set(selectedOption); } - public ObjectProperty selectedOptionsProperty() { - return selectedOptions; + public ObjectProperty selectedOptionProperty() { + return selectedOption; } public ObservableList getOptions() { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/assign/AssignShiftViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/assign/AssignShiftViewController.java index d223b655..cb44ba3e 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/assign/AssignShiftViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/assign/AssignShiftViewController.java @@ -6,7 +6,6 @@ import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.CreateShiftRequest; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.GetHallListRequest; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.ShiftRepeatRequest; -import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.ShiftRequest; import com.ttbmp.cinehub.domain.shift.ShiftRepeatingOption; import com.ttbmp.cinehub.ui.desktop.manageshift.ManageEmployeesShiftViewModel; import com.ttbmp.cinehub.ui.desktop.manageshift.components.ComboBoxOptionValueFactory; @@ -21,7 +20,6 @@ import javafx.scene.layout.VBox; import java.io.IOException; -import java.time.LocalDate; import java.time.LocalTime; /** @@ -79,6 +77,7 @@ protected void onLoad() { hallLabel.visibleProperty().bind(viewModel.hallVisibilityProperty()); hallComboBox.visibleProperty().bind(viewModel.hallVisibilityProperty()); } + viewModel.setRepeatVisibility(false); viewModel.setErrorAssignVisibility(false); activity.getUseCase(ManageEmployeesShiftUseCase.class).getHallList(new GetHallListRequest(viewModel.getSelectedDayWeek().getEmployee().getCinema())); hallComboBox.setItems(viewModel.getHallList()); @@ -98,7 +97,8 @@ protected void onLoad() { errorLabel.textProperty().bind(viewModel.errorProperty()); viewModel.setRepeatVisibility(viewModel.isRepeatVisibility()); - shiftRepeatCheckBox.setOnAction(event -> viewModel.setRepeatVisibility(!viewModel.isRepeatVisibility())); + + shiftRepeatCheckBox.selectedProperty().bindBidirectional(viewModel.repeatVisibilityProperty()); viewModel.setStartSpinnerTime(LocalTime.NOON); viewModel.setEndSpinnerTime(LocalTime.NOON.plusHours(1)); @@ -112,7 +112,7 @@ protected void onLoad() { optionRepeatComboBox.getItems().setAll(ShiftRepeatingOption.values()); optionRepeatComboBox.setButtonCell(new ComboBoxOptionValueFactory(null)); optionRepeatComboBox.setCellFactory(ComboBoxOptionValueFactory::new); - optionRepeatComboBox.valueProperty().bindBidirectional(viewModel.selectedOptionsProperty()); + optionRepeatComboBox.valueProperty().bindBidirectional(viewModel.selectedOptionProperty()); confirmButton.setOnAction(this::confirmButtonOnAction); cancelButton.setOnAction(a -> { @@ -120,7 +120,7 @@ protected void onLoad() { if (shiftRepeatCheckBox.isSelected()) { viewModel.setRepeatVisibility(!viewModel.isRepeatVisibility()); } - viewModel.setSelectedOptions(null); + viewModel.setSelectedOption(null); navController.popBackStack(); } catch (IOException e) { e.printStackTrace(); @@ -130,60 +130,36 @@ protected void onLoad() { private void confirmButtonOnAction(ActionEvent action) { - activity.getUseCase(ManageEmployeesShiftUseCase.class).createShift(new CreateShiftRequest( - viewModel.getSelectedDayWeek().getEmployee(), - viewModel.getSelectedDayWeek().getDate(), - viewModel.getStartSpinnerTime().withNano(0), - viewModel.getEndSpinnerTime().withNano(0), - viewModel.getSelectedHall())); - - if (viewModel.getSelectedOptions() == null) - saveShift(); - else { - saveRepeatedShift(); - } - } - - public void saveShift() { - viewModel.setErrorAssignVisibility(false); - activity.getUseCase(ManageEmployeesShiftUseCase.class).saveShift(new ShiftRequest(viewModel.getShiftCreated())); - if (!viewModel.isErrorAssignVisibility()) { - try { - if (shiftRepeatCheckBox.isSelected()) { - viewModel.setRepeatVisibility(!viewModel.isRepeatVisibility()); - } - viewModel.setSelectedOptions(null); - navController.popBackStack(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - } - - public void saveRepeatedShift() { - if (viewModel.getShiftCreated() != null && viewModel.getSelectedEndRepeatDay() != null) { + if (!viewModel.isRepeatVisibility()) { + activity.getUseCase(ManageEmployeesShiftUseCase.class).createShift(new CreateShiftRequest( + viewModel.getSelectedDayWeek().getEmployee(), + viewModel.getSelectedDayWeek().getDate(), + viewModel.getStartSpinnerTime().withNano(0), + viewModel.getEndSpinnerTime().withNano(0), + viewModel.getSelectedHall())); + } else { activity.getUseCase(ManageEmployeesShiftUseCase.class).saveRepeatedShift( new ShiftRepeatRequest( - LocalDate.parse(viewModel.getSelectedDayWeek().getDate().toString()), + viewModel.getSelectedDayWeek().getDate(), viewModel.getSelectedEndRepeatDay(), - viewModel.getSelectedOptions().toString(), - viewModel.getShiftCreated(), + viewModel.getSelectedOption().toString(), + viewModel.getSelectedDayWeek().getEmployee(), + viewModel.getStartSpinnerTime(), + viewModel.getEndSpinnerTime(), viewModel.getSelectedHall() ) ); + } + if (!viewModel.isErrorAssignVisibility()) { try { - viewModel.setSelectedOptions(null); - viewModel.setRepeatVisibility(!viewModel.isRepeatVisibility()); + viewModel.setSelectedOption(null); navController.popBackStack(); } catch (IOException e) { e.printStackTrace(); } - } else { - repeatDatePicker.setStyle("-fx-background-color: red;"); - errorVBox.setVisible(true); } } + } diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/modify/ModifyShiftViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/modify/ModifyShiftViewController.java index de5dc3c2..701743e0 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/modify/ModifyShiftViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/modify/ModifyShiftViewController.java @@ -121,17 +121,15 @@ protected void onLoad() { private void submitButtonOnAction(ActionEvent action) { viewModel.setErrorAssignVisibility(false); - activity.getUseCase(ManageEmployeesShiftUseCase.class).createShift( - new CreateShiftRequest( + + activity.getUseCase(ManageEmployeesShiftUseCase.class).modifyShift( + new ShiftModifyRequest( viewModel.getSelectedShift().getEmployee(), + viewModel.getSelectedShift().getId(), viewModel.getSelectedDays(), viewModel.getStartSpinnerModifyTime().withNano(0), viewModel.getEndSpinnerModifyTime().withNano(0), - viewModel.getSelectedHall() - ) - ); - - activity.getUseCase(ManageEmployeesShiftUseCase.class).modifyShift(new ShiftModifyRequest(viewModel.getSelectedShift(), viewModel.getShiftCreated())); + viewModel.getSelectedHall())); if (!viewModel.isErrorAssignVisibility()) { try { From 3857594be4ad4daa703bd6e5833ea195c762d930 Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Sun, 14 Feb 2021 16:24:31 +0100 Subject: [PATCH 3/8] Fix #48 --- .../cinehub/app/datamapper/ProjectionDataMapper.java | 2 +- .../ttbmp/cinehub/app/datamapper/SeatDataMapper.java | 2 +- .../cinehub/app/datamapper/TicketDataMapper.java | 4 ++-- .../com/ttbmp/cinehub/app/dto/ProjectionDto.java | 4 ++-- .../main/java/com/ttbmp/cinehub/app/dto/SeatDto.java | 2 +- .../java/com/ttbmp/cinehub/app/dto/TicketDto.java | 7 +++---- .../projection/MockProjectionRepository.java | 4 ---- .../repository/projection/ProjectionRepository.java | 2 -- .../ttbmp/cinehub/app/repository/seat/SeatProxy.java | 4 ++-- .../app/repository/ticket/MockTicketRepository.java | 9 +++++---- .../cinehub/app/repository/ticket/TicketProxy.java | 12 +++++------- .../app/repository/ticket/TicketRepository.java | 2 +- .../app/usecase/buyticket/BuyTicketController.java | 6 +++--- .../app/usecase/buyticket/request/PayRequest.java | 4 +--- .../com/ttbmp/cinehub/app/di/MockServiceLocator.java | 8 ++++---- 15 files changed, 31 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java index c9b6ad82..73556623 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java @@ -24,7 +24,7 @@ public static ProjectionDto mapToDto(Projection projection) { TicketDataMapper.mapToDtoList(projection.getTicketList()), projection.getId(), projection.getProjectionist() - ); + ); } public static Projection mapToEntity(ProjectionDto projectionDto) { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java index d6431a78..15a57698 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java @@ -18,7 +18,7 @@ public static SeatDto mapToDto(Seat seat) { } public static Seat mapToEntity(SeatDto seatDto) { - return new Seat(seatDto.getId(), seatDto.getPrice(), seatDto.getState(),seatDto.getPosition()); + return new Seat(seatDto.getId(), seatDto.getPrice(), seatDto.getState(), seatDto.getPosition()); } public static List mapToDtoList(List seatList) { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java index aac4a8b0..ca8f7a89 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java @@ -16,11 +16,11 @@ private TicketDataMapper() { } public static TicketDto mapToDto(Ticket ticket) { - return new TicketDto(ticket.getId(),ticket.getPrice(),ticket.getOwner(),SeatDataMapper.mapToDto(ticket.getSeat())); + return new TicketDto(ticket.getId(), ticket.getPrice(), ticket.getOwner(), SeatDataMapper.mapToDto(ticket.getSeat())); } public static Ticket mapToEntity(TicketDto ticketDto) { - return new Ticket(ticketDto.getId(),ticketDto.getPrice(),ticketDto.getOwner(),SeatDataMapper.mapToEntity(ticketDto.getSeatDto())); + return new Ticket(ticketDto.getId(), ticketDto.getPrice(), ticketDto.getOwner(), SeatDataMapper.mapToEntity(ticketDto.getSeatDto())); } public static List mapToDtoList(List ticketList) { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java index cdb90324..8a1f9730 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java @@ -9,11 +9,11 @@ */ public class ProjectionDto { + private final String startTime; + private final HallDto hallDto; private int id; private String date; - private final String startTime; private MovieDto movieDto; - private final HallDto hallDto; private CinemaDto cinemaDto; private Projectionist projectionist; private List listTicket; diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java index 65b6c0b3..0d3c32a4 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java @@ -10,7 +10,7 @@ public class SeatDto { private Boolean state; private String position; - public SeatDto(int id, Long price, Boolean state,String position) { + public SeatDto(int id, Long price, Boolean state, String position) { this.id = id; this.price = price; this.state = state; diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java index 5a2afaca..2d3b8f9e 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java @@ -12,9 +12,9 @@ public class TicketDto { private User owner; private SeatDto seatDto; - public TicketDto(int id,long price,User owner,SeatDto seatDto) { - this.id =id; - this.owner=owner; + public TicketDto(int id, long price, User owner, SeatDto seatDto) { + this.id = id; + this.owner = owner; this.price = price; this.seatDto = seatDto; } @@ -56,5 +56,4 @@ public void setPrice(Long price) { } - } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/MockProjectionRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/MockProjectionRepository.java index 425c0e22..bccad294 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/MockProjectionRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/MockProjectionRepository.java @@ -1,8 +1,6 @@ package com.ttbmp.cinehub.app.repository.projection; import com.ttbmp.cinehub.app.di.ServiceLocator; -import com.ttbmp.cinehub.app.dto.CinemaDto; -import com.ttbmp.cinehub.app.dto.MovieDto; import com.ttbmp.cinehub.app.repository.cinema.CinemaRepository; import com.ttbmp.cinehub.app.repository.employee.projectionist.ProjectionistRepository; import com.ttbmp.cinehub.app.repository.hall.HallRepository; @@ -11,13 +9,11 @@ import com.ttbmp.cinehub.app.repository.movie.MovieRepository; import com.ttbmp.cinehub.app.repository.shift.MockShiftRepository; import com.ttbmp.cinehub.app.repository.shift.projectionist.MockProjectionistShiftRepository; -import com.ttbmp.cinehub.app.repository.ticket.MockTicketRepository; import com.ttbmp.cinehub.app.repository.ticket.TicketRepository; import com.ttbmp.cinehub.domain.Cinema; import com.ttbmp.cinehub.domain.Movie; import com.ttbmp.cinehub.domain.Projection; import com.ttbmp.cinehub.domain.shift.ProjectionistShift; -import com.ttbmp.cinehub.domain.ticket.component.Ticket; import java.time.LocalDate; import java.time.LocalTime; diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java index 7c357f2e..8f36fa58 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java @@ -1,7 +1,5 @@ package com.ttbmp.cinehub.app.repository.projection; -import com.ttbmp.cinehub.app.dto.CinemaDto; -import com.ttbmp.cinehub.app.dto.MovieDto; import com.ttbmp.cinehub.domain.Cinema; import com.ttbmp.cinehub.domain.Movie; import com.ttbmp.cinehub.domain.Projection; diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatProxy.java index e187a7bd..f87aec7d 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatProxy.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/seat/SeatProxy.java @@ -7,8 +7,8 @@ */ public class SeatProxy extends Seat { - public SeatProxy(int id, Long price, Boolean state,String position) { - super(id, price, state,position); + public SeatProxy(int id, Long price, Boolean state, String position) { + super(id, price, state, position); } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java index 089725ec..2a8ccdea 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java @@ -12,12 +12,13 @@ import java.util.stream.Collectors; /** - * @author Fabio Buracchi and Palmieri Ivan + * @author Fabio Buracchi, Palmieri Ivan */ public class MockTicketRepository implements TicketRepository { private static final List TICKET_DATA_LIST = new ArrayList<>(); - private static int counterTicketId =0; + private static int counterTicketId = 0; + static { List userIdList = MockUserRepository.getUserDataList().stream() .map(MockUserRepository.UserData::getId) @@ -36,7 +37,7 @@ public static List getTicketDataList() { } @Override - public void saveTicket(Ticket ticket, int projectionId) { + public synchronized void saveTicket(Ticket ticket, int projectionId) { TICKET_DATA_LIST.add(new TicketData( counterTicketId++, ticket.getPrice(), @@ -74,7 +75,7 @@ public TicketData(int id, long price, String userId, int projectionId, int seatI this.price = price; this.userId = userId; this.projectionId = projectionId; - this.seatId =seatId; + this.seatId = seatId; } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketProxy.java index ee857356..a4763810 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketProxy.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketProxy.java @@ -12,19 +12,17 @@ public class TicketProxy extends Ticket { private final UserRepository userRepository; - - private boolean isUserLoaded = false; private final SeatRepository seatRepository; - private boolean isSeatLoaded=false; + private boolean isUserLoaded = false; + private boolean isSeatLoaded = false; public TicketProxy(int id, long price, UserRepository userRepository, SeatRepository seatRepository) { - super(id, price, null,null); + super(id, price, null, null); this.seatRepository = seatRepository; this.userRepository = userRepository; } - @Override public User getOwner() { if (!isUserLoaded) { @@ -41,7 +39,7 @@ public void setOwner(User owner) { @Override public Seat getSeat() { - if(!isSeatLoaded){ + if (!isSeatLoaded) { setSeat(seatRepository.getSeat(this)); } return super.getSeat(); @@ -49,7 +47,7 @@ public Seat getSeat() { @Override public void setSeat(Seat seat) { - isSeatLoaded=true; + isSeatLoaded = true; super.setSeat(seat); } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java index 8178bc9f..f139c853 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author Fabio Buracchi and Palmieri Ivan + * @author Fabio Buracchi, Palmieri Ivan */ public interface TicketRepository { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java index 88caa620..bffce469 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java @@ -67,7 +67,7 @@ public void pay(PayRequest request) { ticket.getPrice() )); ticket.setOwner(user); - ticketRepository.saveTicket(ticket,request.getProjection().getId()); + ticketRepository.saveTicket(ticket, request.getProjection().getId()); emailService.sendMail(new EmailServiceRequest( user.getEmail(), "Payment receipt" @@ -123,7 +123,7 @@ public void createTicket(GetTicketBySeatsRequest request) { Seat seat = seats.get(pos); User user = userRepository.getUser(authenticationService.signIn("", "").getUserId()); /*DECORATOR PATTERN GOF*/ - Ticket ticket = new Ticket(0,seat.getPrice(),user,seat); + Ticket ticket = new Ticket(0, seat.getPrice(), user, seat); if (Boolean.TRUE.equals(request.getHeatedArmchairOption())) { ticket = new TicketSkipLine(ticket); ticket.setPrice(ticket.increasePrice()); @@ -156,7 +156,7 @@ public void getProjectionList(GetProjectionRequest request) { Movie movie = MovieDataMapper.mapToEntity(request.getMovieDto()); String date = request.getLocalDate(); List projectionList = projectionRepository.getProjectionList( - cinema, + cinema, movie, date); buyTicketPresenter.presentProjectionList( diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java index 9ba3035b..c7fb8b81 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java @@ -23,8 +23,7 @@ public class PayRequest extends Request { private String selectedDate; - - public PayRequest(TicketDto ticket,ProjectionDto projection,Integer index,CinemaDto cinemaDto,MovieDto movieDto, String selectedDate) { + public PayRequest(TicketDto ticket, ProjectionDto projection, Integer index, CinemaDto cinemaDto, MovieDto movieDto, String selectedDate) { this.index = index; this.projection = projection; this.ticket = ticket; @@ -59,7 +58,6 @@ public void setCinemaDto(CinemaDto cinemaDto) { } - public ProjectionDto getProjection() { return projection; } diff --git a/app/src/test/java/com/ttbmp/cinehub/app/di/MockServiceLocator.java b/app/src/test/java/com/ttbmp/cinehub/app/di/MockServiceLocator.java index 850e8d68..64edb4cd 100644 --- a/app/src/test/java/com/ttbmp/cinehub/app/di/MockServiceLocator.java +++ b/app/src/test/java/com/ttbmp/cinehub/app/di/MockServiceLocator.java @@ -6,14 +6,16 @@ import com.ttbmp.cinehub.app.repository.creditcard.MockCreditCardRepository; import com.ttbmp.cinehub.app.repository.employee.EmployeeRepository; import com.ttbmp.cinehub.app.repository.employee.MockEmployeeRepository; +import com.ttbmp.cinehub.app.repository.employee.projectionist.MockProjectionistRepository; +import com.ttbmp.cinehub.app.repository.employee.projectionist.ProjectionistRepository; +import com.ttbmp.cinehub.app.repository.employee.usher.MockUsherRepository; +import com.ttbmp.cinehub.app.repository.employee.usher.UsherRepository; import com.ttbmp.cinehub.app.repository.hall.HallRepository; import com.ttbmp.cinehub.app.repository.hall.MockHallRepository; import com.ttbmp.cinehub.app.repository.movie.MockMovieRepository; import com.ttbmp.cinehub.app.repository.movie.MovieRepository; import com.ttbmp.cinehub.app.repository.projection.MockProjectionRepository; import com.ttbmp.cinehub.app.repository.projection.ProjectionRepository; -import com.ttbmp.cinehub.app.repository.employee.projectionist.MockProjectionistRepository; -import com.ttbmp.cinehub.app.repository.employee.projectionist.ProjectionistRepository; import com.ttbmp.cinehub.app.repository.seat.MockSeatRepository; import com.ttbmp.cinehub.app.repository.seat.SeatRepository; import com.ttbmp.cinehub.app.repository.shift.MockShiftRepository; @@ -26,8 +28,6 @@ import com.ttbmp.cinehub.app.repository.ticket.TicketRepository; import com.ttbmp.cinehub.app.repository.user.MockUserRepository; import com.ttbmp.cinehub.app.repository.user.UserRepository; -import com.ttbmp.cinehub.app.repository.employee.usher.MockUsherRepository; -import com.ttbmp.cinehub.app.repository.employee.usher.UsherRepository; import com.ttbmp.cinehub.app.service.authentication.AuthenticationService; import com.ttbmp.cinehub.app.service.authentication.MockAuthenticationService; import com.ttbmp.cinehub.app.service.email.EmailService; From ad7052e962ec36c128f275b6d89f287d1997f002 Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Mon, 15 Feb 2021 04:35:29 +0100 Subject: [PATCH 4/8] Add #24 --- ui/web/browsers.json | 11 --- .../ttbmp/cinehub/ui/web/domain/Cinema.java | 24 ++++++ .../ttbmp/cinehub/ui/web/domain/Employee.java | 24 ++++++ .../ttbmp/cinehub/ui/web/domain/Shift.java | 51 +++++++++++++ .../web/viewpersonalschedule/CalendarDay.java | 33 ++++++++ .../ProjectionListDto.java | 23 ++++++ .../ViewPersonalSchedulePresenterWeb.java | 67 +++++++++++++++++ .../ViewPersonalScheduleViewController.java | 56 ++++++++++++++ .../main/resources/static/css/schedule.css | 14 ++++ .../src/main/resources/static/js/utilities.js | 3 + .../src/main/resources/templates/about.html | 14 ++-- .../main/resources/templates/schedule.html | 75 +++++++++++++++++++ .../resources/templates/schedule_detail.html | 66 ++++++++++++++++ .../schedule_projectionist_detail.html | 74 ++++++++++++++++++ 14 files changed, 517 insertions(+), 18 deletions(-) delete mode 100644 ui/web/browsers.json create mode 100644 ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Cinema.java create mode 100644 ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Employee.java create mode 100644 ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Shift.java create mode 100644 ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/CalendarDay.java create mode 100644 ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ProjectionListDto.java create mode 100644 ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalSchedulePresenterWeb.java create mode 100644 ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalScheduleViewController.java create mode 100644 ui/web/src/main/resources/static/css/schedule.css create mode 100644 ui/web/src/main/resources/static/js/utilities.js create mode 100644 ui/web/src/main/resources/templates/schedule.html create mode 100644 ui/web/src/main/resources/templates/schedule_detail.html create mode 100644 ui/web/src/main/resources/templates/schedule_projectionist_detail.html diff --git a/ui/web/browsers.json b/ui/web/browsers.json deleted file mode 100644 index c93e41fd..00000000 --- a/ui/web/browsers.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "chrome": { - "default": "86.0", - "versions": { - "86.0": { - "image": "selenoid/vnc:chrome_86.0", - "port": "4444" - } - } - } -} \ No newline at end of file diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Cinema.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Cinema.java new file mode 100644 index 00000000..4cc7e707 --- /dev/null +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Cinema.java @@ -0,0 +1,24 @@ +package com.ttbmp.cinehub.ui.web.domain; + +public class Cinema { + + private String address; + private String city; + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + +} diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Employee.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Employee.java new file mode 100644 index 00000000..05506c26 --- /dev/null +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Employee.java @@ -0,0 +1,24 @@ +package com.ttbmp.cinehub.ui.web.domain; + +public class Employee { + + private String role; + private Cinema cinema; + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public Cinema getCinema() { + return cinema; + } + + public void setCinema(Cinema cinema) { + this.cinema = cinema; + } + +} diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Shift.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Shift.java new file mode 100644 index 00000000..4e886271 --- /dev/null +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/domain/Shift.java @@ -0,0 +1,51 @@ +package com.ttbmp.cinehub.ui.web.domain; + +public class Shift { + + private int id; + private String date; + private String start; + private String end; + private Employee employee; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getStart() { + return start; + } + + public void setStart(String start) { + this.start = start; + } + + public String getEnd() { + return end; + } + + public void setEnd(String end) { + this.end = end; + } + + public Employee getEmployee() { + return employee; + } + + public void setEmployee(Employee employee) { + this.employee = employee; + } + +} diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/CalendarDay.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/CalendarDay.java new file mode 100644 index 00000000..72aa25f2 --- /dev/null +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/CalendarDay.java @@ -0,0 +1,33 @@ +package com.ttbmp.cinehub.ui.web.viewpersonalschedule; + +import com.ttbmp.cinehub.app.dto.ShiftDto; + +import java.util.List; + +public class CalendarDay { + + private String day; + private List shiftList; + + public CalendarDay(String day, List shiftList) { + this.day = day; + this.shiftList = shiftList; + } + + public String getDay() { + return day; + } + + public void setDay(String day) { + this.day = day; + } + + public List getShiftList() { + return shiftList; + } + + public void setShiftList(List shiftList) { + this.shiftList = shiftList; + } + +} diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ProjectionListDto.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ProjectionListDto.java new file mode 100644 index 00000000..709f8715 --- /dev/null +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ProjectionListDto.java @@ -0,0 +1,23 @@ +package com.ttbmp.cinehub.ui.web.viewpersonalschedule; + +import com.ttbmp.cinehub.app.dto.ProjectionDto; + +import java.util.List; + +public class ProjectionListDto { + + private List projections; + + public ProjectionListDto(List projections) { + this.projections = projections; + } + + public List getProjections() { + return projections; + } + + public void setProjections(List projections) { + this.projections = projections; + } + +} diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalSchedulePresenterWeb.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalSchedulePresenterWeb.java new file mode 100644 index 00000000..7fca3e00 --- /dev/null +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalSchedulePresenterWeb.java @@ -0,0 +1,67 @@ +package com.ttbmp.cinehub.ui.web.viewpersonalschedule; + +import com.ttbmp.cinehub.app.usecase.viewpersonalschedule.*; +import org.springframework.ui.Model; + +import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; +import java.time.temporal.WeekFields; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.stream.Collectors; + +public class ViewPersonalSchedulePresenterWeb implements ViewPersonalSchedulePresenter { + + private final Model model; + + public ViewPersonalSchedulePresenterWeb(Model model) { + this.model = model; + } + + @Override + public void presentGetShiftList(ShiftListReply result) { + LocalDate date = ((LocalDate) model.getAttribute("date")) + .with(TemporalAdjusters.firstDayOfMonth()) + .with(TemporalAdjusters.previousOrSame(WeekFields.of(Locale.getDefault()).getFirstDayOfWeek())); + List calendarDayList = new ArrayList<>(); + for (int i = 0; i < 42; i++) { + LocalDate finalDate = date; + calendarDayList.add(new CalendarDay( + Integer.toString(date.getDayOfMonth()), + result.getShiftDtoList().stream() + .filter(s -> s.getDate().equals(finalDate)) + .collect(Collectors.toList()) + )); + date = date.plusDays(1); + } + model.addAttribute("calendarDayList", calendarDayList); + } + + @Override + public void presentInvalidShiftListRequest(ShiftListRequest request) { + + } + + @Override + public void presentShiftListNullRequest() { + + } + + @Override + public void presentGetProjectionList(ProjectionListReply result) { + ProjectionListDto projectionForm = new ProjectionListDto(result.getProjectionDtoList()); + model.addAttribute("form", projectionForm); + } + + @Override + public void presentProjectionListNullRequest() { + + } + + @Override + public void presentInvalidProjectionListRequest(ProjectionListRequest request) { + + } + +} diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalScheduleViewController.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalScheduleViewController.java new file mode 100644 index 00000000..5f93db06 --- /dev/null +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalScheduleViewController.java @@ -0,0 +1,56 @@ +package com.ttbmp.cinehub.ui.web.viewpersonalschedule; + +import com.ttbmp.cinehub.app.usecase.viewpersonalschedule.ProjectionListRequest; +import com.ttbmp.cinehub.app.usecase.viewpersonalschedule.ShiftListRequest; +import com.ttbmp.cinehub.app.usecase.viewpersonalschedule.ViewPersonalScheduleHandler; +import com.ttbmp.cinehub.app.usecase.viewpersonalschedule.ViewPersonalScheduleUseCase; +import com.ttbmp.cinehub.ui.web.domain.Shift; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; + +@Controller +public class ViewPersonalScheduleViewController { + + private ViewPersonalScheduleUseCase useCase; + + @GetMapping("/schedule") + public String showShiftList( + @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, + Model model) { + useCase = new ViewPersonalScheduleHandler(new ViewPersonalSchedulePresenterWeb(model)); + if (date == null) { + date = LocalDate.now(); + } + model.addAttribute("date", date); + model.addAttribute("selectedShift", new Shift()); + useCase.getShiftList(new ShiftListRequest( + date.with(TemporalAdjusters.firstDayOfMonth()), + date.with(TemporalAdjusters.lastDayOfMonth()) + )); + return "schedule"; + } + + @PostMapping("/schedule/detail") + public String showShiftDetail(@ModelAttribute Shift shift, Model model) { + useCase = new ViewPersonalScheduleHandler(new ViewPersonalSchedulePresenterWeb(model)); + model.addAttribute("shift", shift); + return "schedule_detail"; + } + + @PostMapping("/schedule/detail/projectionist") + public String showProjectionistShiftDetail(@ModelAttribute Shift shift, Model model) { + useCase = new ViewPersonalScheduleHandler(new ViewPersonalSchedulePresenterWeb(model)); + model.addAttribute("shift", shift); + useCase.getShiftProjectionList(new ProjectionListRequest(shift.getId())); + return "schedule_projectionist_detail"; + } + +} diff --git a/ui/web/src/main/resources/static/css/schedule.css b/ui/web/src/main/resources/static/css/schedule.css new file mode 100644 index 00000000..9f2dfca9 --- /dev/null +++ b/ui/web/src/main/resources/static/css/schedule.css @@ -0,0 +1,14 @@ +.calendar-label { + border: solid 1px; +} + +.calendar-day { + min-width: 160px; + min-height: 160px; + border: solid 1px; +} + +.movie-thumbnail { + width: auto; + height: 200px; +} diff --git a/ui/web/src/main/resources/static/js/utilities.js b/ui/web/src/main/resources/static/js/utilities.js new file mode 100644 index 00000000..52b63f98 --- /dev/null +++ b/ui/web/src/main/resources/static/js/utilities.js @@ -0,0 +1,3 @@ +function getTodayDate() { + return new Date().toISOString().split('T')[0] +} diff --git a/ui/web/src/main/resources/templates/about.html b/ui/web/src/main/resources/templates/about.html index ef60f35c..50b77276 100644 --- a/ui/web/src/main/resources/templates/about.html +++ b/ui/web/src/main/resources/templates/about.html @@ -21,29 +21,29 @@

TTBMP organization

+ src="../static/images/ttbmpLogo.png" th:src="@{/images/ttbmpLogo.png}">

Powered by:

- +
- +
- +
- +
+ th:src="@{/images/theMovieDbLogo.png}">
- +
diff --git a/ui/web/src/main/resources/templates/schedule.html b/ui/web/src/main/resources/templates/schedule.html new file mode 100644 index 00000000..7ade426a --- /dev/null +++ b/ui/web/src/main/resources/templates/schedule.html @@ -0,0 +1,75 @@ + + + + View personal schedule + + + + + + + +
+
+ + +
+
+
+ Monday +
+
+ Tuesday +
+
+ Wednesday +
+
+ Thursday +
+
+ Friday +
+
+ Saturday +
+
+ Sunday +
+ +
+
+

Date

+ +
+ + + + + + + + +
+ +
+ +
+
+ + + + + diff --git a/ui/web/src/main/resources/templates/schedule_detail.html b/ui/web/src/main/resources/templates/schedule_detail.html new file mode 100644 index 00000000..f35681d8 --- /dev/null +++ b/ui/web/src/main/resources/templates/schedule_detail.html @@ -0,0 +1,66 @@ + + + + View personal schedule + + + + + +
+
+
+ Date + Start - End +
+
+
+
+ City as role +
+
+
+
+
+ Location - Address +
+
+
+
+ +
+
+
+
+
+ BACK +
+
+
+ + + + + + + + +
+
+
+
+ + + + + diff --git a/ui/web/src/main/resources/templates/schedule_projectionist_detail.html b/ui/web/src/main/resources/templates/schedule_projectionist_detail.html new file mode 100644 index 00000000..94e5768b --- /dev/null +++ b/ui/web/src/main/resources/templates/schedule_projectionist_detail.html @@ -0,0 +1,74 @@ + + + + View personal schedule + + + + + + +
+
+
+ Date + Start - End +
+
+
+
+ City as role +
+
+
+
+
+ Working in the hall hall +
+
+ + + + + + + + +
Start time + + +
Title
+
Duration
+
+
+
+
+
+ + + + + + + + +
+
+
+
+
+ + + + + From 4955dc4f3323855628d105274826aeed789abbe4 Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Mon, 15 Feb 2021 05:18:46 +0100 Subject: [PATCH 5/8] Fix #24 Error handling --- .../cinehub/ui/web/utilities/ErrorHelper.java | 27 +++++++++++++++++++ .../ViewPersonalSchedulePresenterWeb.java | 17 +++++++----- .../ViewPersonalScheduleViewController.java | 7 ++--- .../src/main/resources/templates/error.html | 27 +++++++++++++++++++ 4 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 ui/web/src/main/java/com/ttbmp/cinehub/ui/web/utilities/ErrorHelper.java create mode 100644 ui/web/src/main/resources/templates/error.html diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/utilities/ErrorHelper.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/utilities/ErrorHelper.java new file mode 100644 index 00000000..4324cd3d --- /dev/null +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/utilities/ErrorHelper.java @@ -0,0 +1,27 @@ +package com.ttbmp.cinehub.ui.web.utilities; + +import com.google.common.base.Joiner; +import com.ttbmp.cinehub.app.usecase.Request; +import org.springframework.ui.Model; + +import java.util.ArrayList; + +public class ErrorHelper { + + public static final String ERROR_VIEW_PATH = "error"; + public static final String ERROR_ATTRIBUTE_NAME = "error"; + public static final String INVALID_ERROR_MESSAGE = "Invalid request"; + + private ErrorHelper() { + + } + + public static String getRequestErrorMessage(Request request) { + return Joiner.on("\n").join(new ArrayList<>(request.getErrorList())); + } + + public static String returnView(Model model, String viewPath) { + return (model.getAttribute(ErrorHelper.ERROR_ATTRIBUTE_NAME) == null) ? viewPath : ERROR_VIEW_PATH; + } + +} diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalSchedulePresenterWeb.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalSchedulePresenterWeb.java index 7fca3e00..2c05a8f1 100644 --- a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalSchedulePresenterWeb.java +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalSchedulePresenterWeb.java @@ -1,6 +1,7 @@ package com.ttbmp.cinehub.ui.web.viewpersonalschedule; import com.ttbmp.cinehub.app.usecase.viewpersonalschedule.*; +import com.ttbmp.cinehub.ui.web.utilities.ErrorHelper; import org.springframework.ui.Model; import java.time.LocalDate; @@ -21,8 +22,12 @@ public ViewPersonalSchedulePresenterWeb(Model model) { @Override public void presentGetShiftList(ShiftListReply result) { - LocalDate date = ((LocalDate) model.getAttribute("date")) - .with(TemporalAdjusters.firstDayOfMonth()) + LocalDate date = ((LocalDate) model.getAttribute("date")); + if (date == null) { + model.addAttribute(ErrorHelper.ERROR_ATTRIBUTE_NAME, ErrorHelper.INVALID_ERROR_MESSAGE); + return; + } + date = date.with(TemporalAdjusters.firstDayOfMonth()) .with(TemporalAdjusters.previousOrSame(WeekFields.of(Locale.getDefault()).getFirstDayOfWeek())); List calendarDayList = new ArrayList<>(); for (int i = 0; i < 42; i++) { @@ -40,12 +45,12 @@ public void presentGetShiftList(ShiftListReply result) { @Override public void presentInvalidShiftListRequest(ShiftListRequest request) { - + model.addAttribute(ErrorHelper.ERROR_ATTRIBUTE_NAME, ErrorHelper.getRequestErrorMessage(request)); } @Override public void presentShiftListNullRequest() { - + model.addAttribute(ErrorHelper.ERROR_ATTRIBUTE_NAME, ErrorHelper.INVALID_ERROR_MESSAGE); } @Override @@ -56,12 +61,12 @@ public void presentGetProjectionList(ProjectionListReply result) { @Override public void presentProjectionListNullRequest() { - + model.addAttribute(ErrorHelper.ERROR_ATTRIBUTE_NAME, ErrorHelper.INVALID_ERROR_MESSAGE); } @Override public void presentInvalidProjectionListRequest(ProjectionListRequest request) { - + model.addAttribute(ErrorHelper.ERROR_ATTRIBUTE_NAME, ErrorHelper.getRequestErrorMessage(request)); } } diff --git a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalScheduleViewController.java b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalScheduleViewController.java index 5f93db06..aa4af177 100644 --- a/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalScheduleViewController.java +++ b/ui/web/src/main/java/com/ttbmp/cinehub/ui/web/viewpersonalschedule/ViewPersonalScheduleViewController.java @@ -5,6 +5,7 @@ import com.ttbmp.cinehub.app.usecase.viewpersonalschedule.ViewPersonalScheduleHandler; import com.ttbmp.cinehub.app.usecase.viewpersonalschedule.ViewPersonalScheduleUseCase; import com.ttbmp.cinehub.ui.web.domain.Shift; +import com.ttbmp.cinehub.ui.web.utilities.ErrorHelper; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -35,14 +36,14 @@ public String showShiftList( date.with(TemporalAdjusters.firstDayOfMonth()), date.with(TemporalAdjusters.lastDayOfMonth()) )); - return "schedule"; + return ErrorHelper.returnView(model, "schedule"); } @PostMapping("/schedule/detail") public String showShiftDetail(@ModelAttribute Shift shift, Model model) { useCase = new ViewPersonalScheduleHandler(new ViewPersonalSchedulePresenterWeb(model)); model.addAttribute("shift", shift); - return "schedule_detail"; + return ErrorHelper.returnView(model, "schedule_detail"); } @PostMapping("/schedule/detail/projectionist") @@ -50,7 +51,7 @@ public String showProjectionistShiftDetail(@ModelAttribute Shift shift, Model mo useCase = new ViewPersonalScheduleHandler(new ViewPersonalSchedulePresenterWeb(model)); model.addAttribute("shift", shift); useCase.getShiftProjectionList(new ProjectionListRequest(shift.getId())); - return "schedule_projectionist_detail"; + return ErrorHelper.returnView(model, "schedule_projectionist_detail"); } } diff --git a/ui/web/src/main/resources/templates/error.html b/ui/web/src/main/resources/templates/error.html new file mode 100644 index 00000000..bd61cebd --- /dev/null +++ b/ui/web/src/main/resources/templates/error.html @@ -0,0 +1,27 @@ + + + + View personal schedule + + + + + +
+
+

Error message

+ Return to home page +
+
+ + + + + From 223c8fe1f2ded7b68457fc9ddbcaf92a0c2dd9f5 Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Mon, 15 Feb 2021 05:23:27 +0100 Subject: [PATCH 6/8] Fix #52 --- .../main/resources/templates/schedule.html | 57 ++++++++++--------- .../resources/templates/schedule_detail.html | 43 +++++++------- .../schedule_projectionist_detail.html | 38 ++++++------- 3 files changed, 71 insertions(+), 67 deletions(-) diff --git a/ui/web/src/main/resources/templates/schedule.html b/ui/web/src/main/resources/templates/schedule.html index 7ade426a..d8284e4e 100644 --- a/ui/web/src/main/resources/templates/schedule.html +++ b/ui/web/src/main/resources/templates/schedule.html @@ -3,19 +3,21 @@ View personal schedule - - + + - +
-
- - +
+ +
@@ -40,36 +42,37 @@ Sunday
-
+

Date

-
- - - - - - - - + + + + + + + +
- - + - + + src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"> diff --git a/ui/web/src/main/resources/templates/schedule_detail.html b/ui/web/src/main/resources/templates/schedule_detail.html index f35681d8..007a56f6 100644 --- a/ui/web/src/main/resources/templates/schedule_detail.html +++ b/ui/web/src/main/resources/templates/schedule_detail.html @@ -3,9 +3,9 @@ View personal schedule - - + +
@@ -34,33 +34,34 @@
-
- BACK +
+ BACK
-
-
+ - - - - - - - - + + + + + + +
- - + - + + src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"> diff --git a/ui/web/src/main/resources/templates/schedule_projectionist_detail.html b/ui/web/src/main/resources/templates/schedule_projectionist_detail.html index 94e5768b..f93d1e30 100644 --- a/ui/web/src/main/resources/templates/schedule_projectionist_detail.html +++ b/ui/web/src/main/resources/templates/schedule_projectionist_detail.html @@ -3,9 +3,9 @@ View personal schedule - - + + @@ -31,7 +31,7 @@ - +
Start timeStart time @@ -45,30 +45,30 @@
-
-
+ - - - - - - - + + + + + + +
- - + - + + src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"> From e84e2b51a7b29c62e70ca07ff677663d841a07fc Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Mon, 15 Feb 2021 06:21:15 +0100 Subject: [PATCH 7/8] Refactory --- .../cinehub/app/datamapper/MovieDataMapper.java | 2 +- .../app/datamapper/ProjectionDataMapper.java | 2 +- .../cinehub/app/datamapper/SeatDataMapper.java | 2 +- .../cinehub/app/datamapper/TicketDataMapper.java | 2 +- .../com/ttbmp/cinehub/app/dto/CinemaDto.java | 2 +- .../java/com/ttbmp/cinehub/app/dto/HallDto.java | 2 +- .../java/com/ttbmp/cinehub/app/dto/MovieDto.java | 2 +- .../com/ttbmp/cinehub/app/dto/ProjectionDto.java | 2 +- .../java/com/ttbmp/cinehub/app/dto/SeatDto.java | 2 +- .../com/ttbmp/cinehub/app/dto/TicketDto.java | 2 +- .../app/repository/hall/MockHallRepository.java | 4 ++-- .../app/repository/movie/MovieRepository.java | 2 +- .../projection/ProjectionRepository.java | 2 +- .../repository/shift/MockShiftRepository.java | 2 +- .../repository/ticket/MockTicketRepository.java | 2 +- .../app/repository/ticket/TicketRepository.java | 2 +- .../cinehub/app/service/email/EmailService.java | 2 +- .../app/service/email/EmailServiceRequest.java | 2 +- .../app/service/email/MockEmailService.java | 2 +- .../service/movieapi/MockMovieApiService.java | 2 +- .../app/service/movieapi/MovieApiService.java | 2 +- .../app/service/payment/MockPaymentService.java | 2 +- .../app/service/payment/PayServiceRequest.java | 2 +- .../app/service/payment/PaymentService.java | 2 +- .../usecase/buyticket/BuyTicketController.java | 2 +- .../usecase/buyticket/BuyTicketPresenter.java | 2 +- .../app/usecase/buyticket/BuyTicketUseCase.java | 2 +- .../buyticket/request/GetListCinemaRequest.java | 2 +- .../request/GetNumberOfSeatsRequest.java | 2 +- .../buyticket/request/GetProjectionRequest.java | 2 +- .../request/GetTicketBySeatsRequest.java | 2 +- .../usecase/buyticket/request/PayRequest.java | 2 +- .../buyticket/request/SendEmailRequest.java | 2 +- .../request/SetSelectedProjectionRequest.java | 2 +- .../response/GetListCinemaResponse.java | 2 +- .../buyticket/response/GetListMovieResponse.java | 2 +- .../response/GetNumberOfSeatsResponse.java | 2 +- .../response/GetTicketBySeatsResponse.java | 2 +- .../response/SetProjectionResponse.java | 2 +- .../ManageEmployeesShiftController.java | 13 ++++++------- .../request/ShiftModifyRequest.java | 4 ++-- .../request/ShiftRepeatRequest.java | 7 ++++--- .../java/com/ttbmp/cinehub/domain/Cinema.java | 2 +- .../com/ttbmp/cinehub/domain/CreditCard.java | 2 +- .../main/java/com/ttbmp/cinehub/domain/Hall.java | 2 +- .../java/com/ttbmp/cinehub/domain/Movie.java | 2 +- .../java/com/ttbmp/cinehub/domain/Payment.java | 2 +- .../com/ttbmp/cinehub/domain/Projection.java | 2 +- .../main/java/com/ttbmp/cinehub/domain/Seat.java | 4 ++-- .../main/java/com/ttbmp/cinehub/domain/User.java | 2 +- .../com/ttbmp/cinehub/domain/shift/Shift.java | 1 - .../ttbmp/cinehub/domain/shift/UsherShift.java | 2 +- .../shift/factory/CreateShiftException.java | 2 +- .../domain/shift/factory/ShiftFactory.java | 16 ++++++++-------- .../cinehub/domain/ticket/component/Ticket.java | 5 ++--- .../domain/ticket/decorator/TicketDecorator.java | 4 ++-- .../ticket/decorator/TicketFoldingArmchair.java | 2 +- .../ticket/decorator/TicketHeatedArmchair.java | 2 +- .../domain/ticket/decorator/TicketSkipLine.java | 2 +- .../FirebaseAuthenticationService.java | 4 +++- .../email/emailservice/EmailServiceRequest.java | 2 +- .../email/emailservice/SendEmailService.java | 2 +- .../ttbmp/cinehub/service/movieapi/Movie.java | 2 +- .../service/movieapi/TheMovieDbApiService.java | 2 +- .../service/payment/stripe/StripeService.java | 2 +- .../payment/stripe/StripeServiceRequest.java | 2 +- .../cinehub/ui/desktop/about/AboutActivity.java | 2 +- .../cinehub/ui/desktop/about/AboutView.java | 2 +- .../ui/desktop/about/AboutViewController.java | 2 +- .../ui/desktop/buyticket/BuyTicketActivity.java | 2 +- .../desktop/buyticket/BuyTicketPresenterFx.java | 2 +- .../ui/desktop/buyticket/BuyTicketViewModel.java | 4 ++-- .../ui/desktop/buyticket/CustomDateCell.java | 2 +- .../choosecinema/ChooseCinemaItemView.java | 2 +- .../ChooseCinemaItemViewController.java | 2 +- .../choosecinema/ChooseCinemaListCell.java | 2 +- .../buyticket/choosecinema/ChooseCinemaView.java | 2 +- .../choosecinema/ChooseCinemaViewController.java | 2 +- .../choosecinema/ChooseProjectionItemView.java | 2 +- .../ChooseProjectionItemViewController.java | 3 +-- .../choosecinema/ChooseProjectionListCell.java | 2 +- .../choosemovie/ChooseMovieItemView.java | 2 +- .../ChooseMovieItemViewController.java | 2 +- .../choosemovie/ChooseMovieListCell.java | 2 +- .../buyticket/choosemovie/ChooseMovieView.java | 2 +- .../choosemovie/ChooseMovieViewController.java | 2 +- .../buyticket/chooseseat/ChooseSeatView.java | 2 +- .../chooseseat/ChooseSeatViewController.java | 2 +- .../buyticket/chooseseat/SeatsMatrixView.java | 2 +- .../chooseseat/SeatsMatrixViewController.java | 14 +++++++------- .../buyticket/confirmemail/ConfirmEmailView.java | 2 +- .../confirmemail/ConfirmEmailViewController.java | 2 +- .../desktop/buyticket/payment/PaymentView.java | 2 +- .../buyticket/payment/PaymentViewController.java | 14 +++++++------- .../ManageEmployeesShiftFxPresenter.java | 13 +++++++------ .../modify/ModifyShiftViewController.java | 1 - 96 files changed, 135 insertions(+), 136 deletions(-) diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/MovieDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/MovieDataMapper.java index ec521dcd..25978daf 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/MovieDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/MovieDataMapper.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class MovieDataMapper { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java index 73556623..1258abbf 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ProjectionDataMapper { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java index 15a57698..aa2a245f 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class SeatDataMapper { private SeatDataMapper() { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java index ca8f7a89..b08f9be5 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java @@ -8,7 +8,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class TicketDataMapper { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/CinemaDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/CinemaDto.java index c975c854..931d0efa 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/CinemaDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/CinemaDto.java @@ -3,7 +3,7 @@ import java.util.List; /** - * @author Palmieri Ivan, Fabio Buracchi + * @author Ivan Palmieri, Fabio Buracchi */ public class CinemaDto { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/HallDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/HallDto.java index 4b1a8297..a451c7b6 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/HallDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/HallDto.java @@ -3,7 +3,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class HallDto { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/MovieDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/MovieDto.java index 8746bee0..789052f4 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/MovieDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/MovieDto.java @@ -2,7 +2,7 @@ /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class MovieDto { private int id; diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java index 8a1f9730..ff598412 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/ProjectionDto.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ProjectionDto { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java index 0d3c32a4..4fdda308 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/SeatDto.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.app.dto; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class SeatDto { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java index 2d3b8f9e..77b102ca 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/dto/TicketDto.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.domain.User; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class TicketDto { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/MockHallRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/MockHallRepository.java index 35dde7b7..65853d36 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/MockHallRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/MockHallRepository.java @@ -82,8 +82,8 @@ public Hall getHall(ProjectionistShift projectionistShift) { @Override public Hall getHall(int hallId) { return HALL_DATA_LIST.stream() - .filter(d-> d.id == hallId) - .map(d-> new HallProxy(d.id, serviceLocator.getService(SeatRepository.class))) + .filter(d -> d.id == hallId) + .map(d -> new HallProxy(d.id, serviceLocator.getService(SeatRepository.class))) .collect(Collectors.toList()) .get(0); } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/movie/MovieRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/movie/MovieRepository.java index df4a8d76..5629bb74 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/movie/MovieRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/movie/MovieRepository.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public interface MovieRepository { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java index 8f36fa58..66450139 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionRepository.java @@ -8,7 +8,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public interface ProjectionRepository { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/MockShiftRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/MockShiftRepository.java index f0e991a0..0e46c8e9 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/MockShiftRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/MockShiftRepository.java @@ -147,7 +147,7 @@ public void deletedShift(Shift shift) throws ShiftSaveException { } @Override - public synchronized void saveShift(Shift shift){ + public synchronized void saveShift(Shift shift) { SHIFT_DATA_LIST.add(new ShiftData( shiftIdCounter, shift.getDate(), diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java index 2a8ccdea..e30f0a86 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/MockTicketRepository.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; /** - * @author Fabio Buracchi, Palmieri Ivan + * @author Fabio Buracchi, Ivan Palmieri */ public class MockTicketRepository implements TicketRepository { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java index f139c853..d3f155c5 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/repository/ticket/TicketRepository.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author Fabio Buracchi, Palmieri Ivan + * @author Fabio Buracchi, Ivan Palmieri */ public interface TicketRepository { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/service/email/EmailService.java b/app/src/main/java/com/ttbmp/cinehub/app/service/email/EmailService.java index 39a2ef59..72ad8ed1 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/service/email/EmailService.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/service/email/EmailService.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.app.service.email; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public interface EmailService { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/service/email/EmailServiceRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/service/email/EmailServiceRequest.java index fe62d53f..296b63d7 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/service/email/EmailServiceRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/service/email/EmailServiceRequest.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.app.service.email; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class EmailServiceRequest { private String email; diff --git a/app/src/main/java/com/ttbmp/cinehub/app/service/email/MockEmailService.java b/app/src/main/java/com/ttbmp/cinehub/app/service/email/MockEmailService.java index c6af3d09..4527efac 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/service/email/MockEmailService.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/service/email/MockEmailService.java @@ -2,7 +2,7 @@ /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class MockEmailService implements EmailService { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/service/movieapi/MockMovieApiService.java b/app/src/main/java/com/ttbmp/cinehub/app/service/movieapi/MockMovieApiService.java index 18b603fa..00e11732 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/service/movieapi/MockMovieApiService.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/service/movieapi/MockMovieApiService.java @@ -6,7 +6,7 @@ import java.util.Map; /** - * @author Palmieri Ivan, Fabio Buracchi + * @author Ivan Palmieri, Fabio Buracchi */ public class MockMovieApiService implements MovieApiService { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/service/movieapi/MovieApiService.java b/app/src/main/java/com/ttbmp/cinehub/app/service/movieapi/MovieApiService.java index a159e4ba..9036692c 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/service/movieapi/MovieApiService.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/service/movieapi/MovieApiService.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.domain.Movie; /** - * @author Palmieri Ivan, Fabio Buracchi + * @author Ivan Palmieri, Fabio Buracchi */ public interface MovieApiService { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/service/payment/MockPaymentService.java b/app/src/main/java/com/ttbmp/cinehub/app/service/payment/MockPaymentService.java index 4250bfb9..112a9b13 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/service/payment/MockPaymentService.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/service/payment/MockPaymentService.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.app.service.payment; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class MockPaymentService implements PaymentService { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/service/payment/PayServiceRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/service/payment/PayServiceRequest.java index 916cb14f..fe552588 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/service/payment/PayServiceRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/service/payment/PayServiceRequest.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.app.usecase.Request; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class PayServiceRequest extends Request { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/service/payment/PaymentService.java b/app/src/main/java/com/ttbmp/cinehub/app/service/payment/PaymentService.java index 0ecb70b7..a23ddc4c 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/service/payment/PaymentService.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/service/payment/PaymentService.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.app.service.payment; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public interface PaymentService { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java index bffce469..fdf92721 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketController.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class BuyTicketController implements BuyTicketUseCase { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketPresenter.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketPresenter.java index 98f57e0f..8efe52b5 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketPresenter.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketPresenter.java @@ -5,7 +5,7 @@ import com.ttbmp.cinehub.app.usecase.buyticket.response.*; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public interface BuyTicketPresenter { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketUseCase.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketUseCase.java index 361656e7..f47486df 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketUseCase.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/BuyTicketUseCase.java @@ -4,7 +4,7 @@ import com.ttbmp.cinehub.app.usecase.buyticket.request.*; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public interface BuyTicketUseCase extends UseCase { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetListCinemaRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetListCinemaRequest.java index bc0a333c..c0a7be35 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetListCinemaRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetListCinemaRequest.java @@ -4,7 +4,7 @@ import com.ttbmp.cinehub.app.usecase.Request; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class GetListCinemaRequest extends Request { public static final Request.Error MISSING_MOVIE_ERROR = new Request.Error("Cinema can't be null"); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetNumberOfSeatsRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetNumberOfSeatsRequest.java index 3620694f..acb10dea 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetNumberOfSeatsRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetNumberOfSeatsRequest.java @@ -4,7 +4,7 @@ import com.ttbmp.cinehub.app.usecase.Request; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class GetNumberOfSeatsRequest extends Request { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetProjectionRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetProjectionRequest.java index 909c266c..e145b7fe 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetProjectionRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetProjectionRequest.java @@ -7,7 +7,7 @@ import java.time.LocalDate; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class GetProjectionRequest extends Request { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetTicketBySeatsRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetTicketBySeatsRequest.java index 11cde6e7..0a48e33a 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetTicketBySeatsRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/GetTicketBySeatsRequest.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class GetTicketBySeatsRequest extends Request { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java index c7fb8b81..a76e8f43 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PayRequest.java @@ -8,7 +8,7 @@ /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class PayRequest extends Request { public static final Request.Error MISSING_TICKET_ERROR = new Request.Error("Ticket can't be null"); diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/SendEmailRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/SendEmailRequest.java index c8ddedef..7fe2bc5a 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/SendEmailRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/SendEmailRequest.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.app.usecase.Request; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class SendEmailRequest extends Request { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/SetSelectedProjectionRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/SetSelectedProjectionRequest.java index e879336c..b07beae1 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/SetSelectedProjectionRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/SetSelectedProjectionRequest.java @@ -7,7 +7,7 @@ import java.time.LocalDate; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class SetSelectedProjectionRequest extends Request { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetListCinemaResponse.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetListCinemaResponse.java index 41b78e4c..68021305 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetListCinemaResponse.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetListCinemaResponse.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class GetListCinemaResponse { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetListMovieResponse.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetListMovieResponse.java index 1e2407bc..b7941022 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetListMovieResponse.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetListMovieResponse.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class GetListMovieResponse { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetNumberOfSeatsResponse.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetNumberOfSeatsResponse.java index e381e606..7364ebed 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetNumberOfSeatsResponse.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetNumberOfSeatsResponse.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class GetNumberOfSeatsResponse { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetTicketBySeatsResponse.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetTicketBySeatsResponse.java index cda1f304..b676203a 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetTicketBySeatsResponse.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/GetTicketBySeatsResponse.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.app.dto.TicketDto; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class GetTicketBySeatsResponse { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/SetProjectionResponse.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/SetProjectionResponse.java index ba26741a..fbe34ebc 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/SetProjectionResponse.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/response/SetProjectionResponse.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.app.dto.ProjectionDto; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class SetProjectionResponse { diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java index 26ad388f..8e960418 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java @@ -16,7 +16,6 @@ import com.ttbmp.cinehub.app.usecase.Request; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.*; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.response.*; -import com.ttbmp.cinehub.domain.Hall; import com.ttbmp.cinehub.domain.employee.Employee; import com.ttbmp.cinehub.domain.shift.ModifyShiftException; import com.ttbmp.cinehub.domain.shift.Shift; @@ -94,10 +93,10 @@ public void getShiftList(GetShiftListRequest request) { public void modifyShift(ShiftModifyRequest request) { try { Request.validate(request); - Shift shift= shiftRepository.getShift(request.getShiftId()); + Shift shift = shiftRepository.getShift(request.getShiftId()); Employee employee = employeeRepository.getEmployee(request.getEmployeeDto().getId()); - /* Hall hall= hallRepository.getHall(request.getHall().getId());*/ - shift.modifyShift(shift,request.getDate(),request.getStart(),request.getEnd(),HallDataMapper.mapToEntity(request.getHall())); + /* Hall hall= hallRepository.getHall(request.getHall().getId());*/ + shift.modifyShift(shift, request.getDate(), request.getStart(), request.getEnd(), HallDataMapper.mapToEntity(request.getHall())); shiftRepository.modifyShift(shift); emailService.sendMail(new EmailServiceRequest( employee.getEmail(), @@ -112,7 +111,7 @@ public void modifyShift(ShiftModifyRequest request) { } catch (Request.InvalidRequestException e) { manageEmployeesShiftPresenter.presentInvalidModifyShiftListRequest(request); } catch (ShiftSaveException e) { - manageEmployeesShiftPresenter.presentCreateShiftError(e); + manageEmployeesShiftPresenter.presentCreateShiftError(e); } catch (ModifyShiftException e) { manageEmployeesShiftPresenter.presentModifyShiftError(e); } @@ -144,7 +143,7 @@ public void saveRepeatedShift(ShiftRepeatRequest request) { Request.validate(request); List shiftDtoList = new ArrayList<>(); UnaryOperator increaseDateFunction; - Employee employee = employeeRepository.getEmployee(request.getEmployeeDto().getId()); + Employee employee = employeeRepository.getEmployee(request.getEmployeeDto().getId()); switch (request.getOption()) { case "EVERY_DAY": increaseDateFunction = date -> date.plusDays(1); @@ -180,7 +179,7 @@ public void saveRepeatedShift(ShiftRepeatRequest request) { } catch (Request.InvalidRequestException e) { manageEmployeesShiftPresenter.presentInvalidRepeatedShiftListRequest(request); } catch (CreateShiftException e) { - manageEmployeesShiftPresenter.presentCreateShiftError(e); + manageEmployeesShiftPresenter.presentCreateShiftError(e); } } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftModifyRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftModifyRequest.java index fb84fb8c..75b38a23 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftModifyRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftModifyRequest.java @@ -20,7 +20,7 @@ public class ShiftModifyRequest extends Request { private int shiftId; private LocalDate date; private LocalTime start; - private LocalTime end; + private LocalTime end; private HallDto hall; public ShiftModifyRequest(EmployeeDto employeeDto, int shiftId, LocalDate date, LocalTime start, LocalTime end, HallDto hall) { @@ -97,7 +97,7 @@ protected void onValidate() { if (hall == null && employeeDto instanceof ProjectionistDto) { addError(MISSING_HALL); } - if(employeeDto == null){ + if (employeeDto == null) { addError(MISSING_EMPLOYEE); } diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftRepeatRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftRepeatRequest.java index 0da18fb2..6ec76c15 100644 --- a/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftRepeatRequest.java +++ b/app/src/main/java/com/ttbmp/cinehub/app/usecase/manageemployeesshift/request/ShiftRepeatRequest.java @@ -107,12 +107,13 @@ public void onValidate() { if (end == null) { addError(MISSING_END); } - if(startShift == null){ + if (startShift == null) { addError(MISSING_START_SHIFT); - }if(endShift == null){ + } + if (endShift == null) { addError(MISSING_END_SHIFT); } - if(hall == null && employeeDto instanceof ProjectionistDto){ + if (hall == null && employeeDto instanceof ProjectionistDto) { addError(MISSING_HALL); } } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Cinema.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Cinema.java index 4a28f543..b8d19605 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Cinema.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Cinema.java @@ -3,7 +3,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class Cinema { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/CreditCard.java b/domain/src/main/java/com/ttbmp/cinehub/domain/CreditCard.java index c246656d..f9fa53cb 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/CreditCard.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/CreditCard.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.domain; /** - * @author Palmieri Ivan, Fabio Buracchi + * @author Ivan Palmieri, Fabio Buracchi */ public class CreditCard { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Hall.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Hall.java index b02dd9e4..2082a3ab 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Hall.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Hall.java @@ -3,7 +3,7 @@ import java.util.List; /** - * @author Palmieri Ivan, Fabio Buracchi + * @author Ivan Palmieri, Fabio Buracchi */ public class Hall { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Movie.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Movie.java index 8a1d4629..cf22519c 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Movie.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Movie.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.domain; /** - * @author Palmieri Ivan, Fabio Buracchi + * @author Ivan Palmieri, Fabio Buracchi */ public class Movie { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Payment.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Payment.java index 8e0ec0cc..947b5f12 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Payment.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Payment.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.domain; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class Payment { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Projection.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Projection.java index 1e3e7b7c..c1a970b9 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Projection.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Projection.java @@ -94,7 +94,7 @@ public void setTicketList(List ticketList) { this.ticketList = ticketList; } - public void addTicket(Ticket ticket){ + public void addTicket(Ticket ticket) { this.ticketList.add(ticket); } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/Seat.java b/domain/src/main/java/com/ttbmp/cinehub/domain/Seat.java index 0dd49486..f2f6a564 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/Seat.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/Seat.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.domain; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class Seat { @@ -10,7 +10,7 @@ public class Seat { private boolean state; private String position; - public Seat(int id, long price, boolean state,String position) { + public Seat(int id, long price, boolean state, String position) { this.id = id; this.price = price; this.state = state; diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/User.java b/domain/src/main/java/com/ttbmp/cinehub/domain/User.java index ee3ca63b..5651cd5f 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/User.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/User.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author Fabio Buracchi, Palmieri Ivan + * @author Fabio Buracchi, Ivan Palmieri */ public class User { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/Shift.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/Shift.java index b5a75610..f0eb08ed 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/Shift.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/Shift.java @@ -5,7 +5,6 @@ import java.time.LocalDate; import java.time.LocalTime; -import java.util.List; /** * @author Fabio Buracchi, Massimo Mazzetti diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/UsherShift.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/UsherShift.java index cfc00f3d..1baa2fac 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/UsherShift.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/UsherShift.java @@ -21,7 +21,7 @@ public UsherShift(int id, Employee employee, String date, String start, String e public void modifyShift(Shift shift, LocalDate date, LocalTime start, LocalTime end, Hall hall) throws ModifyShiftException { List shiftList = shift.getEmployee().getShiftListBetween(date.minusDays(1), date.plusDays(1)); for (Shift elem : shiftList) { - if (elem.getId() !=shift.getId() + if (elem.getId() != shift.getId() && LocalDate.parse(elem.getDate()).equals(date) && (start.isBefore(LocalTime.parse(elem.getEnd())) && (end.isAfter(LocalTime.parse(elem.getStart()))))) { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/CreateShiftException.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/CreateShiftException.java index 2d785cca..32dbefc8 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/CreateShiftException.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/CreateShiftException.java @@ -1,6 +1,6 @@ package com.ttbmp.cinehub.domain.shift.factory; -public class CreateShiftException extends Exception{ +public class CreateShiftException extends Exception { public static final String ALREADY_EXIST_ERROR = "Shift Already Exist"; public static final String NOT_EXIST_ERROR = "Shift Not Exist"; diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/ShiftFactory.java b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/ShiftFactory.java index 75bfdebd..86fdad05 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/ShiftFactory.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/shift/factory/ShiftFactory.java @@ -17,7 +17,7 @@ public class ShiftFactory { public Shift createConcreteShift(Employee employee, String date, String start, String end, Hall hall) throws CreateShiftException { if (employee instanceof Projectionist) { return createShiftProjectionist(employee, date, start, end, hall); - } else if(employee instanceof Usher) { + } else if (employee instanceof Usher) { return createShiftUsher(employee, date, start, end); } throw new IllegalStateException("Unexpected value: " + employee.getClass()); @@ -25,10 +25,10 @@ public Shift createConcreteShift(Employee employee, String date, String start, S private Shift createShiftProjectionist(Employee employee, String date, String start, String end, Hall hall) throws CreateShiftException { List shiftList = employee.getShiftList(); - for(Shift shift : shiftList){ - if(shift.getDate().equals(date) - && LocalTime.parse(start).isBefore(LocalTime.parse(shift.getEnd())) - && LocalTime.parse(end).isAfter(LocalTime.parse(shift.getStart()))){ + for (Shift shift : shiftList) { + if (shift.getDate().equals(date) + && LocalTime.parse(start).isBefore(LocalTime.parse(shift.getEnd())) + && LocalTime.parse(end).isAfter(LocalTime.parse(shift.getStart()))) { throw new CreateShiftException(CreateShiftException.ALREADY_EXIST_ERROR); } } @@ -37,10 +37,10 @@ private Shift createShiftProjectionist(Employee employee, String date, String st private Shift createShiftUsher(Employee employee, String date, String start, String end) throws CreateShiftException { List shiftList = employee.getShiftList(); - for(Shift shift : shiftList){ - if(shift.getDate().equals(date) + for (Shift shift : shiftList) { + if (shift.getDate().equals(date) && LocalTime.parse(start).isBefore(LocalTime.parse(shift.getEnd())) - && LocalTime.parse(end).isAfter(LocalTime.parse(shift.getStart()))){ + && LocalTime.parse(end).isAfter(LocalTime.parse(shift.getStart()))) { throw new CreateShiftException(CreateShiftException.ALREADY_EXIST_ERROR); } } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/Ticket.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/Ticket.java index 69000e70..c94632af 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/Ticket.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/component/Ticket.java @@ -4,7 +4,7 @@ import com.ttbmp.cinehub.domain.User; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class Ticket { @@ -15,7 +15,7 @@ public class Ticket { private User owner; - public Ticket(int id, long price, User owner,Seat seat) { + public Ticket(int id, long price, User owner, Seat seat) { this.id = id; this.price = price; this.owner = owner; @@ -61,5 +61,4 @@ public long increasePrice() { } - } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketDecorator.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketDecorator.java index bcfe15a5..2a693e96 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketDecorator.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketDecorator.java @@ -3,14 +3,14 @@ import com.ttbmp.cinehub.domain.ticket.component.Ticket; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public abstract class TicketDecorator extends Ticket { Ticket ticket; TicketDecorator(Ticket ticket) { - super(ticket.getId(),ticket.getPrice(), ticket.getOwner(), ticket.getSeat()); + super(ticket.getId(), ticket.getPrice(), ticket.getOwner(), ticket.getSeat()); this.ticket = ticket; } diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketFoldingArmchair.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketFoldingArmchair.java index aee74be1..c9dc2795 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketFoldingArmchair.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketFoldingArmchair.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.domain.ticket.component.Ticket; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class TicketFoldingArmchair extends TicketDecorator { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketHeatedArmchair.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketHeatedArmchair.java index 7e3d6bdf..75c303b4 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketHeatedArmchair.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketHeatedArmchair.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.domain.ticket.component.Ticket; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class TicketHeatedArmchair extends TicketDecorator { diff --git a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketSkipLine.java b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketSkipLine.java index 21a70de9..4c461752 100644 --- a/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketSkipLine.java +++ b/domain/src/main/java/com/ttbmp/cinehub/domain/ticket/decorator/TicketSkipLine.java @@ -3,7 +3,7 @@ import com.ttbmp.cinehub.domain.ticket.component.Ticket; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class TicketSkipLine extends TicketDecorator { diff --git a/service/authentication/src/main/java/com/ttbmp/cinehub/service/authentication/FirebaseAuthenticationService.java b/service/authentication/src/main/java/com/ttbmp/cinehub/service/authentication/FirebaseAuthenticationService.java index d85ef618..a2557e11 100644 --- a/service/authentication/src/main/java/com/ttbmp/cinehub/service/authentication/FirebaseAuthenticationService.java +++ b/service/authentication/src/main/java/com/ttbmp/cinehub/service/authentication/FirebaseAuthenticationService.java @@ -3,7 +3,9 @@ import com.google.auth.oauth2.GoogleCredentials; import com.google.firebase.FirebaseApp; import com.google.firebase.FirebaseOptions; -import com.google.firebase.auth.*; +import com.google.firebase.auth.FirebaseAuth; +import com.google.firebase.auth.FirebaseAuthException; +import com.google.firebase.auth.UserRecord; import java.io.IOException; import java.io.InputStream; diff --git a/service/email/src/main/java/com/ttbmp/cinehub/service/email/emailservice/EmailServiceRequest.java b/service/email/src/main/java/com/ttbmp/cinehub/service/email/emailservice/EmailServiceRequest.java index a7ff6924..6135575e 100644 --- a/service/email/src/main/java/com/ttbmp/cinehub/service/email/emailservice/EmailServiceRequest.java +++ b/service/email/src/main/java/com/ttbmp/cinehub/service/email/emailservice/EmailServiceRequest.java @@ -1,7 +1,7 @@ package com.ttbmp.cinehub.service.email.emailservice; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class EmailServiceRequest { private String email; diff --git a/service/email/src/main/java/com/ttbmp/cinehub/service/email/emailservice/SendEmailService.java b/service/email/src/main/java/com/ttbmp/cinehub/service/email/emailservice/SendEmailService.java index 2d953ff0..bfb00eb9 100644 --- a/service/email/src/main/java/com/ttbmp/cinehub/service/email/emailservice/SendEmailService.java +++ b/service/email/src/main/java/com/ttbmp/cinehub/service/email/emailservice/SendEmailService.java @@ -9,7 +9,7 @@ import java.util.Properties; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class SendEmailService { diff --git a/service/movie-api/src/main/java/com/ttbmp/cinehub/service/movieapi/Movie.java b/service/movie-api/src/main/java/com/ttbmp/cinehub/service/movieapi/Movie.java index a9f687ae..379264af 100644 --- a/service/movie-api/src/main/java/com/ttbmp/cinehub/service/movieapi/Movie.java +++ b/service/movie-api/src/main/java/com/ttbmp/cinehub/service/movieapi/Movie.java @@ -3,7 +3,7 @@ import com.google.gson.annotations.SerializedName; /** - * @author Palmieri Ivan, Fabio Buracchi + * @author Ivan Palmieri, Fabio Buracchi */ public class Movie { diff --git a/service/movie-api/src/main/java/com/ttbmp/cinehub/service/movieapi/TheMovieDbApiService.java b/service/movie-api/src/main/java/com/ttbmp/cinehub/service/movieapi/TheMovieDbApiService.java index 0883bcc0..b2cc97b9 100644 --- a/service/movie-api/src/main/java/com/ttbmp/cinehub/service/movieapi/TheMovieDbApiService.java +++ b/service/movie-api/src/main/java/com/ttbmp/cinehub/service/movieapi/TheMovieDbApiService.java @@ -9,7 +9,7 @@ import java.net.URL; /** - * @author Palmieri Ivan, Fabio Buracchi + * @author Ivan Palmieri, Fabio Buracchi */ public class TheMovieDbApiService { diff --git a/service/payment/src/main/java/com/ttbmp/cinehub/service/payment/stripe/StripeService.java b/service/payment/src/main/java/com/ttbmp/cinehub/service/payment/stripe/StripeService.java index 019508fc..c5708598 100644 --- a/service/payment/src/main/java/com/ttbmp/cinehub/service/payment/stripe/StripeService.java +++ b/service/payment/src/main/java/com/ttbmp/cinehub/service/payment/stripe/StripeService.java @@ -5,7 +5,7 @@ import com.stripe.model.PaymentMethod; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class StripeService { diff --git a/service/payment/src/main/java/com/ttbmp/cinehub/service/payment/stripe/StripeServiceRequest.java b/service/payment/src/main/java/com/ttbmp/cinehub/service/payment/stripe/StripeServiceRequest.java index 7ab26be8..2c699cb1 100644 --- a/service/payment/src/main/java/com/ttbmp/cinehub/service/payment/stripe/StripeServiceRequest.java +++ b/service/payment/src/main/java/com/ttbmp/cinehub/service/payment/stripe/StripeServiceRequest.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class StripeServiceRequest { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutActivity.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutActivity.java index 398e01bc..8fe27b4f 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutActivity.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutActivity.java @@ -5,7 +5,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class AboutActivity extends Activity { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutView.java index 29e98f6f..3ef5b116 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutView.java @@ -5,7 +5,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class AboutView extends FxmlView { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutViewController.java index c45f1cc2..04d75e0b 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/about/AboutViewController.java @@ -6,7 +6,7 @@ import javafx.scene.layout.VBox; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class AboutViewController extends ViewController { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketActivity.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketActivity.java index 211d7adc..f8a647ed 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketActivity.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketActivity.java @@ -9,7 +9,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class BuyTicketActivity extends Activity { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketPresenterFx.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketPresenterFx.java index a07c436a..a1776f4c 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketPresenterFx.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketPresenterFx.java @@ -7,7 +7,7 @@ import com.ttbmp.cinehub.app.usecase.buyticket.response.*; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class BuyTicketPresenterFx implements BuyTicketPresenter { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketViewModel.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketViewModel.java index 0261e038..927e6733 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketViewModel.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/BuyTicketViewModel.java @@ -14,7 +14,7 @@ /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class BuyTicketViewModel implements ViewModel { @@ -76,7 +76,7 @@ public BuyTicketViewModel() { selectedCinemaCity.bind(ObjectBindings.map(selectedCinema, CinemaDto::getCity)); selectedCinemaName.bind(ObjectBindings.map(selectedCinema, CinemaDto::getName)); selectedTicketPrice.bind(ObjectBindings.map(selectedTicket, TicketDto::getPrice)); - selectedTicketPosition.bind(ObjectBindings.map(selectedTicket,ticket-> ticket.getSeatDto().getPosition())); + selectedTicketPosition.bind(ObjectBindings.map(selectedTicket, ticket -> ticket.getSeatDto().getPosition())); StringProperty selectedMovieRating = new SimpleStringProperty(); selectedMovieRating.bind(ObjectBindings.map(selectedMovie, MovieDto::getVote)); StringProperty selectedMovieOverview = new SimpleStringProperty(); diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/CustomDateCell.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/CustomDateCell.java index 53aae4ce..93feaafc 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/CustomDateCell.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/CustomDateCell.java @@ -6,7 +6,7 @@ import java.time.LocalDate; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ @SuppressWarnings("java:S110") public class CustomDateCell extends DateCell { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaItemView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaItemView.java index adb4a522..8996d5a4 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaItemView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaItemView.java @@ -6,7 +6,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseCinemaItemView extends FxmlView { public ChooseCinemaItemView() throws IOException { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaItemViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaItemViewController.java index 56a42582..891f159e 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaItemViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaItemViewController.java @@ -11,7 +11,7 @@ import java.util.Objects; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseCinemaItemViewController extends ViewController { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaListCell.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaListCell.java index 4e476714..0a1c8226 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaListCell.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaListCell.java @@ -10,7 +10,7 @@ import java.util.Objects; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ @SuppressWarnings("java:S110") public class ChooseCinemaListCell extends ListCell { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaView.java index aa07c449..d8733cee 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaView.java @@ -6,7 +6,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseCinemaView extends FxmlView { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaViewController.java index 737efb91..1f961fdf 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseCinemaViewController.java @@ -20,7 +20,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseCinemaViewController extends ViewController { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemView.java index 210c19f5..c81f8bbf 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemView.java @@ -5,7 +5,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseProjectionItemView extends FxmlView { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemViewController.java index 5cf09ab6..9679ed60 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionItemViewController.java @@ -10,14 +10,13 @@ import java.util.Objects; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseProjectionItemViewController extends ViewController { private ProjectionDto projectionDto; - @FXML private Label projectionTimeLabel; diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionListCell.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionListCell.java index 1aae16c8..a36705d6 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionListCell.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosecinema/ChooseProjectionListCell.java @@ -9,7 +9,7 @@ import java.util.Objects; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ @SuppressWarnings("java:S110") public class ChooseProjectionListCell extends ListCell { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieItemView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieItemView.java index 4fd65679..446d8931 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieItemView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieItemView.java @@ -6,7 +6,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseMovieItemView extends FxmlView { public ChooseMovieItemView() throws IOException { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieItemViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieItemViewController.java index c0b2b30b..2970eee4 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieItemViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieItemViewController.java @@ -13,7 +13,7 @@ import java.util.Objects; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseMovieItemViewController extends ViewController { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieListCell.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieListCell.java index 29cd4103..8b87a118 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieListCell.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieListCell.java @@ -10,7 +10,7 @@ import java.util.Objects; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ @SuppressWarnings("java:S110") public class ChooseMovieListCell extends ListCell { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieView.java index 4505d5c9..761dd2ea 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieView.java @@ -6,7 +6,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseMovieView extends FxmlView { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieViewController.java index ce8fe2b8..c5ced478 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/choosemovie/ChooseMovieViewController.java @@ -24,7 +24,7 @@ /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseMovieViewController extends ViewController { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/ChooseSeatView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/ChooseSeatView.java index f89466d8..1ac81c9b 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/ChooseSeatView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/ChooseSeatView.java @@ -6,7 +6,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseSeatView extends FxmlView { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/ChooseSeatViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/ChooseSeatViewController.java index f177d1cf..26def4fc 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/ChooseSeatViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/ChooseSeatViewController.java @@ -18,7 +18,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ChooseSeatViewController extends ViewController { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixView.java index 6e3a6072..0014440e 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixView.java @@ -8,7 +8,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class SeatsMatrixView extends View { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixViewController.java index 040c26e5..fa2c6d68 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/chooseseat/SeatsMatrixViewController.java @@ -15,7 +15,7 @@ import java.util.List; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class SeatsMatrixViewController extends ViewController { @@ -47,18 +47,18 @@ private void createMatrix(BuyTicketViewModel viewModel, List seatDtoLis for (int j = 0; j < columns; j++) { RadioButton radioButton = new RadioButton(); radioButton.setPadding(new Insets(5, 5, 5, 5)); - radioButton.setText(seatDtoList.get(count).getPosition()+ "\n" + seatDtoList.get(count).getPrice() + "\u20ac"); + radioButton.setText(seatDtoList.get(count).getPosition() + "\n" + seatDtoList.get(count).getPrice() + "\u20ac"); radioButton.setToggleGroup(toggleGroup); ImageView imageView = new ImageView(new Image(String.valueOf(this.getClass().getResource("/drawables/office-chair.png")))); imageView.setFitWidth(25); imageView.setFitHeight(25); radioButton.setGraphic(imageView); - if(!viewModel.selectedProjectionProperty().getValue().getListTicket().isEmpty()) { + if (!viewModel.selectedProjectionProperty().getValue().getListTicket().isEmpty()) { int finalCount = count; viewModel.selectedProjectionProperty().getValue().getListTicket().forEach(x -> { String val = seatDtoList.get(finalCount).getPosition(); - if (x.getSeatDto().getPosition().equals(val) ) { + if (x.getSeatDto().getPosition().equals(val)) { radioButton.setDisable(true); } }); @@ -70,7 +70,7 @@ private void createMatrix(BuyTicketViewModel viewModel, List seatDtoLis count++; } } - addOtherButton(seatDtoList, columns, rest, count, buy,viewModel); + addOtherButton(seatDtoList, columns, rest, count, buy, viewModel); updateValue(viewModel, size, buy); } @@ -80,12 +80,12 @@ private void addOtherButton(List seatDtoList, int columns, int rest, in radioButton.setText(seatDtoList.get(count).getPosition() + "\n" + seatDtoList.get(count).getPrice() + "\u20ac"); radioButton.setToggleGroup(toggleGroup); radioButton.setPadding(new Insets(5, 5, 5, 5)); - if(!viewModel.selectedProjectionProperty().getValue().getListTicket().isEmpty()) { + if (!viewModel.selectedProjectionProperty().getValue().getListTicket().isEmpty()) { int finalCount = count; viewModel.selectedProjectionProperty().getValue().getListTicket().forEach(x -> { String val = seatDtoList.get(finalCount).getPosition(); - if (x.getSeatDto().getPosition().equals(val) ) { + if (x.getSeatDto().getPosition().equals(val)) { radioButton.setDisable(true); } }); diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/confirmemail/ConfirmEmailView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/confirmemail/ConfirmEmailView.java index faac98df..1d26945e 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/confirmemail/ConfirmEmailView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/confirmemail/ConfirmEmailView.java @@ -6,7 +6,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ConfirmEmailView extends FxmlView { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/confirmemail/ConfirmEmailViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/confirmemail/ConfirmEmailViewController.java index 8ac0f526..a64d0988 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/confirmemail/ConfirmEmailViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/confirmemail/ConfirmEmailViewController.java @@ -19,7 +19,7 @@ import java.time.format.FormatStyle; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class ConfirmEmailViewController extends ViewController { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentView.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentView.java index a22402af..69bd71bf 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentView.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentView.java @@ -6,7 +6,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class PaymentView extends FxmlView { diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentViewController.java index 00c31413..d0242457 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/buyticket/payment/PaymentViewController.java @@ -21,7 +21,7 @@ import java.io.IOException; /** - * @author Palmieri Ivan + * @author Ivan Palmieri */ public class PaymentViewController extends ViewController { @@ -102,12 +102,12 @@ private void startPayment(ActionEvent actionEvent) { viewModel.selectedCinemaProperty().getValue(), viewModel.selectedMovieProperty().getValue(), String.valueOf(viewModel.selectedDateProperty().getValue()) - )) ; - try { - navController.navigate(new NavDestination(new ConfirmEmailView())); - } catch (IOException e) { - e.printStackTrace(); - } + )); + try { + navController.navigate(new NavDestination(new ConfirmEmailView())); + } catch (IOException e) { + e.printStackTrace(); + } } diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftFxPresenter.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftFxPresenter.java index c154e74c..b35a5034 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftFxPresenter.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/ManageEmployeesShiftFxPresenter.java @@ -200,26 +200,27 @@ public void presentCreateShiftNullRequest() { public void presentInvalidRepeatedShiftListRequest(ShiftRepeatRequest request) { String error = ""; if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_EMPLOYEE)) { - viewModel.errorProperty().setValue(error +ShiftRepeatRequest.MISSING_EMPLOYEE.getMessage()); + viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_EMPLOYEE.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_START)) { viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_START.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_END)) { - viewModel.errorProperty().setValue(error+ShiftRepeatRequest.MISSING_END.getMessage()); + viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_END.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_OPTION)) { - viewModel.errorProperty().setValue(error+ShiftRepeatRequest.MISSING_OPTION.getMessage()); + viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_OPTION.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_START_SHIFT)) { viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_START_SHIFT.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_END_SHIFT)) { - viewModel.errorProperty().setValue(error+ShiftRepeatRequest.MISSING_END_SHIFT.getMessage()); + viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_END_SHIFT.getMessage()); } if (request.getErrorList().contains(ShiftRepeatRequest.MISSING_HALL)) { - viewModel.errorProperty().setValue(error+ShiftRepeatRequest.MISSING_HALL.getMessage()); - }viewModel.errorAssignVisibilityProperty().setValue(true); + viewModel.errorProperty().setValue(error + ShiftRepeatRequest.MISSING_HALL.getMessage()); + } + viewModel.errorAssignVisibilityProperty().setValue(true); } @Override diff --git a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/modify/ModifyShiftViewController.java b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/modify/ModifyShiftViewController.java index 701743e0..9f0dba0c 100644 --- a/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/modify/ModifyShiftViewController.java +++ b/ui/desktop/src/main/java/com/ttbmp/cinehub/ui/desktop/manageshift/modify/ModifyShiftViewController.java @@ -3,7 +3,6 @@ import com.ttbmp.cinehub.app.dto.HallDto; import com.ttbmp.cinehub.app.dto.UsherDto; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.ManageEmployeesShiftUseCase; -import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.CreateShiftRequest; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.GetHallListRequest; import com.ttbmp.cinehub.app.usecase.manageemployeesshift.request.ShiftModifyRequest; import com.ttbmp.cinehub.ui.desktop.manageshift.ManageEmployeesShiftViewModel; From 8e6448c4c7cd77b5f37d3f5c690d5a8d4d4b10c9 Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Mon, 15 Feb 2021 06:22:24 +0100 Subject: [PATCH 8/8] Refactory --- .../resources/layout/buy_ticket/projection_list_item.fxml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/desktop/src/main/resources/layout/buy_ticket/projection_list_item.fxml b/ui/desktop/src/main/resources/layout/buy_ticket/projection_list_item.fxml index d3dc84c9..ae187026 100644 --- a/ui/desktop/src/main/resources/layout/buy_ticket/projection_list_item.fxml +++ b/ui/desktop/src/main/resources/layout/buy_ticket/projection_list_item.fxml @@ -1,7 +1,7 @@ - - + +