Merge pull request #28 from AdvancedSoftwareEngineeringGroup3/frontend-tests

Frontend tests

Author: Ma-Golden

.github/workflows/backend-ci.yml

@@ -75,4 +75,4 @@ jobs:
       - name: Run Tests
         run: |
           cd server
-          pytest tests/ --ignore=tests/test_database_connection.py
+          pytest tests/

.github/workflows/frontend-ci.yml

@@ -0,0 +1,36 @@
+name: Frontend CI
+
+on:
+  push:
+    branches: [ "develop", "main" ]
+  pull_request:
+    branches: [ "develop", "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Run Frontend Tests (Jest)
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: ./client  # Removes need for cd client when running tests
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+
+    - name: Install dependencies  # Install dependencies
+      run: |
+        npm install
+
+    - name: Run tests  # Run Jest tests
+      run: |
+        npm test  

client/package-lock.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "@googlemaps/polyline-codec": "^1.0.28",
     "@react-google-maps/api": "^2.20.6",
+    "@react-native-async-storage/async-storage": "^2.1.1",
     "@react-navigation/native": "^7.0.2",
     "@react-navigation/native-stack": "^7.0.2",
     "crypto": "^1.0.1",
@@ -22,6 +23,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-native": "0.76.2",
+    "react-native-chart-kit": "^6.12.0",
     "react-native-element-dropdown": "^2.12.4",
     "react-native-gesture-handler": "~2.20.2",
     "react-native-maps": "1.18.0",

client/package.json

@@ -132,12 +132,11 @@ def update_entry(
         """
         try:
             cursor = self.connection.cursor()
-
-            # TODO: check if username needs to be made dynamic
-            query = f"UPDATE {table_name} "
-            f"SET {column} = '{data}' "
-            f"WHERE username = '{user}';"
-
+            query = (
+                f"UPDATE {table_name} "
+                f"SET {column} = '{data}' "
+                f"WHERE username = '{user}';"
+            )
             cursor.execute(query)
         except Exception as e:
             self.connection.rollback()
@@ -156,11 +155,10 @@ def search_entry(self, table_name: str, user: str, column: str):
         try:
             records = None
             cursor = self.connection.cursor()
-
-            query = f"""SELECT {column}
-            FROM {table_name}
-            WHERE username = '{user}';"""
-
+            query = (
+                f"SELECT {column} FROM {table_name} "
+                f"WHERE username = '{user}';"
+            )
             cursor.execute(query)
             records = cursor.fetchall()
 
@@ -190,9 +188,13 @@ def append_entry(
         """
         try:
             cursor = self.connection.cursor()
-            query = f"UPDATE {table_name} "
-            f"SET {column} = array_append({column},'{sender}') "
-            f"WHERE username = '{receiver}';"
+
+            query = (
+                f"UPDATE {table_name} "
+                f"SET {column} = array_append({column},'{sender}') "
+                f"WHERE username = '{receiver}';"
+            )
+
             cursor.execute(query)
             self.connection.commit()
         except Exception as e:
@@ -218,11 +220,13 @@ def remove_from_array(
         """
         try:
             cursor = self.connection.cursor()
+
             query = (
                 f"UPDATE {table_name} "
                 f"SET {column} = ARRAY_REMOVE({column}, '{value_to_remove}')"
                 f"WHERE username = '{user}';"
             )
+
             cursor.execute(query)
             self.connection.commit()
 
@@ -245,7 +249,9 @@ def print_table(self, tablename: str):
         """
         try:
             cursor = self.connection.cursor()
+
             query = f"SELECT * FROM {tablename};"
+
             cursor.execute(query)
             records = cursor.fetchall()
 
@@ -281,6 +287,7 @@ def search_user(self, table_name: str, user: str) -> bool:
                 f"SELECT username FROM {table_name} "
                 f"WHERE username = '{user}';"
             )
+
             cursor.execute(query)
             record = list(cursor.fetchall())
 

server/src/Database_class.py

@@ -1,6 +1,6 @@
 import pytest
 from unittest.mock import patch, MagicMock
-from server.src.Database_class import DataBase
+from src.Database_class import DataBase
 
 DB_NAME = "test_db"
 DB_USER = "your_user"
@@ -15,7 +15,7 @@ def db():
     return DataBase(DB_HOST, DB_NAME, DB_USER, DB_PASSWORD, DB_PORT)
 
 
-@patch("server.Database_class.pg8000.connect")
+@patch("src.Database_class.pg8000.connect")
 def test_connect_db(mock_connect, db):
     """Test database connection"""
     mock_connect.return_value = MagicMock()