Merge pull request #100 from TTBMP/release/v1.0

Release/v1.0
TTBMP · Jul 4, 2021 · 128e03e · 128e03e
2 parents 647781c + 77b2b89
commit 128e03e
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 101 deletions.
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/dto/ShiftDto.java b/app/src/main/java/com/ttbmp/cinehub/app/dto/ShiftDto.java
@@ -36,13 +36,13 @@ public ShiftDto(Shift shift) {
         this.date = LocalDate.parse(shift.getDate());
         this.start = LocalTime.parse(shift.getStart());
         this.end = LocalTime.parse(shift.getEnd());
-        if(shift instanceof ProjectionistShift){
-            this.type=ShiftType.PROJECTIONIST_SHIFT;
-            this.hall = new HallDto (((ProjectionistShift) shift).getHall());
-        }else if(shift instanceof UsherShift){
-            this.type=ShiftType.USHER_SHIFT;
+        if (shift instanceof ProjectionistShift) {
+            this.type = ShiftType.PROJECTIONIST_SHIFT;
+            this.hall = new HallDto(((ProjectionistShift) shift).getHall());
+        } else if (shift instanceof UsherShift) {
+            this.type = ShiftType.USHER_SHIFT;
             this.hall = null;
-        }else{
+        } else {
             throw new IllegalStateException("Unexpected value: " + shift);
         }
     }

diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/cinema/CinemaProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/cinema/CinemaProxy.java
@@ -6,12 +6,14 @@
 import com.ttbmp.cinehub.app.repository.hall.HallRepository;
 import com.ttbmp.cinehub.domain.Cinema;
 import com.ttbmp.cinehub.domain.Hall;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class CinemaProxy extends Cinema {
 
     private final HallRepository hallRepository;
@@ -41,14 +43,4 @@ public void setHallList(List<Hall> hallList) {
         super.setHallList(hallList);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
 }
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/customer/CustomerProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/customer/CustomerProxy.java
@@ -9,12 +9,14 @@
 import com.ttbmp.cinehub.domain.security.Permission;
 import com.ttbmp.cinehub.domain.security.Role;
 import com.ttbmp.cinehub.domain.ticket.Ticket;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class CustomerProxy extends Customer {
 
     private final TicketRepository ticketRepository;
@@ -134,14 +136,4 @@ public void setOwnedTicketList(List<Ticket> ownedTicketList) {
         super.setOwnedTicketList(ownedTicketList);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
 }
diff --git a/...main/java/com/ttbmp/cinehub/app/repository/employee/projectionist/ProjectionistProxy.java b/...main/java/com/ttbmp/cinehub/app/repository/employee/projectionist/ProjectionistProxy.java
@@ -11,13 +11,15 @@
 import com.ttbmp.cinehub.domain.security.Permission;
 import com.ttbmp.cinehub.domain.security.Role;
 import com.ttbmp.cinehub.domain.shift.Shift;
+import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
 import java.util.List;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class ProjectionistProxy extends Projectionist {
 
     private final UserRepository userRepository;
@@ -167,14 +169,4 @@ public List<Shift> getShiftListBetween(LocalDate start, LocalDate end) {
         }
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
 }
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/employee/usher/UsherProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/employee/usher/UsherProxy.java
@@ -11,13 +11,15 @@
 import com.ttbmp.cinehub.domain.security.Permission;
 import com.ttbmp.cinehub.domain.security.Role;
 import com.ttbmp.cinehub.domain.shift.Shift;
+import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
 import java.util.List;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class UsherProxy extends Usher {
 
     private final UserRepository userRepository;
@@ -169,14 +171,4 @@ public List<Shift> getShiftListBetween(LocalDate start, LocalDate end) {
         }
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
 }
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/HallProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/hall/HallProxy.java
@@ -6,12 +6,14 @@
 import com.ttbmp.cinehub.app.repository.seat.SeatRepository;
 import com.ttbmp.cinehub.domain.Hall;
 import com.ttbmp.cinehub.domain.Seat;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class HallProxy extends Hall {
 
     private final SeatRepository seatRepository;
@@ -41,14 +43,4 @@ public void setSeatList(List<Seat> seatList) {
         super.setSeatList(seatList);
     }
 
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
 }
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/movie/MovieProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/movie/MovieProxy.java
@@ -5,10 +5,12 @@
 import com.ttbmp.cinehub.app.service.movieapi.MovieApiService;
 import com.ttbmp.cinehub.app.service.movieapi.MovieApiServiceException;
 import com.ttbmp.cinehub.domain.Movie;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class MovieProxy extends Movie {
 
     private final MovieApiService movieApiService;
@@ -83,14 +85,4 @@ private void loadMovie() {
         }
     }
 
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
 }
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/projection/ProjectionProxy.java
@@ -12,12 +12,14 @@
 import com.ttbmp.cinehub.domain.Projection;
 import com.ttbmp.cinehub.domain.employee.Projectionist;
 import com.ttbmp.cinehub.domain.ticket.Ticket;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class ProjectionProxy extends Projection {
 
     private final MovieRepository movieRepository;
@@ -110,14 +112,4 @@ public void setTicketList(List<Ticket> ticketList) {
         super.setTicketList(ticketList);
     }
 
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
 }
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
@@ -2,10 +2,12 @@
 
 import com.ttbmp.cinehub.app.di.ServiceLocator;
 import com.ttbmp.cinehub.domain.Seat;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class SeatProxy extends Seat {
 
     @SuppressWarnings("unused")

diff --git a/...in/java/com/ttbmp/cinehub/app/repository/shift/projectionist/ProjectionistShiftProxy.java b/...in/java/com/ttbmp/cinehub/app/repository/shift/projectionist/ProjectionistShiftProxy.java
@@ -10,12 +10,14 @@
 import com.ttbmp.cinehub.domain.Projection;
 import com.ttbmp.cinehub.domain.employee.Employee;
 import com.ttbmp.cinehub.domain.shift.ProjectionistShift;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class ProjectionistShiftProxy extends ProjectionistShift {
 
     private final ProjectionistRepository projectionistRepository;
@@ -88,14 +90,4 @@ public void setProjectionList(List<Projection> projectionList) {
         super.setProjectionList(projectionList);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
 }
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/usher/UsherShiftProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/shift/usher/UsherShiftProxy.java
@@ -6,10 +6,12 @@
 import com.ttbmp.cinehub.app.repository.employee.usher.UsherRepository;
 import com.ttbmp.cinehub.domain.employee.Employee;
 import com.ttbmp.cinehub.domain.shift.UsherShift;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class UsherShiftProxy extends UsherShift {
 
     private final UsherRepository usherRepository;
@@ -40,14 +42,4 @@ public void setEmployee(Employee employee) {
         super.setEmployee(employee);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
 }
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/repository/user/UserProxy.java b/app/src/main/java/com/ttbmp/cinehub/app/repository/user/UserProxy.java
@@ -3,12 +3,14 @@
 import com.ttbmp.cinehub.app.di.ServiceLocator;
 import com.ttbmp.cinehub.domain.User;
 import com.ttbmp.cinehub.domain.security.Role;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 /**
  * @author Fabio Buracchi
  */
+@EqualsAndHashCode(callSuper = true)
 public class UserProxy extends User {
 
     @SuppressWarnings("unused")

diff --git a/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PaymentRequest.java b/app/src/main/java/com/ttbmp/cinehub/app/usecase/buyticket/request/PaymentRequest.java
@@ -61,7 +61,7 @@ public void onValidate() {
         if (creditCard.creditCardNumber.length() < 12 || creditCard.creditCardNumber.length() > 16) {
             addError(CREDIT_CARD_LENGTH_ERROR);
         }
-        if (!email.contains("@")) {
+        if (!email.matches("\\w+@\\w+\\.\\w+")) {
             addError(EMAIL_ERROR);
         }
         if (ticketOption.magicBoxOption == null) {

diff --git a/...va/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java b/...va/com/ttbmp/cinehub/app/usecase/manageemployeesshift/ManageEmployeesShiftController.java
@@ -277,7 +277,7 @@ private void modifyProjectionistShift(ShiftModifyRequest request, ProjectionistS
     }
 
     private void modifyUsherShift(ShiftModifyRequest request, UsherShift shift) throws ModifyShiftException {
-        shift.modifyShift( request.getDate(), request.getStart(), request.getEnd());
+        shift.modifyShift(request.getDate(), request.getStart(), request.getEnd());
     }
 
 }
diff --git a/...java/com/ttbmp/cinehub/ui/desktop/viewpersonalschedule/ViewPersonalScheduleViewModel.java b/...java/com/ttbmp/cinehub/ui/desktop/viewpersonalschedule/ViewPersonalScheduleViewModel.java
@@ -61,7 +61,7 @@ public ViewPersonalScheduleViewModel() {
         selectedShiftDateProperty.bind(ObjectBindings.map(selectedShiftProperty, shiftDto -> shiftDto.getDate().toString()));
         selectedShiftStartProperty.bind(ObjectBindings.map(selectedShiftProperty, shiftDto -> shiftDto.getStart().toString()));
         selectedShiftEndProperty.bind(ObjectBindings.map(selectedShiftProperty, shiftDto -> shiftDto.getEnd().toString()));
-        selectedProjectionistShiftHallProperty.bind(ObjectBindings.map(selectedShiftProperty, shiftDto ->  shiftDto.getHall().getName()));
+        selectedProjectionistShiftHallProperty.bind(ObjectBindings.map(selectedShiftProperty, shiftDto -> shiftDto.getHall().getName()));
         projectionsDetailButtonVisibleProperty.bind(ObjectBindings.map(selectedShiftEmployeeRoleProperty, e -> e.equals(EmployeeDto.EmployeeRole.PROJECTIONIST.toString())));
     }
 

diff --git a/...eb/src/main/resources/templates/view_personal_schedule/schedule_projectionist_detail.html b/...eb/src/main/resources/templates/view_personal_schedule/schedule_projectionist_detail.html
@@ -71,8 +71,8 @@
                     <input th:name="shift.end" th:value="${scheduleForm.shift.end}" type="hidden"/>
                     <input th:name="shift.employeeId" th:value="${scheduleForm.shift.employeeId}" type="hidden"/>
                     <div th:if="${scheduleForm.employee.role.equals('Projectionist')}">
-                        <input th:name="hall.id" th:value="${scheduleForm.shift.hall.id}" type="hidden"/>
-                        <input th:name="hall.name" th:value="${scheduleForm.shift.hall.name}" type="hidden"/>
+                        <input th:name="shift.hall.id" th:value="${scheduleForm.shift.hall.id}" type="hidden"/>
+                        <input th:name="shift.hall.name" th:value="${scheduleForm.shift.hall.name}" type="hidden"/>
                     </div>
                     <input class="btn btn-primary" type="submit" value="BACK"/>
                 </form>