Backup commit

app/checks/__init__.py

@@ -5,7 +5,8 @@
 
 import app.auth as auth
 import app.species.cache as cache
-import app.checks.srefs as srefs
+from .srefs import srefs
+from .vague_dates import VagueDate
 
 
 router = APIRouter()
@@ -69,6 +70,15 @@ async def check_by_tvk(
             results.append(Checked(**result_data))
             continue
 
+        # 3. Confirm date is valid.
+        vague_date = VagueDate(record.date)
+        if not vague_date.validate():
+            result_data['ok'] = False
+            result_data['message'] = 'Invalid date.'
+            results.append(Checked(**result_data))
+            continue
+
+        # 4. Check the record against the rules.
         results.append(Checked(**result_data))
 
     return results

app/checks/srefs/ci_grid.py

@@ -1,10 +1,36 @@
+import re
+
+
 class CiGrid:
 
+    srid = 23030
+
     def __init__(self, sref: str):
         self.sref = sref
 
     def validate(self) -> bool:
-        if len(self.sref) == 8:
-            return True
-        else:
+
+        # Ignore any spaces in the grid ref.
+        self.sref = self.sref.replace(' ', '')
+
+        # Check the first two letters are a valid combination.
+        # Column is in range S-Z
+        # Rows in the range U-V and A-G
+        sq100 = self.sref[:2].upper()
+        if not re.match(r'[S-Z]([U-V]|[A-G])', sq100):
+            return False
+
+        # Check either remaining chars are all numeric and an equal
+        # number, up to 10 digits OR for DINTY Tetrads, 2 numbers followed by a
+        # letter (Excluding O, including I).
+        eastnorth = self.sref[2:]
+        if ((
+            not re.match(r'^[0-9]*$', eastnorth) or
+            len(eastnorth) % 2 != 0 or
+            len(eastnorth) > 10
+        ) and (
+            not re.match(r'^[0-9][0-9][A-NP-Z]$', eastnorth)
+        )):
             return False
+
+        return True

app/checks/srefs/gb_grid.py

@@ -28,8 +28,8 @@ def validate(self) -> bool:
             len(eastnorth) % 2 != 0 or
             len(eastnorth) > 10
         ) and (
-            not re.match(r'^[0-9][0-9][A-NP-Z]$', eastnorth))
-        ):
+            not re.match(r'^[0-9][0-9][A-NP-Z]$', eastnorth)
+        )):
             return False
 
         return True

app/checks/srefs/ni_grid.py

@@ -1,10 +1,34 @@
+import re
+
+
 class NiGrid:
 
+    srid = 29901
+
     def __init__(self, sref: str):
         self.sref = sref
 
     def validate(self) -> bool:
-        if len(self.sref) == 8:
-            return True
-        else:
+
+        # Ignore any spaces in the grid ref.
+        self.sref = self.sref.replace(' ', '')
+
+        # Check the first letter is valid.
+        sq100 = self.sref[0].upper()
+        if not re.match(r'[A-HJ-Z]', sq100):
+            return False
+
+        # Check either remaining chars are all numeric and an equal
+        # number, up to 10 digits OR for DINTY Tetrads, 2 numbers followed by a
+        # letter (Excluding O, including I).
+        eastnorth = self.sref[1:]
+        if ((
+            not re.match(r'^[0-9]*$', eastnorth) or
+            len(eastnorth) % 2 != 0 or
+            len(eastnorth) > 10
+        ) and (
+            not re.match(r'^[0-9][0-9][A-NP-Z]$', eastnorth)
+        )):
             return False
+
+        return True