StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

grouping mail archive by year-month

Browse Source
This commit is contained in:
Stephan Richter
2022-04-24 11:08:04 +02:00
parent ff7497f261
commit fbf3591839
8 changed files with 77 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/srsoftware/widerhall/web/Rest.java
View File

@@ -14,7 +14,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Member;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
@@ -62,17 +61,22 @@ public class Rest extends HttpServlet {
return Map.of(SUCCESS,"Updated user permissions");
}
private List<? extends Object> archive(HttpServletRequest req) {
private Map<String, Object> archive(HttpServletRequest req) {
var list = Util.getMailingList(req);
if (list != null){
try {
return Post.find(list).stream().map(Post::safeMap).toList();
var month = req.getParameter(MONTH);
if (month == null || month.isBlank()) {
return Map.of(LIST,list.email(),"summary",Post.summarize(list));
} else {
return Map.of(LIST,list.email(),"posts",Post.find(list,month).stream().map(Post::safeMap).toList());
}
} catch (SQLException e) {
e.printStackTrace();
}
}
LOG.debug("list: {}",list.email());
return List.of();
return Map.of();
}
@Override

7
src/main/java/de/srsoftware/widerhall/web/Web.java
View File

@@ -134,8 +134,13 @@ public class Web extends TemplateServlet {
}
private String archive(HttpServletRequest req, HttpServletResponse resp) {
var map = new HashMap<String,Object>();
var list = Util.getMailingList(req);
return loadTemplate(ARCHIVE,Map.of(LIST,list.email()),resp);
map.put(LIST,list.email());
var month = req.getParameter(MONTH);
if (month != null && !month.isBlank())map.put(MONTH,month);
return loadTemplate(ARCHIVE,map,resp);
}
private String confirm(HttpServletRequest req, HttpServletResponse resp) {