muikku-core-plugins-persistence/src/main/java/fi/otavanopisto/muikku/plugins/communicator/model/CommunicatorLabel.java

@@ -29,23 +29,11 @@ public void setColor(Long color) {
   	this.color = color;
   }
 
-  public Boolean getArchived() {
-    return archived;
-  }
-
-  public void setArchived(Boolean archived) {
-    this.archived = archived;
-  }
-
   @Id
   @GeneratedValue (strategy = GenerationType.IDENTITY)
   private Long id;
 
   @NotNull
   @Column(nullable = false)
   private Long color;
-
-  @NotNull
-  @Column(nullable = false)
-  private Boolean archived;
 }

muikku-core-plugins-persistence/src/main/java/fi/otavanopisto/muikku/plugins/communicator/model/CommunicatorMessageIdLabel.java

@@ -7,10 +7,8 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 
-import fi.otavanopisto.security.ContextReference;
-
 @Entity
-public class CommunicatorMessageIdLabel implements ContextReference {
+public class CommunicatorMessageIdLabel {
 
   public Long getId() {
     return id;

muikku-core-plugins-persistence/src/main/java/fi/otavanopisto/muikku/plugins/communicator/model/CommunicatorUserLabel.java

@@ -6,11 +6,9 @@
 
 import org.hibernate.validator.constraints.NotEmpty;
 
-import fi.otavanopisto.security.ContextReference;
-
 @Entity
 @PrimaryKeyJoinColumn(name = "id")
-public class CommunicatorUserLabel extends CommunicatorLabel implements ContextReference {
+public class CommunicatorUserLabel extends CommunicatorLabel {
 
   public Long getUserEntity() {
     return userEntity;

muikku-core-plugins/src/main/java/fi/otavanopisto/muikku/plugins/announcer/WorkspaceAnnouncementsViewBackingBean.java

@@ -91,23 +91,10 @@ public String init() {
       }
     }
 
-    workspaceBackingBean.setWorkspaceUrlName(urlName);
-
-    schoolDataBridgeSessionController.startSystemSession();
-    try {
-      Workspace workspace = workspaceController.findWorkspace(workspaceEntity);
-      if (workspace == null) {
-        logger.log(Level.SEVERE, String.format("Could not find workspace for workspace entity (%d)", workspaceEntity.getId()));
-        return NavigationRules.NOT_FOUND;
-      }
-
-      workspaceName = workspace.getName();
-      workspaceNameExtension = workspace.getNameExtension();
-    } finally {
-      schoolDataBridgeSessionController.endSystemSession();
-    }
-
     workspaceEntityId = workspaceEntity.getId();
+    workspaceBackingBean.setWorkspaceUrlName(urlName);
+    workspaceName = workspaceBackingBean.getWorkspaceName();
+    workspaceNameExtension = workspaceBackingBean.getWorkspaceNameExtension();
 
     if (announcementId != null) {
       currentAnnouncement = announcementController.findById(announcementId);

muikku-core-plugins/src/main/java/fi/otavanopisto/muikku/plugins/announcer/WorkspaceAnnouncerBackingBean.java

@@ -1,8 +1,5 @@
 package fi.otavanopisto.muikku.plugins.announcer;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import javax.ejb.Stateful;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -18,9 +15,7 @@
 import fi.otavanopisto.muikku.model.workspace.WorkspaceAccess;
 import fi.otavanopisto.muikku.model.workspace.WorkspaceEntity;
 import fi.otavanopisto.muikku.plugins.workspace.WorkspaceBackingBean;
-import fi.otavanopisto.muikku.schooldata.SchoolDataBridgeSessionController;
 import fi.otavanopisto.muikku.schooldata.WorkspaceController;
-import fi.otavanopisto.muikku.schooldata.entity.Workspace;
 import fi.otavanopisto.muikku.security.MuikkuPermissions;
 import fi.otavanopisto.muikku.session.SessionController;
 
@@ -33,9 +28,6 @@ public class WorkspaceAnnouncerBackingBean {
   @Parameter
   private String workspaceUrlName;
 
-  @Inject
-  private Logger logger;
-
   @Inject
   private SessionController sessionController;
 
@@ -45,9 +37,6 @@ public class WorkspaceAnnouncerBackingBean {
   @Inject
   private NavigationController navigationController;
 
-  @Inject
-  private SchoolDataBridgeSessionController schoolDataBridgeSessionController;
-
   @Inject
   @Named
   private WorkspaceBackingBean workspaceBackingBean;
@@ -82,23 +71,10 @@ public String init() {
       }
     }
 
-    workspaceBackingBean.setWorkspaceUrlName(urlName);
-
-    schoolDataBridgeSessionController.startSystemSession();
-    try {
-      Workspace workspace = workspaceController.findWorkspace(workspaceEntity);
-      if (workspace == null) {
-        logger.log(Level.SEVERE, String.format("Could not find workspace for workspace entity (%d)", workspaceEntity.getId()));
-        return NavigationRules.NOT_FOUND;
-      }
-
-      workspaceName = workspace.getName();
-      workspaceNameExtension = workspace.getNameExtension();
-    } finally {
-      schoolDataBridgeSessionController.endSystemSession();
-    }
-
     workspaceEntityId = workspaceEntity.getId();
+    workspaceBackingBean.setWorkspaceUrlName(urlName);
+    workspaceName = workspaceBackingBean.getWorkspaceName();
+    workspaceNameExtension = workspaceBackingBean.getWorkspaceNameExtension();
 
     return null;
   }

muikku-core-plugins/src/main/java/fi/otavanopisto/muikku/plugins/communicator/dao/CommunicatorMessageIdLabelDAO.java

@@ -17,7 +17,7 @@
 
 public class CommunicatorMessageIdLabelDAO extends CorePluginsDAO<CommunicatorMessageIdLabel> {
 
-  private static final long serialVersionUID = -7513353900590903561L;
+  private static final long serialVersionUID = -6282680425734880911L;
 
   public CommunicatorMessageIdLabel create(UserEntity userEntity, CommunicatorMessageId messageId, CommunicatorLabel label) {
     CommunicatorMessageIdLabel communicatorUserLabel = new CommunicatorMessageIdLabel();

muikku-core-plugins/src/main/java/fi/otavanopisto/muikku/plugins/communicator/dao/CommunicatorUserLabelDAO.java

@@ -14,15 +14,14 @@
 
 public class CommunicatorUserLabelDAO extends CorePluginsDAO<CommunicatorUserLabel> {
 
-  private static final long serialVersionUID = -7513353900590903561L;
+  private static final long serialVersionUID = -5030572490919278599L;
 
   public CommunicatorUserLabel create(String name, Long color, UserEntity userEntity) {
     CommunicatorUserLabel communicatorUserLabel = new CommunicatorUserLabel();
 
     communicatorUserLabel.setName(name);
     communicatorUserLabel.setColor(color);
     communicatorUserLabel.setUserEntity(userEntity.getId());
-    communicatorUserLabel.setArchived(false);
 
     getEntityManager().persist(communicatorUserLabel);
 
@@ -37,10 +36,7 @@ public List<CommunicatorUserLabel> listByUser(UserEntity userEntity) {
     Root<CommunicatorUserLabel> root = criteria.from(CommunicatorUserLabel.class);
     criteria.select(root);
     criteria.where(
-        criteriaBuilder.and(
-            criteriaBuilder.equal(root.get(CommunicatorUserLabel_.userEntity), userEntity.getId()),
-            criteriaBuilder.equal(root.get(CommunicatorUserLabel_.archived), Boolean.FALSE)
-        )
+        criteriaBuilder.equal(root.get(CommunicatorUserLabel_.userEntity), userEntity.getId())
     );
 
     return entityManager.createQuery(criteria).getResultList();
@@ -55,14 +51,6 @@ public CommunicatorUserLabel update(CommunicatorUserLabel communicatorUserLabel,
     return communicatorUserLabel;
   }
 
-  public CommunicatorUserLabel updateArchived(CommunicatorUserLabel communicatorUserLabel, Boolean archived) {
-    communicatorUserLabel.setArchived(archived);
-
-    getEntityManager().persist(communicatorUserLabel);
-
-    return communicatorUserLabel;
-  }
-
   @Override
   public void delete(CommunicatorUserLabel communicatorUserLabel) {
     super.delete(communicatorUserLabel);

muikku-core-plugins/src/main/java/fi/otavanopisto/muikku/plugins/communicator/rest/CommunicatorLabelRESTService.java

@@ -35,7 +35,7 @@
 @Produces ("application/json")
 public class CommunicatorLabelRESTService extends PluginRESTService {
 
-  private static final long serialVersionUID = 5020674196438210604L;
+  private static final long serialVersionUID = 6680345677459264564L;
 
   @Inject
   @BaseUrl
@@ -79,7 +79,7 @@ public Response createMessageIdLabel(
 
     CommunicatorLabel label = communicatorController.findUserLabelById(newLabel.getLabelId());
 
-    if (canAccessLabel(userEntity, label)) {
+    if ((label != null) && canAccessLabel(userEntity, label)) {
       CommunicatorMessageIdLabel userLabel = communicatorController.findMessageIdLabel(userEntity, messageId, label);
 
       if (userLabel == null) {
@@ -103,12 +103,10 @@ public Response getMessageIdLabel(
       @PathParam ("COMMUNICATORMESSAGEID") Long communicatorMessageId,
       @PathParam ("LABELID") Long labelId
    ) throws AuthorizationException {
-//    CommunicatorMessageId messageId = communicatorController.findCommunicatorMessageId(communicatorMessageId);
     CommunicatorMessageIdLabel label = communicatorController.findMessageIdLabelById(labelId);
     UserEntity userEntity = sessionController.getLoggedUserEntity();
 
     if (!canAccessLabel(userEntity, label.getLabel())) {
-//    if (!sessionController.hasPermission(CommunicatorPermissionCollection.COMMUNICATOR_MANAGE_SETTINGS, userLabel)) {
       return Response.status(Status.FORBIDDEN).build();
     }
 
@@ -123,12 +121,10 @@ public Response getMessageIdLabel(
   public Response deleteUserLabel(
       @PathParam ("COMMUNICATORMESSAGEID") Long communicatorMessageId,
       @PathParam ("LABELID") Long userLabelId) throws AuthorizationException {
-//    CommunicatorMessageId messageId = communicatorController.findCommunicatorMessageId(communicatorMessageId);
     CommunicatorMessageIdLabel label = communicatorController.findMessageIdLabelById(userLabelId);
     UserEntity userEntity = sessionController.getLoggedUserEntity();
 
     if (!canAccessLabel(userEntity, label.getLabel())) {
-//    if (!sessionController.hasPermission(CommunicatorPermissionCollection.COMMUNICATOR_MANAGE_SETTINGS, userLabel)) {
       return Response.status(Status.FORBIDDEN).build();
     }
 
@@ -137,30 +133,6 @@ public Response deleteUserLabel(
     return Response.noContent().build();
   }
 
-//  @POST
-//  @Path ("/userLabels/{USERLABELID}")
-//  @RESTPermit(handling = Handling.INLINE, requireLoggedIn = true)
-//  public Response editUserLabel(
-//      @PathParam ("USERLABELID") Long userLabelId,
-//      CommunicatorUserLabelRESTModel updatedUserLabel
-//   ) throws AuthorizationException {
-//    if (!updatedUserLabel.getId().equals(userLabelId)) {
-//      return Response.status(Response.Status.BAD_REQUEST).entity("Id is immutable").build();
-//    }
-//
-//    CommunicatorUserLabel userLabel = communicatorController.findUserLabelById(userLabelId);
-//
-//    if (!sessionController.hasPermission(CommunicatorPermissionCollection.COMMUNICATOR_MANAGE_SETTINGS, userLabel)) {
-//      return Response.status(Status.FORBIDDEN).build();
-//    }
-//    
-//    CommunicatorUserLabel editedUserLabel = communicatorController.updateUserLabel(userLabel, updatedUserLabel.getName(), updatedUserLabel.getColor());
-//
-//    return Response.ok(
-//      toRESTModel(editedUserLabel)
-//    ).build();
-//  }
-
   @GET
   @Path ("/userLabels")
   @RESTPermit(handling = Handling.INLINE, requireLoggedIn = true)
@@ -203,7 +175,7 @@ public Response getUserLabel(
     UserEntity userEntity = sessionController.getLoggedUserEntity();
     CommunicatorUserLabel userLabel = communicatorController.findUserLabelById(userLabelId);
 
-    if (canAccessLabel(userEntity, userLabel)) {
+    if ((userLabel != null) && canAccessLabel(userEntity, userLabel)) {
       return Response.ok(
         toRESTModel(userLabel)
       ).build();
@@ -221,7 +193,7 @@ public Response deleteUserLabel(
     UserEntity userEntity = sessionController.getLoggedUserEntity();
     CommunicatorUserLabel userLabel = communicatorController.findUserLabelById(userLabelId);
 
-    if (canAccessLabel(userEntity, userLabel)) {
+    if ((userLabel != null) && canAccessLabel(userEntity, userLabel)) {
       communicatorController.delete(userLabel);
 
       return Response.noContent().build();
@@ -244,7 +216,7 @@ public Response editUserLabel(
     UserEntity userEntity = sessionController.getLoggedUserEntity();
     CommunicatorUserLabel userLabel = communicatorController.findUserLabelById(userLabelId);
 
-    if (canAccessLabel(userEntity, userLabel)) {
+    if ((userLabel != null) && canAccessLabel(userEntity, userLabel)) {
       CommunicatorUserLabel editedUserLabel = communicatorController.updateUserLabel(userLabel, updatedUserLabel.getName(), updatedUserLabel.getColor());
 
       return Response.ok(

muikku-core-plugins/src/main/java/fi/otavanopisto/muikku/plugins/coursepicker/CoursePickerRESTService.java

@@ -263,7 +263,6 @@ public Response listWorkspaces(
                 String description = (String) result.get("description");
                 boolean canSignup = getCanSignup(workspaceEntity);
                 boolean isCourseMember = getIsAlreadyOnWorkspace(workspaceEntity);
-                Boolean canCopyWorkspace = getCopyWorkspace(workspaceEntity);
                 String educationTypeId = (String) result.get("educationTypeIdentifier");
                 String educationTypeName = null;
 
@@ -282,7 +281,7 @@ public Response listWorkspaces(
                 }
 
                 if (StringUtils.isNotBlank(name)) {
-                  workspaces.add(createRestModel(workspaceEntity, name, nameExtension, description, educationTypeName, canSignup, canCopyWorkspace, isCourseMember));
+                  workspaces.add(createRestModel(workspaceEntity, name, nameExtension, description, educationTypeName, canSignup, isCourseMember));
                 } else {
                   logger.severe(String.format("Search index contains workspace %s that does not have a name", workspaceIdentifier));
                 }
@@ -351,7 +350,6 @@ public Response getWorkspace(@PathParam("ID") Long workspaceEntityId) {
 
     boolean canSignup = getCanSignup(workspaceEntity);
     boolean isCourseMember = getIsAlreadyOnWorkspace(workspaceEntity);
-    Boolean canCopyWorkspace = getCopyWorkspace(workspaceEntity);
     String educationTypeName = null;
 
     if (workspace.getWorkspaceTypeId() != null) {
@@ -361,7 +359,7 @@ public Response getWorkspace(@PathParam("ID") Long workspaceEntityId) {
       }
     }
 
-    return Response.ok(createRestModel(workspaceEntity, workspace.getName(), workspace.getNameExtension(), workspace.getDescription(), educationTypeName, canSignup, canCopyWorkspace, isCourseMember)).build();
+    return Response.ok(createRestModel(workspaceEntity, workspace.getName(), workspace.getNameExtension(), workspace.getDescription(), educationTypeName, canSignup, isCourseMember)).build();
   }
 
   @POST
@@ -493,14 +491,6 @@ private boolean getCanSignup(WorkspaceEntity workspaceEntity) {
       return false;
   }
 
-  private boolean getCopyWorkspace(WorkspaceEntity workspaceEntity) {
-    if (sessionController.isLoggedIn()) {
-      return sessionController.hasEnvironmentPermission(MuikkuPermissions.COPY_WORKSPACE);
-    } 
-
-    return false;
-  }
-
   private Long getWorkspaceStudentRoleId() {
     List<WorkspaceRoleEntity> workspaceStudentRoles = roleController.listWorkspaceRoleEntitiesByArchetype(WorkspaceRoleArchetype.STUDENT);
     if (workspaceStudentRoles.size() == 1) {
@@ -511,7 +501,7 @@ private Long getWorkspaceStudentRoleId() {
     }
   }
 
-  private CoursePickerWorkspace createRestModel(WorkspaceEntity workspaceEntity, String name, String nameExtension, String description, String educationTypeName, boolean canSignup, Boolean canCopyWorkspace, boolean isCourseMember) {
+  private CoursePickerWorkspace createRestModel(WorkspaceEntity workspaceEntity, String name, String nameExtension, String description, String educationTypeName, boolean canSignup, boolean isCourseMember) {
     Long numVisits = workspaceVisitController.getNumVisits(workspaceEntity);
     Date lastVisit = workspaceVisitController.getLastVisit(workspaceEntity);
     return new CoursePickerWorkspace(
@@ -526,7 +516,6 @@ private CoursePickerWorkspace createRestModel(WorkspaceEntity workspaceEntity, S
         lastVisit, 
         educationTypeName,
         canSignup, 
-        canCopyWorkspace,
         isCourseMember);
   }