Abl UUID lower (#650)

TylerZeroMaster · web-flow · commit b472835462d1 · 2025-07-21T09:47:32.000-05:00
* Ensure uuid is lowercase

* Update base image version for dev frontend image

* Ensure uuids from rex release are lowercase

* Account for database book uuid letter casing

Also add similar safety to commit sha, just in case

* Ensure uuid and commit_sha are lowercase in api response

* Add some additional validation for uuids
diff --git a/backend/app/app/data_models/models.py b/backend/app/app/data_models/models.py
@@ -86,8 +86,8 @@ class ApprovedBook(RequestApproveBook):
     class Config:
         class Getter(GetterDict):
             getters = {
-                "uuid": lambda self: self._obj.book.uuid,
-                "commit_sha": lambda self: self._obj.book.commit.sha,
+                "uuid": lambda self: self._obj.book.uuid.lower(),
+                "commit_sha": lambda self: self._obj.book.commit.sha.lower(),
                 "code_version": lambda self: self._obj.code_version.version,
                 "consumer": lambda self: self._obj.consumer.name,
                 "created_at": lambda self: self._obj.created_at,
diff --git a/backend/app/app/service/abl.py b/backend/app/app/service/abl.py
@@ -2,7 +2,7 @@
 from typing import Any, Dict, List, Optional
 
 from httpx import AsyncClient, HTTPStatusError
-from sqlalchemy import and_, delete, or_, select
+from sqlalchemy import and_, delete, func, or_, select
 from sqlalchemy.orm import Session, lazyload
 
 from app.core import config
@@ -36,7 +36,7 @@ async def get_rex_release_json(client: AsyncClient):
 
 async def get_rex_books(client: AsyncClient):
     release_json = await get_rex_release_json(client)
-    return release_json["books"]
+    return {uuid.lower(): v for uuid, v in release_json["books"].items()}
 
 
 async def get_rex_release_version(client: AuthenticatedClient):
@@ -65,7 +65,7 @@ def get_rex_book_versions(rex_books: Dict[str, Any], book_uuids: List[str]):
             version is not None
         ), f"Could not get defaultVersion for {book_uuid}"
         rex_book_versions.append(
-            BaseApprovedBook(commit_sha=version, uuid=book_uuid)
+            BaseApprovedBook(commit_sha=version.lower(), uuid=book_uuid)
         )
     return rex_book_versions
 
@@ -84,18 +84,20 @@ def remove_old_versions(
         .options(lazyload("*"))
         .join(Book)
         .join(Commit)
-        .where(Book.uuid.in_([b.uuid for b in to_add]))
+        .where(func.lower(Book.uuid).in_([b.uuid for b in to_add]))
         .where(ApprovedBook.consumer_id == consumer_id)
     )
     have = db.scalars(query).all()
     to_delete = []
     for record in have:
-        ident = (record.book.uuid, record.book.commit.sha[:7])
+        record_uuid = record.book.uuid.lower()
+        record_sha = record.book.commit.sha[:7].lower()
+        ident = (record_uuid, record_sha)
         # Delete entries that exist in both to_add and to_keep
         # Do not delete existing entries that share a uuid with an intersection
         if ident in intersection or (
             ident not in keep_uuid_sha
-            and not any(record.book.uuid == uuid for uuid, _ in intersection)
+            and not any(record_uuid == uuid for uuid, _ in intersection)
         ):
             to_delete.append(record)
     # NOTE: If to_delete is empty, the condition will be True (delete all)
@@ -181,6 +183,14 @@ async def add_new_entries(
             raise CustomBaseError(
                 f"Found multiple versions for {uuid} - ({items})"
             )
+    to_add = [
+        RequestApproveBook(
+            commit_sha=entry.commit_sha.lower(),
+            uuid=entry.uuid.lower(),
+            code_version=entry.code_version,
+        )
+        for entry in to_add
+    ]
     db_books = db.scalars(
         select(Book)
         .options(lazyload("*"))
@@ -189,14 +199,15 @@ async def add_new_entries(
             or_(
                 *[
                     and_(
-                        Book.uuid == entry.uuid, Commit.sha == entry.commit_sha
+                        func.lower(Book.uuid) == entry.uuid,
+                        func.lower(Commit.sha) == entry.commit_sha,
                     )
                     for entry in to_add
                 ]
             )
         )
     ).all()
-    db_books_by_uuid = {dbb.uuid: dbb for dbb in db_books}
+    db_books_by_uuid = {dbb.uuid.lower(): dbb for dbb in db_books}
     book_info_by_consumer = groupby(
         to_add, lambda entry: guess_consumer(db_books_by_uuid[entry.uuid].slug)
     )
diff --git a/backend/app/app/service/jobs.py b/backend/app/app/service/jobs.py
@@ -2,6 +2,7 @@
 import logging
 from datetime import datetime
 from typing import Dict, Generator, List, Optional, Union, cast
+from uuid import UUID
 
 from lxml import etree
 from sqlalchemy.exc import IntegrityError
@@ -64,6 +65,10 @@ def add_books_to_commit(
         uuid = xpath1(collection, "//*[local-name()='uuid']")
         if uuid is None or not uuid.text:
             raise CustomBaseError("Could not get uuid from collection xml")
+        try:
+            _ = UUID(uuid.text)
+        except ValueError as ve:
+            raise CustomBaseError(f"Invalid UUID: {uuid.text}") from ve
         # TODO: Edition should be either nullable or in a different table
         db_book = Book(uuid=uuid.text, slug=slug, edition=0, style=style)
         commit.books.append(db_book)
diff --git a/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add0-to_keep0/add_new_entries.sql b/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add0-to_keep0/add_new_entries.sql
@@ -1,14 +1,14 @@
 SELECT book.id, book.uuid, book.commit_id, book.edition, book.slug, book.style 
 FROM book JOIN commit ON commit.id = book.commit_id 
-WHERE book.uuid = :uuid_1 AND commit.sha = :sha_1
+WHERE lower(book.uuid) = :lower_1 AND lower(commit.sha) = :lower_2
 
 SELECT consumer.id 
 FROM consumer 
 WHERE consumer.name = :name_1
 
 SELECT approved_book.book_id, approved_book.consumer_id, approved_book.code_version_id, approved_book.created_at, approved_book.updated_at 
 FROM approved_book JOIN book ON book.id = approved_book.book_id JOIN commit ON commit.id = book.commit_id 
-WHERE book.uuid IN (__[POSTCOMPILE_uuid_1]) AND approved_book.consumer_id = :consumer_id_1
+WHERE lower(book.uuid) IN (__[POSTCOMPILE_lower_1]) AND approved_book.consumer_id = :consumer_id_1
 
 DELETE FROM approved_book WHERE approved_book.consumer_id = :consumer_id_1 AND approved_book.book_id = :book_id_1 AND approved_book.code_version_id = :code_version_id_1
 
diff --git a/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add0-to_keep0/add_new_entries_params.json b/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add0-to_keep0/add_new_entries_params.json
@@ -1,13 +1,13 @@
 [
   {
-    "uuid_1": "uuid-book-b",
-    "sha_1": "commit1"
+    "lower_1": "uuid-book-b",
+    "lower_2": "commit1"
   },
   {
     "name_1": "REX"
   },
   {
-    "uuid_1": [
+    "lower_1": [
       "uuid-book-b"
     ],
     "consumer_id_1": 1
diff --git a/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add1-to_keep1/add_new_entries.sql b/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add1-to_keep1/add_new_entries.sql
@@ -1,14 +1,14 @@
 SELECT book.id, book.uuid, book.commit_id, book.edition, book.slug, book.style 
 FROM book JOIN commit ON commit.id = book.commit_id 
-WHERE book.uuid = :uuid_1 AND commit.sha = :sha_1
+WHERE lower(book.uuid) = :lower_1 AND lower(commit.sha) = :lower_2
 
 SELECT consumer.id 
 FROM consumer 
 WHERE consumer.name = :name_1
 
 SELECT approved_book.book_id, approved_book.consumer_id, approved_book.code_version_id, approved_book.created_at, approved_book.updated_at 
 FROM approved_book JOIN book ON book.id = approved_book.book_id JOIN commit ON commit.id = book.commit_id 
-WHERE book.uuid IN (__[POSTCOMPILE_uuid_1]) AND approved_book.consumer_id = :consumer_id_1
+WHERE lower(book.uuid) IN (__[POSTCOMPILE_lower_1]) AND approved_book.consumer_id = :consumer_id_1
 
 DELETE FROM approved_book WHERE approved_book.consumer_id = :consumer_id_1 AND approved_book.book_id = :book_id_1 AND approved_book.code_version_id = :code_version_id_1
 
diff --git a/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add1-to_keep1/add_new_entries_params.json b/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add1-to_keep1/add_new_entries_params.json
@@ -1,13 +1,13 @@
 [
   {
-    "uuid_1": "uuid-book-a",
-    "sha_1": "commit-new"
+    "lower_1": "uuid-book-a",
+    "lower_2": "commit-new"
   },
   {
     "name_1": "REX"
   },
   {
-    "uuid_1": [
+    "lower_1": [
       "uuid-book-a"
     ],
     "consumer_id_1": 1
diff --git a/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add2-to_keep2/add_new_entries.sql b/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add2-to_keep2/add_new_entries.sql
@@ -1,14 +1,14 @@
 SELECT book.id, book.uuid, book.commit_id, book.edition, book.slug, book.style 
 FROM book JOIN commit ON commit.id = book.commit_id 
-WHERE book.uuid = :uuid_1 AND commit.sha = :sha_1 OR book.uuid = :uuid_2 AND commit.sha = :sha_2
+WHERE lower(book.uuid) = :lower_1 AND lower(commit.sha) = :lower_2 OR lower(book.uuid) = :lower_3 AND lower(commit.sha) = :lower_4
 
 SELECT consumer.id 
 FROM consumer 
 WHERE consumer.name = :name_1
 
 SELECT approved_book.book_id, approved_book.consumer_id, approved_book.code_version_id, approved_book.created_at, approved_book.updated_at 
 FROM approved_book JOIN book ON book.id = approved_book.book_id JOIN commit ON commit.id = book.commit_id 
-WHERE book.uuid IN (__[POSTCOMPILE_uuid_1]) AND approved_book.consumer_id = :consumer_id_1
+WHERE lower(book.uuid) IN (__[POSTCOMPILE_lower_1]) AND approved_book.consumer_id = :consumer_id_1
 
 DELETE FROM approved_book WHERE approved_book.consumer_id = :consumer_id_1 AND approved_book.book_id = :book_id_1 AND approved_book.code_version_id = :code_version_id_1 OR approved_book.consumer_id = :consumer_id_2 AND approved_book.book_id = :book_id_2 AND approved_book.code_version_id = :code_version_id_2
 
diff --git a/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add2-to_keep2/add_new_entries_params.json b/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add2-to_keep2/add_new_entries_params.json
@@ -1,15 +1,15 @@
 [
   {
-    "uuid_1": "uuid-book-a",
-    "sha_1": "commit1",
-    "uuid_2": "uuid-book-b",
-    "sha_2": "commit3"
+    "lower_1": "uuid-book-a",
+    "lower_2": "commit1",
+    "lower_3": "uuid-book-b",
+    "lower_4": "commit3"
   },
   {
     "name_1": "REX"
   },
   {
-    "uuid_1": [
+    "lower_1": [
       "uuid-book-a",
       "uuid-book-b"
     ],
diff --git a/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add3-to_keep3/add_new_entries.sql b/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add3-to_keep3/add_new_entries.sql
@@ -1,14 +1,14 @@
 SELECT book.id, book.uuid, book.commit_id, book.edition, book.slug, book.style 
 FROM book JOIN commit ON commit.id = book.commit_id 
-WHERE book.uuid = :uuid_1 AND commit.sha = :sha_1
+WHERE lower(book.uuid) = :lower_1 AND lower(commit.sha) = :lower_2
 
 SELECT consumer.id 
 FROM consumer 
 WHERE consumer.name = :name_1
 
 SELECT approved_book.book_id, approved_book.consumer_id, approved_book.code_version_id, approved_book.created_at, approved_book.updated_at 
 FROM approved_book JOIN book ON book.id = approved_book.book_id JOIN commit ON commit.id = book.commit_id 
-WHERE book.uuid IN (__[POSTCOMPILE_uuid_1]) AND approved_book.consumer_id = :consumer_id_1
+WHERE lower(book.uuid) IN (__[POSTCOMPILE_lower_1]) AND approved_book.consumer_id = :consumer_id_1
 
 DELETE FROM approved_book WHERE approved_book.consumer_id = :consumer_id_1 AND approved_book.book_id = :book_id_1 AND approved_book.code_version_id = :code_version_id_1
 
diff --git a/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add3-to_keep3/add_new_entries_params.json b/backend/app/tests/unit/snapshots/test_abl/test_add_new_entries_rex/to_add3-to_keep3/add_new_entries_params.json
@@ -1,13 +1,13 @@
 [
   {
-    "uuid_1": "uuid-book-a",
-    "sha_1": "commit4"
+    "lower_1": "uuid-book-a",
+    "lower_2": "commit4"
   },
   {
     "name_1": "REX"
   },
   {
-    "uuid_1": [
+    "lower_1": [
       "uuid-book-a"
     ],
     "consumer_id_1": 1
diff --git a/backend/app/tests/unit/test_abl.py b/backend/app/tests/unit/test_abl.py
@@ -67,7 +67,7 @@ def test_get_or_add_code_version(mock_session):
         [
             [
                 RequestApproveBook(
-                    commit_sha="commit1", uuid="uuid-book-b", code_version="42"
+                    commit_sha="commit1", uuid="uuid-boOk-b", code_version="42"
                 )
             ],
             {},
@@ -77,7 +77,7 @@ def test_get_or_add_code_version(mock_session):
             [
                 RequestApproveBook(
                     commit_sha="commit-new",
-                    uuid="uuid-book-a",
+                    uuid="UuID-BoOk-A",
                     code_version="42",
                 )
             ],
@@ -88,10 +88,10 @@ def test_get_or_add_code_version(mock_session):
         [
             [
                 RequestApproveBook(
-                    commit_sha="commit1", uuid="uuid-book-a", code_version="42"
+                    commit_sha="commit1", uuid="uuid-bOok-a", code_version="42"
                 ),
                 RequestApproveBook(
-                    commit_sha="commit3", uuid="uuid-book-b", code_version="42"
+                    commit_sha="commit3", uuid="uuid-book-B", code_version="42"
                 ),
             ],
             {
@@ -103,7 +103,7 @@ def test_get_or_add_code_version(mock_session):
         [
             [
                 RequestApproveBook(
-                    commit_sha="commit4", uuid="uuid-book-a", code_version="42"
+                    commit_sha="commit4", uuid="uuid-book-A", code_version="42"
                 ),
             ],
             {
@@ -117,9 +117,9 @@ async def test_add_new_entries_rex(
     to_add, to_keep, mock_session, mock_http_client, snapshot
 ):
     def mock_database_logic(session_obj):
-        book1 = Book(id=1, uuid="uuid-book-a", slug="test")
+        book1 = Book(id=1, uuid="uuiD-Book-a", slug="test")
         book2 = Book(id=2, uuid="uuid-book-a", slug="test")
-        book3 = Book(id=3, uuid="uuid-book-b", slug="test2")
+        book3 = Book(id=3, uuid="uuid-boOk-b", slug="test2")
         book1.commit = Commit(id=1, sha="commit1")
         book2.commit = Commit(id=2, sha="commit2")
         book3.commit = Commit(id=3, sha="commit3")
@@ -140,18 +140,33 @@ def mock_database_logic(session_obj):
             if " FROM consumer " in last_call:
                 return [1]
             elif " FROM book " in last_call:
-                return [book1, book2, book3]
+                params = session_obj.calls[-1].compile().params
+                # all uuids and shas used in the query
+                lower_params = [
+                    v for k, v in params.items() if k.startswith("lower_")
+                ]
+                # uuids are every other param from 0
+                uuids = lower_params[::2]
+                # shas are every other param from 1
+                # shas = lower_params[1::2]
+                return [
+                    b
+                    for b in (book1, book2, book3)
+                    if any(b.uuid.lower() == uuid for uuid in uuids)
+                ]
             elif " FROM approved_book " in last_call:
                 approved_books = [
                     approved_book1,
                     approved_book2,
                     approved_book3,
                 ]
-                if " WHERE book.uuid IN " in last_call:
+                if " WHERE lower(book.uuid) IN " in last_call:
                     params = session_obj.calls[-1].compile().params
-                    uuids = params["uuid_1"]
+                    uuids = params["lower_1"]
                     approved_books = [
-                        ab for ab in approved_books if ab.book.uuid in uuids
+                        ab
+                        for ab in approved_books
+                        if ab.book.uuid.lower() in uuids
                     ]
                 return approved_books
 
diff --git a/frontend/dev.dockerfile b/frontend/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.19 AS dev-runner
+FROM nginx:1.29 AS dev-runner
 
 ENV NODE_MAJOR=18
 RUN apt-get update && apt-get install -y build-essential ca-certificates curl gnupg \

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "uuid_1": "uuid-book-b",`
`4`		`- "sha_1": "commit1"`
	`3`	`+ "lower_1": "uuid-book-b",`
	`4`	`+ "lower_2": "commit1"`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name_1": "REX"`
`8`	`8`	`},`
`9`	`9`	`{`
`10`		`- "uuid_1": [`
	`10`	`+ "lower_1": [`
`11`	`11`	`"uuid-book-b"`
`12`	`12`	`],`
`13`	`13`	`"consumer_id_1": 1`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "uuid_1": "uuid-book-a",`
`4`		`- "sha_1": "commit-new"`
	`3`	`+ "lower_1": "uuid-book-a",`
	`4`	`+ "lower_2": "commit-new"`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name_1": "REX"`
`8`	`8`	`},`
`9`	`9`	`{`
`10`		`- "uuid_1": [`
	`10`	`+ "lower_1": [`
`11`	`11`	`"uuid-book-a"`
`12`	`12`	`],`
`13`	`13`	`"consumer_id_1": 1`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "uuid_1": "uuid-book-a",`
`4`		`- "sha_1": "commit1",`
`5`		`- "uuid_2": "uuid-book-b",`
`6`		`- "sha_2": "commit3"`
	`3`	`+ "lower_1": "uuid-book-a",`
	`4`	`+ "lower_2": "commit1",`
	`5`	`+ "lower_3": "uuid-book-b",`
	`6`	`+ "lower_4": "commit3"`
`7`	`7`	`},`
`8`	`8`	`{`
`9`	`9`	`"name_1": "REX"`
`10`	`10`	`},`
`11`	`11`	`{`
`12`		`- "uuid_1": [`
	`12`	`+ "lower_1": [`
`13`	`13`	`"uuid-book-a",`
`14`	`14`	`"uuid-book-b"`
`15`	`15`	`],`