merging database into develop

Author: CormacSharkey

.github/workflows/backend-ci.yml

@@ -0,0 +1,73 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Backend CI
+
+on:
+  push:
+    branches: [ "develop", "main" ]
+  pull_request:
+    branches: [ "develop" ]
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    name: Lint Python Code (PEP8)
+    runs-on: ubuntu-latest
+  
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          cd server
+          python -m pip install --upgrade pip
+          pip install flake8 black
+      - name: Run flake8 (Linting)
+        run: |
+          cd server
+          flake8 src/ tests/
+      - name: Run Black (Formatting Check)
+        run: |
+          cd server
+          black --check --diff src/ tests/
+  test:
+    name: Run Backend Tests
+    runs-on: ubuntu-latest
+    needs: lint # Ensures linting passes before running tests
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          cd server
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+        
+      - name: Create .env file in CI
+        run: |
+          cd server
+          touch .env
+          echo "SUPABASE_URL=${{ secrets.SUPABASE_URL }}" >> .env
+          echo "SUPABASE_URL=${{ secrets.SUPABASE_KEY }}" >> .env
+          echo "GOOGLE_MAPS_API_KEY=${{ secrets.GOOGLE_MAPS_API_KEY }}" >> .env
+          
+      - name: Run Tests
+        run: |
+          cd server
+          pytest tests/ --ignore=tests/test_database_connection.py

.gitignore

@@ -2,6 +2,7 @@
 ./assets/stops.txt
 ./assets/stop_times.txt
 
+.vscode/
 *.pyc
 *.env
 

client/Map.js

@@ -8,7 +8,7 @@ export default function MapScreen({ navigation }) {
     const [location, setLocation] = useState(null); // No hardcoded initial location
     const [errorMessage, setErrorMessage] = useState('');
     const mapRef = useRef(null); // Reference to the MapView
-
+   
     // WebSocket Setup
     useEffect(() => {
         const wsUrl = `${process.env.EXPO_PUBLIC_API_URL.replace(/^http/, 'ws')}/ws/location`;
@@ -147,7 +147,6 @@ export default function MapScreen({ navigation }) {
         </View>
     );
 }
-
 const styles = StyleSheet.create({
     container: {
         flex: 1,

server/.gitignore

@@ -0,0 +1,68 @@
+# Server Code .gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+.coverage
+.coverage.*
+.cache
+pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+htmlcov/
+
+# Virtual environment folders
+venv/
+.venv/
+ENV/
+env/
+.envrc
+
+# IDE / editor settings
+.vscode/
+.idea/
+*.swp
+
+# macOS / Windows
+.DS_Store
+Thumbs.db
+
+# Environment variables
+.env
+.env.*
+
+# Logs
+*.log
+logs/
+
+# Docker-related (optional)
+docker-compose.override.yml

server/Dockerfile

@@ -9,10 +9,14 @@ COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy the application code
-COPY . .
+COPY src/ src/
+COPY tests/ tests/
+
+# Copy environment vars
+COPY .env .env
 
 # Expose the FastAPI port
 EXPOSE 8000
 
 # Command to run the FastAPI app
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000"]