lazy initialization issue

rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java

@@ -322,8 +322,8 @@ public class OverlayRestImpl extends BaseRestImpl {
     if (Configuration.ANONYMOUS_LOGIN.equals(user.getLogin())) {
       throw new SecurityException("You have no privileges to add overlay");
     }
-    Project project = getProjectService().getProjectByProjectId(projectId, token);
-    if (project == null) {
+    Model model = getModelService().getLastModelByProjectId(projectId, token);
+    if (model == null) {
       throw new QueryException("Project with given id doesn't exist");
     }
     ColorSchemaType colorSchemaType = ColorSchemaType.GENERIC;
@@ -367,10 +367,10 @@ public class OverlayRestImpl extends BaseRestImpl {
               .name(name).user(user)
               .colorSchemaType(colorSchemaType)
               .directory(".")
-              .project(project)
+              .project(model.getProject())
               .googleLicenseConsent(googleLicenseConsent.equalsIgnoreCase("true")));
 
-      int count = layoutService.getCustomLayouts(project, token, false, user).size();
+      int count = layoutService.getCustomLayouts(model.getProject(), token, false, user).size();
       layout.setOrderIndex(count);
       layoutService.updateLayout(layout);
 

service/src/main/java/lcsb/mapviewer/services/impl/LayoutService.java

@@ -417,7 +417,7 @@ public class LayoutService implements ILayoutService {
     fileEntry.setOwner(params.getUser());
     topLayout.setInputData(fileEntry);
     topLayout.setDescription(params.getDescription());
-    params.getProject().addLayout(topLayout);
+    topLayout.setProject(params.getProject());
     topLayout.setCreator(params.getUser());
     layoutDao.add(topLayout);