memberjojo 1.1__py3-none-any.whl → 1.2__py3-none-any.whl

memberjojo/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.1'
-__version_tuple__ = version_tuple = (1, 1)
+__version__ = version = '1.2'
+__version_tuple__ = version_tuple = (1, 2)
+
+__commit_id__ = commit_id = None

memberjojo/mojo_member.py

@@ -124,7 +124,9 @@ class Member(MojoSkel):
 
     def get_number(self, full_name: str, found_error: bool = False) -> Optional[int]:
         """
-        Find a member number by full name (tries first and last, and then middle last if 3 words).
+        Find a member number by passed full_name.
+        Tries first and last, and then middle last if 3 words,
+        Then initial of first name if initials passed.
 
         :param full_name: Full name of the member.
         :param found_error: (optional) Raise ValueError if not found.
@@ -133,37 +135,140 @@ class Member(MojoSkel):
 
         :raises ValueError: If not found and `found_error` is True.
         """
-        member_num = None
-        try_names = []
+        result = self.get_mojo_name(full_name, found_error)
+        if result:
+            return self.get_number_first_last(result[0], result[1])
+        return None
+
+    def _lookup_exact(self, first_name: str, last_name: str) -> Optional[tuple]:
+        """
+        Lookup first_name and last_name in the member database, return found name or none
+
+        :param first_name: First name to lookup
+        :param last_name: Last name to lookup
+
+        :return: Name on membermojo or None
+        """
+        sql = f"""
+                SELECT first_name, last_name
+                FROM "{self.table_name}"
+                WHERE LOWER(first_name) = LOWER(?)
+                    AND LOWER(last_name)  = LOWER(?)
+        """
+        self.cursor.execute(sql, (first_name, last_name))
+        row = self.cursor.fetchone()
+        return (row["first_name"], row["last_name"]) if row else None
+
+    def _lookup_initial(self, letter: str, last_name: str) -> Optional[tuple]:
+        """
+        Lookup Initial and last_name in the member database, return found name or none
+
+        :param letter: initial to search for
+        :param last_name: last name to search for
+
+        :return: Name on membermojo or None
+        """
+        sql = f"""
+                SELECT first_name, last_name
+                FROM "{self.table_name}"
+                WHERE LOWER(first_name) LIKE LOWER(?) || '%'
+                    AND LOWER(last_name) = LOWER(?)
+                LIMIT 1
+        """
+        self.cursor.execute(sql, (letter, last_name))
+        row = self.cursor.fetchone()
+        return (row["first_name"], row["last_name"]) if row else None
+
+    def get_mojo_name(
+        self, full_name: str, found_error: bool = False
+    ) -> Optional[tuple]:
+        """
+        Resolve a member name from a free-text full name.
+        Search order:
+            1. first + last
+            2. middle + last (if three parts)
+            3. initial 1st letter + last
+            4. initial 2nd letter + last (for two-letter initials)
+        Returns (first_name, last_name) or None.
+
+        :param full_name: Full name of the member to find.
+        :param found_error: (optional) Raise ValueError if not found.
+
+        :return: Membermojo name if found, else None.
+
+        :raises ValueError: If not found and `found_error` is True.
+        """
+
         parts = full_name.strip().split()
-        # Try first + last
-        if len(parts) >= 2:
-            first_name = parts[0]
-            last_name = parts[-1]
-            try_names.append(f"<{first_name} {last_name}>")
-            member_num = self.get_number_first_last(first_name, last_name)
-
-        # Try middle + last if 3 parts and first+last failed
-        if not member_num and len(parts) == 3:
-            first_name = parts[1]
-            last_name = parts[2]
-            try_names.append(f"<{first_name} {last_name}>")
-            member_num = self.get_number_first_last(first_name, last_name)
-
-        if not member_num and found_error:
-            tried = ", ".join(try_names) if try_names else "No valid names to find"
+        tried = []
+
+        # If only one one word passed, fail early
+        if len(parts) < 2:
+            if found_error:
+                raise ValueError(f"❌ Cannot extract name from: {full_name}")
+            return None
+
+        # ----------------------------
+        # 1. Try direct first + last
+        # ----------------------------
+        tried.append(f"{parts[0]} {parts[-1]}")
+
+        result = self._lookup_exact(parts[0], parts[-1])
+        if result:
+            return result
+
+        # ----------------------------
+        # 2. Try middle + last and build initials if no match
+        # ----------------------------
+        if len(parts) == 3:
+            tried.append(f"{parts[1]} {parts[2]}")
+
+            result = self._lookup_exact(parts[1], parts[2])
+            if result:
+                return result
+
+            # First letter of first + first letter of middle
+            initials = parts[0][0].upper() + parts[1][0].upper()
+        else:
+            # Only first letter of first name
+            initials = parts[0][0].upper()
+
+        # ------------------------------------------------
+        # Initial fallback lookups
+        # ------------------------------------------------
+
+        # 3. Try first initial + last name
+        first_initial = initials[0]
+        tried.append(f"{first_initial} {parts[-1]}")
+        result = self._lookup_initial(first_initial, parts[-1])
+        if result:
+            return result
+
+        # 4. Try second initial + last name (e.g., for JA or AM)
+        if len(initials) > 1:
+            second_initial = initials[1]
+            tried.append(f"{second_initial} {parts[-1]}")
+            result = self._lookup_initial(second_initial, parts[-1])
+            if result:
+                return result
+
+        # ----------------------------
+        # 5. No match
+        # ----------------------------
+        if found_error:
             raise ValueError(
                 f"❌ Cannot find {full_name} in member database. Tried: {tried}"
             )
-        return member_num
 
-    def get_name(self, member_number: int) -> Optional[str]:
+        return None
+
+    def get_first_last_name(self, member_number: int) -> Optional[str]:
         """
         Get full name for a given member number.
 
         :param member_number: Member number to look up.
 
-        :return: Full name as "First Last", or None if not found.
+        :return: Full name as tuple, or None if not found.
         """
         sql = f"""
             SELECT first_name, last_name
@@ -173,6 +278,19 @@ class Member(MojoSkel):
         self.cursor.execute(sql, (member_number,))
         result = self.cursor.fetchone()
 
+        return result if result else None
+
+    def get_name(self, member_number: int) -> Optional[str]:
+        """
+        Get full name for a given member number.
+
+        :param member_number: Member number to look up.
+
+        :return: Full name as "First Last", or None if not found.
+        """
+
+        result = self.get_first_last_name(member_number)
+
         if result:
             first_name, last_name = result
             return f"{first_name} {last_name}"

memberjojo/mojo_transaction.py

@@ -9,6 +9,7 @@ from collections import Counter, defaultdict
 from csv import DictReader
 from pathlib import Path
 from sqlite3 import IntegrityError, OperationalError, DatabaseError
+from decimal import Decimal
 
 from .config import CSV_ENCODING  # import encoding from config.py
 from .mojo_common import MojoSkel
@@ -230,7 +231,11 @@ class Transaction(MojoSkel):
                 conditions.append(f'"{col}" IS NULL')
             else:
                 conditions.append(f'"{col}" = ?')
-                values.append(val)
+                values.append(
+                    float(val.quantize(Decimal("0.01")))
+                    if isinstance(val, Decimal)
+                    else val
+                )
 
         query = f'SELECT * FROM "{self.table_name}" WHERE {" AND ".join(conditions)} LIMIT 1'
         self.cursor.execute(query, values)

{memberjojo-1.1.dist-info → memberjojo-1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memberjojo
-Version: 1.1
+Version: 1.2
 Summary: memberjojo - tools for working with members.
 Author-email: Duncan Bellamy <dunk@denkimushi.com>
 Requires-Python: >=3.8

memberjojo-1.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+memberjojo/__init__.py,sha256=KfW3YTaJkEfdjr1Yf9Lf1jBrBErvCbZ7p-1Y6qzEIOY,303
+memberjojo/_version.py,sha256=HQKKxCSMqVTOOMMdZI6WQjmRkHgmuUGY2FWf9ey1h9Y,699
+memberjojo/config.py,sha256=_R3uWh5bfMCfZatXLm49pDXet-tipoPbUO7FUeMu2OI,73
+memberjojo/mojo_common.py,sha256=hSMNggC1BOTLOeRQlv4LOC7gqfM0GMRdoHHT5PnuakA,1597
+memberjojo/mojo_member.py,sha256=mlv847JW0KaeKJ1MtA_x2TlgUr2q6Pie_LiCyZYRniM,11929
+memberjojo/mojo_transaction.py,sha256=772QU3O2xQAzgddRRBqf4UTjXwxKoSZTbHndvMSHcMM,8379
+memberjojo-1.2.dist-info/licenses/LICENSE,sha256=eaTLEca5OoRQ9r8GlC6Rwa1BormM3q-ppDWLFFxhQxI,1071
+memberjojo-1.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+memberjojo-1.2.dist-info/METADATA,sha256=1__DegGgyFuh4CXIrBEdShdhTLOsZ_Ls-N8AEXI_xoo,3177
+memberjojo-1.2.dist-info/RECORD,,

memberjojo-1.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-memberjojo/__init__.py,sha256=KfW3YTaJkEfdjr1Yf9Lf1jBrBErvCbZ7p-1Y6qzEIOY,303
-memberjojo/_version.py,sha256=AAsnOeBTLGhtISZFJd737cAtw6_DnK8inDZsYGvd-x0,506
-memberjojo/config.py,sha256=_R3uWh5bfMCfZatXLm49pDXet-tipoPbUO7FUeMu2OI,73
-memberjojo/mojo_common.py,sha256=hSMNggC1BOTLOeRQlv4LOC7gqfM0GMRdoHHT5PnuakA,1597
-memberjojo/mojo_member.py,sha256=IuZMvERjmrBoz_rQIr9SBIDEC0PqEPiJX2SvA69paSU,8018
-memberjojo/mojo_transaction.py,sha256=rtyRfRPexFlnC9LFdAQe0yy56AaXeunyF6tSobG-Ipo,8203
-memberjojo-1.1.dist-info/licenses/LICENSE,sha256=eaTLEca5OoRQ9r8GlC6Rwa1BormM3q-ppDWLFFxhQxI,1071
-memberjojo-1.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-memberjojo-1.1.dist-info/METADATA,sha256=2FrAn6BI1yO3pYJYdAWCdNGJGudsmpAK8yJX20XMC8c,3177
-memberjojo-1.1.dist-info/RECORD,,