♻️ Refactor: change guests count calculation for events

Author: ge85riz

backend/src/main/java/com/itestra/eep/exceptions/EventCapacityExceededException.java

@@ -6,7 +6,7 @@
 public class EventCapacityExceededException extends RuntimeException {
 
     public EventCapacityExceededException() {
-        super("Event has more participants than its capacity!");
+        super("Event capacity exceeded. There are more participants than event capacity.");
     }
 
     public EventCapacityExceededException(int emptySlots) {

backend/src/main/java/com/itestra/eep/mappers/EventMapper.java

@@ -6,7 +6,6 @@
 import com.itestra.eep.dtos.FileDetailsDTO;
 import com.itestra.eep.models.Event;
 import com.itestra.eep.models.FileEntity;
-import com.itestra.eep.models.Participation;
 import org.mapstruct.*;
 
 import java.time.LocalDateTime;
@@ -28,20 +27,12 @@ public interface EventMapper {
     List<EventDetailsDTO> toDetailsDto(List<Event> events);
 
     @Mappings({
-            @Mapping(source = "participations", target = "participantCount", qualifiedByName = "countConfirmed"),
             @Mapping(source = "date", target = "status", qualifiedByName = "status")
     })
     EventDetailsDTO toDetailsDto(Event event);
 
     FileDetailsDTO toFileDetailsDto(FileEntity file);
 
-    @Named("countConfirmed")
-    default int map(List<Participation> participations) {
-        return participations.stream().filter(Participation::isConfirmed)
-                .mapToInt(p -> p.getGuestCount() + 1)
-                .sum();
-    }
-
     @Named("status")
     default String status(LocalDateTime eventDate) {
         return eventDate.isAfter(LocalDateTime.now()) ? "upcoming" : "completed";

backend/src/main/java/com/itestra/eep/models/Employee.java

@@ -21,7 +21,7 @@ public class Employee {
     private UUID id;
 
     @MapsId
-    @OneToOne(fetch = FetchType.LAZY, optional = false)
+    @OneToOne(fetch = FetchType.LAZY, optional = false, orphanRemoval = true)
     @JoinColumn(name = "profile_id", nullable = false)
     private Profile profile;
 
@@ -35,7 +35,7 @@ public class Employee {
     @Column(name = "employment_type")
     private EmploymentType employmentType;
 
-    @OneToMany(mappedBy = "employee")
+    @OneToMany(mappedBy = "employee", orphanRemoval = true)
     private List<Participation> participations = new LinkedList<>();
 
     @ManyToMany

backend/src/main/java/com/itestra/eep/models/Event.java

@@ -50,5 +50,18 @@ public class Event {
     @OneToOne(mappedBy = "event", orphanRemoval = true)
     private Schematics schematics;
 
+    @Transient
+    public int getParticipantCount() {
+        return getParticipantCount(null);
+    }
+
+    @Transient
+    public int getParticipantCount(Participation excludeParticipation) {
+        return participations.stream()
+                .filter(p -> excludeParticipation == null || !p.getId().equals(excludeParticipation.getId()))
+                .mapToInt(p -> p.getGuestCount() + 1)
+                .sum();
+    }
+
 }
 

backend/src/main/java/com/itestra/eep/services/impl/EventServiceImpl.java

@@ -57,12 +57,9 @@ public Event create(EventCreateDTO dto) {
     @Override
     public Event update(UUID id, EventUpdateDTO dto) {
         Event event = eventRepository.findById(id).orElseThrow(EventNotFoundException::new);
-        eventMapper.updateEventFromDto(dto, event);
-
-        if (event.getCapacity() < participationRepository.sumGuestCounts(event, null)) {
+        if (dto.getCapacity() != null && event.getParticipantCount(null) > dto.getCapacity()) {
             throw new EventCapacityExceededException();
         }
-
         return eventRepository.save(event);
     }
 
@@ -107,9 +104,7 @@ public void deleteParticipant(UUID participationId) {
 
     private void validateCapacity(Event event, int guestCount, Participation excludeParticipation) {
 
-        Integer total = participationRepository.sumGuestCounts(event, excludeParticipation == null ? null : excludeParticipation.getId());
-
-        int currentTotal = total != null ? total : 0;
+        int currentTotal = event.getParticipantCount(excludeParticipation);
 
         int newTotal = currentTotal + guestCount + 1;
 

backend/src/main/java/com/itestra/eep/webcontroller/SchematicsController.java

@@ -28,7 +28,7 @@ public class SchematicsController {
     private final SchematicsMapper schematicsMapper;
 
     @GetMapping("/{id}")
-    @PreAuthorize("hasAnyAuthority('ADMIN', 'EMPLOYEE', 'VISITOR')")
+    @PreAuthorize("hasAnyAuthority('ADMIN', 'EMPLOYEE')")
     public ResponseEntity<SchematicsCreateDTO> getSchematics(@PathVariable UUID id) {
         Schematics schematics = schematicsService.findById(id);
         return new ResponseEntity<>(schematicsMapper.toSchematicsCreateDTO(schematics), HttpStatus.OK);