messing with testing and databases

jessehartloff · jessehartloff · commit 29f5ae699e16 · 2025-06-09T08:16:59.000-04:00
diff --git a/api/config/config.py b/api/config/config.py
@@ -8,4 +8,3 @@ class Config:
 
     def __init__(self):
         self.API_MODE = os.getenv("API_MODE", "Can not find mode")
-        self.DB = os.getenv("DB", "Relational")
diff --git a/api/database/IQueue.py b/api/database/IQueue.py
@@ -6,3 +6,7 @@ class IQueue(ABC):
     @abstractmethod
     def enqueue_student(self, student):
         raise NotImplementedError()
+
+    @abstractmethod
+    def dequeue_student(self):
+        raise NotImplementedError()
diff --git a/api/database/db.py b/api/database/db.py
@@ -0,0 +1,22 @@
+import os
+
+from api.database.relational_db.RelationalDB import RelationalDB
+from api.database.testing_db.TestingDB import TestingDB
+from api.database.mock_db.MockDB import MockDB
+
+
+def create_db():
+    db_type = os.getenv("DB")
+    match db_type:
+        case "relational":
+            return RelationalDB()
+        case "testing":
+            return TestingDB()
+        case "mock":
+            return MockDB()
+        case None:
+            raise EnvironmentError("environment variable \"DB\" not set")
+        case _:
+            raise ModuleNotFoundError("Could not find database named " + db_type)
+
+db = create_db()
diff --git a/api/database/db_relational/RelationalDB.py b/api/database/db_relational/RelationalDB.py
diff --git a/api/database/mock_db/MockDB.py b/api/database/mock_db/MockDB.py
@@ -0,0 +1,7 @@
+from api.database.mock_db.MockDBQueue import MockDBQueue
+from api.database.mock_db.MockDBRatings import MockDBRatings
+
+
+class MockDB(MockDBQueue, MockDBRatings):
+
+    pass
diff --git a/api/database/mock_db/MockDBQueue.py b/api/database/mock_db/MockDBQueue.py
@@ -1,7 +1,7 @@
 from api.database.IQueue import IQueue
 
 
-class TestingDBQueue(IQueue):
+class MockDBQueue(IQueue):
 
     def enqueue_student(self, student):
         pass
diff --git a/api/database/mock_db/MockDBRatings.py b/api/database/mock_db/MockDBRatings.py
@@ -0,0 +1,8 @@
+from api.database.IRatings import IRatings
+
+
+class MockDBRatings(IRatings):
+
+    def rate_student(self, student, rating, feedback):
+        pass
+        # do database stuff
diff --git a/api/database/relational_db/RelationalDB.py b/api/database/relational_db/RelationalDB.py
@@ -0,0 +1,7 @@
+from api.database.relational_db.RelationalDBQueue import RelationalDBQueue
+from api.database.relational_db.RelationalDBRatings import RelationalDBRatings
+
+
+class RelationalDB(RelationalDBQueue, RelationalDBRatings):
+
+    pass
diff --git a/api/database/relational_db/RelationalDBQueue.py b/api/database/relational_db/RelationalDBQueue.py
@@ -4,5 +4,5 @@
 class RelationalDBQueue(IQueue):
 
     def enqueue_student(self, student):
-        pass
+        raise NotImplementedError()
         # do database stuff
diff --git a/api/database/relational_db/RelationalDBRatings.py b/api/database/relational_db/RelationalDBRatings.py
diff --git a/api/database/testing_db/TestingDB.py b/api/database/testing_db/TestingDB.py
@@ -0,0 +1,7 @@
+from api.database.testing_db.TestingDBQueue import TestingDBQueue
+from api.database.testing_db.TestingDBRatings import TestingDBRatings
+
+
+class TestingDB(TestingDBQueue, TestingDBRatings):
+
+    pass
diff --git a/api/database/testing_db/TestingDBQueue.py b/api/database/testing_db/TestingDBQueue.py
@@ -0,0 +1,13 @@
+from api.database.IQueue import IQueue
+
+
+class TestingDBQueue(IQueue):
+
+    def __init__(self):
+        self.queue = []
+
+    def enqueue_student(self, student):
+        self.queue.append(student)
+
+    def dequeue_student(self):
+        return self.queue.pop(0)
diff --git a/api/database/testing_db/TestingDBRatings.py b/api/database/testing_db/TestingDBRatings.py
diff --git a/api/queue/routes.py b/api/queue/routes.py
@@ -2,6 +2,8 @@
 
 from flask import Blueprint, request
 
+from api.database.db import db
+
 blueprint = Blueprint("queue", __name__)
 
 
@@ -27,6 +29,7 @@ def enqueue_card_swipe():
 
 @blueprint.route("/enqueue-ta-override", methods=["POST"])
 def enqueue_ta_override():
+    db.enqueue_student("Steve")
     """
     Force enqueue a student into the queue. Only usable by TAs and instructors
 
@@ -37,10 +40,11 @@ def enqueue_ta_override():
 
 @blueprint.route("/dequeue", methods=["DELETE"])
 def dequeue():
+    student = db.dequeue_student()
     """
     Remove the first student from the queue and create a Visit in the DB
     """
-    return ""
+    return student
 
 
 @blueprint.route("/get-queue", methods=["GET"])
diff --git a/api/server.py b/api/server.py
@@ -16,10 +16,14 @@
 
 from api.config import config
 from api.utils.debug import debug_access_only
+from api.database.db import create_db
 import api.auth.routes as auth_routes
 import api.queue.routes as queue_routes
 import api.ratings.routes as ratings_routes
 
+from api.database.db import db
+
+
 def create_app():
     """Create and return Flask API server
 
diff --git a/test.py b/test.py
@@ -0,0 +1,5 @@
+
+import api.database.db
+
+if __name__ == '__main__':
+    api.database.db.create_db()
diff --git a/tests/api/test_test.py b/tests/api/test_test.py
@@ -10,10 +10,6 @@
 
 @pytest.fixture
 def client():
-    print("^^^^^^^^")
-    print(os.getenv("API_MODE"))
-    load_dotenv()
-    print(os.getenv("API_MODE"))
     app = create_app()
     app.testing = True
     with app.test_client() as client:
@@ -26,5 +22,8 @@ def test_first_test(client):
     assert response.get_data() == b"Welcome to the homepage, you are currently in testing mode"
 
 
-def test_that_needs_db():
-    pass
+def test_that_needs_db(client):
+    client.post('/enqueue-ta-override', 'not used yet')
+    response = client.delete('/dequeue')
+    assert response.get_data() == b"Steve"
+
diff --git a/tests/mock_db/TestingDB.py b/tests/mock_db/TestingDB.py

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,3 @@ class Config:`
`8`	`8`
`9`	`9`	`def __init__(self):`
`10`	`10`	`self.API_MODE = os.getenv("API_MODE", "Can not find mode")`
`11`		`- self.DB = os.getenv("DB", "Relational")`