⚡️ perf: adjust entity graphs according to business logic

ge85riz · ge85riz · commit e5e56a118e76 · 2025-08-02T03:13:56.000+02:00
diff --git a/backend/src/main/java/com/itestra/eep/dtos/EmployeeCreateDTO.java b/backend/src/main/java/com/itestra/eep/dtos/EmployeeCreateDTO.java
@@ -1,20 +1,22 @@
 package com.itestra.eep.dtos;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.itestra.eep.enums.DietaryPreference;
 import com.itestra.eep.enums.Role;
+import com.itestra.eep.serializers.GenderDeserializer;
+import com.itestra.eep.validators.ValidGender;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.type.SqlTypes;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -24,6 +26,7 @@
 @Getter
 @Setter
 @AllArgsConstructor
+@NoArgsConstructor
 public class EmployeeCreateDTO implements Serializable {
 
     @Valid
@@ -53,6 +56,9 @@ public static class ProfileCreateDTO implements Serializable {
 
         @Size(max = 255)
         @NotBlank(message = "Gender cannot be empty.")
+        @ValidGender
+        @JsonProperty("gender")
+        @JsonDeserialize(using = GenderDeserializer.class)
         String gender;
 
         @Size(max = 255, message = "GitLab username should be shorter than 255 characters")
@@ -65,7 +71,6 @@ public static class ProfileCreateDTO implements Serializable {
         @Email(message = "Email should be valid.")
         String email;
 
-        @JdbcTypeCode(SqlTypes.ARRAY)
         @Enumerated(EnumType.STRING)
         DietaryPreference[] dietTypes;
 
diff --git a/backend/src/main/java/com/itestra/eep/dtos/EmployeeUpdateDTO.java b/backend/src/main/java/com/itestra/eep/dtos/EmployeeUpdateDTO.java
@@ -6,6 +6,8 @@
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.itestra.eep.enums.DietaryPreference;
 import com.itestra.eep.enums.Role;
+import com.itestra.eep.serializers.GenderDeserializer;
+import com.itestra.eep.validators.ValidGender;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.validation.Valid;
@@ -15,8 +17,6 @@
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
-import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.type.SqlTypes;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -51,6 +51,8 @@ public static class ProfileUpdateDTO implements Serializable {
 
         @Size(max = 255)
         @NotBlank(message = "Gender cannot be empty.")
+        @ValidGender
+        @JsonDeserialize(using = GenderDeserializer.class)
         String gender;
 
         @Size(max = 255, message = "GitLab username should be shorter than 255 characters")
@@ -63,7 +65,6 @@ public static class ProfileUpdateDTO implements Serializable {
         @Email(message = "Email should be valid.")
         String email;
 
-        @JdbcTypeCode(SqlTypes.ARRAY)
         @Enumerated(EnumType.STRING)
         DietaryPreference[] dietTypes;
 
diff --git a/backend/src/main/java/com/itestra/eep/dtos/ProfileUpdateDTO.java b/backend/src/main/java/com/itestra/eep/dtos/ProfileUpdateDTO.java
@@ -1,14 +1,15 @@
 package com.itestra.eep.dtos;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.itestra.eep.enums.DietaryPreference;
+import com.itestra.eep.serializers.GenderDeserializer;
+import com.itestra.eep.validators.ValidGender;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.Value;
-import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.type.SqlTypes;
 
 import java.io.Serializable;
 
@@ -26,6 +27,8 @@ public class ProfileUpdateDTO implements Serializable {
 
     @Size(max = 255)
     @NotBlank(message = "Gender cannot be empty.")
+    @ValidGender
+    @JsonDeserialize(using = GenderDeserializer.class)
     String gender;
 
     @Size(max = 255, message = "GitLab username should be shorter than 255 characters")
@@ -35,7 +38,6 @@ public class ProfileUpdateDTO implements Serializable {
     @Email(message = "Email should be valid.")
     String email;
 
-    @JdbcTypeCode(SqlTypes.ARRAY)
     @Enumerated(EnumType.STRING)
     DietaryPreference[] dietTypes;
 }
diff --git a/backend/src/main/java/com/itestra/eep/dtos/constraintSolver/ConstraintSolverDTO.java b/backend/src/main/java/com/itestra/eep/dtos/constraintSolver/ConstraintSolverDTO.java
@@ -2,16 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.itestra.eep.enums.DietaryPreference;
-import com.itestra.eep.serializers.DateDeserializer;
-import com.itestra.eep.serializers.DateSerializer;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
 
@@ -22,39 +18,40 @@ public class ConstraintSolverDTO implements Serializable {
     @JsonIgnore
     int guestCount;
 
+    @JsonIgnore
+    LocalDate employeeEmploymentStartDate;
+
     @JsonProperty("ProfileID")
     UUID profileId;
 
-    @JsonProperty("Anzahl")
-    public int getGuestCount() {
-        return guestCount + 1;
-    }
-
     @JsonProperty("Vorname")
     String employeeProfileName;
 
     @JsonProperty("Nachname")
     String employeeProfileLastName;
 
-    @JsonProperty("Projekt")
-    String project = "";
-
     @JsonProperty("Geschlecht")
     String employeeProfileGender;
 
     @JsonProperty("last neighborhood")
     UUID[] lastNeighbourhood;
 
-    DietaryPreference[] employeeProfileDietTypes;
-
-    @JsonSerialize(using = DateSerializer.class)
-    @JsonDeserialize(using = DateDeserializer.class)
-    @JsonProperty("Zugehörigkeit")
-    LocalDate employeeEmploymentStartDate;
-
     @JsonProperty("Standort")
     String employeeLocation = null;
 
     @JsonProperty("TableNr")
     Object[] tableIds;
+
+    @JsonProperty("Anzahl")
+    public int getGuestCount() {
+        return guestCount + 1;
+    }
+
+    @JsonProperty("Zugehörigkeit")
+    public Integer getEmploymentDuration() {
+        if (employeeEmploymentStartDate == null) {
+            return null;
+        }
+        return (int) ChronoUnit.MONTHS.between(employeeEmploymentStartDate, LocalDate.now());
+    }
 }
diff --git a/backend/src/main/java/com/itestra/eep/enums/Gender.java b/backend/src/main/java/com/itestra/eep/enums/Gender.java
@@ -0,0 +1,38 @@
+package com.itestra.eep.enums;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public enum Gender {
+
+    MALE(new String[]{"MALE", "M"}),
+    FEMALE(new String[]{"FEMALE", "F", "W"}),
+    DIVERSE(new String[]{"DIVERSE", "D"});
+
+    private final String[] values;
+    private static final Map<String, Gender> LOOKUP_MAP;
+
+
+    static {
+        LOOKUP_MAP = Arrays.stream(Gender.values())
+                .flatMap(gender -> Arrays.stream(gender.values)
+                        .map(value -> Map.entry(value.toUpperCase(), gender)))
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        Map.Entry::getValue,
+                        (existing, replacement) -> existing
+                ));
+    }
+
+    Gender(String[] values) {
+        this.values = values;
+    }
+
+    public static Gender fromStringOrNull(String value) {
+        if (value == null || value.trim().isEmpty()) {
+            return null;
+        }
+        return LOOKUP_MAP.get(value.trim().toUpperCase());
+    }
+}
diff --git a/backend/src/main/java/com/itestra/eep/mappers/EmployeeParticipationMapper.java b/backend/src/main/java/com/itestra/eep/mappers/EmployeeParticipationMapper.java
@@ -19,7 +19,6 @@ public interface EmployeeParticipationMapper {
     @Mapping(source = "employee.profile.name", target = "employeeProfileName")
     @Mapping(source = "employee.profile.lastName", target = "employeeProfileLastName")
     @Mapping(source = "employee.profile.gender", target = "employeeProfileGender")
-    @Mapping(source = "employee.profile.dietTypes", target = "employeeProfileDietTypes")
     @Mapping(source = "employee.employmentStartDate", target = "employeeEmploymentStartDate")
     @Mapping(source = "employee.location", target = "employeeLocation")
     @Mapping(target = "lastNeighbourhood", expression = "java(findPreviouslyMatchedEmployeeIds(employeeParticipation))")
diff --git a/backend/src/main/java/com/itestra/eep/models/Employee.java b/backend/src/main/java/com/itestra/eep/models/Employee.java
@@ -17,9 +17,6 @@
 @NoArgsConstructor
 @Table(name = "employee", schema = "organization")
 @AllArgsConstructor
-@NamedEntityGraph(name = "Employee.profile_participations",
-        attributeNodes = {@NamedAttributeNode("profile"), @NamedAttributeNode("participations")}
-)
 public class Employee {
 
     @Id
diff --git a/backend/src/main/java/com/itestra/eep/models/Event.java b/backend/src/main/java/com/itestra/eep/models/Event.java
@@ -18,9 +18,6 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@NamedEntityGraph(name = "Event.files_schematics",
-        attributeNodes = {@NamedAttributeNode("fileEntities"), @NamedAttributeNode("schematics")}
-)
 public class Event {
 
     @Id
diff --git a/backend/src/main/java/com/itestra/eep/repositories/EmployeeRepository.java b/backend/src/main/java/com/itestra/eep/repositories/EmployeeRepository.java
@@ -15,14 +15,14 @@
 public interface EmployeeRepository extends JpaRepository<Employee, UUID> {
 
     @Override
-    @EntityGraph("Employee.profile_participations")
     @NonNull
+    @EntityGraph(attributePaths = {"profile", "participations", "participationCount"})
     Optional<Employee> findById(@NonNull UUID id);
 
-    @EntityGraph("Employee.profile_participations")
+    @EntityGraph(attributePaths = {"profile.authorities", "participations", "participationCount"})
     List<Employee> findAllByOrderByProfileNameAsc();
 
-    @EntityGraph(attributePaths = {"profile"})
+    @EntityGraph(attributePaths = {"profile.authorities", "participations", "participationCount"})
     List<Employee> findByProfileEmailIn(Set<String> profile_email);
 
 }
diff --git a/backend/src/main/java/com/itestra/eep/repositories/EventRepository.java b/backend/src/main/java/com/itestra/eep/repositories/EventRepository.java
@@ -27,10 +27,11 @@ public interface EventRepository extends JpaRepository<Event, UUID> {
     @EntityGraph(attributePaths = {"employeeParticipations.employee.previousMatches"})
     Optional<Event> findByIdJoinedWithPreviousMatches(UUID id);
 
-    @EntityGraph("Event.files_schematics")
+
+    @EntityGraph(attributePaths = {"schematics", "fileEntities"})
     List<Event> findAllByDateAfter(LocalDateTime dateAfter);
 
-    @EntityGraph("Event.files_schematics")
+    @EntityGraph(attributePaths = {"schematics", "fileEntities"})
     List<Event> findByDateAfterAndVisitorParticipations_Profile_Id(LocalDateTime from, UUID participantId);
 
     @Lock(LockModeType.PESSIMISTIC_WRITE)
@@ -72,20 +73,22 @@ public interface EventRepository extends JpaRepository<Event, UUID> {
     List<SeatAllocationDetailsDTO> findCurrentSeatAllocationsByEventId(@Param("eventId") UUID eventId);
 
 
-    @EntityGraph(attributePaths = {
-            "employeeParticipations.employee.profile.authorities",
-            "visitorParticipations.profile.authorities"})
     @Query("""
             SELECT p.employee.profile
             FROM Event e
             JOIN e.employeeParticipations p
+            JOIN p.employee emp
+            JOIN emp.profile prof
+            LEFT JOIN FETCH prof.authorities
             WHERE e.id = :eventId
             
             UNION
             
             SELECT v.profile
             FROM Event e
             JOIN e.visitorParticipations v
+            JOIN v.profile prof
+            LEFT JOIN FETCH prof.authorities
             WHERE e.id = :eventId
             """)
     List<Profile> findAllParticipantProfilesByEventId(@Param("eventId") UUID eventId);
diff --git a/backend/src/main/java/com/itestra/eep/serializers/GenderDeserializer.java b/backend/src/main/java/com/itestra/eep/serializers/GenderDeserializer.java
@@ -0,0 +1,18 @@
+package com.itestra.eep.serializers;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.itestra.eep.enums.Gender;
+
+import java.io.IOException;
+
+public class GenderDeserializer extends JsonDeserializer<String> {
+
+    @Override
+    public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        String value = p.getValueAsString();
+        Gender gender = Gender.fromStringOrNull(value);
+        return gender != null ? gender.name() : value;
+    }
+}
diff --git a/backend/src/main/java/com/itestra/eep/services/impl/EmployeeServiceImpl.java b/backend/src/main/java/com/itestra/eep/services/impl/EmployeeServiceImpl.java
@@ -102,8 +102,7 @@ public EmployeeBatchUpsertResultDTO upsertEmployeesBatch(List<EmployeeCreateDTO>
                 employeesToSave.add(employee);
             }
         }
-
-        employeeRepository.saveAllAndFlush(employeesToSave);
+        employeesToSave = employeeRepository.saveAllAndFlush(employeesToSave);
         return new EmployeeBatchUpsertResultDTO(employeeMapper.toMinimalDetailsDto(employeesToSave), employeeMapper.toMinimalDetailsDto(employeesToUpdate));
     }
 
diff --git a/backend/src/main/java/com/itestra/eep/validators/GenderValidator.java b/backend/src/main/java/com/itestra/eep/validators/GenderValidator.java
@@ -0,0 +1,19 @@
+package com.itestra.eep.validators;
+
+
+import com.itestra.eep.enums.Gender;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+
+public class GenderValidator implements ConstraintValidator<ValidGender, String> {
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        if (value == null || value.trim().isEmpty()) {
+            return false;
+        }
+
+        return Gender.fromStringOrNull(value) != null;
+    }
+}
diff --git a/backend/src/main/java/com/itestra/eep/validators/ValidGender.java b/backend/src/main/java/com/itestra/eep/validators/ValidGender.java
@@ -0,0 +1,21 @@
+package com.itestra.eep.validators;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+@Target({ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = GenderValidator.class)
+public @interface ValidGender {
+    String message() default "Invalid gender value";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}
