fix: hibernate lazyloading exception on resource-child

liimaorg · Dec 24, 2024 · 2649d0d · 2649d0d
1 parent 2781c58
commit 2649d0d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/AMW_angular/io/src/app/auth/auth.service.ts b/AMW_angular/io/src/app/auth/auth.service.ts
@@ -59,7 +59,7 @@ export class AuthService extends BaseService {
     return (
       this.restrictions()
         .filter((entry) => entry.permission.name === permissionName)
-        .filter((entry) => entry.resourceGroupId === resourceGroupId)
+        .filter((entry) => entry.resourceGroupId === resourceGroupId || entry.resourceGroupId === null)
         .map((entry) => entry.action)
         .find((entry) => entry === Action.ALL || entry === action) !== undefined
     );

diff --git a/...resources/resource-edit-page/resource-edit-functions/resource-edit-functions.component.ts b/...resources/resource-edit-page/resource-edit-functions/resource-edit-functions.component.ts
@@ -36,7 +36,7 @@ export class ResourceEditFunctionsComponent {
   });
 
   permissions = computed(() => {
-    if (this.authService.restrictions().length > 0) {
+    if (this.authService.restrictions().length > 0 && this.resource()) {
       return {
         canShowInstanceFunctions: this.authService.hasPermission(RESOURCE_PERM, Action.READ),
         canShowSuperTypeFunctions: this.authService.hasPermission(RESOURCETYPE_PERM, Action.READ),

diff --git a/...iness/src/main/java/ch/puzzle/itc/mobiliar/business/function/control/FunctionService.java b/...iness/src/main/java/ch/puzzle/itc/mobiliar/business/function/control/FunctionService.java
@@ -32,15 +32,17 @@
 import ch.puzzle.itc.mobiliar.business.security.interceptor.HasPermission;
 import ch.puzzle.itc.mobiliar.business.utils.Identifiable;
 import ch.puzzle.itc.mobiliar.common.exception.NotFoundException;
+import org.hibernate.Hibernate;
 
 import javax.inject.Inject;
+import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static ch.puzzle.itc.mobiliar.business.security.entity.Action.READ;
 
-public class FunctionService implements GetFunctionUseCase, ListFunctionsUseCase {
+public class FunctionService implements Serializable, GetFunctionUseCase, ListFunctionsUseCase {
 
     @Inject
     FunctionRepository functionRepository;
@@ -89,6 +91,10 @@ public List<AmwFunctionEntity> getAllOverwritableSupertypeFunctions(ResourceType
     private Map<String, AmwFunctionEntity> getAllTypeAndSuperTypeFunctions(ResourceTypeEntity resourceTypeEntity) {
         Map<String, AmwFunctionEntity> superTypeFunctions = new LinkedHashMap<>();
         if (resourceTypeEntity != null) {
+            if (!Hibernate.isInitialized(resourceTypeEntity.getFunctions())) {
+               resourceTypeEntity = resourceTypeRepository.loadWithFunctionsAndMiksForId(resourceTypeEntity.getId());
+            }
+
             for (AmwFunctionEntity function : resourceTypeEntity.getFunctions()) {
                 AmwFunctionEntity functionWithMik = functionRepository.getFunctionByIdWithMiksAndParentChildFunctions(function.getId());
                 superTypeFunctions.put(function.getName(), functionWithMik);