OO-373,OO-372,OO-96: fix a unit tests, add an update context method to notifications manager

src/main/java/org/olat/core/dispatcher/mapper/manager/MapperDAO.java

@@ -47,6 +47,7 @@ public class MapperDAO {
 	public PersistedMapper persistMapper(String sessionId, String mapperId, Serializable mapper) {
 		PersistedMapper m = new PersistedMapper();
 		m.setMapperId(mapperId);
+		m.setLastModified(new Date());
 		m.setOriginalSessionId(sessionId);
 		
 		String configuration = XStreamHelper.createXStreamInstance().toXML(mapper);

src/main/java/org/olat/core/util/notifications/NotificationsManager.java

@@ -111,6 +111,14 @@ public abstract class NotificationsManager extends BasicManager {
 	 */
 	public abstract Publisher getOrCreatePublisher(final SubscriptionContext scontext, final PublisherData pdata);
 	
+	/**
+	 * Modify the publisher
+	 * @param oldContext
+	 * @param newContext
+	 * @return
+	 */
+	public abstract Publisher updatePublisher(SubscriptionContext oldContext, SubscriptionContext newContext);
+	
 	public abstract List<Publisher> getAllPublisher();
 
 	/**

src/main/java/org/olat/notifications/NotificationsManagerImpl.java

@@ -751,6 +751,17 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
 		}
 		return notificationHandlers.get(type);		
 	}
+	
+	@Override
+	public Publisher updatePublisher(SubscriptionContext oldContext, SubscriptionContext newContext) {
+		Publisher p = getPublisherForUpdate(oldContext);
+
+		p.setResId(newContext.getResId());
+		p.setResName(newContext.getResName());
+		p.setSubidentifier(newContext.getSubidentifier());
+		
+		return DBFactory.getInstance().getCurrentEntityManager().merge(p);
+	}
 
 	/**
 	 * @param subscriber

src/test/java/org/olat/notifications/NotificationsManagerTest.java

@@ -97,6 +97,35 @@ public class NotificationsManagerTest extends OlatTestCase {
 		Assert.assertEquals(publisher, reloadedPublisher);
 	}
 	
+	@Test
+	public void testUpdatePublisherContext() {
+		String identifier = UUID.randomUUID().toString().replace("-", "");
+		SubscriptionContext context = new SubscriptionContext("PS", new Long(123), identifier);
+		PublisherData publisherData = new PublisherData("testPublisherSubscriber", "e.g. forumdata=keyofforum", null);
+		
+		Publisher publisher = notificationManager.getOrCreatePublisher(context, publisherData);
+		dbInstance.commitAndCloseSession();
+		//check values
+		Assert.assertNotNull(publisher);
+		Assert.assertEquals("PS", publisher.getResName());
+		Assert.assertEquals(new Long(123), publisher.getResId());
+		Assert.assertEquals(identifier, publisher.getSubidentifier());
+
+		//modify
+		String modifiedIdentifier = UUID.randomUUID().toString().replace("-", "");
+		SubscriptionContext modifiedContext = new SubscriptionContext("PSModified", new Long(12300), modifiedIdentifier);
+		notificationManager.updatePublisher(context, modifiedContext);
+		dbInstance.commitAndCloseSession();
+		
+		//check if exists
+		Publisher reloadedPublisher = notificationManager.getPublisher(modifiedContext);
+		Assert.assertNotNull(reloadedPublisher);
+		Assert.assertEquals(publisher, reloadedPublisher);
+		Assert.assertEquals("PSModified", reloadedPublisher.getResName());
+		Assert.assertEquals(new Long(12300), reloadedPublisher.getResId());
+		Assert.assertEquals(modifiedIdentifier, reloadedPublisher.getSubidentifier());
+	}
+	
 	@Test
 	public void  testAllPublishers() {
 		String identifier = UUID.randomUUID().toString().replace("-", "");