feat: Digest mail notifications - eXIP7.3.0.22 - integration into feature/mips

services/src/main/java/io/meeds/gamification/notification/provider/builder/ActionAnnouncedTemplateBuilder.java

@@ -23,7 +23,6 @@
 import static io.meeds.gamification.utils.Utils.ANNOUNCEMENT_ID_NOTIFICATION_PARAM;
 import static io.meeds.gamification.utils.Utils.getIdentityById;
 
-import java.io.Writer;
 import java.util.Date;
 import java.util.Locale;
 
@@ -163,9 +162,4 @@ protected MessageInfo makeMessage(NotificationContext ctx) { // NOSONAR
     return messageInfo.end();
   }
 
-  @Override
-  protected boolean makeDigest(NotificationContext ctx, Writer writer) {
-    return false;
-  }
-
 }

services/src/main/java/io/meeds/gamification/notification/provider/builder/ActionPublishedTemplateBuilder.java

@@ -24,7 +24,6 @@
 import static io.meeds.gamification.utils.Utils.RULE_CREATOR_NOTIFICATION_PARAM;
 import static io.meeds.gamification.utils.Utils.getUserIdentity;
 
-import java.io.Writer;
 import java.util.Date;
 import java.util.Locale;
 
@@ -151,9 +150,4 @@ protected MessageInfo makeMessage(NotificationContext ctx) { // NOSONAR
     return messageInfo.end();
   }
 
-  @Override
-  protected boolean makeDigest(NotificationContext ctx, Writer writer) {
-    return false;
-  }
-
 }

services/src/main/java/io/meeds/gamification/notification/provider/builder/ContributionAcceptedTemplateBuilder.java

@@ -22,7 +22,6 @@
 import static io.meeds.gamification.plugin.RuleTranslationPlugin.RULE_TITLE_FIELD_NAME;
 import static io.meeds.gamification.utils.Utils.*;
 
-import java.io.Writer;
 import java.util.Date;
 import java.util.Locale;
 
@@ -136,9 +135,4 @@ protected MessageInfo makeMessage(NotificationContext ctx) { // NOSONAR
     return messageInfo.end();
   }
 
-  @Override
-  protected boolean makeDigest(NotificationContext ctx, Writer writer) {
-    return false;
-  }
-
 }

services/src/main/java/io/meeds/gamification/notification/provider/builder/ContributionRejectedTemplateBuilder.java

@@ -23,7 +23,6 @@
 import static io.meeds.gamification.utils.Utils.REALIZATION_ID_NOTIFICATION_PARAM;
 import static io.meeds.gamification.utils.Utils.getIdentityById;
 
-import java.io.Writer;
 import java.util.Date;
 import java.util.Locale;
 
@@ -137,9 +136,4 @@ protected MessageInfo makeMessage(NotificationContext ctx) { // NOSONAR
     return messageInfo.end();
   }
 
-  @Override
-  protected boolean makeDigest(NotificationContext ctx, Writer writer) {
-    return false;
-  }
-
 }

services/src/test/java/io/meeds/gamification/test/AbstractPluginTest.java

@@ -125,18 +125,19 @@ public void tearDown() {
 
   /**
    * It will be invoked after make Activity, Relationship and New User also.
-   * Makes the notification message and retrieve from MockNotificationService
+   * Makes the notification message and retrieves it from the instant store of
+   * MockNotificationService (the legacy digest store is gone, eXIP 7.3.0.22)
    * 
    * @return
    */
   protected NotificationInfo getNotificationInfo(String username) {
-    List<NotificationInfo> list = notificationService.storeDigest(username);
+    List<NotificationInfo> list = notificationService.storeInstantly(username);
     assertFalse(list.isEmpty());
     return list.get(0);
   }
 
   protected List<NotificationInfo> getNotificationInfos(String username) {
-    return notificationService.storeDigest(username);
+    return notificationService.storeInstantly(username);
   }
 
   /**
@@ -170,33 +171,6 @@ protected void assertDigest(Writer writer, String includedString) {
     assertEquals(includedString, writer.toString().replaceAll("\\<.*>", ""));
   }
 
-  /**
-   * Asserts the number of notification what made by the plugins.
-   * 
-   * @param number
-   */
-  protected void assertMadeMailDigestNotifications(int number) {
-    UserSetting setting = userSettingService.get(rootIdentity.getRemoteId());
-    if (setting.isInDaily(getPlugin().getKey().getId())) {
-      assertEquals(number, notificationService.sizeOfStoredDigest());
-    }
-  }
-
-  /**
-   * Asserts the number of notification what made by the plugins.
-   * 
-   * @param number
-   */
-  protected List<NotificationInfo> assertMadeMailDigestNotifications(String username, int number) {
-    UserSetting setting = userSettingService.get(username);
-    List<NotificationInfo> got = notificationService.storeDigest(username);
-    if (setting.isActive(MailChannel.ID, getPlugin().getKey().getId())) {
-      got = notificationService.storeInstantly(username);
-      assertEquals(number, got.size());
-    }
-    return got;
-  }
-
   /**
    * Asserts the number of web's notifications what made by the plugins.
    * 
@@ -261,38 +235,6 @@ protected void setInstantlySettings(String userId, List<String> settings) {
     userSettingService.save(userSetting);
   }
 
-  /**
-   * Make Daily setting
-   * 
-   * @param userId
-   * @param settings
-   */
-  protected void setDailySetting(String userId, List<String> settings) {
-    UserSetting userSetting = userSettingService.get(userId);
-
-    if (userSetting == null) {
-      userSetting = UserSetting.getInstance();
-      userSetting.setUserId(userId);
-    }
-    userSetting.setChannelActive(MailChannel.ID);
-
-    userSetting.setDailyPlugins(settings);
-    userSettingService.save(userSetting);
-  }
-
-  protected void setWeeklySetting(String userId, List<String> settings) {
-    UserSetting userSetting = userSettingService.get(userId);
-
-    if (userSetting == null) {
-      userSetting = UserSetting.getInstance();
-      userSetting.setUserId(userId);
-    }
-    userSetting.setChannelActive(MailChannel.ID);
-
-    userSetting.setWeeklyPlugins(settings);
-    userSettingService.save(userSetting);
-  }
-
   protected AbstractTemplateBuilder getTemplateBuilder(NotificationContext ctx) {
     AbstractChannel channel = ctx.getChannelManager().getChannel(ChannelKey.key(MailChannel.ID));
     assertNotNull(channel);
@@ -309,13 +251,5 @@ protected MessageInfo buildMessageInfo(NotificationContext ctx) {
     return massage;
   }
 
-  protected void buildDigest(NotificationContext ctx, Writer writer) {
-    AbstractTemplateBuilder templateBuilder = getTemplateBuilder();
-    if (templateBuilder == null) {
-      templateBuilder = getTemplateBuilder(ctx);
-    }
-    templateBuilder.buildDigest(ctx, writer);
-  }
-
   public abstract AbstractTemplateBuilder getTemplateBuilder();
 }