Enhance update process for meetings. Fix tests to suit latest features

Konstantin Pankratov · Konstantin Pankratov · commit 7d6af745d78c · 2025-03-27T13:46:06.000+01:00
diff --git a/server/src/main/java/com/studybuddies/server/services/MeetingService.java b/server/src/main/java/com/studybuddies/server/services/MeetingService.java
@@ -5,14 +5,15 @@
 import com.studybuddies.server.domain.MeetingEntity;
 import com.studybuddies.server.domain.UserEntity;
 import com.studybuddies.server.persistance.MeetingRepository;
+import com.studybuddies.server.services.exceptions.InvalidUUIDException;
 import com.studybuddies.server.services.exceptions.MeetingNotFoundException;
 import com.studybuddies.server.web.dto.MeetingChangeRequest;
 import com.studybuddies.server.web.dto.MeetingCreationRequest;
 import com.studybuddies.server.web.dto.MeetingResponse;
 import com.studybuddies.server.web.mapper.MeetingMapper;
+import com.studybuddies.server.web.mapper.MeetingMapperUtils;
 import jakarta.transaction.Transactional;
 import java.util.ArrayList;
-import java.util.function.Consumer;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +26,7 @@ public class MeetingService {
   private final MeetingMapper meetingMapper;
   private final MeetingRepository meetingRepository;
   private final UserService userService;
+  private final MeetingMapperUtils meetingMapperUtils;
 
   @Transactional
   public Long saveMeetingToDatabase(MeetingCreationRequest mcr, String uuid) {
@@ -47,15 +49,15 @@ public void changeMeetingInDatabase(Long id, MeetingChangeRequest meetingChangeR
       throw new MeetingNotFoundException("");
     }
 
-    MeetingEntity changedMeeting = meetingMapper.meetingChangeRequestToMeetingEntity(
-        meetingChangeRequest);
+    if(meetingChangeRequest.getCreator() != null
+        && !userService.existsByUUID(UUIDService.parseUUID(uuid))
+    ) {
+        throw new InvalidUUIDException("");
+      }
+
+    MeetingEntity changedMeetingEntity = meetingMapper.meetingChangeRequestToMeetingEntity(meetingChangeRequest);
+    MergingService.mergeObjects(changedMeetingEntity, meetingEntity);
 
-    setIfNotNull(changedMeeting.getTitle(), meetingEntity::setTitle);
-    setIfNotNull(changedMeeting.getDescription(), meetingEntity::setDescription);
-    setIfNotNull(changedMeeting.getDate_from(), meetingEntity::setDate_from);
-    setIfNotNull(changedMeeting.getDate_until(), meetingEntity::setDate_until);
-    setIfNotNull(changedMeeting.getPlace(), meetingEntity::setPlace);
-    setIfNotNull(changedMeeting.getRepeatable(), meetingEntity::setRepeatable);
     meetingMapper.validate(meetingEntity);
     meetingRepository.save(meetingEntity);
   }
@@ -97,10 +99,4 @@ public ArrayList<MeetingResponse> findAllMeetingEntities() {
     }
     return meetings;
   }
-
-  private <T> void setIfNotNull(T value, Consumer<T> setFunc) {
-    if (value != null) {
-      setFunc.accept(value);
-    }
-  }
 }
diff --git a/server/src/main/java/com/studybuddies/server/services/MergingService.java b/server/src/main/java/com/studybuddies/server/services/MergingService.java
@@ -0,0 +1,35 @@
+package com.studybuddies.server.services;
+
+import com.studybuddies.server.services.exceptions.MergeFailedException;
+import java.lang.reflect.Field;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MergingService {
+  public static void mergeObjects(Object source, Object target) {
+        if (source == null || target == null) {
+            throw new IllegalArgumentException("Source and target objects must not be null");
+        }
+
+        Class<?> sourceClass = source.getClass();
+        Class<?> targetClass = target.getClass();
+
+        if (!sourceClass.equals(targetClass)) {
+            throw new IllegalArgumentException("Source and target objects must be of the same type");
+        }
+
+        Field[] fields = sourceClass.getDeclaredFields();
+
+        for (Field field : fields) {
+            field.setAccessible(true);
+            try {
+                Object sourceValue = field.get(source);
+                if (sourceValue != null) {
+                    field.set(target, sourceValue);
+                }
+            } catch (IllegalAccessException e) {
+              throw new MergeFailedException("");
+            }
+        }
+    }
+}
diff --git a/server/src/main/java/com/studybuddies/server/services/UserService.java b/server/src/main/java/com/studybuddies/server/services/UserService.java
@@ -45,4 +45,9 @@ public void deleteUser(String targetUuid, String senderUuid) {
       userRepository.deleteById(UUIDService.parseUUID(targetUuid));
     }
   }
+
+  @Transactional
+  public boolean existsByUUID(UUID uuid) {
+    return userRepository.existsById(uuid);
+  }
 }
diff --git a/server/src/main/java/com/studybuddies/server/services/exceptions/MergeFailedException.java b/server/src/main/java/com/studybuddies/server/services/exceptions/MergeFailedException.java
@@ -0,0 +1,8 @@
+package com.studybuddies.server.services.exceptions;
+
+public class MergeFailedException extends StudyBuddiesException {
+
+  public MergeFailedException(String message) {
+    super(message);
+  }
+}
diff --git a/server/src/main/java/com/studybuddies/server/web/GlobalExceptionHandler.java b/server/src/main/java/com/studybuddies/server/web/GlobalExceptionHandler.java
@@ -2,6 +2,7 @@
 
 import com.studybuddies.server.services.exceptions.InvalidUUIDException;
 import com.studybuddies.server.services.exceptions.MeetingNotFoundException;
+import com.studybuddies.server.services.exceptions.MergeFailedException;
 import com.studybuddies.server.services.exceptions.UserAccountSetupNotFinished;
 import com.studybuddies.server.web.mapper.exceptions.AccountSetupAlreadyFinished;
 import com.studybuddies.server.web.mapper.exceptions.DateFormatException;
@@ -49,4 +50,8 @@ protected ResponseEntity<?> handleInvalidUUIDException() {
     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Invalid UUID provided");
   }
 
+  @ExceptionHandler(MergeFailedException.class)
+  protected ResponseEntity<?> handleMergeFailedException() {
+    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Updating failed. Please create an issue on GitHub");
+  }
 }
diff --git a/server/src/main/java/com/studybuddies/server/web/dto/MeetingChangeRequest.java b/server/src/main/java/com/studybuddies/server/web/dto/MeetingChangeRequest.java
@@ -12,4 +12,5 @@ public class MeetingChangeRequest {
     public String date_until;
     public String repeatable;
     public String place;
+    public String creator;
 }
diff --git a/server/src/main/java/com/studybuddies/server/web/dto/MeetingResponse.java b/server/src/main/java/com/studybuddies/server/web/dto/MeetingResponse.java
@@ -14,4 +14,5 @@ public class MeetingResponse {
     public String date_until;
     public String repeatable;
     public String place;
+    public String creator;
 }
diff --git a/server/src/main/java/com/studybuddies/server/web/mapper/MeetingMapper.java b/server/src/main/java/com/studybuddies/server/web/mapper/MeetingMapper.java
@@ -29,6 +29,7 @@ public interface MeetingMapper {
   @Mapping(source = "date_from", target = "date_from")
   @Mapping(source = "date_until", target = "date_until")
   @Mapping(source = "repeatable", target = "repeatable")
+  @Mapping(source = "creator", target = "creator", qualifiedByName = "userEntityToUUIDString")
   MeetingResponse meetingEntityToMeetingResponse(MeetingEntity meetingEntity);
 
   // Mappings for meetingChangeRequestToMeetingEntity
@@ -37,11 +38,15 @@ public interface MeetingMapper {
   @Mapping(source = "place", target = "place")
   @Mapping(source = "date_from", target = "date_from", qualifiedByName = "changeStringToLocalDate")
   @Mapping(source = "date_until", target = "date_until", qualifiedByName = "changeStringToLocalDate")
-  @Mapping(source = "repeatable", target = "repeatable", qualifiedByName = "stringToRepeatEnum")
+  @Mapping(source = "repeatable", target = "repeatable", qualifiedByName = "changeStringToRepeatEnum")
+  @Mapping(source = "creator", target = "creator", qualifiedByName = "stringToUserEntity")
   MeetingEntity meetingChangeRequestToMeetingEntity(MeetingChangeRequest meetingChangeRequest);
 
   @AfterMapping
   default void validate(@MappingTarget MeetingEntity meetingEntity) {
+    if(meetingEntity.getDate_from() == null || meetingEntity.getDate_until() == null) {
+      return;
+    }
     LocalDateTime start = meetingEntity.getDate_from();
     LocalDateTime end = meetingEntity.getDate_until();
 
diff --git a/server/src/main/java/com/studybuddies/server/web/mapper/MeetingMapperUtils.java b/server/src/main/java/com/studybuddies/server/web/mapper/MeetingMapperUtils.java
@@ -1,22 +1,36 @@
 package com.studybuddies.server.web.mapper;
 
 import com.studybuddies.server.domain.Repeat;
+import com.studybuddies.server.domain.UserEntity;
+import com.studybuddies.server.services.UUIDService;
+import com.studybuddies.server.services.UserService;
 import com.studybuddies.server.web.mapper.exceptions.DateFormatException;
 import com.studybuddies.server.web.mapper.exceptions.InvalidRepeatStringException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import lombok.AllArgsConstructor;
 import org.mapstruct.Named;
 import org.springframework.stereotype.Component;
 
 @Component
+@AllArgsConstructor
 public class MeetingMapperUtils {
+
+  private final UserService userService;
+
   // MeetingCreationRequest
   @Named("stringToLocalDate")
   public LocalDateTime stringToLocalDate(String dateString) {
     return stringToLocalDateTime(dateString);
   }
 
+  // MeetingCreationRequest
+  @Named("stringToRepeatEnum")
+  public Repeat stringToRepeatEnum(String repeatString) {
+    return stringToRepeat(repeatString);
+  }
+
   // MeetingChangeRequest
   @Named("changeStringToLocalDate")
   public LocalDateTime changeStringToLocalDate(String dateString) {
@@ -26,20 +40,29 @@ public LocalDateTime changeStringToLocalDate(String dateString) {
     return stringToLocalDateTime(dateString);
   }
 
-  // MeetingCreationRequest
-  @Named("stringToRepeatEnum")
-  public Repeat stringToRepeatEnum(String repeatString) {
-    return stringToRepeat(repeatString);
-  }
-
   // MeetingChangeRequest
   @Named("changeStringToRepeatEnum")
   public Repeat changeStringToRepeatEnum(String repeatString) {
     if (repeatString == null || repeatString.trim().isEmpty()) {
       return null;
     }
     return stringToRepeat(repeatString);
+  }
+
+  @Named("stringToUserEntity")
+  public UserEntity stringToUserEntity(String uuidString) {
+    if(uuidString == null || uuidString.trim().isEmpty()) {
+      return null;
+    }
+    return userService.findByUUID(UUIDService.parseUUID(uuidString));
+  }
 
+  @Named("userEntityToUUIDString")
+  public String userEntityToUUIDString(UserEntity userEntity) {
+    if(userEntity == null) {
+      return null;
+    }
+    return userEntity.getUuid().toString();
   }
 
   private Repeat stringToRepeat(String repeatString) {
diff --git a/server/src/test/java/com/studybuddies/server/services/MeetingServiceTest.java b/server/src/test/java/com/studybuddies/server/services/MeetingServiceTest.java
@@ -50,7 +50,6 @@ public void saveMeetingToDatabaseTest_invalidRepeatable_throwsException() {
     // when
     when(meetingMapper.meetingCreationRequestToMeetingEntity(mockMeeting))
         .thenThrow(new InvalidRepeatStringException("Invalid repeatable value"));
-    when(userService.findByUUID(uuid)).thenReturn(any(UserEntity.class));
 
     // then
     assertThrows(InvalidRepeatStringException.class, () -> {
@@ -95,6 +94,7 @@ public void saveMeetingToDatabase_success() {
   public void changeMeetingInDatabaseTest_meetingNotFound_throwsException() {
     // given
     UserEntity mockUser = new UserEntity();
+    mockUser.setUuid(UUID.randomUUID());
 
     Long meetingId = 1L;
     MeetingChangeRequest mockChangeRequest = new MeetingChangeRequest();
@@ -123,8 +123,14 @@ public void retrieveMeetingFromDatabaseTest_meetingNotFound_throwsException() {
   @Test
   public void deleteMeetingFromDatabaseTest_validId_deletesMeeting() {
     // given
-    UserEntity mockUser = new UserEntity();
     Long meetingId = 1L;
+    UserEntity mockUser = new UserEntity();
+    mockUser.setUuid(UUID.randomUUID());
+
+    MeetingEntity mockMeetingEntity = new MeetingEntity();
+    mockMeetingEntity.setId(meetingId);
+    mockMeetingEntity.setCreator(mockUser);
+    when(meetingRepository.findById(meetingId)).thenReturn(Optional.of(mockMeetingEntity));
 
     // when
     meetingService.deleteMeetingFromDatabase(meetingId, mockUser.getUuid().toString());
@@ -136,11 +142,14 @@ public void deleteMeetingFromDatabaseTest_validId_deletesMeeting() {
   public void changeMeetingInDatabaseTest_updatesOnlyNonNullFields() {
     // given
     UserEntity mockUser = new UserEntity();
+    mockUser.setUuid(UUID.randomUUID());
     Long meetingId = 1L;
     MeetingEntity existingMeeting = new MeetingEntity();
     existingMeeting.setTitle("Old Title");
     existingMeeting.setDescription("Old Description");
     existingMeeting.setPlace("Old Place");
+    existingMeeting.setCreator(mockUser);
+
 
     MeetingChangeRequest mockChangeRequest = new MeetingChangeRequest();
     mockChangeRequest.setTitle("New Title"); // Should be updated

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,9 @@ public void deleteUser(String targetUuid, String senderUuid) {`
`45`	`45`	`userRepository.deleteById(UUIDService.parseUUID(targetUuid));`
`46`	`46`	`}`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+ @Transactional`
	`50`	`+ public boolean existsByUUID(UUID uuid) {`
	`51`	`+ return userRepository.existsById(uuid);`
	`52`	`+ }`
`48`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import com.studybuddies.server.services.exceptions.InvalidUUIDException;`
`4`	`4`	`import com.studybuddies.server.services.exceptions.MeetingNotFoundException;`
	`5`	`+import com.studybuddies.server.services.exceptions.MergeFailedException;`
`5`	`6`	`import com.studybuddies.server.services.exceptions.UserAccountSetupNotFinished;`
`6`	`7`	`import com.studybuddies.server.web.mapper.exceptions.AccountSetupAlreadyFinished;`
`7`	`8`	`import com.studybuddies.server.web.mapper.exceptions.DateFormatException;`
`@@ -49,4 +50,8 @@ protected ResponseEntity<?> handleInvalidUUIDException() {`
`49`	`50`	`return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Invalid UUID provided");`
`50`	`51`	`}`
`51`	`52`
	`53`	`+ @ExceptionHandler(MergeFailedException.class)`
	`54`	`+ protected ResponseEntity<?> handleMergeFailedException() {`
	`55`	`+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Updating failed. Please create an issue on GitHub");`
	`56`	`+ }`
`52`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ public class MeetingChangeRequest {`
`12`	`12`	`public String date_until;`
`13`	`13`	`public String repeatable;`
`14`	`14`	`public String place;`
	`15`	`+ public String creator;`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,5 @@ public class MeetingResponse {`
`14`	`14`	`public String date_until;`
`15`	`15`	`public String repeatable;`
`16`	`16`	`public String place;`
	`17`	`+ public String creator;`
`17`	`18`	`}`