merging in remote main

Author: Scr4tch587

.github/workflows/milestone_manager.yml

@@ -0,0 +1,62 @@
+name: Auto Milestone Management
+on:
+  pull_request:
+    branches:
+      - main
+    types:
+      - closed
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  add-milestone:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add milestone on PR merge
+        if: github.event.pull_request.merged == true
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const date = new Date();
+            const month = date.getMonth() + 1;
+            const year = date.getFullYear();
+            const yy = String(year % 100);
+
+            let term;
+            if (month <= 4) term = "W";
+            else if (month >= 9) term = "F";
+            else term = "S";
+
+            const format = yy + term;
+
+            const { data: milestones } = await github.rest.issues.listMilestones({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: "open"
+            });
+
+            let milestone = null;
+            for (let i = 0; i < milestones.length; i++) {
+              if (milestones[i].title == format) {
+                milestone = milestones[i];
+                break;
+              }
+            }
+
+            if (!milestone) {
+              const { data: new_milestone } = await github.rest.issues.createMilestone({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: format
+              });
+              milestone = new_milestone;
+            }
+
+            await github.rest.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              milestone: milestone.number
+            });

.github/workflows/pytest.yml

@@ -30,6 +30,26 @@ jobs:
         pip install -r requirements.txt
         pip install -e .
 
+    - name: Set up PostgreSQL database
+      run: |
+        sudo service postgresql start
+        sudo -u postgres psql -c "CREATE USER ci_user WITH PASSWORD 'ci_password' SUPERUSER;"
+        sudo -u postgres psql -c "CREATE DATABASE gs;"
+
+    - name: Create CI .env file
+      run: |
+        cat > .env << EOF
+        GS_DATABASE_USER=ci_user
+        GS_DATABASE_PASSWORD=ci_password
+        GS_DATABASE_LOCATION=localhost
+        GS_DATABASE_PORT=5432
+        GS_DATABASE_NAME=gs
+        EOF
+
+    - name: Run Alembic migrations
+      run: |
+        alembic upgrade head
+
     - name: Create binary directory
       run: |
         mkdir build_gs
@@ -42,5 +62,11 @@ jobs:
         cmake --build .
 
     - name: Run pytest
+      env:
+        GS_DATABASE_USER: ci_user
+        GS_DATABASE_PASSWORD: ci_password
+        GS_DATABASE_LOCATION: localhost
+        GS_DATABASE_PORT: 5432
+        GS_DATABASE_NAME: gs
       run: |
         python -m pytest

Dockerfile

@@ -3,7 +3,9 @@ FROM python:3.11-slim
 WORKDIR /app
 COPY requirements.txt /app/
 COPY /gs/backend /app/
+RUN apt-get update && apt-get install -y gcc build-essential
 RUN pip install -r requirements.txt
 EXPOSE 8000
 
-CMD ["fastapi", "run", "gs/backend/main.py"]
+#CMD ["fastapi", "run", "gs/backend/main.py"]
+CMD ["uvicorn", "gs.backend.main:app", "--host", "0.0.0.0", "--port", "8000"]

alembic.ini

@@ -0,0 +1,110 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = migrations
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python-dateutil library that can be
+# installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to migrations/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

gs/backend/api/backend_setup.py

@@ -1,4 +1,7 @@
+import logging
+
 from fastapi import FastAPI
+from loguru import logger
 
 from gs.backend.api.middleware.auth_middleware import AuthMiddleware
 from gs.backend.api.middleware.cors_middleware import add_cors_middleware
@@ -37,3 +40,18 @@ def setup_middlewares(app: FastAPI) -> None:
         LoggerMiddleware,
         excluded_endpoints=backend_config.logger_config.excluded_endpoints,
     )
+
+
+def setup_logging() -> None:
+    """Sets all logs from SQLAlchemy to the custom logger level VERBOSE"""
+    verbose_level = 15  # DEBUG=10, INFO=20
+    logger.level("VERBOSE", no=verbose_level, color="<blue>")
+
+    class SQLAlchemyHandler(logging.Handler):
+        def emit(self, record: logging.LogRecord) -> None:
+            logger.log("VERBOSE", record.getMessage())
+
+    sqlalchemy_logger = logging.getLogger("sqlalchemy.engine")
+    sqlalchemy_logger.setLevel(logging.INFO)
+    sqlalchemy_logger.addHandler(SQLAlchemyHandler())
+    sqlalchemy_logger.propagate = False

gs/backend/api/v1/aro/endpoints/user.py

@@ -1,15 +1,10 @@
 from uuid import UUID
 
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter
 
 from gs.backend.api.v1.aro.models.requests import UserRequest
 from gs.backend.api.v1.aro.models.responses import AllUsersResponse, UserResponse
-from gs.backend.data.data_wrappers.aro_wrapper.aro_user_data_wrapper import (
-    add_user,
-    delete_user_by_id,
-    update_user_by_id,
-)
-from gs.backend.data.data_wrappers.aro_wrapper.aro_user_data_wrapper import get_all_users as get_all_db_users
+from gs.backend.data.data_wrappers.wrappers import AROUsersWrapper
 
 aro_user_router = APIRouter(tags=["ARO", "User Information"])
 
@@ -21,10 +16,22 @@ async def get_all_users() -> AllUsersResponse:
 
     :return: all users
     """
-    users = get_all_db_users()
+    users = AROUsersWrapper().get_all()
     return AllUsersResponse(data=users)
 
 
+@aro_user_router.get("/get_user/{userid}", response_model=UserResponse)
+def get_user(userid: str) -> UserResponse:
+    """
+    Gets a user by ID
+
+    :param userid: The unique identifier of the user
+    :return: the user
+    """
+    user = AROUsersWrapper().get_by_id(UUID(userid))
+    return UserResponse(data=user)
+
+
 @aro_user_router.post("/create_user", response_model=UserResponse)
 def create_user(payload: UserRequest) -> UserResponse:
     """
@@ -33,48 +40,25 @@ def create_user(payload: UserRequest) -> UserResponse:
     :return: returns the user created
     """
 
-    user = add_user(
-        call_sign=payload.call_sign,
-        email=payload.email,
-        f_name=payload.first_name,
-        l_name=payload.last_name,
-        phone_number=payload.phone_number,
+    user = AROUsersWrapper().create(
+        data={
+            "call_sign": payload.call_sign,
+            "email": payload.email,
+            "first_name": payload.first_name,
+            "last_name": payload.last_name,
+            "phone_number": payload.phone_number,
+        }
     )
 
     return UserResponse(data=user)
 
 
-@aro_user_router.put("/update_user/{userid}", response_model=UserResponse)
-def update_user(userid: str, payload: UserRequest) -> UserResponse:
-    """
-    Modifies the user’s info based on the payload
-    :param userid: The unique identifier of the user to be updated
-    :param payload: The data used to update a user
-    :return: returns the user updated
-    """
-    try:
-        user = update_user_by_id(
-            userid=UUID(userid),
-            call_sign=payload.call_sign,
-            email=payload.email,
-            f_name=payload.first_name,
-            l_name=payload.last_name,
-            phone_number=payload.phone_number,
-        )
-        return UserResponse(data=user)
-    except ValueError as e:
-        raise HTTPException(status_code=404, detail=str(e)) from e
-
-
-@aro_user_router.delete("/delete_user/{userid}", response_model=AllUsersResponse)
-def delete_user(userid: str) -> AllUsersResponse:
+@aro_user_router.delete("/delete_user/{userid}", response_model=UserResponse)
+def delete_user(userid: str) -> UserResponse:
     """
     Deletes a user based on the user ID
     :param userid: The unique identifier of the user to be deleted
-    :return: returns the user deleted
+    :return: returns the deleted user
     """
-    try:
-        users = delete_user_by_id(UUID(userid))
-        return AllUsersResponse(data=users)
-    except ValueError as e:
-        raise HTTPException(status_code=404, detail=str(e)) from e
+    deleted_user = AROUsersWrapper().delete_by_id(UUID(userid))
+    return UserResponse(data=deleted_user)