From 886e6e71e79d5111395636481cd30c2c4f95fbf8 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Mon, 10 Apr 2017 22:23:51 +0200
Subject: [PATCH] ES: emai subscription: now remember last execution time, to
filter on latest events
---
.../elasticsearch/client/Duniter4jClient.java | 3 +
.../client/Duniter4jClientImpl.java | 30 ++-
.../elasticsearch/dao/AbstractDao.java | 3 +-
.../dao/AbstractIndexTypeDao.java | 19 ++
.../elasticsearch/dao/impl/BlockDaoImpl.java | 36 +---
.../service/BlockchainService.java | 22 +-
.../service/CurrencyService.java | 2 +
.../subscription/PluginSettings.java | 14 +-
.../subscription/dao/DaoModule.java | 3 +
.../dao/SubscriptionIndexTypeDao.java | 4 +
.../execution/SubscriptionExecutionDao.java | 23 +++
.../SubscriptionExecutionDaoImpl.java | 168 +++++++++++++++
.../dao/record/SubscriptionRecordDao.java | 4 +-
.../dao/record/SubscriptionRecordDaoImpl.java | 13 +-
.../model/SubscriptionExecution.java | 78 +++++++
...scription.java => SubscriptionRecord.java} | 2 +-
.../model/email/EmailSubscription.java | 19 +-
.../service/SubscriptionService.java | 192 +++++++++++-------
.../subscription/util/DateUtils.java | 49 +++++
.../util/stringtemplate/I18nRenderer.java | 24 ---
.../util/stringtemplate/StringRenderer.java | 32 +++
...duniter4j-es-subscription_en_GB.properties | 13 +-
...duniter4j-es-subscription_fr_FR.properties | 17 +-
.../main/resources/templates/cesium_logo.st | 6 +
.../resources/templates/html_email_content.st | 103 +++++++---
.../resources/templates/html_event_item.st | 10 +
.../main/resources/templates/text_email.st | 10 +-
.../resources/templates/text_event_item.st | 2 +-
.../service/SubscriptionServiceTest.java | 2 +-
.../service/SubscriptionTemplateTest.java | 54 ++---
.../user/service/UserEventService.java | 2 +
31 files changed, 719 insertions(+), 240 deletions(-)
create mode 100644 duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/execution/SubscriptionExecutionDao.java
create mode 100644 duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/execution/SubscriptionExecutionDaoImpl.java
create mode 100644 duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/SubscriptionExecution.java
rename duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/{Subscription.java => SubscriptionRecord.java} (98%)
create mode 100644 duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/DateUtils.java
delete mode 100644 duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/stringtemplate/I18nRenderer.java
create mode 100644 duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/stringtemplate/StringRenderer.java
create mode 100644 duniter4j-es-subscription/src/main/resources/templates/cesium_logo.st
create mode 100644 duniter4j-es-subscription/src/main/resources/templates/html_event_item.st
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClient.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClient.java
index cdaea5b3..bb2a7705 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClient.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClient.java
@@ -4,6 +4,7 @@ import org.duniter.core.beans.Bean;
import org.duniter.core.client.model.local.LocalEntity;
import org.duniter.elasticsearch.dao.handler.StringReaderHandler;
import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.client.Client;
import org.elasticsearch.search.SearchHit;
@@ -73,4 +74,6 @@ public interface Duniter4jClient extends Bean, Client {
void bulkFromStream(InputStream is, String indexName, String indexType, StringReaderHandler handler);
void flushDeleteBulk(final String index, final String type, BulkRequestBuilder bulkRequest);
+
+ void safeExecuteRequest(ActionRequestBuilder<?, ?, ?> request, boolean wait);
}
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClientImpl.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClientImpl.java
index 54942a82..1a157ea1 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClientImpl.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClientImpl.java
@@ -94,6 +94,7 @@ import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHitField;
@@ -152,10 +153,9 @@ public class Duniter4jClientImpl implements Duniter4jClient {
@Override
public void updateDocumentFromJson(String index, String type, String id, String json) {
// Execute indexBlocksFromNode
- client.prepareUpdate(index, type, id)
+ safeExecuteRequest(client.prepareUpdate(index, type, id)
.setRefresh(true)
- .setDoc(json)
- .execute().actionGet();
+ .setDoc(json), true);
}
@Override
@@ -963,4 +963,28 @@ public class Duniter4jClientImpl implements Duniter4jClient {
public void close() {
client.close();
}
+
+ public void safeExecuteRequest(ActionRequestBuilder<?, ?, ?> request, boolean wait) {
+ // Execute in a pool
+ if (!wait) {
+ boolean acceptedInPool = false;
+ while(!acceptedInPool)
+ try {
+ request.execute();
+ acceptedInPool = true;
+ }
+ catch(EsRejectedExecutionException e) {
+ // not accepted, so wait
+ try {
+ Thread.sleep(1000); // 1s
+ }
+ catch(InterruptedException e2) {
+ // silent
+ }
+ }
+
+ } else {
+ request.execute().actionGet();
+ }
+ }
}
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/AbstractDao.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/AbstractDao.java
index 0fe773e9..08e21ed6 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/AbstractDao.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/AbstractDao.java
@@ -39,6 +39,7 @@ import org.duniter.elasticsearch.dao.handler.StringReaderHandler;
import org.duniter.elasticsearch.exception.AccessDeniedException;
import org.duniter.elasticsearch.exception.NotFoundException;
import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequestBuilder;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequestBuilder;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
@@ -58,6 +59,7 @@ import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHitField;
@@ -101,5 +103,4 @@ public abstract class AbstractDao implements Bean {
/* -- protected methods -- */
-
}
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/AbstractIndexTypeDao.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/AbstractIndexTypeDao.java
index 4f1bf5f6..684950e2 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/AbstractIndexTypeDao.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/AbstractIndexTypeDao.java
@@ -25,6 +25,7 @@ package org.duniter.elasticsearch.dao;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.duniter.core.exception.TechnicalException;
+import org.duniter.core.util.Preconditions;
import org.duniter.elasticsearch.dao.handler.StringReaderHandler;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -175,4 +176,22 @@ public abstract class AbstractIndexTypeDao<T extends IndexTypeDao> extends Abstr
public boolean existsIndex() {
return client.existsIndex(index);
}
+
+ public void create(String json, boolean wait) {
+ Preconditions.checkNotNull(json);
+
+ // Execute
+ client.safeExecuteRequest(client.prepareIndex(getIndex(), getType())
+ .setRefresh(false) // let's see if this works
+ .setSource(json), wait);
+ }
+
+ public void update(String id, String json, boolean wait) {
+ Preconditions.checkNotNull(json);
+
+ // Execute
+ client.safeExecuteRequest(client.prepareUpdate(getIndex(), getType(), id)
+ .setRefresh(false) // let's see if this works
+ .setDoc(json), wait);
+ }
}
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/impl/BlockDaoImpl.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/impl/BlockDaoImpl.java
index 2964b8da..0520d7b5 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/impl/BlockDaoImpl.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/impl/BlockDaoImpl.java
@@ -30,18 +30,14 @@ import org.duniter.core.exception.TechnicalException;
import org.duniter.core.util.Preconditions;
import org.duniter.core.util.StringUtils;
import org.duniter.core.util.json.JsonSyntaxException;
-import org.duniter.elasticsearch.PluginSettings;
import org.duniter.elasticsearch.dao.AbstractDao;
import org.duniter.elasticsearch.dao.BlockDao;
-import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.QueryBuilders;
@@ -88,7 +84,7 @@ public class BlockDaoImpl extends AbstractDao implements BlockDao {
.setSource(json);
// Execute
- safeExecute(request, wait);
+ client.safeExecuteRequest(request, wait);
}
catch(JsonProcessingException e) {
throw new TechnicalException(e);
@@ -114,7 +110,7 @@ public class BlockDaoImpl extends AbstractDao implements BlockDao {
.setSource(json);
// Execute
- safeExecute(request, wait);
+ client.safeExecuteRequest(request, wait);
}
public boolean isExists(String currencyName, String id) {
@@ -138,7 +134,7 @@ public class BlockDaoImpl extends AbstractDao implements BlockDao {
.setDoc(json);
// Execute
- safeExecute(request, wait);
+ client.safeExecuteRequest(request, wait);
}
catch(JsonProcessingException e) {
throw new TechnicalException(e);
@@ -162,7 +158,7 @@ public class BlockDaoImpl extends AbstractDao implements BlockDao {
.setDoc(json);
// Execute
- safeExecute(request, wait);
+ client.safeExecuteRequest(request, wait);
}
public List<BlockchainBlock> findBlocksByHash(String currencyName, String query) {
@@ -361,28 +357,4 @@ public class BlockDaoImpl extends AbstractDao implements BlockDao {
return result;
}
-
- protected void safeExecute(ActionRequestBuilder<?, ?, ?> request, boolean wait) {
- // Execute in a pool
- if (!wait) {
- boolean acceptedInPool = false;
- while(!acceptedInPool)
- try {
- request.execute();
- acceptedInPool = true;
- }
- catch(EsRejectedExecutionException e) {
- // not accepted, so wait
- try {
- Thread.sleep(1000); // 1s
- }
- catch(InterruptedException e2) {
- // silent
- }
- }
-
- } else {
- request.execute().actionGet();
- }
- }
}
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/BlockchainService.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/BlockchainService.java
index b1934f16..25b2134c 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/BlockchainService.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/BlockchainService.java
@@ -48,13 +48,12 @@ import org.duniter.core.util.websocket.WebsocketClientEndpoint;
import org.duniter.elasticsearch.PluginSettings;
import org.duniter.elasticsearch.client.Duniter4jClient;
import org.duniter.elasticsearch.dao.BlockDao;
-import org.duniter.elasticsearch.dao.impl.BlockDaoImpl;
import org.duniter.elasticsearch.exception.DuplicateIndexIdException;
+import org.duniter.elasticsearch.exception.NotFoundException;
import org.duniter.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.action.bulk.BulkItemResponse;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.client.Client;
import org.elasticsearch.common.inject.Inject;
import org.nuiton.i18n.I18n;
@@ -85,7 +84,6 @@ public class BlockchainService extends AbstractService {
private final JsonAttributeParser blockHashParser = new JsonAttributeParser("hash");
private final JsonAttributeParser blockPreviousHashParser = new JsonAttributeParser("previousHash");
- private Client client;
private BlockDao blockDao;
@Inject
@@ -401,8 +399,26 @@ public class BlockchainService extends AbstractService {
return blockDao.getBlockById(currencyName, CURRENT_BLOCK_ID);
}
+ public Map<String, Object> getBlockFieldsById(String currencyName, int number, String... fields) {
+ return getBlockFieldsById(currencyName, String.valueOf(number), fields);
+ }
+
+ public Map<String, Object> getCurrentBlockFields(String currencyName, String... fields) {
+ return getBlockFieldsById(currencyName, CURRENT_BLOCK_ID, fields);
+ }
+
/* -- Internal methods -- */
+
+ protected Map<String, Object> getBlockFieldsById(String currency, String blockId, String... fields) {
+ try {
+ return client.getMandatoryFieldsById(currency, BLOCK_TYPE, blockId, fields);
+ }
+ catch(NotFoundException e) {
+ throw new BlockNotFoundException(e);
+ }
+ }
+
protected Collection<String> indexBlocksNoBulk(Peer peer, String currencyName, int firstNumber, int lastNumber, ProgressionModel progressionModel) {
Set<String> missingBlockNumbers = new LinkedHashSet<>();
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/CurrencyService.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/CurrencyService.java
index f0cdcd62..1594e65f 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/CurrencyService.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/CurrencyService.java
@@ -230,6 +230,8 @@ public class CurrencyService extends AbstractService {
saveCurrency(currency, pubkey);
}
+
+
/* -- Internal methods -- */
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/PluginSettings.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/PluginSettings.java
index 4151475a..f6e36663 100644
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/PluginSettings.java
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/PluginSettings.java
@@ -84,11 +84,19 @@ public class PluginSettings extends AbstractLifecycleComponent<PluginSettings> {
}
/**
- * Time interval (millisecond) to send email ? (default: 3600000 = 1h)
+ * Day of the week to trigger weekly email subscription (default: 1)
* @return
*/
- public long getExecuteEmailSubscriptionsInterval() {
- return settings.getAsLong("duniter.subscription.email.interval", 36000000l) /*1hour*/;
+ public int getEmailSubscriptionsExecuteDayOfWeek() {
+ return settings.getAsInt("duniter.subscription.email.dayOfWeek", 1);
+ }
+
+ /**
+ * Hour in day to trigger daily email subscription (default: 4 AM)
+ * @return
+ */
+ public int getEmailSubscriptionsExecuteHour() {
+ return settings.getAsInt("duniter.subscription.email.hourOfDay", 4) /*4 hour in the morning*/;
}
/* -- delegate methods -- */
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/DaoModule.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/DaoModule.java
index 7851afbe..bbf87958 100644
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/DaoModule.java
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/DaoModule.java
@@ -22,6 +22,8 @@ package org.duniter.elasticsearch.subscription.dao;
* #L%
*/
+import org.duniter.elasticsearch.subscription.dao.execution.SubscriptionExecutionDao;
+import org.duniter.elasticsearch.subscription.dao.execution.SubscriptionExecutionDaoImpl;
import org.duniter.elasticsearch.subscription.dao.record.SubscriptionRecordDao;
import org.duniter.elasticsearch.subscription.dao.record.SubscriptionRecordDaoImpl;
import org.elasticsearch.common.inject.AbstractModule;
@@ -36,6 +38,7 @@ public class DaoModule extends AbstractModule implements Module {
// Subscription types
bind(SubscriptionRecordDao.class).to(SubscriptionRecordDaoImpl.class).asEagerSingleton();
+ bind(SubscriptionExecutionDao.class).to(SubscriptionExecutionDaoImpl.class).asEagerSingleton();
}
}
\ No newline at end of file
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/SubscriptionIndexTypeDao.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/SubscriptionIndexTypeDao.java
index 1b3637b6..d538eb37 100644
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/SubscriptionIndexTypeDao.java
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/SubscriptionIndexTypeDao.java
@@ -32,8 +32,12 @@ public interface SubscriptionIndexTypeDao<T extends SubscriptionIndexTypeDao> ex
String create(final String json);
+ void create(final String json, boolean wait);
+
void update(final String id, final String json);
+ void update(final String id, final String json, boolean wait);
+
void checkSameDocumentIssuer(String id, String expectedIssuer);
}
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/execution/SubscriptionExecutionDao.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/execution/SubscriptionExecutionDao.java
new file mode 100644
index 00000000..f957532c
--- /dev/null
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/execution/SubscriptionExecutionDao.java
@@ -0,0 +1,23 @@
+package org.duniter.elasticsearch.subscription.dao.execution;
+
+import org.duniter.elasticsearch.subscription.dao.SubscriptionIndexTypeDao;
+import org.duniter.elasticsearch.subscription.model.SubscriptionExecution;
+import org.duniter.elasticsearch.subscription.model.SubscriptionRecord;
+
+import java.util.List;
+
+/**
+ * Created by blavenie on 03/04/17.
+ */
+public interface SubscriptionExecutionDao<T extends SubscriptionIndexTypeDao> extends SubscriptionIndexTypeDao<T> {
+
+ String TYPE = "execution";
+
+ SubscriptionExecution getLastExecution(SubscriptionRecord record);
+
+ SubscriptionExecution getLastExecution(String recipient, String subscriptionType, String recordId);
+
+ Long getLastExecutionTime(String recipient, String subscriptionType, String recordId);
+
+ Long getLastExecutionTime(SubscriptionRecord record);
+}
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/execution/SubscriptionExecutionDaoImpl.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/execution/SubscriptionExecutionDaoImpl.java
new file mode 100644
index 00000000..f38d6d28
--- /dev/null
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/execution/SubscriptionExecutionDaoImpl.java
@@ -0,0 +1,168 @@
+package org.duniter.elasticsearch.subscription.dao.execution;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.duniter.core.client.model.bma.BlockchainBlock;
+import org.duniter.core.exception.TechnicalException;
+import org.duniter.core.util.CollectionUtils;
+import org.duniter.core.util.Preconditions;
+import org.duniter.core.util.StringUtils;
+import org.duniter.elasticsearch.subscription.PluginSettings;
+import org.duniter.elasticsearch.subscription.dao.AbstractSubscriptionIndexTypeDao;
+import org.duniter.elasticsearch.subscription.dao.SubscriptionIndexDao;
+import org.duniter.elasticsearch.subscription.model.SubscriptionExecution;
+import org.duniter.elasticsearch.subscription.model.SubscriptionRecord;
+import org.duniter.elasticsearch.subscription.model.email.EmailSubscription;
+import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.action.update.UpdateRequestBuilder;
+import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.sort.SortOrder;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * Created by blavenie on 03/04/17.
+ */
+public class SubscriptionExecutionDaoImpl extends AbstractSubscriptionIndexTypeDao<SubscriptionExecutionDaoImpl> implements SubscriptionExecutionDao<SubscriptionExecutionDaoImpl> {
+
+ @Inject
+ public SubscriptionExecutionDaoImpl(PluginSettings pluginSettings, SubscriptionIndexDao indexDao) {
+ super(SubscriptionIndexDao.INDEX, TYPE, pluginSettings);
+
+ indexDao.register(this);
+ }
+
+ @Override
+ public SubscriptionExecution getLastExecution(SubscriptionRecord record) {
+ Preconditions.checkNotNull(record);
+ Preconditions.checkNotNull(record.getIssuer());
+ Preconditions.checkNotNull(record.getType());
+ Preconditions.checkNotNull(record.getId());
+
+ return getLastExecution(record.getIssuer(), record.getType(), record.getId());
+ }
+
+ @Override
+ public SubscriptionExecution getLastExecution(String recipient, String recordType, String recordId) {
+
+ BoolQueryBuilder query = QueryBuilders.boolQuery()
+ .must(QueryBuilders.termQuery(SubscriptionExecution.PROPERTY_RECIPIENT, recipient))
+ .must(QueryBuilders.termsQuery(SubscriptionExecution.PROPERTY_RECORD_TYPE, recordType))
+ .must(QueryBuilders.termQuery(SubscriptionExecution.PROPERTY_RECORD_ID, recordId));
+
+ SearchResponse response = client.prepareSearch(SubscriptionIndexDao.INDEX)
+ .setTypes(SubscriptionExecutionDao.TYPE)
+ .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+ .setQuery(query)
+ .setFetchSource(true)
+ .setFrom(0).setSize(1)
+ .addSort(SubscriptionExecution.PROPERTY_TIME, SortOrder.DESC)
+ .get();
+
+ if (response.getHits().getTotalHits() == 0) return null;
+
+ SearchHit hit = response.getHits().getHits()[0];
+ return client.readSourceOrNull(hit, SubscriptionExecution.class);
+ }
+
+ @Override
+ public Long getLastExecutionTime(SubscriptionRecord record) {
+ Preconditions.checkNotNull(record);
+ Preconditions.checkNotNull(record.getIssuer());
+ Preconditions.checkNotNull(record.getType());
+ Preconditions.checkNotNull(record.getId());
+
+ return getLastExecutionTime(record.getIssuer(), record.getType(), record.getId());
+ }
+
+ @Override
+ public Long getLastExecutionTime(String recipient, String recordType, String recordId) {
+
+ BoolQueryBuilder query = QueryBuilders.boolQuery()
+ .must(QueryBuilders.termQuery(SubscriptionExecution.PROPERTY_RECIPIENT, recipient))
+ .must(QueryBuilders.termQuery(SubscriptionExecution.PROPERTY_RECORD_ID, recordId))
+ .must(QueryBuilders.termsQuery(SubscriptionExecution.PROPERTY_RECORD_ID, recordType));
+
+ SearchResponse response = client.prepareSearch(SubscriptionIndexDao.INDEX)
+ .setTypes(SubscriptionExecutionDao.TYPE)
+ .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+ .setQuery(query)
+ .addField(SubscriptionExecution.PROPERTY_TIME)
+ .setFrom(0).setSize(1)
+ .addSort(SubscriptionExecution.PROPERTY_TIME, SortOrder.DESC)
+ .get();
+
+ if (response.getHits().getTotalHits() == 0) return null;
+ SearchHit hit = response.getHits().getHits()[0];
+ return hit.field(SubscriptionExecution.PROPERTY_TIME).getValue();
+ }
+
+ @Override
+ public XContentBuilder createTypeMapping() {
+ try {
+ XContentBuilder mapping = XContentFactory.jsonBuilder().startObject()
+ .startObject(getType())
+ .startObject("properties")
+
+ // issuer
+ .startObject("issuer")
+ .field("type", "string")
+ .field("index", "not_analyzed")
+ .endObject()
+
+ // recipient
+ .startObject("recipient")
+ .field("type", "string")
+ .field("index", "not_analyzed")
+ .endObject()
+
+ // record type
+ .startObject("recordType")
+ .field("type", "string")
+ .field("index", "not_analyzed")
+ .endObject()
+
+ // record id
+ .startObject("recordId")
+ .field("type", "string")
+ .field("index", "not_analyzed")
+ .endObject()
+
+ // time
+ .startObject("time")
+ .field("type", "integer")
+ .endObject()
+
+ // hash
+ .startObject("hash")
+ .field("type", "string")
+ .field("index", "not_analyzed")
+ .endObject()
+
+ // signature
+ .startObject("signature")
+ .field("type", "string")
+ .field("index", "not_analyzed")
+ .endObject()
+
+ .endObject()
+ .endObject().endObject();
+
+ return mapping;
+ }
+ catch(IOException ioe) {
+ throw new TechnicalException(String.format("Error while getting mapping for index [%s/%s]: %s", getIndex(), getType(), ioe.getMessage()), ioe);
+ }
+ }
+
+}
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/record/SubscriptionRecordDao.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/record/SubscriptionRecordDao.java
index b8b2703c..d1fa0b80 100644
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/record/SubscriptionRecordDao.java
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/record/SubscriptionRecordDao.java
@@ -1,7 +1,7 @@
package org.duniter.elasticsearch.subscription.dao.record;
import org.duniter.elasticsearch.subscription.dao.SubscriptionIndexTypeDao;
-import org.duniter.elasticsearch.subscription.model.Subscription;
+import org.duniter.elasticsearch.subscription.model.SubscriptionRecord;
import java.util.List;
@@ -12,5 +12,5 @@ public interface SubscriptionRecordDao<T extends SubscriptionIndexTypeDao> exten
String TYPE = "record";
- List<Subscription> getSubscriptions(int from, int size, String recipient, String... types);
+ List<SubscriptionRecord> getSubscriptions(int from, int size, String recipient, String... types);
}
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/record/SubscriptionRecordDaoImpl.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/record/SubscriptionRecordDaoImpl.java
index 983ae405..f3682afc 100644
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/record/SubscriptionRecordDaoImpl.java
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/dao/record/SubscriptionRecordDaoImpl.java
@@ -5,7 +5,7 @@ import org.duniter.core.util.CollectionUtils;
import org.duniter.elasticsearch.subscription.PluginSettings;
import org.duniter.elasticsearch.subscription.dao.AbstractSubscriptionIndexTypeDao;
import org.duniter.elasticsearch.subscription.dao.SubscriptionIndexDao;
-import org.duniter.elasticsearch.subscription.model.Subscription;
+import org.duniter.elasticsearch.subscription.model.SubscriptionRecord;
import org.duniter.elasticsearch.subscription.model.email.EmailSubscription;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
@@ -13,7 +13,6 @@ import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
@@ -36,12 +35,12 @@ public class SubscriptionRecordDaoImpl extends AbstractSubscriptionIndexTypeDao<
}
@Override
- public List<Subscription> getSubscriptions(int from, int size, String recipient, String... types) {
+ public List<SubscriptionRecord> getSubscriptions(int from, int size, String recipient, String... types) {
BoolQueryBuilder query = QueryBuilders.boolQuery()
- .must(QueryBuilders.termQuery(Subscription.PROPERTY_RECIPIENT, recipient));
+ .must(QueryBuilders.termQuery(SubscriptionRecord.PROPERTY_RECIPIENT, recipient));
if (CollectionUtils.isNotEmpty(types)) {
- query.must(QueryBuilders.termsQuery(Subscription.PROPERTY_TYPE, types));
+ query.must(QueryBuilders.termsQuery(SubscriptionRecord.PROPERTY_TYPE, types));
}
SearchResponse response = client.prepareSearch(SubscriptionIndexDao.INDEX)
@@ -123,9 +122,9 @@ public class SubscriptionRecordDaoImpl extends AbstractSubscriptionIndexTypeDao<
}
}
- protected Subscription toSubscription(SearchHit searchHit) {
+ protected SubscriptionRecord toSubscription(SearchHit searchHit) {
- Subscription record = null;
+ SubscriptionRecord record = null;
if (SubscriptionRecordDao.TYPE.equals(searchHit.getType())) {
record = client.readSourceOrNull(searchHit, EmailSubscription.class);
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/SubscriptionExecution.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/SubscriptionExecution.java
new file mode 100644
index 00000000..63cd57f4
--- /dev/null
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/SubscriptionExecution.java
@@ -0,0 +1,78 @@
+package org.duniter.elasticsearch.subscription.model;
+
+/*
+ * #%L
+ * Duniter4j :: ElasticSearch GChange plugin
+ * %%
+ * Copyright (C) 2014 - 2017 EIS
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.duniter.core.client.model.elasticsearch.Record;
+
+/**
+ * Created by blavenie on 01/12/16.
+ */
+public class SubscriptionExecution extends Record {
+
+ public static final String PROPERTY_RECIPIENT = "recipient";
+
+ public static final String PROPERTY_RECORD_TYPE = "recordType";
+
+ public static final String PROPERTY_RECORD_ID = "recordId";
+
+ private String recipient;
+ private String recordType;
+ private String recordId;
+
+ private SubscriptionRecord record;
+
+ public String getRecipient() {
+ return recipient;
+ }
+
+ public void setRecipient(String recipient) {
+ this.recipient = recipient;
+ }
+
+ public String getRecordType() {
+ return recordType;
+ }
+
+ public void setRecordType(String recordType) {
+ this.recordType = recordType;
+ }
+
+ public String getRecordId() {
+ return recordId;
+ }
+
+ public void setRecordId(String recordId) {
+ this.recordId = recordId;
+ }
+
+ @JsonIgnore
+ public SubscriptionRecord getRecord() {
+ return record;
+ }
+
+ @JsonIgnore
+ public void setRecord(SubscriptionRecord record) {
+ this.record = record;
+ }
+}
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/Subscription.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/SubscriptionRecord.java
similarity index 98%
rename from duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/Subscription.java
rename to duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/SubscriptionRecord.java
index 2ffc884e..6a5081cc 100644
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/Subscription.java
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/SubscriptionRecord.java
@@ -28,7 +28,7 @@ import org.duniter.core.client.model.elasticsearch.Record;
/**
* Created by blavenie on 01/12/16.
*/
-public class Subscription<T> extends Record{
+public class SubscriptionRecord<T> extends Record{
public static final String PROPERTY_RECIPIENT = "recipient";
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/email/EmailSubscription.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/email/EmailSubscription.java
index 663297df..781c7778 100644
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/email/EmailSubscription.java
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/model/email/EmailSubscription.java
@@ -22,12 +22,12 @@ package org.duniter.elasticsearch.subscription.model.email;
* #L%
*/
-import org.duniter.elasticsearch.subscription.model.Subscription;
+import org.duniter.elasticsearch.subscription.model.SubscriptionRecord;
/**
* Created by blavenie on 01/12/16.
*/
-public class EmailSubscription extends Subscription<EmailSubscription.Content> {
+public class EmailSubscription extends SubscriptionRecord<EmailSubscription.Content> {
public static final String TYPE = "email";
@@ -35,9 +35,15 @@ public class EmailSubscription extends Subscription<EmailSubscription.Content> {
return new EmailSubscription.Content();
}
+ public enum Frequency {
+ daily,
+ weekly
+ }
+
public static class Content {
public static final String PROPERTY_EMAIL = "email";
+ public static final String PROPERTY_FREQUENCY = "frequency";
public static final String PROPERTY_LOCALE = "locale";
public static final String PROPERTY_INCLUDES = "includes";
public static final String PROPERTY_EXCLUDES = "excludes";
@@ -46,6 +52,7 @@ public class EmailSubscription extends Subscription<EmailSubscription.Content> {
private String[] includes;
private String[] excludes;
private String locale;
+ private Frequency frequency;
public String getEmail() {
return email;
@@ -78,6 +85,14 @@ public class EmailSubscription extends Subscription<EmailSubscription.Content> {
public void setLocale(String locale) {
this.locale = locale;
}
+
+ public Frequency getFrequency() {
+ return frequency;
+ }
+
+ public void setFrequency(Frequency frequency) {
+ this.frequency = frequency;
+ }
}
}
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/service/SubscriptionService.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/service/SubscriptionService.java
index 7571a7f6..18c31276 100644
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/service/SubscriptionService.java
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/service/SubscriptionService.java
@@ -37,11 +37,14 @@ import org.duniter.core.util.StringUtils;
import org.duniter.core.util.crypto.CryptoUtils;
import org.duniter.elasticsearch.client.Duniter4jClient;
import org.duniter.elasticsearch.subscription.PluginSettings;
+import org.duniter.elasticsearch.subscription.dao.execution.SubscriptionExecutionDao;
import org.duniter.elasticsearch.subscription.dao.record.SubscriptionRecordDao;
-import org.duniter.elasticsearch.subscription.model.Subscription;
+import org.duniter.elasticsearch.subscription.model.SubscriptionExecution;
+import org.duniter.elasticsearch.subscription.model.SubscriptionRecord;
import org.duniter.elasticsearch.subscription.model.email.EmailSubscription;
+import org.duniter.elasticsearch.subscription.util.DateUtils;
import org.duniter.elasticsearch.subscription.util.stringtemplate.DateRenderer;
-import org.duniter.elasticsearch.subscription.util.stringtemplate.I18nRenderer;
+import org.duniter.elasticsearch.subscription.util.stringtemplate.StringRenderer;
import org.duniter.elasticsearch.threadpool.ThreadPool;
import org.duniter.elasticsearch.user.model.UserEvent;
import org.duniter.elasticsearch.user.service.AdminService;
@@ -49,11 +52,13 @@ import org.duniter.elasticsearch.user.service.MailService;
import org.duniter.elasticsearch.user.service.UserEventService;
import org.duniter.elasticsearch.user.service.UserService;
import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.unit.TimeValue;
import org.nuiton.i18n.I18n;
-import org.stringtemplate.v4.*;
+import org.stringtemplate.v4.ST;
+import org.stringtemplate.v4.STGroup;
+import org.stringtemplate.v4.STGroupDir;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -62,6 +67,7 @@ import java.util.stream.Collectors;
public class SubscriptionService extends AbstractService {
private SubscriptionRecordDao subscriptionRecordDao;
+ private SubscriptionExecutionDao subscriptionExecutionDao;
private ThreadPool threadPool;
private MailService mailService;
private AdminService adminService;
@@ -74,6 +80,7 @@ public class SubscriptionService extends AbstractService {
PluginSettings settings,
CryptoService cryptoService,
SubscriptionRecordDao subscriptionRecordDao,
+ SubscriptionExecutionDao subscriptionExecutionDao,
ThreadPool threadPool,
MailService mailService,
AdminService adminService,
@@ -81,6 +88,7 @@ public class SubscriptionService extends AbstractService {
UserEventService userEventService) {
super("subscription.service", client, settings, cryptoService);
this.subscriptionRecordDao = subscriptionRecordDao;
+ this.subscriptionExecutionDao = subscriptionExecutionDao;
this.threadPool = threadPool;
this.mailService = mailService;
this.adminService = adminService;
@@ -123,14 +131,26 @@ public class SubscriptionService extends AbstractService {
return this;
}
- threadPool.scheduleWithFixedDelay(
- this::executeEmailSubscriptions,
- new TimeValue(pluginSettings.getExecuteEmailSubscriptionsInterval()));
+
+ // Startup Start
+ threadPool.schedule(() -> executeEmailSubscriptions(EmailSubscription.Frequency.daily));
+
+ // Daily execution
+ threadPool.scheduler().scheduleAtFixedRate(
+ () -> executeEmailSubscriptions(EmailSubscription.Frequency.daily),
+ DateUtils.delayBeforeHour(pluginSettings.getEmailSubscriptionsExecuteHour()),
+ 1, TimeUnit.DAYS);
+
+ // Weekly execution
+ threadPool.scheduler().scheduleAtFixedRate(
+ () -> executeEmailSubscriptions(EmailSubscription.Frequency.weekly),
+ DateUtils.delayBeforeDayAndHour(pluginSettings.getEmailSubscriptionsExecuteDayOfWeek(), pluginSettings.getEmailSubscriptionsExecuteHour()),
+ 7, TimeUnit.DAYS);
return this;
}
- public void executeEmailSubscriptions() {
+ public void executeEmailSubscriptions(final EmailSubscription.Frequency frequency) {
final String senderPubkey = pluginSettings.getNodePubkey();
@@ -139,11 +159,11 @@ public class SubscriptionService extends AbstractService {
boolean hasMore = true;
while (hasMore) {
- List<Subscription> subscriptions = subscriptionRecordDao.getSubscriptions(from, size, senderPubkey, EmailSubscription.TYPE);
+ List<SubscriptionRecord> subscriptions = subscriptionRecordDao.getSubscriptions(from, size, senderPubkey, EmailSubscription.TYPE);
// Get profiles titles, for issuers and the sender
Set<String> issuers = subscriptions.stream()
- .map(Subscription::getIssuer)
+ .map(SubscriptionRecord::getIssuer)
.distinct()
.collect(Collectors.toSet());
final Map<String, String> profileTitles = userService.getProfileTitles(
@@ -151,12 +171,12 @@ public class SubscriptionService extends AbstractService {
final String senderName = (profileTitles != null && profileTitles.containsKey(senderPubkey)) ? profileTitles.get(senderPubkey) :
ModelUtils.minifyPubkey(senderPubkey);
- subscriptions.stream()
+ subscriptions.parallelStream()
.map(record -> decryptEmailSubscription((EmailSubscription)record))
- .filter(Objects::nonNull)
+ .filter(record -> (record != null && record.getContent().getFrequency() == frequency))
.map(record -> processEmailSubscription(record, senderPubkey, senderName, profileTitles))
.filter(Objects::nonNull)
- .forEach(this::saveSubscription);
+ .forEach(this::saveExecution);
hasMore = CollectionUtils.size(subscriptions) >= size;
from += size;
@@ -199,7 +219,7 @@ public class SubscriptionService extends AbstractService {
return subscription;
}
- protected EmailSubscription processEmailSubscription(final EmailSubscription subscription,
+ protected SubscriptionExecution processEmailSubscription(final EmailSubscription subscription,
final String senderPubkey,
final String senderName,
final Map<String, String> profileTitles) {
@@ -207,26 +227,44 @@ public class SubscriptionService extends AbstractService {
logger.info(String.format("Processing email subscription [%s]", subscription.getId()));
- Long lastTime = 0l; // TODO get it from subscription ?
+ SubscriptionExecution lastExecution = subscriptionExecutionDao.getLastExecution(subscription);
+ Long lastExecutionTime;
+
+ if (lastExecution != null) {
+ lastExecutionTime = lastExecution.getTime();
+ }
+ // If first email execution: only send event from the last 7 days.
+ else {
+ Calendar defaultDateLimit = new GregorianCalendar();
+ defaultDateLimit.setTimeInMillis(System.currentTimeMillis());
+ defaultDateLimit.add(Calendar.DAY_OF_YEAR, - 7);
+ defaultDateLimit.set(Calendar.HOUR_OF_DAY, 0);
+ defaultDateLimit.set(Calendar.MINUTE, 0);
+ defaultDateLimit.set(Calendar.SECOND, 0);
+ defaultDateLimit.set(Calendar.MILLISECOND, 0);
+ lastExecutionTime = defaultDateLimit.getTimeInMillis() / 1000;
+ }
// Get last user events
String[] includes = subscription.getContent() == null ? null : subscription.getContent().getIncludes();
String[] excludes = subscription.getContent() == null ? null : subscription.getContent().getExcludes();
- List<UserEvent> userEvents = userEventService.getUserEvents(subscription.getIssuer(), lastTime, includes, excludes);
+ List<UserEvent> userEvents = userEventService.getUserEvents(subscription.getIssuer(), lastExecutionTime, includes, excludes);
+ if (CollectionUtils.isEmpty(userEvents)) return null; // no events: stop here
- STGroup templates = new STGroupDir("templates", '$', '$');
- templates.registerRenderer(Date.class, new DateRenderer());
- //templates.registerRenderer(String.class, new StringRenderer());
- //templates.registerRenderer(Number.class, new NumberRenderer());
- templates.registerRenderer(String.class, new I18nRenderer());
+ // Get user locale
String[] localParts = subscription.getContent() != null && subscription.getContent().getLocale() != null ?
subscription.getContent().getLocale().split("-") : new String[]{"en", "GB"};
-
Locale issuerLocale = localParts.length >= 2 ? new Locale(localParts[0].toLowerCase(), localParts[1].toUpperCase()) : new Locale(localParts[0].toLowerCase());
- // Compute text
- String text = fillTemplate(
+ // Configure templates engine
+ STGroup templates = new STGroupDir("templates", '$', '$');
+ templates.registerRenderer(Date.class, new DateRenderer());
+ templates.registerRenderer(String.class, new StringRenderer());
+ //templates.registerRenderer(Number.class, new NumberRenderer());
+
+ // Compute text content
+ final String text = fillTemplate(
templates.getInstanceOf("text_email"),
subscription,
senderPubkey,
@@ -237,7 +275,7 @@ public class SubscriptionService extends AbstractService {
.render(issuerLocale);
// Compute HTML content
- String html = fillTemplate(
+ final String html = fillTemplate(
templates.getInstanceOf("html_email_content"),
subscription,
senderPubkey,
@@ -247,22 +285,38 @@ public class SubscriptionService extends AbstractService {
pluginSettings.getCesiumUrl())
.render(issuerLocale);
- mailService.sendHtmlEmailWithText(
+
+
+ // Schedule email sending
+ threadPool.schedule(() -> mailService.sendHtmlEmailWithText(
emailSubjectPrefix + I18n.t("duniter4j.es.subscription.email.subject", userEvents.size()),
text,
"<body>" + html + "</body>",
- subscription.getContent().getEmail());
- return subscription;
+ subscription.getContent().getEmail()));
+
+
+ // Compute last time (should be the first one, as events are sorted in DESC order)
+ Long lastEventTime = userEvents.get(0).getTime();
+ if (lastExecution == null) {
+ lastExecution = new SubscriptionExecution();
+ lastExecution.setRecipient(subscription.getIssuer());
+ lastExecution.setRecordType(subscription.getType());
+ lastExecution.setRecordId(subscription.getId());
+ }
+ lastExecution.setTime(lastEventTime);
+
+
+ return lastExecution;
}
public static ST fillTemplate(ST template,
- EmailSubscription subscription,
- String senderPubkey,
- String senderName,
- Map<String, String> issuerProfilNames,
- List<UserEvent> userEvents,
- String cesiumSiteUrl) {
+ EmailSubscription subscription,
+ String senderPubkey,
+ String senderName,
+ Map<String, String> issuerProfilNames,
+ List<UserEvent> userEvents,
+ String cesiumSiteUrl) {
String issuerName = issuerProfilNames != null && issuerProfilNames.containsKey(subscription.getIssuer()) ?
issuerProfilNames.get(subscription.getIssuer()) :
ModelUtils.minifyPubkey(subscription.getIssuer());
@@ -271,7 +325,8 @@ public class SubscriptionService extends AbstractService {
try {
// Compute body
template.add("url", cesiumSiteUrl);
- template.add("issuer", issuerName);
+ template.add("issuerPubkey", subscription.getIssuer());
+ template.add("issuerName", issuerName);
template.add("senderPubkey", senderPubkey);
template.add("senderName", senderName);
userEvents.forEach(userEvent -> {
@@ -282,7 +337,6 @@ public class SubscriptionService extends AbstractService {
description,
new Date(userEvent.getTime() * 1000)
});
-
});
return template;
@@ -293,66 +347,46 @@ public class SubscriptionService extends AbstractService {
}
}
+ protected void saveExecution(SubscriptionExecution execution) {
+ Preconditions.checkNotNull(execution);
+ Preconditions.checkNotNull(execution.getRecipient());
+ Preconditions.checkNotNull(execution.getRecordType());
+ Preconditions.checkNotNull(execution.getRecordId());
- public static String computeTextEmail(STGroup templates,
- Locale issuerLocale,
- EmailSubscription subscription,
- String senderPubkey,
- String senderName,
- Map<String, String> issuerProfilNames,
- List<UserEvent> userEvents,
- String cesiumSiteUrl) {
- String issuerName = issuerProfilNames != null && issuerProfilNames.containsKey(subscription.getIssuer()) ?
- issuerProfilNames.get(subscription.getIssuer()) :
- ModelUtils.minifyPubkey(subscription.getIssuer());
+ // Update issuer
+ execution.setIssuer(pluginSettings.getNodePubkey());
- try {
- // Compute text content
- ST tpl = templates.getInstanceOf("text_email");
- tpl.add("url", cesiumSiteUrl);
- tpl.add("issuer", issuerName);
- tpl.add("url", cesiumSiteUrl);
- tpl.add("senderPubkey", senderPubkey);
- tpl.add("senderName", senderName);
- userEvents.forEach(userEvent -> {
- String description = userEvent.getParams() != null ?
- I18n.t("duniter.user.event." + userEvent.getCode().toUpperCase(), userEvent.getParams()) :
- I18n.t("duniter.user.event." + userEvent.getCode().toUpperCase());
- tpl.addAggr("events.{description, time}", new Object[]{
- description,
- new Date(userEvent.getTime() * 1000)
- });
+ // Fill hash + signature
+ String json = toJson(execution, true/*skip hash and signature*/);
+ execution.setHash(cryptoService.hash(json));
+ execution.setSignature(cryptoService.sign(json, pluginSettings.getNodeKeypair().getSecKey()));
- });
+ if (execution.getId() == null) {
- return tpl.render();
+ subscriptionExecutionDao.create(json, false/*not wait*/);
}
- catch (Exception e) {
- throw new TechnicalException(e);
+ else {
+ subscriptionExecutionDao.update(execution.getId(), json, false/*not wait*/);
}
}
- protected EmailSubscription saveSubscription(EmailSubscription subscription) {
- Preconditions.checkNotNull(subscription);
-
- //mailService.sendEmail();
- return subscription;
- }
-
- private String toJson(EmailSubscription subscription) {
- return toJson(subscription, false);
+ private String toJson(Record record) {
+ return toJson(record, false);
}
- private String toJson(EmailSubscription subscription, boolean cleanHashAndSignature) {
+ private String toJson(Record record, boolean cleanHashAndSignature) {
+ Preconditions.checkNotNull(record);
try {
- String json = objectMapper.writeValueAsString(subscription);
+ String json = objectMapper.writeValueAsString(record);
if (cleanHashAndSignature) {
json = JacksonUtils.removeAttribute(json, Record.PROPERTY_SIGNATURE);
json = JacksonUtils.removeAttribute(json, Record.PROPERTY_HASH);
}
return json;
} catch(JsonProcessingException e) {
- throw new TechnicalException("Unable to serialize UserEvent object", e);
+ throw new TechnicalException("Unable to serialize object " + record.getClass().getName(), e);
}
}
+
+
}
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/DateUtils.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/DateUtils.java
new file mode 100644
index 00000000..85162fe8
--- /dev/null
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/DateUtils.java
@@ -0,0 +1,49 @@
+package org.duniter.elasticsearch.subscription.util;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+/**
+ * Created by blavenie on 10/04/17.
+ */
+public class DateUtils {
+
+ public static Date nextHour(int hour) {
+ Calendar cal = new GregorianCalendar();
+ cal.setTimeInMillis(System.currentTimeMillis());
+ if (cal.get(Calendar.HOUR_OF_DAY) > hour) {
+ // Too late for today: add 1 day (will wait tomorrow)
+ cal.add(Calendar.DAY_OF_YEAR, 1);
+ }
+ cal.set(Calendar.HOUR_OF_DAY, hour);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ return cal.getTime();
+ }
+
+ public static Date nextDayAndHour(int dayOfTheWeek, int hour) {
+ Calendar cal = new GregorianCalendar();
+ cal.setTimeInMillis(System.currentTimeMillis());
+ if (cal.get(Calendar.DAY_OF_WEEK) > dayOfTheWeek || (cal.get(Calendar.DAY_OF_WEEK) == dayOfTheWeek && cal.get(Calendar.HOUR_OF_DAY) > hour)) {
+ // Too late for this week: will wait for next week
+ cal.add(Calendar.WEEK_OF_YEAR, 1);
+ }
+ cal.set(Calendar.DAY_OF_WEEK, dayOfTheWeek);
+ cal.set(Calendar.HOUR_OF_DAY, hour);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ return cal.getTime();
+ }
+
+ public static long delayBeforeHour(int hour) {
+ return nextHour(hour).getTime() - System.currentTimeMillis();
+ }
+
+ public static long delayBeforeDayAndHour(int dayOfTheWeek, int hour) {
+ return nextDayAndHour(dayOfTheWeek, hour).getTime() - System.currentTimeMillis();
+ }
+}
+
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/stringtemplate/I18nRenderer.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/stringtemplate/I18nRenderer.java
deleted file mode 100644
index fbcd6a98..00000000
--- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/stringtemplate/I18nRenderer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.duniter.elasticsearch.subscription.util.stringtemplate;
-
-import org.duniter.core.util.CollectionUtils;
-import org.duniter.core.util.StringUtils;
-import org.nuiton.i18n.I18n;
-import org.stringtemplate.v4.AttributeRenderer;
-
-import java.util.Locale;
-
-/**
- * Created by blavenie on 10/04/17.
- */
-public class I18nRenderer implements AttributeRenderer{
-
- @Override
- public String toString(Object key, String formatString, Locale locale) {
- if (formatString == null || !formatString.startsWith("i18n")) return key.toString();
- String[] params = formatString.startsWith("i18n:") ? formatString.substring(5).split(",") : null;
- if (CollectionUtils.isNotEmpty(params)) {
- return I18n.l(locale, key.toString(), params);
- }
- return I18n.l(locale, key.toString());
- }
-}
diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/stringtemplate/StringRenderer.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/stringtemplate/StringRenderer.java
new file mode 100644
index 00000000..92b638ba
--- /dev/null
+++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/util/stringtemplate/StringRenderer.java
@@ -0,0 +1,32 @@
+package org.duniter.elasticsearch.subscription.util.stringtemplate;
+
+import org.duniter.core.client.model.ModelUtils;
+import org.duniter.core.util.CollectionUtils;
+import org.duniter.core.util.StringUtils;
+import org.nuiton.i18n.I18n;
+import org.stringtemplate.v4.AttributeRenderer;
+
+import java.util.Locale;
+
+/**
+ * Add format capabilities: i18n, pubkey
+ * Created by blavenie on 10/04/17.
+ */
+public class StringRenderer extends org.stringtemplate.v4.StringRenderer{
+
+ @Override
+ public String toString(Object o, String formatString, Locale locale) {
+ return formatString == null ? (String)o :
+ (formatString.equals("pubkey") ? ModelUtils.minifyPubkey((String)o) :
+ (formatString.startsWith("i18n") ? toI18nString(o, formatString, locale) :
+ super.toString(o, formatString, locale)));
+ }
+
+ protected String toI18nString(Object key, String formatString, Locale locale) {
+ String[] params = formatString.startsWith("i18n:") ? formatString.substring(5).split(",") : null;
+ if (CollectionUtils.isNotEmpty(params)) {
+ return I18n.l(locale, key.toString(), params);
+ }
+ return I18n.l(locale, key.toString());
+ }
+}
diff --git a/duniter4j-es-subscription/src/main/resources/i18n/duniter4j-es-subscription_en_GB.properties b/duniter4j-es-subscription/src/main/resources/i18n/duniter4j-es-subscription_en_GB.properties
index d179ccf7..a02b9131 100644
--- a/duniter4j-es-subscription/src/main/resources/i18n/duniter4j-es-subscription_en_GB.properties
+++ b/duniter4j-es-subscription/src/main/resources/i18n/duniter4j-es-subscription_en_GB.properties
@@ -1,7 +1,14 @@
-duniter4j.es.subscription.email.footer.disableHelp=You can disable this email notification service in the page <a href\="%s">Online services</a> of Cesium+.
-duniter4j.es.subscription.email.footer.sendBy=This email has sent you the Cesium+ node of <a href\="%s">%s</a>.
-duniter4j.es.subscription.email.header=Hello <b>%s</b>\!<br/>You received %s new notifications\:
+duniter4j.es.subscription.email.footer.disableHelp=You can disable this email notification service in the page %2$% (%1$s).
+duniter4j.es.subscription.email.footer.sendBy=This email has sent you the Cesium+ node of %2$s (%1$s).
+duniter4j.es.subscription.email.hello=Hello %s\!
+duniter4j.es.subscription.email.html.footer.disableHelp=You can disable this email notification service in <a href\="%s">online services</a> page.
+duniter4j.es.subscription.email.html.footer.sendBy=This email has sent you the Cesium+ node of <a href\="%s">%s</a>..
+duniter4j.es.subscription.email.html.hello=Hello <b>%s</b>\!
+duniter4j.es.subscription.email.html.pubkey=Public key\: <a href\="%s">%s</a>
+duniter4j.es.subscription.email.html.unreadCount=You received <b>%s new notifications</b>.
duniter4j.es.subscription.email.notificationsDivider=Notifications list\:
duniter4j.es.subscription.email.openCesium=Open Cesium+
+duniter4j.es.subscription.email.pubkey=Public key\: %2$s (%1$s)
duniter4j.es.subscription.email.subject=You received %s new notifications
+duniter4j.es.subscription.email.unreadCount=You received %s new notifications.
duniter4j.es.subscription.error.mailDisabling=Unable to process email subscriptions\: Email sending is disabled in the configuration
diff --git a/duniter4j-es-subscription/src/main/resources/i18n/duniter4j-es-subscription_fr_FR.properties b/duniter4j-es-subscription/src/main/resources/i18n/duniter4j-es-subscription_fr_FR.properties
index 37f541ed..c64cf822 100644
--- a/duniter4j-es-subscription/src/main/resources/i18n/duniter4j-es-subscription_fr_FR.properties
+++ b/duniter4j-es-subscription/src/main/resources/i18n/duniter4j-es-subscription_fr_FR.properties
@@ -1,11 +1,14 @@
-duniter4j.es.subscription.email.footer=Cet email vous a été envoyé par Cesium+.<br/><small>vous pouvez désactiver ce service de notification par email, dans la rubrique <a href\="%s">Services en ligne</a> de Cesium+.
-duniter4j.es.subscription.email.footer.disableHelp=Vous pouvez désactiver ce service de notification par email, dans la rubrique <a href\="%s">Services en ligne</a> de Cesium+.
-duniter4j.es.subscription.email.footer.disableHelp.text=Vous pouvez désactiver ce service de notification par email, dans la rubrique "Services en ligne" de Cesium+ (%s).
-duniter4j.es.subscription.email.footer.sendBy=Cet email vous a été envoyé le noeud Cesium+ de <a href\="%1$s">%2$s</a>.
-duniter4j.es.subscription.email.footer.sendBy.text=Cet email vous a été envoyé le noeud Cesium+ de %2$s (%1$s).
-duniter4j.es.subscription.email.header=Bonjour <b>%s</b> \!<br/>Vous avez %s notifications non lues.
-duniter4j.es.subscription.email.header.text=Bonjour %s \!\nVous avez %s notifications non lues.
+duniter4j.es.subscription.email.footer.disableHelp=Vous pouvez désactiver ce service de notification par email, dans la rubrique "Services en ligne" de Cesium+ (%s).
+duniter4j.es.subscription.email.footer.sendBy=Cet email vous a été envoyé le noeud Cesium+ de %2$s (%1$s).
+duniter4j.es.subscription.email.hello=Bonjour %s \!
+duniter4j.es.subscription.email.html.footer.disableHelp=Vous pouvez désactiver ce service de notification par email, dans <a href\="%s">la rubrique services en ligne</a> de Cesium+.
+duniter4j.es.subscription.email.html.footer.sendBy=Cet email vous a été envoyé depuis le noeud Cesium+ de <a href\="%1$s">%2$s</a>.
+duniter4j.es.subscription.email.html.hello=Bonjour <b>%s</b> \!
+duniter4j.es.subscription.email.html.pubkey=Clé publique \: <a href\="%s">%s</a>
+duniter4j.es.subscription.email.html.unreadCount=Vous avez <b>%s notifications</b> non lues.
duniter4j.es.subscription.email.notificationsDivider=Liste des notifications \:
duniter4j.es.subscription.email.openCesium=Ouvrir Cesium+
+duniter4j.es.subscription.email.pubkey=Clé publique \: %2$s (%1$s)
duniter4j.es.subscription.email.subject=%s nouvelles notifications non lues
+duniter4j.es.subscription.email.unreadCount=Vous avez %s notifications non lues.
duniter4j.es.subscription.error.mailDisabling=Impossible de traiter les abonnements email\: la fonction d'envoi d'email est désactivée dans la configuration
diff --git a/duniter4j-es-subscription/src/main/resources/templates/cesium_logo.st b/duniter4j-es-subscription/src/main/resources/templates/cesium_logo.st
new file mode 100644
index 00000000..83cf445c
--- /dev/null
+++ b/duniter4j-es-subscription/src/main/resources/templates/cesium_logo.st
@@ -0,0 +1,6 @@
+cesium_logo(url, data) ::= <<
+$if(data)$<img height="144" width="144" src="data:image/png;base64,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">
+$else$
+<img height="144" width="144" src="$url$/img/logo_128px.png">
+$endif$
+>>
\ No newline at end of file
diff --git a/duniter4j-es-subscription/src/main/resources/templates/html_email_content.st b/duniter4j-es-subscription/src/main/resources/templates/html_email_content.st
index 629515c4..c6fa7ed4 100644
--- a/duniter4j-es-subscription/src/main/resources/templates/html_email_content.st
+++ b/duniter4j-es-subscription/src/main/resources/templates/html_email_content.st
@@ -1,33 +1,76 @@
-html_email_content(issuer, senderPubkey, senderName, events, url) ::= <<
- <div class="row no-padding">
- <div class="col col-20 hidden-xs hidden-sm text-center" id="home">
- <div class="logo"></div>
- </div>
- <div class="col">
- <div class="padding padding-bottom row responsive-sm">
- <div class="col">
- $length(events):{count | $i18n_args("duniter4j.es.subscription.email.header", [issuer, count])$}$
- </div>
- <div class="col">
- <a class="button button-positive pull-right"
- href="$url$">$i18n("duniter4j.es.subscription.email.openCesium")$ >></a>
- </div>
+html_email_content(issuerPubkey, issuerName, senderPubkey, senderName, events, url) ::= <<
+<table cellspacing="0" cellpadding="0" width="100%"
+ style="font-size:12px;font-family:Helvetica Neue,Helvetica,Lucida Grande,tahoma,verdana,arial,sans-serif;border-spacing:0px;border-collapse:collapse;max-width:600px!important;">
+ <tr>
+ <td>
+ <div style="background:#1a237e;width:100%;text-align:center;border-radius:4px;min-height:35px;">
+
+ $cesium_logo(url, true)$
+
+ <p style="margin:0px;padding:8px 0px;text-align:center;color:white;font-size:14px;">
+ $i18n_args("duniter4j.es.subscription.email.html.hello", issuerName)$
+ </p>
</div>
- <div class="list item-border-large">
- <div class="item item-divider stable-bg">
- $i18n("duniter4j.es.subscription.email.notificationsDivider")$
- </div>
- $events:{e|$event_item(e)$}$
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <table cellspacing="0" cellpadding="0" width="100%" >
+ <tr>
+ <td>
+ <p style="margin:0px;padding:16px;font-size: 12px;">
+ $i18n_args("duniter4j.es.subscription.email.html.unreadCount", {$length(events)$} )$
+ $if(issuerPubkey)$
+ <br/>
+ <span style="font-size:12px;color:grey !important;">
+ $i18n_args("duniter4j.es.subscription.email.html.pubkey", [{$[url, "/#/app/wot/", issuerPubkey, "/"]; separator=""$}, {$issuerPubkey; format="pubkey"$}])$
+ </span>
+ $endif$
+ </p>
+
+ </td>
+ <td>
+ <p style="margin:0px;width:100%;text-align:right;min-height: 64px;padding: 16px 0px;">
+ <a style="overflow:hidden!important;background-color:#387ef5;border-color:transparent;border-radius:2px;border-shadow: 2px 2px rgba(50,50,50,0.32);box-sizing: border-box;color:white;display:inline-block;font-size:14px;font-weight: 500;height: 47px;letter-spacing: 0.5px;line-height:42px;margin:0;min-height:47px;min-width:52px;padding-bottom:0px;padding-left:24px;padding-right:24px;padding-top:0px;text-align:center;text-decoration:none;text-transform:uppercase;"
+ href="$url$">$i18n("duniter4j.es.subscription.email.openCesium")$ >></a>
+ </p>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <div style="background-color:#f5f5f5;border: 0;box-sizing: border-box; color: rgba(0, 0, 0, 0.54);font-size: 14px;font-weight: 700;height: 48px;line-height: 48px;min-height: 48px;padding-bottom: 8px;padding-left: 16px;padding-right: 16px;padding-top: 8px;vertical-align: baseline;">
+ $i18n("duniter4j.es.subscription.email.notificationsDivider")$
</div>
- <div class="center padding text-center">
- <i class="ion-es-user-api"></i>
- $i18n_args("duniter4j.es.subscription.email.footer.sendBy", [{$[url, "/#/app/wot/", senderPubkey, "/"]; separator=""$}, senderName])$
- <br/>
- <small>
- $i18n_args("duniter4j.es.subscription.email.footer.disableHelp", {$[url, "/#/app/wallet/subscriptions"]; separator=""$})$
- </small>
+ </td>
+ </tr>
+
+ $events:{e|$html_event_item(e)$}$
+
+ <tr>
+ <td>
+ <div style="width:100%;text-align:center;min-height:32px;padding:8px;">
+
</div>
- </div>
- <div class="col col-20 hidden-xs hidden-sm"> </div>
- </div>
->>
\ No newline at end of file
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <div style="background-color: rgb(236, 240, 247) !important;border-color: rgb(221, 223, 226) !important;width:100%;text-align:center;border-radius:4px;">
+ <p style="margin:0px;padding:8px 0px;text-align:center;color:grey !important;text-decoration:none !important;">
+ $i18n_args("duniter4j.es.subscription.email.html.footer.sendBy", [{$[url, "/#/app/wot/", senderPubkey, "/"]; separator=""$}, senderName])$
+ <br/>
+ <small>
+ $i18n_args("duniter4j.es.subscription.email.html.footer.disableHelp", {$[url, "/#/app/wallet/subscriptions"]; separator=""$})$
+ </small>
+ </p>
+ </div>
+ </td>
+ </tr>
+</table>
+>>
diff --git a/duniter4j-es-subscription/src/main/resources/templates/html_event_item.st b/duniter4j-es-subscription/src/main/resources/templates/html_event_item.st
new file mode 100644
index 00000000..8515d55e
--- /dev/null
+++ b/duniter4j-es-subscription/src/main/resources/templates/html_event_item.st
@@ -0,0 +1,10 @@
+html_event_item(e) ::= <<
+ <tr>
+ <td>
+ <div style="border-bottom: solid 1px #ccc !important;color: rgb(68, 68, 68);display: block;font-size: 14px;font-weight: 400;line-height: 20px;margin-bottom: -1px;margin-left: -1px;margin-right: -1px;margin-top: -1px;padding-bottom: 16px;padding-left: 16px;padding-right: 16px;padding-top: 16px;white-space: normal;">
+ <h3 style="color: rgb(0,0,0);font-family:-apple-system,Helvetica Neue,Helvetica,Roboto,Segoe UI,sans-serif;font-size: 14px;font-synthesis: weight style;font-weight: 500;line-height: 16.8px;margin-bottom: 4px;margin-left: 0px;margin-right: 0px;margin-top: 0px;padding: 0;">$e.description$</h3>
+ <h4 style="color: grey !important;font-size: 12px;font-weight: 500;line-height: 14.4px;margin: 0;padding: 0;">$e.time; format="short"$</h4>
+ </div>
+ </td>
+ </tr>
+>>
\ No newline at end of file
diff --git a/duniter4j-es-subscription/src/main/resources/templates/text_email.st b/duniter4j-es-subscription/src/main/resources/templates/text_email.st
index b982a67a..004367d9 100644
--- a/duniter4j-es-subscription/src/main/resources/templates/text_email.st
+++ b/duniter4j-es-subscription/src/main/resources/templates/text_email.st
@@ -1,13 +1,15 @@
-text_email(issuer, senderPubkey, senderName, events, url) ::= <<
-$length(events):{count | $i18n_args("duniter4j.es.subscription.email.header.text", [issuer, count])$}$
+text_email(issuerPubkey, issuerName, senderPubkey, senderName, events, url) ::= <<
+$i18n_args("duniter4j.es.subscription.email.hello", issuerName)$
+$i18n_args("duniter4j.es.subscription.email.unreadCount", {$length(events)$} )$
$i18n("duniter4j.es.subscription.email.notificationsDivider")$
$events:{e|$text_event_item(e)$}$
$i18n("duniter4j.es.subscription.email.openCesium")$ : $url$
+$if(issuerPubkey)$$i18n_args("duniter4j.es.subscription.email.pubkey", [{$[url, "/#/app/wot/", issuerPubkey, "/"]; separator=""$}, {$issuerPubkey; format="pubkey"$}])$$endif$
-----------------------------------------------
-$i18n_args("duniter4j.es.subscription.email.footer.sendBy.text", [{$[url, "/#/app/wot/", senderPubkey, "/"]; separator=""$}, senderName])$
-$i18n_args("duniter4j.es.subscription.email.footer.disableHelp.text", {$[url, "/#/app/wallet/subscriptions"]; separator=""$})$
+$i18n_args("duniter4j.es.subscription.email.footer.sendBy", [{$[url, "/#/app/wot/", senderPubkey, "/"]; separator=""$}, senderName])$
+$i18n_args("duniter4j.es.subscription.email.footer.disableHelp", {$[url, "/#/app/wallet/subscriptions"]; separator=""$})$
>>
\ No newline at end of file
diff --git a/duniter4j-es-subscription/src/main/resources/templates/text_event_item.st b/duniter4j-es-subscription/src/main/resources/templates/text_event_item.st
index 51cd56fa..701a00ec 100644
--- a/duniter4j-es-subscription/src/main/resources/templates/text_event_item.st
+++ b/duniter4j-es-subscription/src/main/resources/templates/text_event_item.st
@@ -1,3 +1,3 @@
text_event_item(e) ::= <<
- - $e.time; format="short"$ | $e.description$
+ - [$e.time; format="short"$] $e.description$
>>
\ No newline at end of file
diff --git a/duniter4j-es-subscription/src/test/java/org/duniter/elasticsearch/subscription/service/SubscriptionServiceTest.java b/duniter4j-es-subscription/src/test/java/org/duniter/elasticsearch/subscription/service/SubscriptionServiceTest.java
index 81b5babe..c8f9bf4a 100644
--- a/duniter4j-es-subscription/src/test/java/org/duniter/elasticsearch/subscription/service/SubscriptionServiceTest.java
+++ b/duniter4j-es-subscription/src/test/java/org/duniter/elasticsearch/subscription/service/SubscriptionServiceTest.java
@@ -102,7 +102,7 @@ public class SubscriptionServiceTest {
// wait 10s
Thread.sleep(10000);
- service.executeEmailSubscriptions();
+ service.executeEmailSubscriptions(EmailSubscription.Frequency.daily);
// wait 10s
Thread.sleep(10000);
diff --git a/duniter4j-es-subscription/src/test/java/org/duniter/elasticsearch/subscription/service/SubscriptionTemplateTest.java b/duniter4j-es-subscription/src/test/java/org/duniter/elasticsearch/subscription/service/SubscriptionTemplateTest.java
index c526a6a2..71f43f9e 100644
--- a/duniter4j-es-subscription/src/test/java/org/duniter/elasticsearch/subscription/service/SubscriptionTemplateTest.java
+++ b/duniter4j-es-subscription/src/test/java/org/duniter/elasticsearch/subscription/service/SubscriptionTemplateTest.java
@@ -24,20 +24,17 @@ package org.duniter.elasticsearch.subscription.service;
import org.duniter.core.client.model.ModelUtils;
import org.duniter.core.exception.TechnicalException;
-import org.duniter.core.test.TestResource;
import org.duniter.elasticsearch.subscription.util.stringtemplate.DateRenderer;
-import org.duniter.elasticsearch.subscription.util.stringtemplate.I18nRenderer;
+import org.duniter.elasticsearch.subscription.util.stringtemplate.StringRenderer;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.stringtemplate.v4.ST;
import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.STGroupDir;
-import org.stringtemplate.v4.StringRenderer;
-import java.io.File;
-import java.io.FileWriter;
import java.util.Date;
+import java.util.Locale;
import static org.junit.Assert.assertNotNull;
@@ -47,10 +44,7 @@ import static org.junit.Assert.assertNotNull;
public class SubscriptionTemplateTest {
private static final Logger log = LoggerFactory.getLogger(SubscriptionTemplateTest.class);
- private static final boolean verbose = true;
-
- //@ClassRule
- public static final TestResource resource = TestResource.create();
+ private static final boolean verbose = false;
@Test
public void testHtmlEmail() throws Exception{
@@ -60,36 +54,22 @@ public class SubscriptionTemplateTest {
group.registerRenderer(Date.class, new DateRenderer());
group.registerRenderer(String.class, new StringRenderer());
- group.registerRenderer(String.class, new I18nRenderer());
-
- ST contentEmail = group.getInstanceOf("html_email_content");
- contentEmail.add("issuer", "MyIssuerName");
- contentEmail.add("url", "https://g1.duniter.fr");
- contentEmail.add("senderPubkey", "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU");
- contentEmail.add("senderName", ModelUtils.minifyPubkey("G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU"));
- contentEmail.addAggr("events.{description, time}", new Object[]{"My event description", new Date()});
- assertNotNull(contentEmail);
- ST css_logo = group.getInstanceOf("css_logo");
- assertNotNull(css_logo);
+ ST tpl = group.getInstanceOf("html_email_content");
+ tpl.add("issuerName", "MyIssuerName");
+ tpl.add("issuerPubkey", "5ocqzyDMMWf1V8bsoNhWb1iNwax1e9M7VTUN6navs8of");
+ tpl.add("url", "https://g1.duniter.fr");
+ tpl.add("senderPubkey", "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU");
+ tpl.add("senderName", ModelUtils.minifyPubkey("G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU"));
+ tpl.addAggr("events.{description, time}", new Object[]{"My event description", new Date()});
+ tpl.addAggr("events.{description, time}", new Object[]{"My event description 2", new Date()});
+ assertNotNull(tpl);
- ST htmlTpl = group.getInstanceOf("html");
- assertNotNull(htmlTpl);
- htmlTpl.add("content", contentEmail.render());
- htmlTpl.add("useCss", "true");
- String html = htmlTpl.render();
+ String email = tpl.render(new Locale("en", "GB"));
if (verbose) {
- System.out.println(html);
+ System.out.println(email);
}
-
- //FileWriter fw = new FileWriter(new File(resource.getResourceDirectory("out"), "page.html"));
- FileWriter fw = new FileWriter(new File("/home/blavenie/git/duniter4j/duniter4j-es-subscription/src/test/resources/test2.html"));
- fw.write(html);
- fw.flush();
- fw.close();
-
-
}
catch (Exception e) {
throw new TechnicalException(e);
@@ -104,17 +84,17 @@ public class SubscriptionTemplateTest {
group.registerRenderer(Date.class, new DateRenderer());
group.registerRenderer(String.class, new StringRenderer());
- group.registerRenderer(String.class, new I18nRenderer());
ST tpl = group.getInstanceOf("text_email");
- tpl.add("issuer", "MyIssuerName");
+ tpl.add("issuerPubkey", "5ocqzyDMMWf1V8bsoNhWb1iNwax1e9M7VTUN6navs8of");
+ tpl.add("issuerName", "kimamila");
tpl.add("url", "https://g1.duniter.fr");
tpl.add("senderPubkey", "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU");
tpl.add("senderName", ModelUtils.minifyPubkey("G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU"));
tpl.addAggr("events.{description, time}", new Object[]{"My event description", new Date()});
assertNotNull(tpl);
- String text = tpl.render();
+ String text = tpl.render(new Locale("en", "GB"));
if (verbose) {
System.out.println(text);
diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
index 656790b3..0860736c 100644
--- a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
+++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
@@ -59,6 +59,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.sort.SortOrder;
import java.io.IOException;
import java.util.*;
@@ -240,6 +241,7 @@ public class UserEventService extends AbstractService implements ChangeService.C
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.setFetchSource(true)
.setQuery(query)
+ .addSort(UserEvent.PROPERTY_TIME, SortOrder.DESC)
.get();
--
GitLab