Merge pull request #8 from DoodleyJC/dev

Database connection and betting endpoint update
RetroOlympics · Jul 20, 2024 · 70d1e57 · 70d1e57
2 parents d91d337 + bdcf172
commit 70d1e57
Show file tree

Hide file tree

Showing 17 changed files with 158 additions and 16 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -7,16 +7,25 @@ services:
       dockerfile: Dockerfile
     entrypoint: ["tail", "-f", "/dev/null"]
     volumes:
-      - ../..:/workspaces:cached
+      - ..:/workspaces:cached
     command: sleep infinity
-    network_mode: service:db
+    #network_mode: service:db
+    ports: 
+      - "8000:5000"
+    depends_on:
+      - db
   db:
     image: postgres:16-alpine
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
+      POSTGRES_DB: retroolympics
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - "8001:5432"
 
 volumes:
   postgres-data:
diff --git a/.gitignore b/.gitignore
@@ -20,4 +20,6 @@ build
 next-env.d.ts
 
 # Python
-*.pyc
+*.pyc
+
+.env
diff --git a/backend/api/components/betting/__init__.py b/backend/api/components/betting/__init__.py
@@ -0,0 +1,3 @@
+from .controller import betting_api
+
+__all__=["betting_api"]
diff --git a/backend/api/components/betting/controller.py b/backend/api/components/betting/controller.py
@@ -0,0 +1,48 @@
+from flask import Blueprint, jsonify, request, render_template, Response
+
+from api.consts import COMMON_API_PREFIX
+import api.model.betting
+
+betting_api = Blueprint("betting_api", __name__, url_prefix=COMMON_API_PREFIX + "/betting",
+                        template_folder="templates")
+
+
+@betting_api.route("/", methods=["GET"])
+def get_collections():
+    try:
+        responseobject = api.model.betting.getAll()
+        return jsonify(responseobject)
+    except Exception as e:
+        print(e)
+        return Response("something went wrong", 500)
+
+
+
+@betting_api.route("/", methods=["POST", "PUT"])
+def handle_post():
+    if request.method == "POST":
+        try:
+            content = request.json
+            userid = content["userid"]
+            matchid = content["matchid"]
+            teamid = content["teamid"]
+            amount = content["amount"]
+        except Exception as e:
+            print(e)
+            return Response(f"""content_type="bad request, please supply the following: \"user\", \"matchid\", \"teamid\"and \"amount\"
+                            in json form with a content-type json header"""
+                            , 400)
+        try:
+            print(f"userid = {userid}, matchid={matchid}, teamid{teamid}, amount={amount}")
+            api.model.betting.insertBet(userid, matchid, teamid, amount)
+            return Response("inserted", 200)
+        except Exception as e:
+            print(e)
+            return Response(f"""something went wrong with inserting the bet in the database"""
+                            , 500)
+    else:
+        return Response("Only posts are allowed right now", 400)
+
+@betting_api.route("/datatest", methods=["GET", "POST", "PUT"])
+def handle_test():
+    pass
diff --git a/backend/api/components/betting/templates/badrequest.html b/backend/api/components/betting/templates/badrequest.html
diff --git a/backend/api/components/betting/templates/notallowed.html b/backend/api/components/betting/templates/notallowed.html
@@ -0,0 +1,8 @@
+<html>
+    <head>
+
+    </head>
+    <body>
+        <p> this request type is not allowed, only post</p>
+    </body>
+</html>
diff --git a/backend/api/components/betting/templates/placeholder.html b/backend/api/components/betting/templates/placeholder.html
@@ -0,0 +1,8 @@
+<html>
+    <head>
+
+    </head>
+    <body>
+        <p> Placeholder</p>
+    </body>
+</html>
diff --git a/backend/api/main.py b/backend/api/main.py
@@ -1,7 +1,7 @@
 from flask import Flask
 
 from api.components.hello import hello_api
-
+from api.components.betting import betting_api
 api: Flask | None = None
 
 
@@ -11,5 +11,6 @@ def get_api() -> Flask:
         api = Flask(__name__)
 
         api.register_blueprint(hello_api)
+        api.register_blueprint(betting_api)
 
     return api
diff --git a/backend/api/model/betting/__init__.py b/backend/api/model/betting/__init__.py
@@ -0,0 +1,25 @@
+from .main import *
+import psycopg2
+
+__all__ = ["insertBet", "removeBet"]
+
+
+createTableString = """
+                    CREATE TABLE bettingtest (
+                        id SERIAL PRIMARY KEY,
+                        userid VARCHAR,
+                        matchid INT,
+                        teamid INT,
+                        amount FLOAT
+                    );
+                    """
+
+def __init__():
+    with datacon.cursor() as curs:
+        try:
+            curs.execute(createTableString)
+        except psycopg2.errors.DuplicateTable as e:
+            print("duplicate table encountered")
+            pass
+
+__init__()
diff --git a/backend/api/model/betting/main.py b/backend/api/model/betting/main.py
@@ -0,0 +1,21 @@
+import psycopg2
+import api.model.database as data
+
+datacon = data.bettingconn
+datacon.autocommit=True
+
+def insertBet(userid, matchid, teamid, amount):
+    with datacon.cursor() as curs:
+        curs.execute(f"""INSERT INTO bettingtest (userid, matchid, teamid, amount)
+                    VALUES ({userid},{matchid},{teamid},{amount});""")
+
+def getAll():
+    with datacon.cursor() as curs:
+        curs.execute("""
+                    SELECT * FROM bettingtest;
+                    """)
+        res = curs.fetchall()
+    return res
+
+def removeBet():
+    pass
diff --git a/backend/api/model/database/__init__.py b/backend/api/model/database/__init__.py
@@ -0,0 +1 @@
+from .main import *
diff --git a/backend/api/model/database/main.py b/backend/api/model/database/main.py
@@ -0,0 +1,5 @@
+import psycopg2
+bettingconn = psycopg2.connect(host="db", user="postgres", password="postgres", dbname="retroolympics")
+bettingconn.autocommit=True
+
+
diff --git a/backend/requirements-combined.txt b/backend/requirements-combined.txt
@@ -2,10 +2,10 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=backend/requirements-combined.txt backend/requirements-dev.in backend/requirements.in
+#    pip-compile --output-file=requirements-combined.txt requirements-dev.in requirements.in
 #
 black==24.4.2
-    # via -r backend/requirements-dev.in
+    # via -r requirements-dev.in
 blinker==1.8.2
     # via flask
 build==1.2.1
@@ -15,12 +15,16 @@ click==8.1.7
     #   black
     #   flask
     #   pip-tools
+colorama==0.4.6
+    # via
+    #   build
+    #   click
 flask==3.0.3
-    # via -r backend/requirements.in
+    # via -r requirements.in
 invoke==2.2.0
-    # via -r backend/requirements-dev.in
+    # via -r requirements-dev.in
 isort==5.13.2
-    # via -r backend/requirements-dev.in
+    # via -r requirements-dev.in
 itsdangerous==2.2.0
     # via flask
 jinja2==3.1.4
@@ -38,15 +42,17 @@ packaging==24.1
 pathspec==0.12.1
     # via black
 pip-tools==7.4.1
-    # via -r backend/requirements-dev.in
+    # via -r requirements-dev.in
 platformdirs==4.2.2
     # via black
+psycopg2==2.9.9
+    # via -r requirements.in
 pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
 ruff==0.4.9
-    # via -r backend/requirements-dev.in
+    # via -r requirements-dev.in
 werkzeug==3.0.3
     # via flask
 wheel==0.43.0

diff --git a/backend/requirements.in b/backend/requirements.in
@@ -1 +1,2 @@
-Flask==3.0.3
+Flask==3.0.3
+Psycopg2==2.9.9
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -2,14 +2,16 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile backend/requirements.in
+#    pip-compile requirements.in
 #
 blinker==1.8.2
     # via flask
 click==8.1.7
     # via flask
+colorama==0.4.6
+    # via click
 flask==3.0.3
-    # via -r backend/requirements.in
+    # via -r requirements.in
 itsdangerous==2.2.0
     # via flask
 jinja2==3.1.4

diff --git a/backend/tasks.py b/backend/tasks.py
@@ -12,11 +12,11 @@ def update_app_reqs(c):
 @task
 def update_combined_reqs(c):
     c.run(
-        "pip-compile backend/requirements.in backend/requirements-dev.in -o backend/requirements-combined.txt"
+        "pip-compile requirements.in requirements-dev.in -o requirements-combined.txt"
     )
 
 
 # Run
 @task
 def run_back(c):
-    get_api().run()
+    get_api().run("0.0.0.0")
diff --git a/installscript.sh b/installscript.sh
@@ -0,0 +1,2 @@
+pip install invoke
+pip install -r backend/requirements-combined.txt