feat: Enhance event registration and unregistration processes with improved session profile management and entity handling

Author: devondragon

src/main/java/com/digitalsanctuary/spring/demo/event/EventAPIController.java

@@ -74,18 +74,27 @@ public ResponseEntity<Void> deleteEvent(@PathVariable Long id) {
     @PreAuthorize("hasAuthority('REGISTER_FOR_EVENT_PRIVILEGE')")
     @Transactional
     public ResponseEntity<Event> registerForEvent(@PathVariable Long eventId) {
+        // Validate event exists first
         Optional<Event> event = eventService.getEventById(eventId);
         if (event.isEmpty()) {
             log.info("Event not found with id: {}", eventId);
             return ResponseEntity.notFound().build();
         }
+        
+        // Get user profile from session
         DemoUserProfile userProfile = demoSessionProfile.getUserProfile();
-        if (userProfile == null) {
-            log.info("User not found in session");
+        if (userProfile == null || userProfile.getId() == null) {
+            log.info("User profile not found in session");
             return ResponseEntity.badRequest().build();
         }
-        demoUserProfileService.registerForEvent(userProfile, event.get());
-        log.info("User registered for event: {}", eventId);
+        
+        // Register using IDs to ensure managed entities
+        demoUserProfileService.registerForEvent(userProfile.getId(), eventId);
+        log.info("User {} registered for event: {}", userProfile.getId(), eventId);
+        
+        // Refresh the session profile to include the new registration
+        demoSessionProfile.refreshProfile();
+        
         return ResponseEntity.ok(event.get());
     }
 
@@ -98,19 +107,27 @@ public ResponseEntity<Event> registerForEvent(@PathVariable Long eventId) {
     @PostMapping("/{eventId}/unregister")
     @PreAuthorize("hasAuthority('REGISTER_FOR_EVENT_PRIVILEGE')")
     public ResponseEntity<Event> unregisterFromEvent(@PathVariable Long eventId) {
+        // Validate event exists first
         Optional<Event> event = eventService.getEventById(eventId);
         if (event.isEmpty()) {
             log.info("Event not found with id: {}", eventId);
             return ResponseEntity.notFound().build();
         }
+        
+        // Get user profile from session
         DemoUserProfile userProfile = demoSessionProfile.getUserProfile();
-        if (userProfile == null) {
-            log.info("User not found in session");
+        if (userProfile == null || userProfile.getId() == null) {
+            log.info("User profile not found in session");
             return ResponseEntity.badRequest().build();
         }
 
-        demoUserProfileService.unregisterFromEvent(userProfile, event.get());
-        log.info("User unregistered from event: {}", eventId);
+        // Unregister using IDs to ensure managed entities
+        demoUserProfileService.unregisterFromEvent(userProfile.getId(), eventId);
+        log.info("User {} unregistered from event: {}", userProfile.getId(), eventId);
+        
+        // Refresh the session profile to reflect the unregistration
+        demoSessionProfile.refreshProfile();
+        
         return ResponseEntity.ok(event.get());
     }
 

src/main/java/com/digitalsanctuary/spring/demo/event/EventPageController.java

@@ -60,8 +60,12 @@ public String eventDetails(@PathVariable("eventId") String eventId, Model model)
             // Add registration flag for authenticated users
             DemoUserProfile profile = demoSessionProfile.getUserProfile();
             if (profile != null) {
-                boolean isRegistered = profile.isRegisteredForEvent(event);
-                model.addAttribute("isRegistered", isRegistered);
+                // Refresh profile to get latest registration status
+                profile = demoSessionProfile.refreshProfile();
+                if (profile != null) {
+                    boolean isRegistered = profile.isRegisteredForEvent(event);
+                    model.addAttribute("isRegistered", isRegistered);
+                }
             }
             return "/event/details";
 
@@ -94,7 +98,11 @@ public String myEvents(Model model) {
         DemoUserProfile profile = demoSessionProfile.getUserProfile();
         List<Event> myEvents = new ArrayList<>();
         if (profile != null) {
-            myEvents = profile.getEventRegistrations().stream().map(EventRegistration::getEvent).collect(Collectors.toList());
+            // Refresh the profile to ensure we have latest event registrations
+            profile = demoSessionProfile.refreshProfile();
+            if (profile != null) {
+                myEvents = profile.getEventRegistrations().stream().map(EventRegistration::getEvent).collect(Collectors.toList());
+            }
         }
         model.addAttribute("myEvents", myEvents);
         return "/event/my-events";

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

@@ -3,6 +3,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.digitalsanctuary.spring.demo.event.Event;
+import com.digitalsanctuary.spring.demo.event.EventRepository;
 import com.digitalsanctuary.spring.user.persistence.model.User;
 import com.digitalsanctuary.spring.user.persistence.repository.UserRepository;
 import com.digitalsanctuary.spring.user.profile.UserProfileService;
@@ -114,6 +115,7 @@ public class DemoUserProfileService implements UserProfileService<DemoUserProfil
 
     private final DemoUserProfileRepository profileRepository;
     private final UserRepository userRepository;
+    private final EventRepository eventRepository;
 
     /**
      * Retrieves an existing profile for the given user or creates a new one if none exists.
@@ -159,8 +161,44 @@ public DemoUserProfile updateProfile(DemoUserProfile profile) {
         return profileRepository.save(profile);
     }
 
+    /**
+     * Registers a user profile for a specific event using IDs to ensure entities are managed.
+     * 
+     * <p>
+     * This method loads the profile and event as managed entities within the transaction,
+     * avoiding issues with detached entities and cascade operations.
+     * 
+     * @param profileId the ID of the profile to register for the event
+     * @param eventId the ID of the event to register for
+     * @return the updated profile with the event registration
+     * @throws IllegalArgumentException if the profile or event is not found
+     */
+    @Transactional
+    public DemoUserProfile registerForEvent(Long profileId, Long eventId) {
+        // Load managed entities within the transaction
+        DemoUserProfile profile = profileRepository.findById(profileId)
+            .orElseThrow(() -> new IllegalArgumentException("Profile not found with id: " + profileId));
+        Event event = eventRepository.findById(eventId)
+            .orElseThrow(() -> new IllegalArgumentException("Event not found with id: " + eventId));
+        
+        // Check if already registered
+        if (profile.isRegisteredForEvent(event)) {
+            log.info("Profile {} is already registered for event {}", profileId, eventId);
+            return profile;
+        }
+        
+        EventRegistration registration = new EventRegistration();
+        registration.setEvent(event);
+        profile.addEventRegistration(registration);
+        
+        // No explicit save needed - transaction will persist changes to managed entities
+        return profile;
+    }
+
     /**
      * Registers the given profile for a specific event.
+     * 
+     * @deprecated Use {@link #registerForEvent(Long, Long)} instead to avoid issues with detached entities.
      *
      * <p>
      * This method demonstrates how to extend profile functionality with application-specific logic.
@@ -170,23 +208,47 @@ public DemoUserProfile updateProfile(DemoUserProfile profile) {
      * @return the updated profile with the event registration
      * @throws IllegalArgumentException if the profile or event is null
      */
-    @Transactional // added to ensure the session remains active
+    @Deprecated
+    @Transactional
     public DemoUserProfile registerForEvent(DemoUserProfile profile, Event event) {
         if (profile == null) {
             throw new IllegalArgumentException("Profile must not be null");
         }
         if (event == null) {
             throw new IllegalArgumentException("Event must not be null");
         }
+        
+        // Delegate to the ID-based method to ensure we work with managed entities
+        return registerForEvent(profile.getId(), event.getId());
+    }
 
-        EventRegistration registration = new EventRegistration();
-        registration.setEvent(event);
-        profile.addEventRegistration(registration);
-        return profileRepository.save(profile);
+    /**
+     * Unregisters a user profile from a specific event using IDs to ensure entities are managed.
+     * 
+     * @param profileId the ID of the profile to unregister from the event
+     * @param eventId the ID of the event to unregister from
+     * @return the updated profile without the event registration
+     * @throws IllegalArgumentException if the profile or event is not found
+     */
+    @Transactional
+    public DemoUserProfile unregisterFromEvent(Long profileId, Long eventId) {
+        // Load managed entities within the transaction
+        DemoUserProfile profile = profileRepository.findById(profileId)
+            .orElseThrow(() -> new IllegalArgumentException("Profile not found with id: " + profileId));
+        Event event = eventRepository.findById(eventId)
+            .orElseThrow(() -> new IllegalArgumentException("Event not found with id: " + eventId));
+        
+        profile.removeEventRegistration(event);
+        log.info("Unregistered profile {} from event {}", profileId, eventId);
+        
+        // No explicit save needed - transaction will persist changes to managed entities
+        return profile;
     }
 
     /**
      * Unregisters the given profile from a specific event.
+     * 
+     * @deprecated Use {@link #unregisterFromEvent(Long, Long)} instead to avoid issues with detached entities.
      *
      * <p>
      * This method demonstrates how to extend profile functionality with application-specific logic.
@@ -196,15 +258,16 @@ public DemoUserProfile registerForEvent(DemoUserProfile profile, Event event) {
      * @return the updated profile without the event registration
      * @throws IllegalArgumentException if the profile or event is null
      */
+    @Deprecated
     public DemoUserProfile unregisterFromEvent(DemoUserProfile profile, Event event) {
         if (profile == null) {
             throw new IllegalArgumentException("Profile must not be null");
         }
         if (event == null) {
             throw new IllegalArgumentException("Event must not be null");
         }
-        profile.removeEventRegistration(event);
-        log.info("Unregistered profile {} from event {}", profile.getId(), event.getId());
-        return profileRepository.save(profile);
+        
+        // Delegate to the ID-based method to ensure we work with managed entities
+        return unregisterFromEvent(profile.getId(), event.getId());
     }
 }

src/main/java/com/digitalsanctuary/spring/demo/user/profile/session/DemoSessionProfile.java

@@ -1,18 +1,40 @@
 package com.digitalsanctuary.spring.demo.user.profile.session;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.digitalsanctuary.spring.demo.event.Event;
 import com.digitalsanctuary.spring.demo.user.profile.DemoUserProfile;
+import com.digitalsanctuary.spring.demo.user.profile.DemoUserProfileRepository;
 import com.digitalsanctuary.spring.user.profile.session.BaseSessionProfile;
 
 @Component
 public class DemoSessionProfile extends BaseSessionProfile<DemoUserProfile> {
 
+    @Autowired
+    private DemoUserProfileRepository profileRepository;
+
     public boolean isRegisteredForEvent(Event event) {
         return getUserProfile() != null && getUserProfile().getEventRegistrations().stream().anyMatch(reg -> reg.getEvent().equals(event));
     }
 
     public String getFavoriteColor() {
         return getUserProfile() != null ? getUserProfile().getFavoriteColor() : null;
     }
+    
+    /**
+     * Refreshes the user profile from the database to ensure we have the latest data
+     * @return the refreshed user profile or null if no profile exists
+     */
+    public DemoUserProfile refreshProfile() {
+        DemoUserProfile currentProfile = getUserProfile();
+        if (currentProfile != null && currentProfile.getId() != null) {
+            DemoUserProfile refreshedProfile = profileRepository.findById(currentProfile.getId()).orElse(null);
+            if (refreshedProfile != null) {
+                // Update the session with the refreshed profile
+                setUserProfile(refreshedProfile);
+                return refreshedProfile;
+            }
+        }
+        return currentProfile;
+    }
 }