First phase

Author: RomuDeuxfois

openaev-api/src/main/java/io/openaev/config/security/SecurityService.java

@@ -6,10 +6,10 @@
 
 import io.openaev.database.model.Tenant;
 import io.openaev.database.model.User;
+import io.openaev.database.repository.TenantRepository;
 import io.openaev.database.repository.UserRepository;
 import io.openaev.service.UserMappingService;
 import io.openaev.service.UserService;
-import io.openaev.service.tenants.TenantService;
 import io.openaev.service.user_events.UserEventService;
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.validation.constraints.NotBlank;
@@ -19,7 +19,6 @@
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
@@ -41,7 +40,7 @@ public class SecurityService {
   private final UserMappingService userMappingService;
   private final Environment env;
   private final UserEventService userEventService;
-  private final @Lazy TenantService tenantService;
+  private final TenantRepository tenantRepository;
 
   public User userManagement(
       String emailAttribute,
@@ -115,7 +114,11 @@ private void attachTenant(String registrationId, User user) {
       return;
     }
     try {
-      Tenant tenant = tenantService.findById(tenantId);
+      Tenant tenant =
+          tenantRepository
+              .findById(tenantId)
+              .orElseThrow(() -> new EntityNotFoundException("Tenant not found: " + tenantId));
+      ;
       user.getTenants().add(tenant);
     } catch (EntityNotFoundException e) {
       log.warn("SSO tenant ID '{}' configured but not found in database", tenantId);