Merge pull request #42 from CS222-UIUC/minh/fixes_database

Minh/Touch up app.py and fix decorator test

src/backend/app.py

@@ -1,12 +1,12 @@
 """ This is a module docstring """
 import json
 import dataclasses
-from collections import namedtuple
 from werkzeug.datastructures import MultiDict
 from flask import Flask, request
 from flask_cors import CORS
 from pages.login import Login
 from pages.mainpage import MainPage
+from dataholders.mainpage_get import GetRequestType, Params
 
 # from logging import FileHandler, WARNING
 app = Flask(__name__)
@@ -67,27 +67,26 @@ def mainpage_get(mainpage_obj: MainPage, args: MultiDict):
     - Getting reviews of an apartment
     - Getting pictures of an apartment
     """
-    action_type = namedtuple(
-        "action_type", ["is_search", "is_populate", "is_review", "is_pictures"]
-    )
-    action = action_type(
+    action = GetRequestType(
         args.get("search", default=False, type=bool),
         args.get("populate", default=False, type=bool),
         args.get("review", default=False, type=bool),
         args.get("pictures", default=False, type=bool),
     )
 
-    params = namedtuple(
-        "params", ["num_apts", "apt_id", "search_query", "price_sort", "rating_sort"]
-    )
-    param = params(
+    param = Params(
         args.get("numApts", type=int),
         args.get("aptId", type=int),
         args.get("searchQuery", type=str),
         args.get("priceSort", type=int),
         args.get("ratingSort", type=int),
     )
 
+    return mainpage_process_get(mainpage_obj, action, param)
+
+
+def mainpage_process_get(mainpage_obj: MainPage, action: GetRequestType, param: Params):
+    """Process the get requests"""
     query_result = ""
     if action.is_search is True and param.search_query is not None:
         apts = mainpage_obj.search_apartments(param.search_query)

src/backend/dataholders/mainpage_get.py

@@ -0,0 +1,24 @@
+"""Contains dataclasses for mainpage get requests"""
+from dataclasses import dataclass
+from typing import Union
+
+
+@dataclass
+class GetRequestType:
+    """Specific action of the request"""
+
+    is_search: bool
+    is_populate: bool
+    is_review: bool
+    is_pictures: bool
+
+
+@dataclass
+class Params:
+    """Other request parameters"""
+
+    num_apts: Union[int, None]
+    apt_id: Union[int, None]
+    search_query: Union[str, None]
+    rating_sort: Union[int, None]
+    price_sort: Union[int, None]

src/backend/tests/test_decorators.py

@@ -14,6 +14,7 @@ def insert_review():
     )
 
 
+@decorators.use_test
 def test_use_database_raise_exception():
     """use_database correctly raises an exception"""
     connection = sqlite3.connect("database/database_test.db")