Main new

.github/workflows/run_test_cases.yml

@@ -0,0 +1,32 @@
+name: run_test_cases
+
+on: [pull_request, push]
+
+jobs:
+  test_python:
+    runs-on: ubuntu-20.04 
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10.2' 
+
+      - run: pip install virtualenv
+
+      - run: |
+          python -m virtualenv newenv
+          source newenv/bin/activate
+
+          pip install django django-allauth pymongo setuptools --upgrade
+          pip install -r requirements.txt
+
+          python manage.py test
+          pip install coverage
+          coverage run manage.py test
+          coverage xml
+
+      - name: Upload coverage to Codecov
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} 
+        run: bash <(curl -s https://codecov.io/bash) -f coverage.xml

.gitignore

@@ -1,6 +1,6 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
-config.ini
+config.txt
 PackTravel/__pycache__/
 *.py[cod]
 *$py.class
@@ -139,4 +139,5 @@ dmypy.json
 .pytype/
 
 # Cython debug symbols
-cython_debug/
+cython_debug/
+templates/publish/route_old.html

CITATION.cff

@@ -1,17 +1,55 @@
-cff-version: 1.2.0
-message: "Hello!! If you use this software, please cite it using the metadata from this file"
-title: "PackTravel"
+abstract: '<h2><strong>Pilot Release - v1.1</strong></h2>
+
+  <h3><strong>New Features:</strong></h3>
+
+  <p><strong>1. Google Map Integration:</strong>
+
+  - Users can now auto fill exact start and destination locations with the help of
+  googleMapAPI''s autocomplete.
+
+  - Users can now view their ride route from start to destination with embedded GMap
+  on clicking view Ride Details.</p>
+
+  <p><strong>2. Joining a ride:</strong>
+
+  - Users can now request ride owner to add them to the created ride.
+
+  - Ride owners can view requested users and approve their request.
+
+  - Availability and Capacity of ride fields added to keep track of number of users
+  that can be added to a ride.</p>
+
+  <p><strong>3. Secure Password Storage:</strong>
+
+  - Users passwords are hashed and stored in the database.</p>
+
+
+
+  <h3><strong>Bug Fixes:</strong></h3>
+
+  <p><strong>1. Ride Deletion Issue:</strong> Fixed an issue where ride owners were
+  unable to delete the rides they created. Ride owners can now successfully delete
+  any rides they''ve created as intended.</p>
+
+  <p><strong>2. Unique Identifier:</strong> source point was being used as the _id
+  for searching rides. This was fixed by using a UUID as the _id as the identifier
+  for a ride.</p>
+
+  <p><strong>3. Unique Username Constraint:</strong> Added ride owner unique username
+  constraint and simplified db querying.</p>'
 authors:
-  - family-names: Chavan
-    given-names: Ameya
-  - family-names: Waghela
-    given-names: Amisha
-  - family-names: Das
-    given-names: Aoishi
-  - family-names: Shah
-    given-names: Kunal
-  - family-names: Mohan
-    given-names: Swarnamalya
-version: "1.2"
-date-released: "10/09/2022"
-doi: 10.5281/zenodo.7178601
+- family-names: Varatharajan
+  given-names: Varun
+- family-names: Pundlik
+  given-names: Makarand
+- family-names: Varghese
+  given-names: Michelle
+cff-version: 1.2.0
+date-released: '2024-10-30'
+doi: 10.5281/zenodo.14020211
+license:
+- cc-by-4.0
+repository-code: https://github.com/GradHackersGuild/PackTravel-Old/tree/v1.1
+title: PackTravel by GradHackersGuild
+type: software
+version: v1.1

CONTRIBUTING.md

@@ -30,9 +30,9 @@ This section guides you through submitting a bug report. Following these guideli
 > **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
 #### Before Submitting A Bug Report
 
-* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/amisha-w/PackTravel/issues).
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/orgs/GradHackersGuild/projects/2/views/1)
 
-* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/amisha-w/PackTravel/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/GradHackersGuild/PackTravel-Old/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
 
 #### How Do I Submit the fixes for the Bug?
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Amisha Waghela
+Copyright (c) 2022 Makarand Pundlik
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -0,0 +1,41 @@
+PYTHON = py # change the python run command according to your system
+PIP = pip
+PORT = 8080
+
+.PHONY: help
+help:
+	@echo "Makefile for Django Project"
+	@echo ""
+	@echo "Usage:"
+	@echo "  make setup        Install dependencies, apply migrations, and start the server"
+	@echo "  make install      Install Django and dependencies"
+	@echo "  make migrate      Apply migrations"
+	@echo "  make run          Start the Django development server"
+	@echo "  make tests         Run all tests"
+	@echo ""
+
+# Install Django and other dependencies
+.PHONY: install
+install:
+	$(PIP) install -r requirements.txt
+	$(PIP) install django django-allauth pymongo setuptools --upgrade
+
+
+# Apply database migrations
+.PHONY: migrate
+migrate:
+	$(PYTHON) manage.py migrate
+
+# Start the Django server
+.PHONY: run
+run:
+	$(PYTHON) manage.py runserver $(PORT)
+
+# Install, migrate, and run server
+.PHONY: setup
+setup: install migrate run
+
+# Run all django tests
+.PHONY: tests
+tests:
+	$(PYTHON) manage.py test

PackTravel/settings.py

@@ -1,3 +1,27 @@
+"""
+MIT License
+
+Copyright (c) 2022 Makarand Pundlik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
 """
 Django settings for PackTravel project.
 
@@ -42,6 +66,7 @@
     'allauth.account',
     'allauth.socialaccount',
     'allauth.socialaccount.providers.google', # for Google OAuth 2.0
+    'user'
 ]
 
 MIDDLEWARE = [
@@ -81,6 +106,10 @@
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': BASE_DIR / 'db.sqlite3',
+        'TEST': {
+            'NAME': 'my_test_database',  
+            'MIRROR': None,
+        },
     }
 }
 

PackTravel/urls.py

@@ -1,3 +1,27 @@
+"""
+MIT License
+
+Copyright (c) 2022 Makarand Pundlik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
 """PackTravel URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
@@ -36,6 +60,10 @@
     path('display_ride/<ride_id>', publishViews.display_ride, name='display_ride'),
     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('myrides/', userView.my_rides, name = 'my_rides'),
+    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='requested_rides')
 ]