Merge pull request #33 from devondragon/issue-31-Delete-Account-not-working

Issue 31 delete account not working

Author: devondragon

build.gradle

@@ -37,7 +37,7 @@ repositories {
 
 dependencies {
     // DigitalSanctuary Spring User Framework
-    implementation 'com.digitalsanctuary:ds-spring-user-framework:3.2.0'
+    implementation 'com.digitalsanctuary:ds-spring-user-framework:3.2.1'
 
     // Spring Boot starters
     implementation 'org.springframework.boot:spring-boot-starter-actuator'

src/main/java/com/digitalsanctuary/spring/demo/user/profile/EventRegistration.java

@@ -1,6 +1,7 @@
 package com.digitalsanctuary.spring.demo.user.profile;
 
 import com.digitalsanctuary.spring.demo.event.Event;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -19,9 +20,9 @@ public class EventRegistration {
     private Long id;
 
     @ToString.Exclude
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.REMOVE)
     private DemoUserProfile userProfile;
 
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.REMOVE)
     private Event event;
 }

src/main/java/com/digitalsanctuary/spring/demo/user/profile/UserProfileDeletionListener.java

@@ -0,0 +1,45 @@
+package com.digitalsanctuary.spring.demo.user.profile;
+
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import com.digitalsanctuary.spring.user.event.UserPreDeleteEvent;
+
+/**
+ * Listener for user profile deletion events. This class listens for UserPreDeleteEvent and deletes the associated DemoUserProfile. It is assumed that
+ * the DemoUserProfile is mapped to the User entity with a one-to-one relationship.
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class UserProfileDeletionListener {
+    private final DemoUserProfileRepository demoUserProfileRepository;
+    // Inject other repositories if needed (e.g., EventRegistrationRepository)
+
+    @EventListener
+    @Transactional // Joins the transaction started by UserService.deleteUserAccount
+    public void handleUserPreDelete(UserPreDeleteEvent event) {
+        Long userId = event.getUser().getId();
+        log.info("Received UserPreDeleteEvent for userId: {}. Deleting associated DemoUserProfile...", userId);
+
+        // Option 1: Delete profile directly (if no further cascades needed from profile)
+        // Since DemoUserProfile uses @MapsId, its ID is the same as the User's ID
+        demoUserProfileRepository.findById(userId).ifPresent(profile -> {
+            log.debug("Found DemoUserProfile for userId: {}. Deleting...", userId);
+            // If DemoUserProfile itself has relationships needing cleanup (like EventRegistrations)
+            // that aren't handled by CascadeType.REMOVE or orphanRemoval=true,
+            // handle them here *before* deleting the profile.
+            // Example: eventRegistrationRepository.deleteByUserProfile(profile);
+            demoUserProfileRepository.delete(profile);
+            log.debug("DemoUserProfile deleted for userId: {}", userId);
+        });
+
+        // Option 2: If DemoUserProfile has CascadeType.REMOVE/orphanRemoval=true
+        // on its collections (like eventRegistrations), deleting the profile might be enough.
+        // demoUserProfileRepository.deleteById(userId);
+
+        log.info("Finished processing UserPreDeleteEvent for userId: {}", userId);
+    }
+}

src/test/java/com/digitalsanctuary/spring/user/service/UserServiceTest.java

@@ -1,26 +1,25 @@
 package com.digitalsanctuary.spring.user.service;
 
-import com.digitalsanctuary.spring.user.dto.UserDto;
-import com.digitalsanctuary.spring.user.exceptions.UserAlreadyExistException;
-import com.digitalsanctuary.spring.user.persistence.model.Role;
-import com.digitalsanctuary.spring.user.persistence.model.User;
-import com.digitalsanctuary.spring.user.persistence.repository.PasswordResetTokenRepository;
-import com.digitalsanctuary.spring.user.persistence.repository.RoleRepository;
-import com.digitalsanctuary.spring.user.persistence.repository.UserRepository;
-import com.digitalsanctuary.spring.user.persistence.repository.VerificationTokenRepository;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+import java.util.Collections;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.crypto.password.PasswordEncoder;
-
-import java.util.Collections;
-
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.when;
+import com.digitalsanctuary.spring.user.dto.UserDto;
+import com.digitalsanctuary.spring.user.exceptions.UserAlreadyExistException;
+import com.digitalsanctuary.spring.user.persistence.model.Role;
+import com.digitalsanctuary.spring.user.persistence.model.User;
+import com.digitalsanctuary.spring.user.persistence.repository.PasswordResetTokenRepository;
+import com.digitalsanctuary.spring.user.persistence.repository.RoleRepository;
+import com.digitalsanctuary.spring.user.persistence.repository.UserRepository;
+import com.digitalsanctuary.spring.user.persistence.repository.VerificationTokenRepository;
 
 @ExtendWith(MockitoExtension.class)
 public class UserServiceTest {
@@ -43,6 +42,9 @@ public class UserServiceTest {
     @Mock
     public UserVerificationService userVerificationService;
 
+    @Mock
+    private ApplicationEventPublisher eventPublisher;
+
     @Mock
     public AuthorityService authorityService;
 
@@ -72,7 +74,7 @@ void setUp() {
         testUserDto.setRole(1);
 
         userService = new UserService(userRepository, tokenRepository, passwordTokenRepository, passwordEncoder, roleRepository, sessionRegistry,
-                userEmailService, userVerificationService, authorityService, dsUserDetailsService);
+                userEmailService, userVerificationService, authorityService, dsUserDetailsService, eventPublisher);
     }
 
     @Test