adapt project comparison for new openbis api

Author: wow-such-code

src/main/java/life/qbic/portal/portlet/UserDBPortletUI.java

@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -26,10 +27,10 @@
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.Project;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Experiment;
-import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Project;
 import life.qbic.datamodel.persons.Affiliation;
 import life.qbic.datamodel.persons.CollaboratorWithResponsibility;
 import life.qbic.datamodel.persons.Person;
@@ -213,19 +214,25 @@ private void initTabs() {
       }
       Map<String, ProjectInfo> userProjects = new HashMap<String, ProjectInfo>();
 
-      List<Project> openbisProjects = new ArrayList<Project>();
+      List<Project> openbisProjectsForUser = new ArrayList<Project>();
+      Set<String> spaces = new HashSet<>(openbis.getUserSpaces(userID));
 
-      openbisProjects = openbis.getOpenbisInfoService()
-          .listProjectsOnBehalfOfUser(openbis.getSessionToken(), userID);
+      List<Project> allOpenbisProjects = openbis.listProjects();
+      for (Project p : allOpenbisProjects) {
+        String space = p.getSpace().getCode();
+        if (spaces.contains(space)) {
+          openbisProjectsForUser.add(p);
+        }
+      }
 
       Map<String, ProjectInfo> dbProjects = dbControl.getProjectMap();
-      for (Project p : openbisProjects) {
+      for (Project p : openbisProjectsForUser) {
         String desc = Objects.toString(p.getDescription(), "");
         desc = desc.replaceAll("\n+", ". ");
-        String projectID = p.getIdentifier();
+        String projectID = p.getIdentifier().getIdentifier();
         String code = p.getCode();
         if (dbProjects.get(projectID) == null)
-          userProjects.put(projectID, new ProjectInfo(p.getSpaceCode(), code, desc, "", -1));
+          userProjects.put(projectID, new ProjectInfo(p.getSpace().getCode(), code, desc, "", -1));
         else {
           ProjectInfo info = dbProjects.get(projectID);
           info.setDescription(desc);
@@ -253,8 +260,7 @@ private Map<String, Integer> fillMaxInputLengthMap() {
       res.putAll(dbControl.getColsMaxLengthsForTable("persons"));
       res.putAll(dbControl.getColsMaxLengthsForTable("organizations"));
     } catch (SQLException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+      logger.error(e.toString());
     }
     return res;
   }
@@ -271,8 +277,8 @@ private boolean canUsePortlet() {
         }
       }
     } catch (Exception e) {
-      e.printStackTrace();
       logger.error("Could not fetch user groups. User won't be able to use portlet.");
+      logger.error(e.toString());
     }
     return false;
   }
@@ -292,8 +298,8 @@ private boolean isAdmin() {
           }
         }
       } catch (Exception e) {
-        e.printStackTrace();
         logger.error("Could not fetch user groups. User won't be able to use portlet.");
+        logger.error(e.toString());
       }
       return false;
     }
@@ -361,9 +367,9 @@ public void valueChange(ValueChangeEvent event) {
               dbControl.getCollaboratorsOfProject(project);
           // get openbis experiments and type
           Map<String, String> existingExps = new HashMap<String, String>();
-          for (Experiment e : openbis.getExperimentsForProject2(project)) {
-            String type = expTypeCodeTranslation.get(e.getExperimentTypeCode());
-            String id = e.getIdentifier();
+          for (Experiment e : openbis.getExperimentsOfProjectByCode(project)) {
+            String type = expTypeCodeTranslation.get(e.getType().getCode());
+            String id = e.getIdentifier().getIdentifier();
             if (type != null)
               existingExps.put(id, type);
           }
@@ -613,8 +619,7 @@ private void successfulCommit() {
     try {
       Thread.sleep(1000);
     } catch (InterruptedException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+      logger.error(e.toString());
     }
     initTabs();
   }