Merge pull request #112 from NeverScapeAlone/develop

Development Test Environment
NeverScapeAlone · Oct 13, 2022 · b99f907 · b99f907
2 parents d51625d + 83f0990
commit b99f907
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 103 deletions.
diff --git a/.github/workflows/pull_workflow.yml → .github/workflows/api_pull.yml b/.github/workflows/pull_workflow.yml → .github/workflows/api_pull.yml
@@ -1,7 +1,7 @@
 name: Pull workflow
 on:
   pull_request:
-    branches: [main, develop]
+    branches: [main]
 
 jobs:
   pytest:

diff --git a/.github/workflows/push_workflow.yml → .github/workflows/api_push.yml b/.github/workflows/push_workflow.yml → .github/workflows/api_push.yml
@@ -38,7 +38,6 @@ jobs:
           echo "${{ secrets.REDIS_DATABASE}}" >> .env
           echo "${{ secrets.REDIS_PORT}}" >> .env
           echo "${{ secrets.DISCORD_WEBHOOK}}" >> .env
-          echo "${{ secrets.GLOBAL_BROADCAST_TOKEN}}" >> .env
           echo "${{ secrets.RATE_LIMIT_MINUTE}}" >> .env
           echo "${{ secrets.RATE_LIMIT_HOUR}}" >> .env
           echo "${{ secrets.MATCH_VERSION}}" >> .env
@@ -49,4 +48,4 @@ jobs:
     steps:
       - name: Docker
         run: |
-          sudo docker-compose up --build -d
+          sudo docker-compose up --build -d api
diff --git a/.github/workflows/dev_pull.yml b/.github/workflows/dev_pull.yml
@@ -0,0 +1,26 @@
+name: Development Pull workflow
+on:
+  pull_request:
+    branches: [develop]
+
+jobs:
+  pytest:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 2
+    steps:
+      - name: Test Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.X"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Pytest
+        run: |
+          pytest tests
diff --git a/.github/workflows/dev_push.yml b/.github/workflows/dev_push.yml
@@ -0,0 +1,53 @@
+name: Development Push workflow
+on:
+  push:
+    branches: [develop]
+
+jobs:
+  pytest:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 2
+    steps:
+      - name: Test Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.X"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Pytest
+        run: |
+          pytest tests
+
+  checkout:
+    needs: pytest
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set Up ENV
+        run: |
+          echo "${{ secrets.DEV_SQL_URI }}" > .env
+          echo "${{ secrets.DISCORD_ROUTE_TOKEN}}" >> .env
+          echo "${{ secrets.REDIS_PASSWORD}}" >> .env
+          echo "${{ secrets.DEV_REDIS_DATABASE}}" >> .env
+          echo "${{ secrets.REDIS_PORT}}" >> .env
+          echo "${{ secrets.DEV_DISCORD_WEBHOOK}}" >> .env
+          echo "${{ secrets.DEV_DISCORD_ROUTE_TOKEN}}" >> .env
+          echo "${{ secrets.RATE_LIMIT_MINUTE}}" >> .env
+          echo "${{ secrets.RATE_LIMIT_HOUR}}" >> .env
+          echo "${{ secrets.MATCH_VERSION}}" >> .env
+          echo "${{ secrets.DEVELOPER_MODE}}" >> .env
+
+  deploy:
+    runs-on: self-hosted
+    needs: checkout
+    steps:
+      - name: Docker
+        run: |
+          sudo docker-compose up --build -d dev
diff --git a/api/config.py b/api/config.py
@@ -21,11 +21,6 @@ def __init__(self):
             if os.environ.get("sql_uri")
             else "mysql+asyncmy://username:password@host:3306/database"
         )
-        self.GLOBAL_BROADCAST_TOKEN = (
-            os.environ.get("global_broadcast_token")
-            if os.environ.get("global_broadcast_token")
-            else "global_broadcast_token"
-        )
         self.DISCORD_TOKEN = (
             os.environ.get("discord_route_token")
             if os.environ.get("discord_route_token")
@@ -47,7 +42,7 @@ def __init__(self):
             else "1000"
         )
         self.REDIS_PORT = (
-            int(os.environ.get("redis_port")) if os.environ.get("redis_port") else 1000
+            int(os.environ.get("redis_port")) if os.environ.get("redis_port") else 0
         )
         self.RATE_LIMIT_MINUTE = (
             int(os.environ.get("rate_limit_minute"))
@@ -62,8 +57,9 @@ def __init__(self):
         self.MATCH_VERSION = (
             os.environ.get("match_version")
             if os.environ.get("match_version")
-            else "v0.0.0-alpha"
+            else "v0.0.0"
         )
+        self.DEVELOPER_MODE = True if os.environ.get("developer_mode") else False
         self.TIMEOUT = 30 * 60
 
     def setMATCH_VERSION(self, match_version):

diff --git a/api/database/models.py b/api/database/models.py
@@ -36,21 +36,6 @@ class Users(Base):
     timestamp = Column(TIMESTAMP)
 
 
-class UserRatingHistory(Base):
-    __tablename__ = "user_rating_history"
-    ID = Column(BigInteger, primary_key=True)
-    timestamp = Column(TIMESTAMP)
-    s_user_id = Column(
-        ForeignKey("users.user_id", ondelete="RESTRICT", onupdate="RESTRICT")
-    )
-    r_user_id = Column(
-        ForeignKey("users.user_id", ondelete="RESTRICT", onupdate="RESTRICT")
-    )
-    rating = Column(TINYINT)
-    comment = Column(TINYTEXT)
-    request_history_id = Column(BigInteger)
-
-
 class UserToken(Base):
     __tablename__ = "user_token"
     ID = Column(INTEGER, primary_key=True)
@@ -61,65 +46,6 @@ class UserToken(Base):
     token = Column(TINYTEXT)
 
 
-class UserPoints(Base):
-    __tablename__ = "user_points"
-    ID = Column(BigInteger, primary_key=True)
-    user_id = Column(
-        ForeignKey("users.user_id", ondelete="RESTRICT", onupdate="RESTRICT")
-    )
-    points = Column(BigInteger)
-
-
-class ActiveMatches(Base):
-    __tablename__ = "active_matches"
-    ID = Column(Integer, primary_key=True)
-    user_id = Column(
-        Integer, ForeignKey("users.user_id", ondelete="RESTRICT", onupdate="RESTRICT")
-    )
-    party_identifier = Column(TINYTEXT)
-    user_queue_ID = Column(Integer)
-    activity = Column(TEXT)
-    party_member_count = Column(Integer)
-    has_accepted = Column(Boolean, default=False)
-    discord_invite = Column(TEXT, default=None)
-    timestamp = Column(TIMESTAMP)
-
-
-class UserQueue(Base):
-    __tablename__ = "user_queue"
-    ID = Column(Integer, primary_key=True)
-    user_id = Column(
-        Integer, ForeignKey("users.user_id", ondelete="RESTRICT", onupdate="RESTRICT")
-    )
-    timestamp = Column(TIMESTAMP)
-    in_queue = Column(Boolean, unique=False, default=False)
-    activity = Column(TINYTEXT)
-    party_member_count = Column(Integer)
-    self_experience_level = Column(Integer)
-    partner_experience_level = Column(Integer)
-    us = Column(Boolean, unique=False, default=False)
-    eu_central = Column(Boolean, unique=False, default=False)
-    eu_west = Column(Boolean, unique=False, default=False)
-    oceania = Column(Boolean, unique=False, default=False)
-    f2p = Column(Boolean, unique=False, default=False)
-    p2p = Column(Boolean, unique=False, default=False)
-
-
-class WorldInformation(Base):
-    __tablename__ = "world_information"
-    ID = Column(Integer, primary_key=True)
-    timestamp = Column(TIMESTAMP)
-    world_number = Column(Integer)
-    activity = Column(TEXT)
-    us = Column(Boolean, unique=False, default=False)
-    eu_central = Column(Boolean, unique=False, default=False)
-    eu_west = Column(Boolean, unique=False, default=False)
-    oceania = Column(Boolean, unique=False, default=False)
-    f2p = Column(Boolean, unique=False, default=False)
-    p2p = Column(Boolean, unique=False, default=False)
-    player_count = Column(Integer)
-
-
 class AccessTokens(Base):
     __tablename__ = "access_tokens"
     ID = Column(Integer, primary_key=True)

diff --git a/api/routers/lobby.py b/api/routers/lobby.py
@@ -67,23 +67,6 @@ async def update_version(version: str, access_token: str):
     }
 
 
-@router.get("/V2/global_broadcast")
-async def global_broadcast(message: str, authorization_token: str):
-    if authorization_token[:2] != "-:":
-        return HTTPException(
-            status_code=400,
-            detail="Incorrect append, authorization must contain '-:' starter.",
-        )
-    authorization_token = authorization_token[2:]
-    if authorization_token != configVars.GLOBAL_BROADCAST_TOKEN:
-        return HTTPException(
-            status_code=401, detail="Your authorization token is incorrect."
-        )
-    if message == configVars.GLOBAL_BROADCAST_TOKEN:
-        return HTTPException(status_code=400, detail="You didn't mean to send that...")
-    manager.global_broadcast(message=message)
-
-
 @router.websocket("/V2/lobby/{group_identifier}/{passcode}")
 async def websocket_endpoint(
     websocket: WebSocket, group_identifier: str, passcode: str

diff --git a/api/utilities/redis/utils.py b/api/utilities/redis/utils.py
@@ -28,4 +28,6 @@ async def load_redis_from_sql():
         key = f"user:{login}:{user_id}"
         del value["timestamp"]
         mapping[key] = str(value)
+    if not mapping:
+        return
     await redis_client.mset(mapping=mapping)
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   api:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: ./dockerfiles/api/API_Dockerfile
     image: neverscapealone-api:latest
     ports:
       - "5500:5500"
@@ -14,3 +14,16 @@ services:
       - /home/ubuntu/nsa/match_histories:/code/histories:rw
       - /home/ubuntu/nsa/errors:/code/errors:rw
       - /home/ubuntu/nsa/errors:/code/logs:rw
+  dev:
+    build:
+      context: .
+      dockerfile: ./dockerfiles/dev/Dockerfile
+    image: neverscapealone-dev:latest
+    ports:
+      - "5501:5501"
+    env_file:
+      - .env
+    volumes:
+      - /home/ubuntu/nsa_dev/match_histories:/code/histories:rw
+      - /home/ubuntu/nsa_dev/errors:/code/errors:rw
+      - /home/ubuntu/nsa_dev/errors:/code/logs:rw
diff --git a/Dockerfile → dockerfiles/api/Dockerfile b/Dockerfile → dockerfiles/api/Dockerfile
@@ -6,4 +6,4 @@ COPY . /code/
 EXPOSE 5500
 
 RUN pip install -r requirements.txt
-CMD ["uvicorn", "api.app:app", "--host", "0.0.0.0", "--port", "5500"] 
+CMD ["uvicorn", "api.app:app", "--host", "0.0.0.0", "--port", "5500"]
diff --git a/dockerfiles/dev/Dockerfile b/dockerfiles/dev/Dockerfile
@@ -0,0 +1,9 @@
+FROM python:3.10-slim
+
+WORKDIR /code
+COPY . /code/
+
+EXPOSE 5501
+
+RUN pip install -r requirements.txt
+CMD ["uvicorn", "api.app:app", "--host", "0.0.0.0", "--port", "5501"]