Improve searching by member number in new message form.

Author: HalfVoxel

admin/src/Components/MessageForm.tsx

@@ -66,16 +66,6 @@ const MessageForm = ({
         (MemberOption | GroupOption)[]
     >([]);
     const [bodyLength, setBodyLength] = useState(message.body.length);
-    const memberCache = React.useRef(new Map<number, Member>()).current;
-
-    const getMember = async (id: number): Promise<Member> => {
-        if (memberCache.has(id)) {
-            return memberCache.get(id)!;
-        }
-        const { data } = await get({ url: `/membership/member/${id}` });
-        memberCache.set(id, data);
-        return data;
-    };
 
     useEffect(() => {
         const unsubscribe = message.subscribe(() => {
@@ -97,14 +87,22 @@ const MessageForm = ({
             options: (MemberOption | GroupOption | CombinedOption)[],
         ) => void,
     ) => {
-        const intListMatch = inputValue.match(/^(\d+[\s,]*)+$/);
+        const intListMatch = inputValue.match(/^\s*(\d+[\s,]*)+\s*$/);
         if (intListMatch) {
             const ids = inputValue
                 .split(/[\s,]+/)
                 .map((v) => parseInt(v, 10))
                 .filter((v) => !isNaN(v));
             if (ids.length > 0) {
-                Promise.all(ids.map(getMember)).then((members) => {
+                get({
+                    url: "/membership/member",
+                    params: {
+                        search: ids.join(" "),
+                        search_column: "member_number",
+                        sort_by: "member_number",
+                        sort_order: "asc",
+                    },
+                }).then(({ data: members }: { data: Member[] }) => {
                     const options = members.map(memberOption);
                     callback([
                         {

api/src/service/entity.py

@@ -217,6 +217,7 @@ def list(
         relation=None,
         related_entity_id=None,
         include_deleted=Arg(boolean, required=False),
+        search_column=Arg(str, required=False),
     ):
         query = db_session.query(self.model)
 
@@ -229,9 +230,14 @@ def list(
         if relation and related_entity_id:
             query = relation.filter(query, related_entity_id)
 
+        if search_column is not None and search_column not in self.search_columns:
+            raise UnprocessableEntity(f"Search column '{search_column}' not allowed. Allowed values are {self.search_columns}", fields="search_column", what=BAD_VALUE)
+
+        search_columns = self.search_columns if search_column is None else [search_column]
+
         if search:
             for term in search.split():
-                expression = or_(*[self.columns[column_name].like(f"%{term}%") for column_name in self.search_columns])
+                expression = or_(*[self.columns[column_name].like(f"%{term}%") for column_name in search_columns])
                 query = query.filter(expression)
 
         if expand: