From b4092fe77dceb5a0ca2aa5558d851bed37a7a585 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Mon, 18 Oct 2021 20:12:06 -0700
Subject: [PATCH] fix(fastapi): pass request type's name to
 Request*Notification

Previously, we passed the straight up request type instance from
SQLAlchemy and had a .title() function that was transparently
treating the instance the same as the instance's Name in terms
of notify.py's use of it.

This commit removes that transparent behavior; it was not actually
intended.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/models/request_type.py |  9 +--------
 aurweb/routers/packages.py    | 14 ++++++++------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/aurweb/models/request_type.py b/aurweb/models/request_type.py
index 48ace3a3..4578464c 100644
--- a/aurweb/models/request_type.py
+++ b/aurweb/models/request_type.py
@@ -17,14 +17,7 @@ class RequestType(Base):
 
     def name_display(self) -> str:
         """ Return the Name column with its first char capitalized. """
-        name = self.Name
-        return name[0].upper() + name[1:]
-
-    def title(self) -> str:
-        return self.name_display()
-
-    def __getitem__(self, n: int) -> str:
-        return self.Name[n]
+        return self.Name.title()
 
 
 DELETION_ID = db.query(RequestType, RequestType.Name == DELETION).first().ID
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 8e81f087..fef17389 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -697,18 +697,20 @@ async def pkgbase_request_post(request: Request, name: str,
     now = int(datetime.utcnow().timestamp())
     reqtype = db.query(models.RequestType).filter(
         models.RequestType.Name == type).first()
-    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
-    notify_ = None
     with db.begin():
-        pkgreq = db.create(models.PackageRequest, RequestType=reqtype,
-                           RequestTS=now, PackageBase=pkgbase,
+        pkgreq = db.create(models.PackageRequest,
+                           RequestType=reqtype,
+                           User=request.user,
+                           RequestTS=now,
+                           PackageBase=pkgbase,
                            PackageBaseName=pkgbase.Name,
-                           MergeBaseName=merge_into, User=request.user,
+                           MergeBaseName=merge_into,
                            Comments=comments, ClosureComment=str())
 
     # Prepare notification object.
+    conn = db.ConnectionExecutor(db.get_engine().raw_connection())
     notify_ = notify.RequestOpenNotification(
-        conn, request.user.ID, pkgreq.ID, reqtype,
+        conn, request.user.ID, pkgreq.ID, reqtype.Name,
         pkgreq.PackageBase.ID, merge_into=merge_into or None)
 
     # Send the notification now that we're out of the DB scope.