refactoring code

src/main/java/de/srsoftware/widerhall/data/ListMember.java

@@ -11,6 +11,7 @@ import java.sql.SQLException;
 import java.util.*;
 
 import static de.srsoftware.widerhall.Constants.*;
+import static de.srsoftware.widerhall.Constants.STATE;
 
 /**
  * @author Stephan Richter
@@ -26,19 +27,21 @@ public class ListMember {
     private static final String USER_EMAIL = "user_email";
     private static final String STATE = "state";
 
-    private final String listEmail,token,userEmail;
+    private MailingList list;
+    private User user;
+    private final String token;
     private final int state;
 
     /**
      * create a new list member object
-     * @param listEmail
-     * @param userEmail
+     * @param list
+     * @param user
      * @param state
      * @param token
      */
-    public ListMember(String listEmail, String userEmail, int state, String token){
-        this.listEmail = listEmail;
-        this.userEmail = userEmail;
+    public ListMember(MailingList list, User user, int state, String token){
+        this.list = list;
+        this.user = user;
         this.state = state;
         this.token = token;
     }
@@ -59,19 +62,18 @@ public class ListMember {
         if (rs.next()){
             var lm = ListMember.from(rs);
             rs.close();
-            User user = User.loadAll(List.of(lm.userEmail)).stream().findAny().orElse(null);
-            if (user != null){
+            if (lm.user != null){
                 int newState = lm.state ^ STATE_AWAITING_CONFIRMATION | STATE_SUBSCRIBER;
                 Database.open()
                         .update(TABLE_NAME)
                         .set(TOKEN,null)
                         .set(STATE, newState) //drop confirmation state, set subscriber state
-                        .where(LIST_EMAIL,lm.listEmail)
-                        .where(USER_EMAIL,lm.userEmail)
+                        .where(LIST_EMAIL,lm.list.email())
+                        .where(USER_EMAIL,lm.user.email())
                         .compile()
                         .run();
             }
-            return user;
+            return lm.user;
         }
         return null;
     }
@@ -91,7 +93,7 @@ public class ListMember {
         if ((state & STATE_AWAITING_CONFIRMATION) > 0){
             token = Util.sha256(String.join("/",list.email(),user.email(),user.salt()));
         }
-        return new ListMember(list.email(),user.email(),state,token).save();
+        return new ListMember(list,user,state,token).save();
     }
 
     /**
@@ -118,8 +120,8 @@ public class ListMember {
      */
     public static ListMember from(ResultSet rs) throws SQLException {
         return new ListMember(
-                rs.getString(LIST_EMAIL),
-                rs.getString(USER_EMAIL),
+                MailingList.load(rs.getString(LIST_EMAIL)),
+                User.load(rs.getString(USER_EMAIL)),
                 rs.getInt(STATE),
                 rs.getString(TOKEN));
     }
@@ -175,28 +177,24 @@ public class ListMember {
         return null;
     }
 
-    /**
-     * return a map of User → State for a given MailingList
-     * @param listEmail
-     * @return
-     * @throws SQLException
-     */
-    public static Map<User,Integer> of(String listEmail) throws SQLException {
-        // Step 1: create mal USER_EMAIL → STATE for MailingList
-        var rs = Database.open()
-                .select(TABLE_NAME)
-                .where(LIST_EMAIL,listEmail)
-                .compile()
-                .exec();
-        var temp = new HashMap<String,Integer>();
-        while (rs.next()) temp.put(rs.getString(USER_EMAIL),rs.getInt(STATE));
-        rs.close();
-        // Step 2: map user emails to users
-        var result = new HashMap<User,Integer>();
-        User.loadAll(temp.keySet())
-                .stream()
-                .forEach(user -> result.put(user,temp.get(user.email())));
-        return result;
+
+    public static Set<ListMember> of(MailingList list) throws SQLException {
+        var rs = Database.open().select(TABLE_NAME).where(LIST_EMAIL,list.email()).compile().exec();
+        var set = new HashSet<ListMember>();
+        try {
+            while (rs.next()) set.add(ListMember.from(rs));
+        } finally {
+            rs.close();
+        }
+        return set;
+    }
+
+    public Map<String,Object> safeMap(){
+        return Map.of(
+                EMAIL,user.email(),
+                NAME,user.name(),
+                STATE,ListMember.stateText(state)
+        );
     }
 
     /**
@@ -207,8 +205,8 @@ public class ListMember {
     private ListMember save() throws SQLException {
         var req = Database.open()
                 .insertInto(TABLE_NAME)
-                .set(LIST_EMAIL,listEmail)
-                .set(USER_EMAIL,userEmail)
+                .set(LIST_EMAIL,list.email())
+                .set(USER_EMAIL,user.email())
                 .set(STATE,state);
         if (token != null) req.set(TOKEN,token);
         req.compile().run();
@@ -255,4 +253,8 @@ public class ListMember {
             req.where(LIST_EMAIL,list.email()).where(USER_EMAIL,user.email()).compile().run();
         }
     }
+
+    public User user(){
+        return user;
+    }
 }