Merge pull request #46 from Halbes-Byte/feature/specifications

Feature/specifications

Author: Daenges

git-user-stats

@@ -0,0 +1,21 @@
+package com.studybuddies.server.domain;
+
+import java.util.HashMap;
+import lombok.Getter;
+
+@Getter
+public class Filter {
+  HashMap<String, String> filters;
+
+  private Filter() {}
+
+  public static Filter of(Filter filter, String key, String value) {
+    if(filter == null) {
+      filter = new Filter();
+      filter.filters = new HashMap<>();
+    }
+    filter.filters.putIfAbsent(key, value);
+
+    return filter;
+  }
+}

server/src/main/java/com/studybuddies/server/domain/Filter.java

@@ -7,6 +7,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 import java.util.UUID;
 import lombok.AllArgsConstructor;
@@ -24,24 +25,25 @@
 @NoArgsConstructor
 public class MeetingEntity {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.UUID)
-  UUID id;
+@Id
+@GeneratedValue(strategy = GenerationType.UUID)
+UUID id;
 
-  UUID superId;
+UUID superId;
 
-  @Column(nullable = false)
-  String module;
+@Column(nullable = false)
+@NotBlank
+String module;
 
-  String description;
+String description;
 
-  @Column(nullable = false)
-  LocalDateTime dateFrom;
-  @Column(nullable = false)
-  LocalDateTime dateUntil;
-  Repeat repeatable;
-  String place;
+@Column(nullable = false)
+LocalDateTime dateFrom;
+@Column(nullable = false)
+LocalDateTime dateUntil;
+Repeat repeatable;
+String place;
 
-  @ManyToOne
-  private UserEntity creator;
+@ManyToOne
+private UserEntity creator;
 }

server/src/main/java/com/studybuddies/server/domain/MeetingEntity.java

@@ -4,11 +4,14 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface MeetingRepository extends CrudRepository<MeetingEntity, UUID> {
+public interface MeetingRepository extends CrudRepository<MeetingEntity, UUID>,
+    JpaSpecificationExecutor<MeetingEntity> {
 
   void deleteById(UUID id);
 

server/src/main/java/com/studybuddies/server/persistance/MeetingRepository.java

@@ -1,5 +1,6 @@
 package com.studybuddies.server.services;
 
+import com.studybuddies.server.domain.Filter;
 import com.studybuddies.server.domain.MeetingEntity;
 import com.studybuddies.server.domain.StudyGroupEntity;
 import com.studybuddies.server.domain.UserEntity;
@@ -31,7 +32,7 @@ public class StudyGroupService implements
   private final StudyGroupMapper studyGroupMapper;
 
   @Override
-  public List<StudyGroupResponse> get(String id) {
+  public List<StudyGroupResponse> get(String id, Filter filter) {
     var studyGroupEntities = findStudyGroupsByUUID(id);
     List<StudyGroupResponse> responses = new ArrayList<>();
     for (StudyGroupEntity studyGroupEntity : studyGroupEntities) {
@@ -44,12 +45,11 @@ public List<StudyGroupResponse> get(String id) {
   public void create(StudyGroupJoinRequest request, String clientUuid) {
     UserEntity userEntity = userService.findByUUID(UUIDService.parseUUID(clientUuid));
 
-    if (!Objects.equals(request.meetingId, "")) {
+    if (request.meetingId != null && !request.meetingId.isEmpty()) {
       MeetingEntity meetingEntity = meetingService.findMeetingByUUID(request.meetingId);
       joinMeeting(userEntity, meetingEntity);
-    }
-    else if (!Objects.equals(request.superMeetingID, "")) {
-      List<MeetingEntity> meetingList = meetingService.findMeetingsBySuperID(request.superMeetingID);
+    } else if (request.superMeetingId != null && !request.superMeetingId.isEmpty()) {
+      List<MeetingEntity> meetingList = meetingService.findMeetingsBySuperID(request.superMeetingId);
 
       for (MeetingEntity m : meetingList) {
         joinMeeting(userEntity, m);

server/src/main/java/com/studybuddies/server/services/StudyGroupService.java

@@ -1,5 +1,6 @@
 package com.studybuddies.server.services.interfaces;
 
+import com.studybuddies.server.domain.Filter;
 import com.studybuddies.server.web.dto.interfaces.ChangeRequest;
 import com.studybuddies.server.web.dto.interfaces.CreationRequest;
 import com.studybuddies.server.web.dto.interfaces.Responses;
@@ -15,7 +16,17 @@ default List<S> get() {
   }
 
   @Transactional
-  default List<S> get(String id) {
+  default List<S> get(Filter filter) {
+    throw new UnsupportedOperationException("This operation is not supported");
+  }
+
+  @Transactional
+  default List<S> get(String id, Filter filter) {
+    throw new UnsupportedOperationException("This operation is not supported");
+  }
+
+  @Transactional
+  default List<S> get(String id, String clientUUID, Filter filter) {
     throw new UnsupportedOperationException("This operation is not supported");
   }
 

server/src/main/java/com/studybuddies/server/services/interfaces/CRUDService.java

@@ -1,17 +1,19 @@
 package com.studybuddies.server.services.meeting;
 
+import com.studybuddies.server.domain.Filter;
 import com.studybuddies.server.domain.MeetingEntity;
 import com.studybuddies.server.persistance.MeetingRepository;
 import com.studybuddies.server.services.UUIDService;
-import com.studybuddies.server.services.user.UserService;
 import com.studybuddies.server.services.exceptions.MeetingNotFoundException;
+import com.studybuddies.server.services.exceptions.ModuleNotFoundException;
 import com.studybuddies.server.services.interfaces.CRUDService;
 import com.studybuddies.server.web.dto.meeting.MeetingChangeRequest;
 import com.studybuddies.server.web.dto.meeting.MeetingCreationRequest;
 import com.studybuddies.server.web.dto.meeting.MeetingResponse;
 import com.studybuddies.server.web.mapper.MeetingMapper;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.NotImplementedException;
@@ -25,19 +27,25 @@ public class MeetingService implements
 
   private final MeetingMapper meetingMapper;
   private final MeetingRepository meetingRepository;
-  private final UserService userService;
   private final MeetingCreationService meetingCreationService;
   private final MeetingChangeService meetingChangeService;
 
   @Override
-  public List<MeetingResponse> get(String meetingId) {
+  public List<MeetingResponse> get(String clientUUID, Filter filter) {
     List<MeetingResponse> responses = new ArrayList<>();
+    List<MeetingEntity> meetings;
+    UUID client = UUIDService.parseUUID(clientUUID);
 
-    if (meetingId == null) {
-      return findAllMeetingEntities();
+    if(filter == null) {
+      meetings = meetingRepository.findAll(MeetingSpecificationService.getSpecParticipant(client));
+    } else {
+      var module = filter.getFilters().get("module");
+
+      if(module != null)
+        meetings = meetingRepository.findAll(MeetingSpecificationService.getSpecRelevantMeetings(UUIDService.parseUUID(clientUUID), module.toUpperCase()));
+      else
+        throw new ModuleNotFoundException("Module not found");
     }
-    List<MeetingEntity> meetings = meetingRepository.findBySuperId(
-        UUIDService.parseUUID(meetingId));
 
     for (var meetingEntity : meetings) {
       responses.add(meetingMapper.of(meetingEntity));
@@ -74,16 +82,6 @@ public void delete(String targetUUID, String clientUUID) {
     }
   }
 
-  private List<MeetingResponse> findAllMeetingEntities() {
-    ArrayList<MeetingResponse> meetings = new ArrayList<>();
-    Iterable<MeetingEntity> meetingIterator = meetingRepository.findAll();
-
-    for (MeetingEntity e : meetingIterator) {
-      meetings.add(meetingMapper.of(e));
-    }
-    return meetings;
-  }
-
   public MeetingEntity findMeetingByUUID(String uuid) {
     return meetingRepository.findById(UUIDService.parseUUID(uuid)).orElse(null);
   }

server/src/main/java/com/studybuddies/server/services/meeting/MeetingService.java

@@ -1,8 +1,12 @@
 package com.studybuddies.server.services.meeting;
 
 import com.studybuddies.server.domain.MeetingEntity;
-import com.studybuddies.server.persistance.MeetingRepository;
+import com.studybuddies.server.domain.StudyGroupEntity;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Subquery;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
@@ -11,7 +15,6 @@
 @RequiredArgsConstructor
 public class MeetingSpecificationService {
 
-  final MeetingRepository meetingRepository;
 
   public static Specification<MeetingEntity> isThisWeek() {
     return (root, query, builder) -> {
@@ -24,4 +27,57 @@ public static Specification<MeetingEntity> isThisWeek() {
       );
     };
   }
+
+  private static Specification<MeetingEntity> isParticipant(UUID userId) {
+    return (root, query, cb) -> {
+      Subquery<UUID> subquery = query.subquery(UUID.class);
+      Root<StudyGroupEntity> studyGroupRoot = subquery.from(StudyGroupEntity.class);
+      subquery.select(studyGroupRoot.get("meeting").get("id"))
+          .where(cb.equal(studyGroupRoot.get("user").get("id"), userId));
+
+      return cb.or(cb.in(root.get("id")).value(subquery), cb.equal(root.get("creator").get("id"), userId));
+    };
+  }
+
+  private static Specification<MeetingEntity> isNotParticipant(UUID userId) {
+    return (root, query, cb) -> {
+      Subquery<UUID> subquery = query.subquery(UUID.class);
+      Root<StudyGroupEntity> sg = subquery.from(StudyGroupEntity.class);
+
+      subquery.select(sg.get("meeting").get("id"))
+          .where(cb.equal(sg.get("user").get("id"), userId));
+
+      return cb.and(
+          cb.not(root.get("id").in(subquery)),
+          cb.notEqual(root.get("creator").get("id"), userId)
+      );
+    };
+  }
+
+  private static Specification<MeetingEntity> isRelevant(String userModules) {
+    return (r, q, b) -> b.equal(r.get("module"), userModules);
+  }
+
+  public static Specification<MeetingEntity> startsAfter(LocalDateTime start) {
+    return (r, q, b) ->
+        b.greaterThanOrEqualTo(r.get("dateFrom"), start);
+  }
+
+  public static Specification<MeetingEntity> endsBefore(LocalDateTime end) {
+    return (r, q, b) ->
+        b.lessThanOrEqualTo(r.get("dateUntil"), end);
+  }
+
+  public static Specification<MeetingEntity> getSpecRelevantMeetings(
+      UUID clientId,
+      String modules
+  ) {
+    return Specification
+        .where(isNotParticipant(clientId))
+        .and(isRelevant(modules));
+  }
+
+  public static Specification<MeetingEntity> getSpecParticipant(UUID userId) {
+    return isParticipant(userId);
+  }
 }

server/src/main/java/com/studybuddies/server/services/meeting/MeetingSpecificationService.java

@@ -1,5 +1,6 @@
 package com.studybuddies.server.services.module;
 
+import com.studybuddies.server.domain.Filter;
 import com.studybuddies.server.domain.ModuleEntity;
 import com.studybuddies.server.persistance.ModuleRepository;
 import com.studybuddies.server.services.exceptions.ModuleMayAlreadyExistException;
@@ -30,7 +31,7 @@ public List<ModuleResponse> get() {
   }
 
   @Override
-  public List<ModuleResponse> get(String name) {
+  public List<ModuleResponse> get(String name, Filter filter) {
     String creationModule = moduleUtilService.normalizeModuleName(name);
     Iterable<ModuleEntity> iterable = moduleRepository.findAll();
 

server/src/main/java/com/studybuddies/server/services/module/ModuleCrudService.java

@@ -1,5 +1,6 @@
 package com.studybuddies.server.services.user;
 
+import com.studybuddies.server.domain.Filter;
 import com.studybuddies.server.domain.UserEntity;
 import com.studybuddies.server.persistance.UserRepository;
 import com.studybuddies.server.services.UUIDService;
@@ -33,7 +34,7 @@ public class UserService implements
   private final ModuleValidationService moduleValidationService;
 
   @Override
-  public List<UserResponse> get(String userUUID) {
+  public List<UserResponse> get(String userUUID, Filter filter) {
     Optional<UserEntity> target = userRepository.findById(UUIDService.parseUUID(userUUID));
 
     if (target.isEmpty()) {