Merge pull request #7 from GradHackersGuild/varun_features

Merging varun_features into our main branch for first release

Author: V4run14

.github/workflows/run_test_cases.yml

@@ -1,22 +1,6 @@
 name: run_test_cases
 
-on: 
-  push:
-    branches:
-      - main
-      - varun_features
-      - makarand_features
-      - michelle_features
-      - main_new
-      - release
-  pull_request:
-    branches:
-      - main
-      - varun_features
-      - makarand_features
-      - michelle_features
-      - main_new
-      - release
+on: [pull_request, push]
 
 jobs:
   test_python:
@@ -40,6 +24,9 @@ jobs:
           python manage.py test
           pip install coverage
           coverage run manage.py test
+          coverage xml
       
       - name: Upload coverage to Codecov
-        run: bash <(curl -s https://codecov.io/bash)
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} 
+        run: bash <(curl -s https://codecov.io/bash) -f coverage.xml

PackTravel/urls.py

@@ -37,6 +37,9 @@
     path('accounts/', include('allauth.urls')),
     path('logout/', LogoutView.as_view()),
     path('myrides/', userView.my_rides, name = 'search'),
-    path('delete_ride/<ride_id>', userView.delete_ride, name = 'delete_ride')
-    
+    path('delete_ride/<ride_id>', userView.delete_ride, name = 'delete_ride'),
+    path('join_ride/<ride_id>',searchViews.join_ride,name='join_ride'),
+    path('approve_rides/<ride_id>',userView.approve_rides,name='approve_rides'),
+    path('approve_user/<ride_id>/<user_id>',userView.approve_user,name='approve_user'),
+    path('ride_status/',userView.requested_rides,name='rides_status')
 ]

README.md

@@ -6,8 +6,8 @@
 
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7178601.svg)](https://doi.org/10.5281/zenodo.7178601)
-![Tests](https://img.shields.io/github/workflow/status/GradHackersGuild/PackTravel-Old/run_test_cases?lbranch=varun_featuresabel=tests&style=flat-square)
-[![codecov](https://codecov.io/gh/GradHackersGuild/PackTravel-Old/)
+![Tests](https://github.com/GradHackersGuild/PackTravel-Old/actions/workflows/run_test_cases.yml/badge.svg)
+[![Codecov](https://codecov.io/gh/GradHackersGuild/PackTravel-Old/branch/varun_features/graph/badge.svg)](https://codecov.io/gh/GradHackersGuild/PackTravel-Old)
 ![Python Style Checker](https://github.com/GradHackersGuild/PackTravel-Old/actions/workflows/python_style_checker.yml/badge.svg)
 ![Lint Python](https://github.com/GradHackersGuild/PackTravel-Old/actions/workflows/pylint.yml/badge.svg)
 

publish/views.py

@@ -59,7 +59,6 @@ def select_route(request):
         return redirect(display_ride, ride_id=ride['_id'] )
     return render(request, 'publish/publish.html', {"username": username})
 
-
 def routeSelect(username, routes):
     intializeDB()
     user = userDB.find_one({"username": username})
@@ -112,7 +111,6 @@ def create_route(request):
         if ridesDB.find_one({"_id": ride["_id"]}) is None:
             ridesDB.insert_one(ride)
     return render(request, 'publish/publish.html', {"username": request.session['username']})
-
 
 # Add Edit functionality
 

search/views.py

@@ -1,8 +1,6 @@
 from http.client import HTTPResponse
 from django.shortcuts import render,redirect
 from numpy import True_, dtype
-import requests
-import json
 from django.contrib.auth import login, authenticate
 from django.contrib import messages
 from django.contrib.auth.forms import UserCreationForm
@@ -24,6 +22,13 @@ def intializeDB():
     ridesDB  = db.rides
     routesDB  = db.routes
 
+def is_user_in_list(username,list):
+    try:
+        list.index(username)
+        return True
+    except ValueError:
+        return False
+    
 def search_index(request):
     intializeDB()
     if not request.session.has_key('username'):
@@ -32,32 +37,17 @@ def search_index(request):
     processed = list(ridesDB.find())
     for ride in processed:
         ride['id'] = ride['_id']
+        #if condition ensures, requestor is not already a part of requested users or approved users
+        if request.session['username'] != ride['owner'] and ride['availability'] > 0 and not is_user_in_list(request.session['username'],ride['requested_users']) and not is_user_in_list(request.session['username'],ride['confirmed_users']):
+            ride['allow_to_join'] = True
     return render(request, 'search/search.html', {"username": request.session['username'], "rides": processed})
 
-def request_ride(request, ride_id):
-    """This method processes the request from a user to be part of a ride"""
+def join_ride(request,ride_id):
+    if not request.session.has_key('username'):
+        request.session['alert'] = "Please login to create a ride."
+        return redirect('index')
     intializeDB()
-
-    if not request.session.has_key("username"):
-        request.session["alert"] = "Please login to request rides."
-        return redirect("index")
-
-    # get ride information from db
-    ride = ridesDB.find_one({"_id": ride_id})
-
-    # validation - check for edge cases
-    if ride is not None:
-        if ride["availability"] == 0:
-            message = "Ride has reached max capacity."
-        elif ride["owner"] == request.session["username"]:
-            message = "Owner of the ride cannot request own rides."
-        elif request.session["username"] in ride["confirmed_users"]:
-            message = "You are already a confirmed member of this ride."
-        else:
-            # add/update request to ride
-            ridesDB.update_one({"_id": ride_id}, {"$addToSet": {"requested_users": request.session["username"]}})
-            message = "Request successful."
-        print(message)
-
-    return redirect(requestsViews.requested_rides)
-
+    query = {"_id": ride_id}
+    update = {"$push": {"requested_users": request.session['username']}}
+    ridesDB.update_one(query,update)
+    return search_index(request)