working on list management
This commit is contained in:
@@ -40,7 +40,12 @@ public class Database {
|
||||
return this;
|
||||
}
|
||||
|
||||
public Request where(String key, Object value) {
|
||||
public Request where(String key, Collection<? extends Object> values) {
|
||||
for (var val : values) where(key,val);
|
||||
return this;
|
||||
}
|
||||
|
||||
private Request where(String key, Object value) {
|
||||
var list = where.get(key);
|
||||
if (list == null) where.put(key,list = new ArrayList<>());
|
||||
list.add(value);
|
||||
|
||||
@@ -1,12 +1,20 @@
|
||||
package de.srsoftware.widerhall.data;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static de.srsoftware.widerhall.Constants.INT;
|
||||
import static de.srsoftware.widerhall.Constants.VARCHAR;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static de.srsoftware.widerhall.Constants.*;
|
||||
import static de.srsoftware.widerhall.Constants.STATE;
|
||||
|
||||
public class ListMember {
|
||||
private static final Logger LOG = LoggerFactory.getLogger(ListMember.class);
|
||||
public static final String TABLE_NAME = "ListMembers";
|
||||
public static final int STATE_OWNER = 1;
|
||||
private static final String LIST_EMAIL = "list_email";
|
||||
private static final String USER_EMAIL = "user_email";
|
||||
private static final String STATE = "state";
|
||||
@@ -20,6 +28,10 @@ public class ListMember {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public static ListMember create(String listEmail, String userEmail, int state) throws SQLException {
|
||||
return new ListMember(listEmail,userEmail,state).save();
|
||||
}
|
||||
|
||||
public static void createTable() throws SQLException {
|
||||
var sql = new StringBuilder()
|
||||
.append("CREATE TABLE ").append(TABLE_NAME)
|
||||
@@ -30,4 +42,28 @@ public class ListMember {
|
||||
.append("PRIMARY KEY (").append(LIST_EMAIL).append(", ").append(USER_EMAIL).append("));");
|
||||
Database.open().query(sql.toString()).run();
|
||||
}
|
||||
|
||||
public static List<String> listsOf(User user) {
|
||||
var list = new ArrayList<String>();
|
||||
try {
|
||||
var rs = Database.open()
|
||||
.query("SELECT "+LIST_EMAIL+" FROM " + TABLE_NAME)
|
||||
.where(USER_EMAIL,user.email())
|
||||
.where(STATE,STATE_OWNER)
|
||||
.exec();
|
||||
while (rs.next()) list.add(rs.getString(LIST_EMAIL));
|
||||
} catch (SQLException e) {
|
||||
LOG.warn("Listing memberships lists failed: ",e);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
private ListMember save() throws SQLException {
|
||||
Database.open().insertInto(TABLE_NAME)
|
||||
.values(Map.of(LIST_EMAIL,listEmail,
|
||||
USER_EMAIL,userEmail,
|
||||
STATE,state))
|
||||
.run();
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,9 +65,16 @@ public class MailingList {
|
||||
}
|
||||
|
||||
public static List<MailingList> listsOf(User user) {
|
||||
|
||||
List<String> keys = (user.is(ADMIN)) ? null : ListMember.listsOf(user);
|
||||
var list = new ArrayList<MailingList>();
|
||||
try {
|
||||
var rs = Database.open().query("SELECT * FROM "+TABLE_NAME).exec();
|
||||
Database.Request q = Database.open().query("SELECT * FROM " + TABLE_NAME);
|
||||
if (keys != null){
|
||||
if (keys.isEmpty()) return list;
|
||||
q.where(EMAIL,keys);
|
||||
}
|
||||
var rs = q.exec();
|
||||
while (rs.next()){
|
||||
var email = rs.getString(EMAIL);
|
||||
var name = rs.getString(NAME);
|
||||
|
||||
Reference in New Issue
Block a user