Jonathan Zhang - Ground Station onboarding

backend/api/endpoints/command.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, HTTPException
 from sqlmodel import Session, select
 
 from backend.api.models.request_model import CommandRequest
@@ -23,23 +23,38 @@ def get_commands(db: Session = Depends(get_db)):
 
 
 @command_router.post("/", response_model=CommandSingleResponse)
-def create_command(payload: CommandRequest):
+def create_command(payload: CommandRequest, db: Session = Depends(get_db)):
     """
     Creates an item with the given payload in the database and returns this payload after pulling it from the database 
 
     :param payload: The data used to create an item
     :return: returns a json object with field of "data" under which there is the payload now pulled from the database 
     """
     # TODO:(Member) Implement this endpoint
-
+    commands = Command(command_type = payload.command_type, params = payload.params)
+    db.add(commands)
+    db.commit()
+    db.refresh(commands)
+
+    return {"data": commands}
 
 
 @command_router.delete("/{id}", response_model=CommandListResponse)
-def delete_command(id: int):
+def delete_command(id: int, db: Session = Depends(get_db)):
     """
     Deletes the item with the given id if it exists. Otherwise raises a 404 error.
 
     :param id: The id of the item to delete
     :return: returns the list of commands after deleting the item
     """
     # TODO:(Member) Implement this endpoint
+
+    command = db.exec(select(Command).where(Command.id == id)).one_or_none()
+    if command is None:
+        raise HTTPException(status_code=404, detail="Error")
+
+    db.delete(command)
+    db.commit()
+
+    commands = db.exec(select(Command)).all()
+    return {"data": commands}

backend/api/middlewares/logger_middleware.py

@@ -2,6 +2,10 @@
 from typing import Any
 from fastapi import Request, Response
 from starlette.middleware.base import BaseHTTPMiddleware
+import time
+import datetime
+from backend.utils.logging import logger
+from backend.utils.time import to_unix_time
 
 
 class LoggerMiddleware(BaseHTTPMiddleware):
@@ -18,5 +22,17 @@ async def dispatch(
         :return: Response from endpoint
         """
         # TODO:(Member) Finish implementing this method
-        response = await call_next(request)
-        return response
+        start = time.perf_counter()
+        request_time = to_unix_time(datetime.datetime.now())
+
+        response: Response = await call_next(request)
+        duration = time.perf_counter() - start
+
+        log_data = {
+            "request params": dict(request.query_params),
+            "datetime of request": request_time,
+            "execution duration": duration,
+        }
+
+        logger.info("Log data {}", log_data)
+        return response 

backend/data/data_models.py

@@ -33,7 +33,12 @@ def validate_params_format(self):
         The format of the comma seperated values is "data1,data2" so no spaces between data and the commas.
         """
         # TODO: (Member) Implement this method
-        return self
+        if self.params == None and self.format == None:
+            return self
+        if (self.params != None and self.format != None) and len(self.params.split(",")) == len(self.format.split(",")):
+            return self
+        else:
+            raise ValueError("Value error")
 
 
 class Command(BaseSQLModel, table=True):