You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2023/08/25 15:47:17 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2777] message folders should be user-private
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 20519e6f2 [OPENMEETINGS-2777] message folders should be user-private
20519e6f2 is described below
commit 20519e6f26136c0c77e81d55f2015ba468c538bc
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Aug 25 22:47:07 2023 +0700
[OPENMEETINGS-2777] message folders should be user-private
---
.../db/dao/user/PrivateMessageFolderDao.java | 15 ++++---
.../db/entity/user/PrivateMessageFolder.java | 4 ++
.../web/user/profile/MessagesContactsPanel.java | 6 +--
.../apache/openmeetings/db/dao/TestMessageDao.java | 47 ++++++++++++++++++++++
4 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
index 9e1607ebe..9fd437aa0 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
@@ -67,16 +67,21 @@ public class PrivateMessageFolderDao implements IDataProviderDao<PrivateMessageF
@Override
public PrivateMessageFolder get(Long id) {
- return only(em.createQuery("select c from PrivateMessageFolder c where c.id = :id "
- , PrivateMessageFolder.class)
- .setParameter("id", id).getResultList());
+ return only(em.createNamedQuery("getMsgFolderById", PrivateMessageFolder.class)
+ .setParameter("id", id)
+ .getResultList());
+ }
+
+ public List<PrivateMessageFolder> getByUser(Long userId) {
+ return em.createNamedQuery("getMsgFolderByUser", PrivateMessageFolder.class)
+ .setParameter("userId", userId)
+ .getResultList();
}
@Override
public List<PrivateMessageFolder> get(long start, long count) {
return setLimits(
- em.createQuery("SELECT c FROM PrivateMessageFolder c ORDER BY c.id"
- , PrivateMessageFolder.class)
+ em.createNamedQuery("getMsgFolders", PrivateMessageFolder.class)
, start, count)
.getResultList();
}
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
index b4ef4d36a..310b225ab 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
@@ -27,6 +27,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -43,6 +44,9 @@ import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Table(name = "private_message_folder")
@XmlRootElement(name = MSG_FOLDER_NODE)
@XmlAccessorType(XmlAccessType.FIELD)
+@NamedQuery(name = "getMsgFolders", query = "SELECT f FROM PrivateMessageFolder f ORDER BY f.id")
+@NamedQuery(name = "getMsgFolderById", query = "SELECT f FROM PrivateMessageFolder f WHERE f.id = :id")
+@NamedQuery(name = "getMsgFolderByUser", query = "SELECT f FROM PrivateMessageFolder f WHERE f.userId = :userId")
public class PrivateMessageFolder implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index f3c310754..6533fd6dc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -162,7 +162,7 @@ public class MessagesContactsPanel extends UserBasePanel {
super(id);
notMoveFolder.setId(MOVE_CHOOSE);
notMoveFolder.setFolderName(Application.getString("1243"));
- foldersModel.setObject(folderDao.get(0, Integer.MAX_VALUE));
+ foldersModel.setObject(folderDao.getByUser(getUserId()));
updateMoveModel();
final NameDialog addFolder = new NameDialog("addFolder") {
@@ -172,7 +172,7 @@ public class MessagesContactsPanel extends UserBasePanel {
protected void onSubmit(AjaxRequestTarget target) {
super.onSubmit(target);
folderDao.addPrivateMessageFolder(getModelObject(), getUserId());
- foldersModel.setObject(folderDao.get(0, Integer.MAX_VALUE));
+ foldersModel.setObject(folderDao.getByUser(getUserId()));
updateMoveModel();
target.add(folders, moveDropDown);
}
@@ -222,7 +222,7 @@ public class MessagesContactsPanel extends UserBasePanel {
@Override
public void onClick(AjaxRequestTarget target) {
folderDao.delete(item.getModelObject(), getUserId());
- foldersModel.setObject(folderDao.get(0, Integer.MAX_VALUE));
+ foldersModel.setObject(folderDao.getByUser(getUserId()));
updateMoveModel();
target.add(folders, moveDropDown);
}
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestMessageDao.java b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestMessageDao.java
new file mode 100644
index 000000000..6b8f5198b
--- /dev/null
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestMessageDao.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dao;
+
+import static org.junit.Assert.assertFalse;
+
+import java.util.List;
+
+import org.apache.openmeetings.AbstractOmServerTest;
+import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
+import org.apache.openmeetings.db.entity.user.PrivateMessageFolder;
+import org.apache.openmeetings.db.entity.user.User;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class TestMessageDao extends AbstractOmServerTest {
+ @Autowired
+ private PrivateMessageFolderDao msgFolderDao;
+
+ @Test
+ void testMessageFolder() throws Exception {
+ User u1 = createUser();
+ String uiFolderName = "u1Folder-" + u1.getLogin();
+ Long fldId = msgFolderDao.addPrivateMessageFolder(uiFolderName, u1.getId());
+
+ User u2 = createUser();
+ List<PrivateMessageFolder> folders = msgFolderDao.getByUser(u2.getId());
+ assertFalse("Folders of first user shouldn't be visible to second one"
+ , folders.stream().anyMatch(fld -> fldId.equals(fld.getId())));
+ }
+}