Add code refactored from seed-python-docker-rabbitmq repo

Author: andrew-chang-dewitt

db_wrapper/client.py

@@ -105,9 +105,5 @@ async def execute_and_return(
         async with self._connection.cursor() as cursor:
             await self._execute_query(cursor, query, params)
 
-            result = []
-
-            async for row in cursor:
-                result.append(row)
-
+            result: List[T] = await cursor.fetchall()
             return result

db_wrapper/connection.py

@@ -5,6 +5,7 @@
 import logging
 from typing import Optional
 
+from psycopg2.extras import RealDictCursor  # type: ignore
 from psycopg2 import OperationalError  # type: ignore
 
 # no stubs available, starting out by just determining correct return
@@ -48,7 +49,9 @@ async def _try_connect(
 
     while connection is None:
         try:
-            connection = await aiopg.connect(dsn)
+            connection = await aiopg.connect(
+                dsn,
+                cursor_factory=RealDictCursor)
         except OperationalError as err:
             print(type(err))
             if retries > 12:

db_wrapper/model.py

@@ -63,18 +63,15 @@ def __init__(self, client: Client, table: sql.Composable) -> None:
     async def one(self, item: T) -> T:
         """Create one new record with a given item."""
         columns: List[sql.Identifier] = []
-        values: List[sql.Identifier] = []
+        values: List[sql.Literal] = []
 
         for column, value in item.items():
-            if column == '_id':
-                values.append(sql.Identifier(str(value)))
-            else:
-                values.append(sql.Identifier(value))
+            values.append(sql.Literal(value))
 
             columns.append(sql.Identifier(column))
 
         query = sql.SQL(
-            'INSERT INTO {table}({columns}) '
+            'INSERT INTO {table} ({columns}) '
             'VALUES ({values}) '
             'RETURNING *;'
         ).format(
@@ -103,10 +100,10 @@ async def one_by_id(self, id_value: str) -> T:
         query = sql.SQL(
             'SELECT * '
             'FROM {table} '
-            'WHERE id = {id_value};'
+            'WHERE _id = {id_value};'
         ).format(
             table=self._table,
-            id_value=sql.Identifier(id_value)
+            id_value=sql.Literal(id_value)
         )
 
         result: List[T] = await self._client.execute_and_return(query)
@@ -178,7 +175,7 @@ def __init__(self, client: Client, table: sql.Composable) -> None:
         self._client = client
         self._table = table
 
-    async def one(self, id_value: str) -> T:
+    async def one_by_id(self, id_value: str) -> T:
         """Delete one record with matching ID."""
         query = sql.SQL(
             'DELETE FROM {table} '