Implement regex search for use when searching for member numbers.

Author: HalfVoxel

admin/src/Components/MessageForm.tsx

@@ -87,7 +87,7 @@ const MessageForm = ({
             options: (MemberOption | GroupOption | CombinedOption)[],
         ) => void,
     ) => {
-        const intListMatch = inputValue.match(/^\s*(\d+[\s,]*)+\s*$/);
+        const intListMatch = inputValue.match(/^\s*(\d\d\d\d+[\s,]*)+\s*$/);
         if (intListMatch) {
             const ids = inputValue
                 .split(/[\s,]+/)
@@ -97,21 +97,27 @@ const MessageForm = ({
                 get({
                     url: "/membership/member",
                     params: {
-                        search: ids.join(" "),
+                        search: ids.join("|"),
                         search_column: "member_number",
                         sort_by: "member_number",
                         sort_order: "asc",
+                        regex: true,
                     },
                 }).then(({ data: members }: { data: Member[] }) => {
+                    members = members.filter(m => !recipients.some(r => r.id === m.member_id));
                     const options = members.map(memberOption);
-                    callback([
-                        {
-                            type: "combined",
-                            label: `${options.map((o) => o.label).join(", ")}`,
-                            value: "combined-" + ids.join("-"),
-                            inner: options,
-                        },
-                    ]);
+                    if (options.length > 0) {
+                        callback([
+                            {
+                                type: "combined",
+                                label: `${options.map((o) => o.label).join(", ")}`,
+                                value: "combined-" + ids.join("-"),
+                                inner: options,
+                            },
+                        ]);
+                    } else {
+                        callback([]);
+                    }
                 });
                 return;
             }

api/src/service/entity.py

@@ -218,6 +218,7 @@ def list(
         related_entity_id=None,
         include_deleted=Arg(boolean, required=False),
         search_column=Arg(str, required=False),
+        regex=Arg(boolean, required=False),
     ):
         query = db_session.query(self.model)
 
@@ -241,7 +242,11 @@ def list(
 
         if search:
             for term in search.split():
-                expression = or_(*[self.columns[column_name].like(f"%{term}%") for column_name in search_columns])
+                if regex:
+                    expression = or_(*[self.columns[column_name].regexp_match(term) for column_name in search_columns])
+                else:
+                    expression = or_(*[self.columns[column_name].like(f"%{term}%") for column_name in search_columns])
+
                 query = query.filter(expression)
 
         if expand: